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

GetClassInfo should return global classes even if the hInstance

Browse Source 
parameter is different from the one passed to the RegisterClass
function.
This commit is contained in:
Noomen Hamza 2000-07-09 12:21:07 +00:00 committed by Alexandre Julliard
parent dcb9733580
commit 1040eaf747
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
windows/class.c
View File

@ -1159,11 +1159,12 @@ BOOL WINAPI GetClassInfoA( HINSTANCE hInstance, LPCSTR name,
if (!(atom=GlobalFindAtomA(name)) || !(classPtr=CLASS_FindClassByAtom(atom,hInstance))) if (!(atom=GlobalFindAtomA(name)) || !(classPtr=CLASS_FindClassByAtom(atom,hInstance)))
return FALSE; return FALSE;
if (classPtr->hInstance && (hInstance != classPtr->hInstance)) if (!(classPtr->style & CS_GLOBALCLASS) &&
classPtr->hInstance &&
(hInstance != classPtr->hInstance))
{ {
if (hInstance) return FALSE; if (hInstance) return FALSE;
else WARN("systemclass %s (hInst=0) demanded but only class with hInst!=0 found\n",name);
WARN("systemclass %s (hInst=0) demanded but only class with hInst!=0 found\n",name);
} }
wc->style = classPtr->style; wc->style = classPtr->style;
@ -1171,7 +1172,7 @@ BOOL WINAPI GetClassInfoA( HINSTANCE hInstance, LPCSTR name,
WIN_PROC_32A ); WIN_PROC_32A );
wc->cbClsExtra = classPtr->cbClsExtra; wc->cbClsExtra = classPtr->cbClsExtra;
wc->cbWndExtra = classPtr->cbWndExtra; wc->cbWndExtra = classPtr->cbWndExtra;
wc->hInstance = classPtr->hInstance; wc->hInstance = hInstance;
wc->hIcon = (HICON)classPtr->hIcon; wc->hIcon = (HICON)classPtr->hIcon;
wc->hCursor = (HCURSOR)classPtr->hCursor; wc->hCursor = (HCURSOR)classPtr->hCursor;
wc->hbrBackground = (HBRUSH)classPtr->hbrBackground; wc->hbrBackground = (HBRUSH)classPtr->hbrBackground;
@ -1197,18 +1198,19 @@ BOOL WINAPI GetClassInfoW( HINSTANCE hInstance, LPCWSTR name,
) )
return FALSE; return FALSE;
if (classPtr->hInstance && (hInstance != classPtr->hInstance)) { if (!(classPtr->style & CS_GLOBALCLASS) &&
if (hInstance) classPtr->hInstance &&
return FALSE; (hInstance != classPtr->hInstance))
else {
WARN("systemclass %s (hInst=0) demanded but only class with hInst!=0 found\n",debugstr_w(name)); if (hInstance) return FALSE;
WARN("systemclass %s (hInst=0) demanded but only class with hInst!=0 found\n",debugstr_w(name));
} }
wc->style = classPtr->style; wc->style = classPtr->style;
wc->lpfnWndProc = (WNDPROC)WINPROC_GetProc( classPtr->winproc, wc->lpfnWndProc = (WNDPROC)WINPROC_GetProc( classPtr->winproc,
WIN_PROC_32W ); WIN_PROC_32W );
wc->cbClsExtra = classPtr->cbClsExtra; wc->cbClsExtra = classPtr->cbClsExtra;
wc->cbWndExtra = classPtr->cbWndExtra; wc->cbWndExtra = classPtr->cbWndExtra;
wc->hInstance = classPtr->hInstance; wc->hInstance = hInstance;
wc->hIcon = (HICON)classPtr->hIcon; wc->hIcon = (HICON)classPtr->hIcon;
wc->hCursor = (HCURSOR)classPtr->hCursor; wc->hCursor = (HCURSOR)classPtr->hCursor;
wc->hbrBackground = (HBRUSH)classPtr->hbrBackground; wc->hbrBackground = (HBRUSH)classPtr->hbrBackground;