2200 final

diff --git a/od-win32/scaler.cpp b/od-win32/scaler.cpp
index 0bc947f6e355c09d35e0e73e8d2ce672d10192b2..9fa3b0e7082db7bb0a5a69362a44b66dc3a91cd7 100644 (file)
--- 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 2c602b1f69bf94461e7fe8d659652ba135152d84..b62f017d3151b6395318ea9808d5cd575463a7c8 100644 (file)
--- a/od-win32/uaeunp/uaeunp.vcxproj
+++ b/od-win32/uaeunp/uaeunp.vcxproj
@@ -82,7 +82,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CallingConvention>StdCall</CallingConvention>
       <StringPooling>true</StringPooling>
-      <ExceptionHandling>false</ExceptionHandling>
+      <ExceptionHandling>Sync</ExceptionHandling>
       <BufferSecurityCheck>false</BufferSecurityCheck>
     </ClCompile>
     <Link>

diff --git a/od-win32/win32gui.cpp b/od-win32/win32gui.cpp
index 996afe59e4ab8cb69121087f7eca4dd714e5c6dd..b3487bc757ac00e2bc458a130a76773ba7a9119a 100644 (file)
--- 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 6622de73761999931ae4933386f6c8805241e506..3a6e7f0e99a05b510d71f940595d1f799caa7d44 100644 (file)
--- 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 a604530f68b8dd7b04982a6e1797e111c097a400..ce36832f9fee00a8622d8b9d467f610e95c97748 100644 (file)
--- a/od-win32/winuae_msvc10/winuae_msvc.vcxproj
+++ b/od-win32/winuae_msvc10/winuae_msvc.vcxproj
@@ -131,8 +131,7 @@
       <PreprocessToFile>false</PreprocessToFile>
       <PreprocessSuppressLineNumbers>false</PreprocessSuppressLineNumbers>
       <PreprocessKeepComments>false</PreprocessKeepComments>
-      <ExceptionHandling>
-      </ExceptionHandling>
+      <ExceptionHandling>Sync</ExceptionHandling>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <BufferSecurityCheck>true</BufferSecurityCheck>
@@ -256,7 +255,7 @@
       <AdditionalIncludeDirectories>..\..\include;..\..;..\;..\resources;..\osdep;..\sounddep;..\..\prowizard\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WINVER=0x0500;NDEBUG;_WIN32_IE=0x0700;WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
-      <ExceptionHandling>false</ExceptionHandling>
+      <ExceptionHandling>Sync</ExceptionHandling>
       <BasicRuntimeChecks>Default</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <BufferSecurityCheck>false</BufferSecurityCheck>
@@ -330,7 +329,7 @@
       <AdditionalIncludeDirectories>..\..\include;..\..;..\;..\resources;..\osdep;..\sounddep;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WINVER=0x0500;NDEBUG;_WIN32_IE=0x0700;WIN32;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
-      <ExceptionHandling>false</ExceptionHandling>
+      <ExceptionHandling>Sync</ExceptionHandling>
       <BasicRuntimeChecks>Default</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <BufferSecurityCheck>false</BufferSecurityCheck>
@@ -400,8 +399,7 @@
       <AdditionalIncludeDirectories>..\..\include;..\..;..\;..\resources;..\osdep;..\sounddep;..\..\prowizard\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WINVER=0x0500;NDEBUG;_WIN32_IE=0x0700;WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
+      <ExceptionHandling>Sync</ExceptionHandling>
       <BasicRuntimeChecks>Default</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <BufferSecurityCheck>false</BufferSecurityCheck>
@@ -474,8 +472,7 @@
       <AdditionalIncludeDirectories>..\..\include;..\..;..\;..\resources;..\osdep;..\sounddep;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WINVER=0x0500;NDEBUG;_WIN32_IE=0x0700;WIN32;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
+      <ExceptionHandling>Sync</ExceptionHandling>
       <BasicRuntimeChecks>Default</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <BufferSecurityCheck>false</BufferSecurityCheck>

diff --git a/od-win32/winuaechangelog.txt b/od-win32/winuaechangelog.txt
index 4d244a17f6b1b4bf6770fe11971a60b110c49f7c..e84fdfda10f61d64f4586d03da3b94794964a46a 100644 (file)
--- 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)