]> git.unchartedbackwaters.co.uk Git - francis/winuae.git/commitdiff
projects / francis / winuae.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 07b628f)
5.0.0 5.0.0
authorToni Wilen <twilen@winuae.net>
Thu, 1 Jun 2023 17:32:07 +0000 (20:32 +0300)
committerToni Wilen <twilen@winuae.net>
Thu, 1 Jun 2023 17:32:07 +0000 (20:32 +0300)
od-win32/makeres.cmd patch | blob | history
od-win32/resources/resource.h patch | blob | history
od-win32/resources/winuae_minimal.rc patch | blob | history
od-win32/win32.h patch | blob | history
od-win32/winuaechangelog.txt patch | blob | history
od-win32/wix/Product.wxs patch | blob | history

diff --git a/od-win32/makeres.cmd b/od-win32/makeres.cmd
index 5b13ea23b0f4b56ae8407a0775b3d3e5d80424ad..fe8237741abc77ac8767be5732e9c97b3329007c 100644 (file)
--- a/od-win32/makeres.cmd
+++ b/od-win32/makeres.cmd
@@ -1,7 +1,7 @@
 copy resourcedll\release\resourcedll.dll bin\WinUAE_default.dll
 copy d:\amiga\translation.txt bin\translation.txt
 cd bin
-zip -9 WinUAE%1_translation WinUAE_default.dll translation.txt
+c:\utils\cygwin\bin\zip -9 WinUAE%1_translation WinUAE_default.dll translation.txt
 copy WinUAE%1_translation.zip d:\amiga
 del translation.txt
 del WinUAE%1_translation.zip
diff --git a/od-win32/resources/resource.h b/od-win32/resources/resource.h
index c15fc2658efcb22e40b26e48c192ff762ea4ef31..49e93010e1b5c4593e68a73a1e2a613d2ea230c8 100644 (file)
--- a/od-win32/resources/resource.h
+++ b/od-win32/resources/resource.h
@@ -428,7 +428,6 @@
 #define IDS_BOARDEND                    433
 #define IDS_BOARDSIZE                   434
 #define IDS_BOARDID                     435
-#define IDS_ASSOCIATEEXTENSIONS         436
 #define IDS_ASSOCIATEEXTENSION          436
 #define IDS_GAMEPORTS_CUSTOM            437
 #define IDS_QS_MODELS                   1000
diff --git a/od-win32/resources/winuae_minimal.rc b/od-win32/resources/winuae_minimal.rc
index c133d1e9a6a1e099442bf44e994d65164f200a6a..b7d470937ac27703c011c8eb69d185bfd0585dfe 100644 (file)
--- a/od-win32/resources/winuae_minimal.rc
+++ b/od-win32/resources/winuae_minimal.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
@@ -436,7 +436,6 @@ BEGIN
     CONTROL         "Disabled, but emulated",IDC_SOUND1,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,13,58,107,10
     CONTROL         "Enabled",IDC_SOUND2,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,13,72,108,10
     CONTROL         "Automatic switching",IDC_SOUND_AUTO,"Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,13,90,108,10
-    CONTROL         "Volume Counter mode",IDC_SOUND_VOLCNT,"Button",BS_AUTOCHECKBOX | BS_LEFT | NOT WS_VISIBLE | WS_GROUP | WS_TABSTOP,13,123,108,10
     GROUPBOX        "Volume",IDC_STATIC,139,28,255,69
     RTEXT           "Master",IDC_STATIC,160,47,51,10,SS_CENTERIMAGE
     CONTROL         "",IDC_SOUNDVOLUME,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,215,41,105,20
@@ -520,21 +519,24 @@ BEGIN
     RTEXT           "Sampler:",IDC_STATIC,6,102,57,15,SS_CENTERIMAGE
     COMBOBOX        IDC_SAMPLERLIST,67,103,317,134,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     CONTROL         "Stereo sampler",IDC_SAMPLER_STEREO,"Button",BS_AUTOCHECKBOX | BS_VCENTER | WS_TABSTOP,68,122,149,12
-    GROUPBOX        "Serial Port",IDC_STATIC,1,145,393,51
+    GROUPBOX        "Serial Port",IDC_STATIC,1,145,393,66
     COMBOBOX        IDC_SERIAL,67,158,317,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    CONTROL         "Shared",IDC_SER_SHARED,"Button",BS_AUTOCHECKBOX | BS_VCENTER | WS_TABSTOP,32,179,66,12
-    CONTROL         "RTS/CTS",IDC_SER_CTSRTS,"Button",BS_AUTOCHECKBOX | BS_VCENTER | WS_TABSTOP,107,179,66,12
+    CONTROL         "Shared",IDC_SER_SHARED,"Button",BS_AUTOCHECKBOX | BS_VCENTER | WS_TABSTOP,25,179,66,12
+    CONTROL         "Host RTS/CTS",IDC_SER_CTSRTS,"Button",BS_AUTOCHECKBOX | BS_VCENTER | WS_TABSTOP,107,179,66,12
     CONTROL         "Direct []Use when emulating serial-link games on two PCs running WinUAE",IDC_SER_DIRECT,
                     "Button",BS_AUTOCHECKBOX | BS_VCENTER | WS_TABSTOP,182,179,83,12
-    CONTROL         "uaeserial.device",IDC_UAESERIAL,"Button",BS_AUTOCHECKBOX | BS_VCENTER | WS_TABSTOP,274,179,108,12
-    GROUPBOX        "MIDI",IDC_STATIC,1,199,393,54,BS_LEFT
-    RTEXT           "Out:",IDC_MIDI,22,210,32,15,SS_CENTERIMAGE
-    COMBOBOX        IDC_MIDIOUTLIST,58,212,145,130,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    RTEXT           "In:",IDC_MIDI2,204,209,31,15,SS_CENTERIMAGE
-    COMBOBOX        IDC_MIDIINLIST,239,211,145,134,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    CONTROL         "Route MIDI In to MIDI Out",IDC_MIDIROUTER,"Button",BS_AUTOCHECKBOX | BS_VCENTER | WS_TABSTOP,41,235,170,12
-    GROUPBOX        "Protection Dongle",IDC_STATIC,1,260,393,41,BS_LEFT
-    COMBOBOX        IDC_DONGLELIST,58,278,232,130,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    CONTROL         "uaeserial.device",IDC_UAESERIAL,"Button",BS_AUTOCHECKBOX | BS_VCENTER | WS_TABSTOP,292,179,94,12
+    GROUPBOX        "MIDI",IDC_STATIC,1,213,393,54,BS_LEFT
+    RTEXT           "Out:",IDC_MIDI,22,224,32,15,SS_CENTERIMAGE
+    COMBOBOX        IDC_MIDIOUTLIST,58,226,145,130,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    RTEXT           "In:",IDC_MIDI2,204,224,31,15,SS_CENTERIMAGE
+    COMBOBOX        IDC_MIDIINLIST,239,225,145,134,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    CONTROL         "Route MIDI In to MIDI Out",IDC_MIDIROUTER,"Button",BS_AUTOCHECKBOX | BS_VCENTER | WS_TABSTOP,41,249,170,12
+    GROUPBOX        "Protection Dongle",IDC_STATIC,1,274,393,41,BS_LEFT
+    COMBOBOX        IDC_DONGLELIST,58,292,232,130,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    CONTROL         "Serial status (RTS/CTS/DTR/DTE/CD)",IDC_SER_RTSCTSDTRDTECD,
+                    "Button",BS_AUTOCHECKBOX | BS_VCENTER | WS_TABSTOP,25,192,162,12
+    CONTROL         "Serial status: Ring Indicator",IDC_SER_RI,"Button",BS_AUTOCHECKBOX | BS_VCENTER | WS_TABSTOP,182,192,202,12
 END
 
 IDD_GAMEPORTS DIALOGEX 0, 0, 396, 316
@@ -545,7 +547,7 @@ BEGIN
     RTEXT           "Port 1:",IDC_STATIC,4,30,37,15,SS_CENTERIMAGE
     COMBOBOX        IDC_PORT0_JOYS,45,31,342,130,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     COMBOBOX        IDC_PORT0_AF,45,49,86,130,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    COMBOBOX        IDC_PORT0_JOYSMODE,136,50,106,130,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX        IDC_PORT0_JOYSMODE,136,49,106,130,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     PUSHBUTTON      "Remap / Test [] Remap or test Port 1 configurarion.",IDC_PORT0_REMAP,310,49,78,14
     RTEXT           "Port 2:",IDC_STATIC,6,68,35,15,SS_CENTERIMAGE
     COMBOBOX        IDC_PORT1_JOYS,45,69,342,130,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
