wine-commits November 2022

wine-commits@winehq.org

1 participants
1171 discussions

Saulius Krasuckas : ntdll: Check __WINE_PE_BUILD instead of compiler macros.
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: stable Commit: 1267fe6f5869708f1e92838c4c7c15a16560cefb URL: https://gitlab.winehq.org/wine/wine/-/commit/1267fe6f5869708f1e92838c4c7c15… Author: Saulius Krasuckas <saulius2(a)ar-fi.lt> Date: Tue Mar 1 02:42:05 2022 +0200 ntdll: Check __WINE_PE_BUILD instead of compiler macros. Fixes compilation on Cygwin, undeclared identifiers: _alldiv, _allmul, _allrem, _aulldiv, _aullrem. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52607 Signed-off-by: Saulius Krasuckas <saulius2(a)ar-fi.lt> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit f72978ad0751159c00283406856b0c02d2b3cfca) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntdll/large_int.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/large_int.c b/dlls/ntdll/large_int.c index 20ffd646a3e..b38074158c8 100644 --- a/dlls/ntdll/large_int.c +++ b/dlls/ntdll/large_int.c @@ -520,7 +520,7 @@ NTSTATUS WINAPI RtlInt64ToUnicodeString( #ifdef __i386__ /* those builtin functions use stdcall calling convention, but compilers reference them without stdcall declarations */ -#if defined(__MINGW32__) || defined(_MSC_VER) +#ifdef __WINE_PE_BUILD LONGLONG WINAPI _alldiv( LONGLONG a, LONGLONG b ) asm(__ASM_NAME("_alldiv")); LONGLONG WINAPI _allmul( LONGLONG a, LONGLONG b ) asm(__ASM_NAME("_allmul")); LONGLONG WINAPI _allrem( LONGLONG a, LONGLONG b ) asm(__ASM_NAME("_allrem"));

1 0

Bhavesh Davda : wined3d: Add GPU information for NVIDIA Ampere A10 and AMD Radeon Pro V620 GPUs.
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: stable Commit: 08ba025f037d762ef8bc5685fae885985ffc7af1 URL: https://gitlab.winehq.org/wine/wine/-/commit/08ba025f037d762ef8bc5685fae885… Author: Bhavesh Davda <bhaveshd(a)hotmail.com> Date: Sat Jun 18 02:30:22 2022 +0000 wined3d: Add GPU information for NVIDIA Ampere A10 and AMD Radeon Pro V620 GPUs. Signed-off-by: Bhavesh Davda <bhaveshd(a)hotmail.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit c53e4ee4655cee3470de3112383344c1c9be0f93) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 1 + dlls/wined3d/directx.c | 3 +++ dlls/wined3d/wined3d_private.h | 3 +++ 3 files changed, 7 insertions(+) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 8a97144550d..328a80f53f8 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -1313,6 +1313,7 @@ cards_nvidia_binary[] = { /* Direct 3D 11 */ {"Tesla T4", CARD_NVIDIA_TESLA_T4}, + {"Ampere A10", CARD_NVIDIA_AMPERE_A10}, {"RTX 2080 Ti", CARD_NVIDIA_GEFORCE_RTX2080TI}, /* GeForce 2000 - highend */ {"RTX 2080", CARD_NVIDIA_GEFORCE_RTX2080}, /* GeForce 2000 - highend */ {"RTX 2070", CARD_NVIDIA_GEFORCE_RTX2070}, /* GeForce 2000 - highend */ diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 140fe7b2022..0858aa7011c 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -457,6 +457,7 @@ static const struct wined3d_gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_RTX2080, "NVIDIA GeForce RTX 2080", DRIVER_NVIDIA_KEPLER, 8192}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_RTX2080TI, "NVIDIA GeForce RTX 2080 Ti", DRIVER_NVIDIA_KEPLER, 11264}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_TESLA_T4, "NVIDIA Tesla T4", DRIVER_NVIDIA_KEPLER, 16384}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_AMPERE_A10, "NVIDIA Ampere A10", DRIVER_NVIDIA_KEPLER, 24576}, /* AMD cards */ {HW_VENDOR_AMD, CARD_AMD_RAGE_128PRO, "ATI Rage Fury", DRIVER_AMD_RAGE_128PRO, 16 }, @@ -518,6 +519,8 @@ static const struct wined3d_gpu_description gpu_description_table[] = {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_NAVI_10, "Radeon RX 5700 / 5700 XT", DRIVER_AMD_RX, 8192}, {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_NAVI_14, "Radeon RX 5500M", DRIVER_AMD_RX, 4096}, {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_NAVI_21, "Radeon RX 6800/6800 XT / 6900 XT", DRIVER_AMD_RX, 16384}, + {HW_VENDOR_AMD, CARD_AMD_RADEON_PRO_V620, "Radeon Pro V620", DRIVER_AMD_RX, 32768}, + {HW_VENDOR_AMD, CARD_AMD_RADEON_PRO_V620_VF, "Radeon Pro V620 VF", DRIVER_AMD_RX, 32768}, {HW_VENDOR_AMD, CARD_AMD_VANGOGH, "AMD VANGOGH", DRIVER_AMD_RX, 4096}, /* Red Hat */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e9d1fd169a0..b18222f8d07 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2961,6 +2961,8 @@ enum wined3d_pci_device CARD_AMD_RADEON_RX_NAVI_10 = 0x731f, CARD_AMD_RADEON_RX_NAVI_14 = 0x7340, CARD_AMD_RADEON_RX_NAVI_21 = 0x73bf, + CARD_AMD_RADEON_PRO_V620 = 0x73a1, + CARD_AMD_RADEON_PRO_V620_VF = 0x73ae, CARD_AMD_VANGOGH = 0x163f, CARD_NVIDIA_RIVA_128 = 0x0018, @@ -3107,6 +3109,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_RTX2080 = 0x1e87, CARD_NVIDIA_GEFORCE_RTX2080TI = 0x1e07, CARD_NVIDIA_TESLA_T4 = 0x1eb8, + CARD_NVIDIA_AMPERE_A10 = 0x2236, CARD_REDHAT_VIRGL = 0x1010,

1 0

Henri Verbeet : wined3d: Add GPU information for NVIDIA Tesla T4.
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: stable Commit: 56c1423ef931a9b88b3ded36db32bdae6a403e7f URL: https://gitlab.winehq.org/wine/wine/-/commit/56c1423ef931a9b88b3ded36db32bd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 30 16:24:49 2022 +0200 wined3d: Add GPU information for NVIDIA Tesla T4. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit e58f596cd3ef5bb7f57e6c118badb93fa0a8f04a) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 1 + dlls/wined3d/directx.c | 1 + dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 3 insertions(+) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 5511a70a8ff..8a97144550d 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -1312,6 +1312,7 @@ static const struct wined3d_renderer_table cards_nvidia_binary[] = { /* Direct 3D 11 */ + {"Tesla T4", CARD_NVIDIA_TESLA_T4}, {"RTX 2080 Ti", CARD_NVIDIA_GEFORCE_RTX2080TI}, /* GeForce 2000 - highend */ {"RTX 2080", CARD_NVIDIA_GEFORCE_RTX2080}, /* GeForce 2000 - highend */ {"RTX 2070", CARD_NVIDIA_GEFORCE_RTX2070}, /* GeForce 2000 - highend */ diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index b2925eb97e9..140fe7b2022 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -456,6 +456,7 @@ static const struct wined3d_gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_RTX2070, "NVIDIA GeForce RTX 2070", DRIVER_NVIDIA_KEPLER, 8192}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_RTX2080, "NVIDIA GeForce RTX 2080", DRIVER_NVIDIA_KEPLER, 8192}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_RTX2080TI, "NVIDIA GeForce RTX 2080 Ti", DRIVER_NVIDIA_KEPLER, 11264}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_TESLA_T4, "NVIDIA Tesla T4", DRIVER_NVIDIA_KEPLER, 16384}, /* AMD cards */ {HW_VENDOR_AMD, CARD_AMD_RAGE_128PRO, "ATI Rage Fury", DRIVER_AMD_RAGE_128PRO, 16 }, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 5fa51a844ac..e9d1fd169a0 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3106,6 +3106,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_RTX2070 = 0x1f07, CARD_NVIDIA_GEFORCE_RTX2080 = 0x1e87, CARD_NVIDIA_GEFORCE_RTX2080TI = 0x1e07, + CARD_NVIDIA_TESLA_T4 = 0x1eb8, CARD_REDHAT_VIRGL = 0x1010,

1 0

Martin Storsjö : ntdll: Zero-initialize the syscall_frame used for starting threads on ARM/ARM64.
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: stable Commit: bb8b9899d485fd1912f93d04b172e6b6e7bffec5 URL: https://gitlab.winehq.org/wine/wine/-/commit/bb8b9899d485fd1912f93d04b172e6… Author: Martin Storsjö <martin(a)martin.st> Date: Fri Mar 4 18:15:56 2022 +0200 ntdll: Zero-initialize the syscall_frame used for starting threads on ARM/ARM64. This fixes an inconsistency since fed7e7a78b4bea183d0cbb107953e275f17baa4f (ntdll: Simulate a syscall return when starting a thread); in that commit, on i386 and x86_64, the syscall_frame used for starting the thread was zeroed with a memset, while it wasn't on arm and arm64. This had a noticable effect on float maths, where the uninitialized frame->restore_flags field could have the CONTEXT_FLOATING_POINT bit set. (call_init_thunk only ORs in CONTEXT_INTEGER into the restore_flags field, on all architectures). If that bit was set, it would restore uninitialized data into the fpscr register, possibly setting the FPU in a nondefault rounding mode. Signed-off-by: Martin Storsjö <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 482b6a6dea4f73db84354ff31c5cde20998aaa81) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntdll/unix/signal_arm.c | 1 + dlls/ntdll/unix/signal_arm64.c | 1 + 2 files changed, 2 insertions(+) diff --git a/dlls/ntdll/unix/signal_arm.c b/dlls/ntdll/unix/signal_arm.c index a1bcb0ddd32..1fea76f6563 100644 --- a/dlls/ntdll/unix/signal_arm.c +++ b/dlls/ntdll/unix/signal_arm.c @@ -1105,6 +1105,7 @@ void DECLSPEC_HIDDEN call_init_thunk( LPTHREAD_START_ROUTINE entry, void *arg, B ctx = (CONTEXT *)((ULONG_PTR)context.Sp & ~15) - 1; *ctx = context; ctx->ContextFlags = CONTEXT_FULL; + memset( frame, 0, sizeof(*frame) ); NtSetContextThread( GetCurrentThread(), ctx ); frame->sp = (DWORD)ctx; diff --git a/dlls/ntdll/unix/signal_arm64.c b/dlls/ntdll/unix/signal_arm64.c index 94f280e218a..1df97f16f13 100644 --- a/dlls/ntdll/unix/signal_arm64.c +++ b/dlls/ntdll/unix/signal_arm64.c @@ -1202,6 +1202,7 @@ void DECLSPEC_HIDDEN call_init_thunk( LPTHREAD_START_ROUTINE entry, void *arg, B ctx = (CONTEXT *)((ULONG_PTR)context.Sp & ~15) - 1; *ctx = context; ctx->ContextFlags = CONTEXT_FULL; + memset( frame, 0, sizeof(*frame) ); NtSetContextThread( GetCurrentThread(), ctx ); frame->sp = (ULONG64)ctx;

