August 2021 - Wine-Devel - list.winehq.org

[PATCH 3/9] gdi32: Move D3DKMTOpenAdapterFromGdiDisplayName to objects.c.
by Jacek Caban Aug. 25, 2021

Aug. 25, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/driver.c | 91 ----------------------------------------- dlls/gdi32/objects.c | 97 +++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 96 insertions(+), 92 deletions(-)

1 0

[PATCH 2/9] gdi32: Implement NtGdiDdDDIOpenAdapterFromLuid.
by Jacek Caban Aug. 25, 2021

Aug. 25, 2021

And use it for D3DKMTOpenAdapterFromGdiDisplayName. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/driver.c | 41 +++++++++++++++++++++++------------------ dlls/gdi32/gdi32.spec | 1 + include/ddk/d3dkmthk.h | 6 ++++++ include/ntgdi.h | 1 + 4 files changed, 31 insertions(+), 18 deletions(-)

1 0

[PATCH 1/9] gdi32: Use ntgdi names for D3DKMT functions.
by Jacek Caban Aug. 25, 2021

Aug. 25, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/dib.c | 8 ++++---- dlls/gdi32/driver.c | 38 +++++++++++++++++++------------------- dlls/gdi32/gdi32.spec | 22 +++++++++++----------- include/ntgdi.h | 12 ++++++++++++ 4 files changed, 46 insertions(+), 34 deletions(-)

1 0

[PATCH] winex11.drv: When mapping a layered window make sure that surface has a valid bounding rectangle.
by Dmitry Timoshkov Aug. 25, 2021

Aug. 25, 2021

Otherwise surface->flush() would be a no-op. This may happen 1. when UpdateLayeredWindow() was initially called on an invisible window 2. when a window is unmapped during being converted to managed 3. layered windows are mapped only once their attributes are set Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/winex11.drv/window.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 4e856a41865..dfe7d1ce716 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1128,7 +1128,10 @@ static void map_window( HWND hwnd, DWORD new_style ) XMapWindow( data->display, data->whole_window ); XFlush( data->display ); if (data->surface && data->vis.visualid != default_visual.visualid) + { + add_bounds_rect( data->surface->funcs->get_bounds( data->surface ), &data->window_rect ); data->surface->funcs->flush( data->surface ); + } } else set_xembed_flags( data, XEMBED_MAPPED ); -- 2.31.1

1 1

[PATCH v2] ntoskrnl.exe: Add NtTraceControl/ZwTraceControl stubs
by Alistair Leslie-Hughes Aug. 25, 2021

