6020

diff --git a/od-win32/resources/winuae_minimal.rc b/od-win32/resources/winuae_minimal.rc
index bc2dba68f6b90e2d14b83408f49f17f83288023b..e8df1e5bc7dd35c2bbb74497e42effbe3ebdaeae 100644 (file)
--- a/od-win32/resources/winuae_minimal.rc
+++ b/od-win32/resources/winuae_minimal.rc
@@ -176,15 +176,15 @@ BEGIN
     COMBOBOX        IDC_SCREENMODE_RTG,54,122,71,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
     COMBOBOX        IDC_SCREENMODE_RTG2,131,122,107,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
     CONTROL         "Blacker than black [] Borderblanked black is blacker than display area black.",IDC_BLACKER_THAN_BLACK,
-                    "Button",BS_AUTOCHECKBOX | BS_LEFT | WS_TABSTOP,11,144,139,10
+                    "Button",BS_AUTOCHECKBOX | BS_LEFT | WS_TABSTOP,11,142,139,10
     CONTROL         "Remove interlace artifacts [] Emulates interlace mode internally as progressive, removing all interlace artifacts. Not compatible with all software.",IDC_FLICKERFIXER,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,158,139,10
-    CONTROL         "Monochrome video out",IDC_GRAYSCALE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,171,139,10
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,155,139,10
+    CONTROL         "Monochrome video out",IDC_GRAYSCALE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,167,139,10
     CONTROL         "Filtered low resolution [] When scaling hires to lores or superhires to hires, show average color of pixel instead of dropping every other pixel.",IDC_LORES_SMOOTHED,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,155,144,123,10
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,155,142,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
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,155,155,124,10
+    CONTROL         "Display resync blanking",IDC_RESYNCBLANK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,155,168,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
@@ -229,7 +229,7 @@ BEGIN
     EDITTEXT        IDC_CHIPRAM,135,44,40,12,ES_CENTER | ES_READONLY
     RTEXT           "Z2 Fast:",IDC_STATIC,8,68,60,15,SS_CENTERIMAGE
     CONTROL         "Slider1",IDC_FASTMEM,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,68,66,60,20
-    EDITTEXT        IDC_FASTRAM,135,72,40,12,ES_CENTER | ES_READONLY
+    EDITTEXT        IDC_FASTRAM,135,69,40,12,ES_CENTER | ES_READONLY
     RTEXT           "Slow:",IDC_STATIC,179,44,66,15,SS_CENTERIMAGE
     CONTROL         "Slider1",IDC_SLOWMEM,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,248,41,60,20
     EDITTEXT        IDC_SLOWRAM,311,44,40,12,ES_CENTER | ES_READONLY
@@ -262,6 +262,9 @@ BEGIN
     LTEXT           "Z3 mapping mode:",IDC_STATIC,263,256,115,15,SS_CENTERIMAGE
     COMBOBOX        IDC_Z3MAPPING,262,276,117,75,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     CONTROL         "Slow RAM",IDC_FASTMEMSLOW,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,261,238,103,8
+    RTEXT           "Processor slot:",IDC_STATIC,8,93,60,15,SS_CENTERIMAGE
+    CONTROL         "",IDC_CPUSLOTMEM,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,68,93,60,20
+    EDITTEXT        IDC_CPUSLOTRAM,135,93,40,12,ES_CENTER | ES_READONLY
 END
 
 IDD_CPU DIALOGEX 0, 0, 396, 316
@@ -958,23 +961,23 @@ BEGIN
     RTEXT           "Horiz. size:",-1,7,87,81,10,SS_CENTERIMAGE
     COMBOBOX        IDC_FILTERHZMULT,92,86,35,150,CBS_DROPDOWN | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
     CONTROL         "Slider1",IDC_FILTERHZ,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,147,80,152,19
-    EDITTEXT        IDC_FILTERHZV,316,82,42,12,ES_CENTER | ES_READONLY
+    EDITTEXT        IDC_FILTERHZV,316,82,42,12,ES_CENTER
     RTEXT           "Vert. size:",-1,7,108,81,10,SS_CENTERIMAGE
     COMBOBOX        IDC_FILTERVZMULT,92,107,35,150,CBS_DROPDOWN | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
     CONTROL         "Slider1",IDC_FILTERVZ,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,147,101,152,19
-    EDITTEXT        IDC_FILTERVZV,316,103,42,12,ES_CENTER | ES_READONLY
+    EDITTEXT        IDC_FILTERVZV,316,103,42,12,ES_CENTER
     RTEXT           "Horiz. position:",-1,5,129,81,10,SS_CENTERIMAGE
     CONTROL         "Slider1",IDC_FILTERHO,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,147,122,151,19
-    EDITTEXT        IDC_FILTERHOV,316,124,42,12,ES_CENTER | ES_READONLY
+    EDITTEXT        IDC_FILTERHOV,316,124,42,12,ES_CENTER
     RTEXT           "Vert. position:",-1,5,149,81,10,SS_CENTERIMAGE
     CONTROL         "Slider1",IDC_FILTERVO,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,147,143,151,19
-    EDITTEXT        IDC_FILTERVOV,316,145,42,12,ES_CENTER | ES_READONLY
+    EDITTEXT        IDC_FILTERVOV,316,145,42,12,ES_CENTER
     GROUPBOX        "Aspect Ratio Correction",-1,1,173,144,89
-    COMBOBOX        IDC_FILTERASPECT,14,190,99,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX        IDC_FILTERASPECT,14,187,99,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
     CONTROL         "Keep autoscale aspect",IDC_FILTERKEEPAUTOSCALEASPECT,
-                    "Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,14,210,126,11
-    CONTROL         "Keep aspect ratio",IDC_FILTERKEEPASPECT,"Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,14,225,126,11
-    COMBOBOX        IDC_FILTERASPECT2,14,241,99,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
+                    "Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,14,205,126,11
+    CONTROL         "Keep aspect ratio",IDC_FILTERKEEPASPECT,"Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,14,218,126,11
+    COMBOBOX        IDC_FILTERASPECT2,14,244,99,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
     GROUPBOX        "Extra Settings",-1,154,173,240,89
     COMBOBOX        IDC_FILTERXTRA,177,193,138,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
     COMBOBOX        IDC_FILTERSLR,327,193,41,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
@@ -985,6 +988,8 @@ 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         "Always stretch NTSC mode [] NTSC modes are strecthed to match PAL mode",IDC_SCALENTSC,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,231,125,10
 END
 
 IDD_HARDDRIVE DIALOGEX 0, 0, 397, 208
@@ -1286,6 +1291,10 @@ BEGIN
     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         "Native/RTG autoswitch",IDC_RTG_SWITCHER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,195,130,95,10
+    COMBOBOX        IDC_MONITOREMU_ACTIVEMON,316,37,65,65,CBS_DROPDOWNLIST | NOT WS_VISIBLE | WS_VSCROLL | WS_TABSTOP
+    LTEXT           "Active output:",IDC_STATIC,249,37,62,10,NOT WS_VISIBLE,WS_EX_RIGHT
+    CONTROL         "Override initial native chipset display",IDC_RTG_INITIAL_MONITOR,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,249,63,131,10
 END
 
 IDD_INPUTMAP DIALOGEX 0, 0, 421, 293
@@ -1437,8 +1446,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 6,0,1,0
- PRODUCTVERSION 6,0,1,0
+ FILEVERSION 6,0,2,0
+ PRODUCTVERSION 6,0,2,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -1454,12 +1463,12 @@ BEGIN
         BLOCK "040904b0"
         BEGIN
             VALUE "FileDescription", "WinUAE"
-            VALUE "FileVersion", "6.0.1.0"
+            VALUE "FileVersion", "6.0.2.0"
             VALUE "InternalName", "WinUAE"
             VALUE "LegalCopyright", "© 1996-2025 under the GNU Public License (GPL)"
             VALUE "OriginalFilename", "WinUAE.exe"
             VALUE "ProductName", "WinUAE"
-            VALUE "ProductVersion", "6.0.1.0"
+            VALUE "ProductVersion", "6.0.2.0"
         END
     END
     BLOCK "VarFileInfo"
@@ -1556,6 +1565,8 @@ BEGIN
     END
 END
 
+
+
 /////////////////////////////////////////////////////////////////////////////
 //
 // DESIGNINFO

diff --git a/od-win32/winuaechangelog.txt b/od-win32/winuaechangelog.txt
index e9a53f96357398b0c320a0dd851b9f30c5c04e7e..94f8f6d37f9094c29bb5d54506a1e326ccbd8a0c 100644 (file)
--- a/od-win32/winuaechangelog.txt
+++ b/od-win32/winuaechangelog.txt
@@ -1,4 +1,6 @@
 
+6.0.2:
+
 Beta 12:
 
 - Only some filter numeric edit boxes adjusted the sliders correctly.

diff --git a/od-win32/wix/Product.wxs b/od-win32/wix/Product.wxs
index d4342b85713cf2d57c616103c3308278e754cc82..366715abe14021c4306016e8471aa7bf9d784f81 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 = "6.0.1" ?>
-  <?define ProductFullVersion = "6.0.1.0" ?>
+  <?define ProductVersion = "6.0.2" ?>
+  <?define ProductFullVersion = "6.0.2.0" ?>
   <?define ProductAuthor = "Arabuusimiehet" ?>
 
   <?if $(var.Platform) = x64 ?>