Add Search component into Windows build.

suite/browser/src/nsLocalSearchService.cpp

@@ -906,7 +906,7 @@ LocalSearchDataSource::DoCommand(nsISupportsArray/*<nsIRDFResource>*/* aSources,
 
 
 
-nsresult
+NS_IMETHODIMP
 NS_NewLocalSearchService(nsISupports* aOuter, REFNSIID aIID, void** aResult)
 {
 	NS_PRECONDITION(aResult != nsnull, "null ptr");

xpfe/components/search/makefile.win

@@ -17,6 +17,6 @@
 
 DEPTH=..\..\..
 
-DIRS=datasets resources
+DIRS=datasets resources public src
 
 include <$(DEPTH)\config\rules.mak>

xpfe/components/search/src/makefile.win

@@ -18,12 +18,16 @@
 DEPTH=..\..\..\..
 MODULE=search
 
-CPPSRCS=                                \
- nsSearchService.obj                    \
+CPPSRCS=                                 \
+ nsLocalSearchService.cpp                \
+ nsInternetSearchService.cpp             \
+ nsRegisterSearch.cpp                    \
  $(NULL)
 
-CPP_OBJS=                               \
- .\$(OBJDIR)\nsSearchService.obj        \
+CPP_OBJS=                                \
+ .\$(OBJDIR)\nsLocalSearchService.obj    \
+ .\$(OBJDIR)\nsInternetSearchService.obj \
+ .\$(OBJDIR)\nsRegisterSearch.obj        \
  $(NULL)
 
 MAKE_OBJ_TYPE=DLL

xpfe/components/search/src/nsLocalSearchService.cpp

@@ -906,7 +906,7 @@ LocalSearchDataSource::DoCommand(nsISupportsArray/*<nsIRDFResource>*/* aSources,
 
 
 
-nsresult
+NS_IMETHODIMP
 NS_NewLocalSearchService(nsISupports* aOuter, REFNSIID aIID, void** aResult)
 {
 	NS_PRECONDITION(aResult != nsnull, "null ptr");

xpfe/components/search/src/nsRegisterSearch.cpp

@@ -31,8 +31,8 @@ static NS_DEFINE_CID(kInternetSearchServiceCID,      NS_RDFSEARCHDATASOURCE_CID)
 static NS_DEFINE_CID(kComponentManagerCID,           NS_COMPONENTMANAGER_CID);
 static NS_DEFINE_CID(kGenericFactoryCID,             NS_GENERICFACTORY_CID);
 
-nsresult	NS_NewLocalSearchService(nsISupports* aOuter, REFNSIID aIID, void** aResult);
-nsresult	NS_NewInternetSearchService(nsISupports* aOuter, REFNSIID aIID, void** aResult);
+NS_IMETHODIMP	NS_NewLocalSearchService(nsISupports* aOuter, REFNSIID aIID, void** aResult);
+NS_IMETHODIMP	NS_NewInternetSearchService(nsISupports* aOuter, REFNSIID aIID, void** aResult);