Changeset 1009 for trunk/dll/mainwnd.c

Timestamp:

May 10, 2008, 9:51:58 AM (18 years ago)

Author:

Steven Levine

Message:

Add xfree xstrdup Fortify support
Add MT capable Fortify scope logic

File:

• trunk/dll/mainwnd.c (modified) (10 diffs)

trunk/dll/mainwnd.c

@@ -182 +182 @@
       WinEnableWindow(WinQueryWindow(hwndMain, QW_PARENT), TRUE);
       fNoTileUpdate = FALSE;
-      xfree((char *)mp1);
+      xfree((char *)mp1, pszSrcFile, __LINE__);
       if (fAutoTile)
         TileChildren(hwndMain, TRUE);
@@ -511 +511 @@
       WinSetMultWindowPos(WinQueryAnchorBlock(hwnd), &swp[2], numtools);
     }
-    xfree(swp);
+    xfree(swp, pszSrcFile, __LINE__);
   }
   WinInvalidateRect(hwnd, NULL, TRUE);
@@ -1005 +1005 @@
               }
             }
-            xfree(s);
+            xfree(s, pszSrcFile, __LINE__);
           }
         }
@@ -1551 +1551 @@
         PostMsg(hwnd, UM_FOCUSME, MPVOID, MPVOID);
         PostMsg(hwnd, UM_SETUP, MPVOID, MPVOID);
-        xfree(pszCmdLine);
+        xfree(pszCmdLine, pszSrcFile, __LINE__);
       }
     }
@@ -1610 +1610 @@
                                    SEPARATEKEEP : SEPARATE),
                        directory, list, NULL, pszSrcFile, __LINE__);
-            xfree(list);
+            xfree(list, pszSrcFile, __LINE__);
             WinDestroyWindow(hwnd);
             break;
@@ -2238 +2238 @@
   case UM_SETUP:
     if (mp1)
-      strcpy(lastcmd, (CHAR *) mp1);
+      strcpy(lastcmd, (CHAR *)mp1);
     return 0;
 
@@ -5806 +5806 @@
       if (fUserComboBox)
         WinSetWindowText(WinWindowFromID(hwndUserlist, CBID_EDIT),
-                         (CHAR *) mp1);
-      if (add_udir(FALSE, (CHAR *) mp1)) {
+                         (CHAR *)mp1);
+      if (add_udir(FALSE, (CHAR *)mp1)) {
         if (fUserComboBox && fAutoAddDirs) {
           WinSendMsg(hwndUserlist, LM_INSERTITEM,
                      MPFROM2SHORT(LIT_SORTASCENDING, 0),
-                     MPFROMP((CHAR *) mp1));
+                     MPFROMP((CHAR *)mp1));
         }
       }
@@ -5910 +5910 @@
 
   case UM_ADDTOMENU:
-    AddToMenu((CHAR *) mp1, WinWindowFromID(WinQueryWindow(hwnd, QW_PARENT),
+    AddToMenu((CHAR *)mp1, WinWindowFromID(WinQueryWindow(hwnd, QW_PARENT),
                                             FID_MENU));
     return 0;
@@ -6237 +6237 @@
                                   MPFROMP(pszStateName),
                                   MPVOID)) {
-                  xfree(pszStateName);
+                  xfree(pszStateName, pszSrcFile, __LINE__);
                 }
               }
@@ -6311 +6311 @@
         if (!PostMsg(MainObjectHwnd, UM_RESTORE, MPFROMP(pszDefaultStateName), MPVOID))
           // 05 Feb 08 SHL fixme to complain?
-          xfree(pszDefaultStateName);
+          xfree(pszDefaultStateName, pszSrcFile, __LINE__);
       }
     }