Changeset 5935 for trunk/src/user32/win32class.cpp

Timestamp:

Jun 9, 2001, 4:50:26 PM (24 years ago)

Author:

sandervl

Message:

reference count (window + class objects) rewrite

File:

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

trunk/src/user32/win32class.cpp

@@ -1 @@
-/* $Id: win32class.cpp,v 1.24 2001-04-04 09:01:25 sandervl Exp $ */
+/* $Id: win32class.cpp,v 1.25 2001-06-09 14:50:20 sandervl Exp $ */
 /*
  * Win32 Window Class Managment Code for OS/2
@@ -10 +10 @@
  *       Must all be changed if we want to support global app classes
  *       that can be used by other apps. (low priority)
+ *
+ * NOTE: To access a class object, you must call FindClass. This method 
+ *       increases the reference count of the object. When you're done 
+ *       with the object, you MUST call the release method!
+ *       This mechanism prevents premature destruction of objects when there
+ *       are still clients using it.
  *
  * Project Odin Software License can be found in LICENSE.TXT
@@ -34 +40 @@
 //Win32WndClass methods:
 //******************************************************************************
-Win32WndClass::Win32WndClass(WNDCLASSEXA *wndclass, BOOL fUnicode) : GenericObject(&wndclasses, OBJTYPE_CLASS)
+Win32WndClass::Win32WndClass(WNDCLASSEXA *wndclass, BOOL fUnicode) 
+                  : GenericObject(&wndclasses, &critsect)
 {
   isUnicode = fUnicode;
@@ -134 +141 @@
   else  userClassBytes = NULL;
 
-  cWindows = 0;
   hIconSm  = wndclass->hIconSm;
 }
@@ -142 +148 @@
 {
   if(classNameA) {
-    dprintf(("Win32WndClass dtor, destroy class %s\n", classNameA));
+      dprintf(("Win32WndClass dtor, destroy class %s\n", classNameA));
   }
 
   //SvL: Don't delete global classes
   if(classNameA && !(windowStyle & CS_GLOBALCLASS)) {
-    GlobalDeleteAtom(classAtom);
+      GlobalDeleteAtom(classAtom);
   }
 
@@ -156 +162 @@
   if(classNameW)        free(classNameW);
   if(menuNameA && HIWORD(menuNameA)) {
-        free(menuNameA);
-        assert(menuNameW);
-        free(menuNameW);
+      free(menuNameA);
+      assert(menuNameW);
+      free(menuNameW);
   }
 }
@@ -187 +193 @@
 }
 //******************************************************************************
+//Locates class in linked list and increases reference count (if found)
+//Class object must be unreferenced after usage
 //******************************************************************************
 Win32WndClass *Win32WndClass::FindClass(HINSTANCE hInstance, LPSTR id)
 {
-  enterMutex(OBJTYPE_CLASS);
+  lock(&critsect);
 
   Win32WndClass *wndclass = (Win32WndClass *)wndclasses;
 
   if(wndclass == NULL) {
-        leaveMutex(OBJTYPE_CLASS);
+        unlock(&critsect);
         return(NULL);
   }
@@ -202 +210 @@
 //CB: read comment below!
         if(lstrcmpiA(wndclass->classNameA, id) == 0 && wndclass->hInstance == hInstance) {
-                leaveMutex(OBJTYPE_CLASS);
+                wndclass->addRef();
+                unlock(&critsect);
                 return(wndclass);
         }
@@ -214 +223 @@
                                    wndclass->hInstance == hInstance)
                                 {
-                                    leaveMutex(OBJTYPE_CLASS);
+                                    wndclass->addRef();
+                                    unlock(&critsect);
                                     return(wndclass);
                                 }
@@ -226 +236 @@
 //CB: need more code to compare instance; convert 0 to exe module handle
         if(wndclass->classAtom == (DWORD)id /*&& wndclass->hInstance == hInstance*/) {
-                leaveMutex(OBJTYPE_CLASS);
+                wndclass->addRef();
+                unlock(&critsect);
                 return(wndclass);
         }
@@ -233 +244 @@
                 while(wndclass != NULL) {
                         if(wndclass->classAtom == (DWORD)id /* && wndclass->hInstance == hInstance*/) {
-                                leaveMutex(OBJTYPE_CLASS);
+                                wndclass->addRef();
+                                unlock(&critsect);
                                 return(wndclass);
                         }
@@ -240 +252 @@
         }
   }
-  leaveMutex(OBJTYPE_CLASS);
+  unlock(&critsect);
   dprintf(("Class %X (inst %X) not found!", id, hInstance));
   return(NULL);
 }
 //******************************************************************************
+//Locates class in linked list and increases reference count (if found)
+//Class object must be unreferenced after usage
 //******************************************************************************
 Win32WndClass *Win32WndClass::FindClass(HINSTANCE hInstance, LPWSTR id)
@@ -252 +266 @@
 
   if(HIWORD(id)) {
-    lpszClassName = UnicodeToAsciiString((LPWSTR)id);
-  }
-  else  lpszClassName = (LPSTR)id;
+       lpszClassName = UnicodeToAsciiString((LPWSTR)id);
+  }
+  else lpszClassName = (LPSTR)id;
 
   winclass = FindClass(hInstance, lpszClassName);
@@ -551 +565 @@
   wndclass = FindClass(hinst, id);
   if(wndclass) {
-        if(wndclass->GetWindowCount() != 0) {
+        if(wndclass->getRefCount() != 1) {
+            wndclass->markDeleted();
+            RELEASE_CLASSOBJ(wndclass);
             dprintf2(("Win32WndClass::UnregisterClassA class %x still has windows!!", id));
             SetLastError(ERROR_CLASS_HAS_WINDOWS);
             return FALSE;
         }
+        RELEASE_CLASSOBJ(wndclass);
         delete wndclass;
         SetLastError(ERROR_SUCCESS);
@@ -566 +583 @@
 //******************************************************************************
 //******************************************************************************
-GenericObject *Win32WndClass::wndclasses = NULL;
+GenericObject   *Win32WndClass::wndclasses = NULL;
+CRITICAL_SECTION Win32WndClass::critsect   = {0};