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

Win32 - memwatch - Fix ramchange bug & save as bug

This commit is contained in:
adelikat 2008-12-01 19:23:20 +00:00
parent 8fa380903d
commit dae7cd4c2a
1 changed files with 22 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -39,9 +39,9 @@ static HMENU memwrecentmenu;//Handle to Recent Files Menu
int MemWatch_wndx=0, MemWatch_wndy=0; //Window Position int MemWatch_wndx=0, MemWatch_wndy=0; //Window Position
//Memory Watch globals----------------------------------------- //Memory Watch globals-----------------------------------------
const int NUMWATCHES = 24; //Maximum Number of Watches const int NUMWATCHES = 24; //Maximum Number of Watches
const int LABELLENGTH = 64; //Maximum Length of a Watch label const int LABELLENGTH = 64; //Maximum Length of a Watch label
const int ADDRESSLENGTH = 16; //Maximum Length of a Ram Address const int ADDRESSLENGTH = 16; //Maximum Length of a Ram Address
static char addresses[NUMWATCHES][ADDRESSLENGTH]; //Stores all address labels static char addresses[NUMWATCHES][ADDRESSLENGTH]; //Stores all address labels
static char labels[NUMWATCHES][LABELLENGTH]; //Stores all label lengths static char labels[NUMWATCHES][LABELLENGTH]; //Stores all label lengths
@ -70,6 +70,8 @@ int editlast[MAX_RAMMONITOR]; //last address value (1 frame ago)
int editnow[MAX_RAMMONITOR]; //current address value int editnow[MAX_RAMMONITOR]; //current address value
unsigned int editcount[MAX_RAMMONITOR]; //Current counter value unsigned int editcount[MAX_RAMMONITOR]; //Current counter value
char editchangem[MAX_RAMMONITOR][5]; //counter converted to string char editchangem[MAX_RAMMONITOR][5]; //counter converted to string
void RamChangeReset(int x);
//------------------------------------------------- //-------------------------------------------------
void UpdateMemw_RMenu(HMENU menu, char **strs, unsigned int mitem, unsigned int baseid) void UpdateMemw_RMenu(HMENU menu, char **strs, unsigned int mitem, unsigned int baseid)
@ -385,6 +387,8 @@ static void SaveMemWatch()
char nameo[2048]; char nameo[2048];
if (!memwLastFilename[0]) if (!memwLastFilename[0])
strcpy(nameo,GetRomName()); strcpy(nameo,GetRomName());
else
strcpy(nameo,memwLastFilename);
ofn.lpstrFile=nameo; ofn.lpstrFile=nameo;
ofn.nMaxFile=256; ofn.nMaxFile=256;
ofn.Flags=OFN_EXPLORER|OFN_HIDEREADONLY|OFN_OVERWRITEPROMPT; ofn.Flags=OFN_EXPLORER|OFN_HIDEREADONLY|OFN_OVERWRITEPROMPT;
@ -731,13 +735,7 @@ static BOOL CALLBACK MemWatchCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARA
case WM_CLOSE: case WM_CLOSE:
case WM_QUIT: case WM_QUIT:
CloseMemoryWatch(); CloseMemoryWatch();
//DeleteObject(hdc); //removed
break; break;
/*
case WM_KEYDOWN:
if (wParam == VK_HOME)
ClearAllText();
*/
case WM_COMMAND: case WM_COMMAND:
//Menu Items //Menu Items
@ -772,7 +770,7 @@ static BOOL CALLBACK MemWatchCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARA
case MEMW_FILE_RECENT: case MEMW_FILE_RECENT:
break; break;
case MEMW_OPTIONS_LOADSTART: //Load on Start up case MEMW_OPTIONS_LOADSTART: //Load on Start up
MemWatchLoadOnStart ^= 1; MemWatchLoadOnStart ^= 1;
CheckMenuItem(memwmenu, MEMW_OPTIONS_LOADSTART, MemWatchLoadOnStart ? MF_CHECKED : MF_UNCHECKED); CheckMenuItem(memwmenu, MEMW_OPTIONS_LOADSTART, MemWatchLoadOnStart ? MF_CHECKED : MF_UNCHECKED);
break; break;
@ -786,25 +784,17 @@ static BOOL CALLBACK MemWatchCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARA
OpenHelpWindow(memwhelp); OpenHelpWindow(memwhelp);
break; break;
case MEMW_EDIT00RESET: case MEMW_EDIT00RESET:
editlast[0] = 0; RamChangeReset(0);
editnow[0] = 0;
editcount[0] = 0;
break; break;
case MEMW_EDIT01RESET: case MEMW_EDIT01RESET:
editlast[1] = 0; RamChangeReset(1);
editnow[1] = 0; break;
editcount[1] = 0;
break;
case MEMW_EDIT02RESET: case MEMW_EDIT02RESET:
editlast[2] = 0; RamChangeReset(2);
editnow[2] = 0; break;
editcount[2] = 0;
break;
case MEMW_EDIT03RESET: case MEMW_EDIT03RESET:
editlast[3] = 0; RamChangeReset(3);
editnow[3] = 0; break;
editcount[3] = 0;
break;
default: default:
if (LOWORD(wParam) >= MEMW_MENU_FIRST_RECENT_FILE && LOWORD(wParam) < MEMW_MENU_FIRST_RECENT_FILE+MEMW_MAX_NUMBER_OF_RECENT_FILES) if (LOWORD(wParam) >= MEMW_MENU_FIRST_RECENT_FILE && LOWORD(wParam) < MEMW_MENU_FIRST_RECENT_FILE+MEMW_MAX_NUMBER_OF_RECENT_FILES)
OpenMemwatchRecentFile(LOWORD(wParam) - MEMW_MENU_FIRST_RECENT_FILE); OpenMemwatchRecentFile(LOWORD(wParam) - MEMW_MENU_FIRST_RECENT_FILE);
@ -998,3 +988,10 @@ void RamChange()
} }
} //End of for loop } //End of for loop
} }
void RamChangeReset(int x)
{
editcount[x] = 0;
sprintf(editchangem[x], "%d", editcount[x]); //Convert counter to text
SetDlgItemText(hwndMemWatch, EDIT00_RESULTS+x, editchangem[x]); //Display text in results box
}