4100b4

diff --git a/include/custom.h b/include/custom.h
index f9d2495096db66642fe6f2c5f44cda234452aec0..8f56347f1e082de0d80fef82a3c998c6d7e710fb 100644 (file)
--- a/include/custom.h
+++ b/include/custom.h
@@ -35,7 +35,6 @@ extern void custom_reset (bool hardreset, bool keyboardreset);
 extern int intlev (void);
 extern void dumpcustom (void);
 
-extern void do_disk (void);
 extern void do_copper (void);
 
 extern void notice_new_xcolors (void);
@@ -56,8 +55,6 @@ extern uae_u16 intena, intreq, intreqr;
 
 extern int vpos, lof_store;
 
-extern int find_copper_record (uaecptr, int *, int *);
-
 extern int n_frames;
 
 STATIC_INLINE int dmaen (unsigned int dmamask)

diff --git a/od-win32/win32.cpp b/od-win32/win32.cpp
index dbd14ab43893f7b8862a6ac6e0991e925da486b6..95575c58ae2e4d042b22744eced27ad93346012e 100644 (file)
--- a/od-win32/win32.cpp
+++ b/od-win32/win32.cpp
@@ -1043,6 +1043,7 @@ static void setmouseactive2(struct AmigaMonitor *mon, int active, bool allowpaus
                        }
                        setcursor(mon, -30000, -30000);
                }
+               wait_keyrelease();
                inputdevice_acquire(TRUE);
                setpriority (&priorities[currprefs.win32_active_capture_priority]);
                if (currprefs.win32_active_nocapture_pause) {
@@ -1891,7 +1892,8 @@ static LRESULT CALLBACK AmigaWindowProc(HWND hWnd, UINT message, WPARAM wParam,
                        // borderless = do not capture with single-click
                        if (ignorelbutton) {
                                ignorelbutton = 0;
-                               return 0;
+                               if (currprefs.win32_borderless)
+                                       return 0;
                        }
                        if (message == WM_LBUTTONDOWN && isfullscreen() == 0 && currprefs.win32_borderless && !rp_isactive()) {
                                // full-window drag

diff --git a/od-win32/win32.h b/od-win32/win32.h
index bab03a1b947ead5b6c657054906029118831d75c..c0a77010cfb81797d34b5c6471f851ceb3a9c244 100644 (file)
--- a/od-win32/win32.h
+++ b/od-win32/win32.h
@@ -20,12 +20,12 @@
 #define LANG_DLL_FULL_VERSION_MATCH 1
 
 #if WINUAEPUBLICBETA
-#define WINUAEBETA _T("3")
+#define WINUAEBETA _T("4")
 #else
 #define WINUAEBETA _T("")
 #endif
 
-#define WINUAEDATE MAKEBD(2018, 8, 29)
+#define WINUAEDATE MAKEBD(2018, 9, 9)
 
 //#define WINUAEEXTRA _T("AmiKit Preview")
 //#define WINUAEEXTRA _T("Amiga Forever Edition")

diff --git a/od-win32/win32gui.cpp b/od-win32/win32gui.cpp
index 93658c82cbc7d4bc82763805371331ca0a0484be..cb9902006a85280f8ef1263f23036e81037278bb 100644 (file)
--- a/od-win32/win32gui.cpp
+++ b/od-win32/win32gui.cpp
@@ -5719,10 +5719,10 @@ static LRESULT CALLBACK listviewtempproc(HWND hWnd, UINT iMessage, WPARAM wParam
 static struct ConfigStruct *refreshconfiglist(HWND hDlg, struct ConfigStruct *config)
 {
        HWND lv = GetDlgItem(hDlg, IDC_CONFIGTREE);
-       originallistviewtempproc = (WNDPROC)GetWindowLongPtr(lv, GWL_WNDPROC);
-       SetWindowLongPtr(lv, GWL_WNDPROC, (LONG_PTR)listviewtempproc);
+       originallistviewtempproc = (WNDPROC)GetWindowLongPtr(lv, GWLP_WNDPROC);
+       SetWindowLongPtr(lv, GWLP_WNDPROC, (LONG_PTR)listviewtempproc);
        struct ConfigStruct *cs = initloadsave(hDlg, config, false);
-       SetWindowLongPtr(lv, GWL_WNDPROC, (LONG_PTR)originallistviewtempproc);
+       SetWindowLongPtr(lv, GWLP_WNDPROC, (LONG_PTR)originallistviewtempproc);
        return cs;
 }
 

diff --git a/od-win32/winuaechangelog.txt b/od-win32/winuaechangelog.txt
index 5858107ac2fb168e106952e065bf2297b867f634..67dfefb31b346f37e0b7101085ebe906135d2a56 100644 (file)
--- a/od-win32/winuaechangelog.txt
+++ b/od-win32/winuaechangelog.txt
@@ -1,5 +1,18 @@
 \r
 \r
+Beta 4:\r
+\r
+- Horizontal mid-screen resolution changes (Disposable Hero title screen, Runaway / AD 2000 second disk first part) broke when subpixel support was added.\r
+- Filter GUI masks/overlay selection menu was unnecessarily cleared and filled each time option was changed.\r
+- 53C80 SCSI bus reset didn't disconnect active SCSI devices.\r
+- 53C400 compatibility fixes (RT1000B)\r
+- Added x86 bridgeboard compatible 8-bit SCSI adapter: Rancho Technology RT1000B.\r
+- Fixed stuck keys/mouse not getting captured if ALT-TAB was pressed and while keeping ALT pressed, TAB was used to select WinUAE window again.\r
+- Added quick search text box to Configurations panel. Searches from config file name, description and new tags config entry (config_tags=<tag1,tag2,..>).\r
+- Added quick directory select to Configurations panel. Filters by directory or category. Category is new config entry (config_category=<category name>).\r
+- Moved Link and autoload options under Advanced information. Added Category and Tags fields.\r
+- Ignore Huawei mobile USB sticks that have fake CD mode, they hang if SPTI SCSI read is attempted.\r
+\r
 Beta 3:\r
 \r
 - Some CHD CD files returned incorrect data.\r

diff --git a/specialmonitors.cpp b/specialmonitors.cpp
index 51aa92355bd2d39f703c4b66b09d67cc5786a1c4..fc1c840764d4336c78e32c9d1a9bdc997423d2a4 100755 (executable)
--- a/specialmonitors.cpp
+++ b/specialmonitors.cpp
@@ -72,7 +72,7 @@ static const int opal_video_debug = 0;
 static bool automatic;
 static int monitor;
 
-extern unsigned int bplcon0;
+extern uae_u16 bplcon0;
 extern uae_u8 **row_map_genlock;
 
 static uae_u8 graffiti_palette[256 * 4];