Changeset 1560

Timestamp:

Mar 4, 2011, 1:18:51 AM (14 years ago)

Author:

Steven Levine

Message:

Try using FM3INI to create help instance if fm3.hlp not in current directory

File:

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

trunk/dll/init.c

@@ -103 +103 @@
   20 Nov 10 GKY Check that pTmpDir IsValid and recreate if not found; Fixes hangs caused
                 by temp file creation failures.
+  03 Mar 11 SHL Try using FM3INI to create help instance if fm3.hlp not in current directory
 
 ***********************************************************************/
@@ -926 +927 @@
   memset(&hini, 0, sizeof(HELPINIT));
   hini.cb = sizeof(HELPINIT);
-  hini.ulReturnCode = 0;
-  hini.pszTutorialName = NULL;
+  // hini.ulReturnCode = 0;
+  // hini.pszTutorialName = NULL;
   hini.phtHelpTable = (PHELPTABLE) MAKELONG(ID_HELPTABLE, 0xffff);
   hini.hmodAccelActionBarModule = (HMODULE) 0;
-  hini.idAccelTable = 0;
-  hini.idActionBar = 0;
+  // hini.idAccelTable = 0;
+  // hini.idActionBar = 0;
   hini.pszHelpWindowTitle = (PSZ)GetPString(IDS_FM2HELPTITLETEXT);
   hini.hmodHelpTableModule = FM3ModHandle;
@@ -938 +939 @@
   hwndHelp = WinCreateHelpInstance(hab, &hini);
   if (!hwndHelp) {
-    static CHAR helppath[CCHMAXPATH];   // fixme to be local?
-
+    CHAR helppath[CCHMAXPATH];
     env = getenv("FM3INI");
     if (env) {
@@ -950 +950 @@
           hini.pszHelpLibraryName = helppath;
           hwndHelp = WinCreateHelpInstance(hab, &hini);
+          if (!hwndHelp)
+            Win_Error(HWND_DESKTOP, HWND_DESKTOP, pszSrcFile, __LINE__, "WinCreateHelpInstance failed for %s with error 0x%x", hini.pszHelpLibraryName, hini.ulReturnCode);
         }
       }