ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mshtml: Fix handling Gecko strings.

This commit is contained in:
Jacek Caban 2005-12-15 10:41:56 +01:00 committed by Alexandre Julliard
parent 054164d5ba
commit b48d9590a3
2 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
dlls/mshtml/nsembed.c
View File

@ -44,22 +44,23 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
#define PR_UINT32_MAX 0xffffffff #define PR_UINT32_MAX 0xffffffff
typedef struct nsACString { struct nsStringContainer {
void *v;
void *d1; void *d1;
PRUint32 d2; PRUint32 d2;
void *d3; void *d3;
} nsString; };
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)(nsString*); static nsresult (*NS_StringContainerInit)(nsStringContainer*);
static nsresult (*NS_CStringContainerInit)(nsACString*); static nsresult (*NS_CStringContainerInit)(nsCStringContainer*);
static nsresult (*NS_StringContainerFinish)(nsString*); static nsresult (*NS_StringContainerFinish)(nsStringContainer*);
static nsresult (*NS_CStringContainerFinish)(nsACString*); static nsresult (*NS_CStringContainerFinish)(nsCStringContainer*);
static nsresult (*NS_StringSetData)(nsString*,const PRUnichar*,PRUint32); static nsresult (*NS_StringSetData)(nsAString*,const PRUnichar*,PRUint32);
static nsresult (*NS_CStringSetData)(nsACString*,const char*,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 PRUint32 (*NS_CStringGetData)(nsACString*,const char**,PRBool*);
static HINSTANCE hXPCOM = NULL; static HINSTANCE hXPCOM = NULL;
@ -245,7 +246,7 @@ static BOOL load_gecko()
nsresult nsres; nsresult nsres;
nsIObserver *pStartNotif; nsIObserver *pStartNotif;
nsIComponentRegistrar *registrar = NULL; nsIComponentRegistrar *registrar = NULL;
nsString path; nsAString path;
nsIFile *gre_dir; nsIFile *gre_dir;
PRUnichar gre_path[MAX_PATH]; PRUnichar gre_path[MAX_PATH];
WCHAR path_env[MAX_PATH]; WCHAR path_env[MAX_PATH];

8
dlls/mshtml/nsiface.idl
View File

@ -44,11 +44,13 @@ typedef BYTE PRUint8;
typedef BOOL PRBool; typedef BOOL PRBool;
typedef LARGE_INTEGER PRInt64; typedef LARGE_INTEGER PRInt64;
typedef ULARGE_INTEGER PRUint64; typedef ULARGE_INTEGER PRUint64;
typedef int nsAString;
typedef struct nsACString nsACString;
typedef PRUint64 DOMTimeStamp; typedef PRUint64 DOMTimeStamp;
typedef struct nsStringContainer nsStringContainer;
typedef nsStringContainer nsCStringContainer;
typedef nsStringContainer nsACString;
typedef nsStringContainer nsAString;
interface nsIWebBrowserChrome; interface nsIWebBrowserChrome;
[ [