Jacek Caban : jscript: Added IActiveScriptParseProcedure2:: ParseProcedureText implementation.
Alexandre Julliard
julliard at winehq.org
Thu Sep 11 08:00:55 CDT 2008
Module: wine
Branch: master
Commit: eedc6dc715096488be5576c987860e6ad8986164
URL: http://source.winehq.org/git/wine.git/?a=commit;h=eedc6dc715096488be5576c987860e6ad8986164
Author: Jacek Caban <jacek at codeweavers.com>
Date: Wed Sep 10 21:09:48 2008 +0200
jscript: Added IActiveScriptParseProcedure2::ParseProcedureText implementation.
---
dlls/jscript/jscript.c | 28 +++++++++++++++++++++++++---
1 files changed, 25 insertions(+), 3 deletions(-)
diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c
index e1dde43..899f59d 100644
--- a/dlls/jscript/jscript.c
+++ b/dlls/jscript/jscript.c
@@ -576,7 +576,7 @@ static const IActiveScriptParseVtbl JScriptParseVtbl = {
JScriptParse_ParseScriptText
};
-#define ASPARSEPROC_THIS(iface) DEFINE_THIS(JScript, IActiveScriptParse, iface)
+#define ASPARSEPROC_THIS(iface) DEFINE_THIS(JScript, IActiveScriptParseProcedure2, iface)
static HRESULT WINAPI JScriptParseProcedure_QueryInterface(IActiveScriptParseProcedure2 *iface, REFIID riid, void **ppv)
{
@@ -602,8 +602,30 @@ static HRESULT WINAPI JScriptParseProcedure_ParseProcedureText(IActiveScriptPars
DWORD dwSourceContextCookie, ULONG ulStartingLineNumber, DWORD dwFlags, IDispatch **ppdisp)
{
JScript *This = ASPARSEPROC_THIS(iface);
- FIXME("(%p)->()\n", This);
- return E_NOTIMPL;
+ parser_ctx_t *parser_ctx;
+ DispatchEx *dispex;
+ HRESULT hres;
+
+ TRACE("(%p)->(%s %s %s %s %p %s %x %u %x %p)\n", This, debugstr_w(pstrCode), debugstr_w(pstrFormalParams),
+ debugstr_w(pstrProcedureName), debugstr_w(pstrItemName), punkContext, debugstr_w(pstrDelimiter),
+ dwSourceContextCookie, ulStartingLineNumber, dwFlags, ppdisp);
+
+ if(This->thread_id != GetCurrentThreadId() || This->ctx->state == SCRIPTSTATE_CLOSED)
+ return E_UNEXPECTED;
+
+ hres = script_parse(This->ctx, pstrCode, &parser_ctx);
+ if(FAILED(hres)) {
+ WARN("Parse failed %08x\n", hres);
+ return hres;
+ }
+
+ hres = create_source_function(parser_ctx, NULL, parser_ctx->source, NULL, &dispex);
+ parser_release(parser_ctx);
+ if(FAILED(hres))
+ return hres;
+
+ *ppdisp = (IDispatch*)_IDispatchEx_(dispex);
+ return S_OK;
}
#undef ASPARSEPROC_THIS
More information about the wine-cvs
mailing list