Changeset 885

Timestamp:

Dec 16, 2007, 8:52:39 PM (18 years ago)

Author:

Gregg Young

Message:

Replace explore.exe with WPURLDEFAULTSETTINGS for runhttp fall back Ticket 179

Location:

trunk/dll

Files:

• fm3dll.h (modified) (1 diff)
• init.c (modified) (1 diff)
• mle.c (modified) (1 diff)
• newview.c (modified) (1 diff)

trunk/dll/fm3dll.h

@@ -1440 +1440 @@
   binview[CCHMAXPATH], bined[CCHMAXPATH],
   dircompare[CCHMAXPATH], szDefArc[CCHMAXPATH],
-  ftprun[CCHMAXPATH], httprun[CCHMAXPATH], targetdir[CCHMAXPATH];
+  ftprun[CCHMAXPATH], httprun[CCHMAXPATH], httprund[CCHMAXPATH], targetdir[CCHMAXPATH];
 DATADEF HMODULE FM3DllHandle, FM3ModHandle;
 DATADEF CHAR *quicktool[50];

trunk/dll/init.c

@@ -1186 +1186 @@
   size = sizeof(ftprun);
   PrfQueryProfileData(fmprof, appname, "FTPRun", ftprun, &size);
-  if (!*ftprun && !size)
+  if (!*ftprun || !size)
     strcpy(ftprun, "ftppm.exe");
   size = sizeof(httprun);
   PrfQueryProfileData(fmprof, appname, "HTTPRun", httprun, &size);
-  if (!*httprun && !size)
-    strcpy(httprun, "explore.exe -q");
+  if (!*httprun || !size){
+    size = sizeof(httprun);
+    PrfQueryProfileData(HINI_USERPROFILE, "WPURLDEFAULTSETTINGS",
+                        "DefaultBrowserExe", httprun, &size);
+    PrfQueryProfileData(HINI_PROFILE, "WPURLDEFAULTSETTINGS",
+                        "DefaultWorkingDir", httprund, &size);
+  }
   size = sizeof(lasttoolbox);
   PrfQueryProfileData(fmprof, FM3Str, "LastToolBox", lasttoolbox,

trunk/dll/mle.c

@@ -181 +181 @@
           else if (!ftp && *httprun)
             runemf2(SEPARATE | WINDOWED,
-                    h, NULL, NULL, "%s %s", httprun, temp);
+                    h, httprund, NULL, "%s %s", httprun, temp);
         }
       }

trunk/dll/newview.c

@@ -2287 +2287 @@
                 goto NoAdd;
               case 1:
-                if (*urld->url)
-                  runemf2(SEPARATE | WINDOWED,
-                          hwnd, NULL, NULL, "%s %s", httprun, urld->url);
+                       if (*urld->url)
+                         runemf2(SEPARATE | WINDOWED,
+                               hwnd, httprund, NULL, "%s %s", httprun, urld->url);
                 free(urld);
                 goto NoAdd;