Skip to content

W
wine-cw
Commit 22d49376 authored by Jacek Caban's avatar Jacek Caban Committed by Alexandre Julliard
Browse files
Options

mshtml: Use NS_StringContainerInit2 instead of NS_StringContainerInit.

parent 4a400e15
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 8 deletions
dlls/mshtml/mshtml_private.h
View file @ 22d49376
...@@ -711,7 +711,7 @@ void nsfree(void*); ...@@ -711,7 +711,7 @@ void nsfree(void*);
void nsACString_SetData(nsACString*,const char*); void nsACString_SetData(nsACString*,const char*);
PRUint32 nsACString_GetData(const 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*); void nsAString_SetData(nsAString*,const PRUnichar*);
PRUint32 nsAString_GetData(const nsAString*,const PRUnichar**); PRUint32 nsAString_GetData(const nsAString*,const PRUnichar**);
void nsAString_Finish(nsAString*); void nsAString_Finish(nsAString*);
......
dlls/mshtml/nsembed.c
View file @ 22d49376
...@@ -52,13 +52,13 @@ struct nsCStringContainer { ...@@ -52,13 +52,13 @@ struct nsCStringContainer {
void *v; void *v;
void *d1; void *d1;
PRUint32 d2; PRUint32 d2;
void *d3; PRUint32 d3;
}; };
static nsresult (*NS_InitXPCOM2)(nsIServiceManager**,void*,void*); static nsresult (*NS_InitXPCOM2)(nsIServiceManager**,void*,void*);
static nsresult (*NS_ShutdownXPCOM)(nsIServiceManager*); static nsresult (*NS_ShutdownXPCOM)(nsIServiceManager*);
static nsresult (*NS_GetComponentRegistrar)(nsIComponentRegistrar**); 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_CStringContainerInit)(nsCStringContainer*);
static nsresult (*NS_StringContainerFinish)(nsStringContainer*); static nsresult (*NS_StringContainerFinish)(nsStringContainer*);
static nsresult (*NS_CStringContainerFinish)(nsCStringContainer*); static nsresult (*NS_CStringContainerFinish)(nsCStringContainer*);
...@@ -194,7 +194,7 @@ static BOOL load_xpcom(const PRUnichar *gre_path) ...@@ -194,7 +194,7 @@ static BOOL load_xpcom(const PRUnichar *gre_path)
NS_DLSYM(NS_InitXPCOM2); NS_DLSYM(NS_InitXPCOM2);
NS_DLSYM(NS_ShutdownXPCOM); NS_DLSYM(NS_ShutdownXPCOM);
NS_DLSYM(NS_GetComponentRegistrar); NS_DLSYM(NS_GetComponentRegistrar);
NS_DLSYM(NS_StringContainerInit); NS_DLSYM(NS_StringContainerInit2);
NS_DLSYM(NS_CStringContainerInit); NS_DLSYM(NS_CStringContainerInit);
NS_DLSYM(NS_StringContainerFinish); NS_DLSYM(NS_StringContainerFinish);
NS_DLSYM(NS_CStringContainerFinish); NS_DLSYM(NS_CStringContainerFinish);
...@@ -555,11 +555,9 @@ static void nsACString_Finish(nsACString *str) ...@@ -555,11 +555,9 @@ static void nsACString_Finish(nsACString *str)
NS_CStringContainerFinish(str); NS_CStringContainerFinish(str);
} }
void nsAString_Init(nsAString *str, const PRUnichar *data) BOOL nsAString_Init(nsAString *str, const PRUnichar *data)
{ {
NS_StringContainerInit(str); return NS_SUCCEEDED(NS_StringContainerInit2(str, data, PR_UINT32_MAX, 0));
if(data)
nsAString_SetData(str, data);
} }
void nsAString_SetData(nsAString *str, const PRUnichar *data) void nsAString_SetData(nsAString *str, const PRUnichar *data)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment