From 629c91710609fa744eb43fb357cfcf68aa66a991 Mon Sep 17 00:00:00 2001 From: Toni Wilen Date: Wed, 20 Dec 2023 18:17:02 +0200 Subject: [PATCH] 5100 --- od-win32/resources/winuae.rc | 8 +- od-win32/resources/winuae_minimal.rc | 218 ++++++++++++++------------- od-win32/win32.h | 8 +- od-win32/winuaechangelog.txt | 10 ++ od-win32/wix/Product.wxs | 4 +- 5 files changed, 132 insertions(+), 116 deletions(-) diff --git a/od-win32/resources/winuae.rc b/od-win32/resources/winuae.rc index c2189c39..a5cb574a 100644 --- a/od-win32/resources/winuae.rc +++ b/od-win32/resources/winuae.rc @@ -1431,8 +1431,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 5,0,0,0 - PRODUCTVERSION 5,0,0,0 + FILEVERSION 5,1,0,0 + PRODUCTVERSION 5,1,0,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -1448,12 +1448,12 @@ BEGIN BLOCK "040904b0" BEGIN VALUE "FileDescription", "WinUAE" - VALUE "FileVersion", "5.0.0.0" + VALUE "FileVersion", "5.1.0.0" VALUE "InternalName", "WinUAE" VALUE "LegalCopyright", "© 1996-2023 under the GNU Public License (GPL)" VALUE "OriginalFilename", "WinUAE.exe" VALUE "ProductName", "WinUAE" - VALUE "ProductVersion", "5.0.0.0" + VALUE "ProductVersion", "5.1.0.0" END END BLOCK "VarFileInfo" diff --git a/od-win32/resources/winuae_minimal.rc b/od-win32/resources/winuae_minimal.rc index b7d47093..3715a019 100644 --- a/od-win32/resources/winuae_minimal.rc +++ b/od-win32/resources/winuae_minimal.rc @@ -219,12 +219,12 @@ BEGIN CONTROL "Double, fields+",IDC_LM_IDOUBLED3,"Button",BS_AUTORADIOBUTTON | BS_LEFT | WS_TABSTOP,299,281,90,10 END -IDD_MEMORY DIALOGEX 0, 0, 396, 303 +IDD_MEMORY DIALOGEX 0, 0, 396, 304 STYLE DS_LOCALEDIT | DS_SETFONT | DS_3DLOOK | DS_CONTROL | WS_CHILD EXSTYLE WS_EX_CONTEXTHELP FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN - GROUPBOX "Memory Settings",IDC_STATIC,1,26,393,117 + GROUPBOX "Memory Settings",IDC_STATIC,1,20,393,117 RTEXT "Chip:",IDC_STATIC,7,44,60,15,SS_CENTERIMAGE CONTROL "Slider1",IDC_CHIPMEM,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,68,41,60,20 EDITTEXT IDC_CHIPRAM,135,44,40,12,ES_CENTER | ES_READONLY @@ -241,7 +241,7 @@ BEGIN CONTROL "",IDC_Z3CHIPMEM,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,248,90,60,20 EDITTEXT IDC_Z3CHIPRAM,311,95,40,12,ES_CENTER | ES_READONLY EDITTEXT IDC_MAX32RAM,14,118,366,12,ES_CENTER | ES_READONLY - GROUPBOX "Advanced Memory Settings",IDC_STATIC,1,134,393,161 + GROUPBOX "Advanced Memory Settings",IDC_STATIC,1,141,393,157 COMBOBOX IDC_MEMORYSELECT,14,170,228,75,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP CONTROL "",IDC_MEMORYMEM,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,253,164,68,20 EDITTEXT IDC_MEMORYRAM,328,167,40,12,ES_CENTER | ES_READONLY @@ -580,39 +580,39 @@ BEGIN 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 -STYLE DS_LOCALEDIT | DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION +IDD_CONTRIBUTORS DIALOGEX 0, 0, 398, 293 +STYLE DS_LOCALEDIT | DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_3DLOOK | DS_CENTERMOUSE | WS_POPUP | WS_VISIBLE | WS_CAPTION CAPTION "UAE Authors and Contributors..." FONT 8, "MS Sans Serif", 0, 0, 0x0 BEGIN - DEFPUSHBUTTON "Ok",ID_OK,238,324,53,14 - CONTROL "",IDC_CONTRIBUTORS,"RICHEDIT",TCS_HOTTRACK | TCS_VERTICAL | TCS_RAGGEDRIGHT | TCS_OWNERDRAWFIXED | TCS_MULTISELECT | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP,4,5,521,311 + DEFPUSHBUTTON "Ok",ID_OK,172,273,53,14 + CONTROL "",IDC_CONTRIBUTORS,"SysListView32",LVS_REPORT | LVS_ALIGNLEFT | LVS_NOSCROLL | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,7,7,384,260 END -IDD_ERRORLOG DIALOGEX 0, 0, 530, 345 -STYLE DS_LOCALEDIT | DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION +IDD_ERRORLOG DIALOGEX 0, 0, 398, 293 +STYLE DS_LOCALEDIT | DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_3DLOOK | DS_CENTERMOUSE | WS_POPUP | WS_VISIBLE | WS_CAPTION CAPTION "Configuration error log" FONT 8, "MS Sans Serif", 0, 0, 0x0 BEGIN - DEFPUSHBUTTON "OK",IDOK,176,322,65,15 - PUSHBUTTON "Clear log",IDC_ERRORLOGCLEAR,288,322,65,15 - CONTROL "",IDC_ERRORLOGMESSAGE,"RICHEDIT",TCS_HOTTRACK | TCS_VERTICAL | TCS_RAGGEDRIGHT | TCS_OWNERDRAWFIXED | TCS_MULTISELECT | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP,4,5,521,309 + DEFPUSHBUTTON "OK",IDOK,125,269,65,15 + PUSHBUTTON "Clear log",IDC_ERRORLOGCLEAR,208,269,65,15 + CONTROL "",IDC_ERRORLOGMESSAGE,"SysListView32",LVS_REPORT | LVS_ALIGNLEFT | LVS_NOSCROLL | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,4,6,389,254 END 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,85,36,210,35 - CONTROL "",IDC_RICHEDIT2,"RICHEDIT",TCS_SCROLLOPPOSITE | TCS_RAGGEDRIGHT | TCS_MULTISELECT | WS_DISABLED,21,84,343,28 + CTEXT "WinUAE",IDC_RICHEDIT1,85,36,210,35 + CTEXT "",IDC_RICHEDIT2,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 + CTEXT "",IDC_CLOANTOHOME,22,194,112,24 + CTEXT "",IDC_AMIGAHOME,136,194,112,24 + CTEXT "",IDC_WINUAEHOME,251,194,112,24 + CTEXT "",IDC_ABIME,22,222,112,24 + CTEXT "",IDC_CAPS,136,222,112,24 + CTEXT "",IDC_AMIGASYS,136,255,112,24 + CTEXT "",IDC_AMIKIT,251,222,112,24 END IDD_MISC1 DIALOGEX 0, 0, 396, 316 @@ -620,22 +620,21 @@ STYLE DS_LOCALEDIT | DS_SETFONT | DS_3DLOOK | DS_CONTROL | WS_CHILD FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN CONTROL "",IDC_MISCLIST,"SysListView32",LVS_REPORT | LVS_ALIGNLEFT | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,3,5,258,232 - GROUPBOX "Miscellaneous Options",IDC_STATIC,266,2,128,123 + GROUPBOX "Miscellaneous Options",IDC_STATIC,266,2,128,111 CTEXT "SCSI and CD/DVD access:",IDC_STATIC,272,14,117,10,SS_CENTERIMAGE COMBOBOX IDC_SCSIMODE,273,28,114,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP CTEXT "Windowed style:",IDC_STATIC,272,45,117,10,SS_CENTERIMAGE COMBOBOX IDC_WINDOWEDMODE,273,59,114,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP - CTEXT "Graphics API:",IDC_STATIC,272,76,117,10,SS_CENTERIMAGE - COMBOBOX IDC_DXMODE,273,89,114,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_DXMODE_OPTIONS,273,107,114,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP - GROUPBOX "GUI",IDC_STATIC,266,125,128,112 - COMBOBOX IDC_LANGUAGE,273,138,114,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "GUI Font...",IDC_GUI_FONT,272,155,54,14 - PUSHBUTTON "Set default",IDC_GUI_DEFAULT,272,174,54,14 - COMBOBOX IDC_GUI_SIZE,333,175,54,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Reset list customizations",IDC_GUI_LVDEFAULT,272,192,115,14 - CONTROL "Resizeable GUI",IDC_GUI_RESIZE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,273,209,114,11 - CONTROL "Fullscreen GUI",IDC_GUI_FULLSCREEN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,273,222,114,11 + COMBOBOX IDC_DXMODE,273,77,114,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_DXMODE_OPTIONS,273,95,114,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP + GROUPBOX "GUI",IDC_STATIC,266,117,128,121 + COMBOBOX IDC_LANGUAGE,273,129,114,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "GUI Font...",IDC_GUI_FONT,272,146,54,14 + PUSHBUTTON "Set default",IDC_GUI_DEFAULT,272,165,54,14 + COMBOBOX IDC_GUI_SIZE,333,166,54,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Reset list customizations",IDC_GUI_LVDEFAULT,272,183,115,14 + CONTROL "Resizeable GUI",IDC_GUI_RESIZE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,273,199,114,11 + CONTROL "Fullscreen GUI",IDC_GUI_FULLSCREEN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,273,212,114,11 GROUPBOX "State Files",IDC_STATIC,1,242,393,38 COMBOBOX IDC_STATENAME,5,258,232,75,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP CONTROL "",IDC_STATECLEAR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,244,261,9,10 @@ -646,10 +645,11 @@ BEGIN COMBOBOX IDC_KBLED2,97,295,64,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_KBLED3,184,295,64,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP CONTROL "USB mode",IDC_KBLED_USB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,264,296,64,11 + CONTROL "Dark mode",IDC_GUI_DARKMODE,"Button",BS_AUTO3STATE | WS_TABSTOP,273,224,114,11 END IDD_HARDFILE DIALOGEX 0, 0, 397, 292 -STYLE DS_LOCALEDIT | DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_3DLOOK | DS_CENTER | DS_CENTERMOUSE | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +STYLE DS_LOCALEDIT | DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_3DLOOK | 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 @@ -725,8 +725,8 @@ BEGIN PUSHBUTTON "Eject",IDC_FS_SELECT_EJECT,258,90,62,15 END -IDD_SETINFO DIALOGEX 0, 0, 397, 132 -STYLE DS_LOCALEDIT | DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_3DLOOK | DS_CENTER | DS_CENTERMOUSE | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +IDD_SETINFO DIALOGEX 0, 0, 397, 119 +STYLE DS_LOCALEDIT | DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_3DLOOK | DS_CENTERMOUSE | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Additional Information Settings" FONT 8, "MS Sans Serif", 0, 0, 0x0 BEGIN @@ -741,8 +741,8 @@ BEGIN EDITTEXT IDC_CONFIGTAGS,46,74,249,15,ES_AUTOHSCROLL CONTROL "Ignore link",IDC_CONFIGNOLINK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,305,37,58,12 CONTROL "Autoload",IDC_CONFIGAUTO,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,305,56,51,12 - PUSHBUTTON "OK",IDOK,146,102,48,15 - PUSHBUTTON "Cancel",IDCANCEL,201,102,48,15 + PUSHBUTTON "OK",IDOK,147,97,48,15 + PUSHBUTTON "Cancel",IDCANCEL,202,97,48,15 END IDD_CHIPSET DIALOGEX 0, 0, 396, 316 @@ -918,18 +918,18 @@ BEGIN COMBOBOX IDC_INPUTAMIGA,33,248,286,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Test [] Test input mappings.",IDC_INPUTTEST,324,248,34,14 PUSHBUTTON "Remap [] Find and remap quickly.",IDC_INPUTREMAP,361,248,34,14 - RTEXT "Joystick dead zone (%):",-1,5,271,106,10,SS_CENTERIMAGE - EDITTEXT IDC_INPUTDEADZONE,116,270,29,12,ES_NUMBER - RTEXT "Autofire rate (lines):",-1,5,288,106,10,SS_CENTERIMAGE - EDITTEXT IDC_INPUTAUTOFIRERATE,116,286,29,12,ES_NUMBER - RTEXT "Digital joy-mouse speed:",-1,147,271,108,10,SS_CENTERIMAGE - EDITTEXT IDC_INPUTSPEEDD,260,270,29,12,ES_NUMBER - RTEXT "Analog joy-mouse speed:",-1,147,288,108,10,SS_CENTERIMAGE - EDITTEXT IDC_INPUTSPEEDA,260,287,29,12,ES_NUMBER - 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 + RTEXT "Joystick dead zone (%):",-1,5,270,106,10,SS_CENTERIMAGE + EDITTEXT IDC_INPUTDEADZONE,116,269,29,12,ES_NUMBER + RTEXT "Autofire rate (lines):",-1,5,287,106,10,SS_CENTERIMAGE + EDITTEXT IDC_INPUTAUTOFIRERATE,116,285,29,12,ES_NUMBER + RTEXT "Digital joy-mouse speed:",-1,147,270,108,10,SS_CENTERIMAGE + EDITTEXT IDC_INPUTSPEEDD,260,269,29,12,ES_NUMBER + RTEXT "Analog joy-mouse speed:",-1,147,287,108,10,SS_CENTERIMAGE + EDITTEXT IDC_INPUTSPEEDA,260,286,29,12,ES_NUMBER + PUSHBUTTON "Copy from:",IDC_INPUTCOPY,324,267,70,14 + COMBOBOX IDC_INPUTCOPYFROM,324,285,70,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Swap 1<>2",IDC_INPUTSWAP,324,302,70,14 + CONTROL "Swap Backslash/F11",IDC_KEYBOARD_SWAPHACK,"Button", BS_AUTO3STATE | WS_TABSTOP,209,302,87,10 END IDD_FILTER DIALOGEX 0, 0, 396, 316 @@ -980,8 +980,8 @@ BEGIN PUSHBUTTON "Delete",IDC_FILTERPRESETDELETE,325,280,55,14 END -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 +IDD_HARDDRIVE DIALOGEX 0, 0, 397, 208 +STYLE DS_LOCALEDIT | DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_3DLOOK | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Harddrive Settings" FONT 8, "MS Sans Serif", 0, 0, 0x0 BEGIN @@ -1178,7 +1178,7 @@ BEGIN END IDD_PROGRESSBAR DIALOGEX 0, 0, 396, 58 -STYLE DS_LOCALEDIT | DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +STYLE DS_LOCALEDIT | DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | DS_CENTERMOUSE | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Processing..." FONT 8, "MS Sans Serif", 0, 0, 0x0 BEGIN @@ -1282,39 +1282,39 @@ BEGIN COMBOBOX IDC_RTG_SCALE_ASPECTRATIO,282,227,84,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP END -IDD_INPUTMAP DIALOGEX 0, 0, 421, 341 -STYLE DS_LOCALEDIT | DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +IDD_INPUTMAP DIALOGEX 0, 0, 421, 293 +STYLE DS_LOCALEDIT | DS_SETFONT | DS_MODALFRAME | DS_CENTERMOUSE | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Input Remap" FONT 8, "MS Sans Serif", 0, 0, 0x0 BEGIN DEFPUSHBUTTON "OK",IDOK,147,51,58,14,NOT WS_VISIBLE - CONTROL "",IDC_INPUTMAPLIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,1,1,418,257 - EDITTEXT IDC_INPUTMAPOUT,1,261,418,14,ES_AUTOHSCROLL | ES_READONLY | WS_DISABLED - EDITTEXT IDC_INPUTMAPOUTM,1,277,418,29,ES_MULTILINE | ES_READONLY | WS_DISABLED - COMBOBOX IDC_INPUTMAPADD,2,309,247,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Add Event",IDC_INPUTMAP_CUSTOM,253,308,79,14 - PUSHBUTTON "Autofire",IDC_INPUTMAP_SPECIALS,338,308,79,14 - PUSHBUTTON "Test",IDC_INPUTMAP_TEST,1,325,80,14 - PUSHBUTTON "Remap",IDC_INPUTMAP_CAPTURE,85,325,80,14 - PUSHBUTTON "Delete",IDC_INPUTMAP_DELETE,169,325,80,14 - PUSHBUTTON "Delete all",IDC_INPUTMAP_DELETEALL,253,325,80,14 - PUSHBUTTON "Exit",IDC_INPUTMAP_EXIT,338,325,79,14 + CONTROL "",IDC_INPUTMAPLIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,1,1,418,206 + EDITTEXT IDC_INPUTMAPOUT,1,211,418,14,ES_AUTOHSCROLL | ES_READONLY | WS_DISABLED + EDITTEXT IDC_INPUTMAPOUTM,1,227,418,29,ES_MULTILINE | ES_READONLY | WS_DISABLED + COMBOBOX IDC_INPUTMAPADD,2,259,247,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Add Event",IDC_INPUTMAP_CUSTOM,253,258,79,14 + PUSHBUTTON "Autofire",IDC_INPUTMAP_SPECIALS,338,258,79,14 + PUSHBUTTON "Test",IDC_INPUTMAP_TEST,1,275,80,14 + PUSHBUTTON "Remap",IDC_INPUTMAP_CAPTURE,85,275,80,14 + PUSHBUTTON "Delete",IDC_INPUTMAP_DELETE,169,275,80,14 + PUSHBUTTON "Delete all",IDC_INPUTMAP_DELETEALL,253,275,80,14 + PUSHBUTTON "Exit",IDC_INPUTMAP_EXIT,338,275,79,14 END IDD_INFOBOX DIALOGEX 0, 0, 420, 68 -STYLE DS_LOCALEDIT | DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +STYLE DS_LOCALEDIT | DS_SETFONT | DS_MODALFRAME | DS_CENTERMOUSE | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Scanning ROM image files..." FONT 8, "MS Sans Serif", 0, 0, 0x0 BEGIN - DEFPUSHBUTTON "OK",IDOK,113,51,58,14,NOT WS_VISIBLE - PUSHBUTTON "Cancel",IDCANCEL,180,51,58,14 + DEFPUSHBUTTON "OK",IDOK,147,51,58,14,NOT WS_VISIBLE + PUSHBUTTON "Cancel",IDCANCEL,214,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 END IDD_LIST DIALOGEX 0, 0, 316, 206 -STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU +STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | DS_FIXEDSYS | DS_CENTERMOUSE | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Options" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN @@ -1338,7 +1338,7 @@ BEGIN END IDD_TAPEDRIVE DIALOGEX 0, 0, 395, 97 -STYLE DS_LOCALEDIT | DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_3DLOOK | DS_CENTER | DS_CENTERMOUSE | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +STYLE DS_LOCALEDIT | DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_3DLOOK | DS_CENTERMOUSE | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Tape Drive Settings" FONT 8, "MS Sans Serif", 0, 0, 0x0 BEGIN @@ -1356,7 +1356,7 @@ BEGIN END IDD_DISKINFO DIALOGEX 0, 0, 491, 323 -STYLE DS_LOCALEDIT | DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +STYLE DS_LOCALEDIT | DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | DS_CENTERMOUSE | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Disk image information" FONT 8, "MS Sans Serif", 0, 0, 0x0 BEGIN @@ -1369,21 +1369,21 @@ IDD_EXPANSION2 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 "Expansion Board Settings",IDC_STATIC,1,42,394,88 - COMBOBOX IDC_SCSIROMSELECTCAT,12,59,157,75,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_SCSIROMSELECT,12,78,157,75,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_SCSIROMSUBSELECT,12,95,157,75,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_EXPANSIONBOARDITEMSELECTOR,12,112,157,75,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_SCSIROMSELECTNUM,175,78,22,75,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP - CONTROL "24-bit DMA",IDC_SCSIROM24BITDMA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,202,61,84,12 - RTEXT "Controller ID:",IDC_STATIC,281,59,70,15,SS_CENTERIMAGE - COMBOBOX IDC_SCSIROMID,356,60,29,75,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_SCSIROMFILE,202,78,171,75,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "...",IDC_SCSIROMCHOOSER,376,78,10,15 - CONTROL "Autoboot disabled",IDC_SCSIROMFILEAUTOBOOT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,202,98,94,12 - CONTROL "PCMCIA inserted",IDC_SCSIROMFILEPCMCIA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,301,98,84,12 - CONTROL "",IDC_EXPANSIONBOARDCHECKBOX,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,202,112,99,12 - GROUPBOX "Accelerator Board Settings",IDC_STATIC,1,133,394,91 + GROUPBOX "Expansion Board Settings",IDC_STATIC,1,27,394,104 + COMBOBOX IDC_SCSIROMSELECTCAT,12,43,157,75,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_SCSIROMSELECT,12,62,157,75,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_SCSIROMSUBSELECT,12,79,157,75,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_EXPANSIONBOARDITEMSELECTOR,12,104,157,75,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_SCSIROMSELECTNUM,175,62,22,75,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP + CONTROL "24-bit DMA",IDC_SCSIROM24BITDMA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,202,45,84,12 + RTEXT "Controller ID:",IDC_STATIC,281,43,70,15,SS_CENTERIMAGE + COMBOBOX IDC_SCSIROMID,356,44,29,75,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_SCSIROMFILE,202,62,171,75,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "...",IDC_SCSIROMCHOOSER,376,62,10,15 + CONTROL "Autoboot disabled",IDC_SCSIROMFILEAUTOBOOT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,202,82,94,12 + CONTROL "PCMCIA inserted",IDC_SCSIROMFILEPCMCIA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,301,82,84,12 + CONTROL "",IDC_EXPANSIONBOARDCHECKBOX,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,202,104,99,12 + GROUPBOX "Accelerator Board Settings",IDC_STATIC,1,133,394,104 COMBOBOX IDC_CPUBOARD_TYPE,13,154,117,75,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_CPUBOARD_SUBTYPE,13,173,117,75,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "Accelerator board ROM file:",IDC_STATIC,203,141,170,15,SS_CENTERIMAGE @@ -1392,22 +1392,24 @@ BEGIN RTEXT "Accelerator board memory:",IDC_STATIC,155,181,104,15,SS_CENTERIMAGE CONTROL "",IDC_CPUBOARDMEM,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,269,179,68,20 EDITTEXT IDC_CPUBOARDRAM,343,183,40,12,ES_CENTER | ES_READONLY - COMBOBOX IDC_ACCELERATORBOARDITEMSELECTOR,12,205,157,75,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_ACCELERATORBOARDSELECTOR,202,205,171,75,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP - GROUPBOX "Miscellaneous Expansions",IDC_STATIC,1,228,394,51 + COMBOBOX IDC_ACCELERATORBOARDITEMSELECTOR,12,213,157,75,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_ACCELERATORBOARDSELECTOR,202,213,171,75,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP + GROUPBOX "Miscellaneous Expansions",IDC_STATIC,1,245,394,51 CONTROL "bsdsocket.library [] bsdsocket network library emulation.",IDC_SOCKETS, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,243,179,11 - CONTROL "uaescsi.device",IDC_SCSIDEVICE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,259,180,11 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,260,179,11 + CONTROL "uaescsi.device",IDC_SCSIDEVICE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,276,180,11 CONTROL "uaenet.device [] Sana 2 compatible network device emulation.",IDC_SANA2, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,193,243,187,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 - CONTROL "Enabled",IDC_SCSIROMSELECTED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,202,79,99,12 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,193,260,187,11 + EDITTEXT IDC_EXPANSIONBOARDSTRINGBOX,202,104,172,14,ES_AUTOHSCROLL + COMBOBOX IDC_EXPANSIONBOARDSELECTOR,202,104,171,75,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP + CONTROL "",IDC_ACCELERATORBOARDCHECKBOX,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,202,214,99,12 + CONTROL "Enabled",IDC_SCSIROMSELECTED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,202,63,99,12 + GROUPBOX "",IDC_STATIC,6,94,384,30,0,WS_EX_TRANSPARENT + GROUPBOX "",IDC_STATIC,5,202,384,30,0,WS_EX_TRANSPARENT 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 +STYLE DS_LOCALEDIT | DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_3DLOOK | DS_CENTERMOUSE | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "CHS Geometry" FONT 8, "MS Sans Serif", 0, 0, 0x0 BEGIN @@ -1429,8 +1431,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 5,0,0,0 - PRODUCTVERSION 5,0,0,0 + FILEVERSION 5,1,0,0 + PRODUCTVERSION 5,1,0,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -1446,12 +1448,12 @@ BEGIN BLOCK "040904b0" BEGIN VALUE "FileDescription", "WinUAE" - VALUE "FileVersion", "5.0.0.0" + VALUE "FileVersion", "5.1.0.0" VALUE "InternalName", "WinUAE" VALUE "LegalCopyright", "© 1996-2023 under the GNU Public License (GPL)" VALUE "OriginalFilename", "WinUAE.exe" VALUE "ProductName", "WinUAE" - VALUE "ProductVersion", "5.0.0.0" + VALUE "ProductVersion", "5.1.0.0" END END BLOCK "VarFileInfo" @@ -1571,7 +1573,6 @@ BEGIN IDD_MEMORY, DIALOG BEGIN - BOTTOMMARGIN, 289 END IDD_CPU, DIALOG @@ -1700,7 +1701,7 @@ BEGIN IDD_EXPANSION, DIALOG BEGIN - BOTTOMMARGIN, 198 + BOTTOMMARGIN, 246 END IDD_INPUTMAP, DIALOG @@ -1983,7 +1984,7 @@ END STRINGTABLE BEGIN IDS_NOHARDDRIVES "No hard disks detected that were either empty or RDB-partitioned." - IDS_DEFAULT_HOST "Default Configuration" + IDS_DEFAULT_HOST "Default host configuration" IDS_SOUND_4CHANNEL "4 Channels" IDS_HF_FS_CUSTOM "Custom" IDS_SELECTFS "Select file system handler (FFS, PFS, SFS, etc.)" @@ -2163,7 +2164,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\nWarp mode reset\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\nGUI gamepad control\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" @@ -2207,6 +2208,11 @@ BEGIN IDS_BOARDID "ID" IDS_ASSOCIATEEXTENSION "Extension" IDS_GAMEPORTS_CUSTOM "Custom" + IDS_FILTER_LABELS "Null\nScale2X\nhq2x\nhq3x\nhq4x\nSuperEagle\nSuper2xSaI\n2xSaI\nPAL\n" + IDS_CURRENT_HOST "Current host configuration" + IDS_NONE2 "" + IDS_SOUND_CLONED71 "Cloned stereo (7.1)" + IDS_SOUND_71 "7.1 channels" END #endif // English (United Kingdom) resources diff --git a/od-win32/win32.h b/od-win32/win32.h index 61576c02..a969a89d 100644 --- a/od-win32/win32.h +++ b/od-win32/win32.h @@ -15,23 +15,23 @@ #define GETBDM(x) (((x) - ((x / 10000) * 10000)) / 100) #define GETBDD(x) ((x) % 100) -#define WINUAEPUBLICBETA 1 +#define WINUAEPUBLICBETA 0 #define LANG_DLL 1 #define LANG_DLL_FULL_VERSION_MATCH 1 #if WINUAEPUBLICBETA -#define WINUAEBETA _T("14") +#define WINUAEBETA _T("") #else #define WINUAEBETA _T("") #endif -#define WINUAEDATE MAKEBD(2023, 12, 15) +#define WINUAEDATE MAKEBD(2023, 12, 19) //#define WINUAEEXTRA _T("AmiKit Preview") //#define WINUAEEXTRA _T("Amiga Forever Edition") #ifndef WINUAEEXTRA -#define WINUAEEXTRA _T("RC3") +#define WINUAEEXTRA _T("") #endif #ifndef WINUAEREV #define WINUAEREV _T("") diff --git a/od-win32/winuaechangelog.txt b/od-win32/winuaechangelog.txt index 723ce538..d1dc72c7 100644 --- a/od-win32/winuaechangelog.txt +++ b/od-win32/winuaechangelog.txt @@ -1,5 +1,15 @@ +5.1.0 + +- Fixed "Double, Frames" interlace mode (b1) + +Beta 15: + +- 68030 MMU: If MMU generated MMU configuration exception (almost never normally), F-line exception was also generated, hiding the original exception. +- Apollo 040/060 accelerator (and possible some others): On board RAM mirrors partially appeared over 0x08000000 address space, confusing KS ROM RAM detection if KS supported 0x08000000 RAM. +- GUI main window was moved back if was not already bottom most window when closing child window. (Wrong order of closing child window and enabling main window) (b14) + Beta 14: - Fixed FSINCOS disassembly (swapped destination registers) diff --git a/od-win32/wix/Product.wxs b/od-win32/wix/Product.wxs index 2b10cb6a..d5bfc825 100644 --- a/od-win32/wix/Product.wxs +++ b/od-win32/wix/Product.wxs @@ -2,8 +2,8 @@ - - + + -- 2.47.3