Changeset 1856 for trunk/dll/init.c

Timestamp:

Aug 18, 2015, 7:12:52 PM (10 years ago)

Author:

Steven Levine

Message:

Rework Flesh/Stubby etc. to avoid running on thread 1
Should be ready for release after spurious traps resolved
DbgMsg calls retained - delete/disable before release

File:

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

trunk/dll/init.c

@@ -7 +7 @@
 
   Copyright (c) 1993-98 M. Kimes
-  Copyright (c) 2001, 2010 Steven H. Levine
+  Copyright (c) 2001, 2015 Steven H. Levine
 
   11 Jun 02 SHL Add CheckVersion
@@ -211 +211 @@
 #include "excputil.h"                   // xbeginthread
 #include "systemf.h"                    // runemf2
+
 #if 0
 #define  __PMPRINTF__
 #include "PMPRINTF.H"
 #endif
+
 extern int _CRT_init(void);
 extern void _CRT_term(void);
@@ -236 +238 @@
 HMTX hmtxFM2Delete;
 HMTX hmtxFM2Globals;
+
+#if 0 // 2015-08-04 SHL FIXME to be gone
 HMTX hmtxScanning;
+#endif // 2015-08-04 SHL FIXME to be gone
+
+#if 0 // 2015-08-07 SHL FIXME to be gone
 HMTX hmtxScanningLocalHD;
-HMTX hmtxScanningLocal;
+#endif // 2015-08-07 SHL FIXME to be gone
+
 HMTX hmtxFiltering;
+
+#if 0 // 2015-08-04 SHL FIXME to be gone
 HEV  hevTreeCnrScanComplete;
+#endif // 2015-08-04 SHL FIXME to be gone
+
 ULONG OS2ver[2];
 PFNWP PFNWPCnr;
@@ -249 +261 @@
 ULONG ulTimeFmt;
 ULONG ulDateFmt;
-ULONG ulScanPostCnt;
 BOOL fDontSuggestAgain;
 BOOL fInitialDriveScan;
@@ -712 +723 @@
   }
 
-    rc = DosExitList(EXLST_ADD, DeInitFM3DLL);
-    if (rc) {
-      Dos_Error(MB_ENTER, rc, HWND_DESKTOP, pszSrcFile, __LINE__,
-               "DosExitList");
-    }
-
-    rcq = DosQueryProcAddr(FM3ModHandle, 1, "ResVersion", &pfnResVersion);
-    if (!rcq)
-      ret = pfnResVersion(&RVMajor, &RVMinor);
+  rc = DosExitList(EXLST_ADD, DeInitFM3DLL);
+  if (rc) {
+    Dos_Error(MB_ENTER, rc, HWND_DESKTOP, pszSrcFile, __LINE__,
+             "DosExitList");
+  }
+
+  rcq = DosQueryProcAddr(FM3ModHandle, 1, "ResVersion", &pfnResVersion);
+  if (!rcq)
+    ret = pfnResVersion(&RVMajor, &RVMinor);
   else {
     ret = 0;
@@ -739 +750 @@
     return FALSE;
   }
+
 #if 0
   PmPrintfDisplayInterfaceVersionInfo();
   PmPrintfQueueNameThisProcess(NULL);
 #endif
+
   if (!*profile)
     strcpy(profile, PCSZ_FM3DOTINI);
@@ -769 +782 @@
   }
 
-  //Save the FM2 save directory name. This is the location of the ini, dat files etc.
+  // Save the FM2 save directory name. This is the location of the ini, dat files etc.
   rc = save_dir2(temp);
   if (rc) {
@@ -885 +898 @@
   }
 
+  if (!StartFleshWorkThread())
+    return FALSE;
+
   // timer messages are sent from a separate thread -- start it
   if (!StartTimer()) {
@@ -1166 +1182 @@
                    sizeof(PVOID));
 
