ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

user32: When registering redirected class use correct base class name. 

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45689
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Nikolay Sivov 2018-08-27 09:14:11 +03:00 committed by Alexandre Julliard
parent 3178d059c6
commit 78236592df
3 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
dlls/user32/class.c
View File

@ -320,7 +320,7 @@ static void CLASS_FreeClass( CLASS *classPtr )
USER_Unlock(); USER_Unlock();
} }
const WCHAR *CLASS_GetVersionedName( const WCHAR *name, UINT *basename_offset, BOOL register_class ) const WCHAR *CLASS_GetVersionedName( const WCHAR *name, UINT *basename_offset, WCHAR *combined, BOOL register_class )
{ {
ACTCTX_SECTION_KEYED_DATA data; ACTCTX_SECTION_KEYED_DATA data;
struct wndclass_redirect_data struct wndclass_redirect_data
@ -335,9 +335,12 @@ const WCHAR *CLASS_GetVersionedName( const WCHAR *name, UINT *basename_offset, B
const WCHAR *module, *ret; const WCHAR *module, *ret;
UNICODE_STRING name_us; UNICODE_STRING name_us;
HMODULE hmod; HMODULE hmod;
UINT offset;
if (basename_offset) if (!basename_offset)
*basename_offset = 0; basename_offset = &offset;
*basename_offset = 0;
if (IS_INTRESOURCE( name )) if (IS_INTRESOURCE( name ))
return name; return name;
@ -352,14 +355,21 @@ const WCHAR *CLASS_GetVersionedName( const WCHAR *name, UINT *basename_offset, B
return name; return name;
wndclass = (struct wndclass_redirect_data *)data.lpData; wndclass = (struct wndclass_redirect_data *)data.lpData;
if (basename_offset) *basename_offset = wndclass->name_len / sizeof(WCHAR) - strlenW(name);
*basename_offset = wndclass->name_len / sizeof(WCHAR) - strlenW(name);
module = (const WCHAR *)((BYTE *)data.lpSectionBase + wndclass->module_offset); module = (const WCHAR *)((BYTE *)data.lpSectionBase + wndclass->module_offset);
if (!(hmod = GetModuleHandleW( module ))) if (!(hmod = GetModuleHandleW( module )))
hmod = LoadLibraryW( module ); hmod = LoadLibraryW( module );
/* Combined name is used to register versioned class name. Base name part will match exactly
original class name and won't be reused from context data. */
ret = (const WCHAR *)((BYTE *)wndclass + wndclass->name_offset); ret = (const WCHAR *)((BYTE *)wndclass + wndclass->name_offset);
if (combined)
{
memcpy(combined, ret, *basename_offset * sizeof(WCHAR));
strcpyW(&combined[*basename_offset], name);
ret = combined;
}
if (register_class && hmod) if (register_class && hmod)
{ {
@ -409,7 +419,7 @@ static CLASS *CLASS_FindClass( LPCWSTR name, HINSTANCE hinstance )
if (!name) return NULL; if (!name) return NULL;
name = CLASS_GetVersionedName( name, NULL, TRUE ); name = CLASS_GetVersionedName( name, NULL, NULL, TRUE );
for (;;) for (;;)
{ {
@ -662,8 +672,8 @@ ATOM WINAPI RegisterClassW( const WNDCLASSW* wc )
*/ */
ATOM WINAPI RegisterClassExA( const WNDCLASSEXA* wc ) ATOM WINAPI RegisterClassExA( const WNDCLASSEXA* wc )
{ {
WCHAR name[MAX_ATOM_LEN + 1], combined[MAX_ATOM_LEN + 1];
const WCHAR *classname = NULL; const WCHAR *classname = NULL;
WCHAR name[MAX_ATOM_LEN + 1];
ATOM atom; ATOM atom;
CLASS *classPtr; CLASS *classPtr;
HINSTANCE instance; HINSTANCE instance;
@ -682,7 +692,7 @@ ATOM WINAPI RegisterClassExA( const WNDCLASSEXA* wc )
{ {
UINT basename_offset; UINT basename_offset;
if (!MultiByteToWideChar( CP_ACP, 0, wc->lpszClassName, -1, name, MAX_ATOM_LEN + 1 )) return 0; if (!MultiByteToWideChar( CP_ACP, 0, wc->lpszClassName, -1, name, MAX_ATOM_LEN + 1 )) return 0;
classname = CLASS_GetVersionedName( name, &basename_offset, FALSE ); classname = CLASS_GetVersionedName( name, &basename_offset, combined, FALSE );
classPtr = CLASS_RegisterClass( classname, basename_offset, instance, !(wc->style & CS_GLOBALCLASS), classPtr = CLASS_RegisterClass( classname, basename_offset, instance, !(wc->style & CS_GLOBALCLASS),
wc->style, wc->cbClsExtra, wc->cbWndExtra ); wc->style, wc->cbClsExtra, wc->cbWndExtra );
} }
@ -720,6 +730,7 @@ ATOM WINAPI RegisterClassExA( const WNDCLASSEXA* wc )
*/ */
ATOM WINAPI RegisterClassExW( const WNDCLASSEXW* wc ) ATOM WINAPI RegisterClassExW( const WNDCLASSEXW* wc )
{ {
WCHAR name[MAX_ATOM_LEN + 1];
const WCHAR *classname; const WCHAR *classname;
UINT basename_offset; UINT basename_offset;
ATOM atom; ATOM atom;
@ -736,7 +747,7 @@ ATOM WINAPI RegisterClassExW( const WNDCLASSEXW* wc )
} }
if (!(instance = wc->hInstance)) instance = GetModuleHandleW( NULL ); if (!(instance = wc->hInstance)) instance = GetModuleHandleW( NULL );
classname = CLASS_GetVersionedName( wc->lpszClassName, &basename_offset, FALSE ); classname = CLASS_GetVersionedName( wc->lpszClassName, &basename_offset, name, FALSE );
if (!(classPtr = CLASS_RegisterClass( classname, basename_offset, instance, !(wc->style & CS_GLOBALCLASS), if (!(classPtr = CLASS_RegisterClass( classname, basename_offset, instance, !(wc->style & CS_GLOBALCLASS),
wc->style, wc->cbClsExtra, wc->cbWndExtra ))) wc->style, wc->cbClsExtra, wc->cbWndExtra )))
return 0; return 0;
@ -789,7 +800,7 @@ BOOL WINAPI UnregisterClassW( LPCWSTR className, HINSTANCE hInstance )
GetDesktopWindow(); /* create the desktop window to trigger builtin class registration */ GetDesktopWindow(); /* create the desktop window to trigger builtin class registration */
className = CLASS_GetVersionedName( className, NULL, FALSE ); className = CLASS_GetVersionedName( className, NULL, NULL, FALSE );
SERVER_START_REQ( destroy_class ) SERVER_START_REQ( destroy_class )
{ {
req->instance = wine_server_client_ptr( hInstance ); req->instance = wine_server_client_ptr( hInstance );

2
dlls/user32/user_private.h
View File

@ -273,7 +273,7 @@ extern BOOL WINPROC_call_window( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPar
LRESULT *result, BOOL unicode, enum wm_char_mapping mapping ) DECLSPEC_HIDDEN; LRESULT *result, BOOL unicode, enum wm_char_mapping mapping ) DECLSPEC_HIDDEN;
extern const WCHAR *CLASS_GetVersionedName(const WCHAR *classname, UINT *basename_offset, extern const WCHAR *CLASS_GetVersionedName(const WCHAR *classname, UINT *basename_offset,
BOOL register_class) DECLSPEC_HIDDEN; WCHAR *combined, BOOL register_class) DECLSPEC_HIDDEN;
/* message spy definitions */ /* message spy definitions */

2
dlls/user32/win.c
View File

@ -1349,7 +1349,7 @@ HWND WIN_CreateWindowEx( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE module,
CBT_CREATEWNDW cbtc; CBT_CREATEWNDW cbtc;
CREATESTRUCTW cbcs; CREATESTRUCTW cbcs;
className = CLASS_GetVersionedName(className, NULL, TRUE); className = CLASS_GetVersionedName(className, NULL, NULL, TRUE);
TRACE("%s %s%s%s ex=%08x style=%08x %d,%d %dx%d parent=%p menu=%p inst=%p params=%p\n", TRACE("%s %s%s%s ex=%08x style=%08x %d,%d %dx%d parent=%p menu=%p inst=%p params=%p\n",
unicode ? debugstr_w(cs->lpszName) : debugstr_a((LPCSTR)cs->lpszName), unicode ? debugstr_w(cs->lpszName) : debugstr_a((LPCSTR)cs->lpszName),