Changeset 886

Timestamp:

Dec 17, 2007, 11:49:35 PM (18 years ago)

Author:

Gregg Young

Message:

Make WPURLDEFAULTSETTINGS the fall back for ftprun Ticket 182

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], httprund[CCHMAXPATH], targetdir[CCHMAXPATH];
+  ftprun[CCHMAXPATH], ftprund[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)
-    strcpy(ftprun, "ftppm.exe");
+  if (!*ftprun){
+    size = sizeof(ftprun);
+    PrfQueryProfileData(HINI_USERPROFILE, "WPURLDEFAULTSETTINGS",
+                        "DefaultBrowserExe", ftprun, &size);
+    PrfQueryProfileData(HINI_USERPROFILE, "WPURLDEFAULTSETTINGS",
+                        "DefaultWorkingDir", ftprund, &size);
+  }
   size = sizeof(httprun);
   PrfQueryProfileData(fmprof, appname, "HTTPRun", httprun, &size);
-  if (!*httprun || !size){
+  if (!*httprun){
     size = sizeof(httprun);
     PrfQueryProfileData(HINI_USERPROFILE, "WPURLDEFAULTSETTINGS",
                         "DefaultBrowserExe", httprun, &size);
-    PrfQueryProfileData(HINI_PROFILE, "WPURLDEFAULTSETTINGS",
+    PrfQueryProfileData(HINI_USERPROFILE, "WPURLDEFAULTSETTINGS",
                         "DefaultWorkingDir", httprund, &size);
   }

trunk/dll/mle.c

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

trunk/dll/newview.c

@@ -2295 +2295 @@
                 if (*urld->url)
                   runemf2(SEPARATE | WINDOWED,
-                          hwnd, NULL, NULL, "%s %s", ftprun, urld->url);
+                          hwnd, ftprund, NULL, "%s %s", ftprun, urld->url);
                 free(urld);
                 goto NoAdd;