2400

diff --git a/inputdevice.cpp b/inputdevice.cpp
index 30e078de929562e287702bb5fe2b9d1b02a53afa..0623da09d7ab032d9af35c9c459f26ce79d6b190 100644 (file)
--- a/inputdevice.cpp
+++ b/inputdevice.cpp
@@ -5934,7 +5934,7 @@ void warpmode (int mode)
        }
        compute_vsynctime ();
 #ifdef RETROPLATFORM
-       rp_turbo (currprefs.turbo_emulation);
+       rp_turbo_cpu (currprefs.turbo_emulation);
 #endif
        changed_prefs.turbo_emulation = currprefs.turbo_emulation;
        config_changed = 1;

diff --git a/od-win32/parser.cpp b/od-win32/parser.cpp
index 05f07f90193c07b4e16e04943912bb82e8f9519a..e5cbb7fa2a02bfbf6b7dd5d9b87ffd9a1ea2967b 100644 (file)
--- a/od-win32/parser.cpp
+++ b/od-win32/parser.cpp
@@ -1541,8 +1541,11 @@ int enummidiports (void)
        write_log (L"MIDI port enumeration..\n");
        num = midiOutGetNumDevs ();
        for (i = 0; i < num + 1 && i < MAX_MIDI_PORTS - 1; i++) {
-               if (midiOutGetDevCaps (i - 1, &midiOutCaps, sizeof (midiOutCaps)) != MMSYSERR_NOERROR)
+               MMRESULT r = midiOutGetDevCaps (i - 1, &midiOutCaps, sizeof (midiOutCaps));
+               if (r != MMSYSERR_NOERROR) {
+                       num = i;
                        break;
+               }
                midioutportinfo[i] = xcalloc (struct midiportinfo, 1);
                midioutportinfo[i]->name = my_strdup (midiOutCaps.szPname);
                midioutportinfo[i]->devid = i - 1;
@@ -1562,8 +1565,10 @@ int enummidiports (void)
 
        num = midiInGetNumDevs ();
        for (i = 0; i < num && i < MAX_MIDI_PORTS - 1; i++) {
-               if (midiInGetDevCaps (i, &midiInCaps, sizeof (midiInCaps)) != MMSYSERR_NOERROR)
+               if (midiInGetDevCaps (i, &midiInCaps, sizeof (midiInCaps)) != MMSYSERR_NOERROR) {
+                       num = i;
                        break;
+               }
                midiinportinfo[i] = xcalloc (struct midiportinfo, 1);
                midiinportinfo[i]->name = my_strdup (midiInCaps.szPname);
                midiinportinfo[i]->devid = i;

diff --git a/od-win32/rp.cpp b/od-win32/rp.cpp
index d0405bbad78722b2c8c0829c29e4d0a8142581d3..cba5159ba192fa4816caadf76088012d6354e653 100644 (file)
--- a/od-win32/rp.cpp
+++ b/od-win32/rp.cpp
@@ -1002,7 +1002,8 @@ void rp_fixup_options (struct uae_prefs *p)
        }
 
        rp_update_volume (&currprefs);
-       rp_turbo (currprefs.turbo_emulation);
+       rp_turbo_cpu (currprefs.turbo_emulation);
+       rp_turbo_floppy (currprefs.floppy_speed == 0);
        for (i = 0; i <= 4; i++)
                rp_update_leds (i, 0, 0);
        config_changed = 1;
@@ -1262,7 +1263,7 @@ void rp_activate (int active, LPARAM lParam)
        RPSendMessagex (active ? RPIPCGM_ACTIVATED : RPIPCGM_DEACTIVATED, 0, lParam, NULL, 0, &guestinfo, NULL);
 }
 
-void rp_turbo (int active)
+void rp_turbo_cpu (int active)
 {
        if (!cando ())
                return;
@@ -1271,6 +1272,15 @@ void rp_turbo (int active)
        RPSendMessagex (RPIPCGM_TURBO, RP_TURBO_CPU, active ? RP_TURBO_CPU : 0, NULL, 0, &guestinfo, NULL);
 }
 
