wine-commits March 2023

wine-commits@winehq.org

1 participants
910 discussions

Brendan Shanks : kernel32: Implement GetFirmwareType().
by Alexandre Julliard 06 Mar '23

06 Mar '23

Module: wine Branch: master Commit: ac031bff9efb47ac883c062bc44bf60f68b44a1f URL: https://gitlab.winehq.org/wine/wine/-/commit/ac031bff9efb47ac883c062bc44bf6… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Fri Mar 3 11:37:31 2023 -0800 kernel32: Implement GetFirmwareType(). --- dlls/kernel32/kernel32.spec | 1 + dlls/kernel32/process.c | 12 ++++++++++++ include/winbase.h | 1 + include/winnt.h | 7 +++++++ 4 files changed, 21 insertions(+) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index d6b0eb62a69..47ff251067a 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -692,6 +692,7 @@ @ stdcall -import GetFinalPathNameByHandleW(long ptr long long) @ stdcall GetFirmwareEnvironmentVariableA(str str ptr long) @ stdcall GetFirmwareEnvironmentVariableW(wstr wstr ptr long) +@ stdcall GetFirmwareType(ptr) @ stdcall -import GetFullPathNameA(str long ptr ptr) # @ stub GetFullPathNameTransactedA # @ stub GetFullPathNameTransactedW diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 4630043645c..e9e18925911 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -740,6 +740,18 @@ BOOL WINAPI SetFirmwareEnvironmentVariableW(const WCHAR *name, const WCHAR *guid return FALSE; } +/*********************************************************************** + * GetFirmwareType (KERNEL32.@) + */ +BOOL WINAPI GetFirmwareType(FIRMWARE_TYPE *type) +{ + if (!type) + return FALSE; + + *type = FirmwareTypeUnknown; + return TRUE; +} + /********************************************************************** * GetNumaNodeProcessorMask (KERNEL32.@) */ diff --git a/include/winbase.h b/include/winbase.h index 6b3048f795e..2829287a255 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2203,6 +2203,7 @@ WINBASEAPI DWORD WINAPI GetFileSize(HANDLE,LPDWORD); WINBASEAPI BOOL WINAPI GetFileSizeEx(HANDLE,PLARGE_INTEGER); WINBASEAPI BOOL WINAPI GetFileTime(HANDLE,LPFILETIME,LPFILETIME,LPFILETIME); WINBASEAPI DWORD WINAPI GetFileType(HANDLE); +WINBASEAPI BOOL WINAPI GetFirmwareType(PFIRMWARE_TYPE); #define GetFreeSpace(w) (__MSABI_LONG(0x100000)) WINBASEAPI DWORD WINAPI GetFullPathNameA(LPCSTR,DWORD,LPSTR,LPSTR*); WINBASEAPI DWORD WINAPI GetFullPathNameW(LPCWSTR,DWORD,LPWSTR,LPWSTR*); diff --git a/include/winnt.h b/include/winnt.h index 17dce6e84e5..a7c69070a2c 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -6495,6 +6495,13 @@ typedef enum _PROCESS_MITIGATION_POLICY MaxProcessMitigationPolicy } PROCESS_MITIGATION_POLICY, *PPROCESS_MITIGATION_POLICY; +typedef enum _FIRMWARE_TYPE +{ + FirmwareTypeUnknown, + FirmwareTypeBios, + FirmwareTypeUefi, + FirmwareTypeMax +} FIRMWARE_TYPE, *PFIRMWARE_TYPE; /* Intrinsic functions */

1 0

Francois Gouget : advapi32/tests: Fix the RegEnumValueA() tests in UTF-8 locales.
by Alexandre Julliard 06 Mar '23

06 Mar '23

