Changed to use NS_IMPL_THREADSAFE_ISUPPORTS1, patch by dougt, bug 61558, r=nhotta, sr=mscott.

intl/locale/src/nsLocaleService.cpp

@@ -577,7 +577,7 @@ nsLocaleServiceFactory::~nsLocaleServiceFactory()
 {
 }
 
-NS_IMPL_ISUPPORTS1(nsLocaleServiceFactory,nsIFactory)
+NS_IMPL_THREADSAFE_ISUPPORTS1(nsLocaleServiceFactory,nsIFactory)
 
 NS_IMETHODIMP
 nsLocaleServiceFactory::CreateInstance(nsISupports* aOuter,

intl/locale/src/windows/nsIWin32LocaleFactory.cpp

@@ -1,112 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include "nsIWin32Locale.h"
-#include "nsIWin32LocaleImpl.h"
-#include "nsIWin32LocaleFactory.h"
-#include "nsLocaleCID.h"
-
-NS_DEFINE_IID(kIWin32LocaleIID, NS_IWIN32LOCALE_IID);
-NS_DEFINE_IID(kWin32LocaleFactoryCID, NS_WIN32LOCALEFACTORY_CID);
-NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
-NS_DEFINE_IID(kIFactoryIID,  NS_IFACTORY_IID);
-
-
-nsIWin32LocaleFactory::nsIWin32LocaleFactory()
-{
-	NS_INIT_REFCNT();
-}
-
-nsIWin32LocaleFactory::~nsIWin32LocaleFactory()
-{
-
-}
-
-NS_IMETHODIMP
-nsIWin32LocaleFactory::CreateInstance(nsISupports* aOuter, REFNSIID aIID,
-		void** aResult)
-{
-  if (aResult == NULL) {   
-    return NS_ERROR_NULL_POINTER;   
-  }   
-
-  // Always NULL result, in case of failure   
-  *aResult = NULL;   
-
-  if (aIID.Equals(kISupportsIID))
-  {   
-    *aResult = (void *)(nsISupports*)this;   
-	NS_ADDREF_THIS(); // Increase reference count for caller   
-  } else if (aIID.Equals(kIFactoryIID))
-  {   
-    *aResult = (void *)(nsIFactory*)this;   
-	NS_ADDREF_THIS(); // Increase reference count for caller   
-  } else if (aIID.Equals(kIWin32LocaleIID))
-  {
-	nsIWin32LocaleImpl *localeImpl = new nsIWin32LocaleImpl();
-	if(localeImpl)
-		NS_ADDREF(localeImpl);
-	*aResult = (void*)localeImpl;
-	
-  }
-
-  if (*aResult == NULL) {   
-    return NS_NOINTERFACE;   
-  }   
-
-
-  return NS_OK;   
-}
-
-nsresult nsIWin32LocaleFactory::QueryInterface(const nsIID &aIID,   
-                                      void **aResult)   
-{   
-  if (aResult == NULL) {   
-    return NS_ERROR_NULL_POINTER;   
-  }   
-
-  // Always NULL result, in case of failure   
-  *aResult = NULL;   
-
-  if (aIID.Equals(kISupportsIID)) {   
-    *aResult = (void *)(nsISupports*)this;   
-  } else if (aIID.Equals(kIFactoryIID)) {   
-    *aResult = (void *)(nsIFactory*)this;   
-  }   
-
-  if (*aResult == NULL) {   
-    return NS_NOINTERFACE;   
-  }   
-
-  NS_ADDREF_THIS(); // Increase reference count for caller   
-  return NS_OK;   
-}   
-
-
-NS_IMETHODIMP
-nsIWin32LocaleFactory::LockFactory(PRBool	aBool)
-{
-	return NS_OK;
-}
-
-NS_IMPL_ADDREF(nsIWin32LocaleFactory);
-NS_IMPL_RELEASE(nsIWin32LocaleFactory);