4010b1

diff --git a/include/options.h b/include/options.h
index b984f88f7f0f3bf1e9de62ba701e9c2c2f737e40..5f37e7a1faad969543a713d0e722378c406152ef 100644 (file)
--- a/include/options.h
+++ b/include/options.h
@@ -16,7 +16,7 @@
 
 #define UAEMAJOR 4
 #define UAEMINOR 0
-#define UAESUBREV 0
+#define UAESUBREV 1
 
 #define MAX_AMIGADISPLAYS 4
 

diff --git a/od-win32/resources/winuae.rc b/od-win32/resources/winuae.rc
index 69d8e110c3b15e0f0640289972ddebc4f36719a3..39b14f190fe8fa9b439383e026909098d05655c4 100644 (file)
--- a/od-win32/resources/winuae.rc
+++ b/od-win32/resources/winuae.rc
@@ -1375,8 +1375,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 4,0,0,0
- PRODUCTVERSION 4,0,0,0
+ FILEVERSION 4,0,1,0
+ PRODUCTVERSION 4,0,1,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -1392,12 +1392,12 @@ BEGIN
         BLOCK "040904b0"
         BEGIN
             VALUE "FileDescription", "WinUAE"
-            VALUE "FileVersion", "4.0.0.0"
+            VALUE "FileVersion", "4.0.1.0"
             VALUE "InternalName", "WinUAE"
             VALUE "LegalCopyright", "© 1996-2018 under the GNU Public License (GPL)"
             VALUE "OriginalFilename", "WinUAE.exe"
             VALUE "ProductName", "WinUAE"
-            VALUE "ProductVersion", "4.0.0.0"
+            VALUE "ProductVersion", "4.0.1.0"
         END
     END
     BLOCK "VarFileInfo"

diff --git a/od-win32/win32.h b/od-win32/win32.h
index b22789a256b01e107a6c02f1bd0173391b853ca2..d99403ad9a31a8ecc4abff96b8027dea8df8e02e 100644 (file)
--- a/od-win32/win32.h
+++ b/od-win32/win32.h
@@ -15,17 +15,17 @@
 #define GETBDM(x) (((x) - ((x / 10000) * 10000)) / 100)
 #define GETBDD(x) ((x) % 100)
 
-#define WINUAEPUBLICBETA 0
+#define WINUAEPUBLICBETA 1
 #define LANG_DLL 1
 #define LANG_DLL_FULL_VERSION_MATCH 1
 
 #if WINUAEPUBLICBETA
-#define WINUAEBETA _T("16")
+#define WINUAEBETA _T("1")
 #else
 #define WINUAEBETA _T("")
 #endif
 
-#define WINUAEDATE MAKEBD(2018, 6, 19)
+#define WINUAEDATE MAKEBD(2018, 6, 30)
 
 //#define WINUAEEXTRA _T("AmiKit Preview")
 //#define WINUAEEXTRA _T("Amiga Forever Edition")

diff --git a/od-win32/win32gui.cpp b/od-win32/win32gui.cpp
index 82ad115f646d13f51f36fedd35b855ca4f708ff5..e47eb975e2c78ea567ab611166212c1c78a269a5 100644 (file)
--- a/od-win32/win32gui.cpp
+++ b/od-win32/win32gui.cpp
@@ -2245,6 +2245,8 @@ static void flipgui(int opengui)
        if (opengui) {
                DirectDraw_FlipToGDISurface();
        } else {
+               if (uae_quit)
+                       return;
                full_redraw_all();
        }
 }
@@ -6868,7 +6870,9 @@ static void enable_for_displaydlg (HWND hDlg)
                ew(hDlg, IDC_SCREENMODE_NATIVE3, FALSE);
                hide(hDlg, IDC_SCREENMODE_NATIVE3, TRUE);
        }
-
+#ifdef WINUAEPUBLICBETA
+       hide(hDlg, IDC_DISPLAY_VARSYNC, FALSE);
+#endif
 }
 
 static void enable_for_chipsetdlg (HWND hDlg)
