Changeset 1369 for trunk/dll/init.c

Timestamp:

Jan 3, 2009, 7:43:34 PM (17 years ago)

Author:

Gregg Young

Message:

Add check for p-rotectonly system to gray out dos/win commandline choices etc. Ticket 325 It also fixes problem with some drives not being scanned on startup.

File:

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

trunk/dll/init.c

@@ -140 +140 @@
 #include "fortify.h"
 #include "excputil.h"                   // xbeginthread
+#include "systemf.h"                    // runemf2
 
 #ifdef __IBMC__
@@ -176 +177 @@
 BOOL fIniExisted;
 BOOL fLogFile;
+BOOL fProtectOnly;
 BOOL fReminimize;
 BOOL fWantFirstTimeInit;
@@ -698 +700 @@
   CLASSINFO clinfo;
   APIRET rc;
-  APIRET rcl = 1;
-  APIRET rcq = 1;
-  PFN pfnResVersion = (PFN)NULL;
-  ULONG RVMajor = 0;
-  ULONG RVMinor = 0;
-  ULONG ret = 0;
-  FILESTATUS3 fs3;                      // 25 Aug 07 SHL
+  APIRET rcl;
+  APIRET rcq;
+  PFN pfnResVersion;
+  ULONG RVMajor;
+  ULONG RVMinor;
+  ULONG ret;
+  FILESTATUS3 fs3;
   PSZ env;
   CHAR dllfile[CCHMAXPATH];
@@ -732 +734 @@
     }
   }
+
   rcl = DosLoadModule(NULL, 0, dllfile, &FM3ModHandle);
   if (rcl) {
@@ -739 +742 @@
     return FALSE;
   }
-  else {
+
     rc = DosExitList(EXLST_ADD, DeInitFM3DLL);
     if (rc) {
@@ -745 +748 @@
                "DosExitList");
     }
+
     rcq = DosQueryProcAddr(FM3ModHandle, 1, "ResVersion", &pfnResVersion);
     if (!rcq)
       ret = pfnResVersion(&RVMajor, &RVMinor);
-  }
+  else {
+    ret = 0;
+    RVMajor = 0;
+    RVMinor = 0;
+  }
+
   if (RVMajor < VERMAJOR || (RVMajor == VERMAJOR && RVMinor < VERMINOR)) {
     saymsg(MB_ENTER,
@@ -834 +843 @@
     }
       if (fs3.attrFile & FILE_DIRECTORY) {
-        APIRET ret = 0;
         strcpy(szTempName, env);
         MakeTempName(szTempName, NULL, 1);
-        ret = DosCreateDir(szTempName, 0);
-        if (!ret) {   //check writable
-          pTmpDir = xstrdup(szTempName, pszSrcFile, __LINE__);
+        rc = DosCreateDir(szTempName, 0);
+        if (!rc)
+          pTmpDir = xstrdup(szTempName, pszSrcFile, __LINE__);  // if writable
         }
       }
     }
-  }
 
   //Save the FM2 save directory name. This is the location of the ini, dat files etc.
@@ -1239 +1246 @@
     ULONG ulAppType;
 
-      FullPath = searchapath("PATH", "LVMGUI.CMD");
-      if (*FullPath)
-        fLVMGui = TRUE;
+    FullPath = searchapath("PATH", "LVMGUI.CMD");
+    if (*FullPath)
+      fLVMGui = TRUE;
     if (!DosQueryAppType("DFSOS2.EXE", &ulAppType))
       fDFSee = TRUE;
-      if (!DosQueryAppType("MINILVM.EXE", &ulAppType))
-        fMiniLVM = TRUE;
-      if (!DosQueryAppType("FDISK.EXE", &ulAppType))
-        fFDisk = TRUE;
-      if (!DosQueryAppType("LVM.EXE", &ulAppType))
-        fLVM = TRUE;
+    if (!DosQueryAppType("MINILVM.EXE", &ulAppType))
+      fMiniLVM = TRUE;
+    if (!DosQueryAppType("FDISK.EXE", &ulAppType))
+      fFDisk = TRUE;
+    if (!DosQueryAppType("LVM.EXE", &ulAppType))
+      fLVM = TRUE;
+
+    // Check to see if we are running protect only
+    if (!DosQueryAppType(GetCmdSpec(TRUE), &ulAppType)) {
+      ret = runemf2(SEPARATE | WINDOWED | BACKGROUND | MINIMIZED,
+                    (HWND) 0, pszSrcFile, __LINE__, NULL, NULL,
+                    "%s /C exit", GetCmdSpec(TRUE));
+      if (ret == ERROR_SMG_INVALID_PROGRAM_TYPE)
+        fProtectOnly = TRUE;
+    }
+    else
+      fProtectOnly = TRUE;
   }
 
@@ -1467 +1485 @@
         sprintf(szKey, "%s.DirCnrDir.%lu", GetPString(IDS_SHUTDOWNSTATE), x);
         size = sizeof(szDir);
-        if (PrfQueryProfileData(fmprof, FM3Str, szKey, (PVOID) szDir, &size)) {
-          drvNum = toupper(*szDir) - 'A';
+        if (PrfQueryProfileData(fmprof, FM3Str, szKey, (PVOID) szDir, &size) &&
+            (fSwitchTreeOnFocus || fSwitchTree)) {
+          drvNum = toupper(*szDir) - 'A';
           fDrivetoSkip[drvNum] = TRUE;
         }