Changeset 1394

Timestamp:

Oct 21, 1999, 9:23:51 PM (26 years ago)

Author:

sandervl

Message:

class lookup fix

File:

• trunk/src/user32/win32class.cpp (modified) (3 diffs)

trunk/src/user32/win32class.cpp ¶

@@ -1 @@
-/* $Id: win32class.cpp,v 1.1 1999-09-15 23:19:00 sandervl Exp $ */
+/* $Id: win32class.cpp,v 1.2 1999-10-21 19:23:51 sandervl Exp $ */
 /*
  * Win32 Window Class Managment Code for OS/2
@@ -121 +121 @@
 {
   if(HIWORD(classname) == 0) {
-        return classAtom == (DWORD)classname;
+    return classAtom == (DWORD)classname;
   }
   if(fUnicode) {
-        return (lstrcmpW(classNameW, (LPWSTR)classname) == 0);
-  }
-  else  return (strcmp(classNameA, classname) == 0);
+    return (lstrcmpW(classNameW, (LPWSTR)classname) == 0);
+  }
+  else  return (strcmp(classNameA, classname) == 0);
 }
 //******************************************************************************
@@ -150 +150 @@
                 wndclass = (Win32WndClass *)wndclass->GetNext();
                 while(wndclass != NULL) {
-                        if(stricmp(wndclass->classNameA, id) == 0 && wndclass->hInstance == hInstance) {
-                                leaveMutex(OBJTYPE_CLASS);
-                                return(wndclass);
+                        if(stricmp(wndclass->classNameA, id) == 0)
+                        {
+                                //SvL: According to Wine, if the instance handle is the one of the main exe, everything is ok
+                                if(hInstance == NULL || GetModuleHandleA(NULL) == hInstance ||
+                                   wndclass->hInstance == hInstance)
+                                {
+                                    leaveMutex(OBJTYPE_CLASS);
+                                    return(wndclass);
+                                }
                         }
                         wndclass = (Win32WndClass *)wndclass->GetNext();