July 2021 - Wine-devel - list.winehq.org

[PATCH v2 5/6] iphlpapi: Implement ConvertInterfaceLuidToGuid() on top of nsi.
by Huw Davies 06 Jul '21

06 Jul '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/iphlpapi/iphlpapi_main.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index ee5718e5d26..403b51391af 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -3213,20 +3213,17 @@ DWORD WINAPI ConvertInterfaceIndexToLuid(NET_IFINDEX index, NET_LUID *luid) */ DWORD WINAPI ConvertInterfaceLuidToGuid(const NET_LUID *luid, GUID *guid) { - DWORD ret; - MIB_IFROW row; + DWORD err; - TRACE("(%p %p)\n", luid, guid); + TRACE( "(%p %p)\n", luid, guid ); if (!luid || !guid) return ERROR_INVALID_PARAMETER; - row.dwIndex = luid->Info.NetLuidIndex; - if ((ret = GetIfEntry( &row ))) return ret; - - memset( guid, 0, sizeof(*guid) ); - guid->Data1 = luid->Info.NetLuidIndex; - memcpy( guid->Data4+2, "NetDev", 6 ); - return NO_ERROR; + err = NsiGetParameter( 1, &NPI_MS_NDIS_MODULEID, NSI_NDIS_IFINFO_TABLE, luid, sizeof(*luid), + NSI_PARAM_TYPE_STATIC, guid, sizeof(*guid), + FIELD_OFFSET(struct nsi_ndis_ifinfo_static, if_guid) ); + if (err) memset( guid, 0, sizeof(*guid) ); + return err; } /****************************************************************** -- 2.23.0

1 0

[PATCH v2 4/6] iphlpapi: Implement ConvertInterfaceGuidToLuid() on top of nsi.
by Huw Davies 06 Jul '21

06 Jul '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/iphlpapi/iphlpapi_main.c | 29 ++++++++++++++++++++--------- 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 4d3ee86da0b..ee5718e5d26 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -3164,20 +3164,31 @@ ULONG WINAPI GetTcp6Table2(PMIB_TCP6TABLE2 table, PULONG size, BOOL order) */ DWORD WINAPI ConvertInterfaceGuidToLuid(const GUID *guid, NET_LUID *luid) { - DWORD ret; - MIB_IFROW row; + struct nsi_ndis_ifinfo_static *data; + DWORD err, count, i; + NET_LUID *keys; - TRACE("(%s %p)\n", debugstr_guid(guid), luid); + TRACE( "(%s %p)\n", debugstr_guid(guid), luid ); if (!guid || !luid) return ERROR_INVALID_PARAMETER; + luid->Value = 0; - row.dwIndex = guid->Data1; - if ((ret = GetIfEntry( &row ))) return ret; + err = NsiAllocateAndGetTable( 1, &NPI_MS_NDIS_MODULEID, NSI_NDIS_IFINFO_TABLE, (void **)&keys, sizeof(*keys), + NULL, 0, NULL, 0, (void **)&data, sizeof(*data), &count, 0 ); + if (err) return err; - luid->Info.Reserved = 0; - luid->Info.NetLuidIndex = guid->Data1; - luid->Info.IfType = row.dwType; - return NO_ERROR; + err = ERROR_INVALID_PARAMETER; + for (i = 0; i < count; i++) + { + if (IsEqualGUID( &data[i].if_guid, guid )) + { + luid->Value = keys[i].Value; + err = ERROR_SUCCESS; + break; + } + } + NsiFreeTable( keys, NULL, NULL, data ); + return err; } /****************************************************************** -- 2.23.0

1 0

[PATCH v2 3/6] iphlpapi: Implement ConvertInterfaceLuidToIndex() on top of nsi.
by Huw Davies 06 Jul '21