Module: wine Branch: master Commit: 95f2cc0f15b1dde0318e75e2a7f21957fa76af55 URL: https://gitlab.winehq.org/wine/wine/-/commit/95f2cc0f15b1dde0318e75e2a7f219… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Mar 3 16:23:07 2023 +0100 advapi32/tests: Fix the RegEnumValueA() tests in UTF-8 locales. On Windows RegEnumValueA() is buggy such that when the value name buffer is too small, it may way overestimate the required data buffer size, sometimes returning more than the sufficiently large buffer it was provided, in which case that buffer is untouched and thus not NUL-terminated. So modify the tests to accept this broken result and avoid checking out-of-bounds data. Wine-Bug: https://bugs.winehq.org//show_bug.cgi?id=53172 --- dlls/advapi32/tests/registry.c | 29 ++++++++++++++++++++--------- 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 480e96ef6ee..524c3e0ef76 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -476,7 +476,7 @@ static void test_enum_value(void) { DWORD res; HKEY test_key; - char value[20], data[20]; + char value[20], data[30]; WCHAR valueW[20], dataW[20]; DWORD val_count, data_count, type; @@ -542,39 +542,50 @@ static void test_enum_value(void) /* overflow name */ val_count = 3; - data_count = 20; + data_count = 16; type = 1234; strcpy( value, "xxxxxxxxxx" ); memset( data, 'x', sizeof(data) ); + data[sizeof(data)-1] = '\0'; res = RegEnumValueA( test_key, 0, value, &val_count, NULL, &type, (LPBYTE)data, &data_count ); ok( res == ERROR_MORE_DATA, "expected ERROR_MORE_DATA, got %ld\n", res ); ok( val_count == 3, "val_count set to %ld\n", val_count ); - /* Chinese, Japanese, and Korean editions of Windows 10 sometimes set data_count to a higher value */ + /* In double-byte and UTF-8 locales Windows 10 may set data_count > 7, + * potentially even more than the declared buffer size, in which case the + * buffer is not NUL-terminated. + */ ok( data_count == 7 || broken( data_count > 7 ), "data_count set to %ld instead of 7\n", data_count ); ok( type == REG_SZ, "type %ld is not REG_SZ\n", type ); - /* v5.1.2600.0 (XP Home and Professional) does not touch value or data in this case */ + /* v5.1.2600.0 (XP Home and Professional) does not touch value or data in + * this case. Neither does Windows 10 21H1 in UTF-8 locales. + */ ok( !strcmp( value, "Te" ) || !strcmp( value, "xxxxxxxxxx" ), "value set to '%s' instead of 'Te' or 'xxxxxxxxxx'\n", value ); ok( !strcmp( data, "foobar" ) || !strcmp( data, "xxxxxxx" ) || - broken( data_count > 7 && strspn( data, "x" ) == data_count && data[data_count] == 0 ), + broken( data_count > 7 && data_count < 16 && + strspn( data, "x" ) == data_count && data[data_count] == 0 ) || + broken( data_count >= 16 && strspn( data, "x" ) == sizeof(data) - 1 ), "data set to '%s' instead of 'foobar' or x's, data_count=%lu\n", data, data_count ); /* overflow empty name */ val_count = 0; - data_count = 20; + data_count = 16; type = 1234; strcpy( value, "xxxxxxxxxx" ); memset( data, 'x', sizeof(data) ); + data[sizeof(data)-1] = '\0'; res = RegEnumValueA( test_key, 0, value, &val_count, NULL, &type, (LPBYTE)data, &data_count ); ok( res == ERROR_MORE_DATA, "expected ERROR_MORE_DATA, got %ld\n", res ); ok( val_count == 0, "val_count set to %ld\n", val_count ); - /* Chinese, Japanese, and Korean editions of Windows 10 sometimes set data_count to a higher value */ + /* See comment in 'overflow name' section */ ok( data_count == 7 || broken( data_count > 7 ), "data_count set to %ld instead of 7\n", data_count ); ok( type == REG_SZ, "type %ld is not REG_SZ\n", type ); ok( !strcmp( value, "xxxxxxxxxx" ), "value set to '%s'\n", value ); - /* v5.1.2600.0 (XP Home and Professional) does not touch data in this case */ + /* See comment in 'overflow name' section */ ok( !strcmp( data, "foobar" ) || !strcmp( data, "xxxxxxx" ) || - broken( data_count > 7 && strspn( data, "x" ) == data_count && data[data_count] == 0 ), + broken( data_count > 7 && data_count < 16 && + strspn( data, "x" ) == data_count && data[data_count] == 0 ) || + broken( data_count >= 16 && strspn( data, "x" ) == sizeof(data) - 1 ), "data set to '%s' instead of 'foobar' or x's, data_count=%lu\n", data, data_count ); /* overflow data */

1 0

Alexandre Julliard : Wine release 8.3
by Alexandre Julliard 03 Mar '23

03 Mar '23

Module: website Branch: master Commit: 68a726c06f3f79e39e5bf9236fc2950075b6d1dd URL: https://gitlab.winehq.org/winehq/winehq/-/commit/68a726c06f3f79e39e5bf9236f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 3 22:31:16 2023 +0100 Wine release 8.3 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2023030301.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/en/2023030301.xml b/news/en/2023030301.xml new file mode 100644 index 00000000..d1c50957 --- /dev/null +++ b/news/en/2023030301.xml @@ -0,0 +1,16 @@ +<news> +<date>March 3, 2023</date> +<title>Wine 8.3 Released</title> +<body> + The Wine development release 8.3 is now available. + <a href="{$root}/announce/8.3">What's new</a> in this release: +<ul> + <li>Support for the Low Fragmentation Heap.</li> + <li>Smard card support using PCSC-Lite.</li> + <li>Bundled Zydis library for more correct disassembly.</li> + <li>Various bug fixes.</li> +</ul> + +The source is <a href="//dl.winehq.org/wine/source/8.x/wine-8.3.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-8.3 : Alexandre Julliard : Release 8.3
by Alexandre Julliard 03 Mar '23

03 Mar '23

Module: wine Branch: refs/tags/wine-8.3 Tag: 343a857a2648ebe1c276e558ca238f0b8087a900 URL: https://gitlab.winehq.org/wine/wine/-/tags/343a857a2648ebe1c276e558ca238f0b… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 3 22:28:42 2023 +0100 Release 8.3

1 0

Alexandre Julliard : Release 8.3.
by Alexandre Julliard 03 Mar '23

03 Mar '23

Module: wine Branch: master Commit: e796002ee61bf5dfb2718e8f4fb8fa928ccdc236 URL: https://gitlab.winehq.org/wine/wine/-/commit/e796002ee61bf5dfb2718e8f4fb8fa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 3 22:25:34 2023 +0100 Release 8.3. --- ANNOUNCE | 701 +++++++++++++++++++++++++++++--------------------------------- AUTHORS | 5 + VERSION | 2 +- configure | 18 +- 4 files changed, 346 insertions(+), 380 deletions(-)

1 0

Piotr Caban : windowscodecs: Don't reorder gif extension blocks in GetReaderByIndex.
by Alexandre Julliard 03 Mar '23

03 Mar '23

Module: wine Branch: master Commit: fe7885be8002013499fdca426d0ac2ab254926ec URL: https://gitlab.winehq.org/wine/wine/-/commit/fe7885be8002013499fdca426d0ac2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Mar 3 13:33:55 2023 +0100 windowscodecs: Don't reorder gif extension blocks in GetReaderByIndex. --- dlls/windowscodecs/gifformat.c | 54 +++++++++++++++---------------------- dlls/windowscodecs/tests/metadata.c | 28 +++++++++---------- 2 files changed, 36 insertions(+), 46 deletions(-) diff --git a/dlls/windowscodecs/gifformat.c b/dlls/windowscodecs/gifformat.c index 4bd0772810d..f0048d12da9 100644 --- a/dlls/windowscodecs/gifformat.c +++ b/dlls/windowscodecs/gifformat.c @@ -947,7 +947,10 @@ static HRESULT WINAPI GifFrameDecode_Block_GetReaderByIndex(IWICMetadataBlockRea UINT index, IWICMetadataReader **reader) { GifFrameDecode *This = frame_from_IWICMetadataBlockReader(iface); - int i, gce_index = -1, gce_skipped = 0; + class_constructor constructor; + ExtensionBlock *ext; + const void *data; + int data_size; TRACE("(%p,%u,%p)\n", iface, index, reader); @@ -959,40 +962,27 @@ static HRESULT WINAPI GifFrameDecode_Block_GetReaderByIndex(IWICMetadataBlockRea if (index >= This->frame->Extensions.ExtensionBlockCount + 1) return E_INVALIDARG; - for (i = 0; i < This->frame->Extensions.ExtensionBlockCount; i++) + ext = This->frame->Extensions.ExtensionBlocks + index - 1; + if (ext->Function == GRAPHICS_EXT_FUNC_CODE) { - class_constructor constructor; - const void *data; - int data_size; - - if (index != i + 1 - gce_skipped) continue; - - if (This->frame->Extensions.ExtensionBlocks[i].Function == GRAPHICS_EXT_FUNC_CODE) - { - gce_index = i; - gce_skipped = 1; - continue; - } - else if (This->frame->Extensions.ExtensionBlocks[i].Function == COMMENT_EXT_FUNC_CODE) - { - constructor = GifCommentReader_CreateInstance; - data = This->frame->Extensions.ExtensionBlocks[i].Bytes; - data_size = This->frame->Extensions.ExtensionBlocks[i].ByteCount; - } - else - { - constructor = UnknownMetadataReader_CreateInstance; - data = This->frame->Extensions.ExtensionBlocks[i].Bytes; - data_size = This->frame->Extensions.ExtensionBlocks[i].ByteCount; - } - return create_metadata_reader(data, data_size, constructor, reader); + constructor = GCEReader_CreateInstance; + data = ext->Bytes + 3; + data_size = ext->ByteCount - 4; + } + else if (ext->Function == COMMENT_EXT_FUNC_CODE) + { + constructor = GifCommentReader_CreateInstance; + data = ext->Bytes; + data_size = ext->ByteCount; + } + else + { + constructor = UnknownMetadataReader_CreateInstance; + data = ext->Bytes; + data_size = ext->ByteCount; } - if (gce_index == -1) return E_INVALIDARG; - - return create_metadata_reader(This->frame->Extensions.ExtensionBlocks[gce_index].Bytes + 3, - This->frame->Extensions.ExtensionBlocks[gce_index].ByteCount - 4, - GCEReader_CreateInstance, reader); + return create_metadata_reader(data, data_size, constructor, reader); } static HRESULT WINAPI GifFrameDecode_Block_GetEnumerator(IWICMetadataBlockReader *iface, diff --git a/dlls/windowscodecs/tests/metadata.c b/dlls/windowscodecs/tests/metadata.c index 7902a5fcb8d..1deb09cfd19 100644 --- a/dlls/windowscodecs/tests/metadata.c +++ b/dlls/windowscodecs/tests/metadata.c @@ -188,10 +188,10 @@ static const char animatedgif[] = { 0x00,0x00,0x00,0x00,0x01,0x00,0x01,0x00,0x81, 0xDE,0xDE,0xDE,0x00,0x00,0x00, 0x00,0x00,0x00,0x00,0x00,0x00,0x02,0x02,0x4C,0x01,0x00, +0x21,0xF9,0x04,0x01,0x0A,0x00,0x01,0x00, 0x21,0xFE,0x08,'i','m','a','g','e',' ','#','1',0x00, 0x21,0x01,0x0C,'p','l','a','i','n','t','e','x','t',' ','#','1',0x00, -0x21,0xF9,0x04,0x01,0x0A,0x00,0x01,0x00,0x2C, -0x00,0x00,0x00,0x00,0x01,0x00,0x01,0x00,0x81, +0x2C,0x00,0x00,0x00,0x00,0x01,0x00,0x01,0x00,0x81, 0x4D,0x4D,0x4D,0x00,0x00,0x00, 0x00,0x00,0x00,0x00,0x00,0x00,0x02,0x02,0x44,0x01,0x00, 0x21,0xFE,0x08,'i','m','a','g','e',' ','#','2',0x00, @@ -1517,15 +1517,14 @@ static void test_metadata_gif(void) { hr = IWICMetadataReader_GetMetadataFormat(reader, &format); ok(hr == S_OK, "GetMetadataFormat failed, hr=%#lx\n", hr); - ok(IsEqualGUID(&format, &GUID_MetadataFormatGifComment), /* Comment Extension */ - "wrong metadata format %s\n", wine_dbgstr_guid(&format)); + ok(IsEqualGUID(&format, &GUID_MetadataFormatGCE), /* Graphic Control Extension */ + "wrong metadata format %s\n", wine_dbgstr_guid(&format)); hr = IWICMetadataReader_GetCount(reader, &count); ok(hr == S_OK, "GetCount error %#lx\n", hr); - ok(count == ARRAY_SIZE(animated_gif_comment_2), "unexpected count %u\n", count); + ok(count == ARRAY_SIZE(animated_gif_GCE), "unexpected count %u\n", count); - if (count == 1) - compare_metadata(reader, animated_gif_comment_2, count); + compare_metadata(reader, animated_gif_GCE, count); IWICMetadataReader_Release(reader); } @@ -1537,14 +1536,15 @@ static void test_metadata_gif(void) { hr = IWICMetadataReader_GetMetadataFormat(reader, &format); ok(hr == S_OK, "GetMetadataFormat failed, hr=%#lx\n", hr); - ok(IsEqualGUID(&format, &GUID_MetadataFormatUnknown), - "wrong metadata format %s\n", wine_dbgstr_guid(&format)); + ok(IsEqualGUID(&format, &GUID_MetadataFormatGifComment), /* Comment Extension */ + "wrong metadata format %s\n", wine_dbgstr_guid(&format)); hr = IWICMetadataReader_GetCount(reader, &count); ok(hr == S_OK, "GetCount error %#lx\n", hr); - ok(count == ARRAY_SIZE(animated_gif_plain_2), "unexpected count %u\n", count); + ok(count == ARRAY_SIZE(animated_gif_comment_2), "unexpected count %u\n", count); - compare_metadata(reader, animated_gif_plain_2, count); + if (count == 1) + compare_metadata(reader, animated_gif_comment_2, count); IWICMetadataReader_Release(reader); } @@ -1556,14 +1556,14 @@ static void test_metadata_gif(void) { hr = IWICMetadataReader_GetMetadataFormat(reader, &format); ok(hr == S_OK, "GetMetadataFormat failed, hr=%#lx\n", hr); - ok(IsEqualGUID(&format, &GUID_MetadataFormatGCE), /* Graphic Control Extension */ + ok(IsEqualGUID(&format, &GUID_MetadataFormatUnknown), "wrong metadata format %s\n", wine_dbgstr_guid(&format)); hr = IWICMetadataReader_GetCount(reader, &count); ok(hr == S_OK, "GetCount error %#lx\n", hr); - ok(count == ARRAY_SIZE(animated_gif_GCE), "unexpected count %u\n", count); + ok(count == ARRAY_SIZE(animated_gif_plain_2), "unexpected count %u\n", count); - compare_metadata(reader, animated_gif_GCE, count); + compare_metadata(reader, animated_gif_plain_2, count); IWICMetadataReader_Release(reader); }

1 0

Rémi Bernon : win32u: Check GUID_NULL display device if desktop atom is missing.
by Alexandre Julliard 03 Mar '23

03 Mar '23

Module: wine Branch: master Commit: 9c22a5ea63c6be01e257f05bbed23e03d5a7f407 URL: https://gitlab.winehq.org/wine/wine/-/commit/9c22a5ea63c6be01e257f05bbed23e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Mar 3 09:30:37 2023 +0100 win32u: Check GUID_NULL display device if desktop atom is missing. When using nulldrv, there's no module to call __wine_set_user_driver and the user driver is still lazy_load_driver when get_display_driver gets called during desktop windows creation. Then, load_desktop_driver fails as it cannot find the not-yet-created desktop window atom, and fails later explorer.exe window creations such as the systray window. Other processes don't suffer from this as they wait for the desktop window to be fully created, and its atom will be eventually set. This change makes sure that we succeed in the case nulldrv was selected by explorer.exe, while still failing in case of error with another user driver as it would fail to open the right display device GUID. --- dlls/win32u/driver.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/win32u/driver.c b/dlls/win32u/driver.c index 3f676dc5796..eb736de272d 100644 --- a/dlls/win32u/driver.c +++ b/dlls/win32u/driver.c @@ -923,6 +923,8 @@ static const WCHAR guid_key_suffixW[] = {'}','\\','0','0','0','0'}; static BOOL load_desktop_driver( HWND hwnd ) { + static const WCHAR guid_nullW[] = {'0','0','0','0','0','0','0','0','-','0','0','0','0','-','0','0','0','0','-', + '0','0','0','0','-','0','0','0','0','0','0','0','0','0','0','0','0',0}; WCHAR key[ARRAYSIZE(guid_key_prefixW) + 40 + ARRAYSIZE(guid_key_suffixW)], *ptr; char buf[4096]; KEY_VALUE_PARTIAL_INFORMATION *info = (void *)buf; @@ -946,9 +948,15 @@ static BOOL load_desktop_driver( HWND hwnd ) memcpy( key, guid_key_prefixW, sizeof(guid_key_prefixW) ); ptr = key + ARRAYSIZE(guid_key_prefixW); if (NtQueryInformationAtom( guid_atom, AtomBasicInformation, buf, sizeof(buf), NULL )) - return FALSE; - memcpy( ptr, abi->Name, abi->NameLength ); - ptr += abi->NameLength / sizeof(WCHAR); + { + wcscpy( ptr, guid_nullW ); + ptr += ARRAY_SIZE(guid_nullW) - 1; + } + else + { + memcpy( ptr, abi->Name, abi->NameLength ); + ptr += abi->NameLength / sizeof(WCHAR); + } memcpy( ptr, guid_key_suffixW, sizeof(guid_key_suffixW) ); ptr += ARRAY_SIZE(guid_key_suffixW);

