b=473527, r=mfinkle, Option to run app at startup

client/winbuild/regprot.nsi

@@ -18,7 +18,7 @@ ${GetParameters} $R0
 
 ${GetOptions} $R0 "/Protocol" $R1
 IfErrors 0 +2
-GoTo finish
+GoTo autostart
 ${StrTok} $R2 $R1 "/" "0" "0"
 
 ; Delete the existing entry for this protocol
@@ -40,12 +40,27 @@ UAC::RunElevated
 ; Register our protocol keys
 WriteRegStr HKLM "SOFTWARE\Classes\$R2" "EditFlags" 2
 WriteRegStr HKLM "SOFTWARE\Classes\$R2" "URL Protocol" ""
-; WriteRegStr HKLM "SOFTWARE\Classes\$R2\DefaultIcon" "" "$R3,1"
-WriteRegStr HKLM "SOFTWARE\Classes\$R2\shell\open\command" "" "$R3 -url $\"%1$\""
+; WriteRegStr HKLM "SOFTWARE\Classes\$R2\DefaultIcon" "" "$\"$R3$\",1"
+WriteRegStr HKLM "SOFTWARE\Classes\$R2\shell\open\command" "" "$\"$R3$\" -url $\"%1$\""
 WriteRegStr HKLM "SOFTWARE\Classes\$R2\shell\open\ddeexec" "" "$\"%1$\",,0,0,,,,"
 WriteRegStr HKLM "SOFTWARE\Classes\$R2\shell\open\ddeexec" "NoActivateHandler" ""
 WriteRegStr HKLM "SOFTWARE\Classes\$R2\shell\open\ddeexec\Application" "" "$R4"
 WriteRegStr HKLM "SOFTWARE\Classes\$R2\shell\open\ddeexec\Topic" "" "WWW_OpenURL"
+GoTo finish
+
+autostart:
+${GetOptions} $R0 "/AutoStart" $R1
+IfErrors 0 +2
+GoTo finish
+${StrTok} $R2 $R1 "/" "0" "0"
+
+UAC::RunElevated
+
+DeleteRegValue HKCU "Software\Microsoft\Windows\CurrentVersion\Run" "$R2"
+
+${GetOptions} $R0 "/ApplicationPath" $R3
+IfErrors finish +1
+WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Run" "$R2" $\"$R3$\"
 
 finish:
 Quit

runtime/components/public/nsIDesktopEnvironment.idl

@@ -51,6 +51,11 @@ interface nsINativeMenu;
 [scriptable, uuid(86f7332c-f4fd-4a30-946d-433596d79304)]
 interface nsIDesktopEnvironment : nsISupports
 {
+  /**
+   * Register the application to run automatically on startup.
+   */
+  attribute boolean autoStart;
+
   /**
    * Create a shortcut for the application.
    *
@@ -96,9 +101,9 @@ interface nsIDesktopEnvironment : nsISupports
   nsINativeMenu getSystemMenu(in nsIDOMWindow window);
   
   /**
-  * Gets the menu bar for the specific window.
-  *
-  * @param widnow the window for which we want the menu bar.
-  */
+   * Gets the menu bar for the specific window.
+   *
+   * @param window the window for which we want the menu bar.
+   */
   nsINativeMenu getMenuBar(in nsIDOMWindow window);
 };

runtime/components/src/mac/nsDesktopEnvironmentMac.mm

@@ -222,6 +222,59 @@ nsDesktopEnvironment::~nsDesktopEnvironment()
 {
 }
 
+NS_IMETHODIMP nsDesktopEnvironment::GetAutoStart(PRBool* _retval)
+{
+  NSString *loginWindowPlistPath = [@"~/Library/Preferences/loginwindow.plist" stringByExpandingTildeInPath];
+  NSMutableDictionary *loginWindowPrefsDictionary = [NSMutableDictionary dictionaryWithContentsOfFile:loginWindowPlistPath];
+  NSMutableArray *launchItems = [NSMutableArray arrayWithArray:[loginWindowPrefsDictionary valueForKey:@"AutoLaunchedApplicationDictionary"]];
+  NSEnumerator *enumerator = [launchItems objectEnumerator];
+  id application;
+
+  // search for entry
+  *_retval = PR_FALSE;
+  while ((application = [enumerator nextObject]))
+  {
+    if ([[[application valueForKey:@"Path"] lastPathComponent] isEqualToString:[[[NSBundle mainBundle] bundlePath] lastPathComponent]])
+    {
+      *_retval = PR_TRUE;
+    }
+  }
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsDesktopEnvironment::SetAutoStart(PRBool aAutoStart)
+{
+  // setup run on login
+  NSString *loginWindowPlistPath = [@"~/Library/Preferences/loginwindow.plist" stringByExpandingTildeInPath];
+  NSMutableDictionary *loginWindowPrefsDictionary = [NSMutableDictionary dictionaryWithContentsOfFile:loginWindowPlistPath];
+  NSMutableArray *launchItems = [NSMutableArray arrayWithArray:[loginWindowPrefsDictionary valueForKey:@"AutoLaunchedApplicationDictionary"]];
+  NSEnumerator *enumerator = [launchItems objectEnumerator];
+  id application;
+
+  // delete any existing entries
+  while ((application = [enumerator nextObject]))
+  {
+    if ([[[application valueForKey:@"Path"] lastPathComponent] isEqualToString:[[[NSBundle mainBundle] bundlePath] lastPathComponent]])
+    {
+      [launchItems removeObject:application];
+      [loginWindowPrefsDictionary setObject:launchItems forKey:@"AutoLaunchedApplicationDictionary"];
+      [loginWindowPrefsDictionary writeToFile:loginWindowPlistPath atomically:YES];
+    }
+  }
+
+  // add entry if login startup desired
+  if (aAutoStart)
+  {
+    NSString *fullPath = [NSString stringWithFormat: @"%@", [[NSBundle mainBundle] bundlePath]];
+    [launchItems addObject: [NSMutableDictionary dictionaryWithObjectsAndKeys:
+      fullPath, @"Path",
+      [NSNumber numberWithBool: YES], @"Hide", NULL]];
+    [loginWindowPrefsDictionary setObject:launchItems forKey:@"AutoLaunchedApplicationDictionary"];
+    [loginWindowPrefsDictionary writeToFile:loginWindowPlistPath atomically:YES];
+  }
+  return NS_OK;
+}
+
 NS_IMETHODIMP nsDesktopEnvironment::CreateShortcut(
   const nsAString& aName,
   nsIFile* aTarget,

runtime/components/src/windows/nsDesktopEnvironmentWin.cpp

@@ -127,6 +127,57 @@ NS_IMETHODIMP nsDesktopEnvironment::GetFile(const char* prop,
   }
 }
 
+NS_IMETHODIMP nsDesktopEnvironment::GetAutoStart(PRBool* _retval)
+{
+  NS_ENSURE_ARG(_retval);
+
+  nsresult rv;
+  nsCOMPtr<nsIWindowsRegKey> regKey(do_CreateInstance("@mozilla.org/windows-registry-key;1", &rv));
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  nsAutoString appName;
+  rv = GetAppName(appName);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  nsAutoString keyPath = NS_LITERAL_STRING("Software\\Microsoft\\Windows\\CurrentVersion\\Run\\");
+  keyPath += appName;
+
+  rv = regKey->Open(nsIWindowsRegKey::ROOT_KEY_LOCAL_MACHINE, keyPath, nsIWindowsRegKey::ACCESS_READ);
+  if (NS_FAILED(rv)) {
+    *_retval = PR_FALSE;
+  }
+  else {
+    *_retval = PR_TRUE;
+  }
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsDesktopEnvironment::SetAutoStart(PRBool aAutoStart)
+{
+  nsresult rv;
+  nsAutoString params;
+  params = NS_LITERAL_STRING("/AutoStart ");
+
+  nsAutoString appName;
+  rv = GetAppName(appName);
+  params += appName;
+
+  if (aAutoStart) {
+    nsAutoString commandLine;
+    rv = GetAppPath(commandLine);
+    NS_ENSURE_SUCCESS(rv, rv);
+
+    params += NS_LITERAL_STRING(" /ApplicationPath ");
+    params += commandLine;
+  }
+
+  rv = RunHelperApp(params);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  return NS_OK;
+}
+
 NS_IMETHODIMP nsDesktopEnvironment::CreateShortcut(
   const nsAString& aName,
   nsIFile* aTarget,
@@ -257,7 +308,6 @@ NS_IMETHODIMP nsDesktopEnvironment::GetMenuBar(nsIDOMWindow* aWindow, nsINativeM
 {
   NS_ENSURE_ARG(aWindow);
 
-  nsresult rv;
   *_retval = new nsDOMMenuBar(aWindow);
   NS_ENSURE_TRUE(*_retval, NS_ERROR_OUT_OF_MEMORY);
 
@@ -282,72 +332,25 @@ NS_IMETHODIMP nsDesktopEnvironment::RegisterProtocol(
     appPath += aArguments;
   }
   else {
-    int numArgs;
-    LPWSTR* argv = ::CommandLineToArgvW(::GetCommandLineW(), &numArgs);
-    
-    WCHAR fullPath[4096];
-    if (!::GetFullPathNameW(argv[0], 4096, fullPath, NULL)) {
-      ::LocalFree(argv);
-      return NS_ERROR_FAILURE;
-    }
-    appPath = QuoteCommandLineString(nsString(fullPath));
-    
-    for (int i=1; i<numArgs; i++) {
-      appPath += NS_LITERAL_STRING(" ");
-      
-      // Don't include -url parameter
-      if (wcscmp(argv[i], L"-url") == 0)
-      {
-        i++; // Skip -url value as well
-        continue;
-      }
-      
-      appPath += QuoteCommandLineString(nsString(argv[i]));
-    }
-    
-    ::LocalFree(argv);
+    rv = GetAppPath(appPath);
+    NS_ENSURE_SUCCESS(rv, rv);
   }
   
-  nsCOMPtr<nsIXULAppInfo> appInfo(do_GetService("@mozilla.org/xre/app-info;1", &rv));
-  NS_ENSURE_SUCCESS(rv, rv);
-  
-  nsCAutoString appName;
-  rv = appInfo->GetName(appName);
-  NS_ENSURE_SUCCESS(rv, rv);
-  
-  nsCOMPtr<nsIProperties> dirSvc(do_GetService("@mozilla.org/file/directory_service;1", &rv));
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  nsCOMPtr<nsILocalFile> appHelper;
-  rv = dirSvc->Get(NS_OS_CURRENT_PROCESS_DIR, NS_GET_IID(nsILocalFile), getter_AddRefs(appHelper));
+  nsAutoString appName;
+  rv = GetAppName(appName);
   NS_ENSURE_SUCCESS(rv, rv);
+ 
+  nsAutoString params;
+  params += NS_LITERAL_STRING(" /Protocol ");
+  params += aScheme;
+  params += NS_LITERAL_STRING(" /ApplicationPath ");
+  params += appPath;
+  params += NS_LITERAL_STRING(" /ApplicationName ");
+  params += appName;
 
-  rv = appHelper->Append(NS_LITERAL_STRING("regprot.exe"));
-  NS_ENSURE_SUCCESS(rv, rv);
-  
-  nsAutoString helperPath;
-  rv = appHelper->GetPath(helperPath);
+  rv = RunHelperApp(params);
   NS_ENSURE_SUCCESS(rv, rv);
-  
-  helperPath += NS_LITERAL_STRING(" /Protocol ");
-  helperPath += aScheme;
-  helperPath += NS_LITERAL_STRING(" /ApplicationPath ");
-  helperPath += appPath;
-  helperPath += NS_LITERAL_STRING(" /ApplicationName ");
-  helperPath += NS_ConvertUTF8toUTF16(appName);
-  
-  STARTUPINFOW si = {sizeof(si), 0};
-  PROCESS_INFORMATION pi = {0};
-
-  BOOL ok = ::CreateProcessW(NULL, (LPWSTR) helperPath.get(), NULL, NULL,
-                             FALSE, 0, NULL, NULL, &si, &pi);
-
-  if (!ok)
-    return NS_ERROR_FAILURE;
-
-  CloseHandle(pi.hProcess);
-  CloseHandle(pi.hThread);
-  
+ 
   return NS_OK;
 }
 
@@ -411,10 +414,59 @@ NS_IMETHODIMP nsDesktopEnvironment::GetDefaultApplicationForURIScheme(const nsAS
   return NS_OK;
 }
 
+nsresult nsDesktopEnvironment::GetAppName(nsAString& _retval)
+{
+  nsresult rv;
+  nsCOMPtr<nsIXULAppInfo> appInfo(do_GetService("@mozilla.org/xre/app-info;1", &rv));
+  NS_ENSURE_SUCCESS(rv, rv);
+  
+  nsCAutoString appName;
+  rv = appInfo->GetName(appName);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  _retval = NS_ConvertUTF8toUTF16(appName);
+
+  return NS_OK;
+} 
+
+// Return the full command-line for the current app
+nsresult nsDesktopEnvironment::GetAppPath(nsAString& _retval)
+{
+  nsAutoString appPath;
+  int numArgs;
+  LPWSTR* argv = ::CommandLineToArgvW(::GetCommandLineW(), &numArgs);
+  
+  WCHAR fullPath[4096];
+  if (!::GetFullPathNameW(argv[0], 4096, fullPath, NULL)) {
+    ::LocalFree(argv);
+    return NS_ERROR_FAILURE;
+  }
+  appPath = QuoteCommandLineString(nsString(fullPath));
+  
+  for (int i=1; i<numArgs; i++) {
+    appPath += NS_LITERAL_STRING(" ");
+    
+    // Don't include -url parameter
+    if (wcscmp(argv[i], L"-url") == 0)
+    {
+      i++; // Skip -url value as well
+      continue;
+    }
+    
+    appPath += QuoteCommandLineString(nsString(argv[i]));
+  }
+  
+  ::LocalFree(argv);
+
+  _retval = appPath;
+  return NS_OK;
+}
+
 // Quote the string if it contains spaces
 nsString nsDesktopEnvironment::QuoteCommandLineString(const nsAString& aString)
 {
-  if (aString.FindChar(' ') == -1)
+  // Don't quote command line options
+  if (aString.FindChar('-') == 0)
     return nsString(aString);
     
   nsString quoted = NS_LITERAL_STRING("\"");
@@ -424,6 +476,42 @@ nsString nsDesktopEnvironment::QuoteCommandLineString(const nsAString& aString)
   return quoted;
 }
 
+// Run the NSIS helper app with the specified parameters
+nsresult nsDesktopEnvironment::RunHelperApp(const nsAString& aParams)
+{
+  nsresult rv;
+  nsCOMPtr<nsIProperties> dirSvc(do_GetService("@mozilla.org/file/directory_service;1", &rv));
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  nsCOMPtr<nsILocalFile> appHelper;
+  rv = dirSvc->Get(NS_OS_CURRENT_PROCESS_DIR, NS_GET_IID(nsILocalFile), getter_AddRefs(appHelper));
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  rv = appHelper->Append(NS_LITERAL_STRING("regprot.exe"));
+  NS_ENSURE_SUCCESS(rv, rv);
+  
+  nsAutoString helperPath;
+  rv = appHelper->GetPath(helperPath);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  helperPath += NS_LITERAL_STRING(" ");
+  helperPath += aParams;
+ 
+  STARTUPINFOW si = {sizeof(si), 0};
+  PROCESS_INFORMATION pi = {0};
+
+  BOOL ok = ::CreateProcessW(NULL, (LPWSTR) helperPath.get(), NULL, NULL,
+                             FALSE, 0, NULL, NULL, &si, &pi);
+
+  if (!ok)
+    return NS_ERROR_FAILURE;
+
+  CloseHandle(pi.hProcess);
+  CloseHandle(pi.hThread);
+
+  return NS_OK;
+} 
+
 // Retrieves the HWND associated with a DOM window
 nsresult nsDesktopEnvironment::GetHWNDForDOMWindow(nsIDOMWindow* aWindow, void* hWnd)
 {

runtime/components/src/windows/nsDesktopEnvironmentWin.h

@@ -90,6 +90,9 @@ public:
     
 protected:
   nsString QuoteCommandLineString(const nsAString& aString);  
+  nsresult RunHelperApp(const nsAString& params);
+  nsresult GetAppPath(nsAString& _retval);
+  nsresult GetAppName(nsAString& _retval);
 
 private:
   ~nsDesktopEnvironment();