Swapped args to NS_OpenURI. Fixed library name.

intl/strres/src/makefile.win

@@ -56,7 +56,7 @@ LLIBS=				\
  $(LIBNSPR)  
 
 !ifdef NECKO
-LLIBS=$(LLIBS) $(DIST)\lib\netwerkutil_s.lib
+LLIBS=$(LLIBS) $(DIST)\lib\neckoutil_s.lib
 !endif
 
 !if "$(MOZ_BITS)"=="32" && defined(MOZ_DEBUG) && defined(GLOWCODE)

intl/strres/src/nsStringBundle.cpp

@@ -155,7 +155,7 @@ nsStringBundle::nsStringBundle(nsIURI* aURL, nsILocale* aLocale,
     return;
   }
 
-  rv = NS_OpenURI(aURL, &in);
+  rv = NS_OpenURI(&in, aURL);
   if (NS_FAILED(rv)) {
 #ifdef NS_DEBUG
     printf("cannot open uri\n");
@@ -320,7 +320,7 @@ nsStringBundle::OpenInputStream(nsString2& aURLStr, nsIInputStream*& in)
   ret = NS_NewURI(&uri, aURLStr);
   if (NS_FAILED(ret)) return ret;
 
-  ret = NS_OpenURI(uri, &in);
+  ret = NS_OpenURI(&in, uri);
   NS_RELEASE(uri);
 #endif // NECKO
   return ret;