@@ -572,6 +574,10 @@ BEGIN
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,9,283,117,11
     RTEXT           "Tablet mode:",IDC_STATIC,184,283,70,10,SS_CENTERIMAGE
     COMBOBOX        IDC_PORT_TABLET_MODE,268,280,119,130,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX        IDC_PORT0_JOYSSUB,16,49,24,130,CBS_DROPDOWNLIST | NOT WS_VISIBLE | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX        IDC_PORT1_JOYSSUB,16,86,24,130,CBS_DROPDOWNLIST | NOT WS_VISIBLE | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX        IDC_PORT2_JOYSSUB,16,154,24,130,CBS_DROPDOWNLIST | NOT WS_VISIBLE | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX        IDC_PORT3_JOYSSUB,16,190,24,130,CBS_DROPDOWNLIST | NOT WS_VISIBLE | WS_VSCROLL | WS_TABSTOP
 END
 
 IDD_CONTRIBUTORS DIALOGEX 0, 0, 530, 345
@@ -597,16 +603,16 @@ IDD_ABOUT DIALOGEX 0, 0, 396, 316
 STYLE DS_LOCALEDIT | DS_SETFONT | DS_3DLOOK | DS_CONTROL | WS_CHILD
 FONT 8, "MS Sans Serif", 0, 0, 0x0
 BEGIN
-    CONTROL         "",IDC_RICHEDIT1,"RICHEDIT",TCS_SCROLLOPPOSITE | TCS_RAGGEDRIGHT | TCS_MULTISELECT | WS_DISABLED,65,36,210,35
-    CONTROL         "",IDC_RICHEDIT2,"RICHEDIT",TCS_SCROLLOPPOSITE | TCS_RAGGEDRIGHT | TCS_MULTISELECT | WS_DISABLED,1,84,343,28
-    PUSHBUTTON      "Contributors",IDC_CONTRIBUTORS,132,126,80,15
-    CONTROL         "",IDC_CLOANTOHOME,"RICHEDIT",TCS_SCROLLOPPOSITE | TCS_RAGGEDRIGHT | TCS_MULTISELECT | WS_DISABLED,2,194,112,24
-    CONTROL         "",IDC_AMIGAHOME,"RICHEDIT",TCS_SCROLLOPPOSITE | TCS_RAGGEDRIGHT | TCS_MULTISELECT | WS_DISABLED,116,194,112,24
-    CONTROL         "",IDC_WINUAEHOME,"RICHEDIT",TCS_SCROLLOPPOSITE | TCS_RAGGEDRIGHT | TCS_MULTISELECT | WS_DISABLED,231,194,112,24
-    CONTROL         "",IDC_ABIME,"RICHEDIT",TCS_SCROLLOPPOSITE | TCS_RAGGEDRIGHT | TCS_MULTISELECT | WS_DISABLED,60,222,112,24
-    CONTROL         "",IDC_CAPS,"RICHEDIT",TCS_SCROLLOPPOSITE | TCS_RAGGEDRIGHT | TCS_MULTISELECT | WS_DISABLED,174,222,112,24
-    CONTROL         "",IDC_AMIGASYS,"RICHEDIT",TCS_SCROLLOPPOSITE | TCS_RAGGEDRIGHT | TCS_MULTISELECT | WS_DISABLED,2,251,112,24
-    CONTROL         "",IDC_AMIKIT,"RICHEDIT",TCS_SCROLLOPPOSITE | TCS_RAGGEDRIGHT | TCS_MULTISELECT | WS_DISABLED,231,251,112,24
+    CONTROL         "",IDC_RICHEDIT1,"RICHEDIT",TCS_SCROLLOPPOSITE | TCS_RAGGEDRIGHT | TCS_MULTISELECT | WS_DISABLED,85,36,210,35
+    CONTROL         "",IDC_RICHEDIT2,"RICHEDIT",TCS_SCROLLOPPOSITE | TCS_RAGGEDRIGHT | TCS_MULTISELECT | WS_DISABLED,21,84,343,28
+    PUSHBUTTON      "Contributors",IDC_CONTRIBUTORS,152,126,80,15
+    CONTROL         "",IDC_CLOANTOHOME,"RICHEDIT",TCS_SCROLLOPPOSITE | TCS_RAGGEDRIGHT | TCS_MULTISELECT | WS_DISABLED,22,194,112,24
+    CONTROL         "",IDC_AMIGAHOME,"RICHEDIT",TCS_SCROLLOPPOSITE | TCS_RAGGEDRIGHT | TCS_MULTISELECT | WS_DISABLED,136,194,112,24
+    CONTROL         "",IDC_WINUAEHOME,"RICHEDIT",TCS_SCROLLOPPOSITE | TCS_RAGGEDRIGHT | TCS_MULTISELECT | WS_DISABLED,251,194,112,24
+    CONTROL         "",IDC_ABIME,"RICHEDIT",TCS_SCROLLOPPOSITE | TCS_RAGGEDRIGHT | TCS_MULTISELECT | WS_DISABLED,22,222,112,24
+    CONTROL         "",IDC_CAPS,"RICHEDIT",TCS_SCROLLOPPOSITE | TCS_RAGGEDRIGHT | TCS_MULTISELECT | WS_DISABLED,136,222,112,24
+    CONTROL         "",IDC_AMIGASYS,"RICHEDIT",TCS_SCROLLOPPOSITE | TCS_RAGGEDRIGHT | TCS_MULTISELECT | WS_DISABLED,136,255,112,24
+    CONTROL         "",IDC_AMIKIT,"RICHEDIT",TCS_SCROLLOPPOSITE | TCS_RAGGEDRIGHT | TCS_MULTISELECT | WS_DISABLED,251,222,112,24
 END
 
 IDD_MISC1 DIALOGEX 0, 0, 396, 316
