Bug 513742: Remove support for DDE from toolkit. r=jimm

Mossop · Mossop · commit 449b275587dc · 2019-01-22T14:48:43.000-08:00
Differential Revision: https://phabricator.services.mozilla.com/D19075 --HG-- extra : source : 4ef3cc37f719d02443a2058192fdb4c61d3e3dca
diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
@@ -425,70 +425,6 @@ static ArgResult CheckArgExists(const char* aArg) {
   return CheckArg(aArg, nullptr, CheckArgFlag::None);
 }
 
-#if defined(XP_WIN)
-/**
- * Check for a commandline flag from the windows shell and remove it from the
- * argv used when restarting. Flags MUST be in the form -arg.
- *
- * @param aArg the parameter to check. Must be lowercase.
- */
-static ArgResult CheckArgShell(const char* aArg) {
-  char** curarg = gRestartArgv + 1;  // skip argv[0]
-
-  while (*curarg) {
-    char* arg = curarg[0];
-
-    if (arg[0] == '-') {
-      ++arg;
-
-      if (strimatch(aArg, arg)) {
-        do {
-          *curarg = *(curarg + 1);
-          ++curarg;
-        } while (*curarg);
-
-        --gRestartArgc;
-
-        return ARG_FOUND;
-      }
-    }
-
-    ++curarg;
-  }
-
-  return ARG_NONE;
-}
-
-/**
- * Enabled Native App Support to process DDE messages when the app needs to
- * restart and the app has been launched by the Windows shell to open an url.
- * When aWait is false this will process the DDE events manually. This prevents
- * Windows from displaying an error message due to the DDE message not being
- * acknowledged.
- */
-static void ProcessDDE(nsINativeAppSupport* aNative, bool aWait) {
-  // When the app is launched by the windows shell the windows shell
-  // expects the app to be available for DDE messages and if it isn't
-  // windows displays an error dialog. To prevent the error the DDE server
-  // is enabled and pending events are processed when the app needs to
-  // restart after it was launched by the shell with the requestpending
-  // argument. The requestpending pending argument is removed to
-  // differentiate it from being launched when an app restart is not
-  // required.
-  ArgResult ar;
-  ar = CheckArgShell("requestpending");
-  if (ar == ARG_FOUND) {
-    aNative->Enable();  // enable win32 DDE responses
-    if (aWait) {
-      // This is just a guesstimate based on testing different values.
-      // If count is 8 or less windows will display an error dialog.
-      int32_t count = 20;
-      SpinEventLoopUntil([&]() { return --count < 0; });
-    }
-  }
-}
-#endif
-
 bool gSafeMode = false;
 
 /**
@@ -1644,7 +1580,7 @@ static void SetupLauncherProcessPref() {
 // it was initially started with.
 static nsresult LaunchChild(nsINativeAppSupport* aNative,
                             bool aBlankCommandLine = false) {
-  aNative->Quit();  // release DDE mutex, if we're holding it
+  aNative->Quit();  // destroy message window
 
   // Restart this process by exec'ing it into the current process
   // if supported by the platform.  Otherwise, use NSPR.
@@ -1913,12 +1849,6 @@ static ReturnAbortOnError ShowProfileManager(
                                                true);
 #endif
 
-#ifdef XP_WIN
-    // we don't have to wait here because profile manager window will pump
-    // and DDE message will be handled
-    ProcessDDE(aNative, false);
-#endif
-
     {  // extra scoping is needed so we release these components before xpcom
        // shutdown
       nsCOMPtr<nsIWindowWatcher> windowWatcher(
diff --git a/toolkit/xre/nsINativeAppSupport.idl b/toolkit/xre/nsINativeAppSupport.idl
@@ -8,10 +8,7 @@
 /* nsINativeAppSupport
  *
  * This "pseudo" (in the XPCOM sense) interface provides for
- * platform-specific general application support:
- *  o It manages the details of the simple DDE communication 
- *    supported on the Win32 platform (it is the addition of this 
- *    item that prompted the creation of this interface.
+ * platform-specific general application support
  *
  * Due to the nature of the beast, this interface is not a full-blown
  * XPCOM component.  The primary reason is that objects that implement
@@ -39,50 +36,9 @@
  *                      PR_FALSE and nsresult==NS_OK.  This means that
  *                      the command line arguments have been
  *                      successfully passed to the instance of the
- *                      application acting as a DDE server.
- *
- *  stop - You call this to inform the native app support that the
- *         application *wishes* to terminate.  If the returned boolean
- *         value is PR_FALSE, then the application should continue
- *         (as if there were still additional top-level windows open).
- *         
- *         Win32 Note: If this is the instance of the application
- *                     acting as the DDE server, and there are current
- *                     DDE conversations active with other instances
- *                     acting as DDE clients, then this function will
- *                     return PR_FALSE.
- * 
- *  quit - Like Stop, but this method *forces* termination (or more 
- *         precisely, indicates that the application is about to be
- *         terminated regardless of what a call to Stop might have
- *         returned.
- *
- *         This method is intended to be called when the user selects
- *         the "Quit" option (close all windows and exit).
- *
- *         Win32 Note: Stop is problematic in the case of "Quit" (close
- *                     all windows and exit the application) because
- *                     either we don't Quit or (potentially) we lose
- *                     requests coming from other instances of the
- *                     application.  The strategy is to give preference
- *                     to the user's explicit Quit request.  In the
- *                     unlikely event that a request is pending from
- *                     another instance of the application, then such
- *                     requests are essentially ignored.  This is
- *                     roughly equivalent to handling that request by
- *                     opening a new window, followed by immediately
- *                     closing it.  Since this is the same as if the
- *                     request came in immediately before the Quit
- *                     call (versus immediately after it), no harm.
- *
- *                     There is an exposure here: Upon return from this
- *                     function, any DDE connect request (for Mozilla)
- *                     will fail and other instances of the application
- *                     will start up as a DDE server.  In that case,
- *                     those instances may do things that conflict with
- *                     the subsequent shutting down of the instance that
- *                     is quitting.  For this reason, the call to Quit
- *                     should be deferred as long as possible.
+ *                      application acting as a remote server.
+ *  quit - Informs the native app support that the application is stopping. The
+ *         app support should disable any functionality enabled by start.
  *
  *  onLastWindowClosing -  Called when the last window is closed. Used as a
  *                         "soft" shutdown, passwords are flushed.
@@ -95,7 +51,6 @@ interface nsINativeAppSupport : nsISupports {
     // Startup/shutdown.
     boolean start();
     void    enable();
-    boolean stop();
     void    quit();
 
     void onLastWindowClosing();
diff --git a/toolkit/xre/nsNativeAppSupportBase.cpp b/toolkit/xre/nsNativeAppSupportBase.cpp
@@ -21,13 +21,6 @@ nsNativeAppSupportBase::Start(bool *result) {
 NS_IMETHODIMP
 nsNativeAppSupportBase::Enable() { return NS_OK; }
 
-// Stop answer defaults to OK.
-NS_IMETHODIMP
-nsNativeAppSupportBase::Stop(bool *result) {
-  *result = true;
-  return NS_OK;
-}
-
 NS_IMETHODIMP
 nsNativeAppSupportBase::Quit() { return NS_OK; }
 
diff --git a/toolkit/xre/nsNativeAppSupportUnix.cpp b/toolkit/xre/nsNativeAppSupportUnix.cpp
@@ -135,7 +135,6 @@ class nsNativeAppSupportUnix : public nsNativeAppSupportBase {
   void DisconnectFromSM();
 #endif
   NS_IMETHOD Start(bool *aRetVal) override;
-  NS_IMETHOD Stop(bool *aResult) override;
   NS_IMETHOD Enable() override;
 
  private:
@@ -651,13 +650,6 @@ nsNativeAppSupportUnix::Start(bool *aRetVal) {
   return NS_OK;
 }
 
-NS_IMETHODIMP
-nsNativeAppSupportUnix::Stop(bool *aResult) {
-  NS_ENSURE_ARG(aResult);
-  *aResult = true;
-  return NS_OK;
-}
-
 NS_IMETHODIMP
 nsNativeAppSupportUnix::Enable() { return NS_OK; }
 
diff --git a/toolkit/xre/nsNativeAppSupportWin.cpp b/toolkit/xre/nsNativeAppSupportWin.cpp
diff --git a/toolkit/xre/nsNativeAppSupportWin.h b/toolkit/xre/nsNativeAppSupportWin.h