1 0

Kevin Puetz : winegcc: --out-implib needs to propagate -m32/-m64 to winebuild.
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: stable Commit: c6bc349e5cf6cf55fb8df96a8bf43214ec88cf8e URL: https://gitlab.winehq.org/wine/wine/-/commit/c6bc349e5cf6cf55fb8df96a8bf432… Author: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Date: Thu Feb 3 16:08:25 2022 -0600 winegcc: --out-implib needs to propagate -m32/-m64 to winebuild. This was already passed through for linking, and for spec.o files, but was overlooked when implementing -Wl,--out-implib Signed-off-by: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit ccf7b4459bc6a8303aa93a9743e7a3b01ffb9783) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- tools/winegcc/winegcc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 5e666c395e5..74fad83e441 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -889,6 +889,8 @@ static struct strarray get_winebuild_args(struct options *opts) strarray_add( &spec_args, "--target" ); strarray_add( &spec_args, opts->target_alias ); } + if (opts->force_pointer_size) + strarray_add(&spec_args, strmake("-m%u", 8 * opts->force_pointer_size )); for (i = 0; i < opts->prefix.count; i++) strarray_add( &spec_args, strmake( "-B%s", opts->prefix.str[i] )); strarray_addall( &spec_args, opts->winebuild_args ); @@ -1017,8 +1019,6 @@ static const char *build_spec_obj( struct options *opts, const char *spec_file, } spec_o_name = get_temp_file(output_name, ".spec.o"); - if (opts->force_pointer_size) - strarray_add(&spec_args, strmake("-m%u", 8 * opts->force_pointer_size )); if (opts->pic && !is_pe) strarray_add(&spec_args, "-fPIC"); strarray_add(&spec_args, opts->shared ? "--dll" : "--exe"); if (opts->fake_module)

1 0

