5000b8

diff --git a/audio.cpp b/audio.cpp
index a9e7fa884b6d01c14cf85941927e4517eed066d3..4aad7f2b3f562dea57695f8b17306bf319b0ed2a 100644 (file)
--- a/audio.cpp
+++ b/audio.cpp
@@ -1431,7 +1431,7 @@ static void setirq(int nr, int which)
 {
 #if DEBUG_AUDIO > 0
        struct audio_channel_data *cdp = audio_channel + nr;
-       if (debugchannel (nr) && cdp->wlen > 1)
+       if (debugchannel (nr))
                write_log (_T("SETIRQ%d (%d,%d) PC=%08X\n"), nr, which, isirq (nr) ? 1 : 0, M68K_GETPC);
 #endif
        // audio interrupts are delayed by 1 CCK
@@ -1559,6 +1559,11 @@ static void loadper1(int nr)
 {
        struct audio_channel_data *cdp = audio_channel + nr;
        cdp->evtime = 1 * CYCLE_UNIT;
+#if DEBUG_AUDIO2 > 0
+       if (debugchannel(nr)) {
+               write_log(_T("LOADPERP%d: %d\n"), nr, cdp->evtime / CYCLE_UNIT);
+       }
+#endif
 }
 
 static void loadperm1(int nr)
@@ -1570,6 +1575,11 @@ static void loadperm1(int nr)
        } else {
                cdp->evtime = 65536 * CYCLE_UNIT + cdp->per;
        }
+#if DEBUG_AUDIO2 > 0
+       if (debugchannel(nr)) {
+               write_log(_T("LOADPERM%d: %d\n"), nr, cdp->evtime / CYCLE_UNIT);
+       }
+#endif
 }
 
 static void loadper (int nr)
@@ -1580,6 +1590,11 @@ static void loadper (int nr)
        cdp->data.mixvol = cdp->data.audvol;
        if (cdp->evtime < CYCLE_UNIT)
                write_log (_T("LOADPER%d bug %d\n"), nr, cdp->evtime);
+#if DEBUG_AUDIO2 > 0
+       if (debugchannel(nr)) {
+               write_log(_T("LOADPER%d: %d\n"), nr, cdp->evtime / CYCLE_UNIT);
+       }
+#endif
 }
 
 