Aug. 25, 2021

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/ntdll/ntdll.spec | 2 ++ dlls/ntdll/unix/server.c | 9 +++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 ++ dlls/wow64/sync.c | 14 ++++++++++++++ dlls/wow64/syscall.h | 1 + 5 files changed, 28 insertions(+) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 1bff52a299d..c3d17d989ac 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -414,6 +414,7 @@ @ stdcall -syscall NtTerminateProcess(long long) @ stdcall -syscall NtTerminateThread(long long) @ stdcall -syscall NtTestAlert() +@ stdcall -syscall NtTraceControl(long ptr long ptr long long) # @ stub NtTraceEvent # @ stub NtTranslateFilePath @ stdcall -syscall NtUnloadDriver(ptr) @@ -1435,6 +1436,7 @@ @ stdcall -private -syscall ZwTerminateProcess(long long) NtTerminateProcess @ stdcall -private -syscall ZwTerminateThread(long long) NtTerminateThread @ stdcall -private -syscall ZwTestAlert() NtTestAlert +@ stdcall -private -syscall ZwTraceControl(long ptr long ptr long long) NtTraceControl # @ stub ZwTraceEvent # @ stub ZwTranslateFilePath @ stdcall -private -syscall ZwUnloadDriver(ptr) NtUnloadDriver diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c index 986eb6c3250..05fae06fc37 100644 --- a/dlls/ntdll/unix/server.c +++ b/dlls/ntdll/unix/server.c @@ -721,6 +721,15 @@ NTSTATUS WINAPI NtTestAlert(void) return STATUS_SUCCESS; } +/*********************************************************************** + * NtTraceControl (NTDLL.@) + */ +NTSTATUS WINAPI NtTraceControl(ULONG code, void *inbuf, ULONG inbuf_len, void *outbuf, ULONG outbuf_len, ULONG *size) +{ + FIXME("code %u, inbuf %p, inbuf_len %u, outbuf %p, outbuf_len %u, size %p\n", code, inbuf, inbuf_len, + outbuf, outbuf_len, size); + return STATUS_SUCCESS; +} /*********************************************************************** * server_queue_process_apc diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index f51833b91a0..071dae6ceca 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -818,6 +818,7 @@ @ stdcall NtSetSecurityObject(long long ptr) @ stdcall NtSetVolumeInformationFile(long ptr ptr long long) @ stdcall NtShutdownSystem(long) +@ stdcall NtTraceControl(long ptr long ptr long long) @ stub NtTraceEvent @ stdcall NtUnlockFile(long ptr ptr ptr ptr) @ stub NtVdmControl @@ -1514,6 +1515,7 @@ @ stdcall -private ZwSetVolumeInformationFile(long ptr ptr long long) NtSetVolumeInformationFile @ stdcall -private ZwTerminateJobObject(long long) NtTerminateJobObject @ stdcall -private ZwTerminateProcess(long long) NtTerminateProcess +@ stdcall -private ZwTraceControl(long ptr long ptr long long) NtTraceControl @ stub ZwTranslateFilePath @ stdcall ZwUnloadDriver(ptr) @ stdcall -private ZwUnloadKey(ptr) NtUnloadKey diff --git a/dlls/wow64/sync.c b/dlls/wow64/sync.c index 2560fc10a0a..e4a58eeef6d 100644 --- a/dlls/wow64/sync.c +++ b/dlls/wow64/sync.c @@ -1480,6 +1480,20 @@ NTSTATUS WINAPI wow64_NtTestAlert( UINT *args ) return NtTestAlert(); } +/********************************************************************** + * wow64_NtTraceControl + */ +NTSTATUS WINAPI wow64_NtTraceControl( UINT *args ) +{ + ULONG code = get_ulong( &args ); + void *inbuf = get_ptr( &args ); + ULONG inbuf_len = get_ulong( &args ); + void *outbuf = get_ptr( &args ); + ULONG outbuf_len = get_ulong( &args ); + ULONG *size = get_ptr( &args ); + + return NtTraceControl(code, inbuf, inbuf_len, outbuf, outbuf_len, size); +} /********************************************************************** * wow64_NtWaitForDebugEvent diff --git a/dlls/wow64/syscall.h b/dlls/wow64/syscall.h index d6c1b7c74fa..a565e9cda3a 100644 --- a/dlls/wow64/syscall.h +++ b/dlls/wow64/syscall.h @@ -228,6 +228,7 @@ SYSCALL_ENTRY( NtTerminateProcess ) \ SYSCALL_ENTRY( NtTerminateThread ) \ SYSCALL_ENTRY( NtTestAlert ) \ + SYSCALL_ENTRY( NtTraceControl ) \ SYSCALL_ENTRY( NtUnloadDriver ) \ SYSCALL_ENTRY( NtUnloadKey ) \ SYSCALL_ENTRY( NtUnlockFile ) \ -- 2.32.0

1 0

[PATCH] services: Check correct permission
by Alistair Leslie-Hughes Aug. 25, 2021

Aug. 25, 2021

