November 2013 - Wine-Commits

Zhenbo Li : shell32/tests: Add a missed init_shfo_tests() call.
by Alexandre Julliard Nov. 13, 2013

Nov. 13, 2013

Module: wine Branch: master Commit: f19f85f681664cc7b930c197ef205f3a502ec439 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f19f85f681664cc7b930c197e… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Wed Nov 13 20:10:36 2013 +0800 shell32/tests: Add a missed init_shfo_tests() call. --- dlls/shell32/tests/shlfileop.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index bb15054..cd93ce5 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -647,6 +647,7 @@ static void test_delete(void) skip("Test would show a dialog box\n"); /* delete an existent file and a nonexistent file */ + init_shfo_tests(); shfo.pFrom = "test1.txt\0nonexistent.txt\0test2.txt\0"; shfo.wFunc = FO_DELETE; ret = SHFileOperationA(&shfo);

1 0

Qian Hong : msi: Get extension name by strrchrW instead of strchrW.
by Alexandre Julliard Nov. 13, 2013

Nov. 13, 2013

Module: wine Branch: master Commit: 9612ed1ba64b1067ce9e1b17306b0ca490f711d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9612ed1ba64b1067ce9e1b173… Author: Qian Hong <qhong(a)codeweavers.com> Date: Wed Nov 13 19:51:51 2013 +0800 msi: Get extension name by strrchrW instead of strchrW. --- dlls/msi/action.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index ade5a3c..2a0bf87 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -3840,7 +3840,7 @@ static WCHAR *get_link_file( MSIPACKAGE *package, MSIRECORD *row ) filename = msi_dup_record_field( row, 3 ); msi_reduce_to_long_filename( filename ); - extension = strchrW( filename, '.' ); + extension = strrchrW( filename, '.' ); if (!extension || strcmpiW( extension, szlnk )) { int len = strlenW( filename );

1 0

Jacek Caban : vbscript: Added some array tests.
by Alexandre Julliard Nov. 13, 2013

Nov. 13, 2013

Module: wine Branch: master Commit: ff3d22ba4229f4361b16fe97e96d331aa38f7ba0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff3d22ba4229f4361b16fe97e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 13 16:30:04 2013 +0100 vbscript: Added some array tests. --- dlls/vbscript/tests/lang.vbs | 70 ++++++++++++++++++++++++++++++++++++++++++ dlls/vbscript/tests/run.c | 48 ++++++++++++++++++++++++++++ 2 files changed, 118 insertions(+), 0 deletions(-) diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 8cffc7f..f4b0255 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -972,4 +972,74 @@ Class Property2 End Sub End Class +' Array tests + +Call ok(getVT(arr) = "VT_EMPTY*", "getVT(arr) = " & getVT(arr)) + +Dim arr(3) +Dim arr2(4,3), arr3(5,4,3), arr0(0), noarr() + +Call ok(getVT(arr) = "VT_ARRAY|VT_BYREF|VT_VARIANT*", "getVT(arr) = " & getVT(arr)) +Call ok(getVT(arr2) = "VT_ARRAY|VT_BYREF|VT_VARIANT*", "getVT(arr2) = " & getVT(arr2)) +Call ok(getVT(arr0) = "VT_ARRAY|VT_BYREF|VT_VARIANT*", "getVT(arr0) = " & getVT(arr0)) +Call ok(getVT(noarr) = "VT_ARRAY|VT_BYREF|VT_VARIANT*", "getVT(noarr) = " & getVT(noarr)) + +Call testArray(1, arr) +Call testArray(2, arr2) +Call testArray(3, arr3) +Call testArray(0, arr0) +Call testArray(-1, noarr) + +Call ok(getVT(arr(1)) = "VT_EMPTY*", "getVT(arr(1)) = " & getVT(arr(1))) +Call ok(getVT(arr2(1,2)) = "VT_EMPTY*", "getVT(arr2(1,2)) = " & getVT(arr2(1,2))) +Call ok(getVT(arr3(1,2,2)) = "VT_EMPTY*", "getVT(arr3(1,2,3)) = " & getVT(arr3(1,2,2))) +Call ok(getVT(arr(0)) = "VT_EMPTY*", "getVT(arr(0)) = " & getVT(arr(0))) +Call ok(getVT(arr(3)) = "VT_EMPTY*", "getVT(arr(3)) = " & getVT(arr(3))) +Call ok(getVT(arr0(0)) = "VT_EMPTY*", "getVT(arr0(0)) = " & getVT(arr0(0))) + +arr(2) = 3 +Call ok(arr(2) = 3, "arr(2) = " & arr(2)) +Call ok(getVT(arr(2)) = "VT_I2*", "getVT(arr(2)) = " & getVT(arr(2))) + +arr3(3,2,1) = 1 +arr3(1,2,3) = 2 +Call ok(arr3(3,2,1) = 1, "arr3(3,2,1) = " & arr3(3,2,1)) +Call ok(arr3(1,2,3) = 2, "arr3(1,2,3) = " & arr3(1,2,3)) + +x = arr3 +Call ok(x(3,2,1) = 1, "x(3,2,1) = " & x(3,2,1)) + +Function getarr() + Dim arr(3) + arr(2) = 2 + getarr = arr + arr(3) = 3 +End Function + +x = getarr() +Call ok(getVT(x) = "VT_ARRAY|VT_VARIANT*", "getVT(x) = " & getVT(x)) +Call ok(x(2) = 2, "x(2) = " & x(2)) +Call ok(getVT(x(3)) = "VT_EMPTY*", "getVT(x(3)) = " & getVT(x(3))) + +x(1) = 1 +Call ok(x(1) = 1, "x(1) = " & x(1)) +x = getarr() +Call ok(getVT(x(1)) = "VT_EMPTY*", "getVT(x(1)) = " & getVT(x(1))) +Call ok(x(2) = 2, "x(2) = " & x(2)) + +x(1) = 1 +y = x +x(1) = 2 +Call ok(y(1) = 1, "y(1) = " & y(1)) + +for x=1 to 1 + Dim forarr(3) + if x=1 then + Call ok(getVT(forarr(1)) = "VT_EMPTY*", "getVT(forarr(1)) = " & getVT(forarr(1))) + else + Call ok(forarr(1) = x, "forarr(1) = " & forarr(1)) + end if + forarr(1) = x+1 +next + reportSuccess() diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index 7762323..6d4b38a 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -112,6 +112,7 @@ DEFINE_EXPECT(EnableModeless); #define DISPID_GLOBAL_PROPARGPUT1 1012 #define DISPID_GLOBAL_COLLOBJ 1013 #define DISPID_GLOBAL_DOUBLEASSTRING 1014 +#define DISPID_GLOBAL_TESTARRAY 1015 #define DISPID_TESTOBJ_PROPGET 2000 #define DISPID_TESTOBJ_PROPPUT 2001 @@ -186,6 +187,8 @@ static const char *vt2a(VARIANT *v) return "VT_BOOL"; case VT_ARRAY|VT_VARIANT: return "VT_ARRAY|VT_VARIANT"; + case VT_ARRAY|VT_BYREF|VT_VARIANT: + return "VT_ARRAY|VT_BYREF|VT_VARIANT"; default: ok(0, "unknown vt %d\n", V_VT(v)); return NULL; @@ -439,6 +442,26 @@ static void test_disp(IDispatch *disp) IDispatchEx_Release(dispex); } +static void test_safearray(SAFEARRAY *safearray, unsigned indims) +{ + int i, exdims = indims; + + if(!exdims) + exdims = 1; + ok(safearray->cDims == exdims, "safearray->cDims = %d, expected %d\n", safearray->cDims, exdims); + todo_wine + ok(safearray->fFeatures == (FADF_VARIANT|FADF_HAVEVARTYPE|FADF_FIXEDSIZE|FADF_STATIC), + "safearray->fFeatures = %x\n", safearray->fFeatures); + ok(safearray->cbElements == sizeof(VARIANT), "safearray->cbElements = %x\n", safearray->cbElements); + ok(!safearray->cLocks, "safearray->cLocks = %x\n", safearray->cLocks); + + for(i=0; i < safearray->cDims; i++) { + ok(safearray->rgsabound[i].cElements == indims ? i+4 : 1, "safearray->rgsabound[%d].cElements = %d\n", i, + safearray->rgsabound[i].cElements); + ok(!safearray->rgsabound[i].lLbound, "safearray->rgsabound[%d].lLbound = %d\n", i, safearray->rgsabound[i].lLbound); + } +} + #define test_grfdex(a,b) _test_grfdex(__LINE__,a,b) static void _test_grfdex(unsigned line, DWORD grfdex, DWORD expect) { @@ -906,6 +929,11 @@ static HRESULT WINAPI Global_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD *pid = DISPID_GLOBAL_DOUBLEASSTRING; return S_OK; } + if(!strcmp_wa(bstrName, "testArray")) { + test_grfdex(grfdex, fdexNameCaseInsensitive); + *pid = DISPID_GLOBAL_TESTARRAY; + return S_OK; + } if(strict_dispid_check && strcmp_wa(bstrName, "x")) ok(0, "unexpected call %s %x\n", wine_dbgstr_w(bstrName), grfdex); @@ -1164,6 +1192,26 @@ static HRESULT WINAPI Global_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, V_VT(pvarRes) = VT_BSTR; return VarBstrFromR8(V_R8(pdp->rgvarg), 0, 0, &V_BSTR(pvarRes)); + + case DISPID_GLOBAL_TESTARRAY: + 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 == 2, "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+1) == VT_I2, "V_VT(psp->rgvargs+1) = %d\n", V_VT(pdp->rgvarg+1)); + ok(V_VT(pdp->rgvarg) == (VT_BYREF|VT_VARIANT), "V_VT(psp->rgvargs) = %d\n", V_VT(pdp->rgvarg)); + ok(V_VT(V_VARIANTREF(pdp->rgvarg)) == (VT_ARRAY|VT_BYREF|VT_VARIANT), + "V_VT(V_VARIANTREF(psp->rgvargs)) = %d\n", V_VT(V_VARIANTREF(pdp->rgvarg))); + if(V_I2(pdp->rgvarg+1) == -1) + ok(!*V_ARRAYREF(V_VARIANTREF(pdp->rgvarg)), "*V_ARRAYREF(V_VARIANTREF(pdp->rgvarg)) != NULL\n"); + else + test_safearray(*V_ARRAYREF(V_VARIANTREF(pdp->rgvarg)), V_I2(pdp->rgvarg+1)); + return S_OK; } ok(0, "unexpected call %d\n", id);

1 0

Jacek Caban : vbscript: Added support for setting array elements.
by Alexandre Julliard Nov. 13, 2013

Nov. 13, 2013

Module: wine Branch: master Commit: 7917b67a18673457519334fb8339d6b2c8205369 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7917b67a18673457519334fb8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 13 16:29:53 2013 +0100 vbscript: Added support for setting array elements. --- dlls/vbscript/interp.c | 38 +++++++++++++++++++++++++++++++++----- 1 files changed, 33 insertions(+), 5 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 10c9166..07b2a92 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -698,15 +698,43 @@ static HRESULT assign_ident(exec_ctx_t *ctx, BSTR name, DISPPARAMS *dp) case REF_VAR: { VARIANT *v = ref.u.v; + if(V_VT(v) == (VT_VARIANT|VT_BYREF)) + v = V_VARIANTREF(v); + if(arg_cnt(dp)) { - FIXME("arg_cnt %d not supported\n", arg_cnt(dp)); + SAFEARRAY *array; + + if(!(V_VT(v) & VT_ARRAY)) { + FIXME("array assign on type %d\n", V_VT(v)); + return E_FAIL; + } + + switch(V_VT(v)) { + case VT_ARRAY|VT_BYREF|VT_VARIANT: + array = *V_ARRAYREF(v); + break; + case VT_ARRAY|VT_VARIANT: + array = V_ARRAY(v); + break; + default: + FIXME("Unsupported array type %x\v", V_VT(v)); + return E_NOTIMPL; + } + + if(!array) { + FIXME("null array\n"); + return E_FAIL; + } + + hres = array_access(ctx, array, dp, &v); + if(FAILED(hres)) + return hres; + }else if(V_VT(v) == (VT_ARRAY|VT_BYREF|VT_VARIANT)) { + FIXME("non-array assign\n"); return E_NOTIMPL; } - if(V_VT(v) == (VT_VARIANT|VT_BYREF)) - v = V_VARIANTREF(v); - - hres = VariantCopy(v, dp->rgvarg); + hres = VariantCopyInd(v, dp->rgvarg); break; } case REF_DISP:

1 0

Jacek Caban : vbscript: Added support for getting array elements.
by Alexandre Julliard Nov. 13, 2013

Nov. 13, 2013

Module: wine Branch: master Commit: 79c55e125541d4758e4454ba4331458967b5b92c URL: http://source.winehq.org/git/wine.git/?a=commit;h=79c55e125541d4758e4454ba4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 13 16:29:39 2013 +0100 vbscript: Added support for getting array elements. --- dlls/vbscript/global.c | 2 +- dlls/vbscript/interp.c | 76 ++++++++++++++++++++++++++++++++++++++++++---- dlls/vbscript/vbscript.h | 2 + 3 files changed, 73 insertions(+), 7 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index c142d10..5088e59 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -150,7 +150,7 @@ static inline HRESULT return_date(VARIANT *res, double date) return S_OK; } -static HRESULT to_int(VARIANT *v, int *ret) +HRESULT to_int(VARIANT *v, int *ret) { switch(V_VT(v)) { case VT_I2: diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 07125d0..10c9166 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -478,6 +478,49 @@ static void vbstack_to_dp(exec_ctx_t *ctx, unsigned arg_cnt, BOOL is_propput, DI } } +static HRESULT array_access(exec_ctx_t *ctx, SAFEARRAY *array, DISPPARAMS *dp, VARIANT **ret) +{ + unsigned cell_off = 0, dim_size = 1, i; + unsigned argc = arg_cnt(dp); + VARIANT *data; + LONG idx; + HRESULT hres; + + if(!array) { + FIXME("NULL array\n"); + return E_FAIL; + } + + if(array->cDims != argc) { + FIXME("argc %d does not match cDims %d\n", dp->cArgs, array->cDims); + return E_FAIL; + } + + for(i=0; i < argc; i++) { + hres = to_int(get_arg(dp, i), &idx); + if(FAILED(hres)) + return hres; + + idx -= array->rgsabound[i].lLbound; + if(idx >= array->rgsabound[i].cElements) { + FIXME("out of bound element %d in dim %d of size %d\n", idx, i+1, array->rgsabound[i].cElements); + return E_FAIL; + } + + cell_off += idx*dim_size; + dim_size *= array->rgsabound[i].cElements; + } + + hres = SafeArrayAccessData(array, (void**)&data); + if(FAILED(hres)) + return hres; + + *ret = data+cell_off; + + SafeArrayUnaccessData(array); + return S_OK; +} + static HRESULT do_icall(exec_ctx_t *ctx, VARIANT *res) { BSTR identifier = ctx->instr->arg1.bstr; @@ -490,30 +533,51 @@ static HRESULT do_icall(exec_ctx_t *ctx, VARIANT *res) if(FAILED(hres)) return hres; - vbstack_to_dp(ctx, arg_cnt, FALSE, &dp); - switch(ref.type) { case REF_VAR: - case REF_CONST: + case REF_CONST: { + VARIANT *v; + if(!res) { FIXME("REF_VAR no res\n"); return E_NOTIMPL; } + v = V_VT(ref.u.v) == (VT_VARIANT|VT_BYREF) ? V_VARIANTREF(ref.u.v) : ref.u.v; + if(arg_cnt) { - FIXME("arguments not implemented\n"); - return E_NOTIMPL; + SAFEARRAY *array; + + switch(V_VT(v)) { + case VT_ARRAY|VT_BYREF|VT_VARIANT: + array = *V_ARRAYREF(ref.u.v); + break; + case VT_ARRAY|VT_VARIANT: + array = V_ARRAY(ref.u.v); + break; + default: + FIXME("arguments not implemented\n"); + return E_NOTIMPL; + } + + vbstack_to_dp(ctx, arg_cnt, FALSE, &dp); + hres = array_access(ctx, array, &dp, &v); + if(FAILED(hres)) + return hres; } V_VT(res) = VT_BYREF|VT_VARIANT; - V_BYREF(res) = V_VT(ref.u.v) == (VT_VARIANT|VT_BYREF) ? V_VARIANTREF(ref.u.v) : ref.u.v; + V_BYREF(res) = v; break; + } case REF_DISP: + vbstack_to_dp(ctx, arg_cnt, FALSE, &dp); hres = disp_call(ctx->script, ref.u.d.disp, ref.u.d.id, &dp, res); if(FAILED(hres)) return hres; break; case REF_FUNC: + vbstack_to_dp(ctx, arg_cnt, FALSE, &dp); hres = exec_script(ctx->script, ref.u.f, NULL, &dp, res); if(FAILED(hres)) return hres; diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 47fa4c0..a96d0b1 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -142,6 +142,8 @@ void collect_objects(script_ctx_t*) DECLSPEC_HIDDEN; HRESULT create_procedure_disp(script_ctx_t*,vbscode_t*,IDispatch**) DECLSPEC_HIDDEN; HRESULT create_script_disp(script_ctx_t*,ScriptDisp**) DECLSPEC_HIDDEN; +HRESULT to_int(VARIANT*,int*) DECLSPEC_HIDDEN; + static inline unsigned arg_cnt(const DISPPARAMS *dp) { return dp->cArgs - dp->cNamedArgs;

1 0

Jacek Caban : vbscript: Added interp_dim implementation.
by Alexandre Julliard Nov. 13, 2013

Nov. 13, 2013

Module: wine Branch: master Commit: 853c6c4eea3094944fad4232302de9c2cf7a688b URL: http://source.winehq.org/git/wine.git/?a=commit;h=853c6c4eea3094944fad42323… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 13 16:29:29 2013 +0100 vbscript: Added interp_dim implementation. --- dlls/vbscript/interp.c | 47 +++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 45 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 7d2cd65..07125d0 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -35,6 +35,7 @@ typedef struct { VARIANT *args; VARIANT *vars; + SAFEARRAY **arrays; dynamic_var_t *dynamic_vars; heap_pool_t heap; @@ -891,9 +892,43 @@ static HRESULT interp_dim(exec_ctx_t *ctx) { const BSTR ident = ctx->instr->arg1.bstr; const unsigned array_id = ctx->instr->arg2.uint; + ref_t ref; + HRESULT hres; + + TRACE("%s\n", debugstr_w(ident)); + + assert(array_id < ctx->func->array_cnt); + if(!ctx->arrays) { + ctx->arrays = heap_alloc_zero(ctx->func->array_cnt * sizeof(SAFEARRAY*)); + if(!ctx->arrays) + return E_OUTOFMEMORY; + } + + hres = lookup_identifier(ctx, ident, VBDISP_LET, &ref); + if(FAILED(hres)) { + FIXME("lookup %s failed: %08x\n", debugstr_w(ident), hres); + return hres; + } - FIXME("%s(%d)\n", debugstr_w(ident), array_id); - return E_NOTIMPL; + if(ref.type != REF_VAR) { + FIXME("got ref.type = %d\n", ref.type); + return E_FAIL; + } + + if(!ctx->arrays[array_id]) { + const array_desc_t *array_desc; + + array_desc = ctx->func->array_descs + array_id; + if(array_desc->dim_cnt) { + ctx->arrays[array_id] = SafeArrayCreate(VT_VARIANT, array_desc->dim_cnt, array_desc->bounds); + if(!ctx->arrays[array_id]) + return E_OUTOFMEMORY; + } + } + + V_VT(ref.u.v) = VT_ARRAY|VT_BYREF|VT_VARIANT; + V_ARRAYREF(ref.u.v) = ctx->arrays+array_id; + return S_OK; } static HRESULT interp_step(exec_ctx_t *ctx) @@ -1842,6 +1877,14 @@ static void release_exec(exec_ctx_t *ctx) VariantClear(ctx->vars+i); } + if(ctx->arrays) { + for(i=0; i < ctx->func->var_cnt; i++) { + if(ctx->arrays[i]) + SafeArrayDestroy(ctx->arrays[i]); + } + heap_free(ctx->arrays); + } + heap_pool_free(&ctx->heap); heap_free(ctx->args); heap_free(ctx->vars);

1 0

Jacek Caban : vbscript: Added bytecode support for arrays.
by Alexandre Julliard Nov. 13, 2013

Nov. 13, 2013

Module: wine Branch: master Commit: fc713bfc1233a0c11f0441569281fd2efd0b6d5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc713bfc1233a0c11f0441569… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 13 16:29:18 2013 +0100 vbscript: Added bytecode support for arrays. --- dlls/vbscript/compile.c | 42 ++++++++++++++++++++++++++++++++++++++++-- dlls/vbscript/interp.c | 9 +++++++++ dlls/vbscript/vbscript.h | 8 ++++++++ 3 files changed, 57 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index 7353c22..ea22787 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -937,8 +937,9 @@ static HRESULT compile_dim_statement(compile_ctx_t *ctx, dim_statement_t *stat) ctx->func->var_cnt++; if(dim_decl->is_array) { - FIXME("arrays not supported\n"); - return E_NOTIMPL; + HRESULT hres = push_instr_bstr_uint(ctx, OP_dim, dim_decl->name, ctx->func->array_cnt++); + if(FAILED(hres)) + return hres; } if(!dim_decl->next) @@ -1302,6 +1303,41 @@ static HRESULT compile_func(compile_ctx_t *ctx, statement_t *stat, function_t *f } } + if(func->array_cnt) { + unsigned dim_cnt, array_id = 0; + dim_decl_t *dim_decl; + dim_list_t *iter; + + func->array_descs = compiler_alloc(ctx->code, func->array_cnt * sizeof(array_desc_t)); + if(!func->array_descs) + return E_OUTOFMEMORY; + + for(dim_decl = ctx->dim_decls; dim_decl; dim_decl = dim_decl->next) { + if(!dim_decl->is_array) + continue; + + dim_cnt = 0; + for(iter = dim_decl->dims; iter; iter = iter->next) + dim_cnt++; + + func->array_descs[array_id].bounds = compiler_alloc(ctx->code, dim_cnt * sizeof(SAFEARRAYBOUND)); + if(!func->array_descs[array_id].bounds) + return E_OUTOFMEMORY; + + func->array_descs[array_id].dim_cnt = dim_cnt; + + dim_cnt = 0; + for(iter = dim_decl->dims; iter; iter = iter->next) { + func->array_descs[array_id].bounds[dim_cnt].cElements = iter->val+1; + func->array_descs[array_id].bounds[dim_cnt++].lLbound = 0; + } + + array_id++; + } + + assert(array_id == func->array_cnt); + } + return S_OK; } @@ -1337,6 +1373,7 @@ static HRESULT create_function(compile_ctx_t *ctx, function_decl_t *decl, functi func->vars = NULL; func->var_cnt = 0; + func->array_cnt = 0; func->code_ctx = ctx->code; func->type = decl->type; func->is_public = decl->is_public; @@ -1637,6 +1674,7 @@ static vbscode_t *alloc_vbscode(compile_ctx_t *ctx, const WCHAR *source) ret->main_code.code_ctx = ret; ret->main_code.vars = NULL; ret->main_code.var_cnt = 0; + ret->main_code.array_cnt = 0; ret->main_code.arg_cnt = 0; ret->main_code.args = NULL; diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index b3f4244..7d2cd65 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -887,6 +887,15 @@ static HRESULT interp_new(exec_ctx_t *ctx) return stack_push(ctx, &v); } +static HRESULT interp_dim(exec_ctx_t *ctx) +{ + const BSTR ident = ctx->instr->arg1.bstr; + const unsigned array_id = ctx->instr->arg2.uint; + + FIXME("%s(%d)\n", debugstr_w(ident), array_id); + return E_NOTIMPL; +} + static HRESULT interp_step(exec_ctx_t *ctx) { const BSTR ident = ctx->instr->arg2.bstr; diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index e25b524..47fa4c0 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -212,6 +212,7 @@ typedef enum { X(case, 0, ARG_ADDR, 0) \ X(concat, 1, 0, 0) \ X(const, 1, ARG_BSTR, 0) \ + X(dim, 1, ARG_BSTR, ARG_UINT) \ X(div, 1, 0, 0) \ X(double, 1, ARG_DOUBLE, 0) \ X(empty, 1, 0, 0) \ @@ -299,6 +300,11 @@ typedef struct { const WCHAR *name; } var_desc_t; +typedef struct { + unsigned dim_cnt; + SAFEARRAYBOUND *bounds; +} array_desc_t; + struct _function_t { function_type_t type; const WCHAR *name; @@ -307,6 +313,8 @@ struct _function_t { unsigned arg_cnt; var_desc_t *vars; unsigned var_cnt; + array_desc_t *array_descs; + unsigned array_cnt; unsigned code_off; vbscode_t *code_ctx; function_t *next;

1 0

Jacek Caban : vbscript: Added parser support for arrays.
by Alexandre Julliard Nov. 13, 2013

Nov. 13, 2013

Module: wine Branch: master Commit: cf5143554194010e46e377dbdfb817dd2ee806be URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf5143554194010e46e377dbd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 13 16:28:55 2013 +0100 vbscript: Added parser support for arrays. --- dlls/vbscript/compile.c | 6 ++++++ dlls/vbscript/parse.h | 7 +++++++ dlls/vbscript/parser.y | 47 +++++++++++++++++++++++++++++++++++++++-------- 3 files changed, 52 insertions(+), 8 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index c5f3797..ccf7700 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -934,6 +934,12 @@ static HRESULT compile_dim_statement(compile_ctx_t *ctx, dim_statement_t *stat) } ctx->func->var_cnt++; + + if(dim_decl->is_array) { + FIXME("arrays not supported\n"); + return E_NOTIMPL; + } + if(!dim_decl->next) break; dim_decl = dim_decl->next; diff --git a/dlls/vbscript/parse.h b/dlls/vbscript/parse.h index ba1a311..4b97814 100644 --- a/dlls/vbscript/parse.h +++ b/dlls/vbscript/parse.h @@ -138,8 +138,15 @@ typedef struct { expression_t *value_expr; } assign_statement_t; +typedef struct _dim_list_t { + unsigned val; + struct _dim_list_t *next; +} dim_list_t; + typedef struct _dim_decl_t { const WCHAR *name; + BOOL is_array; + dim_list_t *dims; struct _dim_decl_t *next; } dim_decl_t; diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 3c54fd8..6e1eb95 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -57,7 +57,8 @@ static statement_t *new_onerror_statement(parser_ctx_t*,BOOL); static statement_t *new_const_statement(parser_ctx_t*,const_decl_t*); static statement_t *new_select_statement(parser_ctx_t*,expression_t*,case_clausule_t*); -static dim_decl_t *new_dim_decl(parser_ctx_t*,const WCHAR*,dim_decl_t*); +static dim_decl_t *new_dim_decl(parser_ctx_t*,const WCHAR*,BOOL,dim_list_t*); +static dim_list_t *new_dim(parser_ctx_t*,unsigned,dim_list_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); @@ -91,6 +92,7 @@ static const WCHAR propertyW[] = {'p','r','o','p','e','r','t','y',0}; member_expression_t *member; elseif_decl_t *elseif; dim_decl_t *dim_decl; + dim_list_t *dim_list; function_decl_t *func_decl; arg_decl_t *arg_decl; class_decl_t *class_decl; @@ -132,8 +134,9 @@ static const WCHAR propertyW[] = {'p','r','o','p','e','r','t','y',0}; %type <func_decl> FunctionDecl PropertyDecl %type <elseif> ElseIfs_opt ElseIfs ElseIf %type <class_decl> ClassDeclaration ClassBody -%type <uint> Storage Storage_opt -%type <dim_decl> DimDeclList +%type <uint> Storage Storage_opt IntegerValue +%type <dim_decl> DimDeclList DimDecl +%type <dim_list> DimList %type <const_decl> ConstDecl ConstDeclList %type <string> Identifier %type <case_clausule> CaseClausules @@ -209,9 +212,18 @@ MemberExpression : Identifier { $$ = new_member_expression(ctx, NULL, $1); CHECK_ERROR; } | CallExpression '.' Identifier { $$ = new_member_expression(ctx, $1, $3); CHECK_ERROR; } -DimDeclList /* FIXME: Support arrays */ - : Identifier { $$ = new_dim_decl(ctx, $1, NULL); CHECK_ERROR; } - | Identifier ',' DimDeclList { $$ = new_dim_decl(ctx, $1, $3); CHECK_ERROR; } +DimDeclList + : DimDecl { $$ = $1; } + | DimDecl ',' DimDeclList { $1->next = $3; $$ = $1; } + +DimDecl + : Identifier { $$ = new_dim_decl(ctx, $1, FALSE, NULL); CHECK_ERROR; } + | Identifier '(' DimList ')' { $$ = new_dim_decl(ctx, $1, TRUE, $3); CHECK_ERROR; } + | Identifier tEMPTYBRACKETS { $$ = new_dim_decl(ctx, $1, TRUE, NULL); CHECK_ERROR; } + +DimList + : IntegerValue { $$ = new_dim(ctx, $1, NULL); } + | IntegerValue ',' DimList { $$ = new_dim(ctx, $1, $3); } ConstDeclList : ConstDecl { $$ = $1; } @@ -369,6 +381,10 @@ NumericLiteralExpression | tLong { $$ = new_long_expression(ctx, EXPR_ULONG, $1); CHECK_ERROR; } | tDouble { $$ = new_double_expression(ctx, $1); CHECK_ERROR; } +IntegerValue + : tShort { $$ = $1; } + | '0' { $$ = 0; } + | tLong { $$ = $1; } PrimaryExpression : '(' Expression ')' { $$ = new_unary_expression(ctx, EXPR_BRACKETS, $2); } @@ -619,7 +635,7 @@ static statement_t *new_set_statement(parser_ctx_t *ctx, member_expression_t *le return &stat->stat; } -static dim_decl_t *new_dim_decl(parser_ctx_t *ctx, const WCHAR *name, dim_decl_t *next) +static dim_decl_t *new_dim_decl(parser_ctx_t *ctx, const WCHAR *name, BOOL is_array, dim_list_t *dims) { dim_decl_t *decl; @@ -628,10 +644,25 @@ static dim_decl_t *new_dim_decl(parser_ctx_t *ctx, const WCHAR *name, dim_decl_t return NULL; decl->name = name; - decl->next = next; + decl->is_array = is_array; + decl->dims = dims; + decl->next = NULL; return decl; } +static dim_list_t *new_dim(parser_ctx_t *ctx, unsigned val, dim_list_t *next) +{ + dim_list_t *ret; + + ret = parser_alloc(ctx, sizeof(*ret)); + if(!ret) + return NULL; + + ret->val = val; + ret->next = next; + return ret; +} + static statement_t *new_dim_statement(parser_ctx_t *ctx, dim_decl_t *decls) { dim_statement_t *stat;

1 0

André Hentschel : user32/tests: Allow win8 error code.
by Alexandre Julliard Nov. 13, 2013

Nov. 13, 2013

Module: wine Branch: master Commit: de92a45822df24780df981a0e810565640cc5989 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de92a45822df24780df981a0e… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Nov 13 00:06:50 2013 +0100 user32/tests: Allow win8 error code. --- dlls/user32/tests/sysparams.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index 33c7a1c..31d1a8e 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -2868,8 +2868,9 @@ static void test_EnumDisplaySettings(void) if (!EnumDisplaySettingsA(NULL, num, &devmode)) { DWORD le = GetLastError(); ok(le == ERROR_NO_MORE_FILES || + le == ERROR_MOD_NOT_FOUND /* Win8 */ || le == 0xdeadbeef, /* XP, 2003 */ - "Expected ERROR_NO_MORE_FILES or 0xdeadbeef, got %d for %d\n", le, num); + "Expected ERROR_NO_MORE_FILES, ERROR_MOD_NOT_FOUND or 0xdeadbeef, got %d for %d\n", le, num); break; } num++;

1 0

Hans Leidekker : netapi32: Add support for remote computers in NetShareDel.
by Alexandre Julliard Nov. 13, 2013

Nov. 13, 2013

Module: wine Branch: master Commit: 8f200ea9f8d237ffb33540df428cfa2e1b985dde URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f200ea9f8d237ffb33540df4… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Nov 13 15:36:01 2013 +0100 netapi32: Add support for remote computers in NetShareDel. --- dlls/netapi32/netapi32.c | 36 +++++++++++++++++++++++++++++++++++- 1 files changed, 35 insertions(+), 1 deletions(-) diff --git a/dlls/netapi32/netapi32.c b/dlls/netapi32/netapi32.c index 4223379..68d8872 100644 --- a/dlls/netapi32/netapi32.c +++ b/dlls/netapi32/netapi32.c @@ -82,6 +82,7 @@ static NET_API_STATUS (*pNetApiBufferAllocate)(unsigned int, void **); static NET_API_STATUS (*pNetApiBufferFree)(void *); static NET_API_STATUS (*pNetServerGetInfo)(const char *, unsigned int, unsigned char **); static NET_API_STATUS (*pNetShareAdd)(const char *, unsigned int, unsigned char *, unsigned int *); +static NET_API_STATUS (*pNetShareDel)(const char *, const char *, unsigned int); static NET_API_STATUS (*pNetWkstaGetInfo)(const char *, unsigned int, unsigned char **); static BOOL libnetapi_init(void) @@ -113,6 +114,7 @@ static BOOL libnetapi_init(void) LOAD_FUNCPTR(NetApiBufferFree) LOAD_FUNCPTR(NetServerGetInfo) LOAD_FUNCPTR(NetShareAdd) + LOAD_FUNCPTR(NetShareDel) LOAD_FUNCPTR(NetWkstaGetInfo) #undef LOAD_FUNCPTR @@ -312,6 +314,23 @@ static NET_API_STATUS share_add( LMSTR servername, DWORD level, LPBYTE buf, LPDW return status; } +static NET_API_STATUS WINAPI share_del( LMSTR servername, LMSTR netname, DWORD reserved ) +{ + char *server = NULL, *share; + NET_API_STATUS status; + + if (servername && !(server = strdup_unixcp( servername ))) return ERROR_OUTOFMEMORY; + if (!(share = strdup_unixcp( netname ))) + { + HeapFree( GetProcessHeap(), 0, server ); + return ERROR_OUTOFMEMORY; + } + status = pNetShareDel( server, share, reserved ); + HeapFree( GetProcessHeap(), 0, server ); + HeapFree( GetProcessHeap(), 0, share ); + return status; +} + struct wksta_info_100 { unsigned int wki100_platform_id; @@ -400,6 +419,11 @@ static NET_API_STATUS share_add( LMSTR servername, DWORD level, LPBYTE buf, LPDW ERR( "\n" ); return ERROR_NOT_SUPPORTED; } +NET_API_STATUS WINAPI share_del( LMSTR servername, LMSTR netname, DWORD reserved ) +{ + ERR( "\n" ); + return ERROR_NOT_SUPPORTED; +} static NET_API_STATUS wksta_getinfo( LMSTR servername, DWORD level, LPBYTE *bufptr ) { ERR( "\n" ); @@ -744,7 +768,17 @@ NET_API_STATUS WINAPI NetShareEnum( LMSTR servername, DWORD level, LPBYTE* bufpt */ NET_API_STATUS WINAPI NetShareDel(LMSTR servername, LMSTR netname, DWORD reserved) { - FIXME("Stub (%s %s %d)\n", debugstr_w(servername), debugstr_w(netname), reserved); + BOOL local = NETAPI_IsLocalComputer( servername ); + + TRACE("%s %s %d\n", debugstr_w(servername), debugstr_w(netname), reserved); + + if (!local) + { + if (libnetapi_init()) return share_del( servername, netname, reserved ); + FIXME( "remote computers not supported\n" ); + } + + FIXME("%s %s %d\n", debugstr_w(servername), debugstr_w(netname), reserved); return NERR_Success; }

1 0