From 18aac43db1b1a0f5b8d1e6d5b76bc19a028dac14 Mon Sep 17 00:00:00 2001 From: Toni Wilen Date: Mon, 12 Feb 2024 21:17:08 +0200 Subject: [PATCH] 5200b9 --- od-win32/resources/winuae.rc | 4 ++-- od-win32/win32.h | 6 +++--- od-win32/win32gui.cpp | 11 ----------- od-win32/winuaechangelog.txt | 12 ++++++++++++ 4 files changed, 17 insertions(+), 16 deletions(-) diff --git a/od-win32/resources/winuae.rc b/od-win32/resources/winuae.rc index 35e48eac..29709276 100644 --- a/od-win32/resources/winuae.rc +++ b/od-win32/resources/winuae.rc @@ -2074,7 +2074,7 @@ END STRINGTABLE BEGIN - IDS_QS_MODELS "A500\nA500+\nA600\nA1000\nA1200\nA3000\nA4000\nCD32\nCDTV\nAmerican Laser Games\nArcadia Multi Select system\nMacrosystem\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" @@ -2194,7 +2194,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/win32.h b/od-win32/win32.h index d2943b5e..5dad4f9b 100644 --- a/od-win32/win32.h +++ b/od-win32/win32.h @@ -17,15 +17,15 @@ #define WINUAEPUBLICBETA 1 #define LANG_DLL 1 -#define LANG_DLL_FULL_VERSION_MATCH 1 +#define LANG_DLL_FULL_VERSION_MATCH 0 #if WINUAEPUBLICBETA -#define WINUAEBETA _T("8") +#define WINUAEBETA _T("9") #else #define WINUAEBETA _T("") #endif -#define WINUAEDATE MAKEBD(2024, 2, 10) +#define WINUAEDATE MAKEBD(2024, 2, 12) //#define WINUAEEXTRA _T("AmiKit Preview") //#define WINUAEEXTRA _T("Amiga Forever Edition") diff --git a/od-win32/win32gui.cpp b/od-win32/win32gui.cpp index ee67753f..89e56b77 100644 --- a/od-win32/win32gui.cpp +++ b/od-win32/win32gui.cpp @@ -23078,13 +23078,6 @@ static INT_PTR CALLBACK DialogProc (HWND hDlg, UINT msg, WPARAM wParam, LPARAM l return FALSE; } -#if 0 -static ACCEL EmptyAccel[] = { - { FVIRTKEY, VK_UP, 20001 }, { FVIRTKEY, VK_DOWN, 20002 }, - { 0, 0, 0 } -}; -#endif - struct newresource *getresource (int tmpl) { TCHAR rid[20]; @@ -23271,10 +23264,6 @@ static int init_page (int tmpl, int icon, int title, ppage[id].idx = id; ppage[id].accel = NULL; ppage[id].focusid = focusid; -#if 0 - if (!accels) - accels = EmptyAccel; -#endif if (accels) { int i = -1; while (accels[++i].key); diff --git a/od-win32/winuaechangelog.txt b/od-win32/winuaechangelog.txt index c02ac4c3..33a62dff 100644 --- a/od-win32/winuaechangelog.txt +++ b/od-win32/winuaechangelog.txt @@ -1,4 +1,16 @@ +Beta 9: + +- Advanced chipset CIA E-clock mode can be changed on the fly. +- Picmatic Zorton Brothers boot hang fixed. Too long delay in LDP ACK reply. For some reason all other LD games didn't care. Note that LD dump is not (yet?) available. +- Genlock scaling was broken (b7/b8) and only appeared to work if both Amiga and genlock image size was almost identical. +- Genlock video/image was not affected by TV Overscan modes. +- Quickstart "American Laser Games" renamed to "American Laser Games / Picmatic". Quickstart also now automatically enables NTSC if ALG game, disables NTSC if Picmatic game. +- Do not emulate OCS Denise "blanking bug" unless overscan mode Overscan+ or higher. "Blanking bug" lines can appear in some centering modes even in normal Overscan mode and they look too ugly. (Yes, this is correctly emulated but they are usually hidden in overscan) +- 68040 MMU faulting MOVES special case handling fix (Andreas Grabher) +- Advanced chipset panel "Custom register byte write bug" emulation fix. +- Harddrive panel Enter and Delete key shortcuts work again. + Beta 8: - Clicking GamePorts panel remap/test crashed in some situations (remap device, change device type to something that has less events, remap device) -- 2.47.3