wine-commits June 2022

wine-commits@winehq.org

2 participants
791 discussions

Huw Davies : nsiproxy: Pass a ptr to receive the ICMP handle.
by Alexandre Julliard 21 Jun '22

21 Jun '22

Module: wine Branch: master Commit: f5627617ee0e0ad6fa7021865fdd7fc61cd2179c URL: https://source.winehq.org/git/wine.git/?a=commit;h=f5627617ee0e0ad6fa702186… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Jun 17 10:36:03 2022 +0100 nsiproxy: Pass a ptr to receive the ICMP handle. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/nsiproxy.sys/device.c | 4 +++- dlls/nsiproxy.sys/icmp_echo.c | 6 +++--- dlls/nsiproxy.sys/nsiproxy_private.h | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/nsiproxy.sys/device.c b/dlls/nsiproxy.sys/device.c index aa030fa459c..7aba1f0c36f 100644 --- a/dlls/nsiproxy.sys/device.c +++ b/dlls/nsiproxy.sys/device.c @@ -366,6 +366,7 @@ static void handle_queued_send_echo( IRP *irp ) { struct nsiproxy_icmp_echo *in = (struct nsiproxy_icmp_echo *)irp->AssociatedIrp.SystemBuffer; struct icmp_send_echo_params params; + icmp_handle handle; NTSTATUS status; TRACE( "\n" ); @@ -376,6 +377,7 @@ static void handle_queued_send_echo( IRP *irp ) params.ttl = in->ttl; params.tos = in->tos; params.dst = &in->dst; + params.handle = &handle; status = nsiproxy_call( icmp_send_echo, &params ); TRACE( "icmp_send_echo rets %08lx\n", status ); @@ -389,7 +391,7 @@ static void handle_queued_send_echo( IRP *irp ) } else { - irp_set_icmp_handle( irp, params.handle ); + irp_set_icmp_handle( irp, handle ); RtlQueueWorkItem( listen_thread_proc, irp, WT_EXECUTELONGFUNCTION ); } } diff --git a/dlls/nsiproxy.sys/icmp_echo.c b/dlls/nsiproxy.sys/icmp_echo.c index dda19915fe7..e92fa4394c1 100644 --- a/dlls/nsiproxy.sys/icmp_echo.c +++ b/dlls/nsiproxy.sys/icmp_echo.c @@ -659,9 +659,9 @@ NTSTATUS icmp_send_echo( void *args ) return STATUS_SUCCESS; } - params->handle = handle_alloc( data ); - if (!params->handle) icmp_data_free( data ); - return params->handle ? STATUS_PENDING : STATUS_NO_MEMORY; + *params->handle = handle_alloc( data ); + if (!*params->handle) icmp_data_free( data ); + return *params->handle ? STATUS_PENDING : STATUS_NO_MEMORY; } static int get_timeout( LARGE_INTEGER start, UINT timeout ) diff --git a/dlls/nsiproxy.sys/nsiproxy_private.h b/dlls/nsiproxy.sys/nsiproxy_private.h index a62a0eebda8..241106fe228 100644 --- a/dlls/nsiproxy.sys/nsiproxy_private.h +++ b/dlls/nsiproxy.sys/nsiproxy_private.h @@ -45,7 +45,7 @@ struct icmp_send_echo_params void *request, *reply; UINT request_size, reply_len; BYTE bits, ttl, tos; - icmp_handle handle; + icmp_handle *handle; }; /* output for IOCTL_NSIPROXY_WINE_ICMP_ECHO - cf. ICMP_ECHO_REPLY */

1 0

Huw Davies : nsiproxy: Use an unsigned integer for the ICMP handles.
by Alexandre Julliard 21 Jun '22

21 Jun '22

Module: wine Branch: master Commit: 7bd58ba1317e4d8f37818283b770e316d201e839 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7bd58ba1317e4d8f37818283… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Jun 17 10:22:18 2022 +0100 nsiproxy: Use an unsigned integer for the ICMP handles. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/nsiproxy.sys/device.c | 19 +++++++++++-------- dlls/nsiproxy.sys/icmp_echo.c | 32 +++++++++++++++----------------- dlls/nsiproxy.sys/nsiproxy_private.h | 17 +++++++++++++++-- 3 files changed, 41 insertions(+), 27 deletions(-) diff --git a/dlls/nsiproxy.sys/device.c b/dlls/nsiproxy.sys/device.c index d3845829a85..aa030fa459c 100644 --- a/dlls/nsiproxy.sys/device.c +++ b/dlls/nsiproxy.sys/device.c @@ -180,19 +180,20 @@ static NTSTATUS nsiproxy_get_parameter( IRP *irp ) return status; } -static inline HANDLE irp_get_icmp_handle( IRP *irp ) +static inline icmp_handle irp_get_icmp_handle( IRP *irp ) { - return irp->Tail.Overlay.DriverContext[0]; + return PtrToUlong( irp->Tail.Overlay.DriverContext[0] ); } -static inline HANDLE irp_set_icmp_handle( IRP *irp, HANDLE handle ) +static inline icmp_handle irp_set_icmp_handle( IRP *irp, icmp_handle handle ) { - return InterlockedExchangePointer( irp->Tail.Overlay.DriverContext, handle ); + return PtrToUlong( InterlockedExchangePointer( irp->Tail.Overlay.DriverContext, + ULongToPtr( handle ) ) ); } static void WINAPI icmp_echo_cancel( DEVICE_OBJECT *device, IRP *irp ) { - HANDLE handle; + struct icmp_cancel_listen_params params; TRACE( "device %p, irp %p.\n", device, irp ); @@ -205,8 +206,8 @@ static void WINAPI icmp_echo_cancel( DEVICE_OBJECT *device, IRP *irp ) cancel it, or the irp has already finished. If the handle does exist then notify the listen thread. In all cases the irp will be completed elsewhere. */ - handle = irp_get_icmp_handle( irp ); - if (handle) nsiproxy_call( icmp_cancel_listen, handle ); + params.handle = irp_get_icmp_handle( irp ); + if (params.handle) nsiproxy_call( icmp_cancel_listen, &params ); LeaveCriticalSection( &nsiproxy_cs ); } @@ -328,6 +329,7 @@ static DWORD WINAPI listen_thread_proc( void *arg ) IRP *irp = arg; IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp ); struct nsiproxy_icmp_echo *in = irp->AssociatedIrp.SystemBuffer; + struct icmp_close_params close_params; struct icmp_listen_params params; NTSTATUS status; @@ -345,7 +347,8 @@ static DWORD WINAPI listen_thread_proc( void *arg ) EnterCriticalSection( &nsiproxy_cs ); - nsiproxy_call( icmp_close, irp_set_icmp_handle( irp, NULL ) ); + close_params.handle = irp_set_icmp_handle( irp, 0 ); + nsiproxy_call( icmp_close, &close_params ); irp->IoStatus.Status = status; if (status == STATUS_SUCCESS) diff --git a/dlls/nsiproxy.sys/icmp_echo.c b/dlls/nsiproxy.sys/icmp_echo.c index c3ce841c003..dda19915fe7 100644 --- a/dlls/nsiproxy.sys/icmp_echo.c +++ b/dlls/nsiproxy.sys/icmp_echo.c @@ -120,10 +120,10 @@ static struct icmp_data *handle_table[MAX_HANDLES]; static pthread_mutex_t handle_lock = PTHREAD_MUTEX_INITIALIZER; static struct icmp_data **next_free, **next_unused = handle_table; -static HANDLE handle_alloc( struct icmp_data *data ) +static icmp_handle handle_alloc( struct icmp_data *data ) { struct icmp_data **entry; - HANDLE h; + icmp_handle h; pthread_mutex_lock( &handle_lock ); entry = next_free; @@ -136,25 +136,23 @@ static HANDLE handle_alloc( struct icmp_data *data ) return 0; } *entry = data; - h = LongToHandle( entry - handle_table + 1 ); + h = entry - handle_table + 1; pthread_mutex_unlock( &handle_lock ); - TRACE( "returning handle %p\n", h ); + TRACE( "returning handle %x\n", h ); return h; } -static struct icmp_data **handle_entry( HANDLE h ) +static struct icmp_data **handle_entry( icmp_handle h ) { - unsigned int idx = HandleToLong( h ); - - if (!idx || idx > MAX_HANDLES) + if (!h || h > MAX_HANDLES) { ERR( "Invalid icmp handle\n" ); return NULL; } - return handle_table + idx - 1; + return handle_table + h - 1; } -static struct icmp_data *handle_data( HANDLE h ) +static struct icmp_data *handle_data( icmp_handle h ) { struct icmp_data **entry = handle_entry( h ); @@ -162,11 +160,11 @@ static struct icmp_data *handle_data( HANDLE h ) return *entry; } -static void handle_free( HANDLE h ) +static void handle_free( icmp_handle h ) { struct icmp_data **entry; - TRACE( "%p\n", h ); + TRACE( "%x\n", h ); pthread_mutex_lock( &handle_lock ); entry = handle_entry( h ); if (entry) @@ -778,8 +776,8 @@ NTSTATUS icmp_listen( void *args ) NTSTATUS icmp_cancel_listen( void *args ) { - HANDLE handle = args; - struct icmp_data *data = handle_data( handle ); + struct icmp_cancel_listen_params *params = args; + struct icmp_data *data = handle_data( params->handle ); if (!data) return STATUS_INVALID_PARAMETER; write( data->cancel_pipe[1], "x", 1 ); @@ -788,11 +786,11 @@ NTSTATUS icmp_cancel_listen( void *args ) NTSTATUS icmp_close( void *args ) { - HANDLE handle = args; - struct icmp_data *data = handle_data( handle ); + struct icmp_close_params *params = args; + struct icmp_data *data = handle_data( params->handle ); if (!data) return STATUS_INVALID_PARAMETER; icmp_data_free( data ); - handle_free( handle ); + handle_free( params->handle ); return STATUS_SUCCESS; } diff --git a/dlls/nsiproxy.sys/nsiproxy_private.h b/dlls/nsiproxy.sys/nsiproxy_private.h index 4bd269a0691..a62a0eebda8 100644 --- a/dlls/nsiproxy.sys/nsiproxy_private.h +++ b/dlls/nsiproxy.sys/nsiproxy_private.h @@ -17,9 +17,22 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +typedef UINT icmp_handle; + +struct icmp_cancel_listen_params +{ + icmp_handle handle; +}; + +struct icmp_close_params +{ + icmp_handle handle; +}; + struct icmp_listen_params { - HANDLE handle; + icmp_handle handle; void *reply; ULONGLONG user_reply_ptr; unsigned int bits, reply_len; @@ -32,7 +45,7 @@ struct icmp_send_echo_params void *request, *reply; UINT request_size, reply_len; BYTE bits, ttl, tos; - HANDLE handle; + icmp_handle handle; }; /* output for IOCTL_NSIPROXY_WINE_ICMP_ECHO - cf. ICMP_ECHO_REPLY */

1 0

Huw Davies : iphlpapi/tests: Allow the route's age to differ by one second.
by Alexandre Julliard 21 Jun '22

21 Jun '22

Module: wine Branch: master Commit: 1c83efac779248646da51795611651b2191f382c URL: https://source.winehq.org/git/wine.git/?a=commit;h=1c83efac779248646da51795… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jun 21 08:23:35 2022 +0100 iphlpapi/tests: Allow the route's age to differ by one second. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/iphlpapi/tests/iphlpapi.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 29256eb2774..214256c18b4 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -350,7 +350,8 @@ static void testGetIpForwardTable(void) else ok( buf->table[i].dwForwardType == MIB_IPROUTE_TYPE_INDIRECT, "got %ld\n", buf->table[i].dwForwardType ); ok( row->dwForwardProto == row2->Protocol, "got %ld vs %d\n", row->dwForwardProto, row2->Protocol ); - ok( row->dwForwardAge == row2->Age, "got %ld vs %ld\n", row->dwForwardAge, row2->Age ); + ok( row->dwForwardAge == row2->Age || row->dwForwardAge + 1 == row2->Age, + "got %ld vs %ld\n", row->dwForwardAge, row2->Age ); ok( row->dwForwardNextHopAS == 0, "got %08lx\n", row->dwForwardNextHopAS ); /* FIXME: need to add the interface's metric from GetIpInterfaceTable() */ ok( row->dwForwardMetric1 >= row2->Metric, "got %ld vs %ld\n", row->dwForwardMetric1, row2->Metric );

1 0

Zhiyi Zhang : comctl32/toolbar: Don't use pattern brushes to draw checked background.
by Alexandre Julliard 21 Jun '22

21 Jun '22

Module: wine Branch: master Commit: 9b5df952a3df292f09ae62bb206bef3ea75fdd82 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9b5df952a3df292f09ae62bb… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon May 30 15:10:31 2022 +0800 comctl32/toolbar: Don't use pattern brushes to draw checked background. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53049 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/tests/toolbar.c | 1 - dlls/comctl32/toolbar.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index 897405098c2..f66094a0b3a 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -2666,7 +2666,6 @@ static void test_visual(void) toolbar_dc = GetDC(toolbar); color = GetPixel(toolbar_dc, 5, 5); if (is_theme_active) - todo_wine ok(color != RGB(0xff, 0, 0), "Unexpected color %#lx.\n", color); else ok(color == RGB(0xff, 0, 0), "Unexpected color %#lx.\n", color); diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index bea294958c5..02538eeb649 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -1042,7 +1042,7 @@ TOOLBAR_DrawButton (const TOOLBAR_INFO *infoPtr, TBUTTON_INFO *btnPtr, HDC hdc, (btnPtr->fsState & (TBSTATE_PRESSED | TBSTATE_CHECKED))) OffsetRect(&rcText, 1, 1); - if (!(tbcd.nmcd.uItemState & CDIS_HOT) && + if (!theme && !(tbcd.nmcd.uItemState & CDIS_HOT) && ((tbcd.nmcd.uItemState & CDIS_CHECKED) || (tbcd.nmcd.uItemState & CDIS_INDETERMINATE))) TOOLBAR_DrawPattern (&rc, &tbcd);

1 0

Zhiyi Zhang : comctl32/tests: Test that themed toolbar buttons don't use pattern brushes to draw checked background.
by Alexandre Julliard 21 Jun '22

21 Jun '22

Module: wine Branch: master Commit: 7f491491f85edbeeeb58572609b2eb7e7bd4ea1c URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f491491f85edbeeeb585726… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon May 30 15:08:14 2022 +0800 comctl32/tests: Test that themed toolbar buttons don't use pattern brushes to draw checked background. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/toolbar.c | 60 +++++++++++++++++++++++++++++++++++-------- 1 file changed, 49 insertions(+), 11 deletions(-) diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index 31c360304c6..897405098c2 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -62,6 +62,7 @@ static BOOL g_fExpectedHotItemOld; static BOOL g_fExpectedHotItemNew; static DWORD g_dwExpectedDispInfoMask; static BOOL g_ResetDispTextPtr; +static BOOL g_TestCheckedItemPrePaint; static const struct message ttgetdispinfo_parent_seq[] = { { WM_NOTIFY, sent|id, 0, 0, TBN_GETINFOTIPA }, @@ -348,6 +349,28 @@ static LRESULT parent_wnd_notify(LPARAM lParam) } return 0; } + case NM_CUSTOMDRAW: + { + NMTBCUSTOMDRAW *cd = (NMTBCUSTOMDRAW *)lParam; + + switch (cd->nmcd.dwDrawStage) + { + case CDDS_PREPAINT: + return CDRF_NOTIFYITEMDRAW; + case CDDS_ITEMPREPAINT: + { + if (g_TestCheckedItemPrePaint) + { + cd->clrBtnHighlight = RGB(0xff, 0, 0); + cd->clrBtnFace = RGB(0xff, 0, 0); + return TBCDRF_NOBACKGROUND; + } + return CDRF_DODEFAULT; + } + } + + return 0; + } } return 0; } @@ -2617,34 +2640,49 @@ static void test_visual(void) HDC mem_dc1, mem_dc2, toolbar_dc; TBBUTTON tbbutton; int width, height; + COLORREF color; HTHEME theme; HWND toolbar; RECT rect; BOOL ret; - if (!is_theme_active) - { - skip("Theming is not active, skipping visual tests.\n"); - return; - } - - /* Test that toolbar shouldn't use outside theme handles */ toolbar = CreateWindowA(TOOLBARCLASSNAMEA, "", WS_CHILD | WS_VISIBLE, 0, 0, 50, 50, hMainWnd, 0, 0, NULL); ok(!!toolbar, "Failed to create a toolbar window.\n"); - /* Toolbar needs data for it to show */ + /* Test that the comctl32 55AA pattern brush is not used to draw checked background when theming is on */ memset(&tbbutton, 0, sizeof(tbbutton)); - tbbutton.fsState = TBSTATE_ENABLED; - tbbutton.iString = (INT_PTR)"test"; + tbbutton.idCommand = 1000; + tbbutton.fsState = TBSTATE_ENABLED | TBSTATE_CHECKED; + tbbutton.iString = (INT_PTR)" "; SendMessageA(toolbar, TB_BUTTONSTRUCTSIZE, sizeof(tbbutton), 0); ret = SendMessageA(toolbar, TB_ADDBUTTONSA, 1, (LPARAM)&tbbutton); ok(ret, "TB_ADDBUTTONSA failed.\n"); flush_events(); + g_TestCheckedItemPrePaint = TRUE; + ret = RedrawWindow(toolbar, NULL, NULL, RDW_FRAME | RDW_INVALIDATE | RDW_ERASE | RDW_ERASENOW | RDW_UPDATENOW); + ok(ret, "RedrawWindow failed.\n"); + g_TestCheckedItemPrePaint = FALSE; + + toolbar_dc = GetDC(toolbar); + color = GetPixel(toolbar_dc, 5, 5); + if (is_theme_active) + todo_wine + ok(color != RGB(0xff, 0, 0), "Unexpected color %#lx.\n", color); + else + ok(color == RGB(0xff, 0, 0), "Unexpected color %#lx.\n", color); + if (!is_theme_active) + { + skip("Theming is not active, skipping the rest of visual tests.\n"); + ReleaseDC(toolbar, toolbar_dc); + DestroyWindow(toolbar); + return; + } + + /* Test that toolbar shouldn't use outside theme handles */ theme = pGetWindowTheme(toolbar); ok(!theme, "Expected theme not opened by window.\n"); - toolbar_dc = GetDC(toolbar); GetClientRect(toolbar, &rect); width = rect.right - rect.left; height = rect.bottom - rect.top;

1 0

Zhiyi Zhang : comctl32/toolbar: Add support for TBCDRF_NOBACKGROUND.
by Alexandre Julliard 21 Jun '22

21 Jun '22

Module: wine Branch: master Commit: bfb49ad04c7863afe7585f6c151c29a7e51b20bf URL: https://source.winehq.org/git/wine.git/?a=commit;h=bfb49ad04c7863afe7585f6c… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri May 27 18:32:32 2022 +0800 comctl32/toolbar: Add support for TBCDRF_NOBACKGROUND. Tested manually on XP, Win 7 and Win 10. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53049 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/toolbar.c | 31 +++++++++++++++++-------------- include/commctrl.h | 2 +- 2 files changed, 18 insertions(+), 15 deletions(-) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 9b059996b65..bea294958c5 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -1062,20 +1062,23 @@ TOOLBAR_DrawButton (const TOOLBAR_INFO *infoPtr, TBUTTON_INFO *btnPtr, HDC hdc, if (theme) { - int partId = drawSepDropDownArrow ? TP_SPLITBUTTON : TP_BUTTON; - int stateId = TS_NORMAL; - - if (tbcd.nmcd.uItemState & CDIS_DISABLED) - stateId = TS_DISABLED; - else if (tbcd.nmcd.uItemState & CDIS_SELECTED) - stateId = TS_PRESSED; - else if (tbcd.nmcd.uItemState & CDIS_CHECKED) - stateId = (tbcd.nmcd.uItemState & CDIS_HOT) ? TS_HOTCHECKED : TS_CHECKED; - else if ((tbcd.nmcd.uItemState & CDIS_HOT) - || (drawSepDropDownArrow && btnPtr->bDropDownPressed)) - stateId = TS_HOT; - - DrawThemeBackground (theme, hdc, partId, stateId, &rc, NULL); + if (!(dwItemCDFlag & TBCDRF_NOBACKGROUND)) + { + int partId = drawSepDropDownArrow ? TP_SPLITBUTTON : TP_BUTTON; + int stateId = TS_NORMAL; + + if (tbcd.nmcd.uItemState & CDIS_DISABLED) + stateId = TS_DISABLED; + else if (tbcd.nmcd.uItemState & CDIS_SELECTED) + stateId = TS_PRESSED; + else if (tbcd.nmcd.uItemState & CDIS_CHECKED) + stateId = (tbcd.nmcd.uItemState & CDIS_HOT) ? TS_HOTCHECKED : TS_CHECKED; + else if ((tbcd.nmcd.uItemState & CDIS_HOT) + || (drawSepDropDownArrow && btnPtr->bDropDownPressed)) + stateId = TS_HOT; + + DrawThemeBackground(theme, hdc, partId, stateId, &rc, NULL); + } } else TOOLBAR_DrawFrame(infoPtr, &tbcd, &rc, dwItemCDFlag); diff --git a/include/commctrl.h b/include/commctrl.h index b829e4498ea..725ef64764f 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -1380,7 +1380,7 @@ typedef struct _NMTBCUSTOMDRAW #define TBCDRF_NOETCHEDEFFECT 0x00100000 /* No etched effect for */ /* disabled items */ #define TBCDRF_BLENDICON 0x00200000 /* ILD_BLEND50 on the icon image */ -#define TBCDRF_NOBACKGROUND 0x00400000 /* ILD_BLEND50 on the icon image */ +#define TBCDRF_NOBACKGROUND 0x00400000 /* Don't draw button background */ #define TBCDRF_USECDCOLORS 0x00800000

1 0

Zhiyi Zhang : uxtheme: Support parsing more header parts and states.
by Alexandre Julliard 21 Jun '22

21 Jun '22

Module: wine Branch: master Commit: d2a7b967ee0bd76990918138467ef3d43e23d854 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d2a7b967ee0bd76990918138… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Jun 2 17:15:44 2022 +0800 uxtheme: Support parsing more header parts and states. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53066 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/stylemap.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dlls/uxtheme/stylemap.c b/dlls/uxtheme/stylemap.c index 45268a45267..17fae04968b 100644 --- a/dlls/uxtheme/stylemap.c +++ b/dlls/uxtheme/stylemap.c @@ -571,6 +571,15 @@ static const MSSTYLES_CLASS_MAP classHeader[] = { {HP_HEADERITEM, HIS_NORMAL, L"NORMAL"}, {HP_HEADERITEM, HIS_HOT, L"HOT"}, {HP_HEADERITEM, HIS_PRESSED, L"PRESSED"}, + {HP_HEADERITEM, HIS_SORTEDNORMAL, L"SORTEDNORMAL"}, + {HP_HEADERITEM, HIS_SORTEDHOT, L"SORTHOT"}, + {HP_HEADERITEM, HIS_SORTEDPRESSED, L"SORTPRESSED"}, + {HP_HEADERITEM, HIS_ICONNORMAL, L"ICONNORMAL"}, + {HP_HEADERITEM, HIS_ICONHOT, L"ICONHOT"}, + {HP_HEADERITEM, HIS_ICONPRESSED, L"ICONPRESSED"}, + {HP_HEADERITEM, HIS_ICONSORTEDNORMAL, L"ICONSORTEDNORMAL"}, + {HP_HEADERITEM, HIS_ICONSORTEDHOT, L"ICONSORTEDHOT"}, + {HP_HEADERITEM, HIS_ICONSORTEDPRESSED, L"ICONSORTEDPRESSED"}, {HP_HEADERITEMLEFT, 0, L"HEADERITEMLEFT"}, {HP_HEADERITEMLEFT, HILS_NORMAL, L"NORMAL"}, {HP_HEADERITEMLEFT, HILS_HOT, L"HOT"}, @@ -582,6 +591,17 @@ static const MSSTYLES_CLASS_MAP classHeader[] = { {HP_HEADERSORTARROW, 0, L"HEADERSORTARROW"}, {HP_HEADERSORTARROW, HSAS_SORTEDUP, L"SORTEDUP"}, {HP_HEADERSORTARROW, HSAS_SORTEDDOWN, L"SORTEDDOWN"}, + {HP_HEADERDROPDOWN, 0, L"HEADERDROPDOWN"}, + {HP_HEADERDROPDOWN, HDDS_NORMAL, L"NORMAL"}, + {HP_HEADERDROPDOWN, HDDS_SOFTHOT, L"SOFTHOT"}, + {HP_HEADERDROPDOWN, HDDS_HOT, L"HOT"}, + {HP_HEADERDROPDOWNFILTER, 0, L"HEADERDROPDOWNFILTER"}, + {HP_HEADERDROPDOWNFILTER, HDDFS_NORMAL, L"NORMAL"}, + {HP_HEADERDROPDOWNFILTER, HDDFS_SOFTHOT, L"SOFTHOT"}, + {HP_HEADERDROPDOWNFILTER, HDDFS_HOT, L"HOT"}, + {HP_HEADEROVERFLOW, 0, L"HEADEROVERFLOW"}, + {HP_HEADEROVERFLOW, HOFS_NORMAL, L"NORMAL"}, + {HP_HEADEROVERFLOW, HOFS_HOT, L"HOT"}, {0, 0, L""} };

1 0

Zhiyi Zhang : uxtheme: Support parsing more edit parts and states.
by Alexandre Julliard 21 Jun '22

21 Jun '22

Module: wine Branch: master Commit: 968c3de0c52b8c40a38af55e3306104b58dbe1f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=968c3de0c52b8c40a38af55e… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Jun 6 11:53:45 2022 +0800 uxtheme: Support parsing more edit parts and states. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/stylemap.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/dlls/uxtheme/stylemap.c b/dlls/uxtheme/stylemap.c index b5063f3a6ed..45268a45267 100644 --- a/dlls/uxtheme/stylemap.c +++ b/dlls/uxtheme/stylemap.c @@ -488,7 +488,41 @@ static const MSSTYLES_CLASS_MAP classEdit[] = { {EP_EDITTEXT, ETS_FOCUSED, L"FOCUSED"}, {EP_EDITTEXT, ETS_READONLY, L"READONLY"}, {EP_EDITTEXT, ETS_ASSIST, L"ASSIST"}, + {EP_EDITTEXT, ETS_CUEBANNER, L"CUEBANNER"}, {EP_CARET, 0, L"CARET"}, + {EP_BACKGROUND, 0, L"BACKGROUND"}, + {EP_BACKGROUND, EBS_NORMAL, L"NORMAL"}, + {EP_BACKGROUND, EBS_HOT, L"HOT"}, + {EP_BACKGROUND, EBS_DISABLED, L"DISABLED"}, + {EP_BACKGROUND, EBS_FOCUSED, L"FOCUSED"}, + {EP_BACKGROUND, EBS_READONLY, L"READONLY"}, + {EP_BACKGROUND, EBS_ASSIST, L"ASSIST"}, + {EP_PASSWORD, 0, L"PASSWORD"}, + {EP_BACKGROUNDWITHBORDER, 0, L"BACKGROUNDWITHBORDER"}, + {EP_BACKGROUNDWITHBORDER, EBWBS_NORMAL, L"NORMAL"}, + {EP_BACKGROUNDWITHBORDER, EBWBS_HOT, L"HOT"}, + {EP_BACKGROUNDWITHBORDER, EBWBS_DISABLED, L"DISABLED"}, + {EP_BACKGROUNDWITHBORDER, EBWBS_FOCUSED, L"FOCUSED"}, + {EP_EDITBORDER_NOSCROLL, 0, L"EDITBORDER_NOSCROLL"}, + {EP_EDITBORDER_NOSCROLL, EPSN_NORMAL, L"NORMAL"}, + {EP_EDITBORDER_NOSCROLL, EPSN_HOT, L"HOT"}, + {EP_EDITBORDER_NOSCROLL, EPSN_FOCUSED, L"FOCUSED"}, + {EP_EDITBORDER_NOSCROLL, EPSN_DISABLED, L"DISABLED"}, + {EP_EDITBORDER_HSCROLL, 0, L"EDITBORDER_HSCROLL"}, + {EP_EDITBORDER_HSCROLL, EPSH_NORMAL, L"NORMAL"}, + {EP_EDITBORDER_HSCROLL, EPSH_HOT, L"HOT"}, + {EP_EDITBORDER_HSCROLL, EPSH_FOCUSED, L"FOCUSED"}, + {EP_EDITBORDER_HSCROLL, EPSH_DISABLED, L"DISABLED"}, + {EP_EDITBORDER_VSCROLL, 0, L"EDITBORDER_VSCROLL"}, + {EP_EDITBORDER_VSCROLL, EPSV_NORMAL, L"NORMAL"}, + {EP_EDITBORDER_VSCROLL, EPSV_HOT, L"HOT"}, + {EP_EDITBORDER_VSCROLL, EPSV_FOCUSED, L"FOCUSED"}, + {EP_EDITBORDER_VSCROLL, EPSV_DISABLED, L"DISABLED"}, + {EP_EDITBORDER_HVSCROLL, 0, L"EDITBORDER_HVSCROLL"}, + {EP_EDITBORDER_HVSCROLL, EPSHV_NORMAL, L"NORMAL"}, + {EP_EDITBORDER_HVSCROLL, EPSHV_HOT, L"HOT"}, + {EP_EDITBORDER_HVSCROLL, EPSHV_FOCUSED, L"FOCUSED"}, + {EP_EDITBORDER_HVSCROLL, EPSHV_DISABLED, L"DISABLED"}, {0, 0, L""} };

1 0

Zhiyi Zhang : uxtheme: Support parsing more combobox parts and states.
by Alexandre Julliard 21 Jun '22

21 Jun '22

Module: wine Branch: master Commit: b334d89d5dbce8e119eb229cdd0bc6a5288d90c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b334d89d5dbce8e119eb229c… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Jun 2 17:29:57 2022 +0800 uxtheme: Support parsing more combobox parts and states. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/stylemap.c | 34 ++++++++++++++++++++++++++++++++++ include/vsstyle.h | 6 ++++++ 2 files changed, 40 insertions(+) diff --git a/dlls/uxtheme/stylemap.c b/dlls/uxtheme/stylemap.c index 8597be2b40e..b5063f3a6ed 100644 --- a/dlls/uxtheme/stylemap.c +++ b/dlls/uxtheme/stylemap.c @@ -442,6 +442,40 @@ static const MSSTYLES_CLASS_MAP classCombobox[] = { {CP_DROPDOWNBUTTON, CBXS_HOT, L"HOT"}, {CP_DROPDOWNBUTTON, CBXS_PRESSED, L"PRESSED"}, {CP_DROPDOWNBUTTON, CBXS_DISABLED, L"DISABLED"}, + {CP_BACKGROUND, 0, L"BACKGROUND"}, + {CP_TRANSPARENTBACKGROUND, 0, L"TRANSPARENTBACKGROUND"}, + {CP_TRANSPARENTBACKGROUND, CBTBS_NORMAL, L"NORMAL"}, + {CP_TRANSPARENTBACKGROUND, CBTBS_HOT, L"HOT"}, + {CP_TRANSPARENTBACKGROUND, CBTBS_DISABLED, L"DISABLED"}, + {CP_TRANSPARENTBACKGROUND, CBTBS_FOCUSED, L"FOCUSED"}, + {CP_BORDER, 0, L"BORDER"}, + {CP_BORDER, CBB_NORMAL, L"NORMAL"}, + {CP_BORDER, CBB_HOT, L"HOT"}, + {CP_BORDER, CBB_FOCUSED, L"FOCUSED"}, + {CP_BORDER, CBB_DISABLED, L"DISABLED"}, + {CP_READONLY, 0, L"READONLY"}, + {CP_READONLY, CBRO_NORMAL, L"NORMAL"}, + {CP_READONLY, CBRO_HOT, L"HOT"}, + {CP_READONLY, CBRO_PRESSED, L"PRESSED"}, + {CP_READONLY, CBRO_DISABLED, L"DISABLED"}, + {CP_DROPDOWNBUTTONRIGHT, 0, L"DROPDOWNBUTTONRIGHT"}, + {CP_DROPDOWNBUTTONRIGHT, CBXSR_NORMAL, L"NORMAL"}, + {CP_DROPDOWNBUTTONRIGHT, CBXSR_HOT, L"HOT"}, + {CP_DROPDOWNBUTTONRIGHT, CBXSR_PRESSED, L"PRESSED"}, + {CP_DROPDOWNBUTTONRIGHT, CBXSR_DISABLED, L"DISABLED"}, + {CP_DROPDOWNBUTTONLEFT, 0, L"DROPDOWNBUTTONLEFT"}, + {CP_DROPDOWNBUTTONLEFT, CBXSL_NORMAL, L"NORMAL"}, + {CP_DROPDOWNBUTTONLEFT, CBXSL_HOT, L"HOT"}, + {CP_DROPDOWNBUTTONLEFT, CBXSL_PRESSED, L"PRESSED"}, + {CP_DROPDOWNBUTTONLEFT, CBXSL_DISABLED, L"DISABLED"}, + {CP_CUEBANNER, 0, L"CUEBANNER"}, + {CP_CUEBANNER, CBCB_NORMAL, L"NORMAL"}, + {CP_CUEBANNER, CBCB_HOT, L"HOT"}, + {CP_CUEBANNER, CBCB_PRESSED, L"PRESSED"}, + {CP_CUEBANNER, CBCB_DISABLED, L"DISABLED"}, + {CP_DROPDOWNITEM, 0, L"DROPDOWNITEM"}, + {CP_DROPDOWNITEM, CBDI_NORMAL, L"NORMAL"}, + {CP_DROPDOWNITEM, CBDI_HIGHLIGHTED, L"HIGHLIGHTED"}, {0, 0, L""} }; diff --git a/include/vsstyle.h b/include/vsstyle.h index f5af8492aef..3075b4cdc08 100644 --- a/include/vsstyle.h +++ b/include/vsstyle.h @@ -168,6 +168,7 @@ enum COMBOBOXPARTS { CP_DROPDOWNBUTTONRIGHT = 6, CP_DROPDOWNBUTTONLEFT = 7, CP_CUEBANNER = 8, + CP_DROPDOWNITEM = 9, }; #define COMBOBOXSTYLEPARTS COMBOBOXPARTS; @@ -221,6 +222,11 @@ enum CUEBANNERSTATES { CBCB_DISABLED = 4, }; +enum DROPDOWNITEMSTATES { + CBDI_NORMAL = 1, + CBDI_HIGHLIGHTED = 2, +}; + /* COMMUNICATIONSSTYLE class */ #if defined(_MSC_VER) || defined(__MINGW32__) #define VSCLASS_COMMUNICATIONSSTYLE L"COMMUNICATIONSSTYLE"

1 0

Zhiyi Zhang : uxtheme: Support parsing more clock states.
by Alexandre Julliard 21 Jun '22

21 Jun '22

Module: wine Branch: master Commit: f1aa061d8f475271ea5c9f039cd8d9eb25d56f69 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f1aa061d8f475271ea5c9f03… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Jun 6 11:39:49 2022 +0800 uxtheme: Support parsing more clock states. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/stylemap.c | 2 ++ include/vssym32.h | 2 ++ 2 files changed, 4 insertions(+) diff --git a/dlls/uxtheme/stylemap.c b/dlls/uxtheme/stylemap.c index 7a0a64cc470..8597be2b40e 100644 --- a/dlls/uxtheme/stylemap.c +++ b/dlls/uxtheme/stylemap.c @@ -431,6 +431,8 @@ static const MSSTYLES_CLASS_MAP classButton[] = { static const MSSTYLES_CLASS_MAP classClock[] = { {CLP_TIME, 0, L"TIME"}, {CLP_TIME, CLS_NORMAL, L"NORMAL"}, + {CLP_TIME, CLS_HOT, L"HOT"}, + {CLP_TIME, CLS_PRESSED, L"PRESSED"}, {0, 0, L""} }; diff --git a/include/vssym32.h b/include/vssym32.h index 8685fb7f7f0..8bc161a213c 100644 --- a/include/vssym32.h +++ b/include/vssym32.h @@ -522,6 +522,8 @@ enum CLOCKPARTS { enum CLOCKSTATES { CLS_NORMAL = 1, + CLS_HOT = 2, + CLS_PRESSED = 3, }; /* TRAYNOTIFY class */

1 0

← Newer
1
...
23
24
25
26
27
28
29
...
80
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 June 2022