September 2011 - Wine-Commits

Juan Lang : crypt32: Test CertCreateCertificateContext, and fix an error code in a failure case.
by Alexandre Julliard Sept. 22, 2011

Sept. 22, 2011

Module: wine Branch: master Commit: 546bfa2c1ce82f80613cce7870d306faf2de653a URL: http://source.winehq.org/git/wine.git/?a=commit;h=546bfa2c1ce82f80613cce787… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Sep 22 05:20:50 2011 -0700 crypt32: Test CertCreateCertificateContext, and fix an error code in a failure case. --- dlls/crypt32/cert.c | 6 +++++ dlls/crypt32/tests/cert.c | 46 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index 75b0e12..0117f27 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -141,6 +141,12 @@ PCCERT_CONTEXT WINAPI CertCreateCertificateContext(DWORD dwCertEncodingType, TRACE("(%08x, %p, %d)\n", dwCertEncodingType, pbCertEncoded, cbCertEncoded); + if ((dwCertEncodingType & CERT_ENCODING_TYPE_MASK) != X509_ASN_ENCODING) + { + SetLastError(E_INVALIDARG); + return NULL; + } + ret = CryptDecodeObjectEx(dwCertEncodingType, X509_CERT_TO_BE_SIGNED, pbCertEncoded, cbCertEncoded, CRYPT_DECODE_ALLOC_FLAG, NULL, &certInfo, &size); diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index e338740..9e7104a 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -634,6 +634,51 @@ static void testCertProperties(void) CertFreeCertificateContext(context); } +static void testCreateCert(void) +{ + PCCERT_CONTEXT cert, enumCert; + DWORD count, size; + BOOL ret; + + SetLastError(0xdeadbeef); + cert = CertCreateCertificateContext(0, NULL, 0); + ok(!cert && GetLastError() == E_INVALIDARG, + "expected E_INVALIDARG, got %08x\n", GetLastError()); + SetLastError(0xdeadbeef); + cert = CertCreateCertificateContext(0, selfSignedCert, + sizeof(selfSignedCert)); + ok(!cert && GetLastError() == E_INVALIDARG, + "expected E_INVALIDARG, got %08x\n", GetLastError()); + SetLastError(0xdeadbeef); + cert = CertCreateCertificateContext(X509_ASN_ENCODING, NULL, 0); + ok(!cert && + (GetLastError() == CRYPT_E_ASN1_EOD || + broken(GetLastError() == OSS_MORE_INPUT /* NT4 */)), + "expected CRYPT_E_ASN1_EOD, got %08x\n", GetLastError()); + + cert = CertCreateCertificateContext(X509_ASN_ENCODING, + selfSignedCert, sizeof(selfSignedCert)); + ok(cert != NULL, "creating cert failed: %08x\n", GetLastError()); + /* Even in-memory certs are expected to have a store associated with them */ + todo_wine + ok(cert->hCertStore != NULL, "expected created cert to have a store\n"); + /* The cert doesn't have the archived property set (which would imply it + * doesn't show up in enumerations.) + */ + size = 0; + ret = CertGetCertificateContextProperty(cert, CERT_ARCHIVED_PROP_ID, + NULL, &size); + ok(!ret && GetLastError() == CRYPT_E_NOT_FOUND, + "expected CRYPT_E_NOT_FOUND, got %08x\n", GetLastError()); + /* Strangely, enumerating the certs in the store finds none. */ + enumCert = NULL; + count = 0; + while ((enumCert = CertEnumCertificatesInStore(cert->hCertStore, enumCert))) + count++; + ok(!count, "expected 0, got %d\n", count); + CertFreeCertificateContext(cert); +} + static void testDupCert(void) { HCERTSTORE store; @@ -3634,6 +3679,7 @@ START_TEST(cert) testAddCert(); testCertProperties(); + testCreateCert(); testDupCert(); testFindCert(); testGetSubjectCert();

1 0

Francois Gouget : comctl32: Add some SysLink style and state definitions.
by Alexandre Julliard Sept. 22, 2011

