From 5d58c7ff61b95bb0543c5f0194dd725ed0431c9d Mon Sep 17 00:00:00 2001 From: Toni Wilen Date: Tue, 15 May 2018 20:32:52 +0300 Subject: [PATCH] 4000b10 --- newcpu.cpp | 1 + od-win32/resources/resource.h | 11 +++++----- od-win32/resources/winuae.rc | 41 +++++++++++++++-------------------- od-win32/win32.cpp | 2 +- od-win32/win32.h | 6 +++-- od-win32/winuaechangelog.txt | 15 +++++++++++++ 6 files changed, 43 insertions(+), 33 deletions(-) diff --git a/newcpu.cpp b/newcpu.cpp index 771bba61..d5b7c1b8 100644 --- a/newcpu.cpp +++ b/newcpu.cpp @@ -4219,6 +4219,7 @@ static bool mmu_op30fake_pflush (uaecptr pc, uae_u32 opcode, uae_u16 next, uaecp switch (flushmode) { case 0x00: + case 0x02: return mmu_op30fake_pload(pc, opcode, next, extra); case 0x18: if (mmu_op30_invea(opcode)) diff --git a/od-win32/resources/resource.h b/od-win32/resources/resource.h index 03597b78..64a51f78 100644 --- a/od-win32/resources/resource.h +++ b/od-win32/resources/resource.h @@ -210,11 +210,6 @@ #define IDS_AVIOUTPUT_NOCODEC 218 #define IDS_DISK_IMAGENAME 219 #define IDS_DISK_DRIVENAME 220 -#define IDS_UNSUPPORTEDSCREENMODE 222 -#define IDS_UNSUPPORTEDSCREENMODE_1 223 -#define IDS_UNSUPPORTEDSCREENMODE_2 224 -#define IDS_UNSUPPORTEDSCREENMODE_3 225 -#define IDS_UNSUPPORTEDSCREENMODE_4 226 #define IDS_FLOPPYTYPE35DD 227 #define IDS_FLOPPYTYPE35HD 228 #define IDS_FLOPPYTYPE525SD 229 @@ -409,6 +404,8 @@ #define IDS_MISCLISTITEMS4 416 #define IDS_SHUTDOWN_NOTIFICATION 417 #define IDS_QUIT_WARNING 418 +#define IDS_UNMAPPED_ADDRESS 419 +#define IDS_GENLOCK_OPTIONS 420 #define IDS_QS_MODELS 1000 #define IDS_QS_MODEL_A500 1001 #define IDS_QS_MODEL_A500P 1002 @@ -422,7 +419,7 @@ #define IDS_QS_MODEL_A3000 1010 #define IDS_QS_MODEL_A4000 1011 #define IDS_QS_MODEL_A4000T 1012 -#define IDS_QS_MODEL_CASABLANCA 1013 +#define IDS_QS_MODEL_MACROSYSTEM 1013 #define IDC_RESOLUTION 1021 #define IDC_SERIAL 1022 #define IDC_REFRESHRATE 1022 @@ -766,6 +763,8 @@ #define IDC_SETTINGSTEXT3 1520 #define IDC_DISPLAY_VARSYNC 1520 #define IDC_ECS_AGNUS 1521 +#define IDC_DISPLAY_VARSYNC2 1521 +#define IDC_DISPLAY_RESIZE 1521 #define IDC_ECS_DENISE 1522 #define IDC_ECS 1523 #define IDC_AGA 1524 diff --git a/od-win32/resources/winuae.rc b/od-win32/resources/winuae.rc index 2d914104..efb78070 100644 --- a/od-win32/resources/winuae.rc +++ b/od-win32/resources/winuae.rc @@ -150,14 +150,14 @@ FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN GROUPBOX "Screen",IDC_SCREENRESTEXT,1,0,393,81,BS_LEFT COMBOBOX IDC_DISPLAYSELECT,10,13,375,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP - RTEXT "Fullscreen:",IDC_STATIC,3,34,51,15,SS_CENTERIMAGE - COMBOBOX IDC_RESOLUTION,59,34,76,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_RESOLUTIONDEPTH,144,34,62,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_REFRESHRATE,288,35,97,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP - RTEXT "Windowed:",IDC_STATIC,2,54,51,15,SS_CENTERIMAGE - EDITTEXT IDC_XSIZE,59,56,43,12,ES_NUMBER - EDITTEXT IDC_YSIZE,113,56,43,12,ES_NUMBER - COMBOBOX IDC_DISPLAY_BUFFERCNT,288,56,97,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP + RTEXT "Fullscreen:",IDC_STATIC,3,31,51,15,SS_CENTERIMAGE + COMBOBOX IDC_RESOLUTION,59,31,76,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_RESOLUTIONDEPTH,144,31,62,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_REFRESHRATE,288,32,97,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP + RTEXT "Windowed:",IDC_STATIC,2,48,51,15,SS_CENTERIMAGE + EDITTEXT IDC_XSIZE,59,50,43,12,ES_NUMBER + EDITTEXT IDC_YSIZE,110,50,43,12,ES_NUMBER + COMBOBOX IDC_DISPLAY_BUFFERCNT,288,50,97,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP GROUPBOX "Settings",IDC_SETTINGSTEXT,1,86,283,183 RTEXT "Native:",IDC_STATIC,18,98,32,15,SS_CENTERIMAGE COMBOBOX IDC_SCREENMODE_NATIVE,54,98,71,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP @@ -203,8 +203,9 @@ BEGIN CONTROL "Double, frames",IDC_LM_IDOUBLED,"Button",BS_AUTORADIOBUTTON | BS_LEFT | WS_TABSTOP,299,251,90,10 CONTROL "Double, fields",IDC_LM_IDOUBLED2,"Button",BS_AUTORADIOBUTTON | BS_LEFT | WS_TABSTOP,299,264,90,10 CONTROL "Double, fields+",IDC_LM_IDOUBLED3,"Button",BS_AUTORADIOBUTTON | BS_LEFT | WS_TABSTOP,299,277,90,10 - CONTROL "VRR monitor. Do not tick!",IDC_DISPLAY_VARSYNC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,170,58,112,10 + CONTROL "VRR monitor. Do not tick!",IDC_DISPLAY_VARSYNC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,58,67,112,10 COMBOBOX IDC_SCREENMODE_NATIVE3,246,98,31,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP + CONTROL "Window resize",IDC_DISPLAY_RESIZE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,161,51,92,10 END IDD_MEMORY DIALOGEX 0, 0, 396, 266 @@ -1073,7 +1074,7 @@ BEGIN PUSHBUTTON "Save All [] Create zip file that includes both logs and config file.",IDC_LOGSAVE,337,264,51,14 PUSHBUTTON "Open [] Open selected file.",IDC_LOGOPEN,337,280,51,14 EDITTEXT IDC_LOGPATH,7,281,324,13,ES_READONLY - CONTROL "Cache Boxart files",IDC_PATHS_ARTCACHE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,267,30,125,11 + CONTROL "Cache Boxart files",IDC_PATHS_ARTCACHE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,267,31,125,11 END IDD_QUICKSTART DIALOGEX 0, 0, 396, 262 @@ -1837,7 +1838,7 @@ BEGIN IDS_NAME "Name" IDS_DESCRIPTION "Description" IDS_COULDNOTLOADCONFIG "Could not load the selected configuration!\n" - IDS_NOHELP "Online help is disabled because the HTML Help functionality is not installed on this system. HTML Help is available from http://www.microsoft.com/downloads/.\n" + IDS_NOHELP "Online help (http://www.winuae.net/help/) failed to open.\n" IDS_MUSTSELECTCONFIG "You must select a configuration or enter a name before selecting Load...\n" IDS_INVALIDCOMPORT "The serial port you have in this configuration is not valid on this machine.\n" END @@ -1932,20 +1933,10 @@ BEGIN IDS_AVIOUTPUT_NOCODEC "no codec selected" IDS_DISK_IMAGENAME "Disk image" IDS_DISK_DRIVENAME "Drive" - IDS_UNSUPPORTEDSCREENMODE - "The selected screen mode can't be displayed in a window, because %s\nSwitching to full-screen display." - IDS_UNSUPPORTEDSCREENMODE_1 - "the desktop is running in an unknown color mode." END STRINGTABLE BEGIN - IDS_UNSUPPORTEDSCREENMODE_2 - "the desktop is running in 8-bit color depth, which WinUAE can't use in windowed mode." - IDS_UNSUPPORTEDSCREENMODE_3 - "the desktop is too small for the specified window size." - IDS_UNSUPPORTEDSCREENMODE_4 - "you selected an RTG (Picasso96) display with unsupported color depth." IDS_FLOPPYTYPE35DD "3.5"" DD" IDS_FLOPPYTYPE35HD "3.5"" HD" IDS_FLOPPYTYPE525SD "5.25"" (40)" @@ -2028,7 +2019,7 @@ END STRINGTABLE BEGIN - IDS_QS_MODELS "A500\nA500+\nA600\nA1000\nA1200\nA3000\nA4000\nCD32\nCDTV\nArcadia Multi Select system\nMacrosystem Casablanca\nExpanded WinUAE example configuration\n" + IDS_QS_MODELS "A500\nA500+\nA600\nA1000\nA1200\nA3000\nA4000\nCD32\nCDTV\nArcadia Multi Select system\nMacrosystem Casablanca/DraCo\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" @@ -2045,7 +2036,7 @@ 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_CASABLANCA "Macrosystem Casablanca\n" + IDS_QS_MODEL_MACROSYSTEM "Macrosystem Casablanca/DraCo\n" END STRINGTABLE @@ -2139,9 +2130,11 @@ END STRINGTABLE BEGIN - IDS_MISCLISTITEMS4 "Windows shutdown/logoff notification\nWarn when attempting to close window\n" + IDS_MISCLISTITEMS4 "Windows shutdown/logoff notification\nWarn when attempting to close window\nPower led dims when audio filter is disabled\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" + 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" END STRINGTABLE diff --git a/od-win32/win32.cpp b/od-win32/win32.cpp index d8f0bb42..d2e6c6b5 100644 --- a/od-win32/win32.cpp +++ b/od-win32/win32.cpp @@ -2438,7 +2438,7 @@ static int canstretch(struct AmigaMonitor *mon) return 0; return 1; } else { - if (currprefs.win32_rtgallowscaling || currprefs.gf[1].gfx_filter_autoscale) + if (currprefs.win32_rtgallowscaling || currprefs.gf[APMODE_RTG].gfx_filter_autoscale) return 1; } return 0; diff --git a/od-win32/win32.h b/od-win32/win32.h index 1f1e3b33..7826d47b 100644 --- a/od-win32/win32.h +++ b/od-win32/win32.h @@ -20,12 +20,12 @@ #define LANG_DLL_FULL_VERSION_MATCH 1 #if WINUAEPUBLICBETA -#define WINUAEBETA _T("9") +#define WINUAEBETA _T("10") #else #define WINUAEBETA _T("") #endif -#define WINUAEDATE MAKEBD(2018, 5, 9) +#define WINUAEDATE MAKEBD(2018, 5, 15) //#define WINUAEEXTRA _T("AmiKit Preview") //#define WINUAEEXTRA _T("Amiga Forever Edition") @@ -220,4 +220,6 @@ void associate_file_extensions (void); DWORD GetFileAttributesSafe (const TCHAR *name); BOOL SetFileAttributesSafe (const TCHAR *name, DWORD attr); +void HtmlHelp(HWND a, LPCWSTR b, UINT c, const TCHAR *d); + #endif diff --git a/od-win32/winuaechangelog.txt b/od-win32/winuaechangelog.txt index c9b22226..0b83f0a0 100644 --- a/od-win32/winuaechangelog.txt +++ b/od-win32/winuaechangelog.txt @@ -1,4 +1,19 @@ + +Beta 10: + +- Full-window mode captured mouse (and moved it to center of screen) even when window didn't have focus. +- Removed single buffer display option, it was only useful when using old low latency vsync mode. +- Help button now asks for opening online help version if help file is not installed. (not finished yet) +- Added windowed mode resize enable/disable option. Default is enabled. +- Added D3D11 standard vsync black frame insertion support. (100Hz/120Hz) +- Action Replay II/III statefile support improved. (For example AR state was invalid when loading AR statefile when AR was already active) +- On the fly switching between fastest possible <> non-fastest possible CPU modes in lagless vsync caused hang in certain situations. +- Debugger: show number of cycles used when tracing (t, z, breakpoints). Only shown if max 2 frames since last debugger activation. (TODO: should also count number of memory accesses and no-wait state minimum cycle count) +- Removed forgotten, useless and obsolete "The selected screen mode can't be displayed in a window, because.." check. +- 68030 MMU PLOAD R variant (R/W bit=1) caused f-line exception. +- Clear both ping-pong buffers when pausing/unpausing WASAPI exclusive sound mode. + Beta 9: - D3D11 mode screen was not fully refreshed when returning back to fullscreen RTG mode with ALT-TAB/GUI exit -- 2.47.3