September 2011 - Wine-commits

Alexandre Julliard : winex11: Use the physdev picture directly for the SRCCOPY XRender optimization.
by Alexandre Julliard 16 Sep '11

16 Sep '11

Module: wine Branch: master Commit: a09753a34935c4379c021fe939c2e1fb64cb68c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a09753a34935c4379c021fe93… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 15 23:13:01 2011 +0200 winex11: Use the physdev picture directly for the SRCCOPY XRender optimization. --- dlls/winex11.drv/xrender.c | 41 ++++++++++++++++++++++++++--------------- 1 files changed, 26 insertions(+), 15 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index 3288787..77b0aeb 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -2340,16 +2340,11 @@ static void xrender_stretch_blit( struct xrender_physdev *physdev_src, struct xr int height = dst->visrect.bottom - dst->visrect.top; int x_src = physdev_src->x11dev->dc_rect.left + src->visrect.left; int y_src = physdev_src->x11dev->dc_rect.top + src->visrect.top; - int x_dst = physdev_dst->x11dev->dc_rect.left + dst->visrect.left; - int y_dst = physdev_dst->x11dev->dc_rect.top + dst->visrect.top; - Picture src_pict=0, dst_pict=0, mask_pict=0; + int x_dst, y_dst; + Picture src_pict = 0, dst_pict, mask_pict = 0; BOOL use_repeat; double xscale, yscale; - XRenderPictureAttributes pa; - pa.subwindow_mode = IncludeInferiors; - pa.repeat = RepeatNone; - use_repeat = use_source_repeat( physdev_src ); if (!use_repeat) { @@ -2358,7 +2353,22 @@ static void xrender_stretch_blit( struct xrender_physdev *physdev_src, struct xr } else xscale = yscale = 1; /* no scaling needed with a repeating source */ - if (drawable != physdev_dst->x11dev->drawable) x_dst = y_dst = 0; /* using an intermediate pixmap */ + if (drawable) /* using an intermediate pixmap */ + { + XRenderPictureAttributes pa; + + x_dst = y_dst = 0; + pa.repeat = RepeatNone; + wine_tsx11_lock(); + dst_pict = pXRenderCreatePicture( gdi_display, drawable, physdev_dst->pict_format, CPRepeat, &pa ); + wine_tsx11_unlock(); + } + else + { + x_dst = physdev_dst->x11dev->dc_rect.left + dst->visrect.left; + y_dst = physdev_dst->x11dev->dc_rect.top + dst->visrect.top; + dst_pict = get_xrender_picture( physdev_dst ); + } /* mono -> color */ if (physdev_src->format == WXR_FORMAT_MONO && physdev_dst->format != WXR_FORMAT_MONO) @@ -2377,14 +2387,11 @@ static void xrender_stretch_blit( struct xrender_physdev *physdev_src, struct xr /* Create a destination picture and fill it with textPixel color as the background color */ wine_tsx11_lock(); - dst_pict = pXRenderCreatePicture( gdi_display, drawable, physdev_dst->pict_format, - CPSubwindowMode|CPRepeat, &pa ); pXRenderFillRectangle( gdi_display, PictOpSrc, dst_pict, &fg, x_dst, y_dst, width, height ); xrender_mono_blit( src_pict, mask_pict, dst_pict, x_src, y_src, x_dst, y_dst, xscale, yscale, width, height ); - if (dst_pict) pXRenderFreePicture(gdi_display, dst_pict); wine_tsx11_unlock(); LeaveCriticalSection( &xrender_cs ); } @@ -2395,13 +2402,17 @@ static void xrender_stretch_blit( struct xrender_physdev *physdev_src, struct xr src_pict = get_xrender_picture_source( physdev_src, use_repeat ); wine_tsx11_lock(); - dst_pict = pXRenderCreatePicture( gdi_display, drawable, physdev_dst->pict_format, - CPSubwindowMode|CPRepeat, &pa ); xrender_blit( PictOpSrc, src_pict, mask_pict, dst_pict, x_src, y_src, x_dst, y_dst, xscale, yscale, width, height ); - if (dst_pict) pXRenderFreePicture(gdi_display, dst_pict); + wine_tsx11_unlock(); + } + + if (drawable) + { + wine_tsx11_lock(); + pXRenderFreePicture( gdi_display, dst_pict ); wine_tsx11_unlock(); } } @@ -2468,7 +2479,7 @@ static BOOL xrenderdrv_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst, XFreeGC( gdi_display, tmpGC ); wine_tsx11_unlock(); } - else xrender_stretch_blit( physdev_src, physdev_dst, physdev_dst->x11dev->drawable, src, dst ); + else xrender_stretch_blit( physdev_src, physdev_dst, 0, src, dst ); if (physdev_dst != physdev_src) X11DRV_UnlockDIBSection( physdev_src->x11dev, FALSE ); X11DRV_UnlockDIBSection( physdev_dst->x11dev, TRUE );

1 0

Alexandre Julliard : winex11: Disable the XRender StretchBlt implementation if XRender wasn't loaded.
by Alexandre Julliard 16 Sep '11

16 Sep '11

