From: Toni Wilen <twilen@winuae.net>
Date: Sun, 9 Sep 2018 17:16:33 +0000 (+0300)
Subject: 4100b4
X-Git-Tag: 4100~82
X-Git-Url: https://git.unchartedbackwaters.co.uk/w/?a=commitdiff_plain;h=65147e611c8b858297fcce184f5147b378f0c7ea;p=francis%2Fwinuae.git

4100b4
---

diff --git a/include/custom.h b/include/custom.h
index f9d24950..8f56347f 100644
--- 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 dbd14ab4..95575c58 100644
--- 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 bab03a1b..c0a77010 100644
--- 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 93658c82..cb990200 100644
--- 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 5858107a..67dfefb3 100644
--- a/od-win32/winuaechangelog.txt
+++ b/od-win32/winuaechangelog.txt
@@ -1,5 +1,18 @@
 
 
+Beta 4:
+
+- Horizontal mid-screen resolution changes (Disposable Hero title screen, Runaway / AD 2000 second disk first part) broke when subpixel support was added.
+- Filter GUI masks/overlay selection menu was unnecessarily cleared and filled each time option was changed.
+- 53C80 SCSI bus reset didn't disconnect active SCSI devices.
+- 53C400 compatibility fixes (RT1000B)
+- Added x86 bridgeboard compatible 8-bit SCSI adapter: Rancho Technology RT1000B.
+- 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.
+- Added quick search text box to Configurations panel. Searches from config file name, description and new tags config entry (config_tags=<tag1,tag2,..>).
+- Added quick directory select to Configurations panel. Filters by directory or category. Category is new config entry (config_category=<category name>).
+- Moved Link and autoload options under Advanced information. Added Category and Tags fields.
+- Ignore Huawei mobile USB sticks that have fake CD mode, they hang if SPTI SCSI read is attempted.
+
 Beta 3:
 
 - Some CHD CD files returned incorrect data.
diff --git a/specialmonitors.cpp b/specialmonitors.cpp
index 51aa9235..fc1c8407 100755
--- 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];