Sept. 22, 2011

Module: wine Branch: master Commit: 552677956752ea0a136b8d1eb162550d09f964ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=552677956752ea0a136b8d1eb… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Sep 22 16:50:22 2011 +0200 comctl32: Add some SysLink style and state definitions. --- include/commctrl.h | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/include/commctrl.h b/include/commctrl.h index e19b861..0139488 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -5098,6 +5098,10 @@ static const WCHAR WC_LINK[] = { 'S','y','s','L','i','n','k',0 }; /* SysLink styles */ #define LWS_TRANSPARENT 0x0001 #define LWS_IGNORERETURN 0x0002 +#define LWS_NOPREFIX 0x0004 +#define LWS_USEVISUALSTYLE 0x0008 +#define LWS_USECUSTOMTEXT 0x0010 +#define LWS_RIGHT 0x0020 /* SysLink messages */ #define LM_HITTEST (WM_USER + 768) @@ -5115,9 +5119,11 @@ static const WCHAR WC_LINK[] = { 'S','y','s','L','i','n','k',0 }; /* SysLink links states */ -#define LIS_FOCUSED 1 -#define LIS_ENABLED 2 -#define LIS_VISITED 4 +#define LIS_FOCUSED 0x0001 +#define LIS_ENABLED 0x0002 +#define LIS_VISITED 0x0004 +#define LIS_HOTTRACK 0x0008 +#define LIS_DEFAULTCOLORS 0x0010 /* SysLink misc. */

1 0

Alistair Leslie-Hughes : mshtml: Fix test for Windows 7 with IE9.
by Alexandre Julliard Sept. 22, 2011

Sept. 22, 2011

Module: wine Branch: master Commit: 05e18862cb5ae825697695a6ac9b6d4772a9a863 URL: http://source.winehq.org/git/wine.git/?a=commit;h=05e18862cb5ae825697695a6a… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Sep 22 20:09:59 2011 +1000 mshtml: Fix test for Windows 7 with IE9. --- dlls/mshtml/tests/dom.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 4a2a7ac..45b3a80 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -4459,7 +4459,8 @@ static void test_window(IHTMLDocument2 *doc) str = NULL; hres = IHTMLWindow2_toString(window, &str); ok(hres == S_OK, "toString failed: %08x\n", hres); - ok(!strcmp_wa(str, "[object]"), "toString returned %s\n", wine_dbgstr_w(str)); + ok(!strcmp_wa(str, "[object]") || + !strcmp_wa(str, "[object Window]") /* win7 ie9 */, "toString returned %s\n", wine_dbgstr_w(str)); SysFreeString(str); test_window_name(window, NULL);

1 0

Francois Gouget : user32: Change HotTrackingColor to better differentiate regular links from visited links .
by Alexandre Julliard Sept. 22, 2011

Sept. 22, 2011

Module: wine Branch: master Commit: dd0f5377edb618a791be6082cb28b609923abe0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd0f5377edb618a791be6082c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Sep 22 16:56:42 2011 +0200 user32: Change HotTrackingColor to better differentiate regular links from visited links. --- dlls/user32/sysparams.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 6c5955a..fe910f2 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -124,7 +124,7 @@ static const struct {"InfoText", RGB(0, 0, 0)}, /* COLOR_INFOTEXT */ {"InfoWindow", RGB(255, 255, 225)}, /* COLOR_INFOBK */ {"ButtonAlternateFace", RGB(181, 181, 181)}, /* COLOR_ALTERNATEBTNFACE */ - {"HotTrackingColor", RGB(0, 0, 128)}, /* COLOR_HOTLIGHT */ + {"HotTrackingColor", RGB(0, 0, 200)}, /* COLOR_HOTLIGHT */ {"GradientActiveTitle", RGB(166, 202, 240)}, /* COLOR_GRADIENTACTIVECAPTION */ {"GradientInactiveTitle", RGB(192, 192, 192)}, /* COLOR_GRADIENTINACTIVECAPTION */ {"MenuHilight", RGB(10, 36, 106)}, /* COLOR_MENUHILIGHT */

1 0

Nikolay Sivov : msxml3: Fix putProperty() for declaration handler.
by Alexandre Julliard Sept. 22, 2011

Sept. 22, 2011

Module: wine Branch: master Commit: 7db7d857c503581c845ed1cac2e4b2f4e7bb4cf7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7db7d857c503581c845ed1cac… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 22 10:50:41 2011 +0400 msxml3: Fix putProperty() for declaration handler. --- dlls/msxml3/saxreader.c | 58 ++++++++--- dlls/msxml3/tests/saxreader.c | 226 ++++++++++++++++++++++++++++------------ 2 files changed, 201 insertions(+), 83 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7db7d857c503581c845ed…

1 0

Nikolay Sivov : msxml3: Fix putProperty() for lexical handler case.
by Alexandre Julliard Sept. 22, 2011

Sept. 22, 2011

Module: wine Branch: master Commit: 864f17016f5658ebb2299c7d6ce279945cdb29e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=864f17016f5658ebb2299c7d6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Sep 21 21:01:10 2011 +0400 msxml3: Fix putProperty() for lexical handler case. --- dlls/msxml3/saxreader.c | 203 ++++++++++++++++++++++++----------------- dlls/msxml3/tests/saxreader.c | 177 +++++++++++++++++++++++++++++++++++ 2 files changed, 295 insertions(+), 85 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=864f17016f5658ebb2299…

1 0

Jörg Höhle : wineoss: EAGAIN (OSS buffer full) is a regular situation.
by Alexandre Julliard Sept. 22, 2011

Sept. 22, 2011

Module: wine Branch: master Commit: 55efce6c9ca7fd13f4e4362f7fc8fd456d803ea2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=55efce6c9ca7fd13f4e4362f7… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Wed Sep 21 10:42:16 2011 +0200 wineoss: EAGAIN (OSS buffer full) is a regular situation. --- dlls/wineoss.drv/mmdevdrv.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 562a674..33438e4 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -1224,6 +1224,7 @@ static void oss_write_data(ACImpl *This) written = write(This->fd, buf, to_write * This->fmt->nBlockAlign); if(written < 0){ + /* EAGAIN is OSS buffer full, log that too */ WARN("write failed: %d (%s)\n", errno, strerror(errno)); return; } @@ -1729,9 +1730,12 @@ static HRESULT WINAPI AudioRenderClient_ReleaseBuffer( w_bytes = write(This->fd, buffer, written_frames * This->fmt->nBlockAlign); if(w_bytes < 0){ - LeaveCriticalSection(&This->lock); - WARN("write failed: %d (%s)\n", errno, strerror(errno)); - return E_FAIL; + if(errno != EAGAIN){ + LeaveCriticalSection(&This->lock); + WARN("write failed: %d (%s)\n", errno, strerror(errno)); + return E_FAIL; + }else /* OSS buffer full */ + w_bytes = 0; } w_frames = w_bytes / This->fmt->nBlockAlign; This->inbuf_frames += w_frames;

1 0

Jacek Caban : vbscript: Lookup global object before host-provided objects.
by Alexandre Julliard Sept. 22, 2011

Sept. 22, 2011

Module: wine Branch: master Commit: abb2d2872112e7e1242c4b94c388572885ce8440 URL: http://source.winehq.org/git/wine.git/?a=commit;h=abb2d2872112e7e1242c4b94c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 22 14:25:15 2011 +0200 vbscript: Lookup global object before host-provided objects. --- dlls/vbscript/interp.c | 44 +++++++++++++++++++++++--------------------- 1 files changed, 23 insertions(+), 21 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 08ea83e..678b51a 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -126,12 +126,14 @@ static HRESULT lookup_identifier(exec_ctx_t *ctx, BSTR name, vbdisp_invoke_type_ if(lookup_dynamic_vars(ctx->func->type == FUNC_GLOBAL ? ctx->script->global_vars : ctx->dynamic_vars, name, ref)) return S_OK; - hres = disp_get_id(ctx->this_obj, name, invoke_type, TRUE, &id); - if(SUCCEEDED(hres)) { - ref->type = REF_DISP; - ref->u.d.disp = ctx->this_obj; - ref->u.d.id = id; - return S_OK; + if(ctx->func->type != FUNC_GLOBAL) { + hres = disp_get_id(ctx->this_obj, name, invoke_type, TRUE, &id); + if(SUCCEEDED(hres)) { + ref->type = REF_DISP; + ref->u.d.disp = ctx->this_obj; + ref->u.d.id = id; + return S_OK; + } } if(ctx->func->type != FUNC_GLOBAL && lookup_dynamic_vars(ctx->script->global_vars, name, ref)) @@ -145,8 +147,22 @@ static HRESULT lookup_identifier(exec_ctx_t *ctx, BSTR name, vbdisp_invoke_type_ } } + if(!strcmpiW(name, errW)) { + ref->type = REF_OBJ; + ref->u.obj = (IDispatch*)&ctx->script->err_obj->IDispatchEx_iface; + return S_OK; + } + + hres = vbdisp_get_id(ctx->script->global_obj, name, invoke_type, TRUE, &id); + if(SUCCEEDED(hres)) { + ref->type = REF_DISP; + ref->u.d.disp = (IDispatch*)&ctx->script->global_obj->IDispatchEx_iface; + ref->u.d.id = id; + return S_OK; + } + LIST_FOR_EACH_ENTRY(item, &ctx->script->named_items, named_item_t, entry) { - if((item->flags & SCRIPTITEM_GLOBALMEMBERS) && item->disp != ctx->this_obj) { + if((item->flags & SCRIPTITEM_GLOBALMEMBERS)) { hres = disp_get_id(item->disp, name, invoke_type, FALSE, &id); if(SUCCEEDED(hres)) { ref->type = REF_DISP; @@ -180,20 +196,6 @@ static HRESULT lookup_identifier(exec_ctx_t *ctx, BSTR name, vbdisp_invoke_type_ } } - if(!strcmpiW(name, errW)) { - ref->type = REF_OBJ; - ref->u.obj = (IDispatch*)&ctx->script->err_obj->IDispatchEx_iface; - return S_OK; - } - - hres = vbdisp_get_id(ctx->script->global_obj, name, invoke_type, TRUE, &id); - if(SUCCEEDED(hres)) { - ref->type = REF_DISP; - ref->u.d.disp = (IDispatch*)&ctx->script->global_obj->IDispatchEx_iface; - ref->u.d.id = id; - return S_OK; - } - ref->type = REF_NONE; return S_OK; }

1 0

Jacek Caban : vbscript: Added interp_step implementation.
by Alexandre Julliard Sept. 22, 2011

Sept. 22, 2011

Module: wine Branch: master Commit: d55aa556ad6fcd89106d4d5220250834f579fbb7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d55aa556ad6fcd89106d4d522… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 22 14:23:51 2011 +0200 vbscript: Added interp_step implementation. --- dlls/vbscript/interp.c | 41 +++++++++++++++++++++++++++++++++++++++-- 1 files changed, 39 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 5e41845..c95183d 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -245,6 +245,12 @@ static inline VARIANT *stack_pop(exec_ctx_t *ctx) return ctx->stack + --ctx->top; } +static inline VARIANT *stack_top(exec_ctx_t *ctx, unsigned n) +{ + assert(ctx->top >= n); + return ctx->stack + (ctx->top-n-1); +} + static HRESULT stack_push(exec_ctx_t *ctx, VARIANT *v) { if(ctx->stack_size == ctx->top) { @@ -745,8 +751,39 @@ static HRESULT interp_new(exec_ctx_t *ctx) static HRESULT interp_step(exec_ctx_t *ctx) { const BSTR ident = ctx->instr->arg2.bstr; - FIXME("%s\n", debugstr_w(ident)); - return E_NOTIMPL; + BOOL gteq_zero; + VARIANT zero; + ref_t ref; + HRESULT hres; + + TRACE("%s\n", debugstr_w(ident)); + + V_VT(&zero) = VT_I2; + V_I2(&zero) = 0; + hres = VarCmp(stack_top(ctx, 0), &zero, ctx->script->lcid, 0); + if(FAILED(hres)) + return hres; + + gteq_zero = hres == VARCMP_GT || hres == VARCMP_EQ; + + hres = lookup_identifier(ctx, ident, VBDISP_ANY, &ref); + if(FAILED(hres)) + return hres; + + if(ref.type != REF_VAR) { + FIXME("%s is not REF_VAR\n", debugstr_w(ident)); + return E_FAIL; + } + + hres = VarCmp(ref.u.v, stack_top(ctx, 1), ctx->script->lcid, 0); + if(FAILED(hres)) + return hres; + + if(hres == VARCMP_EQ || hres == (gteq_zero ? VARCMP_LT : VARCMP_GT)) + ctx->instr++; + else + instr_jmp(ctx, ctx->instr->arg1.uint); + return S_OK; } static HRESULT interp_jmp(exec_ctx_t *ctx)

1 0

Jacek Caban : vbscript: Added for..to statement compiler implementation.
by Alexandre Julliard Sept. 22, 2011

Sept. 22, 2011

Module: wine Branch: master Commit: 8244e4c0c7011ef1bf5d06f63ae8b5b94b5ea6a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8244e4c0c7011ef1bf5d06f63… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 22 14:23:10 2011 +0200 vbscript: Added for..to statement compiler implementation. --- dlls/vbscript/compile.c | 77 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/vbscript/interp.c | 30 ++++++++++++++++++ dlls/vbscript/vbscript.h | 4 ++ 3 files changed, 111 insertions(+), 0 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index 9cfe45b..1f1f041 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -169,6 +169,18 @@ static HRESULT push_instr_int(compile_ctx_t *ctx, vbsop_t op, LONG arg) return S_OK; } +static HRESULT push_instr_uint(compile_ctx_t *ctx, vbsop_t op, unsigned arg) +{ + unsigned ret; + + ret = push_instr(ctx, op); + if(ret == -1) + return E_OUTOFMEMORY; + + instr_ptr(ctx, ret)->arg1.uint = arg; + return S_OK; +} + static HRESULT push_instr_addr(compile_ctx_t *ctx, vbsop_t op, unsigned arg) { unsigned ret; @@ -603,6 +615,68 @@ static HRESULT compile_dowhile_statement(compile_ctx_t *ctx, while_statement_t * return S_OK; } +static HRESULT compile_forto_statement(compile_ctx_t *ctx, forto_statement_t *stat) +{ + unsigned step_instr, instr; + BSTR identifier; + HRESULT hres; + + identifier = alloc_bstr_arg(ctx, stat->identifier); + if(!identifier) + return E_OUTOFMEMORY; + + hres = compile_expression(ctx, stat->from_expr); + if(FAILED(hres)) + return hres; + + instr = push_instr(ctx, OP_assign_ident); + if(instr == -1) + return E_OUTOFMEMORY; + instr_ptr(ctx, instr)->arg1.bstr = identifier; + + hres = compile_expression(ctx, stat->to_expr); + if(FAILED(hres)) + return hres; + + if(push_instr(ctx, OP_val) == -1) + return E_OUTOFMEMORY; + + if(stat->step_expr) { + hres = compile_expression(ctx, stat->step_expr); + if(FAILED(hres)) + return hres; + + if(push_instr(ctx, OP_val) == -1) + return E_OUTOFMEMORY; + }else { + hres = push_instr_int(ctx, OP_short, 1); + if(FAILED(hres)) + return hres; + } + + step_instr = push_instr(ctx, OP_step); + if(step_instr == -1) + return E_OUTOFMEMORY; + instr_ptr(ctx, step_instr)->arg2.bstr = identifier; + + hres = compile_statement(ctx, stat->body); + if(FAILED(hres)) + return hres; + + instr = push_instr(ctx, OP_incc); + if(instr == -1) + return E_OUTOFMEMORY; + instr_ptr(ctx, instr)->arg1.bstr = identifier; + + hres = push_instr_addr(ctx, OP_jmp, step_instr); + if(FAILED(hres)) + return hres; + + instr_ptr(ctx, step_instr)->arg1.uint = ctx->instr_cnt; + + return push_instr_uint(ctx, OP_pop, 2); +} + static HRESULT compile_assign_statement(compile_ctx_t *ctx, assign_statement_t *stat, BOOL is_set) { HRESULT hres; @@ -799,6 +873,9 @@ static HRESULT compile_statement(compile_ctx_t *ctx, statement_t *stat) case STAT_EXITSUB: hres = compile_exitsub_statement(ctx); break; + case STAT_FORTO: + hres = compile_forto_statement(ctx, (forto_statement_t*)stat); + break; case STAT_FUNC: hres = compile_function_statement(ctx, (function_statement_t*)stat); break; diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index c2ffd98..1327c17 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -682,6 +682,22 @@ static HRESULT interp_const(exec_ctx_t *ctx) return add_dynamic_var(ctx, arg, TRUE, val.v, val.owned); } +static HRESULT interp_val(exec_ctx_t *ctx) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT interp_pop(exec_ctx_t *ctx) +{ + const unsigned n = ctx->instr->arg1.uint; + + TRACE("%u\n", n); + + stack_popn(ctx, n); + return S_OK; +} + static HRESULT interp_new(exec_ctx_t *ctx) { const WCHAR *arg = ctx->instr->arg1.bstr; @@ -710,6 +726,13 @@ static HRESULT interp_new(exec_ctx_t *ctx) return stack_push(ctx, &v); } +static HRESULT interp_step(exec_ctx_t *ctx) +{ + const BSTR ident = ctx->instr->arg2.bstr; + FIXME("%s\n", debugstr_w(ident)); + return E_NOTIMPL; +} + static HRESULT interp_jmp(exec_ctx_t *ctx) { const unsigned arg = ctx->instr->arg1.uint; @@ -1439,6 +1462,13 @@ static HRESULT interp_neg(exec_ctx_t *ctx) return stack_push(ctx, &v); } +static HRESULT interp_incc(exec_ctx_t *ctx) +{ + const BSTR ident = ctx->instr->arg1.bstr; + FIXME("%s\n", debugstr_w(ident)); + return E_NOTIMPL; +} + static const instr_func_t op_funcs[] = { #define X(x,n,a,b) interp_ ## x, OP_LIST diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index bd55719..4b0a569 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -199,6 +199,7 @@ typedef enum { X(icallv, 1, ARG_BSTR, ARG_UINT) \ X(idiv, 1, 0, 0) \ X(imp, 1, 0, 0) \ + X(incc, 1, ARG_BSTR, 0) \ X(is, 1, 0, 0) \ X(jmp, 0, ARG_ADDR, 0) \ X(jmp_false, 0, ARG_ADDR, 0) \ @@ -218,13 +219,16 @@ typedef enum { X(nothing, 1, 0, 0) \ X(null, 1, 0, 0) \ X(or, 1, 0, 0) \ + X(pop, 1, ARG_UINT, 0) \ X(ret, 0, 0, 0) \ X(set_ident, 1, ARG_BSTR, 0) \ X(set_member, 1, ARG_BSTR, 0) \ X(short, 1, ARG_INT, 0) \ + X(step, 0, ARG_ADDR, ARG_BSTR) \ X(stop, 1, 0, 0) \ X(string, 1, ARG_STR, 0) \ X(sub, 1, 0, 0) \ + X(val, 1, 0, 0) \ X(xor, 1, 0, 0) typedef enum {

1 0