-  if (DosCreateMutexSem(NULL, &hmtxFM2Globals, 0L, FALSE))
+  rc = DosCreateMutexSem(NULL, &hmtxFM2Globals, 0L, FALSE);
+  if (rc) {
     Dos_Error(MB_CANCEL, rc, HWND_DESKTOP, pszSrcFile, __LINE__,
               PCSZ_DOSCREATEMUTEXSEM);
+  }
+#if 0 // 2015-08-04 SHL FIXME to be gone
   if (DosCreateMutexSem(NULL, &hmtxScanning, 0L, TRUE))
     Dos_Error(MB_CANCEL, rc, HWND_DESKTOP, pszSrcFile, __LINE__,
               PCSZ_DOSCREATEMUTEXSEM);
-  if (DosCreateMutexSem(NULL, &hmtxScanningLocalHD, 0L, FALSE))
+#endif // 2015-08-04 SHL FIXME to be gone
+#if 0 // 2015-08-07 SHL FIXME to be gone
+  rc = DosCreateMutexSem(NULL, &hmtxScanningLocalHD, 0L, FALSE);
+  if (rc) {
     Dos_Error(MB_CANCEL, rc, HWND_DESKTOP, pszSrcFile, __LINE__,
               PCSZ_DOSCREATEMUTEXSEM);
-    if (DosCreateMutexSem(NULL, &hmtxScanningLocal, 0L, FALSE))
-    Dos_Error(MB_CANCEL, rc, HWND_DESKTOP, pszSrcFile, __LINE__,
-              PCSZ_DOSCREATEMUTEXSEM);
-  if (DosCreateMutexSem(NULL, &hmtxFM2Delete, 0L, FALSE))
+  }
+#endif // 2015-08-07 SHL FIXME to be gone
+  rc = DosCreateMutexSem(NULL, &hmtxFM2Delete, 0L, FALSE);
+  if (rc) {
     Dos_Error(MB_CANCEL, rc, HWND_DESKTOP, pszSrcFile, __LINE__,
               PCSZ_DOSCREATEMUTEXSEM);
-  if (DosCreateMutexSem(NULL, &hmtxFiltering, 0L, FALSE))
+  }
+  rc = DosCreateMutexSem(NULL, &hmtxFiltering, 0L, FALSE);
+  if (rc) {
     Dos_Error(MB_CANCEL, rc, HWND_DESKTOP, pszSrcFile, __LINE__,
               PCSZ_DOSCREATEMUTEXSEM);
-  if (DosCreateEventSem(NULL, &hevTreeCnrScanComplete, 0L, TRUE))
+  }
+#if 0 // 2015-08-04 SHL FIXME to be gone
+  rc = DosCreateEventSem(NULL, &hevTreeCnrScanComplete, 0L, TRUE);
+  if (rc) {
     Dos_Error(MB_CANCEL, rc, HWND_DESKTOP, pszSrcFile, __LINE__,
               PCSZ_DOSCREATEEVENTSEM);
+  }
+#endif // 2015-08-04 SHL FIXME to be gone
 
   /**
@@ -1653 +1682 @@
   PrfQueryProfileData(fmprof, FM3Str, "DontAskGzip", &fDontAskGzip, &size);
 
+  // 2015-08-11 SHL FIXME debug
+  DbgMsg(pszSrcFile, __LINE__, "ShowEnv %u SwitchTree %u SwitchTreeExpand %u SwitchTreeOnFocus %u CollapseFirst %u", fShowEnv, fSwitchTreeOnDirChg, fSwitchTreeExpand, fSwitchTreeOnFocus, fCollapseFirst);
+  DbgMsg(pszSrcFile, __LINE__, "RScanLocal %u RScanRemote %u RScanVirtual %u RScanSlow RScanNoWrite %u", fRScanLocal, fRScanRemote, fRScanVirtual, fRScanSlow, fRScanNoWrite);
+
   LoadDetailsSwitches(PCSZ_DIRCNR, &dsDirCnrDefault, FALSE);