Nikolay Sivov : xmllite/reader: Implement CreateXmlReaderInputWithEncodingCodePage().
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: stable Commit: 7357361fef0c7551321e1b1afa1bd497ca2b9dc0 URL: https://gitlab.winehq.org/wine/wine/-/commit/7357361fef0c7551321e1b1afa1bd4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 3 14:40:31 2022 +0300 xmllite/reader: Implement CreateXmlReaderInputWithEncodingCodePage(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52953 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit f2403bf783a0cff78e1f2c935a212b98ca7b9b4b) Conflicts: dlls/xmllite/tests/reader.c Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/xmllite/reader.c | 36 ++++++++++++++++++++++++++---------- dlls/xmllite/tests/reader.c | 6 ++++++ dlls/xmllite/xmllite.spec | 2 +- include/xmllite.idl | 2 ++ 4 files changed, 35 insertions(+), 11 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 834c36ae18c..e506c29d67d 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -3667,19 +3667,12 @@ HRESULT WINAPI CreateXmlReader(REFIID riid, void **obj, IMalloc *imalloc) return hr; } -HRESULT WINAPI CreateXmlReaderInputWithEncodingName(IUnknown *stream, - IMalloc *imalloc, - LPCWSTR encoding, - BOOL hint, - LPCWSTR base_uri, - IXmlReaderInput **ppInput) +static HRESULT create_reader_input(IUnknown *stream, IMalloc *imalloc, xml_encoding encoding, + BOOL hint, const WCHAR *base_uri, IXmlReaderInput **ppInput) { xmlreaderinput *readerinput; HRESULT hr; - TRACE("%p %p %s %d %s %p\n", stream, imalloc, wine_dbgstr_w(encoding), - hint, wine_dbgstr_w(base_uri), ppInput); - if (!stream || !ppInput) return E_INVALIDARG; if (imalloc) @@ -3693,7 +3686,7 @@ HRESULT WINAPI CreateXmlReaderInputWithEncodingName(IUnknown *stream, readerinput->imalloc = imalloc; readerinput->stream = NULL; if (imalloc) IMalloc_AddRef(imalloc); - readerinput->encoding = parse_encoding_name(encoding, -1); + readerinput->encoding = encoding; readerinput->hint = hint; readerinput->baseuri = readerinput_strdupW(readerinput, base_uri); readerinput->pending = 0; @@ -3714,3 +3707,26 @@ HRESULT WINAPI CreateXmlReaderInputWithEncodingName(IUnknown *stream, return S_OK; } + +/*********************************************************************** + * CreateXmlReaderInputWithEncodingName (xmllite.@) + */ +HRESULT WINAPI CreateXmlReaderInputWithEncodingName(IUnknown *stream, IMalloc *imalloc, + const WCHAR *encoding, BOOL hint, const WCHAR *base_uri, IXmlReaderInput **input) +{ + TRACE("%p, %p, %s, %d, %s, %p.\n", stream, imalloc, wine_dbgstr_w(encoding), + hint, wine_dbgstr_w(base_uri), input); + + return create_reader_input(stream, imalloc, parse_encoding_name(encoding, -1), hint, base_uri, input); +} + +/*********************************************************************** + * CreateXmlReaderInputWithEncodingCodePage (xmllite.@) + */ +HRESULT WINAPI CreateXmlReaderInputWithEncodingCodePage(IUnknown *stream, IMalloc *imalloc, + UINT codepage, BOOL hint, const WCHAR *base_uri, IXmlReaderInput **input) +{ + TRACE("%p, %p, %u, %d, %s, %p.\n", stream, imalloc, codepage, hint, wine_dbgstr_w(base_uri), input); + + return create_reader_input(stream, imalloc, get_encoding_from_codepage(codepage), hint, base_uri, input); +} diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index cb3a3f4e571..33d01d74c2b 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -767,6 +767,12 @@ static void test_readerinput(void) IXmlReader_Release(reader); IUnknown_Release(reader_input); + + /* Using codepage */ + hr = CreateXmlReaderInputWithEncodingCodePage(input, NULL, 1200, FALSE, NULL, &reader_input); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IUnknown_Release(reader_input); + IUnknown_Release(input); } diff --git a/dlls/xmllite/xmllite.spec b/dlls/xmllite/xmllite.spec index 574ed9865c3..3097e8d4e88 100644 --- a/dlls/xmllite/xmllite.spec +++ b/dlls/xmllite/xmllite.spec @@ -1,5 +1,5 @@ @ stdcall CreateXmlReader(ptr ptr ptr) -@ stub CreateXmlReaderInputWithEncodingCodePage +@ stdcall CreateXmlReaderInputWithEncodingCodePage(ptr ptr long long wstr ptr) @ stdcall CreateXmlReaderInputWithEncodingName(ptr ptr wstr long wstr ptr) @ stdcall CreateXmlWriter(ptr ptr ptr) @ stdcall CreateXmlWriterOutputWithEncodingCodePage(ptr ptr long ptr) diff --git a/include/xmllite.idl b/include/xmllite.idl index 0fd68f7b781..b2de76e5630 100644 --- a/include/xmllite.idl +++ b/include/xmllite.idl @@ -228,6 +228,8 @@ typedef enum XmlError cpp_quote("STDAPI CreateXmlReader(REFIID riid, void **ppvObject, IMalloc *pMalloc);") cpp_quote("typedef IUnknown IXmlReaderInput;") +cpp_quote("STDAPI CreateXmlReaderInputWithEncodingCodePage(IUnknown *stream, IMalloc *pMalloc,") +cpp_quote(" UINT encoding_codepage, BOOL hint, const WCHAR *base_uri, IXmlReaderInput **pInput);") cpp_quote("STDAPI CreateXmlReaderInputWithEncodingName(IUnknown *stream, IMalloc *pMalloc,") cpp_quote(" LPCWSTR encoding, BOOL hint,") cpp_quote(" LPCWSTR base_uri, IXmlReaderInput **ppInput);")

