Fix stdcall bustage on windows

toolkit/components/passwordmgr/base/nsPasswordManager.cpp

@@ -232,7 +232,7 @@ nsPasswordManager::SingleSignonEnabled()
   return sRememberPasswords;
 }
 
-/* static */ nsresult
+/* static */ NS_METHOD
 nsPasswordManager::Register(nsIComponentManager* aCompMgr,
                             nsIFile* aPath,
                             const char* aRegistryLocation,
@@ -258,7 +258,7 @@ nsPasswordManager::Register(nsIComponentManager* aCompMgr,
   return NS_OK;
 }
 
-/* static */ nsresult
+/* static */ NS_METHOD
 nsPasswordManager::Unregister(nsIComponentManager* aCompMgr,
                               nsIFile* aPath,
                               const char* aRegistryLocation,

toolkit/components/passwordmgr/base/nsPasswordManager.h

@@ -94,19 +94,27 @@ public:
   nsresult Init();
   static PRBool SingleSignonEnabled();
 
-  static nsresult Register(nsIComponentManager* aCompMgr,
-                           nsIFile* aPath,
-                           const char* aRegistryLocation,
-                           const char* aComponentType,
-                           const nsModuleComponentInfo* aInfo);
+  static NS_METHOD Register(nsIComponentManager* aCompMgr,
+                            nsIFile* aPath,
+                            const char* aRegistryLocation,
+                            const char* aComponentType,
+                            const nsModuleComponentInfo* aInfo);
 
-  static nsresult Unregister(nsIComponentManager* aCompMgr,
-                             nsIFile* aPath,
-                             const char* aRegistryLocation,
-                             const nsModuleComponentInfo* aInfo);
+  static NS_METHOD Unregister(nsIComponentManager* aCompMgr,
+                              nsIFile* aPath,
+                              const char* aRegistryLocation,
+                              const nsModuleComponentInfo* aInfo);
 
   static void Shutdown();
 
+
+  static nsresult DecryptData(const nsAString& aData, nsAString& aPlaintext);
+  static nsresult EncryptData(const nsAString& aPlaintext,
+                              nsACString& aEncrypted);
+  static nsresult EncryptDataUCS2(const nsAString& aPlaintext,
+                                  nsAString& aEncrypted);
+
+
 protected:
   void ReadSignonFile();
   void WriteSignonFile();
@@ -141,12 +149,6 @@ protected:
                                                                 PRInt32 aEntry,
                                                                 void* aUserData);
 
-  static nsresult DecryptData(const nsAString& aData, nsAString& aPlaintext);
-  static nsresult EncryptData(const nsAString& aPlaintext,
-                              nsACString& aEncrypted);
-  static nsresult EncryptDataUCS2(const nsAString& aPlaintext,
-                                  nsAString& aEncrypted);
-
   static void EnsureDecoderRing();
 
   nsClassHashtable<nsCStringHashKey,SignonDataEntry> mSignonTable;