Changeset 1860

Timestamp:

Aug 22, 2015, 4:30:34 AM (10 years ago)

Author:

Steven Levine

Message:

Rework FlesWaitForWorkListEmpty to support wait for parents of path
Add more wrappers for mutex and event semaphores
Clean up some obsolete code

Location:

trunk/dll

Files:

• flesh.c (modified) (15 diffs)
• flesh.h (modified) (1 diff)
• init.c (modified) (11 diffs)
• init.h (modified) (2 diffs)
• treecnr.c (modified) (3 diffs)
• wrappers.c (modified) (5 diffs)
• wrappers.h (modified) (2 diffs)

trunk/dll/flesh.c

@@ -82 +82 @@
 static INT tidFleshWorkListThread = -1; // 2015-08-08 SHL
 
-static CHAR chFleshFocusDrive;  // 2015-08-16 SHL A..Z or 0
-
+static PCSZ pszFleshFocusPath;  // 2015-08-20 SHL
 
 BOOL fNoFleshDbgMsg;    // 2015-08-09 SHL FIXME to be gone
@@ -693 +692 @@
 #endif
 {
-  APIRET rc;
-
   PFLESHWORKITEM item = xmallocz(sizeof(FLESHWORKITEM), pszSrcFile, __LINE__);
   item->hwndCnr = hwndCnr;
@@ -751 +748 @@
 #endif
 
-  rc = DosRequestMutexSem(hmtxFleshWork, SEM_INDEFINITE_WAIT);
-  if (rc)
-    Dos_Error(MB_ENTER, rc, HWND_DESKTOP, pszSrcFile, __LINE__, "DosRequestMutexSem");
+  xDosRequestMutexSem(hmtxFleshWork, SEM_INDEFINITE_WAIT);
 
   // Delete stale requests
@@ -761 +756 @@
   List2Append(&FleshWorkList, (PLIST2)item);
 
-  rc = DosReleaseMutexSem(hmtxFleshWork);
-  if (rc)
-    Dos_Error(MB_ENTER, rc, HWND_DESKTOP, pszSrcFile, __LINE__, "DosReleaseMutexSem");
-
-  rc = DosPostEventSem(hevFleshWorkListChanged);
-  if (rc && rc != ERROR_ALREADY_POSTED)
-    Dos_Error(MB_ENTER, rc, HWND_DESKTOP, pszSrcFile, __LINE__, "DosPostEventSem");
+  xDosReleaseMutexSem(hmtxFleshWork);
+  xDosPostEventSem(hevFleshWorkListChanged);
 
   return TRUE;
@@ -785 +775 @@
  * Check if pci pathname is parent of child path name
  * @param data is child path name
- * @return TRUE if is parent
+ * @return TRUE if is work item path is parent of given path
  */
 
@@ -792 +782 @@
   UINT c;
   if (!((PFLESHWORKITEM)item)->pci->pszFileName) {
-    Runtime_Error(pszSrcFile, __LINE__, "MatchesFocusDrive called with pci %p pszFileName (null) by %s:%u", ((PFLESHWORKITEM)item)->pci);
+    Runtime_Error(pszSrcFile, __LINE__, "IsParentOfChildPath called with pci %p pszFileName (null) by %s:%u", ((PFLESHWORKITEM)item)->pci);
     return FALSE;
   }
@@ -806 +796 @@
 
 #if 0 // 2015-08-03 SHL FIXME debug
-VOID WaitFleshWorkListEmpty(PCSZ pszFileName)
+VOID WaitFleshWorkListEmpty(PCSZ pszDirName)
 #else
-VOID WaitFleshWorkListEmptyDbg(PCSZ pszFileName, PCSZ pszSrcFile_, UINT uSrcLineNo_)
+VOID WaitFleshWorkListEmptyDbg(PCSZ pszDirName, PCSZ pszSrcFile_, UINT uSrcLineNo_)
 #endif
 {
@@ -814 +804 @@
   PFLESHWORKITEM item;
   INT tid = GetTidForThread();
-  CHAR chSavedFleshFocusDrive = chFleshFocusDrive;
+  BOOL pathSaved = FALSE;
+  PCSZ pszSavedFleshFocusPath;
 
   if (tid == 1 || tid == tidFleshWorkListThread) {
@@ -849 +840 @@
       return;
 
-    // Just wait for dependents if path name given
-    if (pszFileName) {
-      rc = DosRequestMutexSem(hmtxFleshWork, SEM_INDEFINITE_WAIT);
-      if (rc) {
-        Dos_Error(MB_ENTER, rc, HWND_DESKTOP, pszSrcFile, __LINE__, "DosRequestMutexSem");
-        continue;
+    // Just wait for dependents to be gone if path name given
+    if (pszDirName) {
+      rc = xDosRequestMutexSem(hmtxFleshWork, SEM_INDEFINITE_WAIT);
+      if (rc)
+        continue;                       // Maybe should return ???
+
+      if (!pathSaved) {
+        // Give priority to work items for parents of this path
+        pathSaved = TRUE;
+        pszSavedFleshFocusPath = pszFleshFocusPath;
+        pszFleshFocusPath = pszDirName;
       }
 
-      chFleshFocusDrive = *pszFileName;         // Give priority to work on this drive
-
-      item = (PFLESHWORKITEM)List2Search(&FleshWorkList, IsParentOfChildPath, (PVOID)pszFileName);
-
-      rc = DosReleaseMutexSem(hmtxFleshWork);
-      if (rc)
-        Dos_Error(MB_ENTER, rc, HWND_DESKTOP, pszSrcFile, __LINE__, "DosReleaseMutexSem");
+      item = (PFLESHWORKITEM)List2Search(&FleshWorkList, IsParentOfChildPath, (PVOID)pszDirName);
+
+      xDosReleaseMutexSem(hmtxFleshWork);
 
       if (!item)
         break;                          // Dependents gone from work list
-    }
+    } // if pszDirName
+
     DosSleep(250);
   } // while
 
-  chFleshFocusDrive = chSavedFleshFocusDrive;   // In case overridden
+  if (!pathSaved) {
+    xDosRequestMutexSem(hmtxFleshWork, SEM_INDEFINITE_WAIT);
+    pszFleshFocusPath = pszSavedFleshFocusPath;
+    xDosReleaseMutexSem(hmtxFleshWork);
+  }
 
 }
@@ -880 +877 @@
  */
 
-VOID SetFleshFocusDrive(CHAR chDriveLetter) {
-  chFleshFocusDrive = chDriveLetter;
-  DbgMsg(pszSrcFile, __LINE__, "SetFleshFocusDrive focus drive set to %c", chFleshFocusDrive); // 2015-08-03 SHL FIXME debug
-
-}
-
-/**
- * Check pci pathname matches focus drive
- * @param data is uppercase drive letter mapped to PVOID
- * @return TRUE if drive letter matches
- */
-
-BOOL MatchesFocusDrive(PLIST2 item, PVOID data)
-{
-  if (!((PFLESHWORKITEM)item)->pci->pszFileName) {
-    Runtime_Error(pszSrcFile, __LINE__, "MatchesFocusDrive called with pci %p pszFileName (null) by %s:%u", ((PFLESHWORKITEM)item)->pci);
-    return FALSE;
-  }
-  return ((PFLESHWORKITEM)item)->pci->pszFileName[0] == (CHAR)data;
+VOID SetFleshFocusPath(PCSZ pszPath) {
+  PCSZ pszOld;
+  PCSZ pszNew = strdup(pszPath);
+  xDosRequestMutexSem(hmtxFleshWork, SEM_INDEFINITE_WAIT);
+  pszOld = pszFleshFocusPath;
+  pszFleshFocusPath = pszNew;
+  xDosReleaseMutexSem(hmtxFleshWork);
+  if (pszOld)
+    xfree((PVOID)pszOld, pszSrcFile, __LINE__);
+  DbgMsg(pszSrcFile, __LINE__, "SetFleshFocusPath focus path set to %s", pszFleshFocusPath); // 2015-08-03 SHL FIXME debug
+
 }
 
@@ -909 +898 @@
   HAB thab;
   HMQ hmq = (HMQ)0;
-  APIRET rc;
 
   // 2015-08-07 SHL FIXME to be gone
@@ -933 +921 @@
 
         // 2015-08-07 SHL FIXME to use SMPSafe...
-        rc = DosRequestMutexSem(hmtxFleshWork, SEM_INDEFINITE_WAIT);
-        if (rc)
-          Dos_Error(MB_ENTER, rc, HWND_DESKTOP, pszSrcFile, __LINE__, "DosRequestMutexSem");
+        xDosRequestMutexSem(hmtxFleshWork, SEM_INDEFINITE_WAIT);
 
         // 2015-08-14 SHL
         // Get next work list item and remove from list
-        // If focus drive known, process items for focus drive first
-        if (chFleshFocusDrive) {
-          item = (PFLESHWORKITEM)List2Search(&FleshWorkList, MatchesFocusDrive, (PVOID)chFleshFocusDrive);
-          if (!item)
-            chFleshFocusDrive = 0;              // Revert to normal
+        // If focus path set, process parents of focus path first
+        if (pszFleshFocusPath) {
+          item = (PFLESHWORKITEM)List2Search(&FleshWorkList, IsParentOfChildPath, (PVOID)pszFleshFocusPath);
+          if (!item) {
+            xfree((PSZ)pszFleshFocusPath, pszSrcFile, __LINE__);
+            pszFleshFocusPath = NULL;           // Revert to normal
+          }
           else
             List2Delete(&FleshWorkList, (PLIST2)item);
@@ -953 +941 @@
           item = (PFLESHWORKITEM)List2DeleteFirst(&FleshWorkList);
 
-        rc = DosReleaseMutexSem(hmtxFleshWork);
-        if (rc)
-          Dos_Error(MB_ENTER, rc, HWND_DESKTOP, pszSrcFile, __LINE__, "DosReleaseMutexSem");
+        xDosReleaseMutexSem(hmtxFleshWork);
 
         // Wait for new items to be added to list
@@ -962 +948 @@
           if (!fNoFleshDbgMsg)
             DbgMsg(pszSrcFile, __LINE__, "FleshWorkThread work list empty - waiting"); // 2015-08-03 SHL FIXME debug
-          rc = DosWaitEventSem(hevFleshWorkListChanged, SEM_INDEFINITE_WAIT);
-          if (rc)
-            Dos_Error(MB_ENTER, rc, HWND_DESKTOP, pszSrcFile, __LINE__, "DosWaitEventSem");
-          rc = DosResetEventSem(hevFleshWorkListChanged, &ul);
-          if (rc)
-            Dos_Error(MB_ENTER, rc, HWND_DESKTOP, pszSrcFile, __LINE__, "DosResetEventSem");
+          xDosWaitEventSem(hevFleshWorkListChanged, SEM_INDEFINITE_WAIT);
+          xDosResetEventSem(hevFleshWorkListChanged, &ul);
           if (!fNoFleshDbgMsg)
             DbgMsg(pszSrcFile, __LINE__, "FleshWorkThread work hev posted"); // 2015-08-03 SHL FIXME debug
@@ -1085 +1067 @@
   }
 
-  rc = DosCreateEventSem(NULL, &hevFleshWorkListChanged, 0 /* Not shared */, FALSE /* Reset */);
-  if (rc) {
-    Dos_Error(MB_CANCEL, rc, HWND_DESKTOP, pszSrcFile, __LINE__,
-              PCSZ_DOSCREATEEVENTSEM);
-    return FALSE;
-  }
+  rc = xDosCreateEventSem(NULL, &hevFleshWorkListChanged, 0 /* Not shared */, FALSE /* Reset */);
+  if (rc)
+    return FALSE;                       // Give up
 
   /* DbgMsg is time consuming

trunk/dll/flesh.h

@@ -23 +23 @@
 BOOL IsFleshWorkListEmpty();
 
-VOID SetFleshFocusDrive(CHAR chDriveLetter);
+VOID SetFleshFocusPath(PCSZ pszPath);
 
 #if 0 // 2015-08-03 SHL FIXME debug
-VOID WaitFleshWorkListEmpty();
+VOID WaitFleshWorkListEmpty(PCSZ pszDirName);
 #else
-#define WaitFleshWorkListEmpty(pszFileName) WaitFleshWorkListEmptyDbg(pszFileName, __FILE__, __LINE__)
-VOID WaitFleshWorkListEmptyDbg(PCSZ pszFileName, PCSZ pszSrcFile, UINT uSrcLineNo);
+#define WaitFleshWorkListEmpty(pszDirName) WaitFleshWorkListEmptyDbg(pszDirName, __FILE__, __LINE__)
+VOID WaitFleshWorkListEmptyDbg(PCSZ pszDirName, PCSZ pszSrcFile, UINT uSrcLineNo);
 #endif
 

trunk/dll/init.c

@@ -78 +78 @@
   14 Mar 09 GKY PCSZ strings moved to compile time initialization
   14 Mar 09 GKY Prevent execution of UM_SHOWME while drive scan is occuring replaces check for
-                saved drive containers.
+                saved drive containers.
   06 Jun 09 GKY Add option to show file system type or drive label in tree
   28 Jun 09 GKY Added AddBackslashToPath() to remove repeatative code.
@@ -85 +85 @@
   22 Jul 09 GKY Fix failure to restore the notebook setting for saving container states or not
   12 Sep 09 GKY Change protectonly check to check for VKBD being loaded instead of starting
-                command.com. Prevents hang (at least until a Dos program is started) on a system
-                that has a broken MDOS install.
+                command.com. Prevents hang (at least until a Dos program is started) on a system
+                that has a broken MDOS install.
   15 Nov 09 GKY Add more PCSZs
   22 Nov 09 GKY Fix FindSwapperDat so the check for large file support actually occurs if the
-                fall back to config.sys is used to find it; use bstripcr to streamline code.
+                fall back to config.sys is used to find it; use bstripcr to streamline code.
   13 Dec 09 GKY Fixed separate paramenters. Please note that appname should be used in
-                profile calls for user settings that work and are setable in more than one
-                miniapp; FM3Str should be used for setting only relavent to FM/2 or that
-                aren't user settable; realappname should be used for setting applicable to
-                one or more miniapp but not to FM/2
+                profile calls for user settings that work and are setable in more than one
+                miniapp; FM3Str should be used for setting only relavent to FM/2 or that
+                aren't user settable; realappname should be used for setting applicable to
+                one or more miniapp but not to FM/2
   17 JAN 10 GKY Changes to get working with Watcom 1.9 Beta (1/16/10). Mostly cast CHAR
-                CONSTANT * as CHAR *.
+                CONSTANT * as CHAR *.
   09 MAY 10 JBS Ticket 434: Make fDontSuggestAgain a "global" flag, not a per app flag
   23 Oct 10 GKY Changes to populate and utilize a HELPTABLE for context specific help
   20 Nov 10 GKY Rework scanning code to remove redundant scans, prevent double directory
-                entries in the tree container, fix related semaphore performance using
-                combination of event and mutex semaphores
+                entries in the tree container, fix related semaphore performance using
+                combination of event and mutex semaphores
   20 Nov 10 GKY Check that pTmpDir IsValid and recreate if not found; Fixes hangs caused
-                by temp file creation failures.
+                by temp file creation failures.
   03 Mar 11 SHL Try using FM3INI to create help instance if fm3.hlp not in current directory
   06 Aug 11 GKY Fixed failure to initalize pFM2SaveDirectory if TEMP and TMP were not present
-                or invalid
+                or invalid
   22 Oct 11 GKY Thread notes dialog now reopens on startup if it was open on shutdown.
   08 Jan 12 GKY Add support for changing PresParams in the notify status window
   04 Aug 12 GKY Changes to use Unlock to unlock files if Unlock.exe is in path both from menu/toolbar and as part of
-                copy, move and delete operations
+                copy, move and delete operations
   04 Aug 12 GKY Changes to allow copy and move over readonly files with a warning dialog; also added a warning dialog
-                for delete of readonly files
+                for delete of readonly files
   09 Feb 14 GKY Fix separate parameters. Moved to general page renamed separate settings
-                for apps.
+                for apps.
   09 Feb 14 GKY Modified wipeallf to allow suppression of the readonly warning on delete
-                of temporary files
+                of temporary files
   16 Feb 14 GKY Add "#" command line switch to workaround problem with blank command shell
-                started from fm2 after fm2 has been started with stdout and stderr
-                redirected to a file.
+                started from fm2 after fm2 has been started with stdout and stderr
+                redirected to a file.
   22 Feb 14 GKY Cleanup of readonly check code suppress spurious error on blocked directory
-                delete and eliminated the check on additional temp file deletes
+                delete and eliminated the check on additional temp file deletes
   23 Feb 14 JBS Ticket #515: Corrected a mis-coded call to strtol which was causing the traps
-                described in this ticket. (Also changed it to strtoul.)
+                described in this ticket. (Also changed it to strtoul.)
   01 Mar 14 JBS Ticket #524: Made "searchapath" thread-safe. Function names and signatures were changed.
-                So calls to these functions had to be changed.
+                So calls to these functions had to be changed.
   02 Mar 14 GKY Fixed typo that reversed the function of the saymsg dialog g/bzip check.
-                Added option to suppress message regarding missing bzip2.exe
-                or gzip.exe on TAR.B/GZ archives.
+                Added option to suppress message regarding missing bzip2.exe
+                or gzip.exe on TAR.B/GZ archives.
   30 Aug 14 GKY Add semaphore hmtxFiltering to prevent freeing dcd while filtering. Prevents
-                a trap when FM2 is shutdown while directory containers are still populating
+                a trap when FM2 is shutdown while directory containers are still populating
   02 Aug 15 GKY Serialize local hard drive scanning to reduce drive thrashing continue to scan
-                all other drive types in separate threads.
+                all other drive types in separate threads.
   12 Aug 15 JBS Ticket #522: Ensure no "highmem-unsafe" functions are called directly
-                Calls to unsafe Dos... functions have been changed to call the wrapped xDos... functions
+                Calls to unsafe Dos... functions have been changed to call the wrapped xDos... functions
   19 Aug 15 SHL Delete obsoletes
+  20 Aug 15 SHL Support PCSZ_DOS...SEM
 
 ***********************************************************************/
@@ -336 +337 @@
 PCSZ PCSZ_CM_ALLOCRECORD  = "CM_ALLOCRECORD";
 PCSZ PCSZ_QUERYCNRINFO    = "CM_QUERYCNRINFO";
-PCSZ PCSZ_DOSCREATEMUTEXSEM =  "DosCreateMutexSem";
-PCSZ PCSZ_DOSCREATEEVENTSEM =  "DosCreateEventSem";
+
+PCSZ PCSZ_DOSCREATEMUTEXSEM = "DosCreateMutexSem";
+PCSZ PCSZ_DOSREQUESTMUTEXSEM = "DosRequestMutexSem";
+PCSZ PCSZ_DOSRELEASEMUTEXSEM =  "DosReleaseMutexSem";
+PCSZ PCSZ_DOSCREATEEVENTSEM = "DosCreateEventSem";
+PCSZ PCSZ_DOSWAITEVENTSEM = "DosWaitEventSem";
+PCSZ PCSZ_DOSPOSTEVENTSEM = "DosPostEventSem";
+PCSZ PCSZ_DOSRESETEVENTSEM = "DosResetEventSem";
+
 PCSZ PCSZ_DOSDUPHANDLE    =  "DosDupHandle";
 PCSZ PCSZ_DOSGETINFOBLOCKS = "DosGetInfoBlocks";
@@ -812 +820 @@
                         FILE_SYSTEM | FILE_READONLY | FILE_HIDDEN |
                         FILE_ARCHIVED,
-                        &ffb, sizeof(ffb), &num_matches, FIL_STANDARD)) {
-        do {
+                        &ffb, sizeof(ffb), &num_matches, FIL_STANDARD)) {
+        do {
           strcpy(enddir, ffb.achName);
           p = strrchr(szTempName, '.');
           if (p) {
             p++;
-            ul = strtoul(p, NULL, 16);
+            ul = strtoul(p, NULL, 16);
             GetDosPgmName(ul, temp);
             if (!strstr(temp, "FM/2") &&
@@ -826 +834 @@
             }
           }
-        }
-        while (!DosFindNext(search_handle,
-                            &ffb, sizeof(ffb), &num_matches));
-        DosFindClose(search_handle);
+        }
+        while (!DosFindNext(search_handle,
+                            &ffb, sizeof(ffb), &num_matches));
+        DosFindClose(search_handle);
       }
       if (fs3.attrFile & FILE_DIRECTORY) {
@@ -836 +844 @@
         rc = DosCreateDir(szTempName, 0);
         if (!rc)
-          pTmpDir = xstrdup(szTempName, pszSrcFile, __LINE__);  // if writable
-        else
-          pTmpDir = xstrdup(pFM2SaveDirectory, pszSrcFile, __LINE__);
+          pTmpDir = xstrdup(szTempName, pszSrcFile, __LINE__);  // if writable
+        else
+          pTmpDir = xstrdup(pFM2SaveDirectory, pszSrcFile, __LINE__);
       }
     }