1 0

Nikolay Sivov : uxtheme: Fix double free on registry key handle.
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: stable Commit: ded80655888fdf98a646a027de0f56eed6823709 URL: https://gitlab.winehq.org/wine/wine/-/commit/ded80655888fdf98a646a027de0f56… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Apr 24 11:42:22 2022 +0300 uxtheme: Fix double free on registry key handle. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52704 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 28d572aa14300b7452f491e2a6b53b4e1ad9a104) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/uxtheme/system.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/uxtheme/system.c b/dlls/uxtheme/system.c index 5e245b16d3a..73af2618311 100644 --- a/dlls/uxtheme/system.c +++ b/dlls/uxtheme/system.c @@ -127,7 +127,6 @@ static DWORD query_reg_path (HKEY hKey, LPCWSTR lpszValue, } } - RegCloseKey(hKey); return dwRet; }

1 0

Zhiyi Zhang : include: Avoid a C++ keyword for RegisterUserApiHook().
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: stable Commit: 52d8cd0a9c53be2162f5ed2d76f2117869b135ba URL: https://gitlab.winehq.org/wine/wine/-/commit/52d8cd0a9c53be2162f5ed2d76f211… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Sat Apr 9 12:14:46 2022 +0800 include: Avoid a C++ keyword for RegisterUserApiHook(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52787 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit be8acff719ef4f0698a1ca845b35c0d430f92fd1) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/user32/hook.c | 10 +++++----- include/winuser.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/user32/hook.c b/dlls/user32/hook.c index 159797020f2..c30c1b37745 100644 --- a/dlls/user32/hook.c +++ b/dlls/user32/hook.c @@ -971,16 +971,16 @@ BOOL WINAPI IsWinEventHookInstalled(DWORD dwEvent) } /* Undocumented RegisterUserApiHook() */ -BOOL WINAPI RegisterUserApiHook(const struct user_api_hook *new, struct user_api_hook *old) +BOOL WINAPI RegisterUserApiHook(const struct user_api_hook *new_hook, struct user_api_hook *old_hook) { - if (!new) + if (!new_hook) return FALSE; USER_Lock(); - hooked_user_api = *new; + hooked_user_api = *new_hook; user_api = &hooked_user_api; - if (old) - *old = original_user_api; + if (old_hook) + *old_hook = original_user_api; USER_Unlock(); return TRUE; } diff --git a/include/winuser.h b/include/winuser.h index 1d37bd44344..129f1368976 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -4441,7 +4441,7 @@ struct user_api_hook LRESULT (WINAPI *pScrollBarWndProc)(HWND, UINT, WPARAM, LPARAM, BOOL); }; -WINUSERAPI BOOL WINAPI RegisterUserApiHook(const struct user_api_hook *new, struct user_api_hook *old); +WINUSERAPI BOOL WINAPI RegisterUserApiHook(const struct user_api_hook *new_hook, struct user_api_hook *old_hook); WINUSERAPI void WINAPI UnregisterUserApiHook(void); #endif

1 0

