From c285473abfa7ed0d685676185f1bac5a85d6e965 Mon Sep 17 00:00:00 2001
From: Toni Wilen <twilen@winuae.net>
Date: Tue, 10 Jul 2007 14:01:10 +0300
Subject: [PATCH] imported winuaesrc1430b9b.zip

---
 akiko.c             | 15 +++++++++------
 od-win32/win32.h    |  2 +-
 od-win32/win32gui.c |  2 +-
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/akiko.c b/akiko.c
index cae9a660..3de30afd 100755
--- a/akiko.c
+++ b/akiko.c
@@ -28,8 +28,8 @@
 #include "custom.h"
 
 #define AKIKO_DEBUG_NVRAM 0
-#define AKIKO_DEBUG_IO 1
-#define AKIKO_DEBUG_IO_CMD 1
+#define AKIKO_DEBUG_IO 0
+#define AKIKO_DEBUG_IO_CMD 0
 
 
 static void irq(void)
@@ -883,7 +883,7 @@ static void cdrom_run_read (void)
     if (cdrom_data_offset < 0)
 	return;
     j = cdrom_sector_counter & 15;
-    if (unitnum >= 0 && cdrom_readmask_w & (1 << j)) {
+    if (unitnum >= 0 && (cdrom_readmask_w & (1 << j))) {
 	sector = cdrom_current_sector = cdrom_data_offset + cdrom_sector_counter;
 	sec = sector - sector_buffer_sector_1;
 	if (sector_buffer_sector_1 >= 0 && sec >= 0 && sec < SECTOR_BUFFER_SIZE) {
@@ -900,8 +900,9 @@ static void cdrom_run_read (void)
 	    }
 	    if (sector_buffer_info_1[sec] != 0xff)
 		sector_buffer_info_1[sec]--;
-	} else
+	} else {
 	    return;
+	}
 #if AKIKO_DEBUG_IO_CMD
 	write_log("read sector=%d, scnt=%d -> %d\n", cdrom_data_offset, cdrom_sector_counter, sector);
 #endif
@@ -910,6 +911,7 @@ static void cdrom_run_read (void)
     cdrom_sector_counter++;
     if (cdrom_readmask_w == 0)
 	set_status(CDSTATUS_DATASECTOR);
+
 }
 
 static uae_sem_t akiko_sem;
@@ -988,7 +990,6 @@ static void do_hunt(void)
 void AKIKO_hsync_handler (void)
 {
     static int framecounter;
-    static int frame2counter;
 
     if (!currprefs.cs_cd32cd)
 	return;
@@ -1011,6 +1012,7 @@ void AKIKO_hsync_handler (void)
 	set_status(CDSTATUS_FRAME);
     }
     if (cdrom_playing) {
+	static int frame2counter;
         frame2counter--;
         if (frame2counter <= 0) {
 	    uae_u8 *s;
@@ -1054,7 +1056,8 @@ static void *akiko_thread (void	*null)
 	    if (sector_buffer_info_1[i] == 0xff)
 		break;
 	}
-	if (cdrom_data_end > 0 && sector >= 0 && (sector_buffer_sector_1 < 0 || sector < sector_buffer_sector_1 || sector >= sector_buffer_sector_1 + SECTOR_BUFFER_SIZE * 2 / 3 || i != SECTOR_BUFFER_SIZE)) {
+	if (cdrom_data_end > 0 && sector >= 0 &&
+		(sector_buffer_sector_1 < 0 || sector < sector_buffer_sector_1 || sector >= sector_buffer_sector_1 + SECTOR_BUFFER_SIZE * 2 / 3 || i != SECTOR_BUFFER_SIZE)) {
 	    memset (sector_buffer_info_2, 0, SECTOR_BUFFER_SIZE);
 #if AKIKO_DEBUG_IO_CMD
 	    write_log("filling buffer sector=%d (max=%d)\n", sector, cdrom_data_end);
diff --git a/od-win32/win32.h b/od-win32/win32.h
index e8711c8d..8d53f06f 100755
--- a/od-win32/win32.h
+++ b/od-win32/win32.h
@@ -17,7 +17,7 @@
 
 #define WINUAEBETA 9
 #define WINUAEPUBLICBETA 1
-#define WINUAEDATE MAKEBD(2007, 7, 9)
+#define WINUAEDATE MAKEBD(2007, 7, 10)
 #define WINUAEEXTRA ""
 #define WINUAEREV ""
 
diff --git a/od-win32/win32gui.c b/od-win32/win32gui.c
index 56fc4a68..4fd99f3a 100755
--- a/od-win32/win32gui.c
+++ b/od-win32/win32gui.c
@@ -9834,7 +9834,7 @@ static void dialogmousemove(HWND hDlg)
     int dx, dy;
     int sw, sh;
 
-    if (isfullscreen() <= 0)
+    if (full_property_sheet || isfullscreen() <= 0)
 	return;
     GetCursorPos(&pt);
     if (pt.x == pt2.x && pt.y == pt2.y)
-- 
2.47.3