wine-commits August 2021

wine-commits@winehq.org

1 participants
1051 discussions

Rémi Bernon : winebus.sys: Create the SDL bus thread in main.c.
by Alexandre Julliard 25 Aug '21

25 Aug '21

Module: wine Branch: master Commit: 9a78467975100321773d11e0a3e2a427498a00cc URL: https://source.winehq.org/git/wine.git/?a=commit;h=9a78467975100321773d11e0… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Aug 23 10:49:36 2021 +0200 winebus.sys: Create the SDL bus thread in main.c. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus.h | 6 +- dlls/winebus.sys/bus_sdl.c | 150 ++++++++++++++++++--------------------------- dlls/winebus.sys/main.c | 85 ++++++++++++++++++++++--- 3 files changed, 139 insertions(+), 102 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9a78467975100321773d…

1 0

Alistair Leslie-Hughes : dpnet: Implement IDirectPlay8Address GetURLW/A.
by Alexandre Julliard 25 Aug '21

25 Aug '21

Module: wine Branch: master Commit: 7a4237fd2558cfded79a11d40bc53d0987bee233 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7a4237fd2558cfded79a11d4… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Aug 25 18:04:59 2021 +1000 dpnet: Implement IDirectPlay8Address GetURLW/A. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dpnet/address.c | 96 +++++++++++++++++++++++++++++---- dlls/dpnet/tests/address.c | 132 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 218 insertions(+), 10 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7a4237fd2558cfded79a…

1 0

Alistair Leslie-Hughes : ntdll: Add NtTraceControl/ZwTraceControl stubs.
by Alexandre Julliard 25 Aug '21

25 Aug '21

Module: wine Branch: master Commit: 16a7976de968b668bc970be4dc3bb5506bed2a34 URL: https://source.winehq.org/git/wine.git/?a=commit;h=16a7976de968b668bc970be4… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Aug 25 18:04:58 2021 +1000 ntdll: Add NtTraceControl/ZwTraceControl stubs. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 2 ++ dlls/ntdll/unix/debug.c | 15 +++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 ++ dlls/wow64/sync.c | 16 ++++++++++++++++ dlls/wow64/syscall.h | 1 + include/winternl.h | 3 ++- 6 files changed, 38 insertions(+), 1 deletion(-) 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/debug.c b/dlls/ntdll/unix/debug.c index d43cdaeb917..a2a63b5a9f4 100644 --- a/dlls/ntdll/unix/debug.c +++ b/dlls/ntdll/unix/debug.c @@ -34,6 +34,8 @@ # include <unistd.h> #endif +#include "ntstatus.h" +#define WIN32_NO_STATUS #include "windef.h" #include "winnt.h" #include "winternl.h" @@ -42,6 +44,7 @@ WINE_DECLARE_DEBUG_CHANNEL(pid); WINE_DECLARE_DEBUG_CHANNEL(timestamp); +WINE_DEFAULT_DEBUG_CHANNEL(ntdll); struct debug_info { @@ -328,3 +331,15 @@ void dbg_init(void) options[nb_debug_options] = default_option; init_done = TRUE; } + + +/*********************************************************************** + * 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; +} 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..0078508fc7f 100644 --- a/dlls/wow64/sync.c +++ b/dlls/wow64/sync.c @@ -1481,6 +1481,22 @@ NTSTATUS WINAPI wow64_NtTestAlert( UINT *args ) } +/********************************************************************** + * 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 ) \ diff --git a/include/winternl.h b/include/winternl.h index 06f00740e43..bc70121ac28 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -4009,7 +4009,7 @@ NTSYSAPI NTSTATUS WINAPI NtSetEvent(HANDLE,LONG*); NTSYSAPI NTSTATUS WINAPI NtSetHighEventPair(HANDLE); NTSYSAPI NTSTATUS WINAPI NtSetHighWaitLowEventPair(HANDLE); NTSYSAPI NTSTATUS WINAPI NtSetHighWaitLowThread(VOID); -NTSYSAPI NTSTATUS WINAPI NtSetInformationDebugObject(HANDLE,DEBUGOBJECTINFOCLASS,PVOID,ULONG,ULONG*); +NTSYSAPI NTSTATUS WINAPI NtSetInformationDebugObject(HANDLE,DEBUGOBJECTINFOCLASS,PVOID,ULONG,ULONG*); NTSYSAPI NTSTATUS WINAPI NtSetInformationFile(HANDLE,PIO_STATUS_BLOCK,PVOID,ULONG,FILE_INFORMATION_CLASS); NTSYSAPI NTSTATUS WINAPI NtSetInformationJobObject(HANDLE,JOBOBJECTINFOCLASS,PVOID,ULONG); NTSYSAPI NTSTATUS WINAPI NtSetInformationKey(HANDLE,const int,PVOID,ULONG); @@ -4045,6 +4045,7 @@ NTSYSAPI NTSTATUS WINAPI NtTerminateJobObject(HANDLE,NTSTATUS); NTSYSAPI NTSTATUS WINAPI NtTerminateProcess(HANDLE,LONG); NTSYSAPI NTSTATUS WINAPI NtTerminateThread(HANDLE,LONG); NTSYSAPI NTSTATUS WINAPI NtTestAlert(VOID); +NTSYSAPI NTSTATUS WINAPI NtTraceControl(ULONG,void*,ULONG,void*,ULONG,ULONG*); NTSYSAPI NTSTATUS WINAPI NtUnloadDriver(const UNICODE_STRING *); NTSYSAPI NTSTATUS WINAPI NtUnloadKey(POBJECT_ATTRIBUTES); NTSYSAPI NTSTATUS WINAPI NtUnloadKeyEx(POBJECT_ATTRIBUTES,HANDLE);

1 0

Huw Davies : iphlpapi: Return early on error.
by Alexandre Julliard 25 Aug '21

25 Aug '21

Module: wine Branch: master Commit: 9521640aa7acf42352eb91c9638b64e6b1e308ae URL: https://source.winehq.org/git/wine.git/?a=commit;h=9521640aa7acf42352eb91c9… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Aug 25 07:37:06 2021 +0100 iphlpapi: Return early on error. 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> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 )

1 0

Zhiyi Zhang : uxtheme: Draw scroll bar parent background only when theme parts are transparent.
by Alexandre Julliard 25 Aug '21

25 Aug '21

Module: wine Branch: master Commit: 2fd0e56a9f0c9b456ab3197485cc32b0dccbd54b URL: https://source.winehq.org/git/wine.git/?a=commit;h=2fd0e56a9f0c9b456ab31974… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Aug 25 14:24:42 2021 +0800 uxtheme: Draw scroll bar parent background only when theme parts are transparent. Fix hangs in Source Insight 4 Options->Window->Styles. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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); + } } }

1 0

Zhiyi Zhang : uxtheme: Use TransparentBlt() for bitmaps with all alpha values being 0xff.
by Alexandre Julliard 25 Aug '21

25 Aug '21

Module: wine Branch: master Commit: 96b7a8a317a859dd6f9bf9a0e03d303e7d3503b3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=96b7a8a317a859dd6f9bf9a0… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Aug 25 14:24:31 2021 +0800 uxtheme: Use TransparentBlt() for bitmaps with all alpha values being 0xff. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51553 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 */

1 0

Zhiyi Zhang : uxtheme: Implement DrawThemeIcon().
by Alexandre Julliard 25 Aug '21

25 Aug '21

Module: wine Branch: master Commit: ea430bf2b751c7a43328adf5dafe22ac1c971fa6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea430bf2b751c7a43328adf5… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Aug 25 14:24:22 2021 +0800 uxtheme: Implement DrawThemeIcon(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51589 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uxtheme/draw.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 55 insertions(+), 3 deletions(-) diff --git a/dlls/uxtheme/draw.c b/dlls/uxtheme/draw.c index 521f9eb32a9..4394f4943b7 100644 --- a/dlls/uxtheme/draw.c +++ b/dlls/uxtheme/draw.c @@ -2,6 +2,7 @@ * Win32 5.1 Theme drawing * * Copyright (C) 2003 Kevin Koltzau + * Copyright 2021 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 @@ -18,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define COBJMACROS + #include <stdlib.h> #include <stdarg.h> @@ -25,6 +28,8 @@ #include "winbase.h" #include "winuser.h" #include "wingdi.h" +#include "commctrl.h" +#include "commoncontrols.h" #include "vfwmsgs.h" #include "uxtheme.h" #include "tmschema.h" @@ -1649,10 +1654,57 @@ HRESULT WINAPI DrawThemeEdge(HTHEME hTheme, HDC hdc, int iPartId, HRESULT WINAPI DrawThemeIcon(HTHEME hTheme, HDC hdc, int iPartId, int iStateId, const RECT *pRect, HIMAGELIST himl, int iImageIndex) { - FIXME("%d %d: stub\n", iPartId, iStateId); - if(!hTheme) + INT effect = ICE_NONE, saturation = 0, alpha = 128; + IImageList *image_list = (IImageList *)himl; + IMAGELISTDRAWPARAMS params = {0}; + COLORREF color = 0; + + TRACE("%p %p %d %d %s %p %d\n", hTheme, hdc, iPartId, iStateId, wine_dbgstr_rect(pRect), himl, + iImageIndex); + + if (!hTheme) return E_HANDLE; - return E_NOTIMPL; + + GetThemeEnumValue(hTheme, iPartId, iStateId, TMT_ICONEFFECT, &effect); + switch (effect) + { + case ICE_NONE: + params.fState = ILS_NORMAL; + break; + case ICE_GLOW: + GetThemeColor(hTheme, iPartId, iStateId, TMT_GLOWCOLOR, &color); + params.fState = ILS_GLOW; + params.crEffect = color; + break; + case ICE_SHADOW: + GetThemeColor(hTheme, iPartId, iStateId, TMT_SHADOWCOLOR, &color); + params.fState = ILS_SHADOW; + params.crEffect = color; + break; + case ICE_PULSE: + GetThemeInt(hTheme, iPartId, iStateId, TMT_SATURATION, &saturation); + params.fState = ILS_SATURATE; + params.Frame = saturation; + break; + case ICE_ALPHA: + GetThemeInt(hTheme, iPartId, iStateId, TMT_ALPHALEVEL, &alpha); + params.fState = ILS_ALPHA; + params.Frame = alpha; + break; + } + + params.cbSize = sizeof(params); + params.himl = himl; + params.i = iImageIndex; + params.hdcDst = hdc; + params.x = pRect->left; + params.y = pRect->top; + params.cx = pRect->right - pRect->left; + params.cy = pRect->bottom - pRect->top; + params.rgbBk = CLR_NONE; + params.rgbFg = CLR_NONE; + params.fStyle = ILD_TRANSPARENT; + return IImageList_Draw(image_list, &params); } /***********************************************************************

1 0

Zhiyi Zhang : uxtheme: Add comctl32 v6 manifest.
by Alexandre Julliard 25 Aug '21

25 Aug '21

Module: wine Branch: master Commit: 6db55005c79dda44ec50c56782a2e75cf75a76d4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6db55005c79dda44ec50c567… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Aug 25 14:23:56 2021 +0800 uxtheme: Add comctl32 v6 manifest. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uxtheme/uxtheme.manifest | 16 ++++++++++++++++ dlls/uxtheme/version.rc | 3 +++ 2 files changed, 19 insertions(+) diff --git a/dlls/uxtheme/uxtheme.manifest b/dlls/uxtheme/uxtheme.manifest new file mode 100644 index 00000000000..fa17a821fe7 --- /dev/null +++ b/dlls/uxtheme/uxtheme.manifest @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> +<assemblyIdentity type="win32" name="Uxtheme" version="1.0.0.0"/> +<dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + processorArchitecture="*" + publicKeyToken="6595b64144ccf1df" + language="*" + /> + </dependentAssembly> +</dependency> +</assembly> diff --git a/dlls/uxtheme/version.rc b/dlls/uxtheme/version.rc index fdeec0a0ab6..71d9f9ec7e1 100644 --- a/dlls/uxtheme/version.rc +++ b/dlls/uxtheme/version.rc @@ -19,3 +19,6 @@ #define WINE_FILENAME_STR "uxtheme.dll" #include <wine/wine_common_ver.rc> + +/* @makedep: uxtheme.manifest */ +1 RT_MANIFEST uxtheme.manifest

1 0

Gerald Pfeifer : nsiproxy: Include sys/queue.h from tcp.c.
by Alexandre Julliard 25 Aug '21

25 Aug '21

Module: wine Branch: master Commit: a1cc71207cd22d7d884f44d135d975d981fa21e6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a1cc71207cd22d7d884f44d1… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Tue Aug 24 14:53:47 2021 +0200 nsiproxy: Include sys/queue.h from tcp.c. 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> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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

1 0

Luke Deller : server: Implement file access hints using posix_fadvise.
by Alexandre Julliard 24 Aug '21

24 Aug '21

Module: wine Branch: master Commit: a87bafc5b92c9f2deaa399e32a8ec42d28f7ea45 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a87bafc5b92c9f2deaa399e3… Author: Luke Deller <luke(a)deller.id.au> Date: Fri Aug 20 21:12:53 2021 +1000 server: Implement file access hints using posix_fadvise. Signed-off-by: Luke Deller <luke(a)deller.id.au> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + include/config.h.in | 3 +++ server/fd.c | 13 +++++++++++++ 4 files changed, 18 insertions(+) diff --git a/configure b/configure index 2e61fcbc685..a53367f0172 100755 --- a/configure +++ b/configure @@ -18010,6 +18010,7 @@ for ac_func in \ pipe2 \ poll \ port_create \ + posix_fadvise \ prctl \ pread \ proc_pidinfo \ diff --git a/configure.ac b/configure.ac index a9750330443..837f41c34aa 100644 --- a/configure.ac +++ b/configure.ac @@ -2186,6 +2186,7 @@ AC_CHECK_FUNCS(\ pipe2 \ poll \ port_create \ + posix_fadvise \ prctl \ pread \ proc_pidinfo \ diff --git a/include/config.h.in b/include/config.h.in index b1918d46ed1..2b488894a49 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -513,6 +513,9 @@ /* Define to 1 if you have the <port.h> header file. */ #undef HAVE_PORT_H +/* Define to 1 if you have the `posix_fadvise' function. */ +#undef HAVE_POSIX_FADVISE + /* Define to 1 if you have the `prctl' function. */ #undef HAVE_PRCTL diff --git a/server/fd.c b/server/fd.c index de7c5d7e36d..a09fc9edfcf 100644 --- a/server/fd.c +++ b/server/fd.c @@ -2026,6 +2026,19 @@ struct fd *open_fd( struct fd *root, const char *name, struct unicode_str nt_nam free( closed_fd ); fd->cacheable = 1; } + +#ifdef HAVE_POSIX_FADVISE + switch (options & (FILE_SEQUENTIAL_ONLY | FILE_RANDOM_ACCESS)) + { + case FILE_SEQUENTIAL_ONLY: + posix_fadvise( fd->unix_fd, 0, 0, POSIX_FADV_SEQUENTIAL ); + break; + case FILE_RANDOM_ACCESS: + posix_fadvise( fd->unix_fd, 0, 0, POSIX_FADV_RANDOM ); + break; + } +#endif + if (root_fd != -1) fchdir( server_dir_fd ); /* go back to the server dir */ return fd;

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 August 2021