Zhiyi Zhang : win32u: Return -1 for NUMCOLORS with 8-bit display DCs.
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: stable Commit: dff2b89c16572651c155bd8a60da1eb214dccb4d URL: https://gitlab.winehq.org/wine/wine/-/commit/dff2b89c16572651c155bd8a60da1e… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Apr 18 14:55:48 2022 +0800 win32u: Return -1 for NUMCOLORS with 8-bit display DCs. According to tests, GetDeviceCaps(NUMCOLORS) returns -1 for display DCs when the current display mode is 8-bit on newer versions of Windows, which makes sense because lower bit depth display modes are actually emulated with 32-bit modes. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52679 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit a1dda8c376e11ace204e8b97a9ba9344e400e2a5) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/user32/tests/monitor.c | 2 +- dlls/win32u/driver.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index b7f2727b049..9e319867af8 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -3,6 +3,7 @@ * * Copyright 2005 Huw Davies * Copyright 2008 Dmitry Timoshkov + * Copyright 2019-2022 Zhiyi Zhang for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -2320,7 +2321,6 @@ static void test_display_dc(void) value = GetDeviceCaps(hdc, NUMCOLORS); if (bpps[i] > 8 || (bpps[i] == 8 && LOBYTE(LOWORD(GetVersion())) >= 6)) - todo_wine_if(bpps[i] == 8 && LOBYTE(LOWORD(GetVersion())) >= 6) ok(value == -1, "Expected -1, got %d.\n", value); else if (bpps[i] == 8 && LOBYTE(LOWORD(GetVersion())) < 6) ok(value > 16 && value <= 256, "Got %d.\n", value); diff --git a/dlls/win32u/driver.c b/dlls/win32u/driver.c index 39996086c6d..0d3d720763e 100644 --- a/dlls/win32u/driver.c +++ b/dlls/win32u/driver.c @@ -319,7 +319,8 @@ static INT CDECL nulldrv_GetDeviceCaps( PHYSDEV dev, INT cap ) case LOGPIXELSY: return get_system_dpi(); case NUMCOLORS: bpp = NtGdiGetDeviceCaps( dev->hdc, BITSPIXEL ); - return (bpp > 8) ? -1 : (1 << bpp); + /* Newer versions of Windows return -1 for 8-bit and higher */ + return (bpp > 4) ? -1 : (1 << bpp); case COLORRES: /* The observed correspondence between BITSPIXEL and COLORRES is: * BITSPIXEL: 8 -> COLORRES: 18

1 0

