Jacek Caban : mshtml: Use NS_StringContainerInit2 instead of NS_StringContainerInit.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 22d493763b77cb21465250d28eec188e951f26df
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=22d493763b77cb21465250d28e...

Author: Jacek Caban 
Date:   Thu Jan 28 23:54:38 2010 +0100

mshtml: Use NS_StringContainerInit2 instead of NS_StringContainerInit.

---

dlls/mshtml/mshtml_private.h |    2 +-
 dlls/mshtml/nsembed.c        |   12 +++++-------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h
index 054aeab..a8cd32f 100644
--- a/dlls/mshtml/mshtml_private.h
+++ b/dlls/mshtml/mshtml_private.h
@@ -711,7 +711,7 @@ void nsfree(void*);
 void nsACString_SetData(nsACString*,const char*);
 PRUint32 nsACString_GetData(const nsACString*,const char**);

-void nsAString_Init(nsAString*,const PRUnichar*);
+BOOL nsAString_Init(nsAString*,const PRUnichar*);
 void nsAString_SetData(nsAString*,const PRUnichar*);
 PRUint32 nsAString_GetData(const nsAString*,const PRUnichar**);
 void nsAString_Finish(nsAString*);
diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c
index 6858897..0e0d4b5 100644
--- a/dlls/mshtml/nsembed.c
+++ b/dlls/mshtml/nsembed.c
@@ -52,13 +52,13 @@ struct nsCStringContainer {
     void *v;
     void *d1;
     PRUint32 d2;
-    void *d3;
+    PRUint32 d3;
 };

static nsresult (*NS_InitXPCOM2)(nsIServiceManager**,void*,void*);
 static nsresult (*NS_ShutdownXPCOM)(nsIServiceManager*);
 static nsresult (*NS_GetComponentRegistrar)(nsIComponentRegistrar**);
-static nsresult (*NS_StringContainerInit)(nsStringContainer*);
+static nsresult (*NS_StringContainerInit2)(nsStringContainer*,const PRUnichar*,PRUint32,PRUint32);
 static nsresult (*NS_CStringContainerInit)(nsCStringContainer*);
 static nsresult (*NS_StringContainerFinish)(nsStringContainer*);
 static nsresult (*NS_CStringContainerFinish)(nsCStringContainer*);
@@ -194,7 +194,7 @@ static BOOL load_xpcom(const PRUnichar *gre_path)
     NS_DLSYM(NS_InitXPCOM2);
     NS_DLSYM(NS_ShutdownXPCOM);
     NS_DLSYM(NS_GetComponentRegistrar);
-    NS_DLSYM(NS_StringContainerInit);
+    NS_DLSYM(NS_StringContainerInit2);
     NS_DLSYM(NS_CStringContainerInit);
     NS_DLSYM(NS_StringContainerFinish);
     NS_DLSYM(NS_CStringContainerFinish);
@@ -555,11 +555,9 @@ static void nsACString_Finish(nsACString *str)
     NS_CStringContainerFinish(str);
 }

-void nsAString_Init(nsAString *str, const PRUnichar *data)
+BOOL nsAString_Init(nsAString *str, const PRUnichar *data)
 {
-    NS_StringContainerInit(str);
-    if(data)
-        nsAString_SetData(str, data);
+    return NS_SUCCEEDED(NS_StringContainerInit2(str, data, PR_UINT32_MAX, 0));
 }

void nsAString_SetData(nsAString *str, const PRUnichar *data)