Jacek Caban : mshtml: Fix handling Gecko strings.
Alexandre Julliard
julliard at wine.codeweavers.com
Thu Dec 15 04:35:11 CST 2005
Module: wine
Branch: refs/heads/master
Commit: b48d9590a3fdd6e9f913e0d703045802a5232211
URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b48d9590a3fdd6e9f913e0d703045802a5232211
Author: Jacek Caban <jacek at codeweavers.com>
Date: Thu Dec 15 10:41:56 2005 +0100
mshtml: Fix handling Gecko strings.
---
dlls/mshtml/nsembed.c | 19 ++++++++++---------
dlls/mshtml/nsiface.idl | 8 +++++---
2 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c
index bce48ed..f409eae 100644
--- a/dlls/mshtml/nsembed.c
+++ b/dlls/mshtml/nsembed.c
@@ -44,22 +44,23 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
#define PR_UINT32_MAX 0xffffffff
-typedef struct nsACString {
+struct nsStringContainer {
+ void *v;
void *d1;
PRUint32 d2;
void *d3;
-} nsString;
+};
static nsresult (*NS_InitXPCOM2)(nsIServiceManager**,void*,void*);
static nsresult (*NS_ShutdownXPCOM)(nsIServiceManager*);
static nsresult (*NS_GetComponentRegistrar)(nsIComponentRegistrar**);
-static nsresult (*NS_StringContainerInit)(nsString*);
-static nsresult (*NS_CStringContainerInit)(nsACString*);
-static nsresult (*NS_StringContainerFinish)(nsString*);
-static nsresult (*NS_CStringContainerFinish)(nsACString*);
-static nsresult (*NS_StringSetData)(nsString*,const PRUnichar*,PRUint32);
+static nsresult (*NS_StringContainerInit)(nsStringContainer*);
+static nsresult (*NS_CStringContainerInit)(nsCStringContainer*);
+static nsresult (*NS_StringContainerFinish)(nsStringContainer*);
+static nsresult (*NS_CStringContainerFinish)(nsCStringContainer*);
+static nsresult (*NS_StringSetData)(nsAString*,const PRUnichar*,PRUint32);
static nsresult (*NS_CStringSetData)(nsACString*,const char*,PRUint32);
-static nsresult (*NS_NewLocalFile)(const nsString*,PRBool,nsIFile**);
+static nsresult (*NS_NewLocalFile)(const nsAString*,PRBool,nsIFile**);
static PRUint32 (*NS_CStringGetData)(nsACString*,const char**,PRBool*);
static HINSTANCE hXPCOM = NULL;
@@ -245,7 +246,7 @@ static BOOL load_gecko()
nsresult nsres;
nsIObserver *pStartNotif;
nsIComponentRegistrar *registrar = NULL;
- nsString path;
+ nsAString path;
nsIFile *gre_dir;
PRUnichar gre_path[MAX_PATH];
WCHAR path_env[MAX_PATH];
diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl
index 077ed25..0567c6a 100644
--- a/dlls/mshtml/nsiface.idl
+++ b/dlls/mshtml/nsiface.idl
@@ -44,11 +44,13 @@ typedef BYTE PRUint8;
typedef BOOL PRBool;
typedef LARGE_INTEGER PRInt64;
typedef ULARGE_INTEGER PRUint64;
-
-typedef int nsAString;
-typedef struct nsACString nsACString;
typedef PRUint64 DOMTimeStamp;
+typedef struct nsStringContainer nsStringContainer;
+typedef nsStringContainer nsCStringContainer;
+typedef nsStringContainer nsACString;
+typedef nsStringContainer nsAString;
+
interface nsIWebBrowserChrome;
[
More information about the wine-cvs
mailing list