Zhiyi Zhang : user32/tests: Test NUMCOLORS for display DCs.
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: stable Commit: f8adf323ede15e378809dd66ea5a655e2e41dd68 URL: https://gitlab.winehq.org/wine/wine/-/commit/f8adf323ede15e378809dd66ea5a65… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Apr 18 14:55:29 2022 +0800 user32/tests: Test NUMCOLORS for display DCs. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit bfed4330245fe08c72fb317db02f8eddfd305767) Conflicts: dlls/user32/tests/monitor.c Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/user32/tests/monitor.c | 92 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 91 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index 5e14c536a76..b7f2727b049 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -2193,8 +2193,10 @@ static void _check_display_dc(INT line, HDC hdc, const DEVMODEA *dm, BOOL allow_ static void test_display_dc(void) { static const INT bpps[] = {1, 4, 8, 16, 24, 32}; + unsigned char buffer[sizeof(BITMAPINFOHEADER) + 256 * sizeof(RGBQUAD)]; + BITMAPINFO *bmi = (BITMAPINFO *)buffer; + INT count, old_count, i, bpp, value; HBITMAP hbitmap, old_hbitmap; - INT count, old_count, i, bpp; DWORD device_idx, mode_idx; DEVMODEA dm, dm2, dm3; DISPLAY_DEVICEA dd; @@ -2247,7 +2249,95 @@ static void test_display_dc(void) winetest_pop_context(); } + /* Test selecting a DIB of a different depth into a display compatible DC */ + for (i = 0; i < ARRAY_SIZE(bpps); ++i) + { + winetest_push_context("bpp %d", bpps[i]); + + mem_dc = CreateCompatibleDC(hdc); + memset(buffer, 0, sizeof(buffer)); + bmi->bmiHeader.biSize = sizeof(bmi->bmiHeader); + bmi->bmiHeader.biWidth = dm.dmPelsWidth; + bmi->bmiHeader.biHeight = dm.dmPelsHeight; + bmi->bmiHeader.biBitCount = bpps[i]; + bmi->bmiHeader.biPlanes = 1; + bmi->bmiHeader.biCompression = BI_RGB; + hbitmap = CreateDIBSection(hdc, bmi, DIB_RGB_COLORS, NULL, NULL, 0); + ok(!!hbitmap, "CreateDIBSection failed, error %d.\n", GetLastError()); + old_hbitmap = SelectObject(mem_dc, hbitmap); + ok(!!old_hbitmap, "Failed to select bitmap.\n"); + + value = GetDeviceCaps(mem_dc, BITSPIXEL); + ok(value == 32, "Expected 32, got %d.\n", value); + value = GetDeviceCaps(mem_dc, NUMCOLORS); + ok(value == -1, "Expected -1, got %d.\n", value); + + SelectObject(mem_dc, old_hbitmap); + DeleteObject(hbitmap); + DeleteDC(mem_dc); + + winetest_pop_context(); + } + + /* Test NUMCOLORS for display DCs */ + for (i = ARRAY_SIZE(bpps) - 1; i >= 0; --i) + { + winetest_push_context("bpp %d", bpps[i]); + + ret = EnumDisplaySettingsA(NULL, ENUM_CURRENT_SETTINGS, &dm); + ok(ret, "EnumDisplaySettingsA failed.\n"); + if (bpps[i] == dm.dmBitsPerPel) + { + res = DISP_CHANGE_SUCCESSFUL; + } + else + { + memset(&dm2, 0, sizeof(dm2)); + dm2.dmSize = sizeof(dm2); + for (mode_idx = 0; EnumDisplaySettingsA(NULL, mode_idx, &dm2); ++mode_idx) + { + if (dm2.dmBitsPerPel == bpps[i]) + break; + } + if (dm2.dmBitsPerPel != bpps[i]) + { + skip("%d-bit display mode not found.\n", bpps[i]); + winetest_pop_context(); + continue; + } + + res = ChangeDisplaySettingsExA(NULL, &dm2, NULL, CDS_RESET, NULL); + /* Win8 TestBots */ + ok(res == DISP_CHANGE_SUCCESSFUL || broken(res == DISP_CHANGE_FAILED), + "ChangeDisplaySettingsExA returned unexpected %d.\n", res); + } + + if (res == DISP_CHANGE_SUCCESSFUL) + { + value = GetDeviceCaps(hdc, BITSPIXEL); + ok(value == (bpps[i] == 4 ? 1 : bpps[i]), "Expected %d, got %d.\n", + (bpps[i] == 4 ? 1 : bpps[i]), value); + + value = GetDeviceCaps(hdc, NUMCOLORS); + if (bpps[i] > 8 || (bpps[i] == 8 && LOBYTE(LOWORD(GetVersion())) >= 6)) + todo_wine_if(bpps[i] == 8 && LOBYTE(LOWORD(GetVersion())) >= 6) + ok(value == -1, "Expected -1, got %d.\n", value); + else if (bpps[i] == 8 && LOBYTE(LOWORD(GetVersion())) < 6) + ok(value > 16 && value <= 256, "Got %d.\n", value); + else + ok(value == 1 << bpps[i], "Expected %d, got %d.\n", 1 << bpps[i], value); + } + winetest_pop_context(); + } + res = ChangeDisplaySettingsExA(NULL, NULL, NULL, 0, NULL); + /* Win8 TestBots */ + ok(res == DISP_CHANGE_SUCCESSFUL || broken(res == DISP_CHANGE_FAILED), + "ChangeDisplaySettingsExA returned unexpected %d.\n", res); + /* Test selecting a DDB of the same color depth into a display compatible DC */ + ret = EnumDisplaySettingsA(NULL, ENUM_CURRENT_SETTINGS, &dm); + ok(ret, "EnumDisplaySettingsA failed.\n"); + mem_dc = CreateCompatibleDC(hdc); bpp = GetDeviceCaps(mem_dc, BITSPIXEL); ok(bpp == dm.dmBitsPerPel, "Expected bpp %d, got %d.\n", dm.dmBitsPerPel, bpp);

1 0

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 November 2022