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

mshtml: Use proper type for parse_proc.

Browse Source
This commit is contained in:
Jacek Caban 2012-10-04 14:59:25 +02:00 committed by Alexandre Julliard
parent bf65003271
commit 94f3eaacf2
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
dlls/mshtml/script.c
View File

@ -47,8 +47,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
#define IActiveScriptParse_Release IActiveScriptParse64_Release #define IActiveScriptParse_Release IActiveScriptParse64_Release
#define IActiveScriptParse_InitNew IActiveScriptParse64_InitNew #define IActiveScriptParse_InitNew IActiveScriptParse64_InitNew
#define IActiveScriptParse_ParseScriptText IActiveScriptParse64_ParseScriptText #define IActiveScriptParse_ParseScriptText IActiveScriptParse64_ParseScriptText
#define IActiveScriptParseProcedure_Release IActiveScriptParseProcedure64_Release #define IActiveScriptParseProcedure2_Release IActiveScriptParseProcedure2_64_Release
#define IActiveScriptParseProcedure_ParseProcedureText IActiveScriptParseProcedure64_ParseProcedureText #define IActiveScriptParseProcedure2_ParseProcedureText IActiveScriptParseProcedure2_64_ParseProcedureText
#else #else
@ -58,8 +58,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
#define IActiveScriptParse_Release IActiveScriptParse32_Release #define IActiveScriptParse_Release IActiveScriptParse32_Release
#define IActiveScriptParse_InitNew IActiveScriptParse32_InitNew #define IActiveScriptParse_InitNew IActiveScriptParse32_InitNew
#define IActiveScriptParse_ParseScriptText IActiveScriptParse32_ParseScriptText #define IActiveScriptParse_ParseScriptText IActiveScriptParse32_ParseScriptText
#define IActiveScriptParseProcedure_Release IActiveScriptParseProcedure32_Release #define IActiveScriptParseProcedure2_Release IActiveScriptParseProcedure2_32_Release
#define IActiveScriptParseProcedure_ParseProcedureText IActiveScriptParseProcedure32_ParseProcedureText #define IActiveScriptParseProcedure2_ParseProcedureText IActiveScriptParseProcedure2_32_ParseProcedureText
#endif #endif
@ -80,7 +80,7 @@ struct ScriptHost {
IActiveScript *script; IActiveScript *script;
IActiveScriptParse *parse; IActiveScriptParse *parse;
IActiveScriptParseProcedure *parse_proc; IActiveScriptParseProcedure2 *parse_proc;
SCRIPTSTATE script_state; SCRIPTSTATE script_state;
@ -214,7 +214,7 @@ static void release_script_engine(ScriptHost *This)
default: default:
if(This->parse_proc) { if(This->parse_proc) {
IActiveScriptParseProcedure_Release(This->parse_proc); IActiveScriptParseProcedure2_Release(This->parse_proc);
This->parse_proc = NULL; This->parse_proc = NULL;
} }
@ -968,7 +968,7 @@ IDispatch *script_parse_event(HTMLInnerWindow *window, LPCWSTR text)
if(!script_host || !script_host->parse_proc) if(!script_host || !script_host->parse_proc)
return NULL; return NULL;
hres = IActiveScriptParseProcedure_ParseProcedureText(script_host->parse_proc, ptr, NULL, emptyW, hres = IActiveScriptParseProcedure2_ParseProcedureText(script_host->parse_proc, ptr, NULL, emptyW,
NULL, NULL, delimiterW, 0 /* FIXME */, 0, NULL, NULL, delimiterW, 0 /* FIXME */, 0,
SCRIPTPROC_HOSTMANAGESSOURCE|SCRIPTPROC_IMPLICIT_THIS|SCRIPTPROC_IMPLICIT_PARENTS, &disp); SCRIPTPROC_HOSTMANAGESSOURCE|SCRIPTPROC_IMPLICIT_THIS|SCRIPTPROC_IMPLICIT_PARENTS, &disp);
if(FAILED(hres)) { if(FAILED(hres)) {
@ -1129,7 +1129,7 @@ static IDispatch *parse_event_elem(HTMLDocumentNode *doc, HTMLScriptElement *scr
const PRUnichar *text; const PRUnichar *text;
nsAString_GetData(&nsstr, &text); nsAString_GetData(&nsstr, &text);
hres = IActiveScriptParseProcedure_ParseProcedureText(script_host->parse_proc, text, args, hres = IActiveScriptParseProcedure2_ParseProcedureText(script_host->parse_proc, text, args,
emptyW, NULL, NULL, script_endW, 0, 0, emptyW, NULL, NULL, script_endW, 0, 0,
SCRIPTPROC_HOSTMANAGESSOURCE|SCRIPTPROC_IMPLICIT_THIS|SCRIPTPROC_IMPLICIT_PARENTS, &disp); SCRIPTPROC_HOSTMANAGESSOURCE|SCRIPTPROC_IMPLICIT_THIS|SCRIPTPROC_IMPLICIT_PARENTS, &disp);
if(FAILED(hres)) if(FAILED(hres))