From: Toni Wilen Date: Mon, 19 Feb 2024 18:56:02 +0000 (+0200) Subject: 5200 X-Git-Tag: 5200^0 X-Git-Url: https://git.unchartedbackwaters.co.uk/w/?a=commitdiff_plain;h=e9612e3c8aa33803460dd4a475eb09f4f4e43731;p=francis%2Fwinuae.git 5200 --- diff --git a/od-win32/resources/resource.h b/od-win32/resources/resource.h index 7ae3ea71..66f74ecf 100644 --- a/od-win32/resources/resource.h +++ b/od-win32/resources/resource.h @@ -515,7 +515,6 @@ #define IDC_THEROOTS 1076 #define IDC_CAPS 1077 #define IDC_ABIME 1078 -#define IDC_AMIGASYS 1079 #define IDC_AMIKIT 1080 #define IDC_RICHEDIT1 1091 #define IDC_RICHEDIT2 1092 diff --git a/od-win32/resources/winuae.rc b/od-win32/resources/winuae.rc index 29709276..64e3a381 100644 --- a/od-win32/resources/winuae.rc +++ b/od-win32/resources/winuae.rc @@ -606,13 +606,12 @@ BEGIN CTEXT "WinUAE",IDC_RICHEDIT1,85,36,210,35 CTEXT "",IDC_RICHEDIT2,21,84,343,28 PUSHBUTTON "Contributors",IDC_CONTRIBUTORS,152,126,80,15 - 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 + CTEXT "",IDC_CLOANTOHOME,22,175,112,44 + CTEXT "",IDC_AMIGAHOME,136,175,112,44 + CTEXT "",IDC_WINUAEHOME,251,175,112,44 + CTEXT "",IDC_ABIME,22,243,112,44 + CTEXT "",IDC_CAPS,136,243,112,44 + CTEXT "",IDC_AMIKIT,251,243,112,44 END IDD_MISC1 DIALOGEX 0, 0, 396, 316 @@ -2091,7 +2090,8 @@ BEGIN IDS_QS_MODEL_A3000 "1.4 ROM, 2MB Chip + 8MB Fast\n\n2.04 ROM, 2MB Chip + 8MB Fast\n\n3.1 ROM, 2MB Chip + 8MB Fast\n" IDS_QS_MODEL_A4000 "68030, 3.1 ROM, 2MB Chip + 8MB Fast\n\n68040, 3.1 ROM, 2MB Chip + 8MB Fast\n\nCyberStorm PPC\n" IDS_QS_MODEL_A4000T "A4000T (test)\nA4000T\n" - IDS_QS_MODEL_MACROSYSTEM "DraCo\n\nCasablanca (Video hardware unimplemented)\n" + IDS_QS_MODEL_MACROSYSTEM + "DraCo\n\nCasablanca (Video hardware unimplemented)\n" IDS_QS_MODEL_ALG "American Laser Games\n" END diff --git a/od-win32/resources/winuae_minimal.rc b/od-win32/resources/winuae_minimal.rc index 3715a019..646fb5c2 100644 --- a/od-win32/resources/winuae_minimal.rc +++ b/od-win32/resources/winuae_minimal.rc @@ -119,7 +119,7 @@ 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 "System ROM Settings",IDC_STATIC,1,5,394,89 + GROUPBOX "System ROM Settings",IDC_STATIC,0,5,394,89 LTEXT "Main ROM file:",IDC_ROMTEXT,14,18,263,10 COMBOBOX IDC_ROMFILE,12,30,361,75,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "...",IDC_KICKCHOOSER,376,30,10,15 @@ -606,13 +606,12 @@ BEGIN CTEXT "WinUAE",IDC_RICHEDIT1,85,36,210,35 CTEXT "",IDC_RICHEDIT2,21,84,343,28 PUSHBUTTON "Contributors",IDC_CONTRIBUTORS,152,126,80,15 - 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 + CTEXT "",IDC_CLOANTOHOME,22,175,112,44 + CTEXT "",IDC_AMIGAHOME,136,175,112,44 + CTEXT "",IDC_WINUAEHOME,251,175,112,44 + CTEXT "",IDC_ABIME,22,243,112,44 + CTEXT "",IDC_CAPS,136,243,112,44 + CTEXT "",IDC_AMIKIT,251,243,112,44 END IDD_MISC1 DIALOGEX 0, 0, 396, 316 @@ -646,6 +645,7 @@ BEGIN 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 + PUSHBUTTON "OSD Font...",IDC_OSD_FONT,333,146,54,14 END IDD_HARDFILE DIALOGEX 0, 0, 397, 292 @@ -883,11 +883,11 @@ BEGIN CONTROL "Disable sound output",IDC_AVIOUTPUT_NOSOUNDOUTPUT, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,114,176,10 CONTROL "Disable sound sync",IDC_AVIOUTPUT_NOSOUNDSYNC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,210,114,171,10 - CONTROL "AVI output enabled",IDC_AVIOUTPUT_ACTIVATED,"Button",BS_AUTORADIOBUTTON | BS_PUSHLIKE | BS_FLAT,15,129,144,14 + CONTROL "AVI output enabled",IDC_AVIOUTPUT_ACTIVATED,"Button",BS_AUTOCHECKBOX | BS_PUSHLIKE | BS_FLAT,15,129,144,14 GROUPBOX "Ripper",IDC_STATIC,1,155,393,65 PUSHBUTTON "Save screenshot",IDC_SCREENSHOT,28,169,87,14 PUSHBUTTON "Pro Wizard 1.62",IDC_PROWIZARD,162,169,87,14,WS_DISABLED - CONTROL "Sample ripper",IDC_SAMPLERIPPER_ACTIVATED,"Button",BS_AUTORADIOBUTTON | BS_PUSHLIKE | BS_FLAT,280,169,87,14 + CONTROL "Sample ripper",IDC_SAMPLERIPPER_ACTIVATED,"Button",BS_AUTOCHECKBOX | BS_PUSHLIKE | BS_FLAT,280,169,87,14 CONTROL "Take screenshot before filtering",IDC_SCREENSHOT_ORIGINALSIZE, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,192,130,10 CONTROL "Create 256 color palette indexed screenshot if possible",IDC_SCREENSHOT_PALETTED, @@ -895,8 +895,8 @@ BEGIN CONTROL "Autoclip screenshot",IDC_SCREENSHOT_CLIP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,210,192,169,10 CONTROL "Continuous screenshots",IDC_SCREENSHOT_AUTO,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,210,206,169,10 GROUPBOX "Re-recorder",IDC_STATIC,1,227,393,70 - CONTROL "Play recording",IDC_STATEREC_PLAY,"Button",BS_AUTORADIOBUTTON | BS_PUSHLIKE | BS_FLAT,53,239,87,14 - CONTROL "Re-recording enabled",IDC_STATEREC_RECORD,"Button",BS_AUTORADIOBUTTON | BS_PUSHLIKE | BS_FLAT,214,239,118,14 + CONTROL "Play recording",IDC_STATEREC_PLAY,"Button",BS_AUTOCHECKBOX | BS_PUSHLIKE | BS_FLAT,53,239,87,14 + CONTROL "Re-recording enabled",IDC_STATEREC_RECORD,"Button",BS_AUTOCHECKBOX | BS_PUSHLIKE | BS_FLAT,214,239,118,14 CONTROL "Automatic replay",IDC_STATEREC_AUTOPLAY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,54,262,129,10 PUSHBUTTON "Save recording",IDC_STATEREC_SAVE,214,257,118,14 RTEXT "Recording rate (seconds):",IDC_STATIC,15,280,121,10,SS_CENTERIMAGE | WS_TABSTOP @@ -929,7 +929,7 @@ BEGIN 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 + CONTROL "Swap Backslash/F11",IDC_KEYBOARD_SWAPHACK,"Button",BS_AUTO3STATE | WS_TABSTOP,209,302,87,10 END IDD_FILTER DIALOGEX 0, 0, 396, 316 @@ -1188,7 +1188,7 @@ BEGIN END IDD_STRINGBOX DIALOGEX 0, 0, 396, 209 -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_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Enter text..." FONT 8, "MS Sans Serif", 0, 0, 0x0 BEGIN @@ -1302,7 +1302,7 @@ BEGIN END IDD_INFOBOX DIALOGEX 0, 0, 420, 68 -STYLE DS_LOCALEDIT | DS_SETFONT | DS_MODALFRAME | DS_CENTERMOUSE | 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 "Scanning ROM image files..." FONT 8, "MS Sans Serif", 0, 0, 0x0 BEGIN @@ -1314,9 +1314,9 @@ BEGIN END IDD_LIST DIALOGEX 0, 0, 316, 206 -STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | DS_FIXEDSYS | DS_CENTERMOUSE | WS_POPUP | WS_CAPTION | WS_SYSMENU +STYLE DS_LOCALEDIT | DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | DS_CENTERMOUSE | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Options" -FONT 8, "MS Shell Dlg", 400, 0, 0x1 +FONT 8, "MS Sans Serif", 0, 0, 0x0 BEGIN DEFPUSHBUTTON "OK",IDOK,205,185,50,14 PUSHBUTTON "Cancel",IDCANCEL,259,185,50,14 @@ -1431,8 +1431,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 5,1,0,0 - PRODUCTVERSION 5,1,0,0 + FILEVERSION 5,2,0,0 + PRODUCTVERSION 5,2,0,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -1448,12 +1448,12 @@ BEGIN BLOCK "040904b0" BEGIN VALUE "FileDescription", "WinUAE" - VALUE "FileVersion", "5.1.0.0" + VALUE "FileVersion", "5.2.0.0" VALUE "InternalName", "WinUAE" - VALUE "LegalCopyright", "© 1996-2023 under the GNU Public License (GPL)" + VALUE "LegalCopyright", "© 1996-2024 under the GNU Public License (GPL)" VALUE "OriginalFilename", "WinUAE.exe" VALUE "ProductName", "WinUAE" - VALUE "ProductVersion", "5.1.0.0" + VALUE "ProductVersion", "5.2.0.0" END END BLOCK "VarFileInfo" @@ -1550,6 +1550,7 @@ BEGIN END END + ///////////////////////////////////////////////////////////////////////////// // // DESIGNINFO @@ -1564,7 +1565,7 @@ BEGIN IDD_KICKSTART, DIALOG BEGIN - BOTTOMMARGIN, 304 + BOTTOMMARGIN, 310 END IDD_DISPLAY, DIALOG @@ -2018,8 +2019,8 @@ BEGIN IDS_NUMSG_KS68020 "The selected system ROM requires a 68020 with 32-bit addressing or 68030 or higher CPU." IDS_NUMSG_ROMNEED "One of the following system ROMs is required:\n\n%s\n\nCheck the System ROM path in the Paths panel and click Rescan ROMs." IDS_NUMSG_STATEHD "WARNING: Current configuration is not fully compatible with state saves.\nThis message will not appear again." - IDS_NUMSG_NOCAPS "Selected disk image needs the SPS plugin\nwhich is available from\nhttp//www.softpres.org/" - IDS_NUMSG_OLDCAPS "You need an updated SPS plugin\nwhich is available from\nhttp//www.softpres.org/" + IDS_NUMSG_NOCAPS "Selected disk image needs the SPS plugin\nwhich is available from\nhttp://www.softpres.org/" + IDS_NUMSG_OLDCAPS "You need an updated SPS plugin\nwhich is available from\nhttp://www.softpres.org/" IDS_IMGCHK_BOOTBLOCKCRCERROR "The selected floppy disk image is not bootable (boot block checksum error)" IDS_IMGCHK_BOOTBLOCKNO "The selected floppy disk image is not bootable (no boot block)" @@ -2048,7 +2049,7 @@ END STRINGTABLE BEGIN - IDS_QS_MODELS "A500\nA500+\nA600\nA1000\nA1200\nA3000\nA4000\nCD32\nCDTV\nAmerican Laser Games\nArcadia Multi Select system\nMacrosystem Casablanca/DraCo\nExpanded WinUAE example configuration\n" + IDS_QS_MODELS "A500\nA500+\nA600\nA1000\nA1200\nA3000\nA4000\nCD32\nCDTV\nAmerican Laser Games / Picmatic\nArcadia Multi Select system\nMacrosystem\nExpanded WinUAE example configuration\n" IDS_QS_MODEL_A500 "1.3 ROM, OCS, 512 KB Chip + 512 KB Slow RAM (most common)\nThis configuration is capable of running most games and demos produced for first-generation hardware. Only few exceptions need a different configuration (e.g. the oldest games tend to be incompatible with this configuration).\n1.3 ROM, ECS Agnus, 512 KB Chip RAM + 512 KB Slow RAM\nLater hardware revision of the A500. Nearly 100% compatible with the previous configuration.\n1.3 ROM, ECS Agnus, 1 MB Chip RAM\nFew newer games and demos require this configuration.\n1.3 ROM, OCS Agnus, 512 KB Chip RAM\nVery old (e.g. pre-1988) games and demos may require this configuration.\n1.2 ROM, OCS Agnus, 512 KB Chip RAM\nAs available for the A1000, and installed on the first A500 and A2000 series. Some very old programs only work correctly with this configuration. Note: This system ROM version can only boot from floppy disk (no hard disk boot support).\n1.2 ROM, OCS Agnus, 512 KB Chip RAM + 512 KB Slow RAM\nThis configuration adds expansion memory to the first A500 produced. Try this if your game does not work with newer configurations, but works with the previous one. It could add some features to the game, including faster loading times. Note: This system ROM version can only boot from floppy disk (no hard disk boot support)." IDS_QS_MODEL_A500P "Basic non-expanded configuration\nThe A500+ adds an ECS Agnus chip, 1 MB of Chip RAM and a 2.0 ROM to the A500. Many A500 games and demos don't work properly on an A500+.\n2 MB Chip RAM expanded configuration\n\n4 MB Fast RAM expanded configuration\n" 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" @@ -2065,7 +2066,8 @@ BEGIN IDS_QS_MODEL_A3000 "1.4 ROM, 2MB Chip + 8MB Fast\n\n2.04 ROM, 2MB Chip + 8MB Fast\n\n3.1 ROM, 2MB Chip + 8MB Fast\n" IDS_QS_MODEL_A4000 "68030, 3.1 ROM, 2MB Chip + 8MB Fast\n\n68040, 3.1 ROM, 2MB Chip + 8MB Fast\n\nCyberStorm PPC\n" IDS_QS_MODEL_A4000T "A4000T (test)\nA4000T\n" - IDS_QS_MODEL_MACROSYSTEM "Macrosystem Casablanca/DraCo\n" + IDS_QS_MODEL_MACROSYSTEM + "DraCo\n\nCasablanca (Video hardware unimplemented)\n" IDS_QS_MODEL_ALG "American Laser Games\n" END @@ -2168,7 +2170,7 @@ BEGIN 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" - IDS_GENLOCK_OPTIONS "Noise (built-in)\nTest card (built-in)\nImage file (png)\nVideo file\nCapture device\nAmerican Laser Games LaserDisc Player\nSony LaserDisc Player\nPioneer LaserDisc Player\n" + IDS_GENLOCK_OPTIONS "Noise (built-in)\nTest card (built-in)\nImage file (png)\nVideo file\nCapture device\nAmerican Laser Games/Picmatic LaserDisc Player\nSony LaserDisc Player\nPioneer LaserDisc Player\n" IDS_READONLYCONFIRMATION "Selected configuration file is write protected.\nDo you want to overwrite it?\n%s\n" IDS_SCREEN_NATIVELACE "Native (Interlaced)" diff --git a/od-win32/rp.cpp b/od-win32/rp.cpp index 2277c17d..cac81b3e 100644 --- a/od-win32/rp.cpp +++ b/od-win32/rp.cpp @@ -1555,7 +1555,7 @@ static LRESULT CALLBACK RPHostMsgFunction2 (UINT uMessage, WPARAM wParam, LPARAM savestate_initsave (NULL, 0, TRUE, true); return 1; } - if (vpos == maxvpos_display_vsync) { + if (vpos == maxvpos_display_vsync + 1) { savestate_initsave (_T(""), 1, TRUE, true); save_state (s, _T("AmigaForever")); ret = 1; diff --git a/od-win32/win32.h b/od-win32/win32.h index a5b925b5..7d12b182 100644 --- a/od-win32/win32.h +++ b/od-win32/win32.h @@ -25,7 +25,7 @@ #define WINUAEBETA _T("") #endif -#define WINUAEDATE MAKEBD(2024, 2, 15) +#define WINUAEDATE MAKEBD(2024, 2, 18) //#define WINUAEEXTRA _T("AmiKit Preview") //#define WINUAEEXTRA _T("Amiga Forever Edition") diff --git a/od-win32/wix/Product.wxs b/od-win32/wix/Product.wxs index d5bfc825..3d9cef88 100644 --- a/od-win32/wix/Product.wxs +++ b/od-win32/wix/Product.wxs @@ -2,8 +2,8 @@ - - + +