@@ -665,6 +671,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
@@ -694,7 +701,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
@@ -769,6 +775,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
@@ -792,8 +800,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
@@ -826,36 +832,37 @@ BEGIN
     CONTROL         "CDTV SRAM",IDC_CS_CDTVRAM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,127,119,121,11
     CONTROL         "A4000/A4000T IDE",IDC_CS_IDE2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,127,132,121,11
     CONTROL         "ROM Mirror (A8)",IDC_CS_KSMIRROR_A8,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,127,145,121,11
-    CONTROL         "No-EHB Denise",IDC_CS_NOEHB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,127,158,121,11
-    CONTROL         "Z3 Autoconfig",IDC_CS_Z3AUTOCONFIG,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,127,171,104,11
+    CONTROL         "Z3 Autoconfig",IDC_CS_Z3AUTOCONFIG,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,127,159,104,11
     CONTROL         "Custom register byte write bug",IDC_CS_BYTECUSTOMWRITEBUG,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,127,184,130,11
-    CONTROL         "KS ROM has Chip RAM speed",IDC_CS_ROMISSLOW,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,127,197,125,12
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,127,172,130,11
+    CONTROL         "KS ROM has Chip RAM speed",IDC_CS_ROMISSLOW,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,127,185,125,12
     CONTROL         "DF0: ID Hardware",IDC_CS_DF0IDHW,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,264,93,125,11
     CONTROL         "CD32 NVRAM",IDC_CS_CD32NVRAM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,264,106,125,11
     CONTROL         "CDTV-CR",IDC_CS_CDTVCR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,264,119,123,11
     CONTROL         "PCMCIA",IDC_CS_PCMCIA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,264,132,125,11
-    CONTROL         "A1000 Agnus (8361/8367)",IDC_CS_DIPAGNUS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,264,145,125,11
-    CONTROL         "Composite color burst",IDC_CS_COMPOSITECOLOR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,264,158,125,12
+    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,171,125,12
+                    "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
     GROUPBOX        "Chipset Revision",IDC_STATIC,1,264,393,52
-    CONTROL         "Ramsey revision:",IDC_CS_RAMSEY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,34,285,97,11
-    CONTROL         "Fat Gary revision:",IDC_CS_FATGARY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,34,299,97,11
-    EDITTEXT        IDC_CS_RAMSEYREV,136,284,45,13,ES_AUTOHSCROLL
-    EDITTEXT        IDC_CS_FATGARYREV,136,298,45,13,ES_AUTOHSCROLL
-    CONTROL         "Agnus/Alice revision:",IDC_CS_AGNUS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,200,285,107,11
-    CONTROL         "Denise/Lisa revision:",IDC_CS_DENISE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,200,299,107,11
-    EDITTEXT        IDC_CS_AGNUSREV,311,284,45,13,ES_AUTOHSCROLL
-    EDITTEXT        IDC_CS_DENISEREV,311,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,184,125,12
+    CONTROL         "Ramsey revision:",IDC_CS_RAMSEY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,281,69,11
+    CONTROL         "Fat Gary revision:",IDC_CS_FATGARY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,299,70,11
+    EDITTEXT        IDC_CS_RAMSEYREV,87,280,45,13,ES_AUTOHSCROLL
+    EDITTEXT        IDC_CS_FATGARYREV,87,298,45,13,ES_AUTOHSCROLL
+    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
+    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
+    COMBOBOX        IDC_CS_AGNUSSIZE,338,280,51,75,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
 END
 
 IDD_AVIOUTPUT DIALOGEX 0, 0, 396, 316
