[PATCH v2 0/2] MR10910: win32u: Simplify window class menu name management.
-- v2: win32u: Simplify window class menu name management. win32u: Handle menu name ansi conversion on the PE side. https://gitlab.winehq.org/wine/wine/-/merge_requests/10910
From: Rémi Bernon <rbernon@codeweavers.com> --- dlls/user32/class.c | 40 ++++++++++++++++++++++++++++++++++++++-- dlls/user32/win.c | 3 ++- dlls/win32u/class.c | 4 ++-- 3 files changed, 42 insertions(+), 5 deletions(-) diff --git a/dlls/user32/class.c b/dlls/user32/class.c index 125ab29c0a3..1e818ae261c 100644 --- a/dlls/user32/class.c +++ b/dlls/user32/class.c @@ -124,6 +124,19 @@ void init_class_name( UNICODE_STRING *str, const WCHAR *name ) } } +static const WCHAR *menu_nameW( const WCHAR *menu_name ) +{ + if (IS_INTRESOURCE(menu_name)) return (const WCHAR *)menu_name; + return (const WCHAR *)(menu_name); +} + +static const char *menu_nameA( const WCHAR *menu_name ) +{ + const WCHAR *nameW = menu_nameW( menu_name ); + if (IS_INTRESOURCE(nameW)) return (const char *)nameW; + return (const char *)(nameW + wcslen( nameW ) + 1); +} + static BOOL alloc_menu_nameA( struct client_menu_name *ret, const char *menu_name ) { if (!IS_INTRESOURCE(menu_name)) @@ -187,6 +200,20 @@ static ULONG_PTR set_menu_nameA( HWND hwnd, INT offset, ULONG_PTR newval ) return 0; } +static ULONG_PTR get_menu_nameW( HWND hwnd ) +{ + const WCHAR *menu_name; + if (!(menu_name = (void *)NtUserGetClassLongPtrW( hwnd, GCLP_MENUNAME ))) return 0; + return (ULONG_PTR)menu_nameW( menu_name ); +} + +static ULONG_PTR get_menu_nameA( HWND hwnd ) +{ + const WCHAR *menu_name; + if (!(menu_name = (void *)NtUserGetClassLongPtrW( hwnd, GCLP_MENUNAME ))) return 0; + return (ULONG_PTR)menu_nameA( menu_name ); +} + void get_class_version( UNICODE_STRING *name, UNICODE_STRING *version, BOOL load ) { ACTCTX_SECTION_KEYED_DATA data = {.cbSize = sizeof(data)}; @@ -406,6 +433,7 @@ BOOL WINAPI UnregisterClassW( LPCWSTR class_name, HINSTANCE instance ) */ WORD WINAPI GetClassWord( HWND hwnd, INT offset ) { + if (offset == GCLP_MENUNAME) return get_menu_nameA( hwnd ); return NtUserGetClassWord( hwnd, offset ); } @@ -415,6 +443,7 @@ WORD WINAPI GetClassWord( HWND hwnd, INT offset ) */ DWORD WINAPI GetClassLongW( HWND hwnd, INT offset ) { + if (offset == GCLP_MENUNAME) return get_menu_nameW( hwnd ); return NtUserGetClassLongW( hwnd, offset ); } @@ -425,6 +454,7 @@ DWORD WINAPI GetClassLongW( HWND hwnd, INT offset ) */ DWORD WINAPI GetClassLongA( HWND hwnd, INT offset ) { + if (offset == GCLP_MENUNAME) return get_menu_nameA( hwnd ); return NtUserGetClassLongA( hwnd, offset ); } @@ -547,6 +577,7 @@ BOOL WINAPI GetClassInfoW( HINSTANCE hInstance, LPCWSTR name, WNDCLASSW *wc ) */ BOOL WINAPI GetClassInfoExA( HINSTANCE hInstance, LPCSTR name, WNDCLASSEXA *wc ) { + struct client_menu_name menu_name; WCHAR nameW[MAX_ATOM_LEN + 1]; UNICODE_STRING name_str = RTL_CONSTANT_STRING(nameW), version; ATOM atom; @@ -563,13 +594,14 @@ BOOL WINAPI GetClassInfoExA( HINSTANCE hInstance, LPCSTR name, WNDCLASSEXA *wc ) init_class_name_ansi( &name_str, name ); get_class_version( &name_str, &version, TRUE ); - if (!(atom = NtUserGetClassInfoEx( hInstance, &name_str, (WNDCLASSEXW *)wc, NULL, TRUE ))) + if (!(atom = NtUserGetClassInfoEx( hInstance, &name_str, (WNDCLASSEXW *)wc, &menu_name, TRUE ))) { TRACE( "%s %p -> not found\n", debugstr_us(&name_str), hInstance ); SetLastError( ERROR_CLASS_DOES_NOT_EXIST ); return 0; } + wc->lpszMenuName = menu_nameA( menu_name.nameW ); wc->lpszClassName = name; /* We must return the atom of the class here instead of just TRUE. */ return atom; @@ -581,6 +613,7 @@ BOOL WINAPI GetClassInfoExA( HINSTANCE hInstance, LPCSTR name, WNDCLASSEXA *wc ) */ BOOL WINAPI GetClassInfoExW( HINSTANCE hInstance, LPCWSTR name, WNDCLASSEXW *wc ) { + struct client_menu_name menu_name; WCHAR nameW[MAX_ATOM_LEN + 1]; UNICODE_STRING name_str = RTL_CONSTANT_STRING(nameW), version; ATOM atom; @@ -597,13 +630,14 @@ BOOL WINAPI GetClassInfoExW( HINSTANCE hInstance, LPCWSTR name, WNDCLASSEXW *wc init_class_name( &name_str, name ); get_class_version( &name_str, &version, TRUE ); - if (!(atom = NtUserGetClassInfoEx( hInstance, &name_str, wc, NULL, FALSE ))) + if (!(atom = NtUserGetClassInfoEx( hInstance, &name_str, wc, &menu_name, FALSE ))) { TRACE( "%s %p -> not found\n", debugstr_us(&name_str), hInstance ); SetLastError( ERROR_CLASS_DOES_NOT_EXIST ); return 0; } + wc->lpszMenuName = menu_nameW( menu_name.nameW ); wc->lpszClassName = name; /* We must return the atom of the class here instead of just TRUE. */ return atom; @@ -624,6 +658,7 @@ BOOL WINAPI GetClassInfoExW( HINSTANCE hInstance, LPCWSTR name, WNDCLASSEXW *wc */ ULONG_PTR WINAPI GetClassLongPtrA( HWND hwnd, INT offset ) { + if (offset == GCLP_MENUNAME) return get_menu_nameA( hwnd ); return NtUserGetClassLongPtrA( hwnd, offset ); } @@ -632,6 +667,7 @@ ULONG_PTR WINAPI GetClassLongPtrA( HWND hwnd, INT offset ) */ ULONG_PTR WINAPI GetClassLongPtrW( HWND hwnd, INT offset ) { + if (offset == GCLP_MENUNAME) return get_menu_nameW( hwnd ); return NtUserGetClassLongPtrW( hwnd, offset ); } diff --git a/dlls/user32/win.c b/dlls/user32/win.c index ac8b33a9c84..e6963764d7c 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -283,6 +283,7 @@ HWND WIN_CreateWindowEx( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE module, { WCHAR nameW[MAX_ATOM_LEN + 1]; UNICODE_STRING class = RTL_CONSTANT_STRING(nameW), version, window_name = {0}; + struct client_menu_name menu_name; HWND hwnd, top_child = 0; MDICREATESTRUCTW mdi_cs; WNDCLASSEXW info; @@ -292,7 +293,7 @@ HWND WIN_CreateWindowEx( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE module, init_class_name( &class, className ); get_class_version( &class, &version, TRUE ); - if (!NtUserGetClassInfoEx( module, &class, &info, NULL, FALSE )) + if (!NtUserGetClassInfoEx( module, &class, &info, &menu_name, FALSE )) { TRACE( "%s %p -> not found\n", debugstr_us(&class), module ); SetLastError( ERROR_CLASS_DOES_NOT_EXIST ); diff --git a/dlls/win32u/class.c b/dlls/win32u/class.c index 9936e31f804..913bbdf03a6 100644 --- a/dlls/win32u/class.c +++ b/dlls/win32u/class.c @@ -684,7 +684,7 @@ ATOM WINAPI NtUserGetClassInfoEx( HINSTANCE instance, UNICODE_STRING *name, WNDC wc->hIconSm = class->hIconSm ? class->hIconSm : class->hIconSmIntern; wc->hCursor = class->hCursor; wc->hbrBackground = class->hbrBackground; - wc->lpszMenuName = ansi ? (const WCHAR *)class->menu_name.nameA : class->menu_name.nameW; + wc->lpszMenuName = class->menu_name.nameW; wc->lpszClassName = name->Buffer; } atom = class_shm->atom; @@ -1065,7 +1065,7 @@ static ULONG_PTR get_class_long_size( HWND hwnd, INT offset, UINT size, BOOL ans retvalue = (ULONG_PTR)get_winproc( class->winproc, ansi ); break; case GCLP_MENUNAME: - retvalue = ansi ? (ULONG_PTR)class->menu_name.nameA : (ULONG_PTR)class->menu_name.nameW; + retvalue = (ULONG_PTR)class->menu_name.nameW; break; default: RtlSetLastWin32Error( ERROR_INVALID_INDEX ); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/10910
From: Rémi Bernon <rbernon@codeweavers.com> --- dlls/user32/class.c | 123 ++++++++++++++++++-------------------- dlls/user32/tests/class.c | 2 - dlls/user32/win.c | 2 +- dlls/win32u/class.c | 34 ++++------- dlls/win32u/main.c | 8 +-- dlls/wow64win/user.c | 64 ++++---------------- include/ntuser.h | 16 ++--- 7 files changed, 89 insertions(+), 160 deletions(-) diff --git a/dlls/user32/class.c b/dlls/user32/class.c index 1e818ae261c..eb28b03479a 100644 --- a/dlls/user32/class.c +++ b/dlls/user32/class.c @@ -124,92 +124,83 @@ void init_class_name( UNICODE_STRING *str, const WCHAR *name ) } } -static const WCHAR *menu_nameW( const WCHAR *menu_name ) +static const WCHAR *menu_nameW( const struct client_menu_name *menu_name ) { if (IS_INTRESOURCE(menu_name)) return (const WCHAR *)menu_name; return (const WCHAR *)(menu_name); } -static const char *menu_nameA( const WCHAR *menu_name ) +static const char *menu_nameA( const struct client_menu_name *menu_name ) { const WCHAR *nameW = menu_nameW( menu_name ); if (IS_INTRESOURCE(nameW)) return (const char *)nameW; return (const char *)(nameW + wcslen( nameW ) + 1); } -static BOOL alloc_menu_nameA( struct client_menu_name *ret, const char *menu_name ) +static struct client_menu_name *alloc_menu_nameA( const char *menu_name ) { - if (!IS_INTRESOURCE(menu_name)) - { - DWORD lenA = strlen( menu_name ) + 1; - DWORD lenW = MultiByteToWideChar( CP_ACP, 0, menu_name, lenA, NULL, 0 ); - ret->nameW = HeapAlloc( GetProcessHeap(), 0, lenA + lenW * sizeof(WCHAR) ); - if (!ret->nameW) return FALSE; - ret->nameA = (char *)(ret->nameW + lenW); - MultiByteToWideChar( CP_ACP, 0, menu_name, lenA, ret->nameW, lenW ); - memcpy( ret->nameA, menu_name, lenA ); - } - else - { - ret->nameW = (WCHAR *)menu_name; - ret->nameA = (char *)menu_name; - } - return TRUE; -} + UINT lenA, lenW; + WCHAR *nameW; -static BOOL alloc_menu_nameW( struct client_menu_name *ret, const WCHAR *menu_name ) -{ - if (!IS_INTRESOURCE(menu_name)) - { - DWORD lenW = lstrlenW( menu_name ) + 1; - DWORD lenA = WideCharToMultiByte( CP_ACP, 0, menu_name, lenW, NULL, 0, NULL, NULL ); - ret->nameW = HeapAlloc( GetProcessHeap(), 0, lenA + lenW * sizeof(WCHAR) ); - if (!ret->nameW) return FALSE; - ret->nameA = (char *)(ret->nameW + lenW); - memcpy( ret->nameW, menu_name, lenW * sizeof(WCHAR) ); - WideCharToMultiByte( CP_ACP, 0, menu_name, lenW, ret->nameA, lenA, NULL, NULL ); - } - else - { - ret->nameW = (WCHAR *)menu_name; - ret->nameA = (char *)menu_name; - } - return TRUE; + if (IS_INTRESOURCE(menu_name)) return (struct client_menu_name *)menu_name; + + lenA = strlen( menu_name ) + 1; + lenW = MultiByteToWideChar( CP_ACP, 0, menu_name, lenA, NULL, 0 ); + if (!(nameW = HeapAlloc( GetProcessHeap(), 0, lenA + lenW * sizeof(WCHAR) ))) return NULL; + MultiByteToWideChar( CP_ACP, 0, menu_name, lenA, nameW, lenW ); + memcpy( nameW + lenW, menu_name, lenA ); + + return (struct client_menu_name *)nameW; } -static void free_menu_name( struct client_menu_name *name ) +static struct client_menu_name *alloc_menu_nameW( const WCHAR *menu_name ) { - if (!IS_INTRESOURCE(name->nameW)) HeapFree( GetProcessHeap(), 0, name->nameW ); + UINT lenA, lenW; + WCHAR *nameW; + + if (IS_INTRESOURCE(menu_name)) return (struct client_menu_name *)menu_name; + + lenW = wcslen( menu_name ) + 1; + lenA = WideCharToMultiByte( CP_ACP, 0, menu_name, lenW, NULL, 0, NULL, NULL ); + if (!(nameW = HeapAlloc( GetProcessHeap(), 0, lenA + lenW * sizeof(WCHAR) ))) return NULL; + memcpy( nameW, menu_name, lenW * sizeof(WCHAR) ); + WideCharToMultiByte( CP_ACP, 0, menu_name, lenW, (char *)(nameW + lenW), lenA, NULL, NULL ); + + return (struct client_menu_name *)nameW; } static ULONG_PTR set_menu_nameW( HWND hwnd, INT offset, ULONG_PTR newval ) { - struct client_menu_name menu_name; - if (!alloc_menu_nameW( &menu_name, (const WCHAR *)newval )) return 0; - NtUserSetClassLongPtr( hwnd, offset, (ULONG_PTR)&menu_name, FALSE ); - free_menu_name( &menu_name ); - return 0; + struct client_menu_name *menu_name = NULL; + + if (newval && !(menu_name = alloc_menu_nameW( (const WCHAR *)newval ))) return 0; + menu_name = (struct client_menu_name *)NtUserSetClassLongPtr( hwnd, offset, (ULONG_PTR)menu_name, FALSE ); + if (!IS_INTRESOURCE(menu_name)) free( menu_name ); + + return (ULONG_PTR)menu_name; } static ULONG_PTR set_menu_nameA( HWND hwnd, INT offset, ULONG_PTR newval ) { - struct client_menu_name menu_name; - if (!alloc_menu_nameA( &menu_name, (const char *)newval )) return 0; - NtUserSetClassLongPtr( hwnd, offset, (ULONG_PTR)&menu_name, TRUE ); - free_menu_name( &menu_name ); - return 0; + struct client_menu_name *menu_name = NULL; + + if (newval && !(menu_name = alloc_menu_nameA( (const char *)newval ))) return 0; + menu_name = (struct client_menu_name *)NtUserSetClassLongPtr( hwnd, offset, (ULONG_PTR)menu_name, FALSE ); + if (!IS_INTRESOURCE(menu_name)) free( menu_name ); + + return (ULONG_PTR)menu_name; } static ULONG_PTR get_menu_nameW( HWND hwnd ) { - const WCHAR *menu_name; + const struct client_menu_name *menu_name; if (!(menu_name = (void *)NtUserGetClassLongPtrW( hwnd, GCLP_MENUNAME ))) return 0; return (ULONG_PTR)menu_nameW( menu_name ); } static ULONG_PTR get_menu_nameA( HWND hwnd ) { - const WCHAR *menu_name; + const struct client_menu_name *menu_name; if (!(menu_name = (void *)NtUserGetClassLongPtrW( hwnd, GCLP_MENUNAME ))) return 0; return (ULONG_PTR)menu_nameA( menu_name ); } @@ -356,7 +347,7 @@ ATOM WINAPI RegisterClassW( const WNDCLASSW* wc ) */ ATOM WINAPI RegisterClassExA( const WNDCLASSEXA* wc ) { - struct client_menu_name menu_name; + struct client_menu_name *menu_name = NULL; WCHAR nameW[MAX_ATOM_LEN + 1]; UNICODE_STRING name = RTL_CONSTANT_STRING(nameW), version; ATOM atom; @@ -364,10 +355,10 @@ ATOM WINAPI RegisterClassExA( const WNDCLASSEXA* wc ) init_class_name_ansi( &name, wc->lpszClassName ); get_class_version( &name, &version, FALSE ); - if (!alloc_menu_nameA( &menu_name, wc->lpszMenuName )) return 0; + if (wc->lpszMenuName && !(menu_name = alloc_menu_nameA( wc->lpszMenuName ))) return 0; - atom = NtUserRegisterClassExWOW( (WNDCLASSEXW *)wc, &name, &version, &menu_name, 0, 1, NULL ); - if (!atom) free_menu_name( &menu_name ); + atom = NtUserRegisterClassExWOW( (WNDCLASSEXW *)wc, &name, &version, menu_name, 0, 1, NULL ); + if (!atom && !IS_INTRESOURCE(menu_name)) free( menu_name ); return atom; } @@ -377,7 +368,7 @@ ATOM WINAPI RegisterClassExA( const WNDCLASSEXA* wc ) */ ATOM WINAPI RegisterClassExW( const WNDCLASSEXW* wc ) { - struct client_menu_name menu_name; + struct client_menu_name *menu_name = NULL; WCHAR nameW[MAX_ATOM_LEN + 1]; UNICODE_STRING name = RTL_CONSTANT_STRING(nameW), version; ATOM atom; @@ -385,10 +376,10 @@ ATOM WINAPI RegisterClassExW( const WNDCLASSEXW* wc ) init_class_name( &name, wc->lpszClassName ); get_class_version( &name, &version, FALSE ); - if (!alloc_menu_nameW( &menu_name, wc->lpszMenuName )) return 0; + if (wc->lpszMenuName && !(menu_name = alloc_menu_nameW( wc->lpszMenuName ))) return 0; - atom = NtUserRegisterClassExWOW( wc, &name, &version, &menu_name, 0, 0, NULL ); - if (!atom) free_menu_name( &menu_name ); + atom = NtUserRegisterClassExWOW( wc, &name, &version, menu_name, 0, 0, NULL ); + if (!atom && !IS_INTRESOURCE(menu_name)) free( menu_name ); return atom; } @@ -414,7 +405,7 @@ BOOL WINAPI UnregisterClassA( LPCSTR className, HINSTANCE hInstance ) */ BOOL WINAPI UnregisterClassW( LPCWSTR class_name, HINSTANCE instance ) { - struct client_menu_name menu_name; + struct client_menu_name *menu_name; WCHAR nameW[MAX_ATOM_LEN + 1]; UNICODE_STRING name = RTL_CONSTANT_STRING(nameW), version; BOOL ret; @@ -423,7 +414,7 @@ BOOL WINAPI UnregisterClassW( LPCWSTR class_name, HINSTANCE instance ) get_class_version( &name, &version, FALSE ); ret = NtUserUnregisterClass( &name, instance, &menu_name ); - if (ret) free_menu_name( &menu_name ); + if (ret && !IS_INTRESOURCE(menu_name)) free( menu_name ); return ret; } @@ -577,7 +568,7 @@ BOOL WINAPI GetClassInfoW( HINSTANCE hInstance, LPCWSTR name, WNDCLASSW *wc ) */ BOOL WINAPI GetClassInfoExA( HINSTANCE hInstance, LPCSTR name, WNDCLASSEXA *wc ) { - struct client_menu_name menu_name; + struct client_menu_name *menu_name; WCHAR nameW[MAX_ATOM_LEN + 1]; UNICODE_STRING name_str = RTL_CONSTANT_STRING(nameW), version; ATOM atom; @@ -601,7 +592,7 @@ BOOL WINAPI GetClassInfoExA( HINSTANCE hInstance, LPCSTR name, WNDCLASSEXA *wc ) return 0; } - wc->lpszMenuName = menu_nameA( menu_name.nameW ); + wc->lpszMenuName = menu_nameA( menu_name ); wc->lpszClassName = name; /* We must return the atom of the class here instead of just TRUE. */ return atom; @@ -613,7 +604,7 @@ BOOL WINAPI GetClassInfoExA( HINSTANCE hInstance, LPCSTR name, WNDCLASSEXA *wc ) */ BOOL WINAPI GetClassInfoExW( HINSTANCE hInstance, LPCWSTR name, WNDCLASSEXW *wc ) { - struct client_menu_name menu_name; + struct client_menu_name *menu_name; WCHAR nameW[MAX_ATOM_LEN + 1]; UNICODE_STRING name_str = RTL_CONSTANT_STRING(nameW), version; ATOM atom; @@ -637,7 +628,7 @@ BOOL WINAPI GetClassInfoExW( HINSTANCE hInstance, LPCWSTR name, WNDCLASSEXW *wc return 0; } - wc->lpszMenuName = menu_nameW( menu_name.nameW ); + wc->lpszMenuName = menu_nameW( menu_name ); wc->lpszClassName = name; /* We must return the atom of the class here instead of just TRUE. */ return atom; diff --git a/dlls/user32/tests/class.c b/dlls/user32/tests/class.c index 6dc6c8871c2..49bec91ff9c 100644 --- a/dlls/user32/tests/class.c +++ b/dlls/user32/tests/class.c @@ -2374,7 +2374,6 @@ static void test_class_name(void) ok(!wcscmp(nameW, L"menu name"), "unexpected class name %s\n", debugstr_w(nameW)); res = SetClassLongPtrA(hwnd, GCLP_MENUNAME, (LONG_PTR)"nameA"); - todo_wine ok(res, "SetClassLongPtrA returned 0\n"); nameA = (const char *)GetClassLongPtrA(hwnd, GCLP_MENUNAME); ok(!strcmp(nameA, "nameA"), "unexpected class name %s\n", debugstr_a(nameA)); @@ -2382,7 +2381,6 @@ static void test_class_name(void) ok(!wcscmp(nameW, L"nameA"), "unexpected class name %s\n", debugstr_w(nameW)); res = SetClassLongPtrW(hwnd, GCLP_MENUNAME, (LONG_PTR)L"nameW"); - todo_wine ok(res, "SetClassLongPtrW returned 0\n"); nameA = (const char *)GetClassLongPtrA(hwnd, GCLP_MENUNAME); ok(!strcmp(nameA, "nameW"), "unexpected class name %s\n", debugstr_a(nameA)); diff --git a/dlls/user32/win.c b/dlls/user32/win.c index e6963764d7c..ded3df542df 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -283,7 +283,7 @@ HWND WIN_CreateWindowEx( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE module, { WCHAR nameW[MAX_ATOM_LEN + 1]; UNICODE_STRING class = RTL_CONSTANT_STRING(nameW), version, window_name = {0}; - struct client_menu_name menu_name; + struct client_menu_name *menu_name; HWND hwnd, top_child = 0; MDICREATESTRUCTW mdi_cs; WNDCLASSEXW info; diff --git a/dlls/win32u/class.c b/dlls/win32u/class.c index 913bbdf03a6..b2b0887f3f9 100644 --- a/dlls/win32u/class.c +++ b/dlls/win32u/class.c @@ -54,7 +54,7 @@ typedef struct tagCLASS HICON hIconSmIntern; /* Internal small icon, derived from hIcon */ HCURSOR hCursor; /* Default cursor */ HBRUSH hbrBackground; /* Default background */ - struct client_menu_name menu_name; /* Default menu name */ + struct client_menu_name *menu_name; /* Default menu name */ const shared_object_t *shared; /* class object in session shared memory */ } CLASS; @@ -510,8 +510,7 @@ struct dce *set_class_dce( CLASS *class, struct dce *dce ) * NtUserRegisterClassExWOW (win32u.@) */ ATOM WINAPI NtUserRegisterClassExWOW( const WNDCLASSEXW *wc, UNICODE_STRING *name, UNICODE_STRING *version, - struct client_menu_name *client_menu_name, DWORD fnid, - DWORD flags, DWORD *wow ) + struct client_menu_name *menu_name, DWORD fnid, DWORD flags, DWORD *wow ) { const BOOL is_builtin = fnid, ansi = flags; const shared_object_t *shared; @@ -599,7 +598,7 @@ ATOM WINAPI NtUserRegisterClassExWOW( const WNDCLASSEXW *wc, UNICODE_STRING *nam class->hCursor = wc->hCursor; class->hbrBackground = wc->hbrBackground; class->winproc = alloc_winproc( wc->lpfnWndProc, ansi ); - if (client_menu_name) class->menu_name = *client_menu_name; + class->menu_name = menu_name; class->shared = shared; release_class_ptr( class ); return atom; @@ -615,8 +614,7 @@ failed: /*********************************************************************** * NtUserUnregisterClass (win32u.@) */ -BOOL WINAPI NtUserUnregisterClass( UNICODE_STRING *name, HINSTANCE instance, - struct client_menu_name *client_menu_name ) +BOOL WINAPI NtUserUnregisterClass( UNICODE_STRING *name, HINSTANCE instance, struct client_menu_name **menu_name ) { struct list drawables = LIST_INIT( drawables ); CLASS *class = NULL; @@ -645,7 +643,7 @@ BOOL WINAPI NtUserUnregisterClass( UNICODE_STRING *name, HINSTANCE instance, list_remove( &class->entry ); if (class->hbrBackground > (HBRUSH)(COLOR_GRADIENTINACTIVECAPTION + 1)) NtGdiDeleteObjectApp( class->hbrBackground ); - *client_menu_name = class->menu_name; + *menu_name = class->menu_name; NtUserDestroyCursor( class->hIconSmIntern, 0 ); free( class ); user_unlock(); @@ -658,7 +656,7 @@ BOOL WINAPI NtUserUnregisterClass( UNICODE_STRING *name, HINSTANCE instance, * NtUserGetClassInfo (win32u.@) */ ATOM WINAPI NtUserGetClassInfoEx( HINSTANCE instance, UNICODE_STRING *name, WNDCLASSEXW *wc, - struct client_menu_name *menu_name, BOOL ansi ) + struct client_menu_name **menu_name, BOOL ansi ) { struct object_lock lock = OBJECT_LOCK_INIT; const class_shm_t *class_shm; @@ -684,14 +682,14 @@ ATOM WINAPI NtUserGetClassInfoEx( HINSTANCE instance, UNICODE_STRING *name, WNDC wc->hIconSm = class->hIconSm ? class->hIconSm : class->hIconSmIntern; wc->hCursor = class->hCursor; wc->hbrBackground = class->hbrBackground; - wc->lpszMenuName = class->menu_name.nameW; + wc->lpszMenuName = (WCHAR *)class->menu_name; wc->lpszClassName = name->Buffer; } atom = class_shm->atom; } if (status) return 0; - if (menu_name) *menu_name = class->menu_name; + *menu_name = class->menu_name; release_class_ptr( class ); return atom; } @@ -836,14 +834,9 @@ static ULONG_PTR set_class_long_size( HWND hwnd, INT offset, LONG_PTR newval, UI switch(offset) { case GCLP_MENUNAME: - { - struct client_menu_name *menu_name = (void *)newval; - struct client_menu_name prev = class->menu_name; - class->menu_name = *menu_name; - *menu_name = prev; - retval = 0; /* Old value is now meaningless anyway */ - break; - } + retval = (ULONG_PTR)class->menu_name; + class->menu_name = (void *)newval; + break; case GCLP_WNDPROC: retval = (ULONG_PTR)get_winproc( class->winproc, ansi ); class->winproc = alloc_winproc( (WNDPROC)newval, ansi ); @@ -1065,7 +1058,7 @@ static ULONG_PTR get_class_long_size( HWND hwnd, INT offset, UINT size, BOOL ans retvalue = (ULONG_PTR)get_winproc( class->winproc, ansi ); break; case GCLP_MENUNAME: - retvalue = (ULONG_PTR)class->menu_name.nameW; + retvalue = (ULONG_PTR)class->menu_name; break; default: RtlSetLastWin32Error( ERROR_INVALID_INDEX ); @@ -1203,7 +1196,6 @@ static const struct builtin_class_descr builtin_classes[] = static void register_builtin( const struct builtin_class_descr *descr ) { UNICODE_STRING name, version = { .Length = 0 }; - struct client_menu_name menu_name = { 0 }; WCHAR nameW[64]; WNDCLASSEXW class = { .cbSize = sizeof(class), @@ -1221,7 +1213,7 @@ static void register_builtin( const struct builtin_class_descr *descr ) asciiz_to_unicode( nameW, descr->name ); RtlInitUnicodeString( &name, nameW ); - if (!NtUserRegisterClassExWOW( &class, &name, &version, &menu_name, 1, 0, NULL ) && class.hCursor) + if (!NtUserRegisterClassExWOW( &class, &name, &version, NULL, 1, 0, NULL ) && class.hCursor) NtUserDestroyCursor( class.hCursor, 0 ); } diff --git a/dlls/win32u/main.c b/dlls/win32u/main.c index 14cecf81497..b2066fba16c 100644 --- a/dlls/win32u/main.c +++ b/dlls/win32u/main.c @@ -1552,7 +1552,7 @@ BOOL SYSCALL_API NtUserGetCaretPos( POINT *pt ) } ATOM SYSCALL_API NtUserGetClassInfoEx( HINSTANCE instance, UNICODE_STRING *name, WNDCLASSEXW *wc, - struct client_menu_name *menu_name, BOOL ansi ) + struct client_menu_name **menu_name, BOOL ansi ) { SYSCALL_FUNC( NtUserGetClassInfoEx ); } @@ -2075,8 +2075,7 @@ BOOL SYSCALL_API NtUserRedrawWindow( HWND hwnd, const RECT *rect, HRGN hrgn, UIN } ATOM SYSCALL_API NtUserRegisterClassExWOW( const WNDCLASSEXW *wc, UNICODE_STRING *name, UNICODE_STRING *version, - struct client_menu_name *client_menu_name, DWORD fnid, - DWORD flags, DWORD *wow ) + struct client_menu_name *menu_name, DWORD fnid, DWORD flags, DWORD *wow ) { SYSCALL_FUNC( NtUserRegisterClassExWOW ); } @@ -2491,8 +2490,7 @@ BOOL SYSCALL_API NtUserUnhookWindowsHookEx( HHOOK handle ) SYSCALL_FUNC( NtUserUnhookWindowsHookEx ); } -BOOL SYSCALL_API NtUserUnregisterClass( UNICODE_STRING *name, HINSTANCE instance, - struct client_menu_name *client_menu_name ) +BOOL SYSCALL_API NtUserUnregisterClass( UNICODE_STRING *name, HINSTANCE instance, struct client_menu_name **menu_name ) { SYSCALL_FUNC( NtUserUnregisterClass ); } diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index 103b785591c..cd7de2710e0 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -338,13 +338,6 @@ typedef struct ULONG hIconSm; } WNDCLASSEXW32; -struct client_menu_name32 -{ - ULONG nameA; - ULONG nameW; - ULONG nameUS; -}; - struct win_proc_params32 { ULONG func; @@ -435,30 +428,6 @@ static MSG32 *msg_64to32( const MSG *msg64, MSG32 *msg32 ) return msg32; } -static struct client_menu_name *client_menu_name_32to64( struct client_menu_name *name, - const struct client_menu_name32 *name32 ) -{ - if (!name32) return NULL; - name->nameA = UlongToPtr( name32->nameA ); - name->nameW = UlongToPtr( name32->nameW ); - name->nameUS = UlongToPtr( name32->nameUS ); - return name; -} - -static struct client_menu_name32 *client_menu_name_64to32( const struct client_menu_name *name64, - struct client_menu_name32 *name32 ) -{ - if (name32) - { - struct client_menu_name32 name; - name.nameA = PtrToUlong( name64->nameA ); - name.nameW = PtrToUlong( name64->nameW ); - name.nameUS = PtrToUlong( name64->nameUS ); - memcpy( name32, &name, sizeof(name) ); - } - return name32; -} - static void win_proc_params_64to32( const struct win_proc_params *src, struct win_proc_params32 *dst ) { struct win_proc_params32 params; @@ -2371,17 +2340,17 @@ NTSTATUS WINAPI wow64_NtUserGetClassInfoEx( UINT *args ) HINSTANCE instance = get_ptr( &args ); UNICODE_STRING32 *name32 = get_ptr( &args ); WNDCLASSEXW32 *wc32 = get_ptr( &args ); - struct client_menu_name32 *client_name32 = get_ptr( &args ); + ULONG *menu_name32 = get_ptr( &args ); BOOL ansi = get_ulong( &args ); - struct client_menu_name client_name; + struct client_menu_name *menu_name; UNICODE_STRING name; WNDCLASSEXW wc; ATOM ret; wc.cbSize = sizeof(wc); if (!(ret = NtUserGetClassInfoEx( instance, unicode_str_32to64( &name, name32 ), &wc, - &client_name, ansi ))) + &menu_name, ansi ))) return 0; wc32->style = wc.style; @@ -2395,7 +2364,7 @@ NTSTATUS WINAPI wow64_NtUserGetClassInfoEx( UINT *args ) wc32->lpszMenuName = PtrToUlong( wc.lpszMenuName ); wc32->lpszClassName = PtrToUlong( wc.lpszClassName ); wc32->hIconSm = HandleToUlong( wc.hIconSm ); - client_menu_name_64to32( &client_name, client_name32 ); + *menu_name32 = PtrToUlong( menu_name ); return ret; } @@ -3075,12 +3044,11 @@ NTSTATUS WINAPI wow64_NtUserRegisterClassExWOW( UINT *args ) const WNDCLASSEXW32 *wc32 = get_ptr( &args ); UNICODE_STRING32 *name32 = get_ptr( &args ); UNICODE_STRING32 *version32 = get_ptr( &args ); - struct client_menu_name32 *client_name32 = get_ptr( &args ); + struct client_menu_name *menu_name = get_ptr( &args ); DWORD fnid = get_ulong( &args ); DWORD flags = get_ulong( &args ); DWORD *wow = get_ptr( &args ); - struct client_menu_name client_name; UNICODE_STRING name, version; WNDCLASSEXW wc; @@ -3103,11 +3071,9 @@ NTSTATUS WINAPI wow64_NtUserRegisterClassExWOW( UINT *args ) wc.lpszClassName = UlongToPtr( wc32->lpszClassName ); wc.hIconSm = LongToHandle( wc32->hIconSm ); - return NtUserRegisterClassExWOW( &wc, - unicode_str_32to64( &name, name32 ), + return NtUserRegisterClassExWOW( &wc, unicode_str_32to64( &name, name32 ), unicode_str_32to64( &version, version32 ), - client_menu_name_32to64( &client_name, client_name32 ), - fnid, flags, wow ); + menu_name, fnid, flags, wow ); } NTSTATUS WINAPI wow64_NtUserGetRegisteredRawInputDevices( UINT *args ) @@ -4292,16 +4258,6 @@ NTSTATUS WINAPI wow64_NtUserSetClassLongPtr( UINT *args ) LONG_PTR newval = get_ulong( &args ); BOOL ansi = get_ulong( &args ); - if (offset == GCLP_MENUNAME) - { - struct client_menu_name menu_name; - struct client_menu_name32 *menu_name32 = UlongToPtr( newval ); - NtUserSetClassLongPtr( hwnd, offset, - (UINT_PTR)client_menu_name_32to64( &menu_name, menu_name32 ), ansi ); - client_menu_name_64to32( &menu_name, menu_name32 ); - return 0; - } - return NtUserSetClassLongPtr( hwnd, offset, newval, ansi ); } @@ -5093,14 +5049,14 @@ NTSTATUS WINAPI wow64_NtUserUnregisterClass( UINT *args ) { UNICODE_STRING32 *name32 = get_ptr( &args ); HINSTANCE instance = get_ptr( &args ); - struct client_menu_name32 *menu_name32 = get_ptr( &args ); + ULONG *menu_name32 = get_ptr( &args ); + struct client_menu_name *menu_name; UNICODE_STRING name; - struct client_menu_name menu_name; BOOL ret; ret = NtUserUnregisterClass( unicode_str_32to64( &name, name32 ), instance, &menu_name ); - if (ret) client_menu_name_64to32( &menu_name, menu_name32 ); + if (ret) *menu_name32 = PtrToUlong( menu_name ); return ret; } diff --git a/include/ntuser.h b/include/ntuser.h index ea673524536..6a155349334 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -562,12 +562,8 @@ struct cursoricon_desc HRSRC rsrc; }; -struct client_menu_name -{ - char *nameA; - WCHAR *nameW; - UNICODE_STRING *nameUS; -}; +/* WCHAR[] unicode name, followed by char[] ansi name */ +struct client_menu_name; /* NtUserGetClipboardData params, not compatible with Windows */ struct get_clipboard_params @@ -849,7 +845,7 @@ W32KAPI ULONG WINAPI NtUserGetAtomName( ATOM atom, UNICODE_STRING *name ); W32KAPI UINT WINAPI NtUserGetCaretBlinkTime(void); W32KAPI BOOL WINAPI NtUserGetCaretPos( POINT *point ); W32KAPI ATOM WINAPI NtUserGetClassInfoEx( HINSTANCE instance, UNICODE_STRING *name, WNDCLASSEXW *wc, - struct client_menu_name *menu_name, BOOL ansi ); + struct client_menu_name **menu_name, BOOL ansi ); W32KAPI INT WINAPI NtUserGetClassName( HWND hwnd, BOOL real, UNICODE_STRING *name ); W32KAPI BOOL WINAPI NtUserGetClipCursor( RECT *rect ); W32KAPI HANDLE WINAPI NtUserGetClipboardData( UINT format, struct get_clipboard_params *params ); @@ -964,8 +960,7 @@ W32KAPI HWND WINAPI NtUserRealChildWindowFromPoint( HWND parent, LONG x, LONG W32KAPI UINT WINAPI NtUserRealizePalette( HDC hdc ); W32KAPI BOOL WINAPI NtUserRedrawWindow( HWND hwnd, const RECT *rect, HRGN hrgn, UINT flags ); W32KAPI ATOM WINAPI NtUserRegisterClassExWOW( const WNDCLASSEXW *wc, UNICODE_STRING *name, UNICODE_STRING *version, - struct client_menu_name *client_menu_name, DWORD fnid, DWORD flags, - DWORD *wow ); + struct client_menu_name *menu_name, DWORD fnid, DWORD flags, DWORD *wow ); W32KAPI BOOL WINAPI NtUserRegisterHotKey( HWND hwnd, INT id, UINT modifiers, UINT vk ); W32KAPI BOOL WINAPI NtUserRegisterRawInputDevices( const RAWINPUTDEVICE *devices, UINT device_count, UINT size ); W32KAPI BOOL WINAPI NtUserRegisterTouchPadCapable( BOOL capable ); @@ -1055,8 +1050,7 @@ W32KAPI BOOL WINAPI NtUserTranslateMessage( const MSG *msg, UINT flags ); W32KAPI BOOL WINAPI NtUserUnhookWinEvent( HWINEVENTHOOK hEventHook ); W32KAPI BOOL WINAPI NtUserUnhookWindowsHook( INT id, HOOKPROC proc ); W32KAPI BOOL WINAPI NtUserUnhookWindowsHookEx( HHOOK handle ); -W32KAPI BOOL WINAPI NtUserUnregisterClass( UNICODE_STRING *name, HINSTANCE instance, - struct client_menu_name *client_menu_name ); +W32KAPI BOOL WINAPI NtUserUnregisterClass( UNICODE_STRING *name, HINSTANCE instance, struct client_menu_name **menu_name ); W32KAPI BOOL WINAPI NtUserUnregisterHotKey( HWND hwnd, INT id ); W32KAPI BOOL WINAPI NtUserUpdateInputContext( HIMC handle, UINT attr, UINT_PTR value ); W32KAPI BOOL WINAPI NtUserUpdateLayeredWindow( HWND hwnd, HDC hdc_dst, const POINT *pts_dst, const SIZE *size, -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/10910
participants (2)
-
Rémi Bernon -
Rémi Bernon (＠rbernon)