Changeset 372 for trunk/src/user32/new/win32class.cpp

Timestamp:

Jul 23, 1999, 5:55:46 PM (26 years ago)

Author:

cbratschi

Message:

atom updates

File:

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

trunk/src/user32/new/win32class.cpp

@@ -1 @@
-/* $Id: win32class.cpp,v 1.4 1999-07-15 18:54:55 sandervl Exp $ */
+/* $Id: win32class.cpp,v 1.5 1999-07-23 15:55:46 cbratschi Exp $ */
 /*
  * Win32 Window Class Managment Code for OS/2
@@ -106 +106 @@
 Win32WndClass::~Win32WndClass()
 {
+  if (classNameA) GlobalDeleteAtom(classAtom);
   if(userClassLong)     free(userClassLong);
   if(classNameA)        free(classNameA);
@@ -124 +125 @@
 
   if(HIWORD(id) != 0) {
+//CB: read comment below!
         if(stricmp(wndclass->classNameA, id) == 0 && wndclass->hInstance == hInstance) {
                 return(wndclass);
@@ -138 +140 @@
   }
   else {
-        if(wndclass->classAtom == (DWORD)id && wndclass->hInstance == hInstance) {
+//CB: without HInstance check, test program finds class
+//CB: need more code to compare instance; convert 0 to exe module handle
+        if(wndclass->classAtom == (DWORD)id /*&& wndclass->hInstance == hInstance*/) {
                 return(wndclass);
         }
@@ -144 +148 @@
                 wndclass = (Win32WndClass *)wndclass->GetNext();
                 while(wndclass != NULL) {
-                        if(wndclass->classAtom == (DWORD)id && wndclass->hInstance == hInstance) {
+                        if(wndclass->classAtom == (DWORD)id/* && wndclass->hInstance == hInstance*/) {
                                 return(wndclass);
                         }