@@ -925 +933 @@
       CHAR szFullFilename[CCHMAXPATH];
       if (!SearchMultiplePathsForFile(profile, szFullFilename)) {
-        strcpy(inipath, szFullFilename);
+        strcpy(inipath, szFullFilename);
       } else {
-        strcpy(inipath, profile);
+        strcpy(inipath, profile);
       }
     } //fixme the DosCopies probably fail if the INI isn't in the FM2 directory GKY 06 Aug 11
@@ -936 +944 @@
     if (rc) {
       if (rc == ERROR_FILE_NOT_FOUND) {
-        DosCopy(PCSZ_FM3INIDOTBAK, PCSZ_FM3DOTINI, 0);
+        DosCopy(PCSZ_FM3INIDOTBAK, PCSZ_FM3DOTINI, 0);
       }
       rc = DosQueryPathInfo(inipath, FIL_STANDARD, &fs3, sizeof(fs3));
       if (rc)
-        fWantFirstTimeInit = TRUE;
+        fWantFirstTimeInit = TRUE;
     }
     if (!fWantFirstTimeInit) { //Check the ini file header and restore from backup if corupted
       if (!CheckFileHeader(inipath, "\xff\xff\xff\xff\x14\x00\x00\x00", 0L)) {
-        saymsg(MB_ENTER,HWND_DESKTOP, GetPString(IDS_DEBUG_STRING),
-               GetPString(IDS_INIFAILURETEXT));
-        DosCopy(PCSZ_FM3DOTINI, PCSZ_FM3INIDOTBAD, DCPY_EXISTING);
-        DosCopy(PCSZ_FM3INIDOTBAK, PCSZ_FM3DOTINI, DCPY_EXISTING);
-        if (!CheckFileHeader(inipath, "\xff\xff\xff\xff\x14\x00\x00\x00", 0L)) {
-          DosCopy(PCSZ_FM3DOTINI, PCSZ_FM3INIDOTBAD2, DCPY_EXISTING);
-          fWantFirstTimeInit = TRUE;
-        }
+        saymsg(MB_ENTER,HWND_DESKTOP, GetPString(IDS_DEBUG_STRING),
+               GetPString(IDS_INIFAILURETEXT));
+        DosCopy(PCSZ_FM3DOTINI, PCSZ_FM3INIDOTBAD, DCPY_EXISTING);
+        DosCopy(PCSZ_FM3INIDOTBAK, PCSZ_FM3DOTINI, DCPY_EXISTING);
+        if (!CheckFileHeader(inipath, "\xff\xff\xff\xff\x14\x00\x00\x00", 0L)) {
+          DosCopy(PCSZ_FM3DOTINI, PCSZ_FM3INIDOTBAD2, DCPY_EXISTING);
+          fWantFirstTimeInit = TRUE;
+        }
       }
     }
