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

Detail

This commit is contained in:
owomomo 2019-07-12 13:07:50 +08:00
parent ddf760c6b6
commit 50bbacfb4d
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -787,8 +787,12 @@ INT_PTR CALLBACK EditWatchProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lPara
{ {
case WM_INITDIALOG: case WM_INITDIALOG:
{ {
HWND parent = GetParent(hDlg);
indexes[GetDlgStoreIndex(parent)] = lParam;
RECT r; RECT r;
GetWindowRect(hWnd, &r); GetWindowRect(hDlg, &r);
SetWindowPos(hDlg, NULL, r.left, r.top, NULL, NULL, SWP_NOSIZE | SWP_NOZORDER | SWP_SHOWWINDOW); SetWindowPos(hDlg, NULL, r.left, r.top, NULL, NULL, SWP_NOSIZE | SWP_NOZORDER | SWP_SHOWWINDOW);
AddressWatcher& watcher = rswatches[lParam]; AddressWatcher& watcher = rswatches[lParam];
@ -836,9 +840,6 @@ INT_PTR CALLBACK EditWatchProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lPara
if (watcher.comment != NULL) if (watcher.comment != NULL)
SetDlgItemText(hDlg, IDC_PROMPT_EDIT, watcher.comment); SetDlgItemText(hDlg, IDC_PROMPT_EDIT, watcher.comment);
HWND parent = GetParent(hDlg);
indexes[GetDlgStoreIndex(parent)] = lParam;
if (watcher.Type == 'S' || parent == RamSearchHWnd || parent == hCheat) if (watcher.Type == 'S' || parent == RamSearchHWnd || parent == hCheat)
{ {
EnableWindow(GetDlgItem(hDlg, IDC_SPECIFICADDRESS), FALSE); EnableWindow(GetDlgItem(hDlg, IDC_SPECIFICADDRESS), FALSE);

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

@ -3272,7 +3272,7 @@ LRESULT APIENTRY FilterEditCtrlProc(HWND hwnd, UINT msg, WPARAM wP, LPARAM lP)
case WM_PASTE: case WM_PASTE:
{ {
bool(*IsLetterLegal)(char) = GetIsLetterLegal(GetDlgCtrlID(hwnd)); bool (*IsLetterLegal)(char) = GetIsLetterLegal(GetDlgCtrlID(hwnd));
if (IsLetterLegal) if (IsLetterLegal)
{ {
@ -3299,7 +3299,6 @@ LRESULT APIENTRY FilterEditCtrlProc(HWND hwnd, UINT msg, WPARAM wP, LPARAM lP)
} }
GlobalUnlock(handle); GlobalUnlock(handle);
CloseClipboard(); CloseClipboard();
} }
} }
} }
@ -3308,7 +3307,7 @@ LRESULT APIENTRY FilterEditCtrlProc(HWND hwnd, UINT msg, WPARAM wP, LPARAM lP)
case WM_CHAR: case WM_CHAR:
{ {
bool(*IsLetterLegal)(char) = GetIsLetterLegal(GetDlgCtrlID(hwnd)); bool(*IsLetterLegal)(char) = GetIsLetterLegal(GetDlgCtrlID(hwnd));
through = IsInputLegal(GetIsLetterLegal(GetDlgCtrlID(hwnd)), wP); through = IsInputLegal(IsLetterLegal, wP);
if (!through) if (!through)
ShowLetterIllegalError(hwnd, IsLetterLegal); ShowLetterIllegalError(hwnd, IsLetterLegal);
} }
@ -3322,9 +3321,6 @@ bool inline (*GetIsLetterLegal(UINT id))(char letter)
{ {
switch (id) switch (id)
{ {
// owomomo TODO: RAM Search is a bit complicated,
// I'll handle it in later development
// Game genie text in Cheat and Game Genie Encoder/Decoder // Game genie text in Cheat and Game Genie Encoder/Decoder
case IDC_CHEAT_GAME_GENIE_TEXT: case IDC_CHEAT_GAME_GENIE_TEXT:
@ -3418,16 +3414,19 @@ void ShowLetterIllegalBalloonTip(HWND hwnd, bool(*IsLetterLegal)(char letter))
tip.ttiIcon = TTI_ERROR; tip.ttiIcon = TTI_ERROR;
SendMessage(hwnd, EM_SHOWBALLOONTIP, 0, (LPARAM)&tip); SendMessage(hwnd, EM_SHOWBALLOONTIP, 0, (LPARAM)&tip);
// make a sound
MessageBeep(0xFFFFFFFF);
free(titleW); free(titleW);
free(msgW); free(msgW);
} }
inline void ShowLetterIllegalMessageBox(HWND hwnd, bool(*IsLetterLegal)(char letter)) inline void ShowLetterIllegalMessageBox(HWND hwnd, bool(*IsLetterLegal)(char letter))
{ {
MessageBox(hwnd, GetLetterIllegalErrMsg(IsLetterLegal), "Unacceptable Character", MB_OK | MB_ICONERROR); MessageBox(hwnd, GetLetterIllegalErrMsg(IsLetterLegal), _T("Unacceptable Character"), MB_OK | MB_ICONERROR);
} }
inline char* GetLetterIllegalErrMsg(bool(*IsLetterLegal)(char letter)) inline TCHAR* GetLetterIllegalErrMsg(bool(*IsLetterLegal)(char letter))
{ {
if (IsLetterLegal == IsLetterLegalGG) if (IsLetterLegal == IsLetterLegalGG)
return "You can only type Game Genie characters:\nA P Z L G I T Y E O X U K S V N"; return "You can only type Game Genie characters:\nA P Z L G I T Y E O X U K S V N";