From 88d930ce82f37e4b66edac07f7be38c8be79ace9 Mon Sep 17 00:00:00 2001 From: zeromus Date: Sat, 15 Dec 2018 17:26:28 -0500 Subject: [PATCH] =?UTF-8?q?winport=20-=20fix=20loading=20files=20named=20t?= =?UTF-8?q?hings=20like=20Splook=C3=A9krong=20from=20commandline,=20fixes?= =?UTF-8?q?=20#238?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- desmume/src/frontend/windows/main.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/desmume/src/frontend/windows/main.cpp b/desmume/src/frontend/windows/main.cpp index 1843bac51..9e5643266 100755 --- a/desmume/src/frontend/windows/main.cpp +++ b/desmume/src/frontend/windows/main.cpp @@ -1880,6 +1880,15 @@ static void SyncGpuBpp() GPU->SetColorFormat(NDSColorFormat_BGR888_Rev); } +static BOOL OpenCoreSystemCP(const char* filename_syscp) +{ + wchar_t wgarbage[1024]; + char garbage[1024]; + MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, filename_syscp, -1, wgarbage, 1024); + int q = WideCharToMultiByte(CP_UTF8, 0, wgarbage, -1, garbage, 1024, NULL, NULL); + return OpenCore(garbage); +} + #define RENDERID_NULL_SAVED -1 #define GPU3D_DEFAULT GPU3D_SWRAST @@ -2482,7 +2491,7 @@ int _main() if (cmdline.nds_file != "") { - if(OpenCore(cmdline.nds_file.c_str())) + if(OpenCoreSystemCP(cmdline.nds_file.c_str())) { romloaded = TRUE; } @@ -3548,15 +3557,6 @@ void SaveWindowPos(HWND hwnd) WritePrivateProfileInt("Video", "WindowPosY", WndY/*MainWindowRect.top*/, IniName); } -static BOOL OpenCoreSystemCP(const char* filename_syscp) -{ - wchar_t wgarbage[1024]; - char garbage[1024]; - MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, filename_syscp, -1, wgarbage, 1024); - int q = WideCharToMultiByte(CP_UTF8, 0, wgarbage, -1, garbage, 1024, NULL, NULL); - return OpenCore(garbage); -} - //======================================================================================== LRESULT CALLBACK WindowProcedure (HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) {