ShuriZma
/
fceux
mirror of https://github.com/TASEmulators/fceux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Made closing minimized windows stop trying to save the position as a negative number, part of what's reported under Tracker Artifact 2979512.

This commit is contained in:
ugetab 2010-03-31 03:46:16 +00:00
parent d4f6aae2cb
commit 3e34f5707b
16 changed files with 35 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.txt
View File

@ -1,3 +1,4 @@
30-march-2010 - ugetab - Win32 - Closing minimized windows no longer moves them the next time they get opened
28-march-2010 - adelikat - lua - fixed zapper.read() to read movie data if a movie is playing. Also changed the struct values to x,y,fire. This breaks lua scripts that used it previous, sorry. 28-march-2010 - adelikat - lua - fixed zapper.read() to read movie data if a movie is playing. Also changed the struct values to x,y,fire. This breaks lua scripts that used it previous, sorry.
04-march-2010 - prockguy - added menu buttons for loading nsf files 04-march-2010 - prockguy - added menu buttons for loading nsf files
03-march-2010 - adelikat - Win32 - If .fm2 drag & dropped with no ROM load, the open ROM dialog will appear 03-march-2010 - adelikat - Win32 - If .fm2 drag & dropped with no ROM load, the open ROM dialog will appear

2
src/drivers/win/cdlogger.cpp
View File

@ -93,6 +93,7 @@ BOOL CALLBACK CDLoggerCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPara
break; break;
case WM_MOVE: { case WM_MOVE: {
if (!IsIconic(hwndDlg)) {
RECT wrect; RECT wrect;
GetWindowRect(hwndDlg,&wrect); GetWindowRect(hwndDlg,&wrect);
CDLogger_wndx = wrect.left; CDLogger_wndx = wrect.left;
@ -101,6 +102,7 @@ BOOL CALLBACK CDLoggerCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPara
#ifdef WIN32 #ifdef WIN32
WindowBoundsCheckNoResize(CDLogger_wndx,CDLogger_wndy,wrect.right); WindowBoundsCheckNoResize(CDLogger_wndx,CDLogger_wndy,wrect.right);
#endif #endif
}
break; break;
}; };
case WM_INITDIALOG: case WM_INITDIALOG:

4
src/drivers/win/cheat.cpp
View File