diff --git a/od-win32/hardfile_win32.cpp b/od-win32/hardfile_win32.cpp
index e7518b408d022c2f4c1188d76ba9890c97be433e..70f6fa38b0cc8f6b5d704436991d8d4a682f2afe 100644 (file)
--- a/od-win32/hardfile_win32.cpp
+++ b/od-win32/hardfile_win32.cpp
@@ -3670,7 +3670,7 @@ int harddrive_to_hdf (HWND hDlg, struct uae_prefs *p, int idx)
        for (;;) {
                if (progressdialogreturn >= 0)
                        break;
-               if (cnt > 0) {
+               if (cnt >= 100) {
                        SendMessage (hwndprogress, PBM_SETPOS, (WPARAM)pct, 0);
                        if (chsmode) {
                                _stprintf(tmp2, _T("Cyl %d/%d Head %d/%d"), cyl, cyls, head, heads);

diff --git a/od-win32/resources/winuae.rc b/od-win32/resources/winuae.rc
index 75a283a581337e793580e9c9412789dd11ad8e11..7427a1a66724eae1667448c31b7b1779645c77c6 100644 (file)
--- a/od-win32/resources/winuae.rc
+++ b/od-win32/resources/winuae.rc
@@ -185,6 +185,7 @@ BEGIN
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,155,144,123,10
     CONTROL         "VGA mode resolution autoswitch [] Automatically selects between hires and superhires in programmed display modes, keeping correct aspect ratio.",IDC_AUTORESOLUTIONVGA,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,155,158,124,10
+    CONTROL         "Display resync blanking",IDC_RESYNCBLANK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,155,172,122,10
     RTEXT           "Resolution:",IDC_STATIC,6,196,44,8,SS_CENTERIMAGE
     COMBOBOX        IDC_LORES,57,195,77,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
     RTEXT           "Overscan:",IDC_STATIC,145,196,43,8,SS_CENTERIMAGE
@@ -216,7 +217,6 @@ BEGIN
     CONTROL         "Double, frames",IDC_LM_IDOUBLED,"Button",BS_AUTORADIOBUTTON | BS_LEFT | WS_TABSTOP,299,255,90,10
     CONTROL         "Double, fields",IDC_LM_IDOUBLED2,"Button",BS_AUTORADIOBUTTON | BS_LEFT | WS_TABSTOP,299,268,90,10
     CONTROL         "Double, fields+",IDC_LM_IDOUBLED3,"Button",BS_AUTORADIOBUTTON | BS_LEFT | WS_TABSTOP,299,281,90,10
-    CONTROL         "Display resync blanking",IDC_RESYNCBLANK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,155,172,122,10
 END
 
 IDD_MEMORY DIALOGEX 0, 0, 396, 303
@@ -668,6 +668,7 @@ BEGIN
     CONTROL         "Manual geometry",IDC_HDF_PHYSGEOMETRY,"Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_TABSTOP,299,70,87,10
     CONTROL         "Read/write",IDC_HDF_RW,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,52,89,67,10
     CONTROL         "Do not mount",IDC_HDF_DONOTMOUNT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,52,103,67,10
+    CONTROL         "Full drive/RDB mode",IDC_HDF_RDB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,52,117,95,10
     CONTROL         "Bootable",IDC_HDF_AUTOBOOT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,152,89,78,10
     CONTROL         "Global filesystem",IDC_HDF_ADDFSRES,"Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_TABSTOP,152,103,82,10
     RTEXT           "Surfaces:",IDC_SURFACES_TEXT,298,90,45,10
@@ -697,7 +698,6 @@ BEGIN
     PUSHBUTTON      "OK",IDOK,147,271,50,14
     PUSHBUTTON      "Cancel",IDCANCEL,203,271,50,14
     RTEXT           "Cylinders:",IDC_CYLINDERS_TEXT,300,128,43,10,NOT WS_VISIBLE
-    CONTROL         "Full drive/RDB mode",IDC_HDF_RDB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,52,117,95,10
 END
 
 IDD_FILESYS DIALOGEX 15, 25, 396, 111
@@ -772,6 +772,8 @@ BEGIN
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,234,45,150,10
     CONTROL         "Wait for Blitter [] Compatibility hack for programs that don't wait for the blitter correctly, causing graphics corruption if CPU is too fast.",IDC_BLITWAIT,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,234,57,150,10
+    LTEXT           "Monitor sync source:",IDC_STATIC,242,75,101,9
+    COMBOBOX        IDC_CS_HVCSYNC,237,90,147,75,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     LTEXT           "Video port display hardware:",IDC_STATIC,241,105,117,15,SS_CENTERIMAGE
     COMBOBOX        IDC_MONITOREMU,237,123,147,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     LTEXT           "Monitor:",IDC_STATIC,240,139,68,15,SS_CENTERIMAGE,WS_EX_RIGHT
@@ -795,8 +797,6 @@ BEGIN
     CONTROL         "Keep aspect ratio",IDC_GENLOCK_KEEP_ASPECT,"Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,13,262,214,10
     COMBOBOX        IDC_GENLOCKFILE,12,278,356,75,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
     PUSHBUTTON      "...",IDC_GENLOCKFILESELECT,375,277,10,15
-    COMBOBOX        IDC_CS_HVCSYNC,237,90,147,75,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT           "Monitor sync source:",IDC_STATIC,242,75,101,9
 END
 
 IDD_CHIPSET2 DIALOGEX 0, 0, 396, 316
@@ -840,8 +840,11 @@ BEGIN
     CONTROL         "Composite color burst",IDC_CS_COMPOSITECOLOR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,264,145,125,12
     CONTROL         "CIA 391078-01 [] CIA revision that can't read IO pin status in output mode",IDC_CS_CIA,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,264,159,125,12
+    CONTROL         "Power up memory pattern",IDC_CS_MEMORYPATTERN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,264,172,125,12
     RTEXT           "Unmapped address space:",IDC_STATIC,15,215,101,9
     COMBOBOX        IDC_CS_UNMAPPED,125,212,71,75,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    RTEXT           "CIA E-Clock Sync",IDC_STATIC,206,215,101,9
+    COMBOBOX        IDC_CS_CIASYNC,313,212,71,75,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     GROUPBOX        "Internal SCSI Hardware",IDC_STATIC,0,232,395,30
     CONTROL         "A3000 WD33C93 SCSI",IDC_CS_DMAC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,84,247,108,11
     CONTROL         "A4000T NCR53C710 SCSI",IDC_CS_DMAC2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,200,247,125,11
@@ -853,9 +856,6 @@ BEGIN
     CONTROL         "Agnus/Alice model:",IDC_CS_AGNUS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,139,281,82,11
     CONTROL         "Denise/Lisa model:",IDC_CS_DENISE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,139,299,82,11
     EDITTEXT        IDC_CS_DENISEREV,230,298,45,13,ES_AUTOHSCROLL
-    COMBOBOX        IDC_CS_CIASYNC,313,212,71,75,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    RTEXT           "CIA E-Clock Sync",IDC_STATIC,206,215,101,9
-    CONTROL         "Power up memory pattern",IDC_CS_MEMORYPATTERN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,264,172,125,12
     EDITTEXT        IDC_CS_AGNUSREV,230,280,45,13,ES_AUTOHSCROLL
     COMBOBOX        IDC_CS_AGNUSMODEL,282,280,51,75,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     COMBOBOX        IDC_CS_DENISEMODEL,282,298,51,75,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
@@ -884,9 +884,13 @@ BEGIN
     GROUPBOX        "Ripper",IDC_STATIC,1,155,393,65
     PUSHBUTTON      "Save screenshot",IDC_SCREENSHOT,28,169,87,14
     PUSHBUTTON      "Pro Wizard 1.62",IDC_PROWIZARD,162,169,87,14,WS_DISABLED
+    CONTROL         "Sample ripper",IDC_SAMPLERIPPER_ACTIVATED,"Button",BS_AUTORADIOBUTTON | BS_PUSHLIKE | BS_FLAT,280,169,87,14
     CONTROL         "Take screenshot before filtering",IDC_SCREENSHOT_ORIGINALSIZE,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,192,130,10
-    CONTROL         "Sample ripper",IDC_SAMPLERIPPER_ACTIVATED,"Button",BS_AUTORADIOBUTTON | BS_PUSHLIKE | BS_FLAT,280,169,87,14
+    CONTROL         "Create 256 color palette indexed screenshot if possible",IDC_SCREENSHOT_PALETTED,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,206,193,10
+    CONTROL         "Autoclip screenshot",IDC_SCREENSHOT_CLIP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,210,192,169,10
+    CONTROL         "Continuous screenshots",IDC_SCREENSHOT_AUTO,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,210,206,169,10
     GROUPBOX        "Re-recorder",IDC_STATIC,1,227,393,70
     CONTROL         "Play recording",IDC_STATEREC_PLAY,"Button",BS_AUTORADIOBUTTON | BS_PUSHLIKE | BS_FLAT,53,239,87,14
     CONTROL         "Re-recording enabled",IDC_STATEREC_RECORD,"Button",BS_AUTORADIOBUTTON | BS_PUSHLIKE | BS_FLAT,214,239,118,14
@@ -896,10 +900,6 @@ BEGIN
     COMBOBOX        IDC_STATEREC_RATE,141,278,38,65,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
     RTEXT           "Recording buffers:",IDC_STATIC,195,280,91,10,SS_CENTERIMAGE | WS_TABSTOP
     COMBOBOX        IDC_STATEREC_BUFFERSIZE,291,278,38,65,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
-    CONTROL         "Autoclip screenshot",IDC_SCREENSHOT_CLIP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,210,192,169,10
-    CONTROL         "Create 256 color palette indexed screenshot if possible",IDC_SCREENSHOT_PALETTED,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,206,193,10
-    CONTROL         "Continuous screenshots",IDC_SCREENSHOT_AUTO,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,210,206,169,10
 END
 
 IDD_INPUT DIALOGEX 0, 0, 396, 316
@@ -934,6 +934,7 @@ STYLE DS_LOCALEDIT | DS_SETFONT | DS_3DLOOK | DS_CONTROL | WS_CHILD
 FONT 8, "MS Sans Serif", 0, 0, 0x1
 BEGIN
     GROUPBOX        "Filter Settings",-1,1,9,393,160
+    CONTROL         "Enabled",IDC_FILTERENABLE,"Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,9,22,126,11
     COMBOBOX        IDC_FILTERMODE,9,39,153,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
     COMBOBOX        IDC_FILTERSTACK,167,39,27,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
     COMBOBOX        IDC_FILTERFILTERH,199,39,29,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
@@ -974,7 +975,6 @@ BEGIN
     PUSHBUTTON      "Load",IDC_FILTERPRESETLOAD,205,280,55,14
     PUSHBUTTON      "Save",IDC_FILTERPRESETSAVE,265,280,55,14
     PUSHBUTTON      "Delete",IDC_FILTERPRESETDELETE,325,280,55,14
-    CONTROL         "Enabled",IDC_FILTERENABLE,"Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,9,22,126,11
 END
 
 IDD_HARDDRIVE DIALOGEX 0, 0, 397, 219
@@ -1023,6 +1023,8 @@ BEGIN
     CTEXT           "Mouse uncaptured:",IDC_STATIC,10,67,101,15,SS_CENTERIMAGE
     CONTROL         "Pause emulation",IDC_ACTIVE_PAUSE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,84,109,10
     CONTROL         "Disable sound",IDC_ACTIVE_NOSOUND,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,98,109,10
+    CONTROL         "Disable game controllers",IDC_ACTIVE_NOJOY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,112,109,10
+    CONTROL         "Disable keyboard",IDC_ACTIVE_NOKEYBOARD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,126,109,10
     GROUPBOX        "When Inactive",IDC_STATIC,133,24,126,119
     CTEXT           "Run at priority:",IDC_INACTIVE_PRI,144,35,107,10,SS_CENTERIMAGE | WS_TABSTOP
     COMBOBOX        IDC_INACTIVE_PRIORITY,144,50,108,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
@@ -1039,8 +1041,6 @@ BEGIN
     CONTROL         "",IDC_ASSOCIATELIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,9,165,238,108
     PUSHBUTTON      "Associate all",IDC_ASSOCIATE_ON,36,281,85,14
     PUSHBUTTON      "Deassociate all",IDC_ASSOCIATE_OFF,125,281,85,14
-    CONTROL         "Disable keyboard",IDC_ACTIVE_NOKEYBOARD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,126,109,10
-    CONTROL         "Disable game controllers",IDC_ACTIVE_NOJOY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,112,109,10
 END
 
 IDD_DISK DIALOGEX 0, 0, 396, 316
@@ -1077,13 +1077,17 @@ STYLE DS_LOCALEDIT | DS_SETFONT | DS_3DLOOK | DS_CONTROL | WS_CHILD
 FONT 8, "MS Sans Serif", 0, 0, 0x1
 BEGIN
     LTEXT           "System ROMs:",IDC_PATHS_ROML,3,16,79,8,SS_CENTERIMAGE
+    CONTROL         "Scan subfolders",IDC_PATHS_RECURSIVEROMS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,91,1,197,11
     EDITTEXT        IDC_PATHS_ROM,89,13,290,15,ES_AUTOHSCROLL
     PUSHBUTTON      "...",IDC_PATHS_ROMS,384,13,11,15
-    CONTROL         "Scan subfolders",IDC_PATHS_RECURSIVEROMS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,91,1,197,11
     LTEXT           "Configuration files:",IDC_PATHS_CONFIGL,3,48,77,8,SS_CENTERIMAGE
+    CONTROL         "Cache Configuration files",IDC_PATHS_CONFIGCACHE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,91,31,99,11
+    CONTROL         "Cache Boxart files",IDC_PATHS_ARTCACHE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,247,31,125,11
     EDITTEXT        IDC_PATHS_CONFIG,88,44,291,15,ES_AUTOHSCROLL
     PUSHBUTTON      "...",IDC_PATHS_CONFIGS,384,43,11,15
-    CONTROL         "Cache Configuration files",IDC_PATHS_CONFIGCACHE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,91,31,99,11
+    LTEXT           "NVRAM files:",IDC_PATHS_NVRAML,3,66,77,8,SS_CENTERIMAGE
+    EDITTEXT        IDC_PATHS_NVRAM,89,63,290,15,ES_AUTOHSCROLL
+    PUSHBUTTON      "...",IDC_PATHS_NVRAMS,384,63,11,15
     LTEXT           "Screenshots:",IDC_PATHS_SCREENSHOTL,3,85,78,8,SS_CENTERIMAGE
     EDITTEXT        IDC_PATHS_SCREENSHOT,89,82,290,15,ES_AUTOHSCROLL
     PUSHBUTTON      "...",IDC_PATHS_SCREENSHOTS,384,82,11,15
@@ -1094,19 +1098,22 @@ BEGIN
     EDITTEXT        IDC_PATHS_AVIOUTPUT,89,120,290,15,ES_AUTOHSCROLL
     PUSHBUTTON      "...",IDC_PATHS_AVIOUTPUTS,384,120,11,15
     LTEXT           "Saveimages:",IDC_PATHS_SAVEIMAGEL,3,154,78,8,SS_CENTERIMAGE
-    EDITTEXT        IDC_PATHS_SAVEIMAGE,89,151,290,15,ES_AUTOHSCROLL
-    PUSHBUTTON      "...",IDC_PATHS_SAVEIMAGES,384,152,11,15
     CONTROL         "Use original image's path",IDC_PATHS_SAVEIMAGEORIGINALPATH,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,91,139,197,11
+    EDITTEXT        IDC_PATHS_SAVEIMAGE,89,151,290,15,ES_AUTOHSCROLL
+    PUSHBUTTON      "...",IDC_PATHS_SAVEIMAGES,384,152,11,15
     LTEXT           "Rips:",IDC_PATHS_RIPSL,3,172,77,8,SS_CENTERIMAGE
     EDITTEXT        IDC_PATHS_RIP,89,169,290,15,ES_AUTOHSCROLL
     PUSHBUTTON      "...",IDC_PATHS_RIPS,384,169,11,15
     PUSHBUTTON      "Set Path",IDC_PATHS_DEFAULT,2,204,83,14
-    PUSHBUTTON      "Rescan ROMs",IDC_ROM_RESCAN,2,240,83,14
     COMBOBOX        IDC_PATHS_DEFAULTTYPE,89,205,164,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
+    PUSHBUTTON      "Clear registry",IDC_RESETREGISTRY,296,204,83,14
+    LTEXT           "Data path:",IDC_STATIC,5,224,34,8
+    EDITTEXT        IDC_CUSTOMDATAPATH,89,222,290,13,ES_AUTOHSCROLL
+    PUSHBUTTON      "...",IDC_PATHS_CUSTOMDATA,384,221,11,15
+    PUSHBUTTON      "Rescan ROMs",IDC_ROM_RESCAN,2,240,83,14
     PUSHBUTTON      "Clear disk history",IDC_RESETDISKHISTORY,89,240,83,14
     CONTROL         "Use relative paths",IDC_PATHS_RELATIVE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,191,242,94,11
-    PUSHBUTTON      "Clear registry",IDC_RESETREGISTRY,296,204,83,14
     CONTROL         "Portable mode",IDC_REGISTRYMODE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,295,242,82,11
     GROUPBOX        "Debug logging",IDC_STATIC,1,271,393,45
     COMBOBOX        IDC_LOGSELECT,7,282,137,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
@@ -1115,13 +1122,6 @@ BEGIN
     PUSHBUTTON      "Save All [] Create zip file that includes both logs and config file.",IDC_LOGSAVE,337,283,51,14
     PUSHBUTTON      "Open [] Open selected file.",IDC_LOGOPEN,337,298,51,14
     EDITTEXT        IDC_LOGPATH,7,299,324,13,ES_READONLY
-    CONTROL         "Cache Boxart files",IDC_PATHS_ARTCACHE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,247,31,125,11
-    EDITTEXT        IDC_PATHS_NVRAM,89,63,290,15,ES_AUTOHSCROLL
-    PUSHBUTTON      "...",IDC_PATHS_NVRAMS,384,63,11,15
-    LTEXT           "NVRAM files:",IDC_PATHS_NVRAML,3,66,77,8,SS_CENTERIMAGE
-    EDITTEXT        IDC_CUSTOMDATAPATH,89,222,290,13,ES_AUTOHSCROLL
-    PUSHBUTTON      "...",IDC_PATHS_CUSTOMDATA,384,221,11,15
-    LTEXT           "Data path:",IDC_STATIC,5,224,34,8
 END
 
 IDD_QUICKSTART DIALOGEX 0, 0, 396, 316
@@ -1260,10 +1260,11 @@ BEGIN
     CONTROL         "Always scale in windowed mode",IDC_RTG_SCALE_ALLOW,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,25,143,162,10
     CONTROL         "Always center",IDC_RTG_CENTER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,25,156,162,10
-    CONTROL         "Hardware vertical blank interrupt",IDC_RTG_VBINTERRUPT,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,195,169,129,10
+    CONTROL         "Integer scaling",IDC_RTG_INTEGERSCALE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,25,169,161,10
     CONTROL         "Multithreaded",IDC_RTG_THREAD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,195,143,83,10
     CONTROL         "Hardware sprite emulation",IDC_RTG_HWSPRITE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,195,156,96,10
+    CONTROL         "Hardware vertical blank interrupt",IDC_RTG_VBINTERRUPT,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,195,169,129,10
     CTEXT           "Color modes:",IDC_STATIC,295,81,83,10,SS_CENTERIMAGE
     COMBOBOX        IDC_RTG_8BIT,296,96,82,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
     COMBOBOX        IDC_RTG_16BIT,296,113,82,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
@@ -1276,7 +1277,6 @@ BEGIN
     COMBOBOX        IDC_RTG_BUFFERCNT,153,227,84,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
     CTEXT           "Aspect ratio:",IDC_STATIC,282,212,83,10,SS_CENTERIMAGE
     COMBOBOX        IDC_RTG_SCALE_ASPECTRATIO,282,227,84,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
-    CONTROL         "Integer scaling",IDC_RTG_INTEGERSCALE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,25,169,161,10
 END
 
 IDD_INPUTMAP DIALOGEX 0, 0, 421, 341

diff --git a/od-win32/win32.h b/od-win32/win32.h
index 1a65ef393ed715e6afe45eefb3c90c58aada6dad..b56534fa4e2ab120769634893277a83c9bf1fce5 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("7")
+#define WINUAEBETA _T("8")
 #else
 #define WINUAEBETA _T("")
 #endif
 
-#define WINUAEDATE MAKEBD(2023, 4, 23)
+#define WINUAEDATE MAKEBD(2023, 5, 1)
 
 //#define WINUAEEXTRA _T("AmiKit Preview")
 //#define WINUAEEXTRA _T("Amiga Forever Edition")

diff --git a/od-win32/winuaechangelog.txt b/od-win32/winuaechangelog.txt
index 81be94bf5fbedca6b288dca5761ad34f91254c27..dd4759a80c9880704076d7f48d92705848069637 100644 (file)
--- a/od-win32/winuaechangelog.txt
+++ b/od-win32/winuaechangelog.txt
@@ -1,4 +1,15 @@
 
+Beta 8:
+
+- input.advancedmultiinput=true now also enables GUI "multiple input devices connected to same joystick port" Game Ports panel support. It is hidden because it is not complete yet and it is too late to do any possible breaking changes.
+- Allow moving vertical position backwards (VPOSW/VHPOSW writes) if current vpos is out of range (vpos was previously in same frame moved past max vertical). Currently free backwards vertical position move is not allowed because it can cause bad side-effects and it can't be used for anything useful.
+- Inter-process serial port emulation was unreliable (4.9.0+)
+- Added inter-process serial port emulation RTS, CTS, DSR, DTE, CD and serial break support. (CTS->RTS, DTE->DSR/CD, both directions).
+- Debugger breakpoints can now be chained, breakpoint chain breaks to debugger only when all chained breakpoints' condition matches. (for example: "wo 0 a0===0 s1" and "wo 1 a1==0" breaks when both A0 and A1 is zero. s1 = this breakpoint (#0) is chained to breakpoint #1)
+- Extra breakpoint parameters (N: count N times before breaking and S: chained) are now only accepted at the end of command.
+- Breakpoint N parameter counting down is now logged.
+- Input panel mode("Configuration #1-3" selected) and mouse inserted using Game ports panel to any port and then later removed: [PORTS] events that used more than 1 slot were not removed. ([PORTS] label was removed but event was not). This caused mouse autoswitch only work once in input panel mode if mouse.
+
 Beta 7:
 
 - Paths panel string "System ROMs" had disappeared (b6)