@@ -959 +967 @@
       fIniExisted = TRUE;
       if (fs3.attrFile & (FILE_READONLY | FILE_HIDDEN | FILE_SYSTEM)) {
-        fs3.attrFile &= ~(FILE_READONLY | FILE_HIDDEN | FILE_SYSTEM);
-        rc = xDosSetPathInfo(inipath, FIL_STANDARD, &fs3, sizeof(fs3), 0);
-        if (rc) {
-          Dos_Error(MB_ENTER, rc, HWND_DESKTOP, pszSrcFile, __LINE__,
-                      GetPString(IDS_INIREADONLYTEXT), inipath);
-        }
+        fs3.attrFile &= ~(FILE_READONLY | FILE_HIDDEN | FILE_SYSTEM);
+        rc = xDosSetPathInfo(inipath, FIL_STANDARD, &fs3, sizeof(fs3), 0);
+        if (rc) {
+          Dos_Error(MB_ENTER, rc, HWND_DESKTOP, pszSrcFile, __LINE__,
+                      GetPString(IDS_INIREADONLYTEXT), inipath);
+        }
       }
     }
@@ -1010 +1018 @@
           hwndHelp = WinCreateHelpInstance(hab, &hini);
           if (!hwndHelp)
-            Win_Error(HWND_DESKTOP, HWND_DESKTOP, pszSrcFile, __LINE__,
-                      "WinCreateHelpInstance failed for %s with error 0x%x",
-                      hini.pszHelpLibraryName, hini.ulReturnCode);
+            Win_Error(HWND_DESKTOP, HWND_DESKTOP, pszSrcFile, __LINE__,
+                      "WinCreateHelpInstance failed for %s with error 0x%x",
+                      hini.pszHelpLibraryName, hini.ulReturnCode);
         }
       }
