Changeset 1837

Timestamp:

Aug 2, 2015, 11:44:10 PM (10 years ago)

Author:

Gregg Young

Message:

Fixed trap in Stubby Ticket [534]

File:

• trunk/dll/flesh.c (modified) (6 diffs)

trunk/dll/flesh.c

@@ -32 +32 @@
   17 Jan 10 GKY Changes to get working with Watcom 1.9 Beta (1/16/10). Mostly cast CHAR CONSTANT * as CHAR *.
   04 Aug 12 GKY Fix trap on close during drive scan
+  02 Aug 15 GKY Fix trap in Stubby
 
 ***********************************************************************/
@@ -282 +283 @@
   static BOOL brokenlan = FALSE, isbroken = FALSE;
 
-  if (!pciParent || !*pciParent->pszFileName
+  if (!pciParent || (INT) pciParent == -1 || !*pciParent->pszFileName
       || pciParent->pszFileName == NullStr || !hwndCnr)
     return FALSE;
-
+  
   len = strlen(pciParent->pszFileName);
   memcpy(str, pciParent->pszFileName, len + 1);
@@ -398 +399 @@
     goto None;
   }
-
+  
   if (!rc) {
     DosFindClose(hDir);
@@ -436 +437 @@
             (includefiles || (pffb->attrFile & FILE_DIRECTORY)) &&
             // Skip . and ..
-            (pffb->achName[0] != '.' || (pffb->achName[1]
+            ((pffb->achName[0] && pffb->achName[0] != '.') || (pffb->achName[1]
                                          && (pffb->achName[1] != '.'
                                              || pffb->achName[2])))) {
@@ -470 +471 @@
             ri.zOrder = (ULONG) CMA_TOP;
             ri.cRecordsInsert = 1;
-            ri.fInvalidateRecord = TRUE;
+            ri.fInvalidateRecord = TRUE;
             //DbgMsg(pszSrcFile, __LINE__, "Stubby %p CM_INSERTRECORD \"%s\" %.255s", hwndCnr, pci->pszFileName, pffb->achName); // 18 Dec 08 SHL fixme debug
             if (!WinSendMsg(hwndCnr,
                             CM_INSERTRECORD, MPFROMP(pci), MPFROMP(&ri))) {
               DosSleep(50); //05 Aug 07 GKY 100
-              WinSetFocus(HWND_DESKTOP, hwndCnr);
-              if (WinIsWindow((HAB)0, hwndCnr)) {
+              WinSetFocus(HWND_DESKTOP, hwndCnr);
+              if (WinIsWindow((HAB)0, hwndCnr)) {
                 //DbgMsg(pszSrcFile, __LINE__, "Stubby %p CM_INSERTRECORD %s", hwndCnr, pci->pszFileName); // 18 Dec 08 SHL fixme debug
                 if (!WinSendMsg(hwndCnr,
@@ -489 +490 @@
             }
             else
-              ok = TRUE;
+              ok = TRUE;
+            }
           }
         }
-      }
       else if (toupper(*str) > 'B' && str[1] == ':' && str[2] == '\\' &&
                !str[3]) {