+void rp_turbo_floppy (int active)
+{
+       if (!cando ())
+               return;
+       if (recursive_device)
+               return;
+       RPSendMessagex (RPIPCGM_TURBO, RP_TURBO_FLOPPY, active ? RP_TURBO_FLOPPY : 0, NULL, 0, &guestinfo, NULL);
+}
+
 void rp_set_hwnd (HWND hWnd)
 {
        struct RPScreenMode sm = { 0 };

diff --git a/od-win32/rp.h b/od-win32/rp.h
index f961c494ea32951c9ca99312033c2d268efeac5f..9ff34bf8e0c1941452460bec2eff1687c3e4a819 100644 (file)
--- a/od-win32/rp.h
+++ b/od-win32/rp.h
@@ -7,7 +7,8 @@ extern void rp_pause (int paused);
 extern void rp_activate (int, LPARAM);
 extern void rp_mouse_capture (int);
 extern void rp_mouse_magic (int);
-extern void rp_turbo (int);
+extern void rp_turbo_cpu (int);
+extern void rp_turbo_floppy (int);
 extern void rp_set_hwnd (HWND);
 extern void rp_set_enabledisable (int);
 extern int rp_checkesc (int, uae_u8*, int, int);

diff --git a/od-win32/win32.cpp b/od-win32/win32.cpp
index 2777876d169f9a78db79503d7517282a25f2c205..e1abce6d1dd81a7c3ec4c7e6cc8552ec6eef8f63 100644 (file)
--- a/od-win32/win32.cpp
+++ b/od-win32/win32.cpp
@@ -5745,8 +5745,6 @@ void fpux_restore (int *v)
 #ifndef _WIN64
        if (v)
                _controlfp (*v, _MCW_IC | _MCW_RC | _MCW_PC);
-#else
-               _controlfp (fpucontrol, _MCW_IC | _MCW_RC | _MCW_PC);
 #endif
 }
 

diff --git a/od-win32/win32.h b/od-win32/win32.h
index d322d5baaffec7cc5de590450e7c41cea6a1b5ce..d57479ebe862f533780d3f5a6afc0ac30a458239 100644 (file)
--- a/od-win32/win32.h
+++ b/od-win32/win32.h
@@ -15,13 +15,13 @@
 #define GETBDM(x) (((x) - ((x / 10000) * 10000)) / 100)
 #define GETBDD(x) ((x) % 100)
 
-#define WINUAEPUBLICBETA 1
+#define WINUAEPUBLICBETA 0
 #define LANG_DLL 1
 
-//#define WINUAEBETA L""
-#define WINUAEBETA L"Beta 27"
-#define WINUAEDATE MAKEBD(2012, 3, 28)
-#define WINUAEEXTRA L"RC5"
+#define WINUAEBETA L""
+//#define WINUAEBETA L"Beta 0"
+#define WINUAEDATE MAKEBD(2012, 3, 29)
+#define WINUAEEXTRA L""
 //#define WINUAEEXTRA L"AmiKit Preview"
 #define WINUAEREV L""
 

diff --git a/od-win32/winuae_msvc10/winuae_msvc.vcxproj b/od-win32/winuae_msvc10/winuae_msvc.vcxproj
index 02d99b94877d6663b77bc0c86331c369aec9f21f..19d891951d2762588726907fefb8dccd8448c31d 100644 (file)
--- a/od-win32/winuae_msvc10/winuae_msvc.vcxproj
+++ b/od-win32/winuae_msvc10/winuae_msvc.vcxproj
@@ -197,8 +197,7 @@
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\include;..\..;..\;..\resources;..\osdep;..\sounddep;..\..\prowizard\include;..\tun;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WINVER=0x0500;_DEBUG;WIN32_IE=0x0700;WIN32;WIN64;_CRT_SECURE_NO_WARNINGS;D3D_DEBUG_INFO;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>
-      </ExceptionHandling>
+      <ExceptionHandling>Sync</ExceptionHandling>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <BufferSecurityCheck>true</BufferSecurityCheck>
@@ -220,7 +219,7 @@
       <Culture>0x0409</Culture>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>ws2_32.lib;ddraw.lib;dxguid.lib;winmm.lib;comctl32.lib;version.lib;vfw32.lib;msacm32.lib;dsound.lib;dinput8.lib;d3d9.lib;d3dx9.lib;setupapi.lib;wininet.lib;dxerr.lib;shlwapi.lib;zlibstat.lib;portaudio_x64.lib;packet.lib;wpcap.lib;openal32.lib;libpng.lib;lglcd.lib;wtsapi32.lib;wntab32x.lib;enet_x64.lib;prowizard_x64.lib;lzmalib.lib;avrt.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>ws2_32.lib;ddraw.lib;dxguid.lib;winmm.lib;comctl32.lib;version.lib;vfw32.lib;msacm32.lib;dsound.lib;dinput8.lib;d3d9.lib;d3dx9.lib;setupapi.lib;wininet.lib;dxerr.lib;shlwapi.lib;zlibstat.lib;portaudio_x64.lib;packet.lib;wpcap.lib;openal32.lib;libpng.lib;lglcd.lib;wtsapi32.lib;wntab32x.lib;enet_x64.lib;prowizard_x64.lib;lzmalib.lib;libFLAC_static.lib;avrt.lib;hid.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>

diff --git a/od-win32/winuaechangelog.txt b/od-win32/winuaechangelog.txt
index dde16d88fd7fb72b69f842d6eb766441561cf753..2fd64121dca8d26c6569c28e6e6317809e86c0fe 100644 (file)
--- a/od-win32/winuaechangelog.txt
+++ b/od-win32/winuaechangelog.txt
@@ -1,4 +1,6 @@
 
+2.4.0
+
 Beta 27: (RC5)
 
 - Saving directory filesystem statefile crashed (b23)