@@ -1174 +1182 @@
   if (rc) {
     Dos_Error(MB_CANCEL, rc, HWND_DESKTOP, pszSrcFile, __LINE__,
-              PCSZ_DOSCREATEMUTEXSEM);
+              PCSZ_DOSCREATEMUTEXSEM);
   }
   rc = DosCreateMutexSem(NULL, &hmtxFM2Delete, 0L, FALSE);
   if (rc) {
     Dos_Error(MB_CANCEL, rc, HWND_DESKTOP, pszSrcFile, __LINE__,
-              PCSZ_DOSCREATEMUTEXSEM);
+              PCSZ_DOSCREATEMUTEXSEM);
   }
   rc = DosCreateMutexSem(NULL, &hmtxFiltering, 0L, FALSE);
   if (rc) {
     Dos_Error(MB_CANCEL, rc, HWND_DESKTOP, pszSrcFile, __LINE__,
-              PCSZ_DOSCREATEMUTEXSEM);
+              PCSZ_DOSCREATEMUTEXSEM);
   }
 

trunk/dll/init.h

@@ -44 +44 @@
                 all other drive types in separate threads.
   19 Aug 15 SHL Delete obsoletes
+  20 Aug 15 SHL Support PCSZ_DOS...SEM
 
 ***********************************************************************/
