2500

diff --git a/memory.cpp b/memory.cpp
index e893d288ed8bfc78057922814378e86b4bafdcd8..3cffe164c249d5ddadfe2ad3844ac8e8dc898c4a 100644 (file)
--- a/memory.cpp
+++ b/memory.cpp
@@ -2156,24 +2156,26 @@ static void allocate_memory (void)
        }
 
        if (allocated_bogomem != currprefs.bogomem_size) {
-               if (bogomemory_allocated)
-                       mapped_free (bogomemory);
-               bogomemory = 0;
-               bogomemory_allocated = 0;
-
-               allocated_bogomem = currprefs.bogomem_size;
-               if (allocated_bogomem >= 0x180000)
-                       allocated_bogomem = 0x200000;
-               bogomem_mask = allocated_bogomem - 1;
-
-               if (allocated_bogomem) {
-                       bogomemory = mapped_malloc (allocated_bogomem, _T("bogo"));
-                       if (bogomemory == 0) {
-                               write_log (_T("Out of memory for bogomem.\n"));
-                               allocated_bogomem = 0;
+               if (!(allocated_bogomem == 0x200000 && currprefs.bogomem_size == 0x180000)) {
+                       if (bogomemory_allocated)
+                               mapped_free (bogomemory);
+                       bogomemory = 0;
+                       bogomemory_allocated = 0;
+
+                       allocated_bogomem = currprefs.bogomem_size;
+                       if (allocated_bogomem >= 0x180000)
+                               allocated_bogomem = 0x200000;
+                       bogomem_mask = allocated_bogomem - 1;
+
+                       if (allocated_bogomem) {
+                               bogomemory = mapped_malloc (allocated_bogomem, _T("bogo"));
+                               if (bogomemory == 0) {
+                                       write_log (_T("Out of memory for bogomem.\n"));
+                                       allocated_bogomem = 0;
+                               }
                        }
+                       need_hardreset = true;
                }
-               need_hardreset = true;
        }
        if (allocated_a3000lmem != currprefs.mbresmem_low_size) {
                if (a3000lmemory)

diff --git a/od-win32/WinUAE_Install.nsi b/od-win32/WinUAE_Install.nsi
index 332505e624bd263c74a139e42ee5555f51051b61..cc90a830ec9592c719826acb2b61398f4caa8b42 100644 (file)
--- a/od-win32/WinUAE_Install.nsi
+++ b/od-win32/WinUAE_Install.nsi
@@ -1,5 +1,5 @@
 !define PRODUCT_NAME "WinUAE"
-!define PRODUCT_VERSION "2.4.1"
+!define PRODUCT_VERSION "2.5.0"
 !define PRODUCT_PUBLISHER "Arabuusimiehet"
 !define PRODUCT_WEB_SITE "http://www.winuae.net/"
 !define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\winuae.exe"
@@ -97,8 +97,8 @@ Section "Host-Configurations" secExConfig
   SetOutPath "$INSTDIR\Configurations\Host"
   SetOverwrite ifnewer
  ;-- Copy Example Host Configurations
-  File "${DISTPATH}\Configurations\Host\Fullscreen (640x480).uae"
   File "${DISTPATH}\Configurations\Host\Fullscreen (800x600).uae"
+  File "${DISTPATH}\Configurations\Host\Fullscreen PAL VSync.uae"
   File "${DISTPATH}\Configurations\Host\FullwindowD3D.uae"
   File "${DISTPATH}\Configurations\Host\Windowed.uae"
 SectionEnd
@@ -268,8 +268,8 @@ Section Uninstall
   Delete "$INSTDIR\Amiga Programs\sources\uae-configuration.c"
   Delete "$INSTDIR\Amiga Programs\sources\picasso96fix.lha"
   Delete "$INSTDIR\Amiga Programs\sources.zip"
-  Delete "$INSTDIR\Configurations\Host\Fullscreen (640x480).uae"
   Delete "$INSTDIR\Configurations\Host\Fullscreen (800x600).uae"
+  Delete "$INSTDIR\Configurations\Host\Fullscreen PAL VSync.uae"
   Delete "$INSTDIR\Configurations\Host\FullwindowD3D.uae"
   Delete "$INSTDIR\Configurations\Host\Windowed.uae"
   Delete "$INSTDIR\winuaebootlog.txt"

diff --git a/od-win32/win32.h b/od-win32/win32.h
index a8d106328fcb4ea85452941e1e46d31817c39083..b331fc1e4f88d0f2c7159222ac3362bd9cd4367a 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 _T("")
-#define WINUAEBETA _T("28")
-#define WINUAEDATE MAKEBD(2012, 11, 29)
-#define WINUAEEXTRA _T(" RC4")
+#define WINUAEBETA _T("")
+//#define WINUAEBETA _T("28")
+#define WINUAEDATE MAKEBD(2012, 12, 2)
+#define WINUAEEXTRA _T("")
 //#define WINUAEEXTRA _T("AmiKit Preview")
 #define WINUAEREV _T("")
 

diff --git a/od-win32/win32gui.cpp b/od-win32/win32gui.cpp
index ad5e428b145865a0e0d9bdc6db90dfa328df54d3..3eb224744ade3b770bff5f4744b1f837cb674845 100644 (file)
--- a/od-win32/win32gui.cpp
+++ b/od-win32/win32gui.cpp
@@ -8340,12 +8340,12 @@ static void enable_for_cpudlg (HWND hDlg)
        ew (hDlg, IDC_CPU_FREQUENCY, workprefs.cpu_cycle_exact);
        ew (hDlg, IDC_CPU_FREQUENCY2, workprefs.cpu_cycle_exact && !workprefs.cpu_clock_multiplier);
 
-       ew (hDlg, IDC_FPU1, TRUE);
-       ew (hDlg, IDC_FPU2, TRUE);
+       ew (hDlg, IDC_FPU1, workprefs.cpu_model < 68040);
+       ew (hDlg, IDC_FPU2, workprefs.cpu_model < 68040);
        ew (hDlg, IDC_FPU3, workprefs.cpu_model >= 68040);
        ew (hDlg, IDC_MMUENABLE, workprefs.cpu_model == 68040 && workprefs.cachesize == 0);
 
-       SendDlgItemMessage (hDlg, IDC_SPEED, TBM_SETRANGE, TRUE, workprefs.m68k_speed < 0 ? MAKELONG(-9, 0) : MAKELONG (-9, 50));
+       SendDlgItemMessage (hDlg, IDC_SPEED, TBM_SETRANGE, TRUE, workprefs.m68k_speed < 0 ? MAKELONG (-9, 0) : MAKELONG (-9, 50));
        SendDlgItemMessage (hDlg, IDC_SPEED, TBM_SETPAGESIZE, 0, 1);
 }