From 5774d70edc9287a47066dbf8df03560c45211119 Mon Sep 17 00:00:00 2001 From: Toni Wilen Date: Sun, 21 Dec 2025 20:45:10 +0200 Subject: [PATCH] 6020b12 --- od-win32/rp.cpp | 4 +-- od-win32/win32.h | 2 +- od-win32/winuae_msvc15/winuae_msvc.sln | 11 ------- od-win32/winuae_msvc15/winuae_msvc.vcxproj | 36 ++++++++++++---------- od-win32/winuaechangelog.txt | 11 +++++++ 5 files changed, 34 insertions(+), 30 deletions(-) diff --git a/od-win32/rp.cpp b/od-win32/rp.cpp index 787314fc..a1fee52a 100644 --- a/od-win32/rp.cpp +++ b/od-win32/rp.cpp @@ -868,7 +868,7 @@ static void get_screenmode (struct RPScreenMode *sm, struct uae_prefs *p, bool g sm->dwScreenMode |= RP_SCREENMODE_SCALE_MAX; } else if ((storeflags & RP_SCREENMODE_SCALEMASK) == RP_SCREENMODE_SCALE_TARGET) { sm->dwScreenMode &= ~RP_SCREENMODE_SCALEMASK; - sm->dwScreenMode = RP_SCREENMODE_SCALE_TARGET; + sm->dwScreenMode |= RP_SCREENMODE_SCALE_TARGET; sm->lTargetWidth = gm->gfx_size_win.width; sm->lTargetHeight = ntsc_extended && p->gfx_ntscpixels ? gfx_height_original : gm->gfx_size_win.height; } @@ -1194,7 +1194,7 @@ static void set_screenmode (struct RPScreenMode *sm, struct uae_prefs *p) if (keepaspect) { p->gf[0].gfx_filter_aspect = ntsc_extended ? 0 : -1; p->gf[0].gfx_filter_keep_autoscale_aspect = ntsc_extended || fs ? 0 : 1; - p->gf[0].gfx_filter_keep_aspect = 1; + p->gf[0].gfx_filter_keep_aspect = 0; } else { p->gf[0].gfx_filter_aspect = 0; p->gf[0].gfx_filter_keep_autoscale_aspect = 0; diff --git a/od-win32/win32.h b/od-win32/win32.h index b872edf2..1bf4edb3 100644 --- a/od-win32/win32.h +++ b/od-win32/win32.h @@ -25,7 +25,7 @@ #define WINUAEBETA _T("") #endif -#define WINUAEDATE MAKEBD(2025, 12, 18) +#define WINUAEDATE MAKEBD(2025, 12, 21) //#define WINUAEEXTRA _T("AmiKit Preview") //#define WINUAEEXTRA _T("Amiga Forever Edition") diff --git a/od-win32/winuae_msvc15/winuae_msvc.sln b/od-win32/winuae_msvc15/winuae_msvc.sln index b2e300fe..e08710ab 100644 --- a/od-win32/winuae_msvc15/winuae_msvc.sln +++ b/od-win32/winuae_msvc15/winuae_msvc.sln @@ -73,7 +73,6 @@ Global {DEF7ACF7-050E-4069-BB99-5B5D93F60521}.Debug|x64.ActiveCfg = Test|Win32 {DEF7ACF7-050E-4069-BB99-5B5D93F60521}.Debug|x64.Build.0 = Test|Win32 {DEF7ACF7-050E-4069-BB99-5B5D93F60521}.FullRelease|ARM64EC.ActiveCfg = FullRelease|Win32 - {DEF7ACF7-050E-4069-BB99-5B5D93F60521}.FullRelease|ARM64EC.Build.0 = FullRelease|Win32 {DEF7ACF7-050E-4069-BB99-5B5D93F60521}.FullRelease|Win32.ActiveCfg = FullRelease|Win32 {DEF7ACF7-050E-4069-BB99-5B5D93F60521}.FullRelease|x64.ActiveCfg = FullRelease|Win32 {DEF7ACF7-050E-4069-BB99-5B5D93F60521}.Release|ARM64EC.ActiveCfg = Release|Win32 @@ -90,7 +89,6 @@ Global {54197DFF-9CAA-4A9F-B9C2-2881EA04EACB}.Debug|x64.ActiveCfg = Test|Win32 {54197DFF-9CAA-4A9F-B9C2-2881EA04EACB}.Debug|x64.Build.0 = Test|Win32 {54197DFF-9CAA-4A9F-B9C2-2881EA04EACB}.FullRelease|ARM64EC.ActiveCfg = FullRelease|Win32 - {54197DFF-9CAA-4A9F-B9C2-2881EA04EACB}.FullRelease|ARM64EC.Build.0 = FullRelease|Win32 {54197DFF-9CAA-4A9F-B9C2-2881EA04EACB}.FullRelease|Win32.ActiveCfg = FullRelease|Win32 {54197DFF-9CAA-4A9F-B9C2-2881EA04EACB}.FullRelease|x64.ActiveCfg = FullRelease|Win32 {54197DFF-9CAA-4A9F-B9C2-2881EA04EACB}.Release|ARM64EC.ActiveCfg = Release|Win32 @@ -107,7 +105,6 @@ Global {765B0AF0-B8D3-4998-89AF-D6F939E1CD18}.Debug|x64.ActiveCfg = TestRelease|Win32 {765B0AF0-B8D3-4998-89AF-D6F939E1CD18}.Debug|x64.Build.0 = TestRelease|Win32 {765B0AF0-B8D3-4998-89AF-D6F939E1CD18}.FullRelease|ARM64EC.ActiveCfg = FullRelease|Win32 - {765B0AF0-B8D3-4998-89AF-D6F939E1CD18}.FullRelease|ARM64EC.Build.0 = FullRelease|Win32 {765B0AF0-B8D3-4998-89AF-D6F939E1CD18}.FullRelease|Win32.ActiveCfg = FullRelease|Win32 {765B0AF0-B8D3-4998-89AF-D6F939E1CD18}.FullRelease|x64.ActiveCfg = FullRelease|Win32 {765B0AF0-B8D3-4998-89AF-D6F939E1CD18}.Release|ARM64EC.ActiveCfg = Release|Win32 @@ -124,7 +121,6 @@ Global {AF3DBBDE-E006-4DC3-9A26-CB0D7D82AE3C}.Debug|x64.ActiveCfg = TestRelease|Win32 {AF3DBBDE-E006-4DC3-9A26-CB0D7D82AE3C}.Debug|x64.Build.0 = TestRelease|Win32 {AF3DBBDE-E006-4DC3-9A26-CB0D7D82AE3C}.FullRelease|ARM64EC.ActiveCfg = FullRelease|Win32 - {AF3DBBDE-E006-4DC3-9A26-CB0D7D82AE3C}.FullRelease|ARM64EC.Build.0 = FullRelease|Win32 {AF3DBBDE-E006-4DC3-9A26-CB0D7D82AE3C}.FullRelease|Win32.ActiveCfg = FullRelease|Win32 {AF3DBBDE-E006-4DC3-9A26-CB0D7D82AE3C}.FullRelease|x64.ActiveCfg = FullRelease|Win32 {AF3DBBDE-E006-4DC3-9A26-CB0D7D82AE3C}.Release|ARM64EC.ActiveCfg = Release|Win32 @@ -141,7 +137,6 @@ Global {C85288FB-A035-42CA-B5FB-8E6214319E97}.Debug|x64.ActiveCfg = TestRelease|Win32 {C85288FB-A035-42CA-B5FB-8E6214319E97}.Debug|x64.Build.0 = TestRelease|Win32 {C85288FB-A035-42CA-B5FB-8E6214319E97}.FullRelease|ARM64EC.ActiveCfg = FullRelease|Win32 - {C85288FB-A035-42CA-B5FB-8E6214319E97}.FullRelease|ARM64EC.Build.0 = FullRelease|Win32 {C85288FB-A035-42CA-B5FB-8E6214319E97}.FullRelease|Win32.ActiveCfg = FullRelease|Win32 {C85288FB-A035-42CA-B5FB-8E6214319E97}.FullRelease|x64.ActiveCfg = FullRelease|Win32 {C85288FB-A035-42CA-B5FB-8E6214319E97}.Release|ARM64EC.ActiveCfg = Release|Win32 @@ -158,7 +153,6 @@ Global {E9F73E11-A463-45C6-A733-2BED75852BA1}.Debug|x64.ActiveCfg = Test|Win32 {E9F73E11-A463-45C6-A733-2BED75852BA1}.Debug|x64.Build.0 = Test|Win32 {E9F73E11-A463-45C6-A733-2BED75852BA1}.FullRelease|ARM64EC.ActiveCfg = FullRelease|Win32 - {E9F73E11-A463-45C6-A733-2BED75852BA1}.FullRelease|ARM64EC.Build.0 = FullRelease|Win32 {E9F73E11-A463-45C6-A733-2BED75852BA1}.FullRelease|Win32.ActiveCfg = FullRelease|Win32 {E9F73E11-A463-45C6-A733-2BED75852BA1}.FullRelease|x64.ActiveCfg = FullRelease|Win32 {E9F73E11-A463-45C6-A733-2BED75852BA1}.Release|ARM64EC.ActiveCfg = Release|Win32 @@ -175,7 +169,6 @@ Global {6181E50C-5F32-42DC-BEF6-827AA8A5429D}.Debug|x64.ActiveCfg = Test|Win32 {6181E50C-5F32-42DC-BEF6-827AA8A5429D}.Debug|x64.Build.0 = Test|Win32 {6181E50C-5F32-42DC-BEF6-827AA8A5429D}.FullRelease|ARM64EC.ActiveCfg = Release|Win32 - {6181E50C-5F32-42DC-BEF6-827AA8A5429D}.FullRelease|ARM64EC.Build.0 = Release|Win32 {6181E50C-5F32-42DC-BEF6-827AA8A5429D}.FullRelease|Win32.ActiveCfg = Release|Win32 {6181E50C-5F32-42DC-BEF6-827AA8A5429D}.FullRelease|x64.ActiveCfg = Release|Win32 {6181E50C-5F32-42DC-BEF6-827AA8A5429D}.Release|ARM64EC.ActiveCfg = Release|Win32 @@ -192,7 +185,6 @@ Global {8627DA33-98D1-4F60-B404-ECCEE0EE7BF9}.Debug|x64.ActiveCfg = Test|x64 {8627DA33-98D1-4F60-B404-ECCEE0EE7BF9}.Debug|x64.Build.0 = Test|x64 {8627DA33-98D1-4F60-B404-ECCEE0EE7BF9}.FullRelease|ARM64EC.ActiveCfg = Release|x64 - {8627DA33-98D1-4F60-B404-ECCEE0EE7BF9}.FullRelease|ARM64EC.Build.0 = Release|x64 {8627DA33-98D1-4F60-B404-ECCEE0EE7BF9}.FullRelease|Win32.ActiveCfg = Release|Win32 {8627DA33-98D1-4F60-B404-ECCEE0EE7BF9}.FullRelease|x64.ActiveCfg = Release|Win32 {8627DA33-98D1-4F60-B404-ECCEE0EE7BF9}.Release|ARM64EC.ActiveCfg = Release|x64 @@ -209,7 +201,6 @@ Global {98BA115B-829F-4085-9729-ABD0D779A60A}.Debug|x64.ActiveCfg = Test|x64 {98BA115B-829F-4085-9729-ABD0D779A60A}.Debug|x64.Build.0 = Test|x64 {98BA115B-829F-4085-9729-ABD0D779A60A}.FullRelease|ARM64EC.ActiveCfg = Release|x64 - {98BA115B-829F-4085-9729-ABD0D779A60A}.FullRelease|ARM64EC.Build.0 = Release|x64 {98BA115B-829F-4085-9729-ABD0D779A60A}.FullRelease|Win32.ActiveCfg = Release|Win32 {98BA115B-829F-4085-9729-ABD0D779A60A}.FullRelease|x64.ActiveCfg = Release|Win32 {98BA115B-829F-4085-9729-ABD0D779A60A}.Release|ARM64EC.ActiveCfg = Release|x64 @@ -226,7 +217,6 @@ Global {EDD28611-EAD9-4EB5-A873-18160AC44434}.Debug|x64.ActiveCfg = Test|x64 {EDD28611-EAD9-4EB5-A873-18160AC44434}.Debug|x64.Build.0 = Test|x64 {EDD28611-EAD9-4EB5-A873-18160AC44434}.FullRelease|ARM64EC.ActiveCfg = Release|x64 - {EDD28611-EAD9-4EB5-A873-18160AC44434}.FullRelease|ARM64EC.Build.0 = Release|x64 {EDD28611-EAD9-4EB5-A873-18160AC44434}.FullRelease|Win32.ActiveCfg = Release|Win32 {EDD28611-EAD9-4EB5-A873-18160AC44434}.FullRelease|x64.ActiveCfg = Release|x64 {EDD28611-EAD9-4EB5-A873-18160AC44434}.Release|ARM64EC.ActiveCfg = Release|x64 @@ -243,7 +233,6 @@ Global {07609D0D-FE6B-4A84-8C87-F914A4566F6F}.Debug|x64.ActiveCfg = Release|x64 {07609D0D-FE6B-4A84-8C87-F914A4566F6F}.Debug|x64.Build.0 = Release|x64 {07609D0D-FE6B-4A84-8C87-F914A4566F6F}.FullRelease|ARM64EC.ActiveCfg = Release|x64 - {07609D0D-FE6B-4A84-8C87-F914A4566F6F}.FullRelease|ARM64EC.Build.0 = Release|x64 {07609D0D-FE6B-4A84-8C87-F914A4566F6F}.FullRelease|Win32.ActiveCfg = Release|Win32 {07609D0D-FE6B-4A84-8C87-F914A4566F6F}.FullRelease|x64.ActiveCfg = Release|x64 {07609D0D-FE6B-4A84-8C87-F914A4566F6F}.Release|ARM64EC.ActiveCfg = Release|x64 diff --git a/od-win32/winuae_msvc15/winuae_msvc.vcxproj b/od-win32/winuae_msvc15/winuae_msvc.vcxproj index b9765d61..0a57fba7 100644 --- a/od-win32/winuae_msvc15/winuae_msvc.vcxproj +++ b/od-win32/winuae_msvc15/winuae_msvc.vcxproj @@ -179,11 +179,11 @@ true true winuae64 - winuae64 + winuaeARM64EC winuae64 - winuae_arm64 + winuaeARM64EC winuae64 - winuae64 + winuaeARM64EC $(MSBuildProgramFiles32)\Windows Kits\10\Include\10.0.18362.0\km;c:\dev\include;$(IncludePath) $(MSBuildProgramFiles32)\Windows Kits\10\Include\10.0.18362.0\km;c:\dev\include;$(IncludePath) C:\dev\lib;$(LibraryPath) @@ -215,6 +215,7 @@ $(MSBuildProgramFiles32)\Windows Kits\10\bin\10.0.17763.0\x64;$(ExecutablePath) + d:\amiga\ $(MSBuildProgramFiles32)\Windows Kits\10\bin\10.0.17763.0\x86;$(ExecutablePath) @@ -233,6 +234,7 @@ $(MSBuildProgramFiles32)\Windows Kits\10\bin\10.0.17763.0\x64;$(ExecutablePath) + d:\amiga\ $(MSBuildProgramFiles32)\Windows Kits\10\bin\10.0.17763.0\x64;$(ExecutablePath) @@ -544,7 +546,7 @@ 0x0409 - ws2_32.lib;winmm.lib;comctl32.lib;version.lib;vfw32.lib;msacm32.lib;dsound.lib;dinput8.lib;d3d9.lib;d3dx9.lib;setupapi.lib;wininet.lib;shlwapi.lib;zlibstat.lib;portaudio_x64.lib;openal32.lib;libpng16.lib;lglcd.lib;wtsapi32.lib;enet_x64.lib;prowizard_x64.lib;lzmalib.lib;libFLAC_static.lib;hid.lib;Iphlpapi.lib;luastatic.lib;libmpeg2_ff.lib;softfloat.lib;gdiplus.lib;effects11.lib;Msimg32.lib;Dwmapi.lib;mt32emu.lib;%(AdditionalDependencies) + ws2_32.lib;winmm.lib;comctl32.lib;version.lib;vfw32.lib;msacm32.lib;dsound.lib;dinput8.lib;d3d9.lib;d3dx9.lib;setupapi.lib;wininet.lib;shlwapi.lib;zlibstat.lib;portaudio_x64.lib;openal32.lib;libpng16.lib;lglcd.lib;wtsapi32.lib;enet_x64.lib;prowizard_x64.lib;lzmalib.lib;libFLAC_static.lib;hid.lib;Iphlpapi.lib;luastatic.lib;libmpeg2_ff.lib;softfloat.lib;gdiplus.lib;effects11.lib;Msimg32.lib;Dwmapi.lib;mt32emu.lib;XINPUT9_1_0.lib;%(AdditionalDependencies) NotSet $(OutDir)$(TargetName)$(TargetExt) true @@ -567,6 +569,7 @@ /ignore:4099 %(AdditionalOptions) + false ..\resources\winuae64.exe.manifest @@ -671,7 +674,6 @@ Default MultiThreaded false - false StreamingSIMDExtensions2 Fast false @@ -697,7 +699,7 @@ 0x0409 - ws2_32.lib;winmm.lib;comctl32.lib;version.lib;vfw32.lib;msacm32.lib;dsound.lib;dinput8.lib;d3d9.lib;d3dx9.lib;setupapi.lib;wininet.lib;shlwapi.lib;zlibstat.lib;portaudio_x64.lib;openal32.lib;libpng16.lib;lglcd.lib;wtsapi32.lib;enet_x64.lib;prowizard_x64.lib;lzmalib.lib;libFLAC_static.lib;hid.lib;Iphlpapi.lib;luastatic.lib;libmpeg2_ff.lib;softfloat.lib;gdiplus.lib;effects11.lib;Msimg32.lib;Dwmapi.lib;mt32emu.lib;%(AdditionalDependencies) + ws2_32.lib;winmm.lib;comctl32.lib;version.lib;vfw32.lib;msacm32.lib;dsound.lib;dinput8.lib;d3d9.lib;d3dx9.lib;setupapi.lib;wininet.lib;shlwapi.lib;zlibstat.lib;portaudio_x64.lib;openal32.lib;libpng16.lib;lglcd.lib;wtsapi32.lib;enet_x64.lib;prowizard_x64.lib;lzmalib.lib;libFLAC_static.lib;hid.lib;Iphlpapi.lib;luastatic.lib;libmpeg2_ff.lib;softfloat.lib;gdiplus.lib;effects11.lib;Msimg32.lib;Dwmapi.lib;mt32emu.lib;XINPUT9_1_0.lib;%(AdditionalDependencies) NotSet $(OutDir)$(TargetName)$(TargetExt) true @@ -715,10 +717,11 @@ true - false - true + true + false true - 0x10000000 + + /ignore:4099 %(AdditionalOptions) @@ -935,7 +938,7 @@ 0x0409 - ws2_32.lib;winmm.lib;comctl32.lib;version.lib;vfw32.lib;msacm32.lib;dsound.lib;dinput8.lib;d3d9.lib;d3dx9.lib;setupapi.lib;wininet.lib;shlwapi.lib;zlibstat.lib;portaudio_x64.lib;openal32.lib;libpng16.lib;lglcd.lib;wtsapi32.lib;enet_x64.lib;prowizard_x64.lib;lzmalib.lib;libFLAC_static.lib;hid.lib;Iphlpapi.lib;luastatic.lib;libmpeg2_ff.lib;softfloat.lib;gdiplus.lib;effects11.lib;Msimg32.lib;Dwmapi.lib;mt32emu.lib;%(AdditionalDependencies) + ws2_32.lib;winmm.lib;comctl32.lib;version.lib;vfw32.lib;msacm32.lib;dsound.lib;dinput8.lib;d3d9.lib;d3dx9.lib;setupapi.lib;wininet.lib;shlwapi.lib;zlibstat.lib;portaudio_x64.lib;openal32.lib;libpng16.lib;lglcd.lib;wtsapi32.lib;enet_x64.lib;prowizard_x64.lib;lzmalib.lib;libFLAC_static.lib;hid.lib;Iphlpapi.lib;luastatic.lib;libmpeg2_ff.lib;softfloat.lib;gdiplus.lib;effects11.lib;Msimg32.lib;Dwmapi.lib;mt32emu.lib;XINPUT9_1_0.lib;%(AdditionalDependencies) NotSet $(OutDir)$(TargetName)$(TargetExt) true @@ -943,7 +946,7 @@ %(IgnoreSpecificDefaultLibraries);MSVCRT d3dx9_43.dll;openal32.dll;portaudio_x64.dll;ws2_32.dll;msacm32.dll;wtsapi32.dll;dsound.dll;Iphlpapi.dll;d3dcompiler_47.dll;%(DelayLoadDLLs) true - .\x64\FullRelease/winuae.pdb + .\arm64\FullRelease/winuae.pdb Windows @@ -952,10 +955,11 @@ true true UseLinkTimeCodeGeneration - false - true + true + false true - 0x10000000 + + /ignore:4099 %(AdditionalOptions) true @@ -1291,12 +1295,12 @@ false - false + true Document false true false - false + true nasm -f win64 %(FullPath) -o $(IntDir)%(filename).obj nasm -f win64 %(FullPath) -o $(IntDir)%(filename).obj nasm -f win64 %(FullPath) -o $(IntDir)%(filename).obj diff --git a/od-win32/winuaechangelog.txt b/od-win32/winuaechangelog.txt index cbc48ce7..e9a53f96 100644 --- a/od-win32/winuaechangelog.txt +++ b/od-win32/winuaechangelog.txt @@ -1,4 +1,15 @@ +Beta 12: + +- Only some filter numeric edit boxes adjusted the sliders correctly. +- Magic mouse positioning had offset in some filter modes (v6). +- uaehf.device thread syncronization fixed when device is opened when current opener count is zero and closed when opener count becomes zero. Happened only if device was repeatedly opened and closed quickly. Probably has existed since uaehf.device was introduced. + +Beta 11: + +- Genlock mode in some ECS/AGA configurations crashed at boot. +- Reverted beta 8 statefile expansion update, full expansion restore is not yet complete enough. Old method requires config file that matches statefile expansions but at least it works if they match. + Beta 10: - Filter panel new numeric text controls had wrong min and max values for most filter modes. -- 2.47.3