user32: Fix names returned with GetClassName().
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
parent
600d6b0199
commit
a21b16d8cb
|
@ -61,6 +61,7 @@ typedef struct tagCLASS
|
||||||
HBRUSH hbrBackground; /* Default background */
|
HBRUSH hbrBackground; /* Default background */
|
||||||
ATOM atomName; /* Name of the class */
|
ATOM atomName; /* Name of the class */
|
||||||
WCHAR name[MAX_ATOM_LEN + 1];
|
WCHAR name[MAX_ATOM_LEN + 1];
|
||||||
|
WCHAR *basename; /* Base name for redirected classes, pointer within 'name'. */
|
||||||
} CLASS;
|
} CLASS;
|
||||||
|
|
||||||
static struct list class_list = LIST_INIT( class_list );
|
static struct list class_list = LIST_INIT( class_list );
|
||||||
|
@ -324,7 +325,7 @@ static void CLASS_FreeClass( CLASS *classPtr )
|
||||||
USER_Unlock();
|
USER_Unlock();
|
||||||
}
|
}
|
||||||
|
|
||||||
const WCHAR *CLASS_GetVersionedName( const WCHAR *name )
|
const WCHAR *CLASS_GetVersionedName( const WCHAR *name, UINT *basename_offset )
|
||||||
{
|
{
|
||||||
ACTCTX_SECTION_KEYED_DATA data;
|
ACTCTX_SECTION_KEYED_DATA data;
|
||||||
struct wndclass_redirect_data
|
struct wndclass_redirect_data
|
||||||
|
@ -337,6 +338,9 @@ const WCHAR *CLASS_GetVersionedName( const WCHAR *name )
|
||||||
ULONG module_offset;
|
ULONG module_offset;
|
||||||
} *wndclass;
|
} *wndclass;
|
||||||
|
|
||||||
|
if (basename_offset)
|
||||||
|
*basename_offset = 0;
|
||||||
|
|
||||||
if (IS_INTRESOURCE( name ))
|
if (IS_INTRESOURCE( name ))
|
||||||
return name;
|
return name;
|
||||||
|
|
||||||
|
@ -348,6 +352,9 @@ const WCHAR *CLASS_GetVersionedName( const WCHAR *name )
|
||||||
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);
|
||||||
|
|
||||||
return (const WCHAR *)((BYTE *)wndclass + wndclass->name_offset);
|
return (const WCHAR *)((BYTE *)wndclass + wndclass->name_offset);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -366,7 +373,7 @@ static CLASS *CLASS_FindClass( LPCWSTR name, HINSTANCE hinstance )
|
||||||
|
|
||||||
if (!name) return NULL;
|
if (!name) return NULL;
|
||||||
|
|
||||||
name = CLASS_GetVersionedName( name );
|
name = CLASS_GetVersionedName( name, NULL );
|
||||||
|
|
||||||
for (;;)
|
for (;;)
|
||||||
{
|
{
|
||||||
|
@ -408,7 +415,7 @@ static CLASS *CLASS_FindClass( LPCWSTR name, HINSTANCE hinstance )
|
||||||
*
|
*
|
||||||
* The real RegisterClass() functionality.
|
* The real RegisterClass() functionality.
|
||||||
*/
|
*/
|
||||||
static CLASS *CLASS_RegisterClass( LPCWSTR name, HINSTANCE hInstance, BOOL local,
|
static CLASS *CLASS_RegisterClass( LPCWSTR name, UINT basename_offset, HINSTANCE hInstance, BOOL local,
|
||||||
DWORD style, INT classExtra, INT winExtra )
|
DWORD style, INT classExtra, INT winExtra )
|
||||||
{
|
{
|
||||||
CLASS *classPtr;
|
CLASS *classPtr;
|
||||||
|
@ -428,7 +435,12 @@ static CLASS *CLASS_RegisterClass( LPCWSTR name, HINSTANCE hInstance, BOOL local
|
||||||
if (!classPtr) return NULL;
|
if (!classPtr) return NULL;
|
||||||
|
|
||||||
classPtr->atomName = get_int_atom_value( name );
|
classPtr->atomName = get_int_atom_value( name );
|
||||||
if (!classPtr->atomName && name) strcpyW( classPtr->name, name );
|
classPtr->basename = classPtr->name;
|
||||||
|
if (!classPtr->atomName && name)
|
||||||
|
{
|
||||||
|
strcpyW( classPtr->name, name );
|
||||||
|
classPtr->basename += basename_offset;
|
||||||
|
}
|
||||||
else GlobalGetAtomNameW( classPtr->atomName, classPtr->name, sizeof(classPtr->name)/sizeof(WCHAR) );
|
else GlobalGetAtomNameW( classPtr->atomName, classPtr->name, sizeof(classPtr->name)/sizeof(WCHAR) );
|
||||||
|
|
||||||
SERVER_START_REQ( create_class )
|
SERVER_START_REQ( create_class )
|
||||||
|
@ -476,7 +488,7 @@ static void register_builtin( const struct builtin_class_descr *descr )
|
||||||
{
|
{
|
||||||
CLASS *classPtr;
|
CLASS *classPtr;
|
||||||
|
|
||||||
if (!(classPtr = CLASS_RegisterClass( descr->name, user32_module, FALSE,
|
if (!(classPtr = CLASS_RegisterClass( descr->name, 0, user32_module, FALSE,
|
||||||
descr->style, 0, descr->extra ))) return;
|
descr->style, 0, descr->extra ))) return;
|
||||||
|
|
||||||
if (descr->cursor) classPtr->hCursor = LoadCursorA( 0, (LPSTR)descr->cursor );
|
if (descr->cursor) classPtr->hCursor = LoadCursorA( 0, (LPSTR)descr->cursor );
|
||||||
|
@ -632,14 +644,15 @@ ATOM WINAPI RegisterClassExA( const WNDCLASSEXA* wc )
|
||||||
|
|
||||||
if (!IS_INTRESOURCE(wc->lpszClassName))
|
if (!IS_INTRESOURCE(wc->lpszClassName))
|
||||||
{
|
{
|
||||||
|
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 );
|
classname = CLASS_GetVersionedName( name, &basename_offset );
|
||||||
classPtr = CLASS_RegisterClass( classname, 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 );
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
classPtr = CLASS_RegisterClass( (LPCWSTR)wc->lpszClassName, instance,
|
classPtr = CLASS_RegisterClass( (LPCWSTR)wc->lpszClassName, 0, instance,
|
||||||
!(wc->style & CS_GLOBALCLASS), wc->style,
|
!(wc->style & CS_GLOBALCLASS), wc->style,
|
||||||
wc->cbClsExtra, wc->cbWndExtra );
|
wc->cbClsExtra, wc->cbWndExtra );
|
||||||
}
|
}
|
||||||
|
@ -672,6 +685,7 @@ ATOM WINAPI RegisterClassExA( const WNDCLASSEXA* wc )
|
||||||
ATOM WINAPI RegisterClassExW( const WNDCLASSEXW* wc )
|
ATOM WINAPI RegisterClassExW( const WNDCLASSEXW* wc )
|
||||||
{
|
{
|
||||||
const WCHAR *classname;
|
const WCHAR *classname;
|
||||||
|
UINT basename_offset;
|
||||||
ATOM atom;
|
ATOM atom;
|
||||||
CLASS *classPtr;
|
CLASS *classPtr;
|
||||||
HINSTANCE instance;
|
HINSTANCE instance;
|
||||||
|
@ -686,8 +700,8 @@ 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 );
|
classname = CLASS_GetVersionedName( wc->lpszClassName, &basename_offset );
|
||||||
if (!(classPtr = CLASS_RegisterClass( classname, 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;
|
||||||
|
|
||||||
|
@ -739,7 +753,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 );
|
className = CLASS_GetVersionedName( className, NULL );
|
||||||
SERVER_START_REQ( destroy_class )
|
SERVER_START_REQ( destroy_class )
|
||||||
{
|
{
|
||||||
req->instance = wine_server_client_ptr( hInstance );
|
req->instance = wine_server_client_ptr( hInstance );
|
||||||
|
@ -1155,7 +1169,8 @@ INT WINAPI GetClassNameW( HWND hwnd, LPWSTR buffer, INT count )
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
lstrcpynW( buffer, class->name, count );
|
/* Return original name class was registered with. */
|
||||||
|
lstrcpynW( buffer, class->basename, count );
|
||||||
release_class_ptr( class );
|
release_class_ptr( class );
|
||||||
ret = strlenW( buffer );
|
ret = strlenW( buffer );
|
||||||
}
|
}
|
||||||
|
|
|
@ -1250,7 +1250,6 @@ static void test_actctx_classes(void)
|
||||||
|
|
||||||
ret = GetClassNameA(hwnd, buff, sizeof(buff));
|
ret = GetClassNameA(hwnd, buff, sizeof(buff));
|
||||||
ok(ret, "Failed to get class name.\n");
|
ok(ret, "Failed to get class name.\n");
|
||||||
todo_wine
|
|
||||||
ok(!strcmp(buff, testclass), "Unexpected class name.\n");
|
ok(!strcmp(buff, testclass), "Unexpected class name.\n");
|
||||||
|
|
||||||
ret = GetClassInfoA(hinst, "4.3.2.1!MyTestClass", &wc);
|
ret = GetClassInfoA(hinst, "4.3.2.1!MyTestClass", &wc);
|
||||||
|
@ -1270,7 +1269,6 @@ todo_wine
|
||||||
|
|
||||||
ret = GetClassNameA(hwnd, buff, sizeof(buff));
|
ret = GetClassNameA(hwnd, buff, sizeof(buff));
|
||||||
ok(ret, "Failed to get class name.\n");
|
ok(ret, "Failed to get class name.\n");
|
||||||
todo_wine
|
|
||||||
ok(!strcmp(buff, testclass), "Unexpected class name.\n");
|
ok(!strcmp(buff, testclass), "Unexpected class name.\n");
|
||||||
|
|
||||||
DestroyWindow(hwnd);
|
DestroyWindow(hwnd);
|
||||||
|
|
|
@ -269,7 +269,7 @@ extern INT_PTR WINPROC_CallDlgProcW( DLGPROC func, HWND hwnd, UINT msg, WPARAM w
|
||||||
extern BOOL WINPROC_call_window( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam,
|
extern BOOL WINPROC_call_window( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam,
|
||||||
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) DECLSPEC_HIDDEN;
|
extern const WCHAR *CLASS_GetVersionedName(const WCHAR *classname, UINT *basename_offset) DECLSPEC_HIDDEN;
|
||||||
|
|
||||||
/* message spy definitions */
|
/* message spy definitions */
|
||||||
|
|
||||||
|
|
|
@ -1338,7 +1338,7 @@ HWND WIN_CreateWindowEx( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE module,
|
||||||
CBT_CREATEWNDW cbtc;
|
CBT_CREATEWNDW cbtc;
|
||||||
CREATESTRUCTW cbcs;
|
CREATESTRUCTW cbcs;
|
||||||
|
|
||||||
className = CLASS_GetVersionedName(className);
|
className = CLASS_GetVersionedName(className, NULL);
|
||||||
|
|
||||||
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),
|
||||||
|
|
Loading…
Reference in New Issue