1 0

Rémi Bernon : explorer: Use GUID_NULL display device GUID for nulldrv.
by Alexandre Julliard 03 Mar '23

03 Mar '23

Module: wine Branch: master Commit: 992d60e1222ef6e6e835ed10e80556235e257bd4 URL: https://gitlab.winehq.org/wine/wine/-/commit/992d60e1222ef6e6e835ed10e80556… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Mar 3 09:30:37 2023 +0100 explorer: Use GUID_NULL display device GUID for nulldrv. --- programs/explorer/desktop.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index 96673adc254..81eb0d1d01b 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -876,7 +876,7 @@ static BOOL get_default_enable_shell( const WCHAR *name ) return result; } -static HMODULE load_graphics_driver( const WCHAR *driver, const GUID *guid ) +static HMODULE load_graphics_driver( const WCHAR *driver, GUID *guid ) { static const WCHAR device_keyW[] = { 'S','y','s','t','e','m','\\', @@ -921,6 +921,7 @@ static HMODULE load_graphics_driver( const WCHAR *driver, const GUID *guid ) if (!wcscmp( name, L"null" )) { + memset( guid, 0, sizeof(*guid) ); TRACE( "display %s using null driver\n", debugstr_guid(guid) ); wcscpy( libname, L"null" ); null_driver = TRUE;

1 0

Rémi Bernon : win32u: Return the current display mode depth with nulldrv.
by Alexandre Julliard 03 Mar '23

03 Mar '23

Module: wine Branch: master Commit: 8531f23a41956dcc3c68d6b02401f5c78db8ec60 URL: https://gitlab.winehq.org/wine/wine/-/commit/8531f23a41956dcc3c68d6b02401f5… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Mar 3 10:26:37 2023 +0100 win32u: Return the current display mode depth with nulldrv. --- dlls/win32u/driver.c | 2 +- dlls/win32u/sysparams.c | 13 +++++++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/win32u/driver.c b/dlls/win32u/driver.c index 1c0708461a1..3f676dc5796 100644 --- a/dlls/win32u/driver.c +++ b/dlls/win32u/driver.c @@ -761,7 +761,7 @@ static BOOL nulldrv_GetCurrentDisplaySettings( LPCWSTR name, BOOL is_primary, LP static INT nulldrv_GetDisplayDepth( LPCWSTR name, BOOL is_primary ) { - return 32; + return -1; /* use default implementation */ } static BOOL nulldrv_UpdateDisplayDevices( const struct gdi_device_manager *manager, BOOL force, void *param ) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index bcdb8c5103b..60b12321953 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -2727,6 +2727,7 @@ static unsigned int active_monitor_count(void) INT get_display_depth( UNICODE_STRING *name ) { struct display_device *device; + BOOL is_primary; INT depth; if (!lock_display_devices()) @@ -2743,8 +2744,16 @@ INT get_display_depth( UNICODE_STRING *name ) return 32; } - depth = user_driver->pGetDisplayDepth( device->device_name, - !!(device->state_flags & DISPLAY_DEVICE_PRIMARY_DEVICE) ); + is_primary = !!(device->state_flags & DISPLAY_DEVICE_PRIMARY_DEVICE); + if ((depth = user_driver->pGetDisplayDepth( device->device_name, is_primary )) < 0) + { + struct adapter *adapter = CONTAINING_RECORD( device, struct adapter, dev ); + DEVMODEW current_mode = {.dmSize = sizeof(DEVMODEW)}; + + if (!adapter_get_current_settings( adapter, &current_mode )) depth = 32; + else depth = current_mode.dmBitsPerPel; + } + unlock_display_devices(); return depth; }

1 0

Rémi Bernon : win32u: Map VK_MENU / KBDALT in kbdus_tables pCharModifiers.
by Alexandre Julliard 03 Mar '23

03 Mar '23

Module: wine Branch: master Commit: 2a6b80b508c6fd983729835a3d5c10f87a49f55b URL: https://gitlab.winehq.org/wine/wine/-/commit/2a6b80b508c6fd983729835a3d5c10… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Mar 3 09:59:51 2023 +0100 win32u: Map VK_MENU / KBDALT in kbdus_tables pCharModifiers. --- dlls/win32u/input.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/win32u/input.c b/dlls/win32u/input.c index f768453594f..d7e502a4513 100644 --- a/dlls/win32u/input.c +++ b/dlls/win32u/input.c @@ -135,8 +135,8 @@ static const VK_TO_BIT vk_to_bit[] = static const MODIFIERS modifiers = { .pVkToBit = (VK_TO_BIT *)vk_to_bit, - .wMaxModBits = 3, - .ModNumber = {0, 1, 2, 3}, + .wMaxModBits = 7, + .ModNumber = {0, 1, 2, 3, 0, 1, 0, 0}, }; static const VK_TO_WCHARS2 vk_to_wchars2[] =

1 0

← Newer
1
...
83
84
85
86
87
88
89
90
91
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2023