Changeset 1444 for trunk/dll/init.c

Timestamp:

Jul 23, 2009, 1:24:23 AM (16 years ago)

Author:

Gregg Young

Message:

Rework of drivebar to rescan all drives and refresh media buttons and menu items grey out inappropriate menu items. Streamline Tree scan code and use semaphores to serialize access. Add NOEASUPPORT and LOCALHD driveflag; .LONGNAME usage fixes; (Tickets 377-386)

File:

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

trunk/dll/init.c

@@ -82 +82 @@
   28 Jun 09 GKY Added AddBackslashToPath() to remove repeatative code.
   12 Jul 09 GKY Add xDosQueryAppType and xDoxAlloc... to allow FM/2 to load in high memory
+  22 Jul 09 GKY Code changes to use semaphores to serialize drive scanning
+  22 Jul 09 GKY Fix failure to restore the notebook setting for saving container states or not
 
 ***********************************************************************/
@@ -180 +182 @@
 HMTX hmtxFM2Delete;
 HMTX hmtxFM2Globals;
+HMTX hmtFillingTreeCnr;
+HEV  hevInitialCnrScanComplete;
 ULONG OS2ver[2];
 PFNWP PFNWPCnr;
@@ -1088 +1092 @@
   if (DosCreateMutexSem(NULL, &hmtxFM2Delete, 0L, FALSE))
     Dos_Error(MB_CANCEL, rc, HWND_DESKTOP, pszSrcFile, __LINE__,
-              PCSZ_DOSCREATEMUTEXSEM);
+              PCSZ_DOSCREATEMUTEXSEM);
+  if (DosCreateMutexSem(NULL, &hmtFillingTreeCnr, 0L, FALSE))
+    Dos_Error(MB_CANCEL, rc, HWND_DESKTOP, pszSrcFile, __LINE__,
+              PCSZ_DOSCREATEMUTEXSEM);
+  if (DosCreateEventSem(NULL, &hevInitialCnrScanComplete, 0L, FALSE))
+    Dos_Error(MB_CANCEL, rc, HWND_DESKTOP, pszSrcFile, __LINE__,
+              PCSZ_DOSCREATEMUTEXSEM);
 
   /*
@@ -1382 +1392 @@
   size = sizeof(BOOL);
   PrfQueryProfileData(fmprof, appname, "ConfirmDelete", &fConfirmDelete, &size);
-  /*size = sizeof(BOOL);   Replaced by UM_SHOWME check 3/14/09 GKY
+  size = sizeof(BOOL);  
   PrfQueryProfileData(fmprof, FM3Str, "SaveState", &fSaveState, &size);
-  if (fSaveState && (fSwitchTreeOnFocus || fSwitchTree) &&
-      (!strcmp(realappname, FM3Str) || !strcmp(realappname, "FM/4"))) {
-    CHAR szKey[STATE_NAME_MAX_BYTES + 80];
-    CHAR szDir[CCHMAXPATH];
-    ULONG drvNum;
-
-    if (!strcmp(realappname, "FM/4"))
-      strcpy(szKey, "FM/4 Dir1");
-    else
-      sprintf(szKey, "%s.DirCnrDir.0", PCSZ_SHUTDOWNSTATE);
-    size = sizeof(szDir);
-    if (PrfQueryProfileData(fmprof, appname, szKey, szDir, &size)) {
-      drvNum = toupper(*szDir) - 'A';
-      fDrivetoSkip[drvNum] = TRUE;
-    }
-  } */
   size = sizeof(BOOL);
   PrfQueryProfileData(fmprof, appname, "SyncUpdates", &fSyncUpdates, &size);