Jacek Caban : mshtml: Use NS_CStringContainerInit2 in nsACString_Init.
Alexandre Julliard
julliard at winehq.org
Thu Apr 22 11:24:07 CDT 2010
Module: wine
Branch: master
Commit: 033bb8a2f9bd57000e64d5566f1b52a1cdf3f730
URL: http://source.winehq.org/git/wine.git/?a=commit;h=033bb8a2f9bd57000e64d5566f1b52a1cdf3f730
Author: Jacek Caban <jacek at codeweavers.com>
Date: Thu Apr 22 17:48:39 2010 +0200
mshtml: Use NS_CStringContainerInit2 in nsACString_Init.
---
dlls/mshtml/nsembed.c | 10 +++-------
1 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c
index ddf3c3a..3df5c04 100644
--- a/dlls/mshtml/nsembed.c
+++ b/dlls/mshtml/nsembed.c
@@ -56,7 +56,6 @@ static nsresult (*NS_ShutdownXPCOM)(nsIServiceManager*);
static nsresult (*NS_GetComponentRegistrar)(nsIComponentRegistrar**);
static nsresult (*NS_StringContainerInit2)(nsStringContainer*,const PRUnichar*,PRUint32,PRUint32);
static nsresult (*NS_CStringContainerInit2)(nsCStringContainer*,const char*,PRUint32,PRUint32);
-static nsresult (*NS_CStringContainerInit)(nsCStringContainer*);
static nsresult (*NS_StringContainerFinish)(nsStringContainer*);
static nsresult (*NS_CStringContainerFinish)(nsCStringContainer*);
static nsresult (*NS_StringSetData)(nsAString*,const PRUnichar*,PRUint32);
@@ -182,9 +181,8 @@ static BOOL load_xpcom(const PRUnichar *gre_path)
NS_DLSYM(NS_InitXPCOM2);
NS_DLSYM(NS_ShutdownXPCOM);
NS_DLSYM(NS_GetComponentRegistrar);
- NS_DLSYM(NS_CStringContainerInit2);
NS_DLSYM(NS_StringContainerInit2);
- NS_DLSYM(NS_CStringContainerInit);
+ NS_DLSYM(NS_CStringContainerInit2);
NS_DLSYM(NS_StringContainerFinish);
NS_DLSYM(NS_CStringContainerFinish);
NS_DLSYM(NS_StringSetData);
@@ -522,11 +520,9 @@ void nsfree(void *mem)
nsIMemory_Free(nsmem, mem);
}
-static void nsACString_Init(nsACString *str, const char *data)
+static BOOL nsACString_Init(nsACString *str, const char *data)
{
- NS_CStringContainerInit(str);
- if(data)
- nsACString_SetData(str, data);
+ return NS_SUCCEEDED(NS_CStringContainerInit2(str, data, PR_UINT32_MAX, 0));
}
/*
More information about the wine-cvs
mailing list