3600

diff --git a/main.cpp b/main.cpp
index 397a4e7c8e8b6178fe66ee5f1fb29669ce40ade5..c1c20e6a6565b6e9aa8381909a2c8cd68f37dbdc 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -169,6 +169,12 @@ void fixup_prefs_dimensions (struct uae_prefs *prefs)
                struct apmode *ap = &prefs->gfx_apmode[i];
                ap->gfx_vflip = 0;
                ap->gfx_strobo = false;
+#if 0
+               if (currprefs.gfx_api > 1 && ap->gfx_vsyncmode) {
+                       ap->gfx_vsyncmode = false;
+                       error_log(_T("Low latency vsync is not yet supported in Direct3D11 mode."));
+               }
+#endif
                if (ap->gfx_vsync < 0) {
                        // adaptive sync
                        ap->gfx_vsyncmode = 0;

diff --git a/od-win32/dinput.cpp b/od-win32/dinput.cpp
index bf21471e3da63236e67361ad6d09c96feaf3f69f..5c80322a48be96f54c9e90d0f4105322985bab97 100644 (file)
--- a/od-win32/dinput.cpp
+++ b/od-win32/dinput.cpp
@@ -437,49 +437,51 @@ static int doregister_rawinput (bool add)
        num++;
 
        /* keyboard */
-       rid[num].usUsagePage = 1;
-       rid[num].usUsage = 6;
-       if (!add) {
-               rid[num].dwFlags = RIDEV_REMOVE;
-       } else {
-               if (hMainWnd) {
-                       rid[num].dwFlags = RIDEV_INPUTSINK;
-                       rid[num].hwndTarget = hMainWnd;
+       if (!rp_isactive()) {
+               rid[num].usUsagePage = 1;
+               rid[num].usUsage = 6;
+               if (!add) {
+                       rid[num].dwFlags = RIDEV_REMOVE;
+               } else {
+                       if (hMainWnd) {
+                               rid[num].dwFlags = RIDEV_INPUTSINK;
+                               rid[num].hwndTarget = hMainWnd;
+                       }
+                       rid[num].dwFlags |= RIDEV_NOHOTKEYS | (os_vista ? RIDEV_DEVNOTIFY : 0);
                }
-               rid[num].dwFlags |= RIDEV_NOHOTKEYS | (os_vista ? RIDEV_DEVNOTIFY : 0);
-       }
-       num++;
+               num++;
 
-       /* joystick */
-       int off = num;
+               /* joystick */
+               int off = num;
 
-       // game pad
-       rid[num].usUsagePage = 1;
-       rid[num].usUsage = 4;
-       if (!add) {
-               rid[num].dwFlags = RIDEV_REMOVE;
-       } else {
-               if (hMainWnd) {
-                       rid[num].dwFlags = RIDEV_INPUTSINK;
-                       rid[num].hwndTarget = hMainWnd;
+               // game pad
+               rid[num].usUsagePage = 1;
+               rid[num].usUsage = 4;
+               if (!add) {
+                       rid[num].dwFlags = RIDEV_REMOVE;
+               } else {
+                       if (hMainWnd) {
+                               rid[num].dwFlags = RIDEV_INPUTSINK;
+                               rid[num].hwndTarget = hMainWnd;
+                       }
+                       rid[num].dwFlags |= (os_vista ? RIDEV_DEVNOTIFY : 0);
                }
-               rid[num].dwFlags |= (os_vista ? RIDEV_DEVNOTIFY : 0);
-       }
-       num++;
+               num++;
 
-       // joystick
-       rid[num].usUsagePage = 1;
-       rid[num].usUsage = 5;
-       if (!add) {
-               rid[num].dwFlags = RIDEV_REMOVE;
-       } else {
-               if (hMainWnd) {
-                       rid[num].dwFlags = RIDEV_INPUTSINK;
-                       rid[num].hwndTarget = hMainWnd;
+               // joystick
+               rid[num].usUsagePage = 1;
+               rid[num].usUsage = 5;
+               if (!add) {
+                       rid[num].dwFlags = RIDEV_REMOVE;
+               } else {
+                       if (hMainWnd) {
+                               rid[num].dwFlags = RIDEV_INPUTSINK;
+                               rid[num].hwndTarget = hMainWnd;
+                       }
+                       rid[num].dwFlags |= (os_vista ? RIDEV_DEVNOTIFY : 0);
                }
-               rid[num].dwFlags |= (os_vista ? RIDEV_DEVNOTIFY : 0);
+               num++;
        }
-       num++;
 
 #if 0
        for (int i = 0; i < num_joystick; i++) {

diff --git a/od-win32/direct3d11.cpp b/od-win32/direct3d11.cpp
index dd9ede4c85e4fe5b5005ef3d4422abef6de75ed2..ad20362fb86dac544a51a353cef68ebc2938ab84 100644 (file)
--- a/od-win32/direct3d11.cpp
+++ b/od-win32/direct3d11.cpp
@@ -3181,7 +3181,7 @@ static int xxD3D11_init2(HWND ahwnd, int w_w, int w_h, int t_w, int t_h, int dep
                                if ((int)(mhz + 0.5) == hz || (int)(mhz) == hz) {
                                        d3d->fsSwapChainDesc.RefreshRate.Denominator = m->RefreshRate.Denominator;
                                        d3d->fsSwapChainDesc.RefreshRate.Numerator = m->RefreshRate.Numerator;
-                                       write_log(_T("D3D11 found matching fullscreen refresh rate %d/%d=%.2f. SLO=%d\n"), m->RefreshRate.Denominator, m->RefreshRate.Numerator, (float)mhz, m->ScanlineOrdering);
+                                       write_log(_T("D3D11 found matching fullscreen refresh rate %d/%d=%.2f. SLO=%d\n"), m->RefreshRate.Numerator, m->RefreshRate.Denominator, (float)mhz, m->ScanlineOrdering);
                                        *freq = hz;
                                        break;
                                }
@@ -3203,7 +3203,7 @@ static int xxD3D11_init2(HWND ahwnd, int w_w, int w_h, int t_w, int t_h, int dep
                        d3d->fsSwapChainDesc.RefreshRate.Numerator = md2.RefreshRate.Numerator;
                        *freq = md2.RefreshRate.Numerator / md2.RefreshRate.Denominator;
                        write_log(_T("D3D11 FindClosestMatchingMode1() %d/%d=%.2f SLO=%d W=%d H=%d\n"),
-                               md2.RefreshRate.Denominator, md2.RefreshRate.Numerator, (float)md2.RefreshRate.Numerator / md2.RefreshRate.Denominator, md1.ScanlineOrdering,
+                               md2.RefreshRate.Numerator, md2.RefreshRate.Denominator, (float)md2.RefreshRate.Numerator / md2.RefreshRate.Denominator, md1.ScanlineOrdering,
                                md2.Width, md2.Height);
                }
        }

diff --git a/od-win32/makeexe.cmd b/od-win32/makeexe.cmd
index 378cb2d2bbdfb2e7628698153ff6ec9bbaad4fa5..e39bfd149f631dcb543d427a5ed40a339019725e 100644 (file)
--- a/od-win32/makeexe.cmd
+++ b/od-win32/makeexe.cmd
@@ -5,7 +5,8 @@ copy docs\windows\translation.txt d:\amiga
 zip -9 -r c:\projects\winuae\src\od-win32\winuae.zip *
 cd c:\projects\winuae\src\od-win32
 copy winuae.zip d:\amiga\WinUAE%1.zip
-#;copy c:\projects\winuae\src\od-win32\wix\bin\Release\winuae.msi d:\amiga\InstallWinUAE%1.msi
+copy c:\projects\winuae\src\od-win32\wix\bin\winuae.msi d:\amiga\InstallWinUAE%1.msi
+copy c:\projects\winuae\src\od-win32\wix\bin\winuae64.msi d:\amiga\InstallWinUAE%1_x64.msi
 #;copy resourcedll\release\resourcedll.dll d:\amiga\WinUAE_default.dll
 cdd d:\amiga
 zip -9 WinUAE%1_x64.zip winuae64.exe

diff --git a/od-win32/resources/winuae.rc b/od-win32/resources/winuae.rc
index 5ca5aee21e60fc2ecf455c3fa9875bd9e482dbb8..a70ca1b00f715ada679ece0b9ee3409cf0c4c12b 100644 (file)
--- a/od-win32/resources/winuae.rc
+++ b/od-win32/resources/winuae.rc
@@ -1900,8 +1900,8 @@ BEGIN
     IDS_SCREEN_WINDOWED     "Windowed"
     IDS_SCREEN_FULLSCREEN   "Fullscreen"
     IDS_SCREEN_FULLWINDOW   "Full-window"
-    IDS_SCREEN_VSYNC        "Legacy VSync"
-    IDS_SCREEN_VSYNC_AUTOSWITCH "Legacy VS, 50/60Hz"
+    IDS_SCREEN_VSYNC        "Standard VSync"
+    IDS_SCREEN_VSYNC_AUTOSWITCH "Standard VS, 50/60Hz"
     IDS_SOUND_MONO          "Mono"
     IDS_SOUND_MIXED         "Mixed"
     IDS_SOUND_STEREO        "Stereo"

diff --git a/od-win32/resources/winuae_minimal.rc b/od-win32/resources/winuae_minimal.rc
index de4bbdc61189b0d239fbf60396be2ff4ee0c450c..6a1c8d62f4659e4e6bf9a0127f8e923a4482f2f9 100644 (file)
--- a/od-win32/resources/winuae_minimal.rc
+++ b/od-win32/resources/winuae_minimal.rc
@@ -153,11 +153,11 @@ BEGIN
     RTEXT           "Fullscreen:",IDC_STATIC,3,33,51,15,SS_CENTERIMAGE
     COMBOBOX        IDC_RESOLUTION,59,33,76,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
     COMBOBOX        IDC_RESOLUTIONDEPTH,144,33,62,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
-    COMBOBOX        IDC_REFRESHRATE,266,33,119,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX        IDC_REFRESHRATE,263,34,122,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
     RTEXT           "Windowed:",IDC_STATIC,2,54,51,15,SS_CENTERIMAGE
-    EDITTEXT        IDC_XSIZE,59,56,56,12,ES_NUMBER
-    EDITTEXT        IDC_YSIZE,122,56,56,12,ES_NUMBER
-    COMBOBOX        IDC_DISPLAY_BUFFERCNT,266,56,119,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
+    EDITTEXT        IDC_XSIZE,59,56,43,12,ES_NUMBER
+    EDITTEXT        IDC_YSIZE,113,56,43,12,ES_NUMBER
+    COMBOBOX        IDC_DISPLAY_BUFFERCNT,263,56,122,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
     GROUPBOX        "Settings",IDC_SETTINGSTEXT,1,86,283,183
     RTEXT           "Native:",IDC_STATIC,9,98,48,15,SS_CENTERIMAGE
     COMBOBOX        IDC_SCREENMODE_NATIVE,61,98,71,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
@@ -203,6 +203,7 @@ BEGIN
     CONTROL         "Double, frames",IDC_LM_IDOUBLED,"Button",BS_AUTORADIOBUTTON | BS_LEFT | WS_TABSTOP,299,251,90,10
     CONTROL         "Double, fields",IDC_LM_IDOUBLED2,"Button",BS_AUTORADIOBUTTON | BS_LEFT | WS_TABSTOP,299,264,90,10
     CONTROL         "Double, fields+",IDC_LM_IDOUBLED3,"Button",BS_AUTORADIOBUTTON | BS_LEFT | WS_TABSTOP,299,277,90,10
+    CONTROL         "Allow tearing",IDC_DISPLAY_TEARING,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,170,58,84,10
 END
 
 IDD_MEMORY DIALOGEX 0, 0, 396, 266
@@ -252,31 +253,34 @@ IDD_CPU DIALOGEX 0, 0, 396, 317
 STYLE DS_LOCALEDIT | DS_SETFONT | DS_3DLOOK | DS_CONTROL | WS_CHILD
 FONT 8, "MS Sans Serif", 0, 0, 0x0
 BEGIN
-    GROUPBOX        "CPU",IDC_STATIC,1,1,129,184,BS_LEFT
+    GROUPBOX        "CPU",IDC_STATIC,1,1,129,163,BS_LEFT
     CONTROL         "68000",IDC_CPU0,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,8,19,63,10
     CONTROL         "68010",IDC_CPU1,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,8,32,63,10
     CONTROL         "68020",IDC_CPU2,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,8,45,63,10
     CONTROL         "68030",IDC_CPU3,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,8,58,63,10
     CONTROL         "68040",IDC_CPU4,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,8,71,63,10
     CONTROL         "68060",IDC_CPU5,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,8,84,63,10
-    CONTROL         "24-bit addressing",IDC_COMPATIBLE24,"Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,8,107,119,12
-    CONTROL         "More compatible [] 68000: emulate prefetch. 68020+: emulate prefetch partially. More compatible but slower.",IDC_COMPATIBLE,
-                    "Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,8,121,118,11
+    CONTROL         "24-bit addressing",IDC_COMPATIBLE24,"Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,8,98,119,12
+    CONTROL         "More compatible [] 68000: emulate prefetch. 68020+: emulate prefetch and instruction cache. More compatible but slower.",IDC_COMPATIBLE,
+                    "Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,8,111,118,12
     CONTROL         "JIT [] Enable just-in-time CPU emulator. Significantly increases the speed of the CPU emulation. Requires 68020 or higher CPU.",IDC_JITENABLE,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,134,120,11
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,136,120,12
+    CONTROL         "None",IDC_MMUENABLEOFF,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,8,181,87,10
+    CONTROL         "EC [] 68EC030, 68EC040 and 68EC060 Transparent Translation Register emulation. Not compatible with JIT.",IDC_MMUENABLEEC,
+                    "Button",BS_AUTORADIOBUTTON | WS_TABSTOP,73,195,48,10
     CONTROL         "MMU [] 68030, 68040 and 68060 MMU emulation. Not compatible with JIT.",IDC_MMUENABLE,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,147,120,11
+                    "Button",BS_AUTORADIOBUTTON | WS_TABSTOP,8,195,49,10
     CONTROL         "Unimplemented CPU emu [] Emulate 68060 unimplemented integer instructions",IDC_CPU_UNIMPLEMENTED,
-                    "Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,8,160,118,10
-    GROUPBOX        "FPU",IDC_STATIC,1,188,129,128,BS_LEFT
-    CONTROL         "None",IDC_FPU0,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,8,204,87,10
-    CONTROL         "68881",IDC_FPU1,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,8,217,87,10
-    CONTROL         "68882",IDC_FPU2,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,8,230,87,10
-    CONTROL         "CPU internal",IDC_FPU3,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,8,243,93,10
+                    "Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,8,149,118,12
+    GROUPBOX        "FPU",IDC_STATIC,1,212,129,103,BS_LEFT
+    CONTROL         "None",IDC_FPU0,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,8,223,87,10
+    CONTROL         "68881",IDC_FPU1,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,8,236,87,10
+    CONTROL         "68882",IDC_FPU2,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,8,249,87,10
+    CONTROL         "CPU internal",IDC_FPU3,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,8,262,93,10
     CONTROL         "More compatible [] More compatible but slower FPU emulation.",IDC_COMPATIBLE_FPU,
-                    "Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,8,259,117,10
+                    "Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,8,276,117,10
     CONTROL         "Unimplemented FPU emu [] Emulate FPU unimplemented instructions",IDC_FPU_UNIMPLEMENTED,
-                    "Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,8,272,116,10
+                    "Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,8,289,116,10
     GROUPBOX        "CPU Emulation Speed",IDC_STATIC,136,1,258,97
     CONTROL         "Fastest possible",IDC_CS_HOST,"Button",BS_AUTORADIOBUTTON | BS_LEFT | WS_GROUP | WS_TABSTOP,143,19,195,10
     CONTROL         "Approximate A500/A1200 or cycle-exact",IDC_CS_68000,
@@ -309,7 +313,10 @@ BEGIN
     CONTROL         "Direct",IDC_TRUST0,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,143,299,72,10
     CONTROL         "Indirect",IDC_TRUST1,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,221,299,72,10
     CONTROL         "No flags",IDC_NOFLAGS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,299,299,68,11
-    CONTROL         "Softfloat FPU emulation",IDC_FPU_SOFTFLOAT,"Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,8,285,115,10
+    CONTROL         "Softfloat FPU emulation",IDC_FPU_SOFTFLOAT,"Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,8,302,115,10
+    GROUPBOX        "MMU",IDC_STATIC,2,168,129,42,BS_LEFT
+    CONTROL         "Data cache emulation [] 68030, 040 and 060 optional data cache emulation. Requires More compatible option.",IDC_CPUDATACACHE,
+                    "Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,8,123,119,12
 END
 
 IDD_FLOPPY DIALOGEX 0, 0, 396, 261
@@ -376,7 +383,7 @@ BEGIN
     PUSHBUTTON      "Add &Hardfile...",IDC_NEW_HF,135,153,126,15
     PUSHBUTTON      "Add Ha&rd Drive...",IDC_NEW_HD,267,153,127,15
     PUSHBUTTON      "Add SCSI/IDE CD Drive",IDC_NEW_CD,1,172,128,15
-    PUSHBUTTON      "Add SCSI Tape Drive",IDC_NEW_TAPE,135,172,126,15
+    PUSHBUTTON      "Add SCSI/IDE Tape Drive",IDC_NEW_TAPE,135,172,126,15
     PUSHBUTTON      "&Properties",IDC_EDIT,267,172,60,15
     PUSHBUTTON      "Remove",IDC_REMOVE,334,172,60,15
     GROUPBOX        "Options",IDC_STATIC,1,189,393,66
@@ -595,8 +602,8 @@ BEGIN
     COMBOBOX        IDC_WINDOWEDMODE,287,59,87,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
     CTEXT           "Graphics API:",IDC_STATIC,272,76,117,10,SS_CENTERIMAGE
     COMBOBOX        IDC_DXMODE,287,89,87,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
-    CTEXT           "DirectDraw:",IDC_STATIC,272,106,117,10,SS_CENTERIMAGE
-    COMBOBOX        IDC_DD_SURFACETYPE,287,119,87,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
+    CTEXT           "Graphics API Options:",IDC_STATIC,272,106,117,10,SS_CENTERIMAGE
+    COMBOBOX        IDC_DXMODE_OPTIONS,287,119,87,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
     GROUPBOX        "GUI",IDC_STATIC,266,144,128,93
     COMBOBOX        IDC_LANGUAGE,273,157,114,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     PUSHBUTTON      "GUI Font...",IDC_GUI_FONT,272,174,54,14
@@ -617,56 +624,59 @@ BEGIN
     CONTROL         "USB mode",IDC_KBLED_USB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,264,296,64,11
 END
 
-IDD_HARDFILE DIALOGEX 0, 0, 397, 279
+IDD_HARDFILE DIALOGEX 0, 0, 397, 290
 STYLE DS_LOCALEDIT | DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_3DLOOK | DS_CENTER | DS_CENTERMOUSE | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_ACCEPTFILES
 CAPTION "Hardfile Settings"
 FONT 8, "MS Sans Serif", 0, 0, 0x0
 BEGIN
-    GROUPBOX        "Settings",IDC_STATIC,2,2,392,183
+    GROUPBOX        "Settings",IDC_STATIC,2,2,392,196
     RTEXT           "Path:",IDC_HARDFILE_DIR_TEXT,10,18,37,10
     COMBOBOX        IDC_PATH_NAME,52,15,325,75,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
     PUSHBUTTON      "...",IDC_SELECTOR,380,14,11,15
-    RTEXT           "FileSys:",IDC_HARDFILE_FILESYS_TEXT,13,38,34,10
-    COMBOBOX        IDC_PATH_FILESYS,51,35,325,75,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
-    PUSHBUTTON      "...",IDC_FILESYS_SELECTOR,380,34,11,15
-    RTEXT           "Device:",IDC_HARDFILE_DEVICE_TEXT,16,58,31,10
-    EDITTEXT        IDC_HARDFILE_DEVICE,52,55,89,15,ES_AUTOHSCROLL
-    RTEXT           "Boot priority:",IDC_HARDFILE_BOOTPRI_TEXT,150,57,83,10
-    EDITTEXT        IDC_HARDFILE_BOOTPRI,238,55,44,15
-    CONTROL         "Manual geometry",IDC_HDF_PHYSGEOMETRY,"Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_TABSTOP,299,56,87,10
-    CONTROL         "Read/write",IDC_HDF_RW,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,52,75,67,10
-    CONTROL         "Do not mount",IDC_HDF_DONOTMOUNT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,52,89,67,10
-    CONTROL         "Bootable",IDC_HDF_AUTOBOOT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,152,75,78,10
-    CONTROL         "Global filesystem",IDC_HDF_ADDFSRES,"Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_TABSTOP,152,89,82,10
-    RTEXT           "Surfaces:",IDC_SURFACES_TEXT,298,76,45,10
-    EDITTEXT        IDC_HEADS,347,73,40,15,ES_NUMBER
-    RTEXT           "Sectors:",IDC_SECTORS_TEXT,298,95,45,10
-    EDITTEXT        IDC_SECTORS,347,92,40,15,ES_NUMBER
-    RTEXT           "Reserved:",IDC_RESERVED_TEXT,297,113,46,10
-    EDITTEXT        IDC_RESERVED,347,111,40,15,ES_NUMBER
-    RTEXT           "Block size:",IDC_BLOCKSIZE_TEXT,299,132,45,10
-    EDITTEXT        IDC_BLOCKSIZE,347,130,40,15,ES_NUMBER
-    LTEXT           "HD Controller:",IDC_STATIC,10,113,54,10,SS_CENTERIMAGE
-    PUSHBUTTON      "Full drive/RDB mode",IDC_HDF_RDB,83,109,127,14
-    COMBOBOX        IDC_HDF_FEATURE_LEVEL,214,109,75,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
-    COMBOBOX        IDC_HDF_CONTROLLER,6,131,152,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
-    COMBOBOX        IDC_HDF_CONTROLLER_UNIT,163,131,63,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
-    COMBOBOX        IDC_HDF_CONTROLLER_TYPE,231,131,58,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
-    EDITTEXT        IDC_HDFINFO,5,150,385,12,ES_CENTER | ES_READONLY
-    EDITTEXT        IDC_HDFINFO2,5,166,385,12,ES_CENTER | ES_READONLY
-    GROUPBOX        "New hard disk image file",IDC_STATIC,2,190,392,62
-    PUSHBUTTON      "Create",IDC_HF_CREATE,58,206,80,14
-    COMBOBOX        IDC_HF_TYPE,58,230,80,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
-    EDITTEXT        IDC_HF_SIZE,154,206,61,15
-    LTEXT           "MB",IDC_STATIC,220,209,53,10,SS_CENTERIMAGE
-    EDITTEXT        IDC_HF_DOSTYPE,154,229,61,15
-    LTEXT           "DOS type",IDC_STATIC,222,231,51,10,SS_CENTERIMAGE
-    CONTROL         "Sparse file",IDC_HF_SPARSE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,280,215,87,10
-    CONTROL         "Dynamic HDF",IDC_HF_DYNAMIC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,280,227,87,10
-    PUSHBUTTON      "OK",IDOK,147,258,50,14
-    PUSHBUTTON      "Cancel",IDCANCEL,203,258,50,14
-    RTEXT           "Cylinders:",IDC_CYLINDERS_TEXT,300,113,43,10,NOT WS_VISIBLE
+    RTEXT           "FileSys:",IDC_HARDFILE_FILESYS_TEXT,13,52,34,10
+    COMBOBOX        IDC_PATH_FILESYS,51,49,325,75,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
+    PUSHBUTTON      "...",IDC_FILESYS_SELECTOR,380,48,11,15
+    RTEXT           "Device:",IDC_HARDFILE_DEVICE_TEXT,16,71,31,10
+    EDITTEXT        IDC_HARDFILE_DEVICE,52,69,89,15,ES_AUTOHSCROLL
+    RTEXT           "Boot priority:",IDC_HARDFILE_BOOTPRI_TEXT,150,71,83,10
+    EDITTEXT        IDC_HARDFILE_BOOTPRI,238,69,44,15
+    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         "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
+    EDITTEXT        IDC_HEADS,347,87,40,15,ES_NUMBER
+    RTEXT           "Sectors:",IDC_SECTORS_TEXT,298,109,45,10
+    EDITTEXT        IDC_SECTORS,347,106,40,15,ES_NUMBER
+    RTEXT           "Reserved:",IDC_RESERVED_TEXT,297,128,46,10
+    EDITTEXT        IDC_RESERVED,347,125,40,15,ES_NUMBER
+    RTEXT           "Block size:",IDC_BLOCKSIZE_TEXT,299,147,45,10
+    EDITTEXT        IDC_BLOCKSIZE,347,144,40,15,ES_NUMBER
+    LTEXT           "HD Controller:",IDC_STATIC,10,127,54,10,SS_CENTERIMAGE
+    PUSHBUTTON      "Full drive/RDB mode",IDC_HDF_RDB,83,123,127,14
+    COMBOBOX        IDC_HDF_FEATURE_LEVEL,214,123,75,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX        IDC_HDF_CONTROLLER,6,145,152,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX        IDC_HDF_CONTROLLER_UNIT,163,145,63,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX        IDC_HDF_CONTROLLER_TYPE,231,145,58,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
+    EDITTEXT        IDC_HDFINFO,5,164,385,12,ES_CENTER | ES_READONLY
+    EDITTEXT        IDC_HDFINFO2,5,180,385,12,ES_CENTER | ES_READONLY
+    GROUPBOX        "New hard disk image file",IDC_STATIC,2,203,392,62
+    PUSHBUTTON      "Create",IDC_HF_CREATE,58,219,80,14
+    COMBOBOX        IDC_HF_TYPE,58,243,80,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
+    EDITTEXT        IDC_HF_SIZE,154,219,61,15
+    LTEXT           "MB",IDC_STATIC,220,222,53,10,SS_CENTERIMAGE
+    EDITTEXT        IDC_HF_DOSTYPE,154,242,61,15
+    LTEXT           "DOS type",IDC_STATIC,220,244,51,10,SS_CENTERIMAGE
+    CONTROL         "Sparse file",IDC_HF_SPARSE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,280,228,87,10
+    CONTROL         "Dynamic HDF",IDC_HF_DYNAMIC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,280,240,87,10
+    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
+    COMBOBOX        IDC_PATH_GEOMETRY,52,32,325,75,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
+    PUSHBUTTON      "...",IDC_PATH_GEOMETRY_SELECTOR,380,31,11,15
+    RTEXT           "Geometry:",IDC_STATIC,6,34,41,10
 END
 
 IDD_FILESYS DIALOGEX 15, 25, 396, 111
@@ -755,60 +765,66 @@ BEGIN
     CONTROL         "Keep aspect ratio",IDC_GENLOCK_KEEP_ASPECT,"Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,13,242,214,10
 END
 
-IDD_CHIPSET2 DIALOGEX 0, 0, 396, 305
+IDD_CHIPSET2 DIALOGEX 0, 0, 396, 317
 STYLE DS_LOCALEDIT | DS_SETFONT | DS_3DLOOK | DS_CONTROL | WS_CHILD
 FONT 8, "MS Sans Serif", 0, 0, 0x0
 BEGIN
-    CONTROL         "Compatible Settings",IDC_CS_COMPATIBLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,6,234,10
-    GROUPBOX        "Battery Backed Up Real Time Clock",IDC_STATIC,1,22,394,31
-    CONTROL         "None",IDC_CS_RTC1,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,15,36,57,10
-    CONTROL         "MSM6242B",IDC_CS_RTC2,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,80,36,77,10
-    CONTROL         "RF5C01A",IDC_CS_RTC3,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,165,36,67,10
-    CONTROL         "A2000 MSM6242B",IDC_CS_RTC4,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,240,36,78,10
-    EDITTEXT        IDC_CS_RTCADJUST,325,34,64,13,ES_AUTOHSCROLL
-    GROUPBOX        "CIA-A TOD Clock Source",IDC_STATIC,1,56,394,29
-    CONTROL         "Vertical Sync",IDC_CS_CIAA_TOD1,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,41,68,86,10
-    CONTROL         "Power Supply 50Hz",IDC_CS_CIAA_TOD2,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,133,68,109,10
-    CONTROL         "Power Supply 60Hz",IDC_CS_CIAA_TOD3,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,248,68,116,10
-    GROUPBOX        "Chipset Features",IDC_STATIC,0,88,395,128
-    CONTROL         "CIA ROM Overlay",IDC_CS_CIAOVERLAY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,104,104,11
-    CONTROL         "CD32 CD",IDC_CS_CD32CD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,117,104,11
-    CONTROL         "CDTV CD",IDC_CS_CDTVCD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,130,105,11
-    CONTROL         "A600/A1200 IDE",IDC_CS_IDE1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,143,104,11
-    CONTROL         "ROM Mirror (E0)",IDC_CS_KSMIRROR_E0,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,156,104,11
-    CONTROL         "KB Reset Warning",IDC_CS_RESETWARNING,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,169,104,11
-    CONTROL         "CIA TOD bug",IDC_CS_CIATODBUG,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,182,104,11
-    CONTROL         "1M Chip / 0.5M+0.5M",IDC_CS_1MCHIPJUMPER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,195,104,11
-    CONTROL         "A1000 Boot RAM/ROM",IDC_CS_A1000RAM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,127,104,121,11
-    CONTROL         "CD32 C2P",IDC_CS_CD32C2P,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,127,117,121,11
-    CONTROL         "CDTV SRAM",IDC_CS_CDTVRAM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,127,130,121,11
-    CONTROL         "A4000/A4000T IDE",IDC_CS_IDE2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,127,143,121,11
-    CONTROL         "ROM Mirror (A8)",IDC_CS_KSMIRROR_A8,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,127,156,121,11
-    CONTROL         "No-EHB Denise",IDC_CS_NOEHB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,127,169,121,11
-    CONTROL         "Z3 Autoconfig",IDC_CS_Z3AUTOCONFIG,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,127,182,104,11
+    CONTROL         "Compatible Settings",IDC_CS_COMPATIBLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,4,234,10
+    GROUPBOX        "Battery Backed Up Real Time Clock",IDC_STATIC,1,18,394,31
+    CONTROL         "None",IDC_CS_RTC1,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,15,32,57,10
+    CONTROL         "MSM6242B",IDC_CS_RTC2,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,80,32,77,10
+    CONTROL         "RF5C01A",IDC_CS_RTC3,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,165,32,67,10
+    CONTROL         "A2000 MSM6242B",IDC_CS_RTC4,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,240,32,78,10
+    EDITTEXT        IDC_CS_RTCADJUST,325,30,64,13,ES_AUTOHSCROLL
+    GROUPBOX        "CIA-A TOD Clock Source",IDC_STATIC,1,52,394,27
+    CONTROL         "Vertical Sync",IDC_CS_CIAA_TOD1,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,41,63,86,10
+    CONTROL         "Power Supply 50Hz",IDC_CS_CIAA_TOD2,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,133,63,109,10
+    CONTROL         "Power Supply 60Hz",IDC_CS_CIAA_TOD3,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,248,63,116,10
+    GROUPBOX        "Chipset Features",IDC_STATIC,0,82,395,148
+    CONTROL         "CIA ROM Overlay",IDC_CS_CIAOVERLAY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,93,104,11
+    CONTROL         "CD32 CD",IDC_CS_CD32CD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,106,104,11
+    CONTROL         "CDTV CD",IDC_CS_CDTVCD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,119,105,11
+    CONTROL         "A600/A1200 IDE",IDC_CS_IDE1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,132,104,11
+    CONTROL         "ROM Mirror (E0)",IDC_CS_KSMIRROR_E0,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,145,104,11
+    CONTROL         "KB Reset Warning",IDC_CS_RESETWARNING,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,158,104,11
+    CONTROL         "CIA TOD bug",IDC_CS_CIATODBUG,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,171,104,11
+    CONTROL         "1M Chip / 0.5M+0.5M",IDC_CS_1MCHIPJUMPER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,184,104,11
+    CONTROL         "A1000 Boot RAM/ROM",IDC_CS_A1000RAM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,127,93,121,11
+    CONTROL         "CD32 C2P",IDC_CS_CD32C2P,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,127,106,121,11
+    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         "Custom register byte write bug",IDC_CS_BYTECUSTOMWRITEBUG,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,127,195,130,11
-    CONTROL         "DF0: ID Hardware",IDC_CS_DF0IDHW,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,264,104,125,11
-    CONTROL         "CD32 NVRAM",IDC_CS_CD32NVRAM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,264,117,125,11
-    CONTROL         "CDTV SRAM Expansion",IDC_CS_CDTVRAMEXP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,264,130,125,11
-    CONTROL         "CDTV-CR",IDC_CS_CDTVCR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,264,143,123,11
-    CONTROL         "PCMCIA",IDC_CS_PCMCIA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,264,156,125,11
-    CONTROL         "C00000 is Fast RAM",IDC_CS_SLOWISFAST,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,264,169,125,11
-    CONTROL         "A1000 Agnus (8361/8367)",IDC_CS_DIPAGNUS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,264,182,125,11
-    CONTROL         "Composite color burst",IDC_CS_COMPOSITECOLOR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,264,195,125,12
-    GROUPBOX        "Internal SCSI Hardware",IDC_STATIC,0,218,395,39
-    CONTROL         "A3000 WD33C93 SCSI",IDC_CS_DMAC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,236,108,11
-    CONTROL         "A4000T NCR53C710 SCSI",IDC_CS_DMAC2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,130,236,125,11
-    CONTROL         "CDTV WD33C93 SCSI",IDC_CS_CDTVSCSI,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,263,236,121,11
-    GROUPBOX        "Chipset Revision",IDC_STATIC,1,259,393,46
-    CONTROL         "Ramsey revision:",IDC_CS_RAMSEY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,34,275,97,11
-    CONTROL         "Fat Gary revision:",IDC_CS_FATGARY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,34,289,97,11
-    EDITTEXT        IDC_CS_RAMSEYREV,136,274,45,13,ES_AUTOHSCROLL
-    EDITTEXT        IDC_CS_FATGARYREV,136,288,45,13,ES_AUTOHSCROLL
-    CONTROL         "Agnus/Alice revision:",IDC_CS_AGNUS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,200,275,107,11
-    CONTROL         "Denise/Lisa revision:",IDC_CS_DENISE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,200,289,107,11
-    EDITTEXT        IDC_CS_AGNUSREV,311,274,45,13,ES_AUTOHSCROLL
-    EDITTEXT        IDC_CS_DENISEREV,311,289,45,13,ES_AUTOHSCROLL
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,127,184,130,11
+    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 SRAM Expansion",IDC_CS_CDTVRAMEXP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,264,119,125,11
+    CONTROL         "CDTV-CR",IDC_CS_CDTVCR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,264,132,123,11
+    CONTROL         "PCMCIA",IDC_CS_PCMCIA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,264,145,125,11
+    CONTROL         "C00000 is Fast RAM",IDC_CS_SLOWISFAST,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,264,158,125,11
+    CONTROL         "A1000 Agnus (8361/8367)",IDC_CS_DIPAGNUS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,264,171,125,11
+    CONTROL         "Composite color burst",IDC_CS_COMPOSITECOLOR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,264,184,125,12
+    GROUPBOX        "Internal SCSI Hardware",IDC_STATIC,0,232,395,30
+    CONTROL         "A3000 WD33C93 SCSI",IDC_CS_DMAC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,247,108,11
+    CONTROL         "A4000T NCR53C710 SCSI",IDC_CS_DMAC2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,130,247,125,11
+    CONTROL         "CDTV WD33C93 SCSI",IDC_CS_CDTVSCSI,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,263,247,121,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_UNMAPPED,125,212,113,75,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    RTEXT           "Unmapped address space:",IDC_STATIC,15,215,101,9
+    CONTROL         "Toshiba Gary",IDC_CS_TOSHIBAGARY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,197,106,12
+    CONTROL         "KS ROM has Chip RAM speed",IDC_CS_ROMISSLOW,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,127,198,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,198,125,12
 END
 
 IDD_AVIOUTPUT DIALOGEX 0, 0, 396, 260
@@ -920,25 +936,38 @@ BEGIN
     PUSHBUTTON      "Delete",IDC_FILTERPRESETDELETE,325,272,55,14
 END
 
-IDD_HARDDRIVE DIALOGEX 0, 0, 397, 136
+IDD_HARDDRIVE DIALOGEX 0, 0, 397, 219
 STYLE DS_LOCALEDIT | DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_3DLOOK | DS_CENTER | DS_CENTERMOUSE | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Harddrive Settings"
 FONT 8, "MS Sans Serif", 0, 0, 0x0
 BEGIN
-    LTEXT           "Hard drive:",IDC_STATIC,7,11,80,10
+    RTEXT           "Hard drive:",IDC_STATIC,7,11,38,10
     COMBOBOX        IDC_HARDDRIVE,49,9,339,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
-    EDITTEXT        IDC_HDFINFO,5,29,385,12,ES_CENTER | ES_READONLY
-    EDITTEXT        IDC_HDFINFO2,5,46,385,12,ES_CENTER | ES_READONLY
-    DEFPUSHBUTTON   "Create hard disk image file",IDC_HARDDRIVE_IMAGE,5,67,158,14
-    EDITTEXT        IDC_PATH_NAME,178,67,41,15,ES_AUTOHSCROLL | NOT WS_VISIBLE
-    CONTROL         "Read/write",IDC_HDF_RW,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,315,71,60,10
-    COMBOBOX        IDC_HDF_CONTROLLER_UNIT,65,90,97,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
-    COMBOBOX        IDC_HDF_CONTROLLER_TYPE,178,90,97,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
-    COMBOBOX        IDC_HDF_FEATURE_LEVEL,291,90,97,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
-    COMBOBOX        IDC_HDF_CONTROLLER,8,113,218,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
-    DEFPUSHBUTTON   "Add hard drive",IDOK,236,113,73,14
-    PUSHBUTTON      "Cancel",IDCANCEL,316,113,73,14
-    CONTROL         "Lock",IDC_HDF_LOCK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,243,71,61,10
+    EDITTEXT        IDC_HDFINFO,5,51,385,12,ES_CENTER | ES_READONLY
+    EDITTEXT        IDC_HDFINFO2,5,68,385,12,ES_CENTER | ES_READONLY
+    DEFPUSHBUTTON   "Read Identity",IDC_HARDDRIVE_ID,113,152,111,14,WS_DISABLED
+    EDITTEXT        IDC_PATH_NAME,17,190,41,15,ES_AUTOHSCROLL | NOT WS_VISIBLE
+    CONTROL         "Read/write",IDC_HDF_RW,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,171,90,56,10
+    COMBOBOX        IDC_HDF_CONTROLLER_UNIT,7,111,97,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_DISABLED | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX        IDC_HDF_CONTROLLER_TYPE,113,111,110,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_DISABLED | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX        IDC_HDF_FEATURE_LEVEL,7,152,97,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_DISABLED | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX        IDC_HDF_CONTROLLER,7,132,216,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_DISABLED | WS_VSCROLL | WS_TABSTOP
+    DEFPUSHBUTTON   "Add hard drive",IDOK,237,195,73,14,WS_DISABLED
+    PUSHBUTTON      "Cancel",IDCANCEL,316,195,73,14
+    CONTROL         "Lock",IDC_HDF_LOCK,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,233,90,55,10
+    DEFPUSHBUTTON   "Create hard disk image file",IDC_HARDDRIVE_IMAGE,5,88,158,14,WS_DISABLED
+    CONTROL         "Manual geometry",IDC_HDF_PHYSGEOMETRY,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,299,90,87,10
+    EDITTEXT        IDC_HEADS,347,109,40,15,ES_NUMBER | WS_DISABLED
+    EDITTEXT        IDC_SECTORS,347,128,40,15,ES_NUMBER | WS_DISABLED
+    EDITTEXT        IDC_RESERVED,347,147,40,15,ES_NUMBER | WS_DISABLED
+    EDITTEXT        IDC_BLOCKSIZE,347,166,40,15,ES_NUMBER | WS_DISABLED
+    RTEXT           "Surfaces:",IDC_SURFACES_TEXT,298,112,45,10
+    RTEXT           "Sectors:",IDC_SECTORS_TEXT,298,131,45,10
+    RTEXT           "Block size:",IDC_BLOCKSIZE_TEXT,299,168,45,10
+    RTEXT           "Cylinders:",IDC_CYLINDERS_TEXT,300,150,43,10
+    COMBOBOX        IDC_PATH_GEOMETRY,49,29,325,75,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_DISABLED | WS_VSCROLL | WS_TABSTOP
+    PUSHBUTTON      "...",IDC_PATH_GEOMETRY_SELECTOR,377,28,11,15,WS_DISABLED
+    RTEXT           "Geometry:",IDC_STATIC,3,31,41,10
 END
 
 IDD_MISC2 DIALOGEX 0, 0, 396, 278
@@ -1002,29 +1031,29 @@ IDD_PATHS DIALOGEX 0, 0, 396, 303
 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,167,8,SS_CENTERIMAGE
+    LTEXT           "System ROMs:",IDC_PATHS_ROML,3,2,138,8,SS_CENTERIMAGE
     EDITTEXT        IDC_PATHS_ROM,3,13,377,15,ES_AUTOHSCROLL
     PUSHBUTTON      "...",IDC_PATHS_ROMS,384,13,11,15
-    CONTROL         "Scan subfolders",IDC_PATHS_RECURSIVEROMS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,177,1,197,11
-    LTEXT           "Configuration files:",IDC_PATHS_CONFIGL,3,32,164,8,SS_CENTERIMAGE
+    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
     PUSHBUTTON      "...",IDC_PATHS_CONFIGS,384,43,11,15
-    CONTROL         "Cache Configuration files",IDC_PATHS_CONFIGCACHE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,177,31,197,11
-    LTEXT           "Screenshots:",IDC_PATHS_SCREENSHOTL,3,62,260,8,SS_CENTERIMAGE
+    CONTROL         "Cache Configuration files",IDC_PATHS_CONFIGCACHE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,147,31,99,11
+    LTEXT           "Screenshots:",IDC_PATHS_SCREENSHOTL,3,62,143,8,SS_CENTERIMAGE
     EDITTEXT        IDC_PATHS_SCREENSHOT,3,73,377,15,ES_AUTOHSCROLL
     PUSHBUTTON      "...",IDC_PATHS_SCREENSHOTS,384,72,11,15
-    LTEXT           "State files:",IDC_PATHS_STATEFILEL,3,91,260,8,SS_CENTERIMAGE
+    LTEXT           "State files:",IDC_PATHS_STATEFILEL,3,91,129,8,SS_CENTERIMAGE
     EDITTEXT        IDC_PATHS_SAVESTATE,3,102,377,15,ES_AUTOHSCROLL
     PUSHBUTTON      "...",IDC_PATHS_SAVESTATES,384,101,11,15
-    LTEXT           "Videos:",IDC_PATHS_AVIOUTPUTL,3,120,260,8,SS_CENTERIMAGE
+    LTEXT           "Videos:",IDC_PATHS_AVIOUTPUTL,3,120,130,8,SS_CENTERIMAGE
     EDITTEXT        IDC_PATHS_AVIOUTPUT,3,131,377,15,ES_AUTOHSCROLL
     PUSHBUTTON      "...",IDC_PATHS_AVIOUTPUTS,384,130,11,15
-    LTEXT           "Saveimages:",IDC_PATHS_SAVEIMAGEL,3,149,158,8,SS_CENTERIMAGE
+    LTEXT           "Saveimages:",IDC_PATHS_SAVEIMAGEL,3,149,129,8,SS_CENTERIMAGE
     EDITTEXT        IDC_PATHS_SAVEIMAGE,3,161,377,15,ES_AUTOHSCROLL
     PUSHBUTTON      "...",IDC_PATHS_SAVEIMAGES,384,160,11,15
     CONTROL         "Use original image's path",IDC_PATHS_SAVEIMAGEORIGINALPATH,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,177,148,197,11
-    LTEXT           "Rips:",IDC_PATHS_RIPSL,3,179,260,8,SS_CENTERIMAGE
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,147,148,197,11
+    LTEXT           "Rips:",IDC_PATHS_RIPSL,3,179,131,8,SS_CENTERIMAGE
     EDITTEXT        IDC_PATHS_RIP,3,190,377,15,ES_AUTOHSCROLL
     PUSHBUTTON      "...",IDC_PATHS_RIPS,383,189,11,15
     PUSHBUTTON      "Reset to defaults",IDC_PATHS_DEFAULT,2,212,92,14
@@ -1041,6 +1070,7 @@ BEGIN
     PUSHBUTTON      "Save All [] Create zip file that includes both logs and config file.",IDC_LOGSAVE,337,264,51,14
     PUSHBUTTON      "Open [] Open selected file.",IDC_LOGOPEN,337,280,51,14
     EDITTEXT        IDC_LOGPATH,7,281,324,13,ES_READONLY
+    CONTROL         "Cache Boxart files",IDC_PATHS_ARTCACHE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,267,30,125,11
 END
 
 IDD_QUICKSTART DIALOGEX 0, 0, 396, 262
@@ -1270,7 +1300,7 @@ CAPTION "Disk image information"
 FONT 8, "MS Sans Serif", 0, 0, 0x0
 BEGIN
     DEFPUSHBUTTON   "OK",IDOK,220,303,50,14
-    PUSHBUTTON      "Save bootblock",IDC_SAVEBOOTBLOCK,397,303,89,14,NOT WS_VISIBLE
+    PUSHBUTTON      "Save",IDC_SAVEBOOTBLOCK,397,303,89,14,NOT WS_VISIBLE
     EDITTEXT        IDC_DISKINFOBOX,5,4,481,292,ES_MULTILINE | ES_READONLY | WS_VSCROLL
 END
 
@@ -1289,11 +1319,14 @@ BEGIN
     PUSHBUTTON      "...",IDC_SCSIROMCHOOSER,376,42,10,15
     CONTROL         "Autoboot disabled",IDC_SCSIROMFILEAUTOBOOT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,202,62,99,12
     CONTROL         "",IDC_EXPANSIONBOARDCHECKBOX,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,202,76,99,12
+    EDITTEXT        IDC_EXPANSIONBOARDSTRINGBOX,202,76,172,14,ES_AUTOHSCROLL
+    COMBOBOX        IDC_EXPANSIONBOARDSELECTOR,202,76,171,75,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
     COMBOBOX        IDC_SCSIROMFILE,202,42,171,75,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
     GROUPBOX        "Accelerator Board Settings",IDC_STATIC,1,97,394,91
     COMBOBOX        IDC_CPUBOARD_TYPE,13,118,117,75,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     COMBOBOX        IDC_CPUBOARD_SUBTYPE,13,137,117,75,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     COMBOBOX        IDC_ACCELERATORBOARDITEMSELECTOR,12,169,157,75,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX        IDC_ACCELERATORBOARDSELECTOR,202,169,171,75,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
     RTEXT           "Accelerator board memory:",IDC_STATIC,155,145,104,15,SS_CENTERIMAGE
     LTEXT           "Accelerator board ROM file:",IDC_STATIC,203,105,170,15,SS_CENTERIMAGE
     COMBOBOX        IDC_CPUBOARDROMFILE,202,120,169,75,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
@@ -1303,14 +1336,28 @@ BEGIN
     CONTROL         "",IDC_ACCELERATORBOARDCHECKBOX,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,202,170,99,12
     GROUPBOX        "Miscellaneous Expansions",IDC_STATIC,1,192,394,51
     CONTROL         "bsdsocket.library [] bsdsocket network library emulation.",IDC_SOCKETS,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,207,187,11
-    CONTROL         "uaescsi.device",IDC_SCSIDEVICE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,223,147,11
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,207,179,11
+    CONTROL         "uaescsi.device",IDC_SCSIDEVICE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,223,180,11
     CONTROL         "uaenet.device [] Sana 2 compatible network device emulation.",IDC_SANA2,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,193,207,187,11
-    CONTROL         "CD32 Full Motion Video cartridge",IDC_CS_CD32FMV,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,193,223,151,11
+    CONTROL         "CD32 Full Motion Video cartridge",IDC_CS_CD32FMV,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,193,223,193,11
     CONTROL         "Enabled",IDC_SCSIROMSELECTED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,202,43,99,12
-    COMBOBOX        IDC_EXPANSIONBOARDSELECTOR,202,76,171,75,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
-    COMBOBOX        IDC_ACCELERATORBOARDSELECTOR,202,169,171,75,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
+END
+
+IDD_CHSQUERY DIALOGEX 0, 0, 396, 85
+STYLE DS_LOCALEDIT | DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_3DLOOK | DS_CENTER | DS_CENTERMOUSE | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "CHS Geometry"
+FONT 8, "MS Sans Serif", 0, 0, 0x0
+BEGIN
+    PUSHBUTTON      "OK",IDOK,59,57,135,15
+    PUSHBUTTON      "Cancel",IDCANCEL,201,57,135,15
+    EDITTEXT        IDC_CHS_CYLINDERS,86,32,45,13,ES_AUTOHSCROLL
+    EDITTEXT        IDC_CHS_HEADS,204,32,45,13,ES_AUTOHSCROLL
+    EDITTEXT        IDC_CHS_SECTORS,322,32,45,13,ES_AUTOHSCROLL
+    RTEXT           "Cylinders:",IDC_STATIC,27,33,45,9
+    RTEXT           "Heads:",IDC_STATIC,145,33,45,9
+    RTEXT           "Sectors:",IDC_STATIC,263,33,45,9
+    CTEXT           "Imaging CHS-only IDE drive requires correct geometry. Check drive label.",IDC_STATIC,39,10,330,9
 END
 
 
@@ -1320,8 +1367,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,5,0,0
- PRODUCTVERSION 3,5,0,0
+ FILEVERSION 3,6,0,0
+ PRODUCTVERSION 3,6,0,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -1337,12 +1384,12 @@ BEGIN
         BLOCK "040904b0"
         BEGIN
             VALUE "FileDescription", "WinUAE"
-            VALUE "FileVersion", "3.5.0.0"
+            VALUE "FileVersion", "3.6.0.0"
             VALUE "InternalName", "WinUAE"
-            VALUE "LegalCopyright", "© 1996-2017 under the GNU Public License (GPL)"
+            VALUE "LegalCopyright", "© 1996-2018 under the GNU Public License (GPL)"
             VALUE "OriginalFilename", "WinUAE.exe"
             VALUE "ProductName", "WinUAE"
-            VALUE "ProductVersion", "3.5.0.0"
+            VALUE "ProductVersion", "3.6.0.0"
         END
     END
     BLOCK "VarFileInfo"
@@ -1439,7 +1486,6 @@ BEGIN
     END
 END
 
-
 /////////////////////////////////////////////////////////////////////////////
 //
 // DESIGNINFO
@@ -1549,6 +1595,7 @@ BEGIN
     IDD_HARDDRIVE, DIALOG
     BEGIN
         RIGHTMARGIN, 396
+        BOTTOMMARGIN, 195
     END
 
     IDD_MISC2, DIALOG
@@ -1623,6 +1670,10 @@ BEGIN
     IDD_EXPANSION2, DIALOG
     BEGIN
     END
+
+    IDD_CHSQUERY, DIALOG
+    BEGIN
+    END
 END
 #endif    // APSTUDIO_INVOKED
 
@@ -1824,8 +1875,8 @@ BEGIN
     IDS_SCREEN_WINDOWED     "Windowed"
     IDS_SCREEN_FULLSCREEN   "Fullscreen"
     IDS_SCREEN_FULLWINDOW   "Full-window"
-    IDS_SCREEN_VSYNC        "Legacy VSync"
-    IDS_SCREEN_VSYNC_AUTOSWITCH "Legacy VS, 50/60Hz"
+    IDS_SCREEN_VSYNC        "Standard VSync"
+    IDS_SCREEN_VSYNC_AUTOSWITCH "Standard VS, 50/60Hz"
     IDS_SOUND_MONO          "Mono"
     IDS_SOUND_MIXED         "Mixed"
     IDS_SOUND_STEREO        "Stereo"
@@ -1865,7 +1916,7 @@ BEGIN
                             "you selected an RTG (Picasso96) display with unsupported color depth."
     IDS_FLOPPYTYPE35DD      "3.5"" DD"
     IDS_FLOPPYTYPE35HD      "3.5"" HD"
-    IDS_FLOPPYTYPE525SD     "5.25"" SD"
+    IDS_FLOPPYTYPE525SD     "5.25"" (40)"
     IDS_FLOPPYTYPEDISABLED  "Disabled"
     IDS_STMENUNOFLOPPY      "No floppy disk inserted"
     IDS_TREEVIEW_HARDWARE   "Hardware"
@@ -1935,7 +1986,7 @@ BEGIN
     IDS_NUMSG_KICKREP       "You need to have a floppy disk (image file) in DF0: to use the system ROM replacement."
     IDS_NUMSG_KICKREPNO     "The floppy disk (image file) in DF0: is not compatible with the system ROM replacement functionality."
     IDS_NUMSG_NOROM         "Could not load system ROM, trying system ROM replacement."
-    IDS_HDCLONE_OK          "Hard drive image file created succesfully."
+    IDS_HDCLONE_OK          "Hard drive image file created successfully."
     IDS_HDCLONE_FAIL        "Hard drive image file creation failed.\nError %d:%d (%s)."
     IDS_NUMSG_KS68030       "The selected system ROM requires a 68030 CPU."
     IDS_NUMSG_EXPROMNEED    "One of the following expansion boot ROMs is required:\n\n%s\n\nCheck the System ROM path in the Paths panel and click Rescan ROMs."
@@ -1951,7 +2002,7 @@ BEGIN
     IDS_QS_MODEL_A600       "Basic non-expanded configuration\nThe A600 is smaller than the A500+ and has an updated 2.0 ROM.\n2 MB Chip RAM expanded configuration\n\n4 MB Fast RAM expanded configuration\n"
     IDS_QS_MODEL_A1000      "512 KB Chip RAM\nThe A1000 was the first model produced, with a configuration equivalent to that of an A500 with OCS chipset. You normally don't need to use this configuration, unless you are nostalgic and would like to hear the short A1000 boot tune\n""ICS"" Denise without EHB support\nVery first A1000 models had Denise without EHB capability.\n256 KB Chip RAM\n Unexpanded A1000. All later A1000 models were sold with a 256 KB RAM expansion built-in.\nA1000 ""Velvet"" Prototype\n"
     IDS_QS_MODEL_A1200      "Basic non-expanded configuration\nUse this configuration to run most AGA demos and games\n4 MB Fast RAM expanded configuration\nSome newer AGA games and demos need an expanded A1200 to run.\nBlizzard 1230 IV\n\nBlizzard 1240\n\nBlizzard 1260\n\nBlizzard PPC\n"
-    IDS_QS_MODEL_CD32       "CD32\nThe CD32 was one the first 32-bit consoles on the market. It is basically an A1200 with a built-in CD-ROM drive. Insert your CD32 or CDTV CD-ROM into a free CD-ROM drive before starting the emulation.\nCD32 with Full Motion Video cartridge\n"
+    IDS_QS_MODEL_CD32       "CD32\nThe CD32 was one the first 32-bit consoles on the market. It is basically an A1200 with a built-in CD-ROM drive. Insert your CD32 or CDTV CD-ROM into a free CD-ROM drive before starting the emulation.\nCD32 with Full Motion Video cartridge\n\nCubo CD32\n"
     IDS_QS_MODEL_CDTV       "CDTV\nThe CDTV was the first model with a built-in CD-ROM drive. Looking like a black CD player, it featured a configuration equivalent to that of an A500 with 1 MB RAM and an ECS chipset.\nFloppy drive and 64KB SRAM card expanded CDTV\n\nCDTV-CR\n"
 END
 
@@ -2053,6 +2104,12 @@ BEGIN
     IDS_SLIRP_INBOUND       "SLIRP + Open ports (21-23,80)"
 END
 
+STRINGTABLE
+BEGIN
+    IDS_MISCLISTITEMS4      "Windows shutdown/logoff notification\n"
+    IDS_SHUTDOWN_NOTIFICATION "Emulation session active"
+END
+
 STRINGTABLE
 BEGIN
     IDS_FILTER_PAL_EXTRA    "Brightness\nContrast\nSaturation\nGamma\nScanlines\nBlurriness\nNoise\n"

diff --git a/od-win32/win32.cpp b/od-win32/win32.cpp
index f91a895ddf27d5a86a494d7a3d6cfdab7b2818a3..fd13aa0d5822b7216765c2d4b98e78ea40e1c82a 100644 (file)
--- a/od-win32/win32.cpp
+++ b/od-win32/win32.cpp
@@ -1580,7 +1580,7 @@ static LRESULT CALLBACK AmigaWindowProc (HWND hWnd, UINT message, WPARAM wParam,
                winuae_active(hWnd, minimized);
                unsetminimized();
                dx_check();
-               break;
+               return 0;
        case WM_SIZE:
                //write_log (_T("WM_SIZE %d\n"), wParam);
                if (hStatusWnd)
@@ -1597,7 +1597,7 @@ static LRESULT CALLBACK AmigaWindowProc (HWND hWnd, UINT message, WPARAM wParam,
                        write_log(_T("WM_SIZE\n"));
                        D3D_resize(0);
                }
-               break;
+               return 0;
        case WM_ACTIVATE:
                //write_log (_T("active %d\n"), LOWORD(wParam));
                if (LOWORD(wParam) == WA_INACTIVE) {
@@ -1608,7 +1608,7 @@ static LRESULT CALLBACK AmigaWindowProc (HWND hWnd, UINT message, WPARAM wParam,
                        winuae_inactive(hWnd, minimized);
                }
                dx_check();
-               break;
+               return 0;
        case WM_MOUSEACTIVATE:
                if (isfocus() == 0)
                        ignorelbutton = true;
@@ -1630,7 +1630,7 @@ static LRESULT CALLBACK AmigaWindowProc (HWND hWnd, UINT message, WPARAM wParam,
                rp_activate(wParam, lParam);
 #endif
                dx_check();
-               break;
+               return 0;
 
        case WM_KEYDOWN:
                if (dinput_wmkey((uae_u32)lParam))
@@ -6900,6 +6900,7 @@ void systray (HWND hwnd, int remove)
        static const GUID iconguid = { 0xdac2e99b, 0xe8f6, 0x4150, { 0x98, 0x46, 0xd, 0x4a, 0x61, 0xfb, 0xdd, 0x03 } };
        NOTIFYICONDATA nid;
        BOOL v;
+       static bool noguid;
 
        if (!remove && currprefs.win32_nonotificationicon)
                return;
@@ -6908,9 +6909,11 @@ void systray (HWND hwnd, int remove)
        if (rp_isactive ())
                return;
 #endif
+       bool canguid = !noguid && os_win7;
        //write_log (_T("notif: systray(%x,%d)\n"), hwnd, remove);
        if (!remove) {
-               TaskbarRestart = RegisterWindowMessage (_T("TaskbarCreated"));
+               if (!TaskbarRestart)
+                       TaskbarRestart = RegisterWindowMessage (_T("TaskbarCreated"));
                TaskbarRestartHWND = hwnd;
                //write_log (_T("notif: taskbarrestart = %d\n"), TaskbarRestart);
        } else {
@@ -6923,14 +6926,14 @@ void systray (HWND hwnd, int remove)
        nid.cbSize = sizeof (nid);
        nid.hWnd = hwnd;
        nid.hIcon = LoadIcon (hInst, (LPCWSTR)MAKEINTRESOURCE (IDI_APPICON));
-       nid.uFlags = NIF_ICON | NIF_MESSAGE | (os_win7 ? NIF_GUID : 0);
+       nid.uFlags = NIF_ICON | NIF_MESSAGE | (canguid ? NIF_GUID : 0);
        nid.uCallbackMessage = WM_USER + 1;
        nid.uVersion = os_win7 ? NOTIFYICON_VERSION_4 : NOTIFYICON_VERSION;
        nid.dwInfoFlags = NIIF_USER;
        _tcscpy(nid.szInfo, _T("WinUAE"));
        _tcscpy(nid.szInfoTitle, _T("WinUAE"));
        nid.hBalloonIcon = nid.hIcon;
-       if (os_win7) {
+       if (canguid) {
                nid.guidItem = iconguid;
                if (!remove) {
                        // if guid identifier: always remove first.
@@ -6939,6 +6942,12 @@ void systray (HWND hwnd, int remove)
                }
        }
        v = Shell_NotifyIcon (remove ? NIM_DELETE : NIM_ADD, &nid);
+       if (!remove && !v && !noguid) {
+               noguid = true;
+               write_log(_T("Notify error2 = %x %d\n"), GetLastError(), remove);
+               return systray(hwnd, remove);
+       }
+
        //write_log (_T("notif: Shell_NotifyIcon returned %d\n"), v);
        if (v) {
                if (remove) {
@@ -6947,8 +6956,7 @@ void systray (HWND hwnd, int remove)
                        v = Shell_NotifyIcon(NIM_SETVERSION, &nid);
                }
        } else {
-               DWORD err = GetLastError ();
-               write_log (_T("Notify error code = %x (%d)\n"),  err, err);
+               write_log (_T("Notify error = %x %d\n"), GetLastError(), remove);
        }
 }
 

diff --git a/od-win32/win32.h b/od-win32/win32.h
index 7b5743e963cf2a55dbbcd58ec3e5520aaf12a5d6..b7a9643317717d0e0ae09447fdf12beddf4871b1 100644 (file)
--- a/od-win32/win32.h
+++ b/od-win32/win32.h
@@ -25,7 +25,7 @@
 #define WINUAEBETA _T("")
 #endif
 
-#define WINUAEDATE MAKEBD(2018, 1, 15)
+#define WINUAEDATE MAKEBD(2018, 1, 17)
 
 //#define WINUAEEXTRA _T("AmiKit Preview")
 //#define WINUAEEXTRA _T("Amiga Forever Edition")

diff --git a/od-win32/win32gfx.cpp b/od-win32/win32gfx.cpp
index 7b7653b20d01df23ca1e62eb7de832aa4274e0f5..a29f3f62f5685f9361df16d79e006f7a17e67ccd 100644 (file)
--- a/od-win32/win32gfx.cpp
+++ b/od-win32/win32gfx.cpp
@@ -4427,7 +4427,7 @@ static int create_windows_2 (void)
                        ShowWindow (hMainWnd, firstwindow ? (currprefs.win32_start_minimized ? SW_SHOWMINIMIZED : SW_SHOWDEFAULT) : SW_SHOWNORMAL);
                UpdateWindow (hMainWnd);
        }
-       if (!currprefs.headless && !rp_isactive () && !D3D_resize)
+       if (!currprefs.headless && !rp_isactive ())
                ShowWindow (hAmigaWnd, SW_SHOWNORMAL);
        UpdateWindow (hAmigaWnd);
        firstwindow = false;

diff --git a/od-win32/winuaechangelog.txt b/od-win32/winuaechangelog.txt
index dd51a4399113448cd165f99a92a4796f16e6d6e4..4bdf8c39448732d75e56332b78bfd3f146e021a0 100644 (file)
--- a/od-win32/winuaechangelog.txt
+++ b/od-win32/winuaechangelog.txt
@@ -4,6 +4,10 @@ JIT Direct current rules are less complex now. It automatically switches off onl
   - RTG VRAM is outside of reserved natmem space. Workaround: Move RTG in earlier position using Hardware info GUI panel.\r
   Note that in 64-bit version RTG VRAM must be inside of reserved natmem space. (Outside = error message and return back to GUI)\r
 \r
+3.6.0\r
+\r
+- Main window was not activated early enough, it was possible to get logged D3D11 fullscreen error and automatic fallback to windowed mode in some situations.\r
+\r
 Beta 19:\r
 \r
 - D3D11 fullscreen and GUI open: Quit/Restart did unnecessary fullscreen open and close. (Was working in some betas, broke later)\r

diff --git a/od-win32/wix/makemsi.cmd b/od-win32/wix/makemsi.cmd
new file mode 100644 (file)
index 0000000..af3abb2
--- /dev/null
+++ b/od-win32/wix/makemsi.cmd
@@ -0,0 +1,13 @@
+
+copy d:\amiga\text\winuaechangelog.txt c:\projects\winuae\src\od-win32
+copy d:\amiga\text\winuaechangelog.txt c:\projects\winuae\distribution\docs
+
+"C:\Program Files (x86)\WiX Toolset v3.11\bin\candle.exe" -d"DevEnvDir=C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\IDE\\" -dSolutionDir=C:\projects\winuae\src\od-win32\winuae_msvc15\ -dSolutionExt=.sln -dSolutionFileName=winuae_msvc.sln -dSolutionName=winuae_msvc -dSolutionPath=C:\projects\winuae\src\od-win32\winuae_msvc15\winuae_msvc.sln -dConfiguration=Release -dOutDir=bin\Release\ -dPlatform=x86 -dProjectDir=C:\projects\winuae\src\od-win32\wix\ -dProjectExt=.wixproj -dProjectFileName=wix.wixproj -dProjectName=wix -dProjectPath=C:\projects\winuae\src\od-win32\wix\wix.wixproj -dTargetDir=C:\projects\winuae\src\od-win32\wix\bin\Release\ -dTargetExt=.msi -dTargetFileName=winuae.msi -dTargetName=winuae -dTargetPath=C:\projects\winuae\src\od-win32\wix\bin\Release\winuae.msi -dwinuae.Configuration=Release -d"winuae.FullConfiguration=Release|Win32" -dwinuae.Platform=Win32 -dwinuae.ProjectDir=C:\projects\winuae\src\od-win32\winuae_msvc14\ -dwinuae.ProjectExt=.vcxproj -dwinuae.ProjectFileName=winuae_msvc.vcxproj -dwinuae.ProjectName=winuae_msvc -dwinuae.ProjectPath=C:\projects\winuae\src\od-win32\winuae_msvc14\winuae_msvc.vcxproj -dwinuae.TargetDir=d:\amiga\ -dwinuae.TargetExt=.exe -dwinuae.TargetFileName=winuae.exe -dwinuae.TargetName=winuae -dwinuae.TargetPath=d:\amiga\winuae.exe -out obj\Release\ -arch x86 -ext "C:\Program Files (x86)\WiX Toolset v3.11\bin\\WixUIExtension.dll" Product.wxs WixUI_FeatureTree_NL.wxs
+
+"C:\Program Files (x86)\WiX Toolset v3.11\bin\Light.exe" -out C:\projects\winuae\src\od-win32\wix\bin\winuae.msi -pdbout C:\projects\winuae\src\od-win32\wix\bin\Release\winuae.wixpdb -cultures:null -ext "C:\Program Files (x86)\WiX Toolset v3.11\bin\\WixUIExtension.dll" -contentsfile obj\Release\wix.wixproj.BindContentsFileListnull.txt -outputsfile obj\Release\wix.wixproj.BindOutputsFileListnull.txt -builtoutputsfile obj\Release\wix.wixproj.BindBuiltOutputsFileListnull.txt -wixprojectfile C:\projects\winuae\src\od-win32\wix\wix.wixproj obj\Release\Product.wixobj obj\Release\WixUI_FeatureTree_NL.wixobj
+
+
+
+"C:\Program Files (x86)\WiX Toolset v3.11\bin\candle.exe" -d"DevEnvDir=C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\IDE\\" -dSolutionDir=C:\projects\winuae\src\od-win32\winuae_msvc15\ -dSolutionExt=.sln -dSolutionFileName=winuae_msvc.sln -dSolutionName=winuae_msvc -dSolutionPath=C:\projects\winuae\src\od-win32\winuae_msvc15\winuae_msvc.sln -dConfiguration=Release -dOutDir=bin\Release\ -dPlatform=x64 -dProjectDir=C:\projects\winuae\src\od-win32\wix\ -dProjectExt=.wixproj -dProjectFileName=wix.wixproj -dProjectName=wix -dProjectPath=C:\projects\winuae\src\od-win32\wix\wix.wixproj -dTargetDir=C:\projects\winuae\src\od-win32\wix\bin\Release\ -dTargetExt=.msi -dTargetFileName=winuae.msi -dTargetName=winuae -dTargetPath=C:\projects\winuae\src\od-win32\wix\bin\Release\winuae.msi -dwinuae.Configuration=Release -d"winuae.FullConfiguration=Release|x64" -dwinuae.Platform=x64 -dwinuae.ProjectDir=C:\projects\winuae\src\od-win32\winuae_msvc14\ -dwinuae.ProjectExt=.vcxproj -dwinuae.ProjectFileName=winuae_msvc.vcxproj -dwinuae.ProjectName=winuae_msvc -dwinuae.ProjectPath=C:\projects\winuae\src\od-win32\winuae_msvc14\winuae_msvc.vcxproj -dwinuae.TargetDir=d:\amiga\ -dwinuae.TargetExt=.exe -dwinuae.TargetFileName=winuae64.exe -dwinuae.TargetName=winuae64 -dwinuae.TargetPath=d:\amiga\winuae64.exe -out obj\Release\ -arch x64 -ext "C:\Program Files (x86)\WiX Toolset v3.11\bin\\WixUIExtension.dll" Product.wxs WixUI_FeatureTree_NL.wxs
+
+"C:\Program Files (x86)\WiX Toolset v3.11\bin\Light.exe" -out C:\projects\winuae\src\od-win32\wix\bin\winuae64.msi -pdbout C:\projects\winuae\src\od-win32\wix\bin\Release\winuae.wixpdb -cultures:null -ext "C:\Program Files (x86)\WiX Toolset v3.11\bin\\WixUIExtension.dll" -contentsfile obj\Release\wix.wixproj.BindContentsFileListnull.txt -outputsfile obj\Release\wix.wixproj.BindOutputsFileListnull.txt -builtoutputsfile obj\Release\wix.wixproj.BindBuiltOutputsFileListnull.txt -wixprojectfile C:\projects\winuae\src\od-win32\wix\wix.wixproj obj\Release\Product.wixobj obj\Release\WixUI_FeatureTree_NL.wixobj