Changeset 1394 for trunk/dll/init.c

Timestamp:

Feb 5, 2009, 5:17:25 AM (17 years ago)

Author:

Steven Levine

Message:

Ticket 340: Convert GetPString to use STRINGTABLE.

Drop fm3dll.str and mkstr.exe from makefiles and wpi builders

Convert many functions to expect PCSZ arguments.
Correct walk, compare and dirsizes dialog setups to ignore saved dialog size
Drop copyright.c logic from makefile

File:

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

trunk/dll/init.c

@@ -7 +7 @@
 
   Copyright (c) 1993-98 M. Kimes
-  Copyright (c) 2001, 2008 Steven H. Levine
+  Copyright (c) 2001, 2009 Steven H. Levine
 
   11 Jun 02 SHL Add CheckVersion
@@ -64 +64 @@
   28 Dec 08 GKY Check for LVM.EXE and remove Refresh removable media menu item as appropriate
   28 Dec 08 GKY Rework partition submenu to gray out unavailable items (check for existence of files)
-                and have no default choice.
+                and have no default choice.
   01 Jan 09 GKY Add option to rescan tree container on eject of removable media
   03 Jan 09 GKY Avoid dbl scan of drive on startup by checking for first rescan drive.
   03 Jan 09 GKY Check for system that is protectonly to gray out Dos/Win command lines and prevent
-                Dos/Win programs from being inserted into the execute dialog with message why.
+                Dos/Win programs from being inserted into the execute dialog with message why.
   11 Jan 09 GKY Move strings that shouldn't be translated (font names etc) compile time variables
+  03 Feb 09 SHL Switch to STRINGTABLE
 
 ***********************************************************************/
@@ -387 +388 @@
                           unsigned ulFlag)
 {
-  CHAR *env;
-  CHAR stringfile[CCHMAXPATH];
-  FILESTATUS3 fsa;
-  APIRET rc;
-
   switch (ulFlag) {
   case 0:
     FM3DllHandle = hModule;
-    strcpy(stringfile, "FM3RES.STR");
-    env = getenv("FM3INI");
-    if (env) {
-      DosError(FERR_DISABLEHARDERR);
-      rc = DosQueryPathInfo(env, FIL_STANDARD, &fsa, sizeof(fsa));
-      if (!rc) {
-        if (fsa.attrFile & FILE_DIRECTORY) {
-          BldFullPathName(stringfile, env, "FM3RES.STR");
-          DosError(FERR_DISABLEHARDERR);
-          if (DosQueryPathInfo(stringfile, FIL_STANDARD, &fsa, sizeof(fsa)))
-            strcpy(stringfile, "FM3RES.STR");
-        }
-      }
-    }
-    LoadStrings(stringfile);
 
     DosError(FERR_DISABLEHARDERR);
@@ -506 +487 @@
                                     unsigned long ulFlag)
 {
-  CHAR *env;
-  CHAR stringfile[CCHMAXPATH];
-  FILESTATUS3 fsa;
-  APIRET rc;
-
   switch (ulFlag) {
   case 0:
@@ -516 +492 @@
       return 0UL;
     FM3DllHandle = hModule;
-    strcpy(stringfile, "FM3RES.STR");
-    env = getenv("FM3INI");
-    if (env) {
-      DosError(FERR_DISABLEHARDERR);
-      rc = DosQueryPathInfo(env, FIL_STANDARD, &fsa, sizeof(fsa));
-      if (!rc) {
-        if (fsa.attrFile & FILE_DIRECTORY) {
-          BldFullPathName(stringfile, env, "FM3RES.STR");
-          DosError(FERR_DISABLEHARDERR);
-          if (DosQueryPathInfo(stringfile, FIL_STANDARD, &fsa, sizeof(fsa)))
-            strcpy(stringfile, "FM3RES.STR");
-        }
-      }
-    }
-    LoadStrings(stringfile);
 
     DosError(FERR_DISABLEHARDERR);
@@ -747 +708 @@
   ULONG size;
 
-  if (!StringsLoaded()) {
-    saymsg(MB_ENTER,
-           HWND_DESKTOP,
-           "Error",
-           "FM3RES.STR isn't in right format, at least "
-           "for this version of FM/2.");
-    return FALSE;
-  }
-
   strcpy(dllfile, "FM3RES");
   env = getenv("FM3INI");
@@ -1051 +1003 @@
   hini.idAccelTable = 0;
   hini.idActionBar = 0;
-  hini.pszHelpWindowTitle = GetPString(IDS_FM2HELPTITLETEXT);
+  hini.pszHelpWindowTitle = (PSZ)GetPString(IDS_FM2HELPTITLETEXT);
   hini.fShowPanelId = CMIC_HIDE_PANEL_ID;
   hini.pszHelpLibraryName = "FM3.HLP";
@@ -1298 +1250 @@
     if (!DosQueryAppType(GetCmdSpec(TRUE), &ulAppType)) {
       ret = runemf2(SEPARATE | WINDOWED | BACKGROUND | MINIMIZED,
-                    (HWND) 0, pszSrcFile, __LINE__, NULL, NULL,
-                    "%s /C exit", GetCmdSpec(TRUE));
+                    (HWND) 0, pszSrcFile, __LINE__, NULL, NULL,
+                    "%s /C exit", GetCmdSpec(TRUE));
       if (ret == ERROR_SMG_INVALID_PROGRAM_TYPE)
-        fProtectOnly = TRUE;
+        fProtectOnly = TRUE;
     }
     else