@@ -11857,7 +11861,8 @@ static void values_from_cpudlg (HWND hDlg)
 #ifdef JIT
        oldcache = workprefs.cachesize;
        jitena = (ischecked (hDlg, IDC_JITENABLE) ? 1 : 0) && !workprefs.address_space_24 && workprefs.cpu_model >= 68020;
-       workprefs.cachesize = 1024 << SendMessage (GetDlgItem (hDlg, IDC_CACHE), TBM_GETPOS, 0, 0);
+       idx = SendMessage (GetDlgItem (hDlg, IDC_CACHE), TBM_GETPOS, 0, 0);
+       workprefs.cachesize = 1024 << idx;
        if (workprefs.cachesize <= 1024)
                workprefs.cachesize = 0;
        else
@@ -12014,19 +12019,23 @@ static INT_PTR CALLBACK CPUDlgProc (HWND hDlg, UINT msg, WPARAM wParam, LPARAM l
        case WM_COMMAND:
                if (recursive > 0)
                        break;
-               recursive++;
-               values_from_cpudlg (hDlg);
-               enable_for_cpudlg (hDlg);
-               values_to_cpudlg (hDlg);
-               recursive--;
+               if (currentpage == CPU_ID) {
+                       recursive++;
+                       values_from_cpudlg(hDlg);
+                       enable_for_cpudlg(hDlg);
+                       values_to_cpudlg(hDlg);
+                       recursive--;
+               }
                break;
 
        case WM_HSCROLL:
-               recursive++;
-               values_from_cpudlg (hDlg);
-               enable_for_cpudlg ( hDlg);
-               values_to_cpudlg (hDlg);
-               recursive--;
+               if (currentpage == CPU_ID) {
+                       recursive++;
+                       values_from_cpudlg(hDlg);
+                       enable_for_cpudlg(hDlg);
+                       values_to_cpudlg(hDlg);
+                       recursive--;
+               }
                break;
        }
        return FALSE;

diff --git a/od-win32/winuaechangelog.txt b/od-win32/winuaechangelog.txt
index 10ebd2857f16485692808243b3af5543da441779..6d6a602015959ac7f917fbdb46f0b0f09479d03b 100644 (file)
--- a/od-win32/winuaechangelog.txt
+++ b/od-win32/winuaechangelog.txt
@@ -1,4 +1,31 @@
 \r
+Beta 1:\r
+\r
+4.0.0 bugs fixed:\r
+\r
+- 80-bit native FPU mode FREM and FMOD had parameters swapped in x86 code.\r
+- 64-bit FPU mode config mode was not loaded from config file.\r
+- "Minimize when focus is lost" could cause crashes.\r
+\r
+Older bugs:\r
+\r
+- "Minimize when focus is lost" incorrectly activated when switching modes in some situations. (same as above)\r
+- If CPU panel select menu was active and then some other panel was selected: JIT got switched off.\r
+- Don't abort with "tried to seek out of bounds" message when HDF/HD has virtual RDB and writing to too large offset.\r
+- When inserting previously connected USB device, previous device type (Gamepad, CD32 pad etc) and autofire type (if any) was not restored.\r
+- Do not copy data to Amiga side clipboard buffer if filesystem heartbeat signal is missing (=Some program took over the system), clipboard data can overwrite other program's data.\r
+- Directory filesystem/UAE HDF uses indirect mode if new debugger is active. (Indirect is needed for debugger to detect memory reads and writes)\r
+- "Minimize when focus is lost" minimized main emulation window when GUI was open and main window lost focus.\r
+- RTG Multithread mode display refreshing was unreliable in palette modes when palette changed.\r
+\r
+Other:\r
+\r
+- Resolve hardfile/directory path environmental variables only when needed, loading and saving config now keeps original unresolved variables.\r
+- Save also config file to crash dump file.\r
+- QuikPak XP board emulation, not yet fully implemented.\r
+- Added GVP v3.7, Blizzard 2060 v7.25 and QuikPak v2.1 to ROM scanner.\r
+\r
+\r
 4.0.0\r
 \r
 Beta 16:\r