Changeset 377 for trunk/dll/seeall.c

Timestamp:

Jul 27, 2006, 8:28:31 AM (19 years ago)

Author:

root

Message:

Validate WinCreateWindow

File:

• trunk/dll/seeall.c (modified) (8 diffs)

trunk/dll/seeall.c

@@ -745 +745 @@
                         GetPString(IDS_TOTEXT),
                         newname);
-                WinSetWindowText(WinWindowFromID(hwndFrame,
-                                                 SEEALL_STATUS),
+                WinSetWindowText(WinWindowFromID(hwndFrame,SEEALL_STATUS),
                                  message);
                 if(fRealIdle)
@@ -1296 +1295 @@
                                   NULL,
                                   NULL);
-        if(hwndObj) {
+        if (!hwndObj) {
+          Win_Error2(HWND_OBJECT,HWND_DESKTOP,pszSrcFile,__LINE__,IDS_WINCREATEWINDOW);
+          if (!PostMsg(ad->hwndClient,WM_CLOSE,MPVOID,MPVOID))
+            WinSendMsg(ad->hwndClient,WM_CLOSE,MPVOID,MPVOID);
+        }
+        else {
           ad->hwndObj = hwndObj;
           WinSetWindowULong(hwndObj,QWL_USER,ad->hwndFrame);
@@ -1303 +1307 @@
             WinDispatchMsg(hab2,&qmsg2);
           WinDestroyWindow(hwndObj);
-        }
-        else {
-          if(!PostMsg(ad->hwndClient,WM_CLOSE,MPVOID,MPVOID))
-            WinSendMsg(ad->hwndClient,WM_CLOSE,MPVOID,MPVOID);
         }
         WinDestroyMsgQueue(hmq2);
@@ -2544 +2544 @@
       WinSetWindowPtr(hwnd,QWL_USER,NULL);
       pAD = xmallocz(sizeof(ALLDATA),pszSrcFile,__LINE__);
-      if(pAD) {
+      if (pAD) {
+        HWND hwndFrame;
         pAD->size = sizeof(ALLDATA);
-        pAD->hwndFrame = WinQueryWindow(hwnd,QW_PARENT);
+        hwndFrame = WinQueryWindow(hwnd,QW_PARENT);
+        pAD->hwndFrame = hwndFrame;
         pAD->mask.attrFile = FILE_READONLY | FILE_HIDDEN   |
                             FILE_SYSTEM   | FILE_ARCHIVED;
@@ -2629 +2631 @@
         pAD->fattrs.usCodePage = Codepage;
         memcpy(pAD->aulColors,Colors,sizeof(LONG) * COLORS_MAX);
-        pAD->hwndMenu   = WinWindowFromID(WinQueryWindow(hwnd,QW_PARENT),
+        pAD->hwndMenu   = WinWindowFromID(hwndFrame,
                                          FID_MENU);
         SetConditionalCascade(pAD->hwndMenu,IDM_DELETESUBMENU,
@@ -2646 +2648 @@
         pAD->hwndClient = hwnd;
         pAD->hps = InitWindow(hwnd);
-        pAD->hvscroll = WinWindowFromID(WinQueryWindow(hwnd,QW_PARENT),
+        pAD->hvscroll = WinWindowFromID(hwndFrame,
                                        FID_VERTSCROLL);
-        pAD->hhscroll = WinWindowFromID(WinQueryWindow(hwnd,QW_PARENT),
+        pAD->hhscroll = WinWindowFromID(hwndFrame,
                                        FID_HORZSCROLL);
         pAD->multiplier = 1;
@@ -2655 +2657 @@
         else {
           if (!DosCreateMutexSem(NULL,&pAD->hmtxScan,0L,FALSE)) {
-            pAD->hwndStatus = WinCreateWindow(WinQueryWindow(hwnd,QW_PARENT),
+            pAD->hwndStatus = WinCreateWindow(hwndFrame,
                                               GetPString(IDS_WCSEESTATUS),
                                               NullStr,
@@ -2664 +2666 @@
                                               0,
                                               0,
-                                              WinQueryWindow(hwnd,QW_PARENT),
+                                              hwndFrame,
                                               HWND_TOP,
                                               SEEALL_STATUS,
                                               NULL,
                                               NULL);
+            if (!pAD->hwndStatus)
+              Win_Error2(hwndFrame,hwnd,pszSrcFile,__LINE__,IDS_WINCREATEWINDOW);
+            else
             {
               PFNWP oldproc;
-
-              oldproc = WinSubclassWindow(WinQueryWindow(hwnd,QW_PARENT),
-                                          (PFNWP)SeeFrameWndProc);
-              if(oldproc)
-                WinSetWindowPtr(WinQueryWindow(hwnd,QW_PARENT),
-                                QWL_USER,
-                                (PVOID)oldproc);
+              oldproc = WinSubclassWindow(hwndFrame,SeeFrameWndProc);
+              WinSetWindowPtr(hwndFrame,QWL_USER,(PVOID)oldproc);
             }
             break;