Changeset 1369

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.

Location:

trunk/dll

Files:

• datamin.c (modified) (1 diff)
• fm3dll.str (modified) (1 diff)
• fm3str.h (modified) (1 diff)
• init.c (modified) (9 diffs)
• init.h (modified) (1 diff)
• mainwnd.c (modified) (1 diff)
• mainwnd2.c (modified) (1 diff)
• systemf.c (modified) (4 diffs)
• valid.c (modified) (1 diff)

trunk/dll/datamin.c

@@ -384 +384 @@
       WinCheckMenuItem(hwndMenu, MINI_BORING, fDullMin);
       WinCheckMenuItem(hwndMenu, MINI_INCLREMOTE, fDataInclRemote);
+      if (fProtectOnly) {
+        WinEnableMenuItem(hwndMenu, IDM_DOSCOMMANDLINE, FALSE);
+        WinEnableMenuItem(hwndMenu, IDM_WINFULLSCREEN, FALSE);
+      }
       NoFloat = TRUE;
       if (!PopupMenu(hwnd, hwnd, hwndMenu))

trunk/dll/fm3dll.str

@@ -49 +49 @@
 Edit
 10.System Proportional
-
+The file %s is a Dos or Windows executible, however Dos and WinOS2 are not currently activated on this system.
 
 8.Helvetica

trunk/dll/fm3str.h

@@ -85 +85 @@
 #define IDS_EDITTEXT                                          48
 #define IDS_10SYSPROTEXT                                      49
+#define IDS_NOTPROTECTONLYEXE                                 50
 #define IDS_8HELVTEXT                                         52
 #define IDS_6HELVTEXT                                         53

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;
         }

trunk/dll/init.h

@@ -71 +71 @@
 extern BOOL fIniExisted;
 extern BOOL fLogFile;
+extern BOOL fProtectOnly;
 extern BOOL fReminimize;
 extern BOOL fWantFirstTimeInit;

trunk/dll/mainwnd.c

@@ -5790 +5790 @@
     CfgMenuInit(hwndMenu, FALSE);        // 14 Feb 08 SHL
     SetConditionalCascade(hwndMenu, IDM_COMMANDLINESUBMENU, IDM_COMMANDLINE);
+    if (fProtectOnly) {
+      WinEnableMenuItem(hwndMenu, IDM_DOSCOMMANDLINE, FALSE);
+      WinEnableMenuItem(hwndMenu, IDM_WINFULLSCREEN, FALSE);
+    }
     SetConditionalCascade(hwndMenu, IDM_TOOLSUBMENU, IDM_TOOLBAR);
     SetConditionalCascade(hwndMenu, IDM_AUTOVIEWSUBMENU, IDM_AUTOVIEW);

trunk/dll/mainwnd2.c

@@ -814 +814 @@
         CfgMenuInit(hwndMenu, FALSE);   // 14 Feb 08 SHL
         SetConditionalCascade(hwndMenu, IDM_COMMANDLINESUBMENU, IDM_COMMANDLINE);
+        if (fProtectOnly) {
+          WinEnableMenuItem(hwndMenu, IDM_DOSCOMMANDLINE, FALSE);
+          WinEnableMenuItem(hwndMenu, IDM_WINFULLSCREEN, FALSE);
+        }
         SetConditionalCascade(hwndMenu, IDM_COMMANDSMENU, IDM_DOITYOURSELF);
         SetConditionalCascade(hwndMenu, IDM_TOOLSUBMENU, IDM_TOOLBAR);

trunk/dll/systemf.c

@@ -674 +674 @@
   BOOL useTermQ = FALSE;
   char szTempdir[CCHMAXPATH];
+  BOOL fNoErrorMsg = FALSE;
 
   typedef struct {
@@ -728 +729 @@
       ; // loop
   }
+
+  if (!stricmp(pszCallingFile, "init.c"))
+    fNoErrorMsg = TRUE;
 
   if (!*pszPgm) {
@@ -872 +876 @@
         if (pszDirectory && *pszDirectory)
           switch_to(szSavedir);
-        if (ret) {
+        if (ret && !fNoErrorMsg) {
           Dos_Error(MB_ENTER,ret,hwnd,pszSrcFile,__LINE__,
                     GetPString(IDS_DOSEXECPGMFAILEDTEXT), pszPgm,
@@ -1130 +1134 @@
 
       if (ret && ret != ERROR_SMG_START_IN_BACKGROUND) {
+        if (!fNoErrorMsg)
         Dos_Error(MB_CANCEL,ret,hwnd,pszSrcFile,__LINE__,
                   GetPString(IDS_DOSSTARTSESSIONFAILEDTEXT),pszPgm,pszArgs,

trunk/dll/valid.c

@@ -600 +600 @@
       strcat(fname, ".");
       ret = DosQueryAppType(fname, &apptype);
-    } //fixme protectonly BMT GKY 23 Dec 08
-    if ((!ret && (!apptype ||
-                  (apptype &
-                   (FAPPTYP_NOTWINDOWCOMPAT |
-                    FAPPTYP_WINDOWCOMPAT |
-                    FAPPTYP_WINDOWAPI |
-                    FAPPTYP_BOUND |
-                    FAPPTYP_DOS |
-                    FAPPTYP_WINDOWSREAL |
-                    FAPPTYP_WINDOWSPROT |
-                    FAPPTYP_32BIT |
-                    0x1000)))) ||
-        (p && (!stricmp(p, ".CMD") || !stricmp(p, ".BAT"))))
+    }
+    if (!fProtectOnly) {
+      if ((!ret && (!apptype ||
+                    (apptype &
+                     (FAPPTYP_NOTWINDOWCOMPAT |
+                      FAPPTYP_WINDOWCOMPAT |
+                      FAPPTYP_WINDOWAPI |
+                      FAPPTYP_BOUND |
+                      FAPPTYP_DOS |
+                      FAPPTYP_WINDOWSREAL |
+                      FAPPTYP_WINDOWSPROT |
+                      FAPPTYP_32BIT |
+                      0x1000)))) ||
+          (p && (!stricmp(p, ".CMD") || !stricmp(p, ".BAT") || !stricmp(p, ".BMT"))))
+        return TRUE;
+    }
+    else if ((!ret && (!apptype ||
+                       (apptype &
+                        (FAPPTYP_WINDOWSREAL |
+                         FAPPTYP_WINDOWSPROT |
+                         FAPPTYP_32BIT |
+                         0x1000)))) ||
+             (p && (!stricmp(p, ".CMD") || !stricmp(p, ".BMT"))))
       return TRUE;
+    if (fProtectOnly && (apptype &
+                       (FAPPTYP_NOTWINDOWCOMPAT |
+                        FAPPTYP_WINDOWCOMPAT |
+                        FAPPTYP_WINDOWAPI |
+                        FAPPTYP_BOUND |
+                        FAPPTYP_DOS)) &&
+        (p && (!stricmp(p, ".EXE") || !stricmp(p, ".COM"))))
+      saymsg(MB_OK,
+             HWND_DESKTOP,
+             NullStr,
+             GetPString(IDS_NOTPROTECTONLYEXE),
+             filename);
   }
   return FALSE;