From: Toni Wilen Date: Mon, 28 Jun 2010 17:06:49 +0000 (+0300) Subject: 2200 final X-Git-Tag: 2200^0 X-Git-Url: https://git.unchartedbackwaters.co.uk/w/?a=commitdiff_plain;h=9c9127cd8173c28b02615ab9dbe1480fa3ee3315;p=francis%2Fwinuae.git 2200 final --- diff --git a/od-win32/scaler.cpp b/od-win32/scaler.cpp index 0bc947f6..9fa3b0e7 100644 --- a/od-win32/scaler.cpp +++ b/od-win32/scaler.cpp @@ -17,12 +17,12 @@ extern int cpu_mmx; -extern "C" -{ - #include "sysconfig.h" #include "sysdeps.h" +extern "C" +{ + #include "gfxfilter.h" static uint32 colorMask; diff --git a/od-win32/uaeunp/uaeunp.vcxproj b/od-win32/uaeunp/uaeunp.vcxproj index 2c602b1f..b62f017d 100644 --- a/od-win32/uaeunp/uaeunp.vcxproj +++ b/od-win32/uaeunp/uaeunp.vcxproj @@ -82,7 +82,7 @@ ProgramDatabase StdCall true - false + Sync false diff --git a/od-win32/win32gui.cpp b/od-win32/win32gui.cpp index 996afe59..b3487bc7 100644 --- a/od-win32/win32gui.cpp +++ b/od-win32/win32gui.cpp @@ -99,7 +99,7 @@ #define CONFIG_HOST L"Host" #define CONFIG_HARDWARE L"Hardware" -static TCHAR szNone[MAX_DPATH]; +static wstring szNone; static int allow_quit; static int restart_requested; @@ -129,6 +129,15 @@ static TCHAR stored_path[MAX_DPATH]; #define Error(x) MessageBox (NULL, (x), L"WinUAE Error", MB_OK) +wstring WIN32GUI_LoadUIString (DWORD id) +{ + wchar_t tmp[MAX_DPATH]; + tmp[0] = 0; + if (LoadString (hUIDLL ? hUIDLL : hInst, id, tmp, MAX_DPATH) == 0) + LoadString (hInst, id, tmp, MAX_DPATH); + return wstring(tmp); +} + void WIN32GUI_LoadUIString (DWORD id, TCHAR *string, DWORD dwStringLen) { if (LoadString (hUIDLL ? hUIDLL : hInst, id, string, dwStringLen) == 0) @@ -2447,7 +2456,7 @@ static BOOL CreateHardFile (HWND hDlg, UINT hfsizem, TCHAR *dostype, TCHAR *newp } static const TCHAR *memsize_names[] = { - /* 0 */ szNone, + /* 0 */ szNone.c_str(), /* 1 */ L"256 K", /* 2 */ L"512 K", /* 3 */ L"1 MB", @@ -10555,7 +10564,7 @@ static void init_portsdlg (HWND hDlg) } SendDlgItemMessage (hDlg, IDC_DONGLELIST, CB_RESETCONTENT, 0, 0L); - SendDlgItemMessage (hDlg, IDC_DONGLELIST, CB_ADDSTRING, 0, (LPARAM)szNone); + SendDlgItemMessage (hDlg, IDC_DONGLELIST, CB_ADDSTRING, 0, (LPARAM)szNone.c_str()); SendDlgItemMessage (hDlg, IDC_DONGLELIST, CB_ADDSTRING, 0, (LPARAM)L"Robocop 3"); SendDlgItemMessage (hDlg, IDC_DONGLELIST, CB_ADDSTRING, 0, (LPARAM)L"Leaderboard"); SendDlgItemMessage (hDlg, IDC_DONGLELIST, CB_ADDSTRING, 0, (LPARAM)L"B.A.T. II"); @@ -10566,7 +10575,7 @@ static void init_portsdlg (HWND hDlg) SendDlgItemMessage (hDlg, IDC_DONGLELIST, CB_ADDSTRING, 0, (LPARAM)L"Leviathan"); SendDlgItemMessage (hDlg, IDC_SERIAL, CB_RESETCONTENT, 0, 0L); - SendDlgItemMessage (hDlg, IDC_SERIAL, CB_ADDSTRING, 0, (LPARAM)szNone); + SendDlgItemMessage (hDlg, IDC_SERIAL, CB_ADDSTRING, 0, (LPARAM)szNone.c_str()); for (port = 0; port < MAX_SERIAL_PORTS && comports[port].name; port++) { SendDlgItemMessage (hDlg, IDC_SERIAL, CB_ADDSTRING, 0, (LPARAM)comports[port].name); } @@ -10586,7 +10595,7 @@ static void init_portsdlg (HWND hDlg) SendDlgItemMessage (hDlg, IDC_PRINTERTYPELIST, CB_ADDSTRING, 0, (LPARAM)tmp); SendDlgItemMessage (hDlg, IDC_SAMPLERLIST, CB_RESETCONTENT, 0, 0L); - SendDlgItemMessage (hDlg, IDC_SAMPLERLIST, CB_ADDSTRING, 0, (LPARAM)szNone); + SendDlgItemMessage (hDlg, IDC_SAMPLERLIST, CB_ADDSTRING, 0, (LPARAM)szNone.c_str()); enumerate_sound_devices (); for (int card = 0; record_devices[card].type; card++) { int type = record_devices[card].type; @@ -10599,7 +10608,7 @@ static void init_portsdlg (HWND hDlg) } SendDlgItemMessage (hDlg, IDC_PRINTERLIST, CB_RESETCONTENT, 0, 0L); - SendDlgItemMessage (hDlg, IDC_PRINTERLIST, CB_ADDSTRING, 0, (LPARAM)szNone); + SendDlgItemMessage (hDlg, IDC_PRINTERLIST, CB_ADDSTRING, 0, (LPARAM)szNone.c_str()); if(!pInfo) { int flags = PRINTER_ENUM_LOCAL | PRINTER_ENUM_CONNECTIONS; DWORD needed = 0; @@ -10636,7 +10645,7 @@ static void init_portsdlg (HWND hDlg) } SendDlgItemMessage (hDlg, IDC_MIDIOUTLIST, CB_RESETCONTENT, 0, 0L); - SendDlgItemMessage (hDlg, IDC_MIDIOUTLIST, CB_ADDSTRING, 0, (LPARAM)szNone); + SendDlgItemMessage (hDlg, IDC_MIDIOUTLIST, CB_ADDSTRING, 0, (LPARAM)szNone.c_str()); if ((numdevs = midiOutGetNumDevs ()) == 0) { ew (hDlg, IDC_MIDIOUTLIST, FALSE); } else { @@ -10983,7 +10992,7 @@ static void init_inputdlg_2 (HWND hDlg) int cnt, index, af, aftmp, port; SendDlgItemMessage (hDlg, IDC_INPUTAMIGA, CB_RESETCONTENT, 0, 0L); - SendDlgItemMessage (hDlg, IDC_INPUTAMIGA, CB_ADDSTRING, 0, (LPARAM)szNone); + SendDlgItemMessage (hDlg, IDC_INPUTAMIGA, CB_ADDSTRING, 0, (LPARAM)szNone.c_str()); WIN32GUI_LoadUIString (IDS_INPUT_CUSTOMEVENT, tmp1, MAX_DPATH); SendDlgItemMessage (hDlg, IDC_INPUTAMIGA, CB_ADDSTRING, 0, (LPARAM)tmp1); index = 0; af = 0; port = 0; @@ -13840,7 +13849,7 @@ static int GetSettings (int all_options, HWND hwnd) memset (&workprefs, 0, sizeof (struct uae_prefs)); default_prefs (&workprefs, 0); - WIN32GUI_LoadUIString (IDS_NONE, szNone, MAX_DPATH); + szNone = WIN32GUI_LoadUIString (IDS_NONE); prefs_to_gui (&changed_prefs); if (!init_called) { diff --git a/od-win32/winuae_msvc10/winuae_msvc.sln b/od-win32/winuae_msvc10/winuae_msvc.sln index 6622de73..3a6e7f0e 100644 --- a/od-win32/winuae_msvc10/winuae_msvc.sln +++ b/od-win32/winuae_msvc10/winuae_msvc.sln @@ -139,7 +139,6 @@ Global {98BA115B-829F-4085-9729-ABD0D779A60A}.FullRelease|Win32.Build.0 = Release|Win32 {98BA115B-829F-4085-9729-ABD0D779A60A}.FullRelease|x64.ActiveCfg = Release|Win32 {98BA115B-829F-4085-9729-ABD0D779A60A}.Release|Win32.ActiveCfg = Release|Win32 - {98BA115B-829F-4085-9729-ABD0D779A60A}.Release|Win32.Build.0 = Release|Win32 {98BA115B-829F-4085-9729-ABD0D779A60A}.Release|x64.ActiveCfg = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution diff --git a/od-win32/winuae_msvc10/winuae_msvc.vcxproj b/od-win32/winuae_msvc10/winuae_msvc.vcxproj index a604530f..ce36832f 100644 --- a/od-win32/winuae_msvc10/winuae_msvc.vcxproj +++ b/od-win32/winuae_msvc10/winuae_msvc.vcxproj @@ -131,8 +131,7 @@ false false false - - + Sync EnableFastChecks MultiThreadedDebug true @@ -256,7 +255,7 @@ ..\..\include;..\..;..\;..\resources;..\osdep;..\sounddep;..\..\prowizard\include;%(AdditionalIncludeDirectories) WINVER=0x0500;NDEBUG;_WIN32_IE=0x0700;WIN32;%(PreprocessorDefinitions) true - false + Sync Default MultiThreaded false @@ -330,7 +329,7 @@ ..\..\include;..\..;..\;..\resources;..\osdep;..\sounddep;%(AdditionalIncludeDirectories) WINVER=0x0500;NDEBUG;_WIN32_IE=0x0700;WIN32;WIN64;%(PreprocessorDefinitions) true - false + Sync Default MultiThreaded false @@ -400,8 +399,7 @@ ..\..\include;..\..;..\;..\resources;..\osdep;..\sounddep;..\..\prowizard\include;%(AdditionalIncludeDirectories) WINVER=0x0500;NDEBUG;_WIN32_IE=0x0700;WIN32;%(PreprocessorDefinitions) true - - + Sync Default MultiThreaded false @@ -474,8 +472,7 @@ ..\..\include;..\..;..\;..\resources;..\osdep;..\sounddep;%(AdditionalIncludeDirectories) WINVER=0x0500;NDEBUG;_WIN32_IE=0x0700;WIN32;WIN64;%(PreprocessorDefinitions) true - - + Sync Default MultiThreaded false diff --git a/od-win32/winuaechangelog.txt b/od-win32/winuaechangelog.txt index 4d244a17..e84fdfda 100644 --- a/od-win32/winuaechangelog.txt +++ b/od-win32/winuaechangelog.txt @@ -2,6 +2,8 @@ 2.2.0 Final - A3000 KS 2.04 ROM odd/even pair mismatched checksums fixed +- no registry or ini data, -datapath not used and winuae.exe in Program Files + (CSIDL_PROGRAM_FILES): set default paths to CSIDL_COMMON_DOCUMENTS Beta 12: (RC3)