@@ -120 +121 @@
 extern PCSZ PCSZ_CM_ALLOCRECORD;
 extern PCSZ PCSZ_QUERYCNRINFO;
+
 extern PCSZ PCSZ_DOSCREATEMUTEXSEM;
+extern PCSZ PCSZ_DOSREQUESTMUTEXSEM;
+extern PCSZ PCSZ_DOSRELEASEMUTEXSEM;
+
 extern PCSZ PCSZ_DOSCREATEEVENTSEM;
+extern PCSZ PCSZ_DOSWAITEVENTSEM;
+extern PCSZ PCSZ_DOSPOSTEVENTSEM;
+extern PCSZ PCSZ_DOSRESETEVENTSEM;
+
 extern PCSZ PCSZ_DOSDUPHANDLE;
 extern PCSZ PCSZ_DOSGETINFOBLOCKS;

trunk/dll/treecnr.c

@@ -101 +101 @@
   12 Jul 15 GKY Fixed trap caused by pci->pszFileName being NullStr
   07 Aug 15 SHL Rework to use AddFleshWorkRequest rather than direct calls to Stubby/Flesh/Unflesh
+  20 Aug 15 SHL Sync with SetFleshFocusPath mods
 
 ***********************************************************************/
@@ -1092 +1093 @@
 #     endif
     }
