bug 538606 - make IE profile migration not use #import. r=gavin

browser/components/build/Makefile.in

@@ -25,8 +25,6 @@ CPPSRCS = nsModule.cpp \
           $(NULL)
 
 ifeq ($(OS_ARCH),WINNT)
-DEFINES += -DPSTOREC_DLL=\"$(subst \,\\,$(WINDIR))\\system32\\pstorec.dll\"
-
 OS_LIBS	+= $(call EXPAND_LIBNAME,ole32 shell32)
 endif
 

browser/components/migration/src/Makefile.in

@@ -66,8 +66,6 @@ CPPSRCS += nsOperaProfileMigrator.cpp
 endif
 
 ifeq ($(OS_ARCH)_$(GNU_CXX),WINNT_)
-DEFINES += -DPSTOREC_DLL=\"$(subst \,\\,$(WINDIR))\\system32\\pstorec.dll\"
-
 CPPSRCS += nsIEProfileMigrator.cpp \
            $(NULL)
 endif

browser/components/migration/src/nsIEProfileMigrator.cpp

@@ -948,7 +948,7 @@ nsIEProfileMigrator::CopyPasswords(PRBool aReplace)
   }
 
   PStoreCreateInstancePtr PStoreCreateInstance = (PStoreCreateInstancePtr)::GetProcAddress(pstoreDLL, "PStoreCreateInstance");
-  IPStorePtr PStore;
+  IPStore* PStore;
   hr = PStoreCreateInstance(&PStore, 0, 0, 0);
 
   rv = GetSignonsListFromPStore(PStore, &signonsFound);
@@ -985,7 +985,7 @@ nsIEProfileMigrator::MigrateSiteAuthSignons(IPStore* aPStore)
     return NS_OK;
 
   GUID mtGuid = {0};
-  IEnumPStoreItemsPtr enumItems = NULL;
+  IEnumPStoreItems* enumItems = NULL;
   hr = aPStore->EnumItems(0, &IEPStoreSiteAuthGUID, &mtGuid, 0, &enumItems);
   if (SUCCEEDED(hr) && enumItems != NULL) {
     LPWSTR itemName = NULL;
@@ -1050,7 +1050,7 @@ nsIEProfileMigrator::GetSignonsListFromPStore(IPStore* aPStore, nsTArray<SignonD
 
   NS_ENSURE_ARG_POINTER(aPStore);
 
-  IEnumPStoreItemsPtr enumItems = NULL;
+  IEnumPStoreItems* enumItems = NULL;
   hr = aPStore->EnumItems(0, &IEPStoreAutocompGUID, &IEPStoreAutocompGUID, 0, &enumItems);
   if (SUCCEEDED(hr) && enumItems != NULL) {
     LPWSTR itemName = NULL;
@@ -1130,7 +1130,7 @@ nsIEProfileMigrator::ResolveAndMigrateSignons(IPStore* aPStore, nsTArray<SignonD
 {
   HRESULT hr;
 
-  IEnumPStoreItemsPtr enumItems = NULL;
+  IEnumPStoreItems* enumItems = NULL;
   hr = aPStore->EnumItems(0, &IEPStoreAutocompGUID, &IEPStoreAutocompGUID, 0, &enumItems);
   if (SUCCEEDED(hr) && enumItems != NULL) {
     LPWSTR itemName = NULL;
@@ -1271,12 +1271,12 @@ nsIEProfileMigrator::CopyFormData(PRBool aReplace)
   }
 
   PStoreCreateInstancePtr PStoreCreateInstance = (PStoreCreateInstancePtr)::GetProcAddress(pstoreDLL, "PStoreCreateInstance");
-  IPStorePtr PStore = NULL;
+  IPStore* PStore = NULL;
   hr = PStoreCreateInstance(&PStore, 0, 0, 0);
   if (FAILED(hr) || PStore == NULL)
     return NS_OK;
 
-  IEnumPStoreItemsPtr enumItems = NULL;
+  IEnumPStoreItems* enumItems = NULL;
   hr = PStore->EnumItems(0, &IEPStoreAutocompGUID, &IEPStoreAutocompGUID, 0, &enumItems);
   if (SUCCEEDED(hr) && enumItems != NULL) {
     LPWSTR itemName = NULL;

browser/components/migration/src/nsIEProfileMigrator.h

@@ -43,6 +43,7 @@
 
 #include <time.h>
 #include <windows.h>
+#include <pstore.h>
 #include "nsIBrowserProfileMigrator.h"
 #include "nsIObserverService.h"
 #include "nsTArray.h"
@@ -60,9 +61,6 @@ struct SignonData {
   char*      realm;
 };
 
-#import PSTOREC_DLL raw_interfaces_only
-using namespace PSTORECLib;
-
 class nsIEProfileMigrator : public nsIBrowserProfileMigrator,
                             public nsINavHistoryBatchCallback {
 public: