Changeset 377 for trunk/dll/treecnr.c

Timestamp:

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

Author:

root

Message:

Validate WinCreateWindow

File:

• trunk/dll/treecnr.c (modified) (18 diffs)

trunk/dll/treecnr.c

@@ -636 +636 @@
       dcd = WinQueryWindowPtr(hwnd,QWL_USER);
       if (!dcd)
-        Runtime_Error(pszSrcFile, __LINE__, "no data");
+        Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
       else {
         BOOL tempsusp = dcd->suspendview;
@@ -655 +655 @@
       dcd = WinQueryWindowPtr(hwnd,QWL_USER);
       if (!dcd || !mp1)
-        Runtime_Error(pszSrcFile, __LINE__, "no data");
+        Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
       else {
         INT    numentries = 0;
@@ -674 +674 @@
       dcd = WinQueryWindowPtr(hwnd,QWL_USER);
       if (!dcd)
-        Runtime_Error(pszSrcFile, __LINE__, "no data");
+        Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
       else {
         dcd->hwndObject = hwnd;
@@ -685 +685 @@
       dcd = WinQueryWindowPtr(hwnd,QWL_USER);
       if (!dcd)
-        Runtime_Error(pszSrcFile, __LINE__, "no data");
+        Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
       else if (!hwndStatus)
-        Runtime_Error(pszSrcFile, __LINE__, "no window");
+        Runtime_Error2(pszSrcFile, __LINE__, IDS_NOWINDOWTEXT);
       else if (dcd->hwndFrame == WinQueryActiveWindow(dcd->hwndParent)) {
         CHAR      s[CCHMAXPATH * 2];
@@ -788 +788 @@
       dcd = WinQueryWindowPtr(hwnd,QWL_USER);
       if (!dcd)
-        Runtime_Error(pszSrcFile, __LINE__, "no data");
+        Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
       else {
         WinSendMsg(dcd->hwndCnr,
@@ -861 +861 @@
         dcd = WinQueryWindowPtr(hwnd,QWL_USER);
         if (!dcd)
-          Runtime_Error(pszSrcFile, __LINE__, "no data");
+          Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
         else {
           WORKER *wk;
@@ -891 +891 @@
         dcd = WinQueryWindowPtr(hwnd,QWL_USER);
         if (!dcd)
-          Runtime_Error(pszSrcFile, __LINE__, "no data");
+          Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
         else {
           WORKER *wk;
@@ -1309 +1309 @@
     case UM_SETUP:
       if (!dcd) {
-        Runtime_Error(pszSrcFile, __LINE__, "no data");
+        Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
         PostMsg(hwnd,WM_CLOSE,MPVOID,MPVOID);
         return 0;
@@ -1423 +1423 @@
                                    MPFROMP(&pqr));
         if(!pci || (INT)pci == -1)
-          Runtime_Error(pszSrcFile, __LINE__, "no data");
+          Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
         else {
           memset(&nr,0,sizeof(nr));
@@ -1565 +1565 @@
 
               if (!pcd) {
-                Runtime_Error(pszSrcFile, __LINE__, "no data");
+                Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
                 break;
               }
@@ -1571 +1571 @@
                 pci = (PCNRITEM)pcd->pRecord;
                 if (!pci || (INT)pci == -1) {
-                  Runtime_Error(pszSrcFile, __LINE__, "no data");
+                  Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
                   break;
                 }
@@ -2420 +2420 @@
     case UM_COMMAND:
       if (!mp1)
-        Runtime_Error(pszSrcFile, __LINE__, "no data");
+        Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
       else {
         if (!dcd) {
-          Runtime_Error(pszSrcFile, __LINE__, "no data");
+          Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
           FreeListInfo((LISTINFO *)mp1);
         }
@@ -3297 +3297 @@
       SWP swp;
       WinQueryWindowPos(hwndFrame,&swp);
-      if(*(ULONG *)realappname == FM3UL)
-        WinCreateWindow(hwndFrame,
+      if (*(ULONG *)realappname == FM3UL) {
+        if (!WinCreateWindow(hwndFrame,
                         GetPString(IDS_WCTREEOPENBUTTON),
                         "O",
@@ -3313 +3313 @@
                         IDM_OPENWINDOW,
                         NULL,
-                        NULL);
-      else
-        WinCreateWindow(hwndFrame,
+                        NULL))
+        {
+          Win_Error2(hwndFrame,hwndParent,pszSrcFile,__LINE__,IDS_WINCREATEWINDOW);
+        }
+      }
+      else {
+        if (!WinCreateWindow(hwndFrame,
                         GetPString(IDS_WCTREESTATUS),
                         GetPString(IDS_YOUAREHERETEXT),
@@ -3330 +3334 @@
                         MAIN_STATUS,
                         NULL,
-                        NULL);
+                        NULL))
+        {
+          Win_Error2(hwndFrame,hwndParent,pszSrcFile,__LINE__,IDS_WINCREATEWINDOW);
+        }
+      }
       memset(dcd,0,sizeof(DIRCNRDATA));
       dcd->size = sizeof(DIRCNRDATA);
@@ -3341 +3349 @@
         PFNWP oldproc;
 
-        oldproc = WinSubclassWindow(hwndFrame,(PFNWP)TreeFrameWndProc);
+        oldproc = WinSubclassWindow(hwndFrame,TreeFrameWndProc);
         WinSetWindowPtr(hwndFrame,QWL_USER,(PVOID)oldproc);
         oldproc = WinSubclassWindow(WinWindowFromID(hwndFrame,FID_TITLEBAR),
@@ -3363 +3371 @@
                                      NULL,
                                      NULL);
-      if(dcd->hwndCnr) {
+      if (!dcd->hwndCnr) {
+        Win_Error2(hwndClient,hwndClient,pszSrcFile,__LINE__,IDS_WINCREATEWINDOW);
+        PostMsg(hwndClient,WM_CLOSE,MPVOID,MPVOID);
+        free(dcd);
+        hwndFrame = (HWND)0;
+      }
+      else {
         WinSetWindowPtr(dcd->hwndCnr,QWL_USER,(PVOID)dcd);
         if(ParentIsDesktop(hwndFrame,hwndParent)) {
@@ -3374 +3388 @@
                            GetPString(IDS_TREETEXT));
         }
-        dcd->oldproc = WinSubclassWindow(dcd->hwndCnr,(PFNWP)TreeCnrWndProc);
+        dcd->oldproc = WinSubclassWindow(dcd->hwndCnr,TreeCnrWndProc);
         if(!PostMsg(dcd->hwndCnr,UM_SETUP,MPVOID,MPVOID))
           WinSendMsg(dcd->hwndCnr,UM_SETUP,MPVOID,MPVOID);
-      }
-      else {
-        PostMsg(hwndClient,WM_CLOSE,MPVOID,MPVOID);
-        free(dcd);
-        hwndFrame = (HWND)0;
       }
     }