-    DosPostEventSem(CompactSem);
+    xDosPostEventSem(CompactSem);
     if (!PostMsg((HWND) 0, WM_QUIT, MPVOID, MPVOID))
       WinSendMsg((HWND) 0, WM_QUIT, MPVOID, MPVOID);
@@ -1981 +1982 @@
           free(dir);
         else
-          SetFleshFocusDrive(*dir);
+          SetFleshFocusPath(dir);
       }
     }

trunk/dll/wrappers.c

@@ -6 +6 @@
   Wrappers with error checking
 
-  Copyright (c) 2006, 2008 Steven H.Levine
+  Copyright (c) 2006, 2015 Steven H.Levine
 
   22 Jul 06 SHL Baseline
@@ -28 +28 @@
                    "#if 0" block for quick implementation should FM/2 start to use them.
                    Among these. xDosOpenL and xWinUpper still need work. The rest are ready for use.
+  20 Aug 15 SHL Add xDos...MutexSem and xDos..EventSem wrappers
 
 ***********************************************************************/
@@ -68 +69 @@
 {
   APIRET        rc;
-  HFILE         hFileLow = *phFile;
+  HFILE hFileLow = *phFile;
 
   rc = DosDupHandle(hFile, &hFileLow);
@@ -324 +325 @@
   return apiret;
 }
