Changeset 403

Timestamp:

Jul 29, 2006, 10:00:53 PM (19 years ago)

Author:

root

Message:

Avoid shutdown hang - pre3 typo
Use xfgets_bstripcr

File:

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

trunk/dll/collect.c

@@ -23 +23 @@
   10 Nov 05 SHL CollectorCnrWndProc: correct missing button window updates
   14 Jul 06 SHL Use Runtime_Error
+  27 Jul 06 SHL Avoid shutdown hang - pre3 typo
+  29 Jul 06 SHL Use xfgets_bstripcr
 
 ***********************************************************************/
@@ -68 +70 @@
 
   static BOOL emphasized = FALSE;
-  static HWND hwndButtonPopup = (HWND) 0;
+  static HWND hwndButtonPopup = (HWND)0;
   static ULONG timestamp = ULONG_MAX;
   static USHORT lastid = 0;
@@ -197 +199 @@
 
   case WM_MENUEND:
-    if (hwndButtonPopup == (HWND) mp2)
-    {
-      lastid = WinQueryWindowUShort((HWND) mp2, QWS_ID);
+    if (hwndButtonPopup == (HWND)mp2)
+    {
+      lastid = WinQueryWindowUShort((HWND)mp2, QWS_ID);
       WinDestroyWindow(hwndButtonPopup);
-      hwndButtonPopup = (HWND) 0;
+      hwndButtonPopup = (HWND)0;
       DosQuerySysInfo(QSV_MS_COUNT,
                       QSV_MS_COUNT,
@@ -642 +644 @@
                          MPFROMLONG(EXTRA_RECORD_BYTES),
                          MPFROMLONG(ulMaxFiles));
-        if (pci) {
+        if (!pci) {
           Runtime_Error(pszSrcFile, __LINE__, "CM_ALLOCRECORD %u failed", ulMaxFiles);
           break;
@@ -732 +734 @@
   case UM_COLLECTFROMFILE:
     dcd = WinQueryWindowPtr(hwnd, QWL_USER);
-    if (dcd && mp1)
-    {
+    if (dcd && mp1) {
       FILESTATUS4 fs4;
       PCNRITEM pci;
@@ -742 +743 @@
 
       fp = _fsopen((CHAR *) mp1, "r", SH_DENYNO);
-      if (fp)
-      {
-        while (!feof(fp))
-        {
-          if (!fgets(fullname, 1024, fp))
+      if (fp) {
+        while (!feof(fp)) {
+          if (!xfgets_bstripcr(fullname, sizeof(fullname), fp,pszSrcFile, __LINE__))
             break;
-          fullname[1023] = 0;
-          bstripcr(fullname);
-          if (*fullname == '\"')
-          {
+          if (*fullname == '\"') {
             memmove(fullname, fullname + 1, strlen(fullname) + 1);
             lstrip(fullname);
@@ -759 +755 @@
             rstrip(fullname);
           }
-          else
-          {
+          else {
             p = strchr(fullname, ' ');
             if (p)
@@ -822 +817 @@
       }
     }
-    if (mp1)
-      free(mp1);
+    xfree(mp1);
     return 0;
 
@@ -1009 +1003 @@
     }
     DosPostEventSem(CompactSem);
-    if (!PostMsg(HWND_DESKTOP, WM_QUIT, MPVOID, MPVOID))
-      WinSendMsg(HWND_DESKTOP, WM_QUIT, MPVOID, MPVOID);
+    if (!PostMsg((HWND)0, WM_QUIT, MPVOID, MPVOID))
+      WinSendMsg((HWND)0, WM_QUIT, MPVOID, MPVOID);
     break;
   }
@@ -1495 +1489 @@
     if (dcd)
     {
-      HWND hwndMenu = (HWND) mp2;
+      HWND hwndMenu = (HWND)mp2;
 
       if (hwndMenu == CollectorCnrMenu || hwndMenu == CollectorFileMenu ||
@@ -1542 +1536 @@
 
           wmsg = (SHORT1FROMMP(mp1) == 0) ? UM_FILESMENU : UM_VIEWSMENU;
-          PortholeInit((HWND) WinSendMsg(dcd -> hwndClient, wmsg, MPVOID,
+          PortholeInit((HWND)WinSendMsg(dcd -> hwndClient, wmsg, MPVOID,
                                          MPVOID), mp1, mp2);
         }
@@ -1557 +1551 @@
       {
       case IDM_VIEWSMENU:
-        SetViewMenu((HWND) mp2, dcd -> flWindowAttr);
-        WinEnableMenuItem((HWND) mp2, IDM_RESELECT,
+        SetViewMenu((HWND)mp2, dcd -> flWindowAttr);
+        WinEnableMenuItem((HWND)mp2, IDM_RESELECT,
                           (dcd -> lastselection != NULL));
         break;
 
       case IDM_DETAILSSETUP:
-        SetDetailsSwitches((HWND) mp2, dcd);
+        SetDetailsSwitches((HWND)mp2, dcd);
         break;
 
       case IDM_COMMANDSMENU:
-        SetupCommandMenu((HWND) mp2, hwnd);
+        SetupCommandMenu((HWND)mp2, hwnd);
         break;
 
       case IDM_SORTSUBMENU:
-        SetSortChecks((HWND) mp2, CollectorsortFlags);
-        break;
-      }
-      dcd -> hwndLastMenu = (HWND) mp2;
+        SetSortChecks((HWND)mp2, CollectorsortFlags);
+        break;
+      }
+      dcd -> hwndLastMenu = (HWND)mp2;
     }
     if (msg == WM_INITMENU)
@@ -2306 +2300 @@
     {
       PCNRITEM pci;
-      HWND menuHwnd = (HWND) 0;
+      HWND menuHwnd = (HWND)0;
 
       pci = (PCNRITEM) CurrentRecord(hwnd);
@@ -2915 +2909 @@
 
   case UM_FOLDUP:
-    if (!PostMsg(HWND_DESKTOP, WM_QUIT, MPVOID, MPVOID))
+    if (!PostMsg((HWND)0, WM_QUIT, MPVOID, MPVOID))
       DosExit(EXIT_PROCESS, 1);
     return 0;
@@ -2950 +2944 @@
     if (CollectorCnrMenu)
       WinDestroyWindow(CollectorCnrMenu);
-    CollectorCnrMenu = CollectorFileMenu = CollectorDirMenu = (HWND) 0;
-    Collector = (HWND) 0;
+    CollectorCnrMenu = CollectorFileMenu = CollectorDirMenu = (HWND)0;
+    Collector = (HWND)0;
     EmptyCnr(hwnd);
     break;
@@ -2961 +2955 @@
 HWND StartCollector(HWND hwndParent, INT flags)
 {
-  HWND hwndFrame = (HWND) 0;
+  HWND hwndFrame = (HWND)0;
   HWND hwndClient;
   ULONG FrameFlags = FCF_TITLEBAR | FCF_SYSMENU |
@@ -3006 +3000 @@
       Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
       PostMsg(hwndClient,WM_CLOSE,MPVOID,MPVOID);
-      hwndFrame = (HWND) 0;
+      hwndFrame = (HWND)0;
     }
     else {
@@ -3045 +3039 @@
         PostMsg(hwndClient,WM_CLOSE,MPVOID,MPVOID);
         free(dcd);
-        hwndFrame = (HWND) 0;
+        hwndFrame = (HWND)0;
       }
       else {