From 4a06b13c9ef56194bf4296fbf2c32b8444b0a937 Mon Sep 17 00:00:00 2001 From: Toni Wilen Date: Sun, 23 Apr 2023 19:55:14 +0300 Subject: [PATCH] 5000b7 --- od-win32/resources/winuae.rc | 8 ++++---- od-win32/win32.cpp | 2 +- od-win32/win32.h | 4 ++-- od-win32/win32gui.cpp | 1 + od-win32/winuaechangelog.txt | 12 ++++++++++++ 5 files changed, 20 insertions(+), 7 deletions(-) diff --git a/od-win32/resources/winuae.rc b/od-win32/resources/winuae.rc index f3dcb18a..b2153b25 100644 --- a/od-win32/resources/winuae.rc +++ b/od-win32/resources/winuae.rc @@ -1072,18 +1072,18 @@ IDD_PATHS 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 - LTEXT "System ROMs:",IDC_PATHS_ROML,3,16,74,8,SS_CENTERIMAGE + LTEXT "System ROMs:",IDC_PATHS_ROML,3,16,79,8,SS_CENTERIMAGE EDITTEXT IDC_PATHS_ROM,89,13,290,15,ES_AUTOHSCROLL PUSHBUTTON "...",IDC_PATHS_ROMS,384,13,11,15 CONTROL "Scan subfolders",IDC_PATHS_RECURSIVEROMS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,91,1,197,11 - LTEXT "Configuration files:",IDC_PATHS_CONFIGL,89,47,134,8,SS_CENTERIMAGE + LTEXT "Configuration files:",IDC_PATHS_CONFIGL,3,48,77,8,SS_CENTERIMAGE EDITTEXT IDC_PATHS_CONFIG,88,44,291,15,ES_AUTOHSCROLL PUSHBUTTON "...",IDC_PATHS_CONFIGS,384,43,11,15 CONTROL "Cache Configuration files",IDC_PATHS_CONFIGCACHE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,91,31,99,11 - LTEXT "Screenshots:",IDC_PATHS_SCREENSHOTL,3,86,78,8,SS_CENTERIMAGE + LTEXT "Screenshots:",IDC_PATHS_SCREENSHOTL,3,85,78,8,SS_CENTERIMAGE EDITTEXT IDC_PATHS_SCREENSHOT,89,82,290,15,ES_AUTOHSCROLL PUSHBUTTON "...",IDC_PATHS_SCREENSHOTS,384,82,11,15 - LTEXT "State files:",IDC_PATHS_STATEFILEL,3,103,75,8,SS_CENTERIMAGE + LTEXT "State files:",IDC_PATHS_STATEFILEL,3,104,75,8,SS_CENTERIMAGE EDITTEXT IDC_PATHS_SAVESTATE,89,101,290,15,ES_AUTOHSCROLL PUSHBUTTON "...",IDC_PATHS_SAVESTATES,384,101,11,15 LTEXT "Videos:",IDC_PATHS_AVIOUTPUTL,3,123,75,8,SS_CENTERIMAGE diff --git a/od-win32/win32.cpp b/od-win32/win32.cpp index 14015ad0..7b84817d 100644 --- a/od-win32/win32.cpp +++ b/od-win32/win32.cpp @@ -7626,7 +7626,7 @@ void registertouch(HWND hwnd) void systray (HWND hwnd, int remove) { - static const GUID iconguid = { 0x6974bfc1, 0x898b, 0x4157, { 0xa4, 0x30, 0x43, 0x6b, 0xa0, 0xdd, 0x5d, 0xf2 } }; + static const GUID iconguid = { 0xb9628768, 0xad27, 0x40fa, { 0xbd, 0xb, 0x35, 0x21, 0xdf, 0x6b, 0x8f, 0x4f } }; NOTIFYICONDATA nid; BOOL v; static bool noguid; diff --git a/od-win32/win32.h b/od-win32/win32.h index 46009877..1a65ef39 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("6") +#define WINUAEBETA _T("7") #else #define WINUAEBETA _T("") #endif -#define WINUAEDATE MAKEBD(2023, 4, 17) +#define WINUAEDATE MAKEBD(2023, 4, 23) //#define WINUAEEXTRA _T("AmiKit Preview") //#define WINUAEEXTRA _T("Amiga Forever Edition") diff --git a/od-win32/win32gui.cpp b/od-win32/win32gui.cpp index c41eff1e..fc528f5c 100644 --- a/od-win32/win32gui.cpp +++ b/od-win32/win32gui.cpp @@ -18402,6 +18402,7 @@ static void values_from_inputdlg (HWND hDlg, int inputchange) inputdevice_updateconfig (NULL, &workprefs); enable_for_inputdlg (hDlg); InitializeListView (hDlg); + values_to_inputdlg(hDlg); doselect = 1; } } diff --git a/od-win32/winuaechangelog.txt b/od-win32/winuaechangelog.txt index 02d95de1..81be94bf 100644 --- a/od-win32/winuaechangelog.txt +++ b/od-win32/winuaechangelog.txt @@ -1,4 +1,16 @@ +Beta 7: + +- Paths panel string "System ROMs" had disappeared (b6) +- GDI mode, possibly also D3D11 mode had wrong screen positioning/size after mode change in some situations. +- Switching HW RTG modes with scaling enabled: new mode was not always using correct size (b5) +- Input panel "Device enabled" checkbox state was not refreshed when Input mode was changed (Game Ports Panel, Configuration #1-#3). +- Saving config after GUI was opened for the first time without default.uae, then loading it and saving it again: second saved config file was not identical. +- Adjusted "VGA mode resolution autoswitch" switch range, some OS 3.2 native display monitors have been changed and it triggered autoswitch incorrectly. +- Native mode integer scale behavior adjusted. Removed some earlier beta auto-adjustments because they would break programmed modes in integer scaling. +- RTG integer scale didn't support scaling multiplers smaller than 1x. 1/2x and 1/4x is now supported. +- Changed uaegfx Picasso96 BoardName field to "UAE" (was "uaegfx.card"). Now P96Prefs created modes have same prefix as UAE internally generated modes. +- Fixed disassembler FMOVE.L/FMOVEM.L to/from control registers register order (FPCR and FPIAR was swapped) Beta 6: -- 2.47.3