2510b5

diff --git a/filesys.cpp b/filesys.cpp
index 97d8ade0bd6113d3b4d68d013ae2c32113c151cd..dd5750fac20a9adcd710cc89517a8f4fe63964f2 100644 (file)
--- 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 544c9403e53c4f875bfedbd9dc177b06e7ebbd0e..b336df20b10ce216ffa6aaa8a8fa4fab4375949e 100644 (file)
--- 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 09d52c2576e58511d01173e301f8d57bc90a6166..71454b393421cf04c5a8f6db6906aced16f4f59f 100644 (file)
--- 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 09fb5dfe74fe25a92ed186360b8be45f60e59d81..367fd17add4bc2e01398b1f8f0cdc1ee629fbd5e 100644 (file)
--- 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 a6eeebfa3808fc3f254358e9500d76f3d72475f2..ae0dc297f4a190d166cc1d5d73539b1a386efca5 100644 (file)
--- 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 c1b3a246ab6a1cb89b716fcf9313a90ae5ad207e..3bcb4560c6c04b611cfed0ac33fd87b5af6f6623 100644 (file)
--- 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)