@@ -880,9 +887,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
@@ -892,10 +903,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
@@ -922,6 +929,7 @@ BEGIN
     PUSHBUTTON      "Copy from:",IDC_INPUTCOPY,324,268,70,14
     COMBOBOX        IDC_INPUTCOPYFROM,324,286,70,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
     PUSHBUTTON      "Swap 1<>2",IDC_INPUTSWAP,324,303,70,14
+    CONTROL         "Swap Backslash/F11",IDC_KEYBOARD_SWAPHACK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,209,303,87,10
 END
 
 IDD_FILTER DIALOGEX 0, 0, 396, 316
@@ -929,6 +937,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
@@ -969,7 +978,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
@@ -1012,28 +1020,30 @@ IDD_MISC2 DIALOGEX 0, 0, 396, 316
 STYLE DS_LOCALEDIT | DS_SETFONT | DS_3DLOOK | DS_CONTROL | WS_CHILD
 FONT 8, "MS Sans Serif", 0, 0, 0x1
 BEGIN
-    GROUPBOX        "When Active",IDC_STATIC,1,24,125,105
+    GROUPBOX        "When Active",IDC_STATIC,1,24,125,119
     CTEXT           "Run at priority:",IDC_ACTIVE_PRI,10,35,108,10,SS_CENTERIMAGE | WS_TABSTOP
     COMBOBOX        IDC_ACTIVE_PRIORITY,10,50,108,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     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
-    GROUPBOX        "When Inactive",IDC_STATIC,133,24,126,105
+    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
     CONTROL         "Pause emulation",IDC_INACTIVE_PAUSE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,143,84,109,10
     CONTROL         "Disable sound",IDC_INACTIVE_NOSOUND,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,143,98,109,10
     CONTROL         "Disable game controllers",IDC_INACTIVE_NOJOY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,143,112,109,10
-    GROUPBOX        "When Minimized",IDC_STATIC,269,24,125,105
+    GROUPBOX        "When Minimized",IDC_STATIC,269,24,125,119
     CTEXT           "Run at priority:",IDC_MINIMIZED_PRI,278,36,109,10,SS_CENTERIMAGE | WS_TABSTOP
     COMBOBOX        IDC_MINIMIZED_PRIORITY,278,50,108,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     CONTROL         "Pause emulation",IDC_MINIMIZED_PAUSE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,280,84,108,10
     CONTROL         "Disable sound",IDC_MINIMIZED_NOSOUND,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,280,98,108,10
     CONTROL         "Disable game controllers",IDC_MINIMIZED_NOJOY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,280,112,107,10
-    GROUPBOX        "File Extension Associations",IDC_STATIC,0,137,260,155
-    CONTROL         "",IDC_ASSOCIATELIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,9,154,238,108
-    PUSHBUTTON      "Associate all",IDC_ASSOCIATE_ON,36,270,85,14
-    PUSHBUTTON      "Deassociate all",IDC_ASSOCIATE_OFF,125,270,85,14
+    GROUPBOX        "File Extension Associations",IDC_STATIC,0,148,260,155
+    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
 END
 
 IDD_DISK DIALOGEX 0, 0, 396, 316
@@ -1069,38 +1079,45 @@ IDD_PATHS DIALOGEX 0, 0, 396, 316
 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,2,138,8,SS_CENTERIMAGE
-    EDITTEXT        IDC_PATHS_ROM,3,13,377,15,ES_AUTOHSCROLL
+    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,147,1,197,11
-    LTEXT           "Configuration files:",IDC_PATHS_CONFIGL,3,32,134,8,SS_CENTERIMAGE
-    EDITTEXT        IDC_PATHS_CONFIG,3,44,377,15,ES_AUTOHSCROLL
+    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,147,31,99,11
-    LTEXT           "Screenshots:",IDC_PATHS_SCREENSHOTL,3,91,143,8,SS_CENTERIMAGE
-    EDITTEXT        IDC_PATHS_SCREENSHOT,3,102,377,15,ES_AUTOHSCROLL
-    PUSHBUTTON      "...",IDC_PATHS_SCREENSHOTS,384,101,11,15
-    LTEXT           "State files:",IDC_PATHS_STATEFILEL,3,120,129,8,SS_CENTERIMAGE
-    EDITTEXT        IDC_PATHS_SAVESTATE,3,131,377,15,ES_AUTOHSCROLL
-    PUSHBUTTON      "...",IDC_PATHS_SAVESTATES,384,130,11,15
-    LTEXT           "Videos:",IDC_PATHS_AVIOUTPUTL,3,149,130,8,SS_CENTERIMAGE
-    EDITTEXT        IDC_PATHS_AVIOUTPUT,3,160,377,15,ES_AUTOHSCROLL
-    PUSHBUTTON      "...",IDC_PATHS_AVIOUTPUTS,384,159,11,15
-    LTEXT           "Saveimages:",IDC_PATHS_SAVEIMAGEL,3,178,129,8,SS_CENTERIMAGE
-    EDITTEXT        IDC_PATHS_SAVEIMAGE,3,189,377,15,ES_AUTOHSCROLL
-    PUSHBUTTON      "...",IDC_PATHS_SAVEIMAGES,384,189,11,15
+    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
+    LTEXT           "State files:",IDC_PATHS_STATEFILEL,3,104,75,8,SS_CENTERIMAGE
+    EDITTEXT        IDC_PATHS_SAVESTATE,89,101,290,15,ES_AUTOHSCROLL
+    PUSHBUTTON      "...",IDC_PATHS_SAVESTATES,384,101,11,15
+    LTEXT           "Videos:",IDC_PATHS_AVIOUTPUTL,3,123,75,8,SS_CENTERIMAGE
+    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
     CONTROL         "Use original image's path",IDC_PATHS_SAVEIMAGEORIGINALPATH,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,147,177,197,11
-    LTEXT           "Rips:",IDC_PATHS_RIPSL,3,207,131,8,SS_CENTERIMAGE
-    EDITTEXT        IDC_PATHS_RIP,3,219,377,15,ES_AUTOHSCROLL
-    PUSHBUTTON      "...",IDC_PATHS_RIPS,383,218,11,15
-    PUSHBUTTON      "Reset to defaults",IDC_PATHS_DEFAULT,2,238,92,14
-    PUSHBUTTON      "Rescan ROMs",IDC_ROM_RESCAN,2,255,92,14
-    COMBOBOX        IDC_PATHS_DEFAULTTYPE,99,239,163,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
-    PUSHBUTTON      "Clear disk history",IDC_RESETDISKHISTORY,99,255,92,14
-    CONTROL         "Use relative paths",IDC_PATHS_RELATIVE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,199,257,94,11
-    PUSHBUTTON      "Clear registry",IDC_RESETREGISTRY,302,238,92,14
-    CONTROL         "Portable mode",IDC_REGISTRYMODE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,303,257,82,11
+                    "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
+    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
+    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
     CONTROL         "Enable full logging",IDC_LOGENABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,151,283,93,12
@@ -1108,10 +1125,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,267,31,125,11
-    EDITTEXT        IDC_PATHS_NVRAM,3,73,377,15,ES_AUTOHSCROLL
-    PUSHBUTTON      "...",IDC_PATHS_NVRAMS,384,73,11,15
-    LTEXT           "NVRAM files:",IDC_PATHS_NVRAML,3,62,134,8,SS_CENTERIMAGE
 END
 
 IDD_QUICKSTART DIALOGEX 0, 0, 396, 316
@@ -1250,10 +1263,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
@@ -1266,7 +1280,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
@@ -1293,8 +1306,8 @@ STYLE DS_LOCALEDIT | DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAP
 CAPTION "Scanning ROM image files..."
 FONT 8, "MS Sans Serif", 0, 0, 0x0
 BEGIN
-    DEFPUSHBUTTON   "OK",IDOK,147,51,58,14,NOT WS_VISIBLE
-    PUSHBUTTON      "Cancel",IDCANCEL,214,51,58,14
+    DEFPUSHBUTTON   "OK",IDOK,113,51,58,14,NOT WS_VISIBLE
+    PUSHBUTTON      "Cancel",IDCANCEL,180,51,58,14
     CTEXT           "",IDC_INFOBOX_TEXT1,4,7,412,11,SS_CENTERIMAGE | SS_SUNKEN | WS_TABSTOP
     CTEXT           "",IDC_INFOBOX_TEXT2,4,21,412,11,SS_CENTERIMAGE | SS_SUNKEN | WS_TABSTOP
     CTEXT           "",IDC_INFOBOX_TEXT3,4,35,412,11,SS_CENTERIMAGE | SS_SUNKEN | WS_TABSTOP
@@ -1387,7 +1400,6 @@ BEGIN
     CONTROL         "uaescsi.device",IDC_SCSIDEVICE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,259,180,11
     CONTROL         "uaenet.device [] Sana 2 compatible network device emulation.",IDC_SANA2,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,193,243,187,11
-    CONTROL         "CD32 Full Motion Video cartridge",IDC_CS_CD32FMV,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,193,259,193,11
     EDITTEXT        IDC_EXPANSIONBOARDSTRINGBOX,202,112,172,14,ES_AUTOHSCROLL
     COMBOBOX        IDC_EXPANSIONBOARDSELECTOR,202,112,171,75,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
     CONTROL         "",IDC_ACCELERATORBOARDCHECKBOX,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,202,206,99,12
@@ -1417,8 +1429,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 4,10,1,0
- PRODUCTVERSION 4,10,1,0
+ FILEVERSION 5,0,0,0
+ PRODUCTVERSION 5,0,0,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -1434,12 +1446,12 @@ BEGIN
         BLOCK "040904b0"
         BEGIN
             VALUE "FileDescription", "WinUAE"
-            VALUE "FileVersion", "4.10.1.0"
+            VALUE "FileVersion", "5.0.0.0"
             VALUE "InternalName", "WinUAE"
             VALUE "LegalCopyright", "© 1996-2023 under the GNU Public License (GPL)"
             VALUE "OriginalFilename", "WinUAE.exe"
             VALUE "ProductName", "WinUAE"
-            VALUE "ProductVersion", "4.10.1.0"
+            VALUE "ProductVersion", "5.0.0.0"
         END
     END
     BLOCK "VarFileInfo"
@@ -1536,7 +1548,6 @@ BEGIN
     END
 END
 
-
 /////////////////////////////////////////////////////////////////////////////
 //
 // DESIGNINFO
@@ -2106,7 +2117,7 @@ BEGIN
     IDS_PORT_AUTOFIRE       "Autofire"
     IDS_PORT_AUTOFIRE_TOGGLE "Autofire (toggle)"
     IDS_PORT_AUTOFIRE_ALWAYS "Autofire (always)"
-    IDS_PORT_AUTOFIRE_NO    "No autofire"
+    IDS_PORT_AUTOFIRE_NO    "No autofire (normal)"
     IDS_AUTOSCALE_INTEGER   "Integer scaling"
     IDS_SCREEN_VSYNC2_AUTOSWITCH "Lagless VS (BR), 50/60Hz"
     IDS_SCREEN_VSYNC2       "Lagless VSync (Beamraced)"
@@ -2152,7 +2163,7 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_MISCLISTITEMS4      "Windows shutdown/logoff notification\nWarn when attempting to close window\nPower led dims when audio filter is disabled\nAutomatically capture mouse when window is activated\nDebug memory space\nForce hard reset if CPU halted\nA600/A1200/A4000 IDE scsi.device disable\n"
+    IDS_MISCLISTITEMS4      "Windows shutdown/logoff notification\nWarn when attempting to close window\nPower led dims when audio filter is disabled\nAutomatically capture mouse when window is activated\nDebug memory space\nForce hard reset if CPU halted\nA600/A1200/A4000 IDE scsi.device disable\nWarp mode reset\n"
     IDS_SHUTDOWN_NOTIFICATION "Emulation session active"
     IDS_QUIT_WARNING        "Are you sure you want to quit WinUAE?"
     IDS_UNMAPPED_ADDRESS    "Floating\nAll zeros\nAll ones\n"
@@ -2160,6 +2171,15 @@ BEGIN
     IDS_READONLYCONFIRMATION 
                             "Selected configuration file is write protected.\nDo you want to overwrite it?\n%s\n"
     IDS_SCREEN_NATIVELACE   "Native (Interlaced)"
+    IDS_PORT_AUTOFIRE_TOGGLENOAF "No autofire (toggle)"
+    IDS_DEFAULT_WINUAECUSTOM "Custom"
+    IDS_SYNCMODE_COMBINED   "Combined"
+    IDS_SYNCMODE_CSYNC      "Composite Sync"
+    IDS_SYNCMODE_HVSYNC     "H/V Sync"
+    IDS_MEMINFO             "Configured 32-bit address space: %dM, reserved: %dM, Z3 available: %dM (UAE), %dM (Real)"
+    IDS_INPUTINVERT         "Invert"
+    IDS_BOARDTYPE           "Type"
+    IDS_BOARDNAME           "Name"
 END
 
 STRINGTABLE
@@ -2179,6 +2199,16 @@ BEGIN
     IDS_TABLET_MODE         "-\nTablet emulation\n"
 END
 
+STRINGTABLE
+BEGIN
+    IDS_BOARDSTART          "Start"
+    IDS_BOARDEND            "End"
+    IDS_BOARDSIZE           "Size"
+    IDS_BOARDID             "ID"
+    IDS_ASSOCIATEEXTENSION  "Extension"
+    IDS_GAMEPORTS_CUSTOM    "Custom"
+END
+
 #endif    // English (United Kingdom) resources
 /////////////////////////////////////////////////////////////////////////////
 
diff --git a/od-win32/win32.h b/od-win32/win32.h
index 2dce48306a2066315e5c50a2db1f3f422c157f01..3c1822b1184a70e3510fdf38186b92054afe7bbf 100644 (file)
--- a/od-win32/win32.h
+++ b/od-win32/win32.h
@@ -25,7 +25,7 @@
 #define WINUAEBETA _T("")
 #endif
 
-#define WINUAEDATE MAKEBD(2023, 5, 28)
+#define WINUAEDATE MAKEBD(2023, 5, 31)
 
 //#define WINUAEEXTRA _T("AmiKit Preview")
 //#define WINUAEEXTRA _T("Amiga Forever Edition")
diff --git a/od-win32/winuaechangelog.txt b/od-win32/winuaechangelog.txt
index cd3142a102b03fd78e33e5fc8337de5bc73f5d82..3c36e2ccc1c11d92fc6aafde8642550c28753413 100644 (file)
--- a/od-win32/winuaechangelog.txt
+++ b/od-win32/winuaechangelog.txt
@@ -1,4 +1,8 @@
 
+5.0.0
+
+- Wait for blitter hung if blitter hung. Now it exists if blitter is in hung state or it has waited few frames.
+
 Beta 15: (RC7)
 
 - 4.10.0 introduced low to high/high to low IPL delay is optional and off by default, it seems to only happen when Paula IPL lines have extra load (like expansion devices or logic analyzer probes..). Config file only: ipl_delay=true
diff --git a/od-win32/wix/Product.wxs b/od-win32/wix/Product.wxs
index 4bcf9977a066deb654a9935fd339e6f4b7bc1696..2b10cb6a4f271d9042ab41aeaa1ecbfd30464bca 100644 (file)
--- a/od-win32/wix/Product.wxs
+++ b/od-win32/wix/Product.wxs
@@ -2,8 +2,8 @@
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
 
   <?define ProductName = "WinUAE" ?>
-  <?define ProductVersion = "4.10.1" ?>
-  <?define ProductFullVersion = "4.10.1.0" ?>
+  <?define ProductVersion = "5.0.0" ?>
+  <?define ProductFullVersion = "5.0.0.0" ?>
   <?define ProductAuthor = "Arabuusimiehet" ?>
 
   <?if $(var.Platform) = x64 ?>
@@ -175,6 +175,9 @@
       <Component Id="ConfigFiles4" Guid="E5DD85B1-29E5-4B1C-99E9-C284C940A4F7">
         <File Source="$(var.SRCDIST)/Configurations/Host/FullwindowD3D.uae" KeyPath="yes"/>
       </Component>
+      <Component Id="ConfigFiles5" Guid="91F6156D-9329-40C0-BE71-C207022DED47">
+        <File Source="$(var.SRCDIST)/Configurations/Host/Windowed Integer Scaling.uae" KeyPath="yes"/>
+      </Component>
     </DirectoryRef>
 
     <DirectoryRef Id="DOCS">
@@ -228,6 +231,7 @@
       <ComponentRef Id="ConfigFiles2" />
       <ComponentRef Id="ConfigFiles3" />
       <ComponentRef Id="ConfigFiles4" />
+      <ComponentRef Id="ConfigFiles5" />
     </Feature>
 
     <Feature Id="AdditionalFiles" Title="Amiga files" Description="Miscellaneous Amiga utilities" Level="1" AllowAdvertise="no">
WinUAE Amiga Emulator (auto-fetched).