June 2022 - Wine-Commits - list.winehq.org

Huw Davies : nsiproxy: Use an unsigned integer for the ICMP handles.
by Alexandre Julliard June 21, 2022

June 21, 2022

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

Zhiyi Zhang : uxtheme: Support parsing more header parts and states.
by Alexandre Julliard June 21, 2022

June 21, 2022

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 June 21, 2022

June 21, 2022

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 June 21, 2022

June 21, 2022

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

Jacek Caban : win32u: Move get_menu_item_info implementation from user32.
by Alexandre Julliard June 21, 2022

June 21, 2022

Module: wine Branch: master Commit: 7099c8d7e85a88677d0992cb59fa3c225eb3322f URL: https://source.winehq.org/git/wine.git/?a=commit;h=7099c8d7e85a88677d0992cb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 14 19:39:06 2022 +0200 win32u: Move get_menu_item_info implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/menu.c | 212 ++--------------------------------------------------- dlls/win32u/menu.c | 123 +++++++++++++++++++++++++++++++ include/ntuser.h | 2 + 3 files changed, 131 insertions(+), 206 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7099c8d7e85a88677d09…

1 0

Jacek Caban : win32u: Move WM_GETTEXT implementation from user32.
by Alexandre Julliard June 21, 2022

June 21, 2022

Module: wine Branch: master Commit: 4a53c479e8647636b327a81d9f3537d7d5c0ae03 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4a53c479e8647636b327a81d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 21 00:42:05 2022 +0200 win32u: Move WM_GETTEXT implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/defwnd.c | 71 ---------------------------------------------------- dlls/win32u/defwnd.c | 34 +++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 71 deletions(-) diff --git a/dlls/user32/defwnd.c b/dlls/user32/defwnd.c index c72789ac963..d29846ad623 100644 --- a/dlls/user32/defwnd.c +++ b/dlls/user32/defwnd.c @@ -30,8 +30,6 @@ #include "win.h" #include "user_private.h" #include "controls.h" -#include "wine/server.h" -#include "wine/exception.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(win); @@ -73,28 +71,6 @@ HBRUSH DEFWND_ControlColor( HDC hDC, UINT ctlType ) } -static LPARAM DEFWND_GetTextA( WND *wndPtr, LPSTR dest, WPARAM wParam ) -{ - LPARAM result = 0; - - __TRY - { - if (wndPtr->text) - { - if (!WideCharToMultiByte( CP_ACP, 0, wndPtr->text, -1, - dest, wParam, NULL, NULL )) dest[wParam-1] = 0; - result = strlen( dest ); - } - else dest[0] = '\0'; - } - __EXCEPT_PAGE_FAULT - { - return 0; - } - __ENDTRY - return result; -} - /*********************************************************************** * DefWindowProcA (USER32.@) * @@ -145,19 +121,6 @@ LRESULT WINAPI DefWindowProcA( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam result = NC_HandleSysCommand( hwnd, wParam, lParam ); break; - case WM_GETTEXT: - if (wParam) - { - LPSTR dest = (LPSTR)lParam; - WND *wndPtr = WIN_GetPtr( hwnd ); - - if (!wndPtr) break; - result = DEFWND_GetTextA( wndPtr, dest, wParam ); - - WIN_ReleasePtr( wndPtr ); - } - break; - case WM_IME_CHAR: if (HIBYTE(wParam)) PostMessageA( hwnd, WM_CHAR, HIBYTE(wParam), lParam ); PostMessageA( hwnd, WM_CHAR, LOBYTE(wParam), lParam ); @@ -236,28 +199,6 @@ LRESULT WINAPI DefWindowProcA( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam } -static LPARAM DEFWND_GetTextW( WND *wndPtr, LPWSTR dest, WPARAM wParam ) -{ - LPARAM result = 0; - - __TRY - { - if (wndPtr->text) - { - lstrcpynW( dest, wndPtr->text, wParam ); - result = lstrlenW( dest ); - } - else dest[0] = '\0'; - } - __EXCEPT_PAGE_FAULT - { - return 0; - } - __ENDTRY - - return result; -} - /*********************************************************************** * DefWindowProcW (USER32.@) Calls default window message handler * @@ -315,18 +256,6 @@ LRESULT WINAPI DefWindowProcW( result = NC_HandleSysCommand( hwnd, wParam, lParam ); break; - case WM_GETTEXT: - if (wParam) - { - LPWSTR dest = (LPWSTR)lParam; - WND *wndPtr = WIN_GetPtr( hwnd ); - - if (!wndPtr) break; - result = DEFWND_GetTextW( wndPtr, dest, wParam ); - WIN_ReleasePtr( wndPtr ); - } - break; - case WM_IME_CHAR: PostMessageW( hwnd, WM_CHAR, wParam, lParam ); break; diff --git a/dlls/win32u/defwnd.c b/dlls/win32u/defwnd.c index c54dbdb710c..af51b933d49 100644 --- a/dlls/win32u/defwnd.c +++ b/dlls/win32u/defwnd.c @@ -2519,6 +2519,40 @@ LRESULT default_window_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, } break; + case WM_GETTEXT: + if (wparam) + { + WND *win; + + if (!(win = get_win_ptr( hwnd ))) break; + + __TRY + { + if (ansi) + { + char *dest = (char *)lparam; + if (win->text) + result = win32u_wctomb( &ansi_cp, dest, wparam - 1, + win->text, wcslen( win->text )); + dest[result] = 0; + } + else + { + WCHAR *dest = (WCHAR *)lparam; + if (win->text) result = min( wcslen( win->text ), wparam - 1 ); + if (result) memcpy( dest, win->text, result * sizeof(WCHAR) ); + dest[result] = 0; + } + } + __EXCEPT + { + } + __ENDTRY + + release_win_ptr( win ); + } + break; + case WM_SETICON: result = (LRESULT)set_window_icon( hwnd, wparam, (HICON)lparam ); if ((get_window_long( hwnd, GWL_STYLE ) & WS_CAPTION) == WS_CAPTION)

1 0

Jacek Caban : win32u: Move WM_GETTEXTLENGTH implementation from user32.
by Alexandre Julliard June 21, 2022

June 21, 2022

Module: wine Branch: master Commit: 9260d114b1e73810b86cfcf535d54d30fdb56ed3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9260d114b1e73810b86cfcf5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 20 17:58:21 2022 +0200 win32u: Move WM_GETTEXTLENGTH implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/defwnd.c | 18 ------------------ dlls/win32u/defwnd.c | 14 ++++++++++++++ dlls/win32u/font.c | 22 ++++++++++++++++++++++ dlls/win32u/tests/win32u.c | 9 +++++++++ dlls/win32u/win32u_private.h | 1 + 5 files changed, 46 insertions(+), 18 deletions(-) diff --git a/dlls/user32/defwnd.c b/dlls/user32/defwnd.c index 16442b6899e..c72789ac963 100644 --- a/dlls/user32/defwnd.c +++ b/dlls/user32/defwnd.c @@ -145,16 +145,6 @@ LRESULT WINAPI DefWindowProcA( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam result = NC_HandleSysCommand( hwnd, wParam, lParam ); break; - case WM_GETTEXTLENGTH: - { - WND *wndPtr = WIN_GetPtr( hwnd ); - if (wndPtr && wndPtr->text) - result = WideCharToMultiByte( CP_ACP, 0, wndPtr->text, lstrlenW(wndPtr->text), - NULL, 0, NULL, NULL ); - WIN_ReleasePtr( wndPtr ); - } - break; - case WM_GETTEXT: if (wParam) { @@ -325,14 +315,6 @@ LRESULT WINAPI DefWindowProcW( result = NC_HandleSysCommand( hwnd, wParam, lParam ); break; - case WM_GETTEXTLENGTH: - { - WND *wndPtr = WIN_GetPtr( hwnd ); - if (wndPtr && wndPtr->text) result = (LRESULT)lstrlenW(wndPtr->text); - WIN_ReleasePtr( wndPtr ); - } - break; - case WM_GETTEXT: if (wParam) { diff --git a/dlls/win32u/defwnd.c b/dlls/win32u/defwnd.c index 90323e304fc..c54dbdb710c 100644 --- a/dlls/win32u/defwnd.c +++ b/dlls/win32u/defwnd.c @@ -2505,6 +2505,20 @@ LRESULT default_window_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, handle_nc_paint( hwnd , (HRGN)1 ); /* repaint caption */ break; + case WM_GETTEXTLENGTH: + { + WND *win = get_win_ptr( hwnd ); + if (win && win->text) + { + if (ansi) + result = win32u_wctomb_size( &ansi_cp, win->text, wcslen( win->text )); + else + result = wcslen( win->text ); + } + release_win_ptr( win ); + } + break; + case WM_SETICON: result = (LRESULT)set_window_icon( hwnd, wparam, (HICON)lparam ); if ((get_window_long( hwnd, GWL_STYLE ) & WS_CAPTION) == WS_CAPTION) diff --git a/dlls/win32u/font.c b/dlls/win32u/font.c index 39b195fe25a..5bf59903308 100644 --- a/dlls/win32u/font.c +++ b/dlls/win32u/font.c @@ -3230,6 +3230,28 @@ DWORD win32u_wctomb( CPTABLEINFO *info, char *dst, DWORD dstlen, const WCHAR *sr return ret; } +DWORD win32u_wctomb_size( CPTABLEINFO *info, const WCHAR *src, DWORD srclen ) +{ + DWORD ret; + + if (info->CodePage == CP_UTF8) + { + RtlUnicodeToUTF8N( NULL, 0, &ret, src, srclen * sizeof(WCHAR) ); + } + else if(info->DBCSCodePage) + { + WCHAR *uni2cp = info->WideCharTable; + for (ret = srclen; srclen; srclen--, src++) + if (uni2cp[*src] & 0xff00) ret++; + } + else + { + ret = srclen; + } + + return ret; +} + DWORD win32u_mbtowc( CPTABLEINFO *info, WCHAR *dst, DWORD dstlen, const char *src, DWORD srclen ) { DWORD ret; diff --git a/dlls/win32u/tests/win32u.c b/dlls/win32u/tests/win32u.c index 11820859358..dc1638f37ab 100644 --- a/dlls/win32u/tests/win32u.c +++ b/dlls/win32u/tests/win32u.c @@ -494,6 +494,12 @@ static void test_window_text(void) ok( len == 4, "len = %d\n", len ); ok( !lstrcmpW( buf, L"test" ), "buf = %s\n", wine_dbgstr_w(buf) ); + res = NtUserMessageCall( hwnd, WM_GETTEXTLENGTH, 0, 0, 0, NtUserDefWindowProc, TRUE ); + ok( res == 4, "res = %Id\n", res ); + + res = NtUserMessageCall( hwnd, WM_GETTEXTLENGTH, 0, 0, 0, NtUserDefWindowProc, FALSE ); + ok( res == 4, "res = %Id\n", res ); + res = NtUserMessageCall( hwnd, WM_SETTEXT, 0, (LPARAM)"TestA", 0, NtUserDefWindowProc, TRUE ); ok( res == 1, "res = %Id\n", res ); @@ -502,6 +508,9 @@ static void test_window_text(void) ok( len == 5, "len = %d\n", len ); ok( !lstrcmpW( buf, L"TestA" ), "buf = %s\n", wine_dbgstr_w(buf) ); + res = NtUserMessageCall( hwnd, WM_GETTEXTLENGTH, 0, 0, 0, NtUserDefWindowProc, TRUE ); + ok( res == 5, "res = %Id\n", res ); + DestroyWindow( hwnd ); } diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index 808d3f83e37..468375f1ddf 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -575,6 +575,7 @@ DWORD win32u_mbtowc( CPTABLEINFO *info, WCHAR *dst, DWORD dstlen, const char *sr DWORD srclen ) DECLSPEC_HIDDEN; DWORD win32u_wctomb( CPTABLEINFO *info, char *dst, DWORD dstlen, const WCHAR *src, DWORD srclen ) DECLSPEC_HIDDEN; +DWORD win32u_wctomb_size( CPTABLEINFO *info, const WCHAR *src, DWORD srclen ) DECLSPEC_HIDDEN; static inline WCHAR *win32u_wcsdup( const WCHAR *str ) {

1 0

Hans Leidekker : secur32: Implement SECPKG_ATTR_CIPHER_INFO.
by Alexandre Julliard June 21, 2022

June 21, 2022

Module: wine Branch: master Commit: 99e2f4caca474d14efd55e6a008bd57c720e0fd7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=99e2f4caca474d14efd55e6a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jun 20 20:06:55 2022 +0200 secur32: Implement SECPKG_ATTR_CIPHER_INFO. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53180 --- dlls/secur32/schannel.c | 8 ++ dlls/secur32/schannel_gnutls.c | 222 +++++++++++++++++++++++++++++++++++++++++ dlls/secur32/secur32_priv.h | 7 ++ dlls/secur32/tests/schannel.c | 29 ++++++ 4 files changed, 266 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=99e2f4caca474d14efd5…

1 0

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

June 21, 2022

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/toolbar: Add support for TBCDRF_NOBACKGROUND.
by Alexandre Julliard June 21, 2022

June 21, 2022

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