Changeset 5935 for trunk/src/user32/windlg.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/windlg.cpp (modified) (16 diffs)

trunk/src/user32/windlg.cpp

@@ -1 @@
-/* $Id: windlg.cpp,v 1.22 2001-02-23 14:52:42 sandervl Exp $ */
+/* $Id: windlg.cpp,v 1.23 2001-06-09 14:50:25 sandervl Exp $ */
 /*
  * Win32 dialog apis for OS/2
@@ -87 +87 @@
     {
         dprintf(("Win32Dialog error found (%0x)!!", GetLastError()));
+        RELEASE_WNDOBJ(dialog);
         delete dialog;
         return 0;
     }
-    return dialog->getWindowHandle();
+    HWND hwnd = dialog->getWindowHandle();
+    RELEASE_WNDOBJ(dialog);
+    return hwnd;
 }
 //******************************************************************************
@@ -115 +118 @@
     {
         dprintf(("Win32Dialog error found!!"));
+        RELEASE_WNDOBJ(dialog);
         delete dialog;
         return 0;
     }
-    return dialog->getWindowHandle();
+    HWND hwnd = dialog->getWindowHandle();
+    RELEASE_WNDOBJ(dialog);
+    return hwnd;
 }
 //******************************************************************************
@@ -127 +133 @@
                       LPARAM lParamInit)
 {
+    INT result;
     HWND hwnd = CreateDialogIndirectParamA(hInst, dlgtemplate, hwndParent, dlgproc,
                                            lParamInit);
@@ -136 +143 @@
         if(!dialog || !dialog->IsDialog()) {
             dprintf(("DialogBoxIndirectParamA, dialog %x not found", hwnd));
+            if(dialog) RELEASE_WNDOBJ(dialog);
             SetLastError(ERROR_INVALID_WINDOW_HANDLE);
             return 0;
         }
-        return dialog->doDialogBox();
+        result = dialog->doDialogBox();
+        RELEASE_WNDOBJ(dialog);
+        return result;
     }
     return -1;
@@ -149 +159 @@
                                       LPARAM lParamInit)
 {
+    INT result;
     HWND hwnd = CreateDialogIndirectParamW(hInst, dlgtemplate, hwndParent, dlgproc,
                                            lParamInit);
@@ -158 +169 @@
         if(!dialog || !dialog->IsDialog()) {
             dprintf(("DialogBoxIndirectParamW, dialog %x not found", hwnd));
+            if(dialog) RELEASE_WNDOBJ(dialog);
             SetLastError(ERROR_INVALID_WINDOW_HANDLE);
             return 0;
         }
-        return dialog->doDialogBox();
+        result = dialog->doDialogBox();
+        RELEASE_WNDOBJ(dialog);
+        return result;
     }
     return -1;
@@ -170 +184 @@
                      DLGPROC dlgproc, LPARAM  lParamInit)
 {
+    INT result;
     HWND hwnd = CreateDialogParamA( hInst, lpszTemplate, hwndOwner, dlgproc, lParamInit);
 
@@ -179 +194 @@
         if(!dialog || !dialog->IsDialog()) {
             dprintf(("DialogBoxParamA, dialog %x not found", hwnd));
+            if(dialog) RELEASE_WNDOBJ(dialog);
             SetLastError(ERROR_INVALID_WINDOW_HANDLE);
             return 0;
         }
-        return dialog->doDialogBox();
+        result = dialog->doDialogBox();
+        RELEASE_WNDOBJ(dialog);
+        return result;
     }
     return -1;
@@ -191 +209 @@
                              DLGPROC dlgproc, LPARAM lParamInit)
 {
+    INT result;
     HWND hwnd = CreateDialogParamW( hInst, lpszTemplate, hwndOwner, dlgproc, lParamInit);
 
@@ -200 +219 @@
         if(!dialog || !dialog->IsDialog()) {
             dprintf(("DialogBoxParamW, dialog %x not found", hwnd));
+            if(dialog) RELEASE_WNDOBJ(dialog);
             SetLastError(ERROR_INVALID_WINDOW_HANDLE);
             return 0;
         }
-        return dialog->doDialogBox();
+        result = dialog->doDialogBox();
+        RELEASE_WNDOBJ(dialog);
+        return result;
     }
     return -1;
@@ -213 +235 @@
 {
   Win32Dialog *dialog;
+  BOOL rc;
 #ifdef DEBUG
-  BOOL rc;
   RECT dlgRect = *rect;
 #endif
@@ -222 +244 @@
         dprintf(("MapDialogRect, window %x not found", hwndDlg));
         SetLastError(ERROR_INVALID_WINDOW_HANDLE);
-        return 0;
-    }
-#ifdef DEBUG
+        if(dialog) RELEASE_WNDOBJ(dialog);
+        return 0;
+    }
     rc = dialog->MapDialogRect(rect);
     dprintf(("USER32: MapDialogRect %x (%d,%d)(%d,%d) -> (%d,%d)(%d,%d)", hwndDlg, dlgRect.left, dlgRect.top, dlgRect.right, dlgRect.bottom, rect->left, rect->top, rect->right, rect->bottom));
+    RELEASE_WNDOBJ(dialog);
     return rc;
-#else
-    dprintf(("USER32: MapDialogRect %x (%d,%d)(%d,%d)", hwndDlg, rect->left, rect->top, rect->right, rect->bottom));
-    return dialog->MapDialogRect(rect);
-#endif
 }
 //******************************************************************************
@@ -334 +353 @@
 HWND WIN32API GetNextDlgTabItem(HWND hwndDlg, HWND hwndCtrl, BOOL fPrevious)
 {
-  Win32BaseWindow *window;
-
-    window = (Win32BaseWindow*)Win32BaseWindow::GetWindowFromHandle(hwndDlg);
-    if(!window) {
+    if(!IsWindow(hwndDlg)) {
         dprintf(("GetNextDlgTabItem, window %x not found", hwndDlg));
         SetLastError(ERROR_INVALID_WINDOW_HANDLE);
@@ -352 +368 @@
 HWND WIN32API GetDlgItem(HWND hwnd, int id)
 {
-  Win32BaseWindow *dlgcontrol, *window;
+  Win32BaseWindow *window;
+  HWND             hwndDlgItem;
 
     window = (Win32Dialog *)Win32BaseWindow::GetWindowFromHandle(hwnd);
@@ -360 +377 @@
         return 0;
     }
-    dlgcontrol = window->FindWindowById(id);
-    if(dlgcontrol) {
-        dprintf(("USER32: GetDlgItem %x %d returned %x\n", hwnd, id, dlgcontrol->getWindowHandle()));
-        return dlgcontrol->getWindowHandle();
+    hwndDlgItem = window->FindWindowById(id);
+    RELEASE_WNDOBJ(window);
+    if(hwndDlgItem) {
+        dprintf(("USER32: GetDlgItem %x %d returned %x\n", hwnd, id, hwndDlgItem));
+        return hwndDlgItem;
     }
     dprintf(("USER32: GetDlgItem %x %d NOT FOUND!\n", hwnd, id));