From a9351c7b7578338d906791bda95a76ec064f5480 Mon Sep 17 00:00:00 2001 From: nitsuja Date: Fri, 11 Dec 2009 08:43:20 +0000 Subject: [PATCH] sprinkling some W's around. maybe it will fix some title bars or something, either way it probably can't hurt anything --- desmume/src/windows/CWindow.cpp | 5 ++- desmume/src/windows/cheatsWin.cpp | 22 +++++------ desmume/src/windows/gbaslot_config.cpp | 8 ++-- desmume/src/windows/ginfo.cpp | 2 +- desmume/src/windows/inputdx.cpp | 4 +- desmume/src/windows/main.cpp | 50 ++++++++++++------------- desmume/src/windows/pathsettings.cpp | 4 +- desmume/src/windows/ramwatch.cpp | 2 +- desmume/src/windows/replay.cpp | 4 +- desmume/src/windows/resource.h | 7 ++++ desmume/src/windows/resources.rc | Bin 889010 -> 889102 bytes desmume/src/windows/soundView.cpp | 2 +- 12 files changed, 59 insertions(+), 51 deletions(-) diff --git a/desmume/src/windows/CWindow.cpp b/desmume/src/windows/CWindow.cpp index d1b57c3b1..a07fd6226 100644 --- a/desmume/src/windows/CWindow.cpp +++ b/desmume/src/windows/CWindow.cpp @@ -21,6 +21,7 @@ #include "CWindow.h" #include "IORegView.h" #include "debug.h" +#include "resource.h" DWORD GetFontQuality() { @@ -162,7 +163,7 @@ void CToolWindow::PostInitialize() return; SetWindowText(hWnd, title.c_str()); - SendMessage(hWnd, WM_SETICON, ICON_BIG, (LPARAM)LoadIcon(hAppInst, "ICONDESMUME")); + SendMessage(hWnd, WM_SETICON, ICON_BIG, (LPARAM)LoadIcon(hAppInst, MAKEINTRESOURCE(ICONDESMUME))); } } @@ -559,7 +560,7 @@ DWORD TOOLSCLASS::ThreadFunc() LOG("Start thread\n"); GetLastError(); - hwnd = CreateDialog(hInstance, MAKEINTRESOURCE(idd), NULL, (DLGPROC) dlgproc); + hwnd = CreateDialogW(hInstance, MAKEINTRESOURCEW(idd), NULL, (DLGPROC) dlgproc); if (!hwnd) { diff --git a/desmume/src/windows/cheatsWin.cpp b/desmume/src/windows/cheatsWin.cpp index ef8a5a535..fb02a8c8b 100644 --- a/desmume/src/windows/cheatsWin.cpp +++ b/desmume/src/windows/cheatsWin.cpp @@ -754,7 +754,7 @@ INT_PTR CALLBACK CheatsListBox_Proc(HWND dialog, UINT msg,WPARAM wparam,LPARAM l searchAddValue = 0; searchAddMode = 0; searchAddFreeze = 1; - if (DialogBox(hAppInst, MAKEINTRESOURCE(IDD_CHEAT_ADD), dialog, (DLGPROC) CheatsAddProc)) + if (DialogBoxW(hAppInst, MAKEINTRESOURCEW(IDD_CHEAT_ADD), dialog, (DLGPROC) CheatsAddProc)) { LVITEM lvi; char buf[256]; @@ -794,7 +794,7 @@ INT_PTR CALLBACK CheatsListBox_Proc(HWND dialog, UINT msg,WPARAM wparam,LPARAM l return TRUE; cheatXXaction = 0; // 0 = add - if (DialogBox(hAppInst, MAKEINTRESOURCE(IDD_CHEAT_ADD_XX_CODE), dialog, (DLGPROC) CheatsAdd_XX_Proc)) + if (DialogBoxW(hAppInst, MAKEINTRESOURCEW(IDD_CHEAT_ADD_XX_CODE), dialog, (DLGPROC) CheatsAdd_XX_Proc)) { LVITEM lvi; @@ -834,7 +834,7 @@ INT_PTR CALLBACK CheatsListBox_Proc(HWND dialog, UINT msg,WPARAM wparam,LPARAM l switch (tempCheat.type) { case 0: // internal - if (DialogBox(hAppInst, MAKEINTRESOURCE(IDD_CHEAT_ADD), dialog, (DLGPROC) CheatsEditProc)) + if (DialogBoxW(hAppInst, MAKEINTRESOURCEW(IDD_CHEAT_ADD), dialog, (DLGPROC) CheatsEditProc)) { char buf[256]; cheatsGet(&tempCheat, cheatEditPos); @@ -857,7 +857,7 @@ INT_PTR CALLBACK CheatsListBox_Proc(HWND dialog, UINT msg,WPARAM wparam,LPARAM l cheatXXtype = 1; cheatXXaction = 1; // 1 = edit - if (DialogBox(hAppInst, MAKEINTRESOURCE(IDD_CHEAT_ADD_XX_CODE), dialog, (DLGPROC) CheatsAdd_XX_Proc)) + if (DialogBoxW(hAppInst, MAKEINTRESOURCEW(IDD_CHEAT_ADD_XX_CODE), dialog, (DLGPROC) CheatsAdd_XX_Proc)) { cheatsGet(&tempCheat, cheatEditPos); if (tempCheat.enabled) @@ -907,7 +907,7 @@ void CheatsListDialog(HWND hwnd) { if (!cheatsPush()) return; memset(&tempCheat, 0, sizeof(CHEATS_LIST)); - u32 res=DialogBox(hAppInst, MAKEINTRESOURCE(IDD_CHEAT_LIST), hwnd, (DLGPROC) CheatsListBox_Proc); + u32 res=DialogBoxW(hAppInst, MAKEINTRESOURCEW(IDD_CHEAT_LIST), hwnd, (DLGPROC) CheatsListBox_Proc); if (res) { cheatsSave(); @@ -1102,7 +1102,7 @@ INT_PTR CALLBACK CheatsSearchViewWnd(HWND dialog, UINT msg,WPARAM wparam,LPARAM searchAddValue = atol(buf); searchAddMode = 1; searchAddSize = searchSize; - DialogBox(hAppInst, MAKEINTRESOURCE(IDD_CHEAT_ADD), dialog, (DLGPROC) CheatsAddProc); + DialogBoxW(hAppInst, MAKEINTRESOURCEW(IDD_CHEAT_ADD), dialog, (DLGPROC) CheatsAddProc); } return TRUE; } @@ -1187,7 +1187,7 @@ INT_PTR CALLBACK CheatsSearchProc(HWND dialog, UINT msg,WPARAM wparam,LPARAM lpa hBView = GetDlgItem(dialog, IDC_BVIEW); hBSearch = GetDlgItem(dialog, IDC_BSEARCH); - searchWnd=CreateDialog(hAppInst, MAKEINTRESOURCE(searchIDDs[searchType][searchStep]), + searchWnd=CreateDialogW(hAppInst, MAKEINTRESOURCEW(searchIDDs[searchType][searchStep]), dialog, (DLGPROC)CheatsSearchSubWnds[searchType][searchStep]); return TRUE; } @@ -1203,7 +1203,7 @@ INT_PTR CALLBACK CheatsSearchProc(HWND dialog, UINT msg,WPARAM wparam,LPARAM lpa return TRUE; case IDC_BVIEW: - DialogBox(hAppInst, MAKEINTRESOURCE(IDD_CHEAT_SEARCH_VIEW), dialog, (DLGPROC)CheatsSearchViewWnd); + DialogBoxW(hAppInst, MAKEINTRESOURCEW(IDD_CHEAT_SEARCH_VIEW), dialog, (DLGPROC)CheatsSearchViewWnd); return TRUE; case IDC_BSEARCH: @@ -1222,7 +1222,7 @@ INT_PTR CALLBACK CheatsSearchProc(HWND dialog, UINT msg,WPARAM wparam,LPARAM lpa searchStep++; if (searchWnd) DestroyWindow(searchWnd); - searchWnd=CreateDialog(hAppInst, MAKEINTRESOURCE(searchIDDs[searchType][searchStep]), + searchWnd=CreateDialogW(hAppInst, MAKEINTRESOURCEW(searchIDDs[searchType][searchStep]), dialog, (DLGPROC)CheatsSearchSubWnds[searchType][searchStep]); if (searchType == 0) { @@ -1240,7 +1240,7 @@ INT_PTR CALLBACK CheatsSearchProc(HWND dialog, UINT msg,WPARAM wparam,LPARAM lpa searchStep = 0; searchNumberResults = 0; if (searchWnd) DestroyWindow(searchWnd); - searchWnd=CreateDialog(hAppInst, MAKEINTRESOURCE(searchIDDs[searchType][searchStep]), + searchWnd=CreateDialogW(hAppInst, MAKEINTRESOURCEW(searchIDDs[searchType][searchStep]), dialog, (DLGPROC)CheatsSearchSubWnds[searchType][searchStep]); return TRUE; } @@ -1252,7 +1252,7 @@ INT_PTR CALLBACK CheatsSearchProc(HWND dialog, UINT msg,WPARAM wparam,LPARAM lpa void CheatsSearchDialog(HWND hwnd) { - DialogBox(hAppInst, MAKEINTRESOURCE(IDD_CHEAT_SEARCH), hwnd, (DLGPROC) CheatsSearchProc); + DialogBoxW(hAppInst, MAKEINTRESOURCEW(IDD_CHEAT_SEARCH), hwnd, (DLGPROC) CheatsSearchProc); } void CheatsSearchReset() diff --git a/desmume/src/windows/gbaslot_config.cpp b/desmume/src/windows/gbaslot_config.cpp index c1165d373..f52ef9bef 100644 --- a/desmume/src/windows/gbaslot_config.cpp +++ b/desmume/src/windows/gbaslot_config.cpp @@ -379,7 +379,7 @@ BOOL CALLBACK GbaSlotBox_Proc(HWND dialog, UINT msg,WPARAM wparam,LPARAM lparam) SetWindowText(GetDlgItem(dialog, IDC_ADDONS_INFO), (char *)tmp_info); _OKbutton = false; - wndConfig=CreateDialog(hAppInst, MAKEINTRESOURCE(GBAslot_IDDs[temp_type]), + wndConfig=CreateDialogW(hAppInst, MAKEINTRESOURCEW(GBAslot_IDDs[temp_type]), dialog, (DLGPROC)GBAslot_Procs[temp_type]); if ( (temp_type == 0) || (_OKbutton) ) EnableWindow(OKbutton, TRUE); @@ -421,8 +421,8 @@ BOOL CALLBACK GbaSlotBox_Proc(HWND dialog, UINT msg,WPARAM wparam,LPARAM lparam) { if (wndConfig) DestroyWindow(wndConfig); _OKbutton = false; - wndConfig=CreateDialog(hAppInst, - MAKEINTRESOURCE(GBAslot_IDDs[temp_type]), dialog, + wndConfig=CreateDialogW(hAppInst, + MAKEINTRESOURCEW(GBAslot_IDDs[temp_type]), dialog, (DLGPROC)GBAslot_Procs[temp_type]); if ( (temp_type == 0) || (_OKbutton) ) EnableWindow(OKbutton, TRUE); @@ -453,7 +453,7 @@ void GBAslotDialog(HWND hwnd) tmp_CFlashMode = CFlash_Mode; _OKbutton = false; needReset = true; - u32 res=DialogBox(hAppInst, MAKEINTRESOURCE(IDD_GBASLOT), hwnd, (DLGPROC) GbaSlotBox_Proc); + u32 res=DialogBoxW(hAppInst, MAKEINTRESOURCEW(IDD_GBASLOT), hwnd, (DLGPROC) GbaSlotBox_Proc); if (res) { switch (temp_type) diff --git a/desmume/src/windows/ginfo.cpp b/desmume/src/windows/ginfo.cpp index 121a24d91..916b8e3e1 100644 --- a/desmume/src/windows/ginfo.cpp +++ b/desmume/src/windows/ginfo.cpp @@ -63,7 +63,7 @@ BOOL GInfo_DlgOpen(HWND hParentWnd) { HWND hDlg; - hDlg = CreateDialog(hAppInst, MAKEINTRESOURCE(IDD_GAME_INFO), hParentWnd, GInfo_DlgProc); + hDlg = CreateDialogW(hAppInst, MAKEINTRESOURCEW(IDD_GAME_INFO), hParentWnd, GInfo_DlgProc); if(hDlg == NULL) return 0; diff --git a/desmume/src/windows/inputdx.cpp b/desmume/src/windows/inputdx.cpp index 916cd04b7..d4788ba68 100644 --- a/desmume/src/windows/inputdx.cpp +++ b/desmume/src/windows/inputdx.cpp @@ -2711,12 +2711,12 @@ switch(msg) void RunInputConfig() { - DialogBox(hAppInst, MAKEINTRESOURCE(IDD_INPUTCONFIG), MainWindow->getHWnd(), DlgInputConfig); + DialogBoxW(hAppInst, MAKEINTRESOURCEW(IDD_INPUTCONFIG), MainWindow->getHWnd(), DlgInputConfig); } void RunHotkeyConfig() { - DialogBox(hAppInst, MAKEINTRESOURCE(IDD_KEYCUSTOM), MainWindow->getHWnd(), DlgHotkeyConfig); + DialogBoxW(hAppInst, MAKEINTRESOURCEW(IDD_KEYCUSTOM), MainWindow->getHWnd(), DlgHotkeyConfig); } diff --git a/desmume/src/windows/main.cpp b/desmume/src/windows/main.cpp index 7727d7d72..43e3b8f60 100644 --- a/desmume/src/windows/main.cpp +++ b/desmume/src/windows/main.cpp @@ -1864,10 +1864,10 @@ joinThread_gdb( void *thread_handle) { int MenuInit() { - mainMenu = LoadMenu(hAppInst, "MENU_PRINCIPAL"); //Load Menu, and store handle + mainMenu = LoadMenu(hAppInst, MAKEINTRESOURCE(MENU_PRINCIPAL)); //Load Menu, and store handle if (!MainWindow->setMenu(mainMenu)) return 0; - recentromsmenu = LoadMenu(hAppInst, "RECENTROMS"); + recentromsmenu = LoadMenu(hAppInst, MAKEINTRESOURCE(RECENTROMS)); GetRecentRoms(); ResetSaveStateTimes(); @@ -2202,7 +2202,7 @@ int _main() WIN_InstallCFlash(); ColorCtrl_Register(); - if (!RegWndClass("DeSmuME", WindowProcedure, CS_DBLCLKS, LoadIcon(hAppInst, "ICONDESMUME"))) + if (!RegWndClass("DeSmuME", WindowProcedure, CS_DBLCLKS, LoadIcon(hAppInst, MAKEINTRESOURCE(ICONDESMUME)))) { MessageBox(NULL, "Error registering windows class", "DeSmuME", MB_OK); exit(-1); @@ -3416,25 +3416,25 @@ void RunConfig(CONFIGSCREEN which) RunHotkeyConfig(); break; case CONFIGSCREEN_FIRMWARE: - DialogBox(hAppInst,MAKEINTRESOURCE(IDD_FIRMSETTINGS), hwnd, (DLGPROC) FirmConfig_Proc); + DialogBoxW(hAppInst,MAKEINTRESOURCEW(IDD_FIRMSETTINGS), hwnd, (DLGPROC) FirmConfig_Proc); break; case CONFIGSCREEN_SOUND: - DialogBox(hAppInst, MAKEINTRESOURCE(IDD_SOUNDSETTINGS), hwnd, (DLGPROC)SoundSettingsDlgProc); + DialogBoxW(hAppInst, MAKEINTRESOURCEW(IDD_SOUNDSETTINGS), hwnd, (DLGPROC)SoundSettingsDlgProc); break; case CONFIGSCREEN_EMULATION: - DialogBox(hAppInst, MAKEINTRESOURCE(IDD_EMULATIONSETTINGS), hwnd, (DLGPROC)EmulationSettingsDlgProc); + DialogBoxW(hAppInst, MAKEINTRESOURCEW(IDD_EMULATIONSETTINGS), hwnd, (DLGPROC)EmulationSettingsDlgProc); break; case CONFIGSCREEN_MICROPHONE: - DialogBox(hAppInst, MAKEINTRESOURCE(IDD_MICROPHONE), hwnd, (DLGPROC)MicrophoneSettingsDlgProc); + DialogBoxW(hAppInst, MAKEINTRESOURCEW(IDD_MICROPHONE), hwnd, (DLGPROC)MicrophoneSettingsDlgProc); break; case CONFIGSCREEN_PATHSETTINGS: - DialogBox(hAppInst, MAKEINTRESOURCE(IDD_PATHSETTINGS), hwnd, (DLGPROC)PathSettingsDlgProc); + DialogBoxW(hAppInst, MAKEINTRESOURCEW(IDD_PATHSETTINGS), hwnd, (DLGPROC)PathSettingsDlgProc); break; case CONFIGSCREEN_WIFI: #ifdef EXPERIMENTAL_WIFI_COMM if(wifi_netEnabled) { - DialogBox(hAppInst,MAKEINTRESOURCE(IDD_WIFISETTINGS), hwnd, (DLGPROC) WifiSettingsDlgProc); + DialogBoxW(hAppInst,MAKEINTRESOURCEW(IDD_WIFISETTINGS), hwnd, (DLGPROC) WifiSettingsDlgProc); } else { @@ -3480,18 +3480,18 @@ LRESULT CALLBACK WindowProcedure (HWND hwnd, UINT message, WPARAM wParam, LPARAM { SPU_Pause(1); - MENUITEMINFO mii; - TCHAR menuItemString[256]; - ZeroMemory(&mii, sizeof(MENUITEMINFO)); + MENUITEMINFOW mii; + WCHAR menuItemString[256]; + ZeroMemory(&mii, sizeof(MENUITEMINFOW)); //Check if AVI is recording - mii.cbSize = sizeof(MENUITEMINFO); + mii.cbSize = sizeof(MENUITEMINFOW); mii.fMask = MIIM_STRING; - LoadString(hAppInst, !AVI_IsRecording() ? IDM_FILE_RECORDAVI : IDM_FILE_STOPAVI, menuItemString, 256); + LoadStringW(hAppInst, !AVI_IsRecording() ? IDM_FILE_RECORDAVI : IDM_FILE_STOPAVI, menuItemString, 256); mii.dwTypeData = menuItemString; - SetMenuItemInfo(mainMenu, IDM_FILE_RECORDAVI, FALSE, &mii); + SetMenuItemInfoW(mainMenu, IDM_FILE_RECORDAVI, FALSE, &mii); //Check if WAV is recording - LoadString(hAppInst, !WAV_IsRecording() ? IDM_FILE_RECORDWAV : IDM_FILE_STOPWAV, menuItemString, 256); - SetMenuItemInfo(mainMenu, IDM_FILE_RECORDWAV, FALSE, &mii); + LoadStringW(hAppInst, !WAV_IsRecording() ? IDM_FILE_RECORDWAV : IDM_FILE_STOPWAV, menuItemString, 256); + SetMenuItemInfoW(mainMenu, IDM_FILE_RECORDWAV, FALSE, &mii); //Menu items dependent on a ROM loaded DesEnableMenuItem(mainMenu, IDM_GAME_INFO, romloaded); @@ -3968,7 +3968,7 @@ LRESULT CALLBACK WindowProcedure (HWND hwnd, UINT message, WPARAM wParam, LPARAM HWND IsScriptFileOpen(const char* Path); if(!IsScriptFileOpen(temp)) { - HWND hDlg = CreateDialog(hAppInst, MAKEINTRESOURCE(IDD_LUA), MainWindow->getHWnd(), (DLGPROC) LuaScriptProc); + HWND hDlg = CreateDialogW(hAppInst, MAKEINTRESOURCEW(IDD_LUA), MainWindow->getHWnd(), (DLGPROC) LuaScriptProc); SendDlgItemMessage(hDlg,IDC_EDIT_LUAPATH,WM_SETTEXT,0,(LPARAM)temp); } } @@ -4084,7 +4084,7 @@ LRESULT CALLBACK WindowProcedure (HWND hwnd, UINT message, WPARAM wParam, LPARAM HWND IsScriptFileOpen(const char* Path); if(!IsScriptFileOpen(temp)) { - HWND hDlg = CreateDialog(hAppInst, MAKEINTRESOURCE(IDD_LUA), MainWindow->getHWnd(), (DLGPROC) LuaScriptProc); + HWND hDlg = CreateDialogW(hAppInst, MAKEINTRESOURCEW(IDD_LUA), MainWindow->getHWnd(), (DLGPROC) LuaScriptProc); SendDlgItemMessage(hDlg,IDC_EDIT_LUAPATH,WM_SETTEXT,0,(LPARAM)temp); } } @@ -4450,7 +4450,7 @@ LRESULT CALLBACK WindowProcedure (HWND hwnd, UINT message, WPARAM wParam, LPARAM case IDM_GAME_INFO: { - //CreateDialog(hAppInst, MAKEINTRESOURCE(IDD_GAME_INFO), hwnd, GinfoView_Proc); + //CreateDialogW(hAppInst, MAKEINTRESOURCEW(IDD_GAME_INFO), hwnd, GinfoView_Proc); GInfo_DlgOpen(hwnd); } return 0; @@ -4469,7 +4469,7 @@ LRESULT CALLBACK WindowProcedure (HWND hwnd, UINT message, WPARAM wParam, LPARAM return 0; case IDM_IOREG: //ViewRegisters->open(); - if (!RegWndClass("DeSmuME_IORegView", IORegView_Proc, CS_DBLCLKS, LoadIcon(hAppInst, "ICONDESMUME"), sizeof(CIORegView*))) + if (!RegWndClass("DeSmuME_IORegView", IORegView_Proc, CS_DBLCLKS, LoadIcon(hAppInst, MAKEINTRESOURCE(ICONDESMUME)), sizeof(CIORegView*))) return 0; OpenToolWindow(new CIORegView()); @@ -4768,7 +4768,7 @@ LRESULT CALLBACK WindowProcedure (HWND hwnd, UINT message, WPARAM wParam, LPARAM NDS_Pause(); } - DialogBox(hAppInst, MAKEINTRESOURCE(IDD_3DSETTINGS), hwnd, (DLGPROC)GFX3DSettingsDlgProc); + DialogBoxW(hAppInst, MAKEINTRESOURCEW(IDD_3DSETTINGS), hwnd, (DLGPROC)GFX3DSettingsDlgProc); if(tpaused) NDS_UnPause(); } @@ -4801,7 +4801,7 @@ LRESULT CALLBACK WindowProcedure (HWND hwnd, UINT message, WPARAM wParam, LPARAM return 0; case IDC_NEW_LUA_SCRIPT: if(LuaScriptHWnds.size() < 16) - CreateDialog(hAppInst, MAKEINTRESOURCE(IDD_LUA), MainWindow->getHWnd(), (DLGPROC) LuaScriptProc); + CreateDialogW(hAppInst, MAKEINTRESOURCEW(IDD_LUA), MainWindow->getHWnd(), (DLGPROC) LuaScriptProc); break; case IDC_CLOSE_LUA_SCRIPTS: for(int i=(int)LuaScriptHWnds.size()-1; i>=0; i--) @@ -4885,7 +4885,7 @@ LRESULT CALLBACK WindowProcedure (HWND hwnd, UINT message, WPARAM wParam, LPARAM tpaused=true; NDS_Pause(); } - DialogBox(hAppInst,MAKEINTRESOURCE(IDD_ABOUT_BOX), hwnd, (DLGPROC) AboutBox_Proc); + DialogBoxW(hAppInst,MAKEINTRESOURCEW(IDD_ABOUT_BOX), hwnd, (DLGPROC) AboutBox_Proc); if (tpaused) NDS_UnPause(); @@ -5761,7 +5761,7 @@ const char* OpenLuaScript(const char* filename, const char* extraDirToCheck, boo { HWND prevWindow = GetActiveWindow(); - HWND hDlg = CreateDialog(hAppInst, MAKEINTRESOURCE(IDD_LUA), MainWindow->getHWnd(), (DLGPROC) LuaScriptProc); + HWND hDlg = CreateDialogW(hAppInst, MAKEINTRESOURCEW(IDD_LUA), MainWindow->getHWnd(), (DLGPROC) LuaScriptProc); SendMessage(hDlg,WM_COMMAND,IDC_NOTIFY_SUBSERVIENT,TRUE); SendDlgItemMessage(hDlg,IDC_EDIT_LUAPATH,WM_SETTEXT,0,(LPARAM)filename); diff --git a/desmume/src/windows/pathsettings.cpp b/desmume/src/windows/pathsettings.cpp index be6250282..5cb8241b2 100644 --- a/desmume/src/windows/pathsettings.cpp +++ b/desmume/src/windows/pathsettings.cpp @@ -76,8 +76,8 @@ BOOL PathSettings_OnInitDialog(HWND hDlg, HWND hwndFocus, LPARAM lParam) hwnd = GetDlgItem(hDlg, IDC_FORMATEDIT); Edit_LimitText(hwnd, MAX_FORMAT); - HWND toolTip = CreateWindowEx(NULL, - TOOLTIPS_CLASS, NULL, + HWND toolTip = CreateWindowExW(NULL, + TOOLTIPS_CLASSW, NULL, TTS_ALWAYSTIP, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, diff --git a/desmume/src/windows/ramwatch.cpp b/desmume/src/windows/ramwatch.cpp index 341081f21..7e5b973df 100644 --- a/desmume/src/windows/ramwatch.cpp +++ b/desmume/src/windows/ramwatch.cpp @@ -164,7 +164,7 @@ bool InsertWatch(const AddressWatcher& Watch, HWND parent) rswatches[WatchCount] = Watch; rswatches[WatchCount].CurValue = GetCurrentValue(rswatches[WatchCount]); - DialogBox(hAppInst, MAKEINTRESOURCE(IDD_PROMPT), parent, (DLGPROC) PromptWatchNameProc); + DialogBoxW(hAppInst, MAKEINTRESOURCEW(IDD_PROMPT), parent, (DLGPROC) PromptWatchNameProc); return WatchCount > prevWatchCount; } diff --git a/desmume/src/windows/replay.cpp b/desmume/src/windows/replay.cpp index f1f4c96c1..df141bdd8 100644 --- a/desmume/src/windows/replay.cpp +++ b/desmume/src/windows/replay.cpp @@ -371,7 +371,7 @@ static INT_PTR CALLBACK RecordDialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, //Show the play movie dialog and play a movie void Replay_LoadMovie() { - char* fn = (char*)DialogBoxParam(hAppInst, "IDD_REPLAYINP", MainWindow->getHWnd(), ReplayDialogProc, false); + char* fn = (char*)DialogBoxParamW(hAppInst, MAKEINTRESOURCEW(IDD_REPLAYINP), MainWindow->getHWnd(), ReplayDialogProc, false); if(fn) { @@ -384,5 +384,5 @@ void Replay_LoadMovie() //Show the record movie dialog and record a movie. void MovieRecordTo() { - DialogBoxParam(hAppInst, MAKEINTRESOURCE(IDD_RECORDMOVIE), MainWindow->getHWnd(), RecordDialogProc, (LPARAM)0); + DialogBoxParamW(hAppInst, MAKEINTRESOURCEW(IDD_RECORDMOVIE), MainWindow->getHWnd(), RecordDialogProc, (LPARAM)0); } diff --git a/desmume/src/windows/resource.h b/desmume/src/windows/resource.h index 2fe63afb0..ae84ee9ac 100644 --- a/desmume/src/windows/resource.h +++ b/desmume/src/windows/resource.h @@ -603,6 +603,12 @@ #define IDC_SOUND5MUTE 2006 #define IDC_SOUND6MUTE 2007 #define IDC_SOUND7MUTE 2008 +#define ICONDESMUME 2009 +#define IDD_REPLAYINP 2010 +#define IDD_REPLAY_METADATA 2011 +#define MENU_PRINCIPAL 2012 +#define RAMWATCH_MENU 2013 +#define RECENTROMS 2014 #define IDC_GI_FATOFS 4464 #define IDC_INTERPOLATECOLOR 4464 #define IDC_GI_FATSIZE 4465 @@ -687,6 +693,7 @@ #define ID_LCDS_SUBGPU 40061 #define IDM_CHEATS_DISABLE 40062 #define IDM_CHEATS_SEARCH 40063 +#define ID_RAMSEARCH_CAPTIONTEXT 40064 #define IDC_LABEL_UP 50000 #define IDC_LABEL_RIGHT 50001 #define IDC_LABEL_LEFT 50002 diff --git a/desmume/src/windows/resources.rc b/desmume/src/windows/resources.rc index 9babf3c5d60cbb8b44c3243e917eb35d2f324b00..7c0e3d6e90e1eb2ed08297de3c261484de9d3c58 100644 GIT binary patch delta 274 zcmdnA(5!EfSwjos7ABMB)6+OOtfntn&LlM5p_55OIhetf!I2?|!I{B>As$FNG6XP$ zFnBWfGxz~%SB40NkjcCj;_cg(GXXI(5VHU=D-g47-?p5+Dq(sLJBQTt29T+D*g1Hn z`*bpK5M%1}`+hu%(}BinO#kM|YO?*q87?oz_5>~tAm#*OE+FOxVxH{@T)aI^aBEbi RC-m}4k!#oXMZLTN%mCUwOIrW{ delta 133 zcmeBMWVUIcSwjos7ABMBlgkA7rfV!?a+>bY%d0RwZ#k3D^lQDm8tvbfGXXI(5VHU= zD-g47|F)bxC;>%>%5;yp>_XEo_44Yp%W!f4F((jn0Wmia^K6&l