+
+/**
+ * DosRequestMutexSem wrapper
+ */
+
+APIRET xDosRequestMutexSem(HMTX hmtx, ULONG ulTimeout)
+{
+  APIRET apiret = DosRequestMutexSem(hmtx, ulTimeout);
+
+  if (apiret && (ulTimeout == SEM_INDEFINITE_WAIT || apiret != ERROR_TIMEOUT)) {
+    Dos_Error(MB_CANCEL, apiret, HWND_DESKTOP, pszSrcFile, __LINE__,
+              PCSZ_DOSREQUESTMUTEXSEM);
+  }
+  return apiret;
+}
+
+/**
+ * DosReleaseMutexSem wrapper
+ */
+
+APIRET xDosReleaseMutexSem(HMTX hmtx)
+{
+  APIRET apiret = DosReleaseMutexSem(hmtx);
+
+  if (apiret) {
+    Dos_Error(MB_CANCEL, apiret, HWND_DESKTOP, pszSrcFile, __LINE__,
+              PCSZ_DOSRELEASEMUTEXSEM);
+  }
+  return apiret;
+}
+
+/**
+ * DosCreateEventSem wrapper
+ */
+
+APIRET xDosCreateEventSem (PSZ pszName,PHEV phev, ULONG flAttr, BOOL32 fState)
+{
+  APIRET apiret = DosCreateEventSem (pszName,phev, flAttr, fState);
+  if (apiret) {
+    Dos_Error(MB_CANCEL, apiret, HWND_DESKTOP, pszSrcFile, __LINE__,
+              PCSZ_DOSCREATEEVENTSEM);
+  }
+  return apiret;
+}
+
+/**
+ * DosWaitEventSem wrapper
+ */
+
+APIRET xDosWaitEventSem(HEV hev, ULONG ulTimeout)
+{
+  APIRET apiret = DosWaitEventSem(hev, ulTimeout);
+
+  if (apiret && (ulTimeout == SEM_INDEFINITE_WAIT || apiret != ERROR_TIMEOUT)) {
+    Dos_Error(MB_CANCEL, apiret, HWND_DESKTOP, pszSrcFile, __LINE__,
+              PCSZ_DOSWAITEVENTSEM);
+  }
+  return apiret;
+}
+
+/**
+ * DosPostEventSem wrapper
+ */
+
+APIRET xDosPostEventSem(HEV hev)
+{
+  APIRET apiret = DosPostEventSem(hev);
+
+  if (apiret && apiret != ERROR_ALREADY_POSTED) {
+    Dos_Error(MB_CANCEL, apiret, HWND_DESKTOP, pszSrcFile, __LINE__,
+              PCSZ_DOSPOSTEVENTSEM);
+  }
+  return apiret;
+}
+
+/**
+ * DosResetEventSem wrapper
+ */
+
+APIRET xDosResetEventSem(HEV hev, PULONG pulPostCt)
+{
+  APIRET apiret = DosResetEventSem(hev, pulPostCt);
+
+  if (apiret && apiret != ERROR_ALREADY_RESET) {
+    Dos_Error(MB_CANCEL, apiret, HWND_DESKTOP, pszSrcFile, __LINE__,
+              PCSZ_DOSRESETEVENTSEM);
+  }
+  return apiret;
+}
+
+/**
+ * DosFindFirst wrapper
+ */
 
 APIRET xDosFindFirst(PSZ pszFileSpec,
@@ -731 +825 @@
 /*
  * JBS: Wrappers for functions which...
- *      - are identified by klibc as "highmem-unsafe"
- *      - not yet used by FM/2
+ *      - are identified by klibc as "highmem-unsafe"
+ *      - not yet used by FM/2
  */
 

trunk/dll/wrappers.h

@@ -19 +19 @@
                    "#if 0" block in wrappers.c for quick implementation should FM/2 start to use them.
                    Among these. xDosOpenL and xWinUpper still need work. The rest are ready for use.
+  20 Aug 15 SHL Add xDos...MutexSem and xDos..EventSem wrappers
 
 ***********************************************************************/
@@ -81 +82 @@
                     ULONG  ulInfoLevel);        // 06 Oct 07 SHL Added
 
-#ifdef INCL_DOSPROCESS  // // PPIB PTIB
+#ifdef INCL_DOSPROCESS  // PPIB PTIB
 APIRET xDosGetInfoBlocks(PTIB *pptib,
                          PPIB *pppib);  // 2015-08-09 SHL added
+#endif
+
+#ifdef INCL_DOSSEMAPHORES       // HMTX HEV
+APIRET xDosRequestMutexSem(HMTX hmtx, ULONG ulTimeout);
+APIRET xDosReleaseMutexSem(HMTX hmtx);
+APIRET xDosCreateEventSem (PSZ pszName,PHEV phev, ULONG flAttr, BOOL32 fState);
+APIRET xDosWaitEventSem(HEV hev, ULONG ulTimeout);
+APIRET xDosPostEventSem(HEV hev);
+APIRET xDosResetEventSem(HEV hev, PULONG pulPostCt);
 #endif