06 Jul '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/iphlpapi/iphlpapi_main.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 05f3c3b9b76..4d3ee86da0b 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -3223,18 +3223,17 @@ DWORD WINAPI ConvertInterfaceLuidToGuid(const NET_LUID *luid, GUID *guid) */ DWORD WINAPI ConvertInterfaceLuidToIndex(const NET_LUID *luid, NET_IFINDEX *index) { - DWORD ret; - MIB_IFROW row; + DWORD err; - TRACE("(%p %p)\n", luid, index); + TRACE( "(%p %p)\n", luid, index ); if (!luid || !index) return ERROR_INVALID_PARAMETER; - row.dwIndex = luid->Info.NetLuidIndex; - if ((ret = GetIfEntry( &row ))) return ret; - - *index = luid->Info.NetLuidIndex; - return NO_ERROR; + err = NsiGetParameter( 1, &NPI_MS_NDIS_MODULEID, NSI_NDIS_IFINFO_TABLE, luid, sizeof(*luid), + NSI_PARAM_TYPE_STATIC, index, sizeof(*index), + FIELD_OFFSET(struct nsi_ndis_ifinfo_static, if_index) ); + if (err) *index = 0; + return err; } /****************************************************************** -- 2.23.0

1 0

[PATCH v2 2/6] iphlpapi: Implement ConvertInterfaceIndexToLuid() on top of nsi.
by Huw Davies 06 Jul '21

06 Jul '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/iphlpapi/Makefile.in | 2 +- dlls/iphlpapi/iphlpapi_main.c | 18 ++++++++---------- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/dlls/iphlpapi/Makefile.in b/dlls/iphlpapi/Makefile.in index 3a2227f5ebb..3db17289bf4 100644 --- a/dlls/iphlpapi/Makefile.in +++ b/dlls/iphlpapi/Makefile.in @@ -1,6 +1,6 @@ MODULE = iphlpapi.dll IMPORTLIB = iphlpapi -IMPORTS = advapi32 +IMPORTS = advapi32 nsi uuid EXTRALIBS = $(RESOLV_LIBS) $(KSTAT_LIBS) $(PROCSTAT_LIBS) C_SRCS = \ diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index b6b96165027..05f3c3b9b76 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -56,7 +56,9 @@ #include "netioapi.h" #include "tcpestats.h" #include "ip2string.h" +#include "netiodef.h" +#include "wine/nsi.h" #include "wine/debug.h" #include "wine/unicode.h" @@ -3183,20 +3185,16 @@ DWORD WINAPI ConvertInterfaceGuidToLuid(const GUID *guid, NET_LUID *luid) */ DWORD WINAPI ConvertInterfaceIndexToLuid(NET_IFINDEX index, NET_LUID *luid) { - MIB_IFROW row; + DWORD err; - TRACE("(%u %p)\n", index, luid); + TRACE( "(%u %p)\n", index, luid ); if (!luid) return ERROR_INVALID_PARAMETER; - memset( luid, 0, sizeof(*luid) ); - - row.dwIndex = index; - if (GetIfEntry( &row )) return ERROR_FILE_NOT_FOUND; - luid->Info.Reserved = 0; - luid->Info.NetLuidIndex = index; - luid->Info.IfType = row.dwType; - return NO_ERROR; + err = NsiGetParameter( 1, &NPI_MS_NDIS_MODULEID, NSI_NDIS_INDEX_LUID_TABLE, &index, sizeof(index), + NSI_PARAM_TYPE_STATIC, luid, sizeof(*luid), 0 ); + if (err) luid->Value = 0; + return err; } /****************************************************************** -- 2.23.0

1 0

[PATCH v2 1/6] mountmgr.sys: Move dhcp lookup to a worker thread.
by Huw Davies 06 Jul '21

06 Jul '21

While this is a reasonable change per se, the motivation is to avoid a deadlock when mountmgr.sys calls into iphlpapi and further into nsiproxy.sys via the nsi device. nsiproxy.sys is hosted by the same process as mountmgr.sys so is unable to handle the request while it is also waiting for that same request to return. The correct long-term solution is for mountmgr.sys to call the netio.sys versions of the iphlpapi functions. These will call the kernel-side versions of the nsi functions without going through the nsi device. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/mountmgr.sys/mountmgr.c | 46 ++++++++++++++++++++++++------------ 1 file changed, 31 insertions(+), 15 deletions(-) diff --git a/dlls/mountmgr.sys/mountmgr.c b/dlls/mountmgr.sys/mountmgr.c index 61d51d8e61d..b94944a350c 100644 --- a/dlls/mountmgr.sys/mountmgr.c +++ b/dlls/mountmgr.sys/mountmgr.c @@ -286,32 +286,48 @@ static NTSTATUS define_unix_drive( const void *in_buff, SIZE_T insize ) } /* implementation of IOCTL_MOUNTMGR_QUERY_DHCP_REQUEST_PARAMS */ -static NTSTATUS query_dhcp_request_params( void *buff, SIZE_T insize, - SIZE_T outsize, IO_STATUS_BLOCK *iosb ) +static void WINAPI query_dhcp_request_params( TP_CALLBACK_INSTANCE *instance, void *context ) { - struct mountmgr_dhcp_request_params *query = buff; - ULONG i, offset; + IRP *irp = context; + struct mountmgr_dhcp_request_params *query = irp->AssociatedIrp.SystemBuffer; + IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp ); + SIZE_T insize = irpsp->Parameters.DeviceIoControl.InputBufferLength; + SIZE_T outsize = irpsp->Parameters.DeviceIoControl.OutputBufferLength; + ULONG i, offset = 0; /* sanity checks */ if (FIELD_OFFSET(struct mountmgr_dhcp_request_params, params[query->count]) > insize || - !memchrW( query->adapter, 0, ARRAY_SIZE(query->adapter) )) return STATUS_INVALID_PARAMETER; + !memchrW( query->adapter, 0, ARRAY_SIZE(query->adapter) )) + { + irp->IoStatus.u.Status = STATUS_INVALID_PARAMETER; + goto err; + } + for (i = 0; i < query->count; i++) - if (query->params[i].offset + query->params[i].size > insize) return STATUS_INVALID_PARAMETER; + if (query->params[i].offset + query->params[i].size > insize) + { + irp->IoStatus.u.Status = STATUS_INVALID_PARAMETER; + goto err; + } + offset = FIELD_OFFSET(struct mountmgr_dhcp_request_params, params[query->count]); for (i = 0; i < query->count; i++) { - offset += get_dhcp_request_param( query->adapter, &query->params[i], buff, offset, outsize - offset ); + offset += get_dhcp_request_param( query->adapter, &query->params[i], (char *)query, offset, outsize - offset ); if (offset > outsize) { if (offset >= sizeof(query->size)) query->size = offset; - iosb->Information = sizeof(query->size); - return STATUS_MORE_ENTRIES; + offset = sizeof(query->size); + irp->IoStatus.u.Status = STATUS_MORE_ENTRIES; + goto err; } } + irp->IoStatus.u.Status = STATUS_SUCCESS; - iosb->Information = offset; - return STATUS_SUCCESS; +err: + irp->IoStatus.Information = offset; + IoCompleteRequest( irp, IO_NO_INCREMENT ); } /* implementation of Wine extension to use host APIs to find symbol file by GUID */ @@ -929,10 +945,10 @@ static NTSTATUS WINAPI mountmgr_ioctl( DEVICE_OBJECT *device, IRP *irp ) status = STATUS_INVALID_PARAMETER; break; } - status = query_dhcp_request_params( irp->AssociatedIrp.SystemBuffer, - irpsp->Parameters.DeviceIoControl.InputBufferLength, - irpsp->Parameters.DeviceIoControl.OutputBufferLength, - &irp->IoStatus ); + + if (TrySubmitThreadpoolCallback( query_dhcp_request_params, irp, NULL )) + return (irp->IoStatus.u.Status = STATUS_PENDING); + status = STATUS_NO_MEMORY; break; #ifdef __APPLE__ case IOCTL_MOUNTMGR_QUERY_SYMBOL_FILE: -- 2.23.0

1 0

[WineHQ v2] wwn/en: Fix some case and spelling issues, add some missing words.
by Francois Gouget 06 Jul '21

06 Jul '21

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- Attached to avoid mangling. --- wwn/en/wn19990829_6.xml | 2 +- wwn/en/wn20010611_97.xml | 6 +++--- wwn/en/wn20010802_101.xml | 10 +++++----- wwn/en/wn20041015_244.xml | 4 ++-- wwn/en/wn20070410_328.xml | 2 +- wwn/en/wn20080106_338.xml | 4 ++-- wwn/en/wn20080922_352.xml | 2 +- wwn/en/wn20140303_364.xml | 12 ++++++------ wwn/en/wn20140314_365.xml | 8 ++++---- wwn/en/wn20140328_366.xml | 8 ++++---- wwn/en/wn20140509_369.xml | 4 ++-- 11 files changed, 31 insertions(+), 31 deletions(-)

1 0

[WineHQ] wwn/en: Tweak the wording of the AppDB disclaimer.
by Francois Gouget 06 Jul '21

06 Jul '21

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- wwn/en/wn20071210_334.xml | 10 +++++----- wwn/en/wn20071217_335.xml | 13 ++++++------- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/wwn/en/wn20071210_334.xml b/wwn/en/wn20071210_334.xml index 1919feb7..2c19f405 100644 --- a/wwn/en/wn20071210_334.xml +++ b/wwn/en/wn20071210_334.xml @@ -530,12 +530,12 @@ situation left where shaders recompile all over. posts="0" > <topic>AppDB</topic> -*Disclaimer: This list of changes is automatically generated by +*Disclaimer: This list of changes is automatically generated from information entered into the AppDB. These results are subject to the opinions -of the users submitting application reviews. The WINE community does not -guarantee that even though an application may be upgraded to 'Gold' or -'Platinum' in this list that you will have the same experience and would -provide a similar rating +of the users submitting application reviews. Even if an application is +upgraded to 'Gold' or 'Platinum' in this list, the Wine community cannot +guarantee that you will have the same experience and would +provide a similar rating. <div align="center"> Updates by App Maintainers <table width="80%" border="1" bordercolor="#222222" cellspacing="0" cellpadding="3"> diff --git a/wwn/en/wn20071217_335.xml b/wwn/en/wn20071217_335.xml index 9a550817..0cdc1079 100644 --- a/wwn/en/wn20071217_335.xml +++ b/wwn/en/wn20071217_335.xml @@ -379,13 +379,12 @@ Alexander N. Sornes posts="0" > <topic>AppDB</topic> -*Disclaimer: This list of changes is automatically generated by -information entered into the AppDB. -These results are subject to the opinions of the users submitting application -reviews. -The WINE community does not guarantee that even though an application may be -upgraded to 'Gold' or 'Platinum' in this list that you -will have the same experience and would provide a similar rating +*Disclaimer: This list of changes is automatically generated from +information entered into the AppDB. These results are subject to the opinions +of the users submitting application reviews. Even if an application is +upgraded to 'Gold' or 'Platinum' in this list, the Wine community cannot +guarantee that you will have the same experience and would +provide a similar rating. <div align="center"> Updates by App Maintainers <table width="80%" border="1" bordercolor="#222222" cellspacing="0" cellpadding="3"> -- 2.20.1

1 0

[PATCH 2/6] user32: Call SCROLL_DrawScrollBar() to draw tracks in SCROLL_HandleScrollEvent().
by Zhiyi Zhang 06 Jul '21

06 Jul '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/scroll.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/user32/scroll.c b/dlls/user32/scroll.c index 4abb13d5199..fdd657feda6 100644 --- a/dlls/user32/scroll.c +++ b/dlls/user32/scroll.c @@ -614,6 +614,13 @@ void SCROLL_DrawScrollBar( HWND hwnd, HDC hdc, INT nBar, enum SCROLL_HITTEST hit SCROLL_DrawMovingThumb( hdc, &rect, vertical, arrowSize, thumbSize ); SCROLL_MovingThumb = FALSE; } + else if (vertical == SCROLL_trackVertical && GetCapture() == hwnd) + { + SCROLL_DrawInterior( hwnd, hdc, nBar, &rect, arrowSize, thumbSize, thumbPos, + infoPtr->flags, vertical, + hit_test == SCROLL_trackHitTest && hit_test == SCROLL_TOP_RECT, + hit_test == SCROLL_trackHitTest && hit_test == SCROLL_BOTTOM_RECT ); + } else { SCROLL_DrawInterior( hwnd, hdc, nBar, &rect, arrowSize, thumbSize, thumbPos, @@ -836,9 +843,7 @@ static void SCROLL_HandleScrollEvent( HWND hwnd, INT nBar, UINT msg, POINT pt) break; case SCROLL_TOP_RECT: - SCROLL_DrawInterior( hwnd, hdc, nBar, &rect, arrowSize, thumbSize, - thumbPos, infoPtr->flags, vertical, - (hittest == SCROLL_trackHitTest), FALSE ); + SCROLL_DrawScrollBar( hwnd, hdc, nBar, hittest, FALSE, TRUE ); if (hittest == SCROLL_trackHitTest) { if ((msg == WM_LBUTTONDOWN) || (msg == WM_SYSTIMER)) @@ -869,9 +874,7 @@ static void SCROLL_HandleScrollEvent( HWND hwnd, INT nBar, UINT msg, POINT pt) } else if (msg == WM_LBUTTONUP) { - SCROLL_DrawInterior( hwnd, hdc, nBar, &rect, arrowSize, thumbSize, - thumbPos, infoPtr->flags, vertical, - FALSE, FALSE ); + SCROLL_DrawScrollBar( hwnd, hdc, nBar, SCROLL_NOWHERE, FALSE, TRUE ); } else /* WM_MOUSEMOVE */ { @@ -900,9 +903,7 @@ static void SCROLL_HandleScrollEvent( HWND hwnd, INT nBar, UINT msg, POINT pt) break; case SCROLL_BOTTOM_RECT: - SCROLL_DrawInterior( hwnd, hdc, nBar, &rect, arrowSize, thumbSize, - thumbPos, infoPtr->flags, vertical, - FALSE, (hittest == SCROLL_trackHitTest) ); + SCROLL_DrawScrollBar( hwnd, hdc, nBar, hittest, FALSE, TRUE ); if (hittest == SCROLL_trackHitTest) { if ((msg == WM_LBUTTONDOWN) || (msg == WM_SYSTIMER)) -- 2.30.2

2 1

[PATCH 1/6] user32: Call SCROLL_DrawScrollBar() to draw moving thumb in SCROLL_HandleScrollEvent().
by Zhiyi Zhang 06 Jul '21

06 Jul '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/scroll.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/scroll.c b/dlls/user32/scroll.c index 01868bd4238..4abb13d5199 100644 --- a/dlls/user32/scroll.c +++ b/dlls/user32/scroll.c @@ -863,8 +863,8 @@ static void SCROLL_HandleScrollEvent( HWND hwnd, INT nBar, UINT msg, POINT pt) SCROLL_TrackingPos ); if (!SCROLL_MovingThumb) { - SCROLL_DrawMovingThumb(hdc, &rect, vertical, arrowSize, thumbSize); SCROLL_MovingThumb = TRUE; + SCROLL_DrawScrollBar( hwnd, hdc, nBar, hittest, FALSE, TRUE ); } } else if (msg == WM_LBUTTONUP) @@ -893,8 +893,8 @@ static void SCROLL_HandleScrollEvent( HWND hwnd, INT nBar, UINT msg, POINT pt) SendMessageW( hwndOwner, vertical ? WM_VSCROLL : WM_HSCROLL, MAKEWPARAM( SB_THUMBTRACK, SCROLL_TrackingVal), (LPARAM)hwndCtl ); - SCROLL_DrawMovingThumb( hdc, &rect, vertical, arrowSize, thumbSize ); SCROLL_MovingThumb = TRUE; + SCROLL_DrawScrollBar( hwnd, hdc, nBar, hittest, FALSE, TRUE ); } } break; -- 2.30.2

2 1

[PATCH 6/6] user32: Draw scroll bar size box and size grip in a single function.
by Zhiyi Zhang 06 Jul '21

06 Jul '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/scroll.c | 62 +++++++++++++++++++++++--------------------- 1 file changed, 33 insertions(+), 29 deletions(-) diff --git a/dlls/user32/scroll.c b/dlls/user32/scroll.c index d7a4f412785..5561509c50c 100644 --- a/dlls/user32/scroll.c +++ b/dlls/user32/scroll.c @@ -296,6 +296,16 @@ static void SCROLL_GetScrollBarDrawInfo( HWND hwnd, INT bar, { INT pos, max_size; + if (bar == SB_CTL && GetWindowLongW( hwnd, GWL_STYLE ) & (SBS_SIZEGRIP | SBS_SIZEBOX)) + { + GetClientRect( hwnd, rect ); + *arrow_size = 0; + *thumb_pos = 0; + *thumb_size = 0; + *vertical = FALSE; + return; + } + *vertical = SCROLL_GetScrollBarRect( hwnd, bar, rect, arrow_size, thumb_size, thumb_pos ); if (SCROLL_MovingThumb && tracking_info->win == hwnd && tracking_info->bar == bar) @@ -564,6 +574,28 @@ static void SCROLL_DoDrawScrollBar( HWND hwnd, HDC hdc, INT nBar, enum SCROLL_HI { SCROLLBAR_INFO *infoPtr; + if (nBar == SB_CTL) + { + DWORD style = GetWindowLongW( hwnd, GWL_STYLE ); + + if (style & SBS_SIZEGRIP) + { + RECT rc = *rect; + + FillRect( hdc, &rc, GetSysColorBrush( COLOR_SCROLLBAR ) ); + rc.left = max( rc.left, rc.right - GetSystemMetrics( SM_CXVSCROLL ) - 1 ); + rc.top = max( rc.top, rc.bottom - GetSystemMetrics( SM_CYHSCROLL ) - 1 ); + DrawFrameControl( hdc, &rc, DFC_SCROLL, DFCS_SCROLLSIZEGRIP ); + return; + } + + if (style & SBS_SIZEBOX) + { + FillRect( hdc, rect, GetSysColorBrush( COLOR_SCROLLBAR ) ); + return; + } + } + if (!(infoPtr = SCROLL_GetInternalInfo( hwnd, nBar, TRUE ))) return; @@ -658,23 +690,6 @@ void SCROLL_DrawNCScrollBar( HWND hwnd, HDC hdc, BOOL draw_horizontal, BOOL draw SCROLL_DrawScrollBar( hwnd, hdc, SB_VERT, g_tracking_info.hit_test, &g_tracking_info, TRUE, TRUE ); } -/*********************************************************************** - * SCROLL_DrawSizeGrip - * - * Draw the size grip. - */ -static void SCROLL_DrawSizeGrip( HWND hwnd, HDC hdc) -{ - RECT rc; - - GetClientRect( hwnd, &rc ); - FillRect( hdc, &rc, GetSysColorBrush(COLOR_SCROLLBAR) ); - rc.left = max( rc.left, rc.right - GetSystemMetrics(SM_CXVSCROLL) - 1 ); - rc.top = max( rc.top, rc.bottom - GetSystemMetrics(SM_CYHSCROLL) - 1 ); - DrawFrameControl( hdc, &rc, DFC_SCROLL, DFCS_SCROLLSIZEGRIP ); -} - - /*********************************************************************** * SCROLL_RefreshScrollBar * @@ -1413,18 +1428,7 @@ LRESULT ScrollBarWndProc_common( HWND hwnd, UINT message, WPARAM wParam, LPARAM { PAINTSTRUCT ps; HDC hdc = wParam ? (HDC)wParam : BeginPaint(hwnd, &ps); - if (GetWindowLongW( hwnd, GWL_STYLE ) & SBS_SIZEGRIP) - { - SCROLL_DrawSizeGrip( hwnd, hdc); - } - else if (GetWindowLongW( hwnd, GWL_STYLE ) & SBS_SIZEBOX) - { - RECT rc; - GetClientRect( hwnd, &rc ); - FillRect( hdc, &rc, GetSysColorBrush(COLOR_SCROLLBAR) ); - } - else - SCROLL_DrawScrollBar( hwnd, hdc, SB_CTL, g_tracking_info.hit_test, &g_tracking_info, TRUE, TRUE ); + SCROLL_DrawScrollBar( hwnd, hdc, SB_CTL, g_tracking_info.hit_test, &g_tracking_info, TRUE, TRUE ); if (!wParam) EndPaint(hwnd, &ps); } break; -- 2.30.2

1 0