Function svcctl_QueryServiceConfigW already checked for this permission, so make sense that QueryServiceConfig2W should as well. MSDN states "This handle is returned by the OpenService or CreateService function and must have the SERVICE_QUERY_CONFIG access right" Patch by Bugzilla user Dalai. Wine-bug: https://bugs.winehq.org/show_bug.cgi?id=50412 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- programs/services/rpc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/services/rpc.c b/programs/services/rpc.c index 8d688c2f904..0f0a83df421 100644 --- a/programs/services/rpc.c +++ b/programs/services/rpc.c @@ -979,7 +979,7 @@ DWORD __cdecl svcctl_QueryServiceConfig2W( SC_RPC_HANDLE hService, DWORD level, memset(buffer, 0, size); - if ((err = validate_service_handle(hService, SERVICE_QUERY_STATUS, &service)) != 0) + if ((err = validate_service_handle(hService, SERVICE_QUERY_CONFIG, &service)) != 0) return err; switch (level) -- 2.32.0

1 0

[PATCH] nsiproxy: Include sys/queue.h from tcp.c
by Gerald Pfeifer Aug. 25, 2021

Aug. 25, 2021

In what looks like a change between FreeBSD 11 and later versions (FreeBSD 12 and 13), we now need to explicitly include sys/queue.h to avoid In file included from dlls/nsiproxy.sys/tcp.c:42: /usr/include/netinet/tcp_var.h:516:2: error: expected specifier-qualifier-list before 'TAILQ_ENTRY' 516 | TAILQ_ENTRY(tcptw) tw_2msl; Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> --- dlls/nsiproxy.sys/tcp.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/nsiproxy.sys/tcp.c b/dlls/nsiproxy.sys/tcp.c index 8567330be99..603aefadfe9 100644 --- a/dlls/nsiproxy.sys/tcp.c +++ b/dlls/nsiproxy.sys/tcp.c @@ -58,6 +58,10 @@ #include <netinet/ip_var.h> #endif +#ifdef HAVE_SYS_QUEUE_H +#include <sys/queue.h> +#endif + #ifdef HAVE_NETINET_TCP_VAR_H #include <netinet/tcp_var.h> #endif -- 2.31.1

2 1

[PATCH] iphlpapi: Return early on error.
by Huw Davies Aug. 25, 2021

Aug. 25, 2021

This prevents using err uninitialized. Spotted by Fabian Maurer. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51655 Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- Supersedes 212361. dlls/iphlpapi/iphlpapi_main.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 47c8a507e38..f83271eae97 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -1206,15 +1206,11 @@ static DWORD dns_info_alloc( IP_ADAPTER_ADDRESSES *aa, ULONG family, ULONG flags } } if (servers != (DNS_ADDR_ARRAY *)buf) heap_free( servers ); - if (err) goto err; + if (err) return err; } aa->DnsSuffix = heap_alloc( MAX_DNS_SUFFIX_STRING_LENGTH * sizeof(WCHAR) ); - if (!aa->DnsSuffix) - { - err = ERROR_NOT_ENOUGH_MEMORY; - goto err; - } + if (!aa->DnsSuffix) return ERROR_NOT_ENOUGH_MEMORY; aa->DnsSuffix[0] = '\0'; if (!DnsQueryConfig( DnsConfigSearchList, 0, name, NULL, NULL, &size ) && @@ -1231,8 +1227,7 @@ static DWORD dns_info_alloc( IP_ADAPTER_ADDRESSES *aa, ULONG family, ULONG flags aa = aa->Next; } -err: - return err; + return ERROR_SUCCESS; } static DWORD adapters_addresses_alloc( ULONG family, ULONG flags, IP_ADAPTER_ADDRESSES **info ) -- 2.23.0

1 0

[PATCH 4/4] uxtheme: Draw scroll bar parent background only when theme parts are transparent.
by Zhiyi Zhang Aug. 25, 2021

Aug. 25, 2021

Fix hangs in Source Insight 4 Options->Window->Styles. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/scrollbar.c | 27 ++++++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/dlls/uxtheme/scrollbar.c b/dlls/uxtheme/scrollbar.c index 386f0446049..a9d5a83f2bb 100644 --- a/dlls/uxtheme/scrollbar.c +++ b/dlls/uxtheme/scrollbar.c @@ -100,9 +100,6 @@ void WINAPI UXTHEME_ScrollBarDraw(HWND hwnd, HDC dc, INT bar, enum SCROLL_HITTES thumbstate = SCRBS_PRESSED; } - if (bar == SB_CTL) - DrawThemeParentBackground(hwnd, dc, NULL); - if (vertical) { int uparrowstate, downarrowstate; @@ -132,16 +129,22 @@ void WINAPI UXTHEME_ScrollBarDraw(HWND hwnd, HDC dc, INT bar, enum SCROLL_HITTES partrect = *rect; partrect.bottom = partrect.top + arrowsize; + if (bar == SB_CTL && IsThemeBackgroundPartiallyTransparent(theme, SBP_ARROWBTN, uparrowstate)) + DrawThemeParentBackground(hwnd, dc, &partrect); DrawThemeBackground(theme, dc, SBP_ARROWBTN, uparrowstate, &partrect, NULL); partrect.bottom = rect->bottom; partrect.top = partrect.bottom - arrowsize; + if (bar == SB_CTL && IsThemeBackgroundPartiallyTransparent(theme, SBP_ARROWBTN, downarrowstate)) + DrawThemeParentBackground(hwnd, dc, &partrect); DrawThemeBackground(theme, dc, SBP_ARROWBTN, downarrowstate, &partrect, NULL); if (thumbpos > 0) { partrect.top = rect->top + arrowsize; partrect.bottom = rect->top + thumbpos; + if (bar == SB_CTL && IsThemeBackgroundPartiallyTransparent(theme, SBP_UPPERTRACKVERT, uppertrackstate)) + DrawThemeParentBackground(hwnd, dc, &partrect); DrawThemeBackground(theme, dc, SBP_UPPERTRACKVERT, uppertrackstate, &partrect, NULL); } @@ -149,6 +152,8 @@ void WINAPI UXTHEME_ScrollBarDraw(HWND hwnd, HDC dc, INT bar, enum SCROLL_HITTES partrect.top = rect->top + thumbpos; partrect.bottom = partrect.top + thumbsize; + if (bar == SB_CTL && IsThemeBackgroundPartiallyTransparent(theme, SBP_THUMBBTNVERT, thumbstate)) + DrawThemeParentBackground(hwnd, dc, &partrect); DrawThemeBackground(theme, dc, SBP_THUMBBTNVERT, thumbstate, &partrect, NULL); if (SUCCEEDED(GetThemePartSize(theme, dc, SBP_GRIPPERVERT, thumbstate, NULL, TS_DRAW, &grippersize))) { @@ -167,7 +172,11 @@ void WINAPI UXTHEME_ScrollBarDraw(HWND hwnd, HDC dc, INT bar, enum SCROLL_HITTES else partrect.top = rect->top + arrowsize; if (partrect.bottom > partrect.top) + { + if (bar == SB_CTL && IsThemeBackgroundPartiallyTransparent(theme, SBP_LOWERTRACKVERT, lowertrackstate)) + DrawThemeParentBackground(hwnd, dc, &partrect); DrawThemeBackground(theme, dc, SBP_LOWERTRACKVERT, lowertrackstate, &partrect, NULL); + } } else { int leftarrowstate, rightarrowstate; @@ -197,16 +206,22 @@ void WINAPI UXTHEME_ScrollBarDraw(HWND hwnd, HDC dc, INT bar, enum SCROLL_HITTES partrect = *rect; partrect.right = partrect.left + arrowsize; + if (bar == SB_CTL && IsThemeBackgroundPartiallyTransparent(theme, SBP_ARROWBTN, leftarrowstate)) + DrawThemeParentBackground(hwnd, dc, &partrect); DrawThemeBackground(theme, dc, SBP_ARROWBTN, leftarrowstate, &partrect, NULL); partrect.right = rect->right; partrect.left = partrect.right - arrowsize; + if (bar == SB_CTL && IsThemeBackgroundPartiallyTransparent(theme, SBP_ARROWBTN, rightarrowstate)) + DrawThemeParentBackground(hwnd, dc, &partrect); DrawThemeBackground(theme, dc, SBP_ARROWBTN, rightarrowstate, &partrect, NULL); if (thumbpos > 0) { partrect.left = rect->left + arrowsize; partrect.right = rect->left + thumbpos; + if (bar == SB_CTL && IsThemeBackgroundPartiallyTransparent(theme, SBP_UPPERTRACKHORZ, uppertrackstate)) + DrawThemeParentBackground(hwnd, dc, &partrect); DrawThemeBackground(theme, dc, SBP_UPPERTRACKHORZ, uppertrackstate, &partrect, NULL); } @@ -214,6 +229,8 @@ void WINAPI UXTHEME_ScrollBarDraw(HWND hwnd, HDC dc, INT bar, enum SCROLL_HITTES partrect.left = rect->left + thumbpos; partrect.right = partrect.left + thumbsize; + if (bar == SB_CTL && IsThemeBackgroundPartiallyTransparent(theme, SBP_THUMBBTNHORZ, thumbstate)) + DrawThemeParentBackground(hwnd, dc, &partrect); DrawThemeBackground(theme, dc, SBP_THUMBBTNHORZ, thumbstate, &partrect, NULL); if (SUCCEEDED(GetThemePartSize(theme, dc, SBP_GRIPPERHORZ, thumbstate, NULL, TS_DRAW, &grippersize))) { @@ -232,7 +249,11 @@ void WINAPI UXTHEME_ScrollBarDraw(HWND hwnd, HDC dc, INT bar, enum SCROLL_HITTES else partrect.left = rect->left + arrowsize; if (partrect.right > partrect.left) + { + if (bar == SB_CTL && IsThemeBackgroundPartiallyTransparent(theme, SBP_LOWERTRACKHORZ, lowertrackstate)) + DrawThemeParentBackground(hwnd, dc, &partrect); DrawThemeBackground(theme, dc, SBP_LOWERTRACKHORZ, lowertrackstate, &partrect, NULL); + } } } -- 2.30.2

1 0

[PATCH 3/4] uxtheme: Use TransparentBlt() for bitmaps with all alpha values being 0xff.
by Zhiyi Zhang Aug. 25, 2021

Aug. 25, 2021

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51553 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/msstyles.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/uxtheme/msstyles.c b/dlls/uxtheme/msstyles.c index ed22d923250..6f74d2d3d7d 100644 --- a/dlls/uxtheme/msstyles.c +++ b/dlls/uxtheme/msstyles.c @@ -1072,11 +1072,18 @@ static BOOL prepare_alpha (HBITMAP bmp, BOOL* hasAlpha) if (!bmp || GetObjectW( bmp, sizeof(dib), &dib ) != sizeof(dib)) return FALSE; - if(dib.dsBm.bmBitsPixel != 32) + if (dib.dsBm.bmBitsPixel != 32 || dib.dsBmih.biCompression != BI_RGB) /* nothing to do */ return TRUE; - *hasAlpha = TRUE; + /* If all alpha values are 0xff, don't use alpha blending */ + for (n = 0, p = dib.dsBm.bmBits; n < dib.dsBmih.biWidth * dib.dsBmih.biHeight; n++, p += 4) + if ((*hasAlpha = (p[3] != 0xff))) + break; + + if (!*hasAlpha) + return TRUE; + p = dib.dsBm.bmBits; n = dib.dsBmih.biHeight * dib.dsBmih.biWidth; /* AlphaBlend() wants premultiplied alpha, so do that now */ -- 2.30.2

1 0