From 67c313fd3eb3c9915c902e86a6ae2e3e28c165dd Mon Sep 17 00:00:00 2001
From: Toni Wilen <twilen@winuae.net>
Date: Fri, 21 Dec 2012 18:31:10 +0200
Subject: [PATCH] 2510b5

---
 filesys.cpp                  | 7 ++++---
 include/gui.h                | 2 +-
 od-win32/win32.cpp           | 4 ++--
 od-win32/win32.h             | 4 ++--
 od-win32/win32gfx.cpp        | 4 ++++
 od-win32/winuaechangelog.txt | 6 ++++++
 6 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/filesys.cpp b/filesys.cpp
index 97d8ade0..dd5750fa 100644
--- a/filesys.cpp
+++ b/filesys.cpp
@@ -6133,9 +6133,10 @@ static void dump_partinfo (struct hardfiledata *hfd, uae_u8 *pp)
 	uae_u64 size;
 	int blocksize, surfaces, spb, spt, reserved;
 	int lowcyl, highcyl;
-	uae_u32 block;
+	uae_u32 block, flags;
 	uae_u8 buf[512];
 
+	flags = rl (pp + 20);
 	pp[37 + pp[36]] = 0;
 	s = au ((char*)pp + 37);
 	pp += 128;
@@ -6149,7 +6150,7 @@ static void dump_partinfo (struct hardfiledata *hfd, uae_u8 *pp)
 	lowcyl = rl (pp + 36);
 	highcyl = rl (pp + 40);
 
-	write_log (_T("RDB: '%s' dostype=%08X (%s)\n"), s, dostype, dostypes (dostype));
+	write_log (_T("RDB: '%s' dostype=%08X (%s) Flags: %08X\n"), s, dostype, dostypes (dostype), flags);
 	write_log (_T("BlockSize: %d, Surfaces: %d, SectorsPerBlock %d\n"),
 		blocksize, surfaces, spb);
 	write_log (_T("SectorsPerTrack: %d, Reserved: %d, LowCyl %d, HighCyl %d, Size %dM\n"),
@@ -6208,7 +6209,7 @@ static void dump_rdb (UnitInfo *uip, struct hardfiledata *hfd, uae_u8 *bufrdb, u
 			fileblock = rl (buf + 4 * 4);
 		if (fileblock == 0xffffffff)
 			break;
-		write_log (_T("RDB: FSEG block %d:\n"), fileblock);
+		write_log (_T("RDB: LSEG block %d:\n"), fileblock);
 		if (!legalrdbblock (uip, fileblock)) {
 			write_log (_T("RDB: corrupt FSHD pointer %d\n"), fileblock);
 			break;
diff --git a/include/gui.h b/include/gui.h
index 544c9403..b336df20 100644
--- a/include/gui.h
+++ b/include/gui.h
@@ -50,7 +50,7 @@ struct gui_info
     bool drive_writing[4];		/* drive is writing */
     bool drive_disabled[4];		/* drive is disabled */
     bool powerled;				/* state of power led */
-    uae_s8 powerled_brightness;	/* 0 to 255 */
+    uae_u8 powerled_brightness;	/* 0 to 255 */
     uae_s8 drive_side;			/* floppy side */
     uae_s8 hd;					/* harddrive */
     uae_s8 cd;					/* CD */
diff --git a/od-win32/win32.cpp b/od-win32/win32.cpp
index 09d52c25..71454b39 100644
--- a/od-win32/win32.cpp
+++ b/od-win32/win32.cpp
@@ -590,6 +590,7 @@ static void releasecapture (void)
 {
 	if (!showcursor)
 		return;
+	write_log (_T("releasecapture\n"));
 	ClipCursor (NULL);
 	ReleaseCapture ();
 	ShowCursor (TRUE);
@@ -621,7 +622,7 @@ void updatewinrect (bool allowfullscreen)
 
 static void setmouseactive2 (int active, bool allowpause)
 {
-	//write_log (_T("setmouseactive %d->%d\n"), mouseactive, active);
+	write_log (_T("setmouseactive %d->%d showcursor=%d focus=%d recap=%d\n"), mouseactive, active, showcursor, focus, recapture);
 	if (active == 0)
 		releasecapture ();
 	if (mouseactive == active && active >= 0)
@@ -1984,7 +1985,6 @@ void handle_events (void)
 		updatedisplayarea ();
 		manual_painting_needed--;
 		pause_emulation = was_paused;
-		setmouseactive (0);
 		resumepaused (was_paused);
 		sound_closed = 0;
 	}
diff --git a/od-win32/win32.h b/od-win32/win32.h
index 09fb5dfe..367fd17a 100644
--- a/od-win32/win32.h
+++ b/od-win32/win32.h
@@ -19,8 +19,8 @@
 #define LANG_DLL 1
 
 //#define WINUAEBETA _T("")
-#define WINUAEBETA _T("4")
-#define WINUAEDATE MAKEBD(2012, 12, 18)
+#define WINUAEBETA _T("5")
+#define WINUAEDATE MAKEBD(2012, 12, 21)
 #define WINUAEEXTRA _T("")
 //#define WINUAEEXTRA _T("AmiKit Preview")
 #define WINUAEREV _T("")
diff --git a/od-win32/win32gfx.cpp b/od-win32/win32gfx.cpp
index a6eeebfa..ae0dc297 100644
--- a/od-win32/win32gfx.cpp
+++ b/od-win32/win32gfx.cpp
@@ -1210,6 +1210,8 @@ void getrtgfilterrect2 (RECT *sr, RECT *dr, RECT *zr, int dst_width, int dst_hei
 	picasso_offset_mx = 1000;
 	picasso_offset_my = 1000;
 
+	if (!picasso_on)
+		return;
 	if (!scalepicasso)
 		return;
 
@@ -1217,6 +1219,8 @@ void getrtgfilterrect2 (RECT *sr, RECT *dr, RECT *zr, int dst_width, int dst_hei
 	int srcwidth, srcheight;
 	srcwidth = picasso96_state.Width;
 	srcheight = picasso96_state.Height;
+	if (!srcwidth || !srcheight)
+		return;
 
 	if (currprefs.win32_rtgscaleaspectratio < 0) {
 		// automatic
diff --git a/od-win32/winuaechangelog.txt b/od-win32/winuaechangelog.txt
index c1b3a246..3bcb4560 100644
--- a/od-win32/winuaechangelog.txt
+++ b/od-win32/winuaechangelog.txt
@@ -4,6 +4,12 @@
 This is usual quick 2.5.0 bug fix version. Estimated release date: before Christmas.
 I try not to do any GUI changes this time, 2.5.0 translation DLLs should still work with 2.5.1.
 
+Beta 5: (Possibly 2.5.1 final)
+
+- Fixed crash when reset caused switching from RTG to native mode. (b3)
+- Power led (and audio filter if enabled) state was not updated correctly (2.5.0)
+- Exiting pause mode kept mouse uncaptured in some situations (b4)
+
 Beta 4:
 
 - Floppy read/write checkboxes didn't work (b1 filesystem update)
-- 
2.47.3