Attachment #184218 for bug #272166

Attachment #184218: patch to get rid of it for bug #272166

View | Details | Raw Unified | Return to bug 272166
Collapse All | Expand All





 * the provisions above, a recipient may use your version of this file under
 * the terms of any one of the MPL, the GPL or the LGPL.
 *
 * ***** END LICENSE BLOCK ***** */

#include "nsIShellService.idl"

[scriptable, uuid(5a92782c-a2e8-4dd3-b18a-33acc3af4fd7)]
interface nsIWindowsShellService : nsIShellService
{
    /**
    * Restores system settings to what they were before Firefox 
    * modified them.
    *
    * @param aForAllUsers   Whether or not Firefox should restore


    /** 
     * The number of unread mail messages for the current user.
     * 
     * @return The number of unread (new) mail messages for the current user.
     */
    readonly attribute unsigned long unreadMailCount;

    /**
     * Valid starting keys for the Windows Registry.
     */
    const long HKCR = 0; // HKEY_CLASSES_ROOT
    const long HKCC = 1; // HKEY_CURRENT_CONFIG
    const long HKCU = 2; // HKEY_CURRENT_USER
    const long HKLM = 3; // HKEY_LOCAL_MACHINE
    const long HKU  = 4; // HKEY_USERS

    /** 
     * Retrieves a Windows Registry entry value.
     * 
     * @param aHKeyConstant The starting key, using the constants defined above.
     * @param aSubKeyName   The sub key to locate
     * @param aValueName    The value to locate in the sub key. The empty string
     *                      returns the default value of the sub key.
     * @return The value of the specified sub key/value, truncated to 4096 bytes.
     */
    string getRegistryEntry(in long aHKeyConstant, in string aSubKeyName, in string aValueName);
};


-      Line
+  Link Here
-       Lines 1006-1067
      nsWindowsShellService::GetMailAccountKey
+  Link Here
   while (1);
   // Close the key we opened.
   ::RegCloseKey(mailKey);
   return PR_FALSE;
+}
+NS_IMETHODIMP
+nsWindowsShellService::GetRegistryEntry(PRInt32 aHKEYConstant,
+                                        const char *aSubKeyName,
+                                        const char *aValueName,
+                                        char **aResult)
+{
+  HKEY hKey, fullKey;
+  *aResult = 0;
+  // Calculate HKEY_* base key
+  switch (aHKEYConstant) {
+  case HKCR:
+    hKey = HKEY_CLASSES_ROOT;
+    break;
+  case HKCC:
+    hKey = HKEY_CURRENT_CONFIG;
+    break;
+  case HKCU:
+    hKey = HKEY_CURRENT_USER;
+    break;
+  case HKLM:
+    hKey = HKEY_LOCAL_MACHINE;
+    break;
+  case HKU:
+    hKey = HKEY_USERS;
+    break;
+  default:
+    return NS_ERROR_INVALID_ARG;
+  }
+  // Open Key
+  LONG rv = ::RegOpenKeyEx(hKey, aSubKeyName, 0, KEY_READ, &fullKey);
+  if (rv == ERROR_SUCCESS) {
+    char buffer[4096] = { 0 };
+    DWORD len = sizeof buffer;
+    rv = ::RegQueryValueEx(fullKey, aValueName, NULL, NULL,
+                           (LPBYTE)buffer, &len);
+    if (rv == ERROR_SUCCESS)
+      *aResult = PL_strdup(buffer);
+  }
+  ::RegCloseKey(fullKey);
+  return *aResult ? NS_OK : NS_ERROR_OUT_OF_MEMORY;
+}
 static nsresult ResetHomepage()
+{
   // Reset the homepage to the default value if the user requested the installer do so.
   HKEY theKey;
   nsresult rv = OpenKeyForWriting("Software\\Mozilla\\Mozilla Firefox", &theKey, PR_FALSE, PR_FALSE);
   if (NS_FAILED(rv)) return rv;

Return to bug 272166