@ -241,6 +241,7 @@ BOOL CALLBACK CheatConsoleCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM l
break; break;
case WM_MOVE: case WM_MOVE:
if (!IsIconic(hwndDlg)) {
GetWindowRect(hwndDlg,&wrect); GetWindowRect(hwndDlg,&wrect);
ChtPosX = wrect.left; ChtPosX = wrect.left;
ChtPosY = wrect.top; ChtPosY = wrect.top;
@ -248,6 +249,7 @@ BOOL CALLBACK CheatConsoleCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM l
#ifdef WIN32 #ifdef WIN32
WindowBoundsCheckNoResize(ChtPosX,ChtPosY,wrect.right); WindowBoundsCheckNoResize(ChtPosX,ChtPosY,wrect.right);
#endif #endif
}
break; break;
case WM_VSCROLL: case WM_VSCROLL:
@ -624,6 +626,7 @@ BOOL CALLBACK GGConvCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
switch(uMsg) { switch(uMsg) {
case WM_MOVE: { case WM_MOVE: {
if (!IsIconic(hwndDlg)) {
RECT wrect; RECT wrect;
GetWindowRect(hwndDlg,&wrect); GetWindowRect(hwndDlg,&wrect);
GGConv_wndx = wrect.left; GGConv_wndx = wrect.left;
@ -632,6 +635,7 @@ BOOL CALLBACK GGConvCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
#ifdef WIN32 #ifdef WIN32
WindowBoundsCheckNoResize(GGConv_wndx,GGConv_wndy,wrect.right); WindowBoundsCheckNoResize(GGConv_wndx,GGConv_wndy,wrect.right);
#endif #endif
}
break; break;
}; };
case WM_INITDIALOG: case WM_INITDIALOG:

2
src/drivers/win/debugger.cpp
View File

@ -1081,6 +1081,7 @@ BOOL CALLBACK DebuggerCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPara
case WM_MOVING: case WM_MOVING:
break; break;
case WM_MOVE: case WM_MOVE:
if (!IsIconic(hwndDlg)) {
GetWindowRect(hwndDlg,&wrect); GetWindowRect(hwndDlg,&wrect);
DbgPosX = wrect.left; DbgPosX = wrect.left;
DbgPosY = wrect.top; DbgPosY = wrect.top;
@ -1088,6 +1089,7 @@ BOOL CALLBACK DebuggerCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPara
#ifdef WIN32 #ifdef WIN32
WindowBoundsCheckResize(DbgPosX,DbgPosY,DbgSizeX,wrect.right); WindowBoundsCheckResize(DbgPosX,DbgPosY,DbgSizeX,wrect.right);
#endif #endif
}
break; break;
//adelikat: Buttons that don't need a rom loaded to do something, such as autoload //adelikat: Buttons that don't need a rom loaded to do something, such as autoload

3
src/drivers/win/log.cpp
View File

@ -83,6 +83,7 @@ BOOL CALLBACK LogCon(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
SetWindowPos(hwndDlg,0,MLogPosX,MLogPosY,0,0,SWP_NOSIZE|SWP_NOZORDER|SWP_NOOWNERZORDER); SetWindowPos(hwndDlg,0,MLogPosX,MLogPosY,0,0,SWP_NOSIZE|SWP_NOZORDER|SWP_NOOWNERZORDER);
break; break;
case WM_MOVE: case WM_MOVE:
if (!IsIconic(hwndDlg)) {
GetWindowRect(hwndDlg,&wrect); //Remember X,Y coordinates GetWindowRect(hwndDlg,&wrect); //Remember X,Y coordinates
MLogPosX = wrect.left; MLogPosX = wrect.left;
MLogPosY = wrect.top; MLogPosY = wrect.top;
@ -90,7 +91,7 @@ BOOL CALLBACK LogCon(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
#ifdef WIN32 #ifdef WIN32
WindowBoundsCheckNoResize(MLogPosX,MLogPosY,wrect.right); WindowBoundsCheckNoResize(MLogPosX,MLogPosY,wrect.right);
#endif #endif
}
break; break;
case WM_COMMAND: case WM_COMMAND:
if(HIWORD(wParam)==BN_CLICKED) if(HIWORD(wParam)==BN_CLICKED)

6
src/drivers/win/memview.cpp
View File

@ -1592,6 +1592,7 @@ LRESULT CALLBACK MemViewCallB(HWND hwnd, UINT message, WPARAM wParam, LPARAM lPa
} }
case WM_MOVE: { case WM_MOVE: {
if (!IsIconic(hwnd)) {
RECT wrect; RECT wrect;
GetWindowRect(hwnd,&wrect); GetWindowRect(hwnd,&wrect);
MemView_wndx = wrect.left; MemView_wndx = wrect.left;
@ -1600,7 +1601,7 @@ LRESULT CALLBACK MemViewCallB(HWND hwnd, UINT message, WPARAM wParam, LPARAM lPa
#ifdef WIN32 #ifdef WIN32
WindowBoundsCheckResize(MemView_wndx,MemView_wndy,MemViewSizeX,wrect.right); WindowBoundsCheckResize(MemView_wndx,MemView_wndy,MemViewSizeX,wrect.right);
#endif #endif
}
return 0; return 0;
} }
@ -1695,6 +1696,7 @@ BOOL CALLBACK MemFindCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam
case WM_MOVING: case WM_MOVING:
break; break;
case WM_MOVE: { case WM_MOVE: {
if (!IsIconic(hwndDlg)) {
RECT wrect; RECT wrect;
GetWindowRect(hwndDlg,&wrect); GetWindowRect(hwndDlg,&wrect);
MemFind_wndx = wrect.left; MemFind_wndx = wrect.left;
@ -1703,7 +1705,7 @@ BOOL CALLBACK MemFindCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam
#ifdef WIN32 #ifdef WIN32
WindowBoundsCheckNoResize(MemFind_wndx,MemFind_wndy,wrect.right); WindowBoundsCheckNoResize(MemFind_wndx,MemFind_wndy,wrect.right);
#endif #endif
}
break; break;
} }
case WM_RBUTTONDBLCLK: case WM_RBUTTONDBLCLK:

3
src/drivers/win/memwatch.cpp
View File

@ -720,6 +720,7 @@ static BOOL CALLBACK MemWatchCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARA
EnableMenuItem(memwmenu,MEMW_FILE_SAVE,MF_BYCOMMAND | fileChanged ? MF_ENABLED:MF_GRAYED); EnableMenuItem(memwmenu,MEMW_FILE_SAVE,MF_BYCOMMAND | fileChanged ? MF_ENABLED:MF_GRAYED);
break; break;
case WM_MOVE: { case WM_MOVE: {
if (!IsIconic(hwndDlg)) {
RECT wrect; RECT wrect;
GetWindowRect(hwndDlg,&wrect); GetWindowRect(hwndDlg,&wrect);
MemWatch_wndx = wrect.left; MemWatch_wndx = wrect.left;
@ -728,7 +729,7 @@ static BOOL CALLBACK MemWatchCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARA
#ifdef WIN32 #ifdef WIN32
WindowBoundsCheckNoResize(MemWatch_wndx,MemWatch_wndy,wrect.right); WindowBoundsCheckNoResize(MemWatch_wndx,MemWatch_wndy,wrect.right);
#endif #endif
}
break; break;
}; };

3
src/drivers/win/monitor.cpp
View File

@ -223,6 +223,7 @@ BOOL CALLBACK MonitorCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam
{ {
switch(uMsg) { switch(uMsg) {
case WM_MOVE: { case WM_MOVE: {
if (!IsIconic(hwndDlg)) {
RECT wrect; RECT wrect;
GetWindowRect(hwndDlg,&wrect); GetWindowRect(hwndDlg,&wrect);
Monitor_wndx = wrect.left; Monitor_wndx = wrect.left;
@ -231,7 +232,7 @@ BOOL CALLBACK MonitorCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam
#ifdef WIN32 #ifdef WIN32
WindowBoundsCheckNoResize(Monitor_wndx,Monitor_wndy,wrect.right); WindowBoundsCheckNoResize(Monitor_wndx,Monitor_wndy,wrect.right);
#endif #endif
}
break; break;
}; };

3
src/drivers/win/ntview.cpp
View File

@ -421,6 +421,7 @@ BOOL CALLBACK NTViewCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
case WM_MOVING: case WM_MOVING:
break; break;
case WM_MOVE: case WM_MOVE:
if (!IsIconic(hwndDlg)) {
GetWindowRect(hwndDlg,&wrect); GetWindowRect(hwndDlg,&wrect);
NTViewPosX = wrect.left; NTViewPosX = wrect.left;
NTViewPosY = wrect.top; NTViewPosY = wrect.top;
@ -428,7 +429,7 @@ BOOL CALLBACK NTViewCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
#ifdef WIN32 #ifdef WIN32
WindowBoundsCheckNoResize(NTViewPosX,NTViewPosY,wrect.right); WindowBoundsCheckNoResize(NTViewPosX,NTViewPosY,wrect.right);
#endif #endif
}
break; break;
case WM_RBUTTONDBLCLK: case WM_RBUTTONDBLCLK:
case WM_RBUTTONDOWN: case WM_RBUTTONDOWN:

3
src/drivers/win/ppuview.cpp
View File

@ -267,6 +267,7 @@ BOOL CALLBACK PPUViewCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam
case WM_MOVING: case WM_MOVING:
break; break;
case WM_MOVE: case WM_MOVE:
if (!IsIconic(hwndDlg)) {
GetWindowRect(hwndDlg,&wrect); GetWindowRect(hwndDlg,&wrect);
PPUViewPosX = wrect.left; PPUViewPosX = wrect.left;
PPUViewPosY = wrect.top; PPUViewPosY = wrect.top;
@ -274,7 +275,7 @@ BOOL CALLBACK PPUViewCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam
#ifdef WIN32 #ifdef WIN32
WindowBoundsCheckNoResize(PPUViewPosX,PPUViewPosY,wrect.right); WindowBoundsCheckNoResize(PPUViewPosX,PPUViewPosY,wrect.right);
#endif #endif
}
break; break;
case WM_RBUTTONDBLCLK: case WM_RBUTTONDBLCLK:
case WM_RBUTTONDOWN: case WM_RBUTTONDOWN:

3
src/drivers/win/ramwatch.cpp
View File

@ -826,6 +826,7 @@ LRESULT CALLBACK RamWatchProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam
switch(uMsg) switch(uMsg)
{ {
case WM_MOVE: { case WM_MOVE: {
if (!IsIconic(hDlg)) {
RECT wrect; RECT wrect;
GetWindowRect(hDlg,&wrect); GetWindowRect(hDlg,&wrect);
ramw_x = wrect.left; ramw_x = wrect.left;
@ -834,7 +835,7 @@ LRESULT CALLBACK RamWatchProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam
#ifdef WIN32 #ifdef WIN32
WindowBoundsCheckNoResize(ramw_x,ramw_y,wrect.right); WindowBoundsCheckNoResize(ramw_x,ramw_y,wrect.right);
#endif #endif
}
//regSetDwordValue(RAMWX, ramw_x); TODO //regSetDwordValue(RAMWX, ramw_x); TODO
//regSetDwordValue(RAMWY, ramw_y); TODO //regSetDwordValue(RAMWY, ramw_y); TODO
} break; } break;

2
src/drivers/win/replay.cpp
View File

@ -398,6 +398,7 @@ BOOL CALLBACK ReplayMetadataDialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, L
} }
break; break;
case WM_MOVE: case WM_MOVE:
if (!IsIconic(hwndDlg)) {
GetWindowRect(hwndDlg,&wrect); GetWindowRect(hwndDlg,&wrect);
MetaPosX = wrect.left; MetaPosX = wrect.left;
MetaPosY = wrect.top; MetaPosY = wrect.top;
@ -405,6 +406,7 @@ BOOL CALLBACK ReplayMetadataDialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, L
#ifdef WIN32 #ifdef WIN32
WindowBoundsCheckNoResize(MetaPosX,MetaPosY,wrect.right); WindowBoundsCheckNoResize(MetaPosX,MetaPosY,wrect.right);
#endif #endif
}
break; break;
case WM_COMMAND: case WM_COMMAND:

3
src/drivers/win/tasedit.cpp
View File

@ -1019,6 +1019,7 @@ BOOL CALLBACK WndprocTasEdit(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPar
break; break;
case WM_MOVE: { case WM_MOVE: {
if (!IsIconic(hwndDlg)) {
RECT wrect; RECT wrect;
GetWindowRect(hwndDlg,&wrect); GetWindowRect(hwndDlg,&wrect);
TasEdit_wndx = wrect.left; TasEdit_wndx = wrect.left;
@ -1027,7 +1028,7 @@ BOOL CALLBACK WndprocTasEdit(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPar
#ifdef WIN32 #ifdef WIN32
WindowBoundsCheckNoResize(TasEdit_wndx,TasEdit_wndy,wrect.right); WindowBoundsCheckNoResize(TasEdit_wndx,TasEdit_wndy,wrect.right);
#endif #endif
}
break; break;
} }

3
src/drivers/win/texthook.cpp
View File

@ -872,6 +872,7 @@ BOOL CALLBACK TextHookerCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa
//StopSound(); //mbg merge 6/30/08 //StopSound(); //mbg merge 6/30/08
break; break;
case WM_MOVE: case WM_MOVE:
if (!IsIconic(hwndDlg)) {
GetWindowRect(hwndDlg,&wrect); GetWindowRect(hwndDlg,&wrect);
TextHookerPosX = wrect.left; TextHookerPosX = wrect.left;
TextHookerPosY = wrect.top; TextHookerPosY = wrect.top;
@ -879,7 +880,7 @@ BOOL CALLBACK TextHookerCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa
#ifdef WIN32 #ifdef WIN32
WindowBoundsCheckNoResize(TextHookerPosX,TextHookerPosY,wrect.right); WindowBoundsCheckNoResize(TextHookerPosX,TextHookerPosY,wrect.right);
#endif #endif
}
break; break;
case WM_RBUTTONDBLCLK: case WM_RBUTTONDBLCLK:
sprintf(str,"aaaa"); sprintf(str,"aaaa");

3
src/drivers/win/tracer.cpp
View File

@ -86,6 +86,7 @@ BOOL CALLBACK TracerCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
LOGFONT lf; LOGFONT lf;
switch(uMsg) { switch(uMsg) {
case WM_MOVE: { case WM_MOVE: {
if (!IsIconic(hwndDlg)) {
RECT wrect; RECT wrect;
GetWindowRect(hwndDlg,&wrect); GetWindowRect(hwndDlg,&wrect);
Tracer_wndx = wrect.left; Tracer_wndx = wrect.left;
@ -94,7 +95,7 @@ BOOL CALLBACK TracerCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
#ifdef WIN32 #ifdef WIN32
WindowBoundsCheckNoResize(Tracer_wndx,Tracer_wndy,wrect.right); WindowBoundsCheckNoResize(Tracer_wndx,Tracer_wndy,wrect.right);
#endif #endif
}
break; break;
}; };
case WM_INITDIALOG: case WM_INITDIALOG:

3
src/drivers/win/window.cpp
View File

@ -1194,6 +1194,7 @@ LRESULT FAR PASCAL AppWndProc(HWND hWnd,UINT msg,WPARAM wParam,LPARAM lParam)
case WM_MOVE: case WM_MOVE:
{ {
if (!IsIconic(hWnd)) {
RECT wrect; RECT wrect;
GetWindowRect(hWnd,&wrect); GetWindowRect(hWnd,&wrect);
MainWindow_wndx = wrect.left; MainWindow_wndx = wrect.left;
@ -1202,7 +1203,7 @@ LRESULT FAR PASCAL AppWndProc(HWND hWnd,UINT msg,WPARAM wParam,LPARAM lParam)
#ifdef WIN32 #ifdef WIN32
WindowBoundsCheckNoResize(MainWindow_wndx,MainWindow_wndy,wrect.right); WindowBoundsCheckNoResize(MainWindow_wndx,MainWindow_wndy,wrect.right);
#endif #endif
}
} }
case WM_MOUSEMOVE: case WM_MOUSEMOVE: