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

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

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 : 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

Hans Leidekker : include: Move SECPKG_ATTR defines to a new header and add missing definitions.
by Alexandre Julliard 21 Jun '22

21 Jun '22

Module: wine Branch: master Commit: 4ce39cd09b1ab740c2b493dfabc99b4696cb6116 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4ce39cd09b1ab740c2b493df… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jun 20 19:59:06 2022 +0200 include: Move SECPKG_ATTR defines to a new header and add missing definitions. --- include/minschannel.h | 44 ++++++++++++++++++++++++++++++++++++++++++++ include/schannel.h | 39 +++++++++++++++++++++++---------------- 2 files changed, 67 insertions(+), 16 deletions(-) diff --git a/include/minschannel.h b/include/minschannel.h new file mode 100644 index 00000000000..c30ae85922b --- /dev/null +++ b/include/minschannel.h @@ -0,0 +1,44 @@ +/* + * Copyright 2022 Hans Leidekker for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_MINSCHANNEL_H__ +#define __WINE_MINSCHANNEL_H__ + +#define SECPKG_ATTR_ISSUER_LIST 0x50 +#define SECPKG_ATTR_REMOTE_CRED 0x51 +#define SECPKG_ATTR_LOCAL_CRED 0x52 +#define SECPKG_ATTR_REMOTE_CERT_CONTEXT 0x53 +#define SECPKG_ATTR_LOCAL_CERT_CONTEXT 0x54 +#define SECPKG_ATTR_ROOT_STORE 0x55 +#define SECPKG_ATTR_SUPPORTED_ALGS 0x56 +#define SECPKG_ATTR_CIPHER_STRENGTHS 0x57 +#define SECPKG_ATTR_SUPPORTED_PROTOCOLS 0x58 +#define SECPKG_ATTR_ISSUER_LIST_EX 0x59 +#define SECPKG_ATTR_CONNECTION_INFO 0x5a +#define SECPKG_ATTR_EAP_KEY_BLOCK 0x5b +#define SECPKG_ATTR_MAPPED_CRED_ATTR 0x5c +#define SECPKG_ATTR_SESSION_INFO 0x5d +#define SECPKG_ATTR_APP_DATA 0x5e +#define SECPKG_ATTR_REMOTE_CERTIFICATES 0x5f +#define SECPKG_ATTR_CLIENT_CERT_POLICY 0x60 +#define SECPKG_ATTR_CC_POLICY_RESULT 0x61 +#define SECPKG_ATTR_USE_NCRYPT 0x62 +#define SECPKG_ATTR_LOCAL_CERT_INFO 0x63 +#define SECPKG_ATTR_CIPHER_INFO 0x64 + +#endif /* __WINE_MINSCHANNEL_H__ */ diff --git a/include/schannel.h b/include/schannel.h index 556ec1882c9..3aa85832fd3 100644 --- a/include/schannel.h +++ b/include/schannel.h @@ -18,6 +18,7 @@ #ifndef __WINE_SCHANNEL_H__ #define __WINE_SCHANNEL_H__ +#include <minschannel.h> #include <wincrypt.h> /* Package names */ @@ -179,22 +180,6 @@ static const WCHAR SCHANNEL_NAME_W[] = { 'S','c','h','a','n','n','e','l',0 }; #define SCH_CRED_IGNORE_NO_REVOCATION_CHECK 2048 #define SCH_CRED_IGNORE_REVOCATION_OFFLINE 4096 -#define SECPKG_ATTR_ISSUER_LIST 0x50 -#define SECPKG_ATTR_REMOTE_CRED 0x51 -#define SECPKG_ATTR_LOCAL_CRED 0x52 -#define SECPKG_ATTR_REMOTE_CERT_CONTEXT 0x53 -#define SECPKG_ATTR_LOCAL_CERT_CONTEXT 0x54 -#define SECPKG_ATTR_ROOT_STORE 0x55 -#define SECPKG_ATTR_SUPPORTED_ALGS 0x56 -#define SECPKG_ATTR_CIPHER_STRENGTHS 0x57 -#define SECPKG_ATTR_SUPPORTED_PROTOCOLS 0x58 -#define SECPKG_ATTR_ISSUER_LIST_EX 0x59 -#define SECPKG_ATTR_CONNECTION_INFO 0x5a -#define SECPKG_ATTR_EAP_KEY_BLOCK 0x5b -#define SECPKG_ATTR_MAPPED_CRED_ATTR 0x5c -#define SECPKG_ATTR_SESSION_INFO 0x5d -#define SECPKG_ATTR_APP_DATA 0x5e - #define UNISP_RPC_ID 14 struct _HMAPPER; @@ -299,4 +284,26 @@ typedef struct _SecPkgContext_ConnectionInfo DWORD dwExchStrength; } SecPkgContext_ConnectionInfo, *PSecPkgContext_ConnectionInfo; +#define SECPKGCONTEXT_CIPHERINFO_V1 1 +#define SZ_ALG_MAX_SIZE 64 + +typedef struct _SecPkgContext_CipherInfo +{ + DWORD dwVersion; + DWORD dwProtocol; + DWORD dwCipherSuite; + DWORD dwBaseCipherSuite; + WCHAR szCipherSuite[SZ_ALG_MAX_SIZE]; + WCHAR szCipher[SZ_ALG_MAX_SIZE]; + DWORD dwCipherLen; + DWORD dwCipherBlockLen; + WCHAR szHash[SZ_ALG_MAX_SIZE]; + DWORD dwHashLen; + WCHAR szExchange[SZ_ALG_MAX_SIZE]; + DWORD dwMinExchangeLen; + DWORD dwMaxExchangeLen; + WCHAR szCertificate[SZ_ALG_MAX_SIZE]; + DWORD dwKeyType; +} SecPkgContext_CipherInfo, *PSecPkgContext_CipherInfo; + #endif /* __WINE_SCHANNEL_H__ */

1 0

Hans Leidekker : secur32: Implement SECPKG_ATTR_CIPHER_INFO.
by Alexandre Julliard 21 Jun '22

21 Jun '22

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

Jacek Caban : win32u: Move WM_GETTEXTLENGTH implementation from user32.
by Alexandre Julliard 21 Jun '22

21 Jun '22

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

Jacek Caban : win32u: Move WM_GETTEXT implementation from user32.
by Alexandre Julliard 21 Jun '22

21 Jun '22

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 get_menu_item_info implementation from user32.
by Alexandre Julliard 21 Jun '22

21 Jun '22

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 : user32: Reimplement GetMenuStringA on top of NtUserThunkedMenuItemInfo.
by Alexandre Julliard 21 Jun '22

21 Jun '22

Module: wine Branch: master Commit: 992d69b9d128e9c519306e36fd103ea4bd1b76bb URL: https://source.winehq.org/git/wine.git/?a=commit;h=992d69b9d128e9c519306e36… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 21 13:18:52 2022 +0200 user32: Reimplement GetMenuStringA on top of NtUserThunkedMenuItemInfo. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/menu.c | 45 ++++++++++++--------------------------------- 1 file changed, 12 insertions(+), 33 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index df260b063d9..29a266d2312 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -476,42 +476,21 @@ BOOL WINAPI ChangeMenuW( HMENU hMenu, UINT pos, LPCWSTR data, /******************************************************************* * GetMenuStringA (USER32.@) */ -INT WINAPI GetMenuStringA( - HMENU hMenu, /* [in] menuhandle */ - UINT wItemID, /* [in] menu item (dep. on wFlags) */ - LPSTR str, /* [out] outbuffer. If NULL, func returns entry length*/ - INT nMaxSiz, /* [in] length of buffer. if 0, func returns entry len*/ - UINT wFlags /* [in] MF_ flags */ -) +INT WINAPI GetMenuStringA( HMENU menu, UINT item, char *str, INT count, UINT flags ) { - POPUPMENU *menu; - MENUITEM *item; - UINT pos; - INT ret; - - TRACE("menu=%p item=%04x ptr=%p len=%d flags=%04x\n", hMenu, wItemID, str, nMaxSiz, wFlags ); - if (str && nMaxSiz) str[0] = '\0'; - - if (!(menu = find_menu_item(hMenu, wItemID, wFlags, &pos))) - { - SetLastError( ERROR_MENU_ITEM_NOT_FOUND); - return 0; - } - item = &menu->items[pos]; + MENUITEMINFOA info; + int ret; - if (!item->text) - ret = 0; - else if (!str || !nMaxSiz) - ret = WideCharToMultiByte( CP_ACP, 0, item->text, -1, NULL, 0, NULL, NULL ); - else - { - if (!WideCharToMultiByte( CP_ACP, 0, item->text, -1, str, nMaxSiz, NULL, NULL )) - str[nMaxSiz-1] = 0; - ret = strlen(str); - } - release_menu_ptr(menu); + TRACE( "menu=%p item=%04x ptr=%p len=%d flags=%04x\n", menu, item, str, count, flags ); - TRACE("returning %s\n", debugstr_a(str)); + info.cbSize = sizeof(info); + info.fMask = MIIM_STRING; + info.dwTypeData = str; + info.cch = count; + ret = NtUserThunkedMenuItemInfo( menu, item, flags, NtUserGetMenuItemInfoA, + (MENUITEMINFOW *)&info, NULL ); + if (ret) ret = info.cch; + TRACE( "returning %s %d\n", debugstr_a( str ), ret ); return ret; }

1 0

Jacek Caban : user32: Reimplement GetMenuStringW on top of NtUserThunkedMenuItemInfo.
by Alexandre Julliard 21 Jun '22

21 Jun '22

Module: wine Branch: master Commit: 0868ca1578d8dd9a4f8386ddbe8aaffd8b34c40f URL: https://source.winehq.org/git/wine.git/?a=commit;h=0868ca1578d8dd9a4f8386dd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 21 13:19:44 2022 +0200 user32: Reimplement GetMenuStringW on top of NtUserThunkedMenuItemInfo. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/menu.c | 41 +++++++++++------------------------------ 1 file changed, 11 insertions(+), 30 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 29a266d2312..434353e8892 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -498,39 +498,20 @@ INT WINAPI GetMenuStringA( HMENU menu, UINT item, char *str, INT count, UINT fla /******************************************************************* * GetMenuStringW (USER32.@) */ -INT WINAPI GetMenuStringW( HMENU hMenu, UINT wItemID, - LPWSTR str, INT nMaxSiz, UINT wFlags ) +INT WINAPI GetMenuStringW( HMENU menu, UINT item, WCHAR *str, INT count, UINT flags ) { - POPUPMENU *menu; - MENUITEM *item; - UINT pos; - INT ret; - - TRACE("menu=%p item=%04x ptr=%p len=%d flags=%04x\n", hMenu, wItemID, str, nMaxSiz, wFlags ); - if (str && nMaxSiz) str[0] = '\0'; - - if (!(menu = find_menu_item(hMenu, wItemID, wFlags, &pos))) - { - SetLastError( ERROR_MENU_ITEM_NOT_FOUND); - return 0; - } - item = &menu->items[pos]; + MENUITEMINFOW info; + int ret; - if (!str || !nMaxSiz) - ret = item->text ? lstrlenW(item->text) : 0; - else if (!item->text) - { - str[0] = 0; - ret = 0; - } - else - { - lstrcpynW( str, item->text, nMaxSiz ); - ret = lstrlenW(str); - } - release_menu_ptr(menu); + TRACE( "menu=%p item=%04x ptr=%p len=%d flags=%04x\n", menu, item, str, count, flags ); - TRACE("returning %s\n", debugstr_w(str)); + info.cbSize = sizeof(info); + info.fMask = MIIM_STRING; + info.dwTypeData = str; + info.cch = count; + ret = NtUserThunkedMenuItemInfo( menu, item, flags, NtUserGetMenuItemInfoW, &info, NULL ); + if (ret) ret = info.cch; + TRACE( "returning %s %d\n", debugstr_w( str ), ret ); return ret; }

1 0