From fb4441df73dc0a1974515aa98831fdda3250dab6 Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Thu, 12 Dec 2013 12:05:36 +0100 Subject: [PATCH] user32: Don't check for comctl32 class for integer atoms. --- dlls/user32/class.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/user32/class.c b/dlls/user32/class.c index 349aedf6abc..d40d22e1cd2 100644 --- a/dlls/user32/class.c +++ b/dlls/user32/class.c @@ -311,6 +311,8 @@ static CLASS *CLASS_FindClass( LPCWSTR name, HINSTANCE hinstance ) GetDesktopWindow(); /* create the desktop window to trigger builtin class registration */ + if (!name) return NULL; + for (;;) { USER_Lock(); @@ -324,7 +326,7 @@ static CLASS *CLASS_FindClass( LPCWSTR name, HINSTANCE hinstance ) } else { - if (!name || strcmpiW( class->name, name )) continue; + if (strcmpiW( class->name, name )) continue; } if (!class->local || class->hInstance == hinstance) { @@ -334,6 +336,7 @@ static CLASS *CLASS_FindClass( LPCWSTR name, HINSTANCE hinstance ) } USER_Unlock(); + if (atom) break; if (!is_comctl32_class( name )) break; if (GetModuleHandleW( comctl32W )) break; if (!LoadLibraryW( comctl32W )) break;