Module: wine Branch: master Commit: c2edf4399ca69ae9c176e4d00254249ee4dca30e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2edf4399ca69ae9c176e4d00… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 16 11:36:59 2011 +0200 winex11: Disable the XRender StretchBlt implementation if XRender wasn't loaded. --- dlls/winex11.drv/xrender.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index 77b0aeb..ce3bc03 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -2435,13 +2435,14 @@ static BOOL xrenderdrv_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst, return dst_dev->funcs->pStretchBlt( dst_dev, dst, src_dev, src, rop ); } + if (!X11DRV_XRender_Installed) goto x11drv_fallback; + /* XRender is of no use for color -> mono */ if (physdev_dst->format == WXR_FORMAT_MONO && physdev_src->format != WXR_FORMAT_MONO) - return X11DRV_StretchBlt( &physdev_dst->x11dev->dev, dst, &physdev_src->x11dev->dev, src, rop ); + goto x11drv_fallback; /* if not stretching, we only need to handle format conversion */ - if (!stretch && physdev_dst->format == physdev_src->format) - return X11DRV_StretchBlt( &physdev_dst->x11dev->dev, dst, &physdev_src->x11dev->dev, src, rop ); + if (!stretch && physdev_dst->format == physdev_src->format) goto x11drv_fallback; sSrc = sDst = X11DRV_LockDIBSection( physdev_dst->x11dev, DIB_Status_None ); if (physdev_dst != physdev_src) sSrc = X11DRV_LockDIBSection( physdev_src->x11dev, DIB_Status_None ); @@ -2484,6 +2485,9 @@ static BOOL xrenderdrv_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst, if (physdev_dst != physdev_src) X11DRV_UnlockDIBSection( physdev_src->x11dev, FALSE ); X11DRV_UnlockDIBSection( physdev_dst->x11dev, TRUE ); return TRUE; + +x11drv_fallback: + return X11DRV_StretchBlt( &physdev_dst->x11dev->dev, dst, &physdev_src->x11dev->dev, src, rop ); }

1 0

Jacek Caban : vbscript: Added interp_nothing implementation and tests.
by Alexandre Julliard 15 Sep '11

15 Sep '11

Module: wine Branch: master Commit: 9848d6be2ed2e3be4e7ce3ac07c5b96586614591 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9848d6be2ed2e3be4e7ce3ac0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 15 14:19:19 2011 +0200 vbscript: Added interp_nothing implementation and tests. --- dlls/vbscript/interp.c | 9 +++++++-- dlls/vbscript/tests/lang.vbs | 5 +++++ dlls/vbscript/tests/run.c | 29 +++++++++++++++++++++++++++++ 3 files changed, 41 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 4094ac1..f8e0011 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -599,8 +599,13 @@ static HRESULT interp_null(exec_ctx_t *ctx) static HRESULT interp_nothing(exec_ctx_t *ctx) { - FIXME("\n"); - return E_NOTIMPL; + VARIANT v; + + TRACE("\n"); + + V_VT(&v) = VT_DISPATCH; + V_DISPATCH(&v) = NULL; + return stack_push(ctx, &v); } static HRESULT interp_not(exec_ctx_t *ctx) diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index c89009b..a94b2cd 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -71,9 +71,14 @@ Call ok(getVT(1 & 100000) = "VT_BSTR", "getVT(1 & 100000) is not VT_BSTR") Call ok(getVT(-empty) = "VT_I2", "getVT(-empty) = " & getVT(-empty)) Call ok(getVT(-null) = "VT_NULL", "getVT(-null) = " & getVT(-null)) Call ok(getVT(y) = "VT_EMPTY*", "getVT(y) = " & getVT(y)) +Call ok(getVT(nothing) = "VT_DISPATCH", "getVT(nothing) = " & getVT(nothing)) +set x = nothing +Call ok(getVT(x) = "VT_DISPATCH*", "getVT(x=nothing) = " & getVT(x)) x = true Call ok(getVT(x) = "VT_BOOL*", "getVT(x) = " & getVT(x)) +Call ok(isNullDisp(nothing), "nothing is not nulldisp?") + x = "xx" Call ok("ab" & "cd" = "abcd", """ab"" & ""cd"" <> ""abcd""") Call ok("ab " & null = "ab ", """ab"" & null = " & ("ab " & null)) diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index aa2e3f1..4281b16 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -70,6 +70,7 @@ DEFINE_EXPECT(testobj_propput_i); #define DISPID_GLOBAL_ISENGLOC 1004 #define DISPID_GLOBAL_VBVAR 1005 #define DISPID_GLOBAL_TESTOBJ 1006 +#define DISPID_GLOBAL_ISNULLDISP 1007 #define DISPID_TESTOBJ_PROPPUT 2001 @@ -329,6 +330,12 @@ static HRESULT WINAPI Global_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD *pid = DISPID_GLOBAL_VBVAR; return S_OK; } + if(!strcmp_wa(bstrName, "isNullDisp")) { + test_grfdex(grfdex, fdexNameCaseInsensitive); + *pid = DISPID_GLOBAL_ISNULLDISP; + return S_OK; + } + if(strict_dispid_check && strcmp_wa(bstrName, "x")) ok(0, "unexpected call %s %x\n", wine_dbgstr_w(bstrName), grfdex); @@ -459,6 +466,28 @@ static HRESULT WINAPI Global_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, V_VT(pvarRes) = VT_DISPATCH; V_DISPATCH(pvarRes) = (IDispatch*)&testObj; return S_OK; + + case DISPID_GLOBAL_ISNULLDISP: { + VARIANT *v; + + ok(wFlags == (INVOKE_FUNC|INVOKE_PROPERTYGET), "wFlags = %x\n", wFlags); + ok(pdp != NULL, "pdp == NULL\n"); + ok(pdp->rgvarg != NULL, "rgvarg == NULL\n"); + ok(!pdp->rgdispidNamedArgs, "rgdispidNamedArgs != NULL\n"); + ok(pdp->cArgs == 1, "cArgs = %d\n", pdp->cArgs); + ok(!pdp->cNamedArgs, "cNamedArgs = %d\n", pdp->cNamedArgs); + ok(pvarRes != NULL, "pvarRes == NULL\n"); + ok(pei != NULL, "pei == NULL\n"); + + v = pdp->rgvarg; + if(V_VT(v) == (VT_VARIANT|VT_BYREF)) + v = V_VARIANTREF(v); + + ok(V_VT(v) == VT_DISPATCH, "V_VT(psp->rgvargs) = %d\n", V_VT(pdp->rgvarg)); + V_VT(pvarRes) = VT_BOOL; + V_BOOL(pvarRes) = V_DISPATCH(v) ? VARIANT_FALSE : VARIANT_TRUE; + return S_OK; + } } ok(0, "unexpected call %d\n", id);

1 0

Jacek Caban : vbscript: Added object member call implementation.
by Alexandre Julliard 15 Sep '11

15 Sep '11

Module: wine Branch: master Commit: a6ee830fd249ee96176e62c5261ed6cc70107b55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6ee830fd249ee96176e62c52… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 15 14:19:41 2011 +0200 vbscript: Added object member call implementation. --- dlls/vbscript/compile.c | 7 ++++- dlls/vbscript/interp.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/vbscript/vbscript.h | 2 + 3 files changed, 58 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index 36bf04c..698ea8d 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -318,8 +318,11 @@ static HRESULT compile_member_expression(compile_ctx_t *ctx, member_expression_t return hres; if(expr->obj_expr) { - FIXME("obj_expr not implemented\n"); - hres = E_NOTIMPL; + hres = compile_expression(ctx, expr->obj_expr); + if(FAILED(hres)) + return hres; + + hres = push_instr_bstr_uint(ctx, ret_val ? OP_mcall : OP_mcallv, expr->identifier, arg_cnt); }else { hres = push_instr_bstr_uint(ctx, ret_val ? OP_icall : OP_icallv, expr->identifier, arg_cnt); } diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index f8e0011..beacfe9 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -327,6 +327,57 @@ static HRESULT interp_icallv(exec_ctx_t *ctx) return do_icall(ctx, NULL); } +static HRESULT do_mcall(exec_ctx_t *ctx, VARIANT *res) +{ + const BSTR identifier = ctx->instr->arg1.bstr; + const unsigned arg_cnt = ctx->instr->arg2.uint; + IDispatch *obj; + DISPPARAMS dp; + DISPID id; + HRESULT hres; + + hres = stack_pop_disp(ctx, &obj); + if(FAILED(hres)) + return hres; + + if(!obj) { + FIXME("NULL obj\n"); + return E_FAIL; + } + + vbstack_to_dp(ctx, arg_cnt, &dp); + + hres = disp_get_id(obj, identifier, &id); + if(SUCCEEDED(hres)) + hres = disp_call(ctx->script, obj, id, &dp, res); + IDispatch_Release(obj); + if(FAILED(hres)) + return hres; + + stack_popn(ctx, arg_cnt); + return S_OK; +} + +static HRESULT interp_mcall(exec_ctx_t *ctx) +{ + VARIANT res; + HRESULT hres; + + TRACE("\n"); + + hres = do_mcall(ctx, &res); + if(FAILED(hres)) + return hres; + + return stack_push(ctx, &res); +} + +static HRESULT interp_mcallv(exec_ctx_t *ctx) +{ + FIXME("\n"); + return E_NOTIMPL; +} + static HRESULT assign_ident(exec_ctx_t *ctx, BSTR name, VARIANT *val, BOOL own_val) { ref_t ref; diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 4c2d977..8defcd6 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -146,6 +146,8 @@ typedef enum { X(jmp, 0, ARG_ADDR, 0) \ X(jmp_false, 0, ARG_ADDR, 0) \ X(long, 1, ARG_INT, 0) \ + X(mcall, 1, ARG_BSTR, ARG_UINT) \ + X(mcallv, 1, ARG_BSTR, ARG_UINT) \ X(mod, 1, 0, 0) \ X(mul, 1, 0, 0) \ X(neg, 1, 0, 0) \

1 0

Jacek Caban : vbscript: Added obj member call test.
by Alexandre Julliard 15 Sep '11

15 Sep '11

Module: wine Branch: master Commit: dfc74ac04a7417cf21bfecedd60be3fe838ca572 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfc74ac04a7417cf21bfecedd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 15 14:19:52 2011 +0200 vbscript: Added obj member call test. --- dlls/vbscript/tests/run.c | 30 ++++++++++++++++++++++++++++++ 1 files changed, 30 insertions(+), 0 deletions(-) diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index 4281b16..fa6eec1 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -60,6 +60,8 @@ DEFINE_EXPECT(global_success_d); DEFINE_EXPECT(global_success_i); DEFINE_EXPECT(global_vbvar_d); DEFINE_EXPECT(global_vbvar_i); +DEFINE_EXPECT(testobj_propget_d); +DEFINE_EXPECT(testobj_propget_i); DEFINE_EXPECT(testobj_propput_d); DEFINE_EXPECT(testobj_propput_i); @@ -72,6 +74,7 @@ DEFINE_EXPECT(testobj_propput_i); #define DISPID_GLOBAL_TESTOBJ 1006 #define DISPID_GLOBAL_ISNULLDISP 1007 +#define DISPID_TESTOBJ_PROPGET 2000 #define DISPID_TESTOBJ_PROPPUT 2001 static const WCHAR testW[] = {'t','e','s','t',0}; @@ -234,6 +237,12 @@ static HRESULT WINAPI DispatchEx_GetNameSpaceParent(IDispatchEx *iface, IUnknown static HRESULT WINAPI testObj_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD grfdex, DISPID *pid) { + if(!strcmp_wa(bstrName, "propget")) { + CHECK_EXPECT(testobj_propget_d); + test_grfdex(grfdex, fdexNameCaseInsensitive); + *pid = DISPID_TESTOBJ_PROPGET; + return S_OK; + } if(!strcmp_wa(bstrName, "propput")) { CHECK_EXPECT(testobj_propput_d); test_grfdex(grfdex, fdexNameCaseInsensitive); @@ -249,6 +258,21 @@ static HRESULT WINAPI testObj_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, VARIANT *pvarRes, EXCEPINFO *pei, IServiceProvider *pspCaller) { switch(id) { + case DISPID_TESTOBJ_PROPGET: + CHECK_EXPECT(testobj_propget_i); + + ok(wFlags == (DISPATCH_PROPERTYGET|DISPATCH_METHOD), "wFlags = %x\n", wFlags); + ok(pdp != NULL, "pdp == NULL\n"); + ok(!pdp->rgvarg, "rgvarg == NULL\n"); + ok(!pdp->rgdispidNamedArgs, "rgdispidNamedArgs != NULL\n"); + ok(!pdp->cArgs, "cArgs = %d\n", pdp->cArgs); + ok(!pdp->cNamedArgs, "cNamedArgs = %d\n", pdp->cNamedArgs); + ok(pvarRes != NULL, "pvarRes == NULL\n"); + ok(pei != NULL, "pei == NULL\n"); + + V_VT(pvarRes) = VT_I2; + V_I2(pvarRes) = 10; + return S_OK; case DISPID_TESTOBJ_PROPPUT: CHECK_EXPECT(testobj_propput_i); @@ -802,6 +826,12 @@ static void run_tests(void) CHECK_CALLED(global_vbvar_d); CHECK_CALLED(global_vbvar_i); + SET_EXPECT(testobj_propget_d); + SET_EXPECT(testobj_propget_i); + parse_script_a("dim x\nx = testObj.propget"); + CHECK_CALLED(testobj_propget_d); + CHECK_CALLED(testobj_propget_i); + SET_EXPECT(testobj_propput_d); SET_EXPECT(testobj_propput_i); parse_script_a("testObj.propput = 1");

1 0

Jacek Caban : vbscript: Added function storage specifiers support.
by Alexandre Julliard 15 Sep '11

15 Sep '11

Module: wine Branch: master Commit: 3862cdab4ffb12aab79309df331fbe40a962ba37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3862cdab4ffb12aab79309df3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 15 14:20:05 2011 +0200 vbscript: Added function storage specifiers support. --- dlls/vbscript/compile.c | 1 + dlls/vbscript/parse.h | 1 + dlls/vbscript/parser.y | 35 ++++++++++++++++++++++++++++------- dlls/vbscript/tests/lang.vbs | 16 ++++++++++++++++ dlls/vbscript/vbscript.h | 1 + 5 files changed, 47 insertions(+), 7 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index 698ea8d..5c7f7e3 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -760,6 +760,7 @@ static HRESULT create_function(compile_ctx_t *ctx, function_decl_t *decl, functi func->var_cnt = 0; func->code_ctx = ctx->code; func->type = decl->type; + func->is_public = decl->is_public; func->arg_cnt = 0; if(decl->args) { diff --git a/dlls/vbscript/parse.h b/dlls/vbscript/parse.h index ac0f310..3a4d03b 100644 --- a/dlls/vbscript/parse.h +++ b/dlls/vbscript/parse.h @@ -135,6 +135,7 @@ typedef struct _arg_decl_t { typedef struct _function_decl_t { const WCHAR *name; function_type_t type; + BOOL is_public; arg_decl_t *args; statement_t *body; struct _function_decl_t *next; diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 50a4bf1..e310a70 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -31,7 +31,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(vbscript); static int parser_error(const char*); - static void parse_complete(parser_ctx_t*,BOOL); +static void parse_complete(parser_ctx_t*,BOOL); static void source_add_statement(parser_ctx_t*,statement_t*); static void source_add_class(parser_ctx_t*,class_decl_t*); @@ -57,10 +57,13 @@ static statement_t *new_function_statement(parser_ctx_t*,function_decl_t*); static dim_decl_t *new_dim_decl(parser_ctx_t*,const WCHAR*,dim_decl_t*); static elseif_decl_t *new_elseif_decl(parser_ctx_t*,expression_t*,statement_t*); -static function_decl_t *new_function_decl(parser_ctx_t*,const WCHAR*,function_type_t,arg_decl_t*,statement_t*); +static function_decl_t *new_function_decl(parser_ctx_t*,const WCHAR*,function_type_t,unsigned,arg_decl_t*,statement_t*); static arg_decl_t *new_argument_decl(parser_ctx_t*,const WCHAR*,BOOL); static class_decl_t *new_class_decl(parser_ctx_t*); +#define STORAGE_IS_PRIVATE 1 +#define STORAGE_IS_DEFAULT 2 + #define CHECK_ERROR if(((parser_ctx_t*)ctx)->hres != S_OK) YYABORT %} @@ -78,6 +81,7 @@ static class_decl_t *new_class_decl(parser_ctx_t*); function_decl_t *func_decl; arg_decl_t *arg_decl; class_decl_t *class_decl; + unsigned uint; LONG lng; BOOL bool; double dbl; @@ -111,6 +115,7 @@ static class_decl_t *new_class_decl(parser_ctx_t*); %type <func_decl> FunctionDecl %type <elseif> ElseIfs_opt ElseIfs ElseIf %type <class_decl> ClassDeclaration ClassBody +%type <uint> Storage Storage_opt %type <dim_decl> DimDeclList %% @@ -286,10 +291,19 @@ ClassBody : /* empty */ { $$ = new_class_decl(ctx); } FunctionDecl - : /* Storage_opt */ tSUB tIdentifier ArgumentsDecl_opt tNL StatementsNl_opt tEND tSUB - { $$ = new_function_decl(ctx, $2, FUNC_SUB, $3, $5); CHECK_ERROR; } - | /* Storage_opt */ tFUNCTION tIdentifier ArgumentsDecl_opt tNL StatementsNl_opt tEND tFUNCTION - { $$ = new_function_decl(ctx, $2, FUNC_FUNCTION, $3, $5); CHECK_ERROR; } + : Storage_opt tSUB tIdentifier ArgumentsDecl_opt tNL StatementsNl_opt tEND tSUB + { $$ = new_function_decl(ctx, $3, FUNC_SUB, $1, $4, $6); CHECK_ERROR; } + | Storage_opt tFUNCTION tIdentifier ArgumentsDecl_opt tNL StatementsNl_opt tEND tFUNCTION + { $$ = new_function_decl(ctx, $3, FUNC_FUNCTION, $1, $4, $6); CHECK_ERROR; } + +Storage_opt + : /* empty*/ { $$ = 0; } + | Storage { $$ = $1; } + +Storage + : tPUBLIC tDEFAULT { $$ = STORAGE_IS_DEFAULT; } + | tPUBLIC { $$ = 0; } + | tPRIVATE { $$ = STORAGE_IS_PRIVATE; } ArgumentsDecl_opt : EmptyBrackets_opt { $$ = NULL; } @@ -566,16 +580,23 @@ static arg_decl_t *new_argument_decl(parser_ctx_t *ctx, const WCHAR *name, BOOL } static function_decl_t *new_function_decl(parser_ctx_t *ctx, const WCHAR *name, function_type_t type, - arg_decl_t *arg_decl, statement_t *body) + unsigned storage_flags, arg_decl_t *arg_decl, statement_t *body) { function_decl_t *decl; + if(storage_flags & STORAGE_IS_DEFAULT) { + FIXME("Function declared as default property\n"); + ctx->hres = E_FAIL; + return NULL; + } + decl = parser_alloc(ctx, sizeof(*decl)); if(!decl) return NULL; decl->name = name; decl->type = type; + decl->is_public = !(storage_flags & STORAGE_IS_PRIVATE); decl->args = arg_decl; decl->body = body; return decl; diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index a94b2cd..bc64f85 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -271,6 +271,14 @@ y = true Call TestSubLocalVal Call ok(x, "global x is not true?") +Public Sub TestPublicSub +End Sub +Call TestPublicSub + +Private Sub TestPrivateSub +End Sub +Call TestPrivateSub + if false then Function testfunc x = true @@ -360,6 +368,14 @@ x = false ok SetVal(x, true), "SetVal returned false?" Call ok(x, "x is not set to true by SetVal?") +Public Function TestPublicFunc +End Function +Call TestPublicFunc + +Private Function TestPrivateFunc +End Function +Call TestPrivateFunc + set x = testObj Call ok(getVT(x) = "VT_DISPATCH*", "getVT(x=testObj) = " & getVT(x)) diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 8defcd6..014e480 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -204,6 +204,7 @@ typedef struct { struct _function_t { function_type_t type; const WCHAR *name; + BOOL is_public; arg_desc_t *args; unsigned arg_cnt; var_desc_t *vars;

1 0

Jacek Caban : vbscript: Added class functions parser implementation.
by Alexandre Julliard 15 Sep '11

15 Sep '11

Module: wine Branch: master Commit: ee67bc7a37dc8133ea5711e013825382730b9087 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee67bc7a37dc8133ea5711e01… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 15 19:04:43 2011 +0200 vbscript: Added class functions parser implementation. --- dlls/vbscript/parse.h | 1 + dlls/vbscript/parser.y | 24 ++++++++++++++++++++++++ dlls/vbscript/tests/lang.vbs | 12 ++++++++++++ 3 files changed, 37 insertions(+), 0 deletions(-) diff --git a/dlls/vbscript/parse.h b/dlls/vbscript/parse.h index 3a4d03b..94ba0cf 100644 --- a/dlls/vbscript/parse.h +++ b/dlls/vbscript/parse.h @@ -148,6 +148,7 @@ typedef struct _function_statement_t { typedef struct _class_decl_t { const WCHAR *name; + function_decl_t *funcs; struct _class_decl_t *next; } class_decl_t; diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index e310a70..3eacf2f 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -59,7 +59,9 @@ static dim_decl_t *new_dim_decl(parser_ctx_t*,const WCHAR*,dim_decl_t*); static elseif_decl_t *new_elseif_decl(parser_ctx_t*,expression_t*,statement_t*); static function_decl_t *new_function_decl(parser_ctx_t*,const WCHAR*,function_type_t,unsigned,arg_decl_t*,statement_t*); static arg_decl_t *new_argument_decl(parser_ctx_t*,const WCHAR*,BOOL); + static class_decl_t *new_class_decl(parser_ctx_t*); +static class_decl_t *add_class_function(parser_ctx_t*,class_decl_t*,function_decl_t*); #define STORAGE_IS_PRIVATE 1 #define STORAGE_IS_DEFAULT 2 @@ -289,6 +291,7 @@ ClassDeclaration ClassBody : /* empty */ { $$ = new_class_decl(ctx); } + | FunctionDecl tNL ClassBody { $$ = add_class_function(ctx, $3, $1); CHECK_ERROR; } FunctionDecl : Storage_opt tSUB tIdentifier ArgumentsDecl_opt tNL StatementsNl_opt tEND tSUB @@ -599,6 +602,7 @@ static function_decl_t *new_function_decl(parser_ctx_t *ctx, const WCHAR *name, decl->is_public = !(storage_flags & STORAGE_IS_PRIVATE); decl->args = arg_decl; decl->body = body; + decl->next = NULL; return decl; } @@ -622,10 +626,30 @@ static class_decl_t *new_class_decl(parser_ctx_t *ctx) if(!class_decl) return NULL; + class_decl->funcs = NULL; class_decl->next = NULL; return class_decl; } +static class_decl_t *add_class_function(parser_ctx_t *ctx, class_decl_t *class_decl, function_decl_t *decl) +{ + function_decl_t *iter; + + for(iter = class_decl->funcs; iter; iter = iter->next) { + if(!strcmpiW(iter->name, decl->name)) { + if(decl->type == FUNC_SUB || decl->type == FUNC_FUNCTION) { + FIXME("Redefinition of %s::%s\n", debugstr_w(class_decl->name), debugstr_w(decl->name)); + ctx->hres = E_FAIL; + return NULL; + } + } + } + + decl->next = class_decl->funcs; + class_decl->funcs = decl; + return class_decl; +} + void *parser_alloc(parser_ctx_t *ctx, size_t size) { void *ret; diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index bc64f85..2f78403 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -386,4 +386,16 @@ Call ok(getVT(obj) = "VT_DISPATCH*", "getVT(obj) = " & getVT(obj)) Class EmptyClass End Class +Class TestClass + Public Function publicFunction() + publicFunction = 4 + End Function + + Public Sub publicSub + End Sub + + Public Sub privateSub + End Sub +End Class + reportSuccess()

1 0

Jacek Caban : vbscript: Added class function compiler implementation.
by Alexandre Julliard 15 Sep '11

15 Sep '11

Module: wine Branch: master Commit: 8fb2b985dc74714905c0593cfa826fb2cf9d3006 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fb2b985dc74714905c0593cf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 15 14:20:46 2011 +0200 vbscript: Added class function compiler implementation. --- dlls/vbscript/compile.c | 33 +++++++++++++++++++++++++++++++++ dlls/vbscript/vbscript.h | 22 +++++++++++++++------- 2 files changed, 48 insertions(+), 7 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index 5c7f7e3..32707dc 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -804,9 +804,26 @@ static BOOL lookup_class_name(compile_ctx_t *ctx, const WCHAR *name) return FALSE; } +static HRESULT create_class_funcprop(compile_ctx_t *ctx, function_decl_t *func_decl, vbdisp_funcprop_desc_t *desc) +{ + desc->name = compiler_alloc_string(ctx->code, func_decl->name); + if(!desc->name) + return E_OUTOFMEMORY; + + assert(!desc->entries[0]); + + if(func_decl->is_public) + desc->is_public = TRUE; + + return create_function(ctx, func_decl, desc->entries); +} + static HRESULT compile_class(compile_ctx_t *ctx, class_decl_t *class_decl) { + function_decl_t *func_decl; class_desc_t *class_desc; + unsigned i; + HRESULT hres; if(lookup_dim_decls(ctx, class_decl->name) || lookup_funcs_name(ctx, class_decl->name) || lookup_class_name(ctx, class_decl->name)) { @@ -822,6 +839,22 @@ static HRESULT compile_class(compile_ctx_t *ctx, class_decl_t *class_decl) if(!class_desc->name) return E_OUTOFMEMORY; + class_desc->func_cnt = 1; /* always allocate slot for default getter */ + + for(func_decl = class_decl->funcs; func_decl; func_decl = func_decl->next) + class_desc->func_cnt++; + + class_desc->funcs = compiler_alloc(ctx->code, class_desc->func_cnt*sizeof(*class_desc->funcs)); + if(!class_desc->funcs) + return E_OUTOFMEMORY; + memset(class_desc->funcs, 0, class_desc->func_cnt*sizeof(*class_desc->funcs)); + + for(func_decl = class_decl->funcs, i=1; func_decl; func_decl = func_decl->next, i++) { + hres = create_class_funcprop(ctx, func_decl, class_desc->funcs + i); + if(FAILED(hres)) + return hres; + } + class_desc->next = ctx->classes; ctx->classes = class_desc; return S_OK; diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 014e480..11a5862 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -55,9 +55,24 @@ typedef struct named_item_t { struct list entry; } named_item_t; +typedef enum { + VBDISP_CALLGET, + VBDISP_LET, + VBDISP_SET, + VBDISP_ANY +} vbdisp_invoke_type_t; + +typedef struct { + const WCHAR *name; + BOOL is_public; + function_t *entries[VBDISP_ANY]; +} vbdisp_funcprop_desc_t; + typedef struct _class_desc_t { const WCHAR *name; script_ctx_t *ctx; + unsigned func_cnt; + vbdisp_funcprop_desc_t *funcs; struct _class_desc_t *next; } class_desc_t; @@ -69,13 +84,6 @@ typedef struct { const class_desc_t *desc; } vbdisp_t; -typedef enum { - VBDISP_CALLGET, - VBDISP_LET, - VBDISP_SET, - VBDISP_ANY -} vbdisp_invoke_type_t; - HRESULT create_vbdisp(const class_desc_t*,vbdisp_t**); HRESULT disp_get_id(IDispatch*,BSTR,DISPID*); HRESULT disp_call(script_ctx_t*,IDispatch*,DISPID,DISPPARAMS*,VARIANT*);

1 0

Jacek Caban : vbscript: Added beginning GetDispID implementation.
by Alexandre Julliard 15 Sep '11

15 Sep '11

Module: wine Branch: master Commit: 8b4c560d756815b9632dcf99709e7a554e52ed46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b4c560d756815b9632dcf997… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 15 14:21:13 2011 +0200 vbscript: Added beginning GetDispID implementation. --- dlls/vbscript/tests/lang.vbs | 4 ++- dlls/vbscript/tests/run.c | 62 ++++++++++++++++++++++++++++++++++++++++- dlls/vbscript/vbdisp.c | 34 +++++++++++++++++++++- 3 files changed, 95 insertions(+), 5 deletions(-) diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 2f78403..3f39a4e 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -394,8 +394,10 @@ Class TestClass Public Sub publicSub End Sub - Public Sub privateSub + Private Sub privateSub End Sub End Class +Call testDisp(new testClass) + reportSuccess() diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index fa6eec1..fb6302a 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -73,6 +73,7 @@ DEFINE_EXPECT(testobj_propput_i); #define DISPID_GLOBAL_VBVAR 1005 #define DISPID_GLOBAL_TESTOBJ 1006 #define DISPID_GLOBAL_ISNULLDISP 1007 +#define DISPID_GLOBAL_TESTDISP 1008 #define DISPID_TESTOBJ_PROPGET 2000 #define DISPID_TESTOBJ_PROPPUT 2001 @@ -140,6 +141,46 @@ static BOOL is_english(void) && PRIMARYLANGID(GetUserDefaultLangID()) == LANG_ENGLISH; } +static void test_disp(IDispatch *disp) +{ + DISPID id, public_func_id, public_sub_id; + IDispatchEx *dispex; + BSTR str; + HRESULT hres; + + hres = IDispatch_QueryInterface(disp, &IID_IDispatchEx, (void**)&dispex); + ok(hres == S_OK, "Could not get IDispatchEx iface: %08x\n", hres); + + str = a2bstr("publicFunction"); + hres = IDispatchEx_GetDispID(dispex, str, fdexNameCaseInsensitive, &public_func_id); + SysFreeString(str); + ok(hres == S_OK, "GetDispID(publicFunction) failed: %08x\n", hres); + ok(public_func_id != -1, "public_func_id = -1\n"); + + str = a2bstr("publicSub"); + hres = IDispatchEx_GetDispID(dispex, str, fdexNameCaseInsensitive, &public_sub_id); + SysFreeString(str); + ok(hres == S_OK, "GetDispID(publicSub) failed: %08x\n", hres); + ok(public_sub_id != -1, "public_func_id = -1\n"); + + str = a2bstr("privateSub"); + hres = IDispatchEx_GetDispID(dispex, str, fdexNameCaseInsensitive, &id); + SysFreeString(str); + ok(hres == DISP_E_UNKNOWNNAME, "GetDispID(privateSub) failed: %08x, expected DISP_E_UNKNOWNNAME\n", hres); + ok(id == -1, "id = %d\n", id); + + str = a2bstr("dynprop"); + hres = IDispatchEx_GetDispID(dispex, str, fdexNameCaseInsensitive|fdexNameEnsure, &id); + ok(hres == DISP_E_UNKNOWNNAME, "GetDispID(privateProp) failed: %08x, expected DISP_E_UNKNOWNNAME\n", hres); + ok(id == -1, "id = %d\n", id); + hres = IDispatchEx_GetDispID(dispex, str, fdexNameEnsure, &id); + ok(hres == DISP_E_UNKNOWNNAME, "GetDispID(privateProp) failed: %08x, expected DISP_E_UNKNOWNNAME\n", hres); + ok(id == -1, "id = %d\n", id); + SysFreeString(str); + + IDispatchEx_Release(dispex); +} + #define test_grfdex(a,b) _test_grfdex(__LINE__,a,b) static void _test_grfdex(unsigned line, DWORD grfdex, DWORD expect) { @@ -359,7 +400,11 @@ static HRESULT WINAPI Global_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD *pid = DISPID_GLOBAL_ISNULLDISP; return S_OK; } - + if(!strcmp_wa(bstrName, "testDisp")) { + test_grfdex(grfdex, fdexNameCaseInsensitive); + *pid = DISPID_GLOBAL_TESTDISP; + return S_OK; + } if(strict_dispid_check && strcmp_wa(bstrName, "x")) ok(0, "unexpected call %s %x\n", wine_dbgstr_w(bstrName), grfdex); @@ -473,7 +518,6 @@ static HRESULT WINAPI Global_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, ok(V_VT(pdp->rgvarg) == VT_I2, "V_VT(psp->rgvargs) = %d\n", V_VT(pdp->rgvarg)); ok(V_I2(pdp->rgvarg) == 3, "V_I2(psp->rgvargs) = %d\n", V_I2(pdp->rgvarg)); - return S_OK; case DISPID_GLOBAL_TESTOBJ: @@ -512,6 +556,20 @@ static HRESULT WINAPI Global_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, V_BOOL(pvarRes) = V_DISPATCH(v) ? VARIANT_FALSE : VARIANT_TRUE; return S_OK; } + + case DISPID_GLOBAL_TESTDISP: + ok(wFlags == INVOKE_FUNC, "wFlags = %x\n", wFlags); + ok(pdp != NULL, "pdp == NULL\n"); + ok(pdp->rgvarg != NULL, "rgvarg == NULL\n"); + ok(!pdp->rgdispidNamedArgs, "rgdispidNamedArgs != NULL\n"); + ok(pdp->cArgs == 1, "cArgs = %d\n", pdp->cArgs); + ok(!pdp->cNamedArgs, "cNamedArgs = %d\n", pdp->cNamedArgs); + ok(!pvarRes, "pvarRes != NULL\n"); + ok(pei != NULL, "pei == NULL\n"); + + ok(V_VT(pdp->rgvarg) == VT_DISPATCH, "V_VT(psp->rgvargs) = %d\n", V_VT(pdp->rgvarg)); + test_disp(V_DISPATCH(pdp->rgvarg)); + return S_OK; } ok(0, "unexpected call %d\n", id); diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index f1a323d..77837c6 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -22,6 +22,25 @@ WINE_DEFAULT_DEBUG_CHANNEL(vbscript); +static BOOL get_func_id(vbdisp_t *This, const WCHAR *name, BOOL search_private, DISPID *id) +{ + unsigned i; + + for(i = 0; i < This->desc->func_cnt; i++) { + if(!search_private && !This->desc->funcs[i].is_public) + continue; + if(!This->desc->funcs[i].name) /* default value may not exist */ + continue; + + if(!strcmpiW(This->desc->funcs[i].name, name)) { + *id = i; + return TRUE; + } + } + + return FALSE; +} + static inline vbdisp_t *impl_from_IDispatchEx(IDispatchEx *iface) { return CONTAINING_RECORD(iface, vbdisp_t, IDispatchEx_iface); @@ -112,8 +131,19 @@ static HRESULT WINAPI DispatchEx_Invoke(IDispatchEx *iface, DISPID dispIdMember, static HRESULT WINAPI DispatchEx_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD grfdex, DISPID *pid) { vbdisp_t *This = impl_from_IDispatchEx(iface); - FIXME("(%p)->(%s %x %p)\n", This, debugstr_w(bstrName), grfdex, pid); - return E_NOTIMPL; + + TRACE("(%p)->(%s %x %p)\n", This, debugstr_w(bstrName), grfdex, pid); + + if(grfdex & ~(fdexNameEnsure|fdexNameCaseInsensitive)) { + FIXME("unsupported flags %x\n", grfdex); + return E_NOTIMPL; + } + + if(get_func_id(This, bstrName, FALSE, pid)) + return S_OK; + + *pid = -1; + return DISP_E_UNKNOWNNAME; } static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, WORD wFlags, DISPPARAMS *pdp,

1 0

Jacek Caban : vbscript: Added beginning InvokeEx implementation.
by Alexandre Julliard 15 Sep '11

15 Sep '11

Module: wine Branch: master Commit: 6ee2e3ac9122c251458f5f3a4bba641265893c22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ee2e3ac9122c251458f5f3a4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 15 14:21:33 2011 +0200 vbscript: Added beginning InvokeEx implementation. --- dlls/vbscript/tests/lang.vbs | 5 +++++ dlls/vbscript/tests/run.c | 26 ++++++++++++++++++++++++++ dlls/vbscript/vbdisp.c | 35 ++++++++++++++++++++++++++++++++++- 3 files changed, 65 insertions(+), 1 deletions(-) diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 3f39a4e..ec85614 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -400,4 +400,9 @@ End Class Call testDisp(new testClass) +Set obj = New TestClass + +Call ok(obj.publicFunction = 4, "obj.publicFunction = " & obj.publicFunction) +Call ok(obj.publicFunction() = 4, "obj.publicFunction() = " & obj.publicFunction()) + reportSuccess() diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index fb6302a..d98cf38 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -144,7 +144,11 @@ static BOOL is_english(void) static void test_disp(IDispatch *disp) { DISPID id, public_func_id, public_sub_id; + DISPID named_args[5] = {DISPID_PROPERTYPUT}; + VARIANT v, args[5]; + DISPPARAMS dp = {args, named_args}; IDispatchEx *dispex; + EXCEPINFO ei = {0}; BSTR str; HRESULT hres; @@ -163,6 +167,28 @@ static void test_disp(IDispatch *disp) ok(hres == S_OK, "GetDispID(publicSub) failed: %08x\n", hres); ok(public_sub_id != -1, "public_func_id = -1\n"); + dp.cArgs = dp.cNamedArgs = 0; + hres = IDispatchEx_InvokeEx(dispex, public_func_id, 0, DISPATCH_PROPERTYGET|DISPATCH_METHOD, &dp, &v, &ei, NULL); + ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); + ok(V_VT(&v) == VT_I2, "V_VT(v) = %d\n", V_VT(&v)); + ok(V_I2(&v) == 4, "V_I2(v) = %d\n", V_I2(&v)); + + dp.cArgs = dp.cNamedArgs = 0; + hres = IDispatchEx_InvokeEx(dispex, public_func_id, 0, DISPATCH_METHOD, &dp, &v, &ei, NULL); + ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); + ok(V_VT(&v) == VT_I2, "V_VT(v) = %d\n", V_VT(&v)); + ok(V_I2(&v) == 4, "V_I2(v) = %d\n", V_I2(&v)); + + dp.cArgs = dp.cNamedArgs = 0; + hres = IDispatchEx_InvokeEx(dispex, public_sub_id, 0, DISPATCH_PROPERTYGET|DISPATCH_METHOD, &dp, &v, &ei, NULL); + ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); + ok(V_VT(&v) == VT_EMPTY, "V_VT(v) = %d\n", V_VT(&v)); + + dp.cArgs = dp.cNamedArgs = 0; + hres = IDispatchEx_InvokeEx(dispex, public_sub_id, 0, DISPATCH_METHOD, &dp, &v, &ei, NULL); + ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); + ok(V_VT(&v) == VT_EMPTY, "V_VT(v) = %d\n", V_VT(&v)); + str = a2bstr("privateSub"); hres = IDispatchEx_GetDispID(dispex, str, fdexNameCaseInsensitive, &id); SysFreeString(str); diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index 77837c6..2b60926 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -22,6 +22,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(vbscript); +static inline BOOL is_func_id(vbdisp_t *This, DISPID id) +{ + return id < This->desc->func_cnt; +} + static BOOL get_func_id(vbdisp_t *This, const WCHAR *name, BOOL search_private, DISPID *id) { unsigned i; @@ -150,7 +155,35 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc VARIANT *pvarRes, EXCEPINFO *pei, IServiceProvider *pspCaller) { vbdisp_t *This = impl_from_IDispatchEx(iface); - FIXME("(%p)->(%x %x %x %p %p %p %p)\n", This, id, lcid, wFlags, pdp, pvarRes, pei, pspCaller); + + TRACE("(%p)->(%x %x %x %p %p %p %p)\n", This, id, lcid, wFlags, pdp, pvarRes, pei, pspCaller); + + if(pvarRes) + V_VT(pvarRes) = VT_EMPTY; + + if(id < 0) + return DISP_E_MEMBERNOTFOUND; + + if(is_func_id(This, id)) { + function_t *func; + + switch(wFlags) { + case DISPATCH_METHOD: + case DISPATCH_METHOD|DISPATCH_PROPERTYGET: + func = This->desc->funcs[id].entries[VBDISP_CALLGET]; + if(!func) { + FIXME("no invoke/getter\n"); + return DISP_E_MEMBERNOTFOUND; + } + + return exec_script(This->desc->ctx, func, pdp, pvarRes); + default: + FIXME("flags %x\n", wFlags); + return DISP_E_MEMBERNOTFOUND; + } + } + + FIXME("not implemented for non-function ids\n"); return DISP_E_MEMBERNOTFOUND; }

1 0