6030

diff --git a/od-win32/resources/winuae_minimal.rc b/od-win32/resources/winuae_minimal.rc
index e8df1e5bc7dd35c2bbb74497e42effbe3ebdaeae..e3339347e615cecaaee2b9a18a73c98604d2d06a 100644 (file)
--- a/od-win32/resources/winuae_minimal.rc
+++ b/od-win32/resources/winuae_minimal.rc
@@ -423,9 +423,10 @@ BEGIN
     PUSHBUTTON      "Select image file",IDC_CD_SELECT,177,266,98,15
     COMBOBOX        IDC_CD_TYPE,282,267,71,50,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     PUSHBUTTON      "Eject",IDC_CD_EJECT,360,266,30,15
-    COMBOBOX        IDC_CD_TEXT,5,285,386,75,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX        IDC_CD_TEXT,42,285,348,75,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
     CONTROL         "CDTV/CDTV-CR/CD32 turbo CD read speed",IDC_CD_SPEED,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,301,201,11
+    COMBOBOX        IDC_CD_NUMBER,9,285,26,50,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
 END
 
 IDD_SOUND DIALOGEX 0, 0, 396, 316
@@ -1339,17 +1340,17 @@ BEGIN
     CONTROL         "",IDC_LISTDIALOG_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,7,7,302,171
 END
 
-IDD_CDDRIVE DIALOGEX 0, 0, 395, 125
+IDD_CDDRIVE DIALOGEX 0, 0, 395, 201
 STYLE DS_LOCALEDIT | DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_3DLOOK | DS_CENTER | DS_CENTERMOUSE | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "CD Settings"
 FONT 8, "MS Sans Serif", 0, 0, 0x0
 BEGIN
-    CONTROL         "",IDC_CDLIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP,4,4,387,77
-    RTEXT           "HD Controller:",IDC_STATIC,7,90,65,10,SS_CENTERIMAGE
-    COMBOBOX        IDC_HDF_CONTROLLER,80,89,154,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
-    COMBOBOX        IDC_HDF_CONTROLLER_UNIT,239,89,71,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
-    DEFPUSHBUTTON   "Add CD Drive",IDOK,121,108,73,14
-    PUSHBUTTON      "Cancel",IDCANCEL,201,108,73,14
+    CONTROL         "",IDC_CDLIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP,4,4,387,138
+    RTEXT           "HD Controller:",IDC_STATIC,7,156,65,10,SS_CENTERIMAGE
+    COMBOBOX        IDC_HDF_CONTROLLER,80,155,154,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX        IDC_HDF_CONTROLLER_UNIT,239,155,71,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
+    DEFPUSHBUTTON   "Add CD Drive",IDOK,121,174,73,14
+    PUSHBUTTON      "Cancel",IDCANCEL,201,174,73,14
 END
 
 IDD_TAPEDRIVE DIALOGEX 0, 0, 395, 97
@@ -1446,8 +1447,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 6,0,2,0
- PRODUCTVERSION 6,0,2,0
+ FILEVERSION 6,0,3,0
+ PRODUCTVERSION 6,0,3,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -1463,12 +1464,12 @@ BEGIN
         BLOCK "040904b0"
         BEGIN
             VALUE "FileDescription", "WinUAE"
-            VALUE "FileVersion", "6.0.2.0"
+            VALUE "FileVersion", "6.0.3.0"
             VALUE "InternalName", "WinUAE"
-            VALUE "LegalCopyright", "© 1996-2025 under the GNU Public License (GPL)"
+            VALUE "LegalCopyright", "© 1996-2026 under the GNU Public License (GPL)"
             VALUE "OriginalFilename", "WinUAE.exe"
             VALUE "ProductName", "WinUAE"
-            VALUE "ProductVersion", "6.0.2.0"
+            VALUE "ProductVersion", "6.0.3.0"
         END
     END
     BLOCK "VarFileInfo"
@@ -1566,7 +1567,6 @@ BEGIN
 END
 
 
-
 /////////////////////////////////////////////////////////////////////////////
 //
 // DESIGNINFO

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