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

user32: Properly handle integer atoms specified as strings in class names.

This commit is contained in:
Alexandre Julliard 2007-11-02 11:42:53 +01:00
parent b9b940fab9
commit 1ee62a8d72
1 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
dlls/user32/class.c
View File

@ -96,6 +96,25 @@ static inline void release_class_ptr( CLASS *ptr )
} }
/***********************************************************************
* get_int_atom_value
*/
static ATOM get_int_atom_value( LPCWSTR name )
{
UINT ret = 0;
if (IS_INTRESOURCE(name)) return LOWORD(name);
if (*name++ != '#') return 0;
while (*name)
{
if (*name < '0' || *name > '9') return 0;
ret = ret * 10 + *name++ - '0';
if (ret > 0xffff) return 0;
}
return ret;
}
/*********************************************************************** /***********************************************************************
* set_server_info * set_server_info
* *
@ -328,8 +347,8 @@ static CLASS *CLASS_RegisterClass( LPCWSTR name, HINSTANCE hInstance, BOOL local
req->extra = classExtra; req->extra = classExtra;
req->win_extra = winExtra; req->win_extra = winExtra;
req->client_ptr = classPtr; req->client_ptr = classPtr;
if (IS_INTRESOURCE(name)) req->atom = LOWORD(name); if (!(req->atom = get_int_atom_value(name)) && name)
else wine_server_add_data( req, name, strlenW(name) * sizeof(WCHAR) ); wine_server_add_data( req, name, strlenW(name) * sizeof(WCHAR) );
ret = !wine_server_call_err( req ); ret = !wine_server_call_err( req );
classPtr->atomName = reply->atom; classPtr->atomName = reply->atom;
} }
@ -596,8 +615,8 @@ BOOL WINAPI UnregisterClassW( LPCWSTR className, HINSTANCE hInstance )
SERVER_START_REQ( destroy_class ) SERVER_START_REQ( destroy_class )
{ {
req->instance = hInstance; req->instance = hInstance;
if (IS_INTRESOURCE(className)) req->atom = LOWORD(className); if (!(req->atom = get_int_atom_value(className)) && className)
else wine_server_add_data( req, className, strlenW(className)*sizeof(WCHAR) ); wine_server_add_data( req, className, strlenW(className) * sizeof(WCHAR) );
if (!wine_server_call_err( req )) classPtr = reply->client_ptr; if (!wine_server_call_err( req )) classPtr = reply->client_ptr;
} }
SERVER_END_REQ; SERVER_END_REQ;