October 2019 - Wine-Commits

Jacek Caban : vbscript: Factor out variant_call.
by Alexandre Julliard Oct. 28, 2019

Oct. 28, 2019

Module: wine Branch: master Commit: ecaa72855a3be83e96fdb8e57d5232eb354c5886 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ecaa72855a3be83e96fdb8e5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 28 18:40:29 2019 +0100 vbscript: Factor out variant_call. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/interp.c | 88 +++++++++++++++++++++++++++++--------------------- 1 file changed, 52 insertions(+), 36 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index d8ed679788..45f15933e6 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -515,6 +515,52 @@ static HRESULT array_access(exec_ctx_t *ctx, SAFEARRAY *array, DISPPARAMS *dp, V return hres; } +static HRESULT variant_call(exec_ctx_t *ctx, VARIANT *v, unsigned arg_cnt, VARIANT *res) +{ + SAFEARRAY *array = NULL; + DISPPARAMS dp; + HRESULT hres; + + TRACE("%s\n", debugstr_variant(v)); + + if(V_VT(v) == (VT_VARIANT|VT_BYREF)) + v = V_VARIANTREF(v); + + 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; + case VT_DISPATCH: + vbstack_to_dp(ctx, arg_cnt, FALSE, &dp); + hres = disp_call(ctx->script, V_DISPATCH(v), DISPID_VALUE, &dp, res); + break; + default: + FIXME("unsupported on %s\n", debugstr_variant(v)); + return E_NOTIMPL; + } + + if(array) { + if(!res) { + FIXME("no res\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; + } + + stack_popn(ctx, arg_cnt); + return S_OK; +} + static HRESULT do_icall(exec_ctx_t *ctx, VARIANT *res) { BSTR identifier = ctx->instr->arg1.bstr; @@ -523,56 +569,26 @@ static HRESULT do_icall(exec_ctx_t *ctx, VARIANT *res) ref_t ref; HRESULT hres; + TRACE("%s %u\n", debugstr_w(identifier), arg_cnt); + hres = lookup_identifier(ctx, identifier, VBDISP_CALLGET, &ref); if(FAILED(hres)) return hres; switch(ref.type) { case REF_VAR: - case REF_CONST: { - VARIANT *v; + case REF_CONST: + if(arg_cnt) + return variant_call(ctx, ref.u.v, arg_cnt, res); 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) { - SAFEARRAY *array = NULL; - - 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; - case VT_DISPATCH: - vbstack_to_dp(ctx, arg_cnt, FALSE, &dp); - hres = disp_call(ctx->script, V_DISPATCH(v), DISPID_VALUE, &dp, res); - if(FAILED(hres)) - return hres; - break; - default: - FIXME("arguments not implemented\n"); - return E_NOTIMPL; - } - - if(!array) - break; - - 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; + V_BYREF(res) = V_VT(ref.u.v) == (VT_VARIANT|VT_BYREF) ? V_VARIANTREF(ref.u.v) : ref.u.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);

1 0

Zebediah Figura : ddraw: Reset the stateblock state before calling wined3d_device_reset().
by Alexandre Julliard Oct. 28, 2019

Oct. 28, 2019

Module: wine Branch: master Commit: 6c51a93b6378ed1ab0a8bcbc044d4f87bdfdac0b URL: https://source.winehq.org/git/wine.git/?a=commit;h=6c51a93b6378ed1ab0a8bcbc… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Oct 24 13:43:06 2019 -0500 ddraw: Reset the stateblock state before calling wined3d_device_reset(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/surface.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 769b5a7576..89e5024c0e 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -6068,14 +6068,6 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ swapchain_desc.backbuffer_height = mode.height; swapchain_desc.backbuffer_format = mode.format_id; - if (FAILED(hr = wined3d_device_reset(ddraw->wined3d_device, - &swapchain_desc, NULL, ddraw_reset_enum_callback, TRUE))) - { - ERR("Failed to reset device.\n"); - heap_free(texture); - return hr_ddraw_from_wined3d(hr); - } - if (ddraw->d3ddevice) { if (ddraw->d3ddevice->recording) @@ -6083,6 +6075,15 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ ddraw->d3ddevice->recording = NULL; ddraw->d3ddevice->update_state = ddraw->d3ddevice->state; } + wined3d_stateblock_reset(ddraw->state); + + if (FAILED(hr = wined3d_device_reset(ddraw->wined3d_device, + &swapchain_desc, NULL, ddraw_reset_enum_callback, TRUE))) + { + ERR("Failed to reset device.\n"); + heap_free(texture); + return hr_ddraw_from_wined3d(hr); + } wined3d_device_set_render_state(ddraw->wined3d_device, WINED3D_RS_ZENABLE, !!swapchain_desc.enable_auto_depth_stencil);

1 0

Jacek Caban : vbscript: Move sign expression to a separated rule.
by Alexandre Julliard Oct. 28, 2019

Oct. 28, 2019

Module: wine Branch: master Commit: aa95d8a9bcc39fe66fc80eac3b359d05fbc3c83d URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa95d8a9bcc39fe66fc80eac… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 28 18:39:38 2019 +0100 vbscript: Move sign expression to a separated rule. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/parser.y | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 8ecdf47c08..000ab5bf33 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -126,7 +126,7 @@ static statement_t *link_statements(statement_t*,statement_t*); %type <statement> Statement SimpleStatement StatementNl StatementsNl StatementsNl_opt BodyStatements IfStatement Else_opt %type <expression> Expression LiteralExpression PrimaryExpression EqualityExpression CallExpression ExpressionNl_opt %type <expression> ConcatExpression AdditiveExpression ModExpression IntdivExpression MultiplicativeExpression ExpExpression -%type <expression> NotExpression UnaryExpression AndExpression OrExpression XorExpression EqvExpression +%type <expression> NotExpression UnaryExpression AndExpression OrExpression XorExpression EqvExpression SignExpression %type <expression> ConstExpression NumericLiteralExpression %type <member> MemberExpression %type <expression> Arguments_opt ArgumentList ArgumentList_opt Step_opt ExpressionList @@ -369,15 +369,18 @@ MultiplicativeExpression { $$ = new_binary_expression(ctx, EXPR_DIV, $1, $3); CHECK_ERROR; } ExpExpression - : UnaryExpression { $$ = $1; } - | ExpExpression '^' UnaryExpression { $$ = new_binary_expression(ctx, EXPR_EXP, $1, $3); CHECK_ERROR; } + : SignExpression { $$ = $1; } + | ExpExpression '^' SignExpression { $$ = new_binary_expression(ctx, EXPR_EXP, $1, $3); CHECK_ERROR; } + +SignExpression + : UnaryExpression { $$ = $1; } + | '-' SignExpression { $$ = new_unary_expression(ctx, EXPR_NEG, $2); CHECK_ERROR; } + | '+' SignExpression { $$ = $2; } UnaryExpression : LiteralExpression { $$ = $1; } | CallExpression { $$ = $1; } | tNEW Identifier { $$ = new_new_expression(ctx, $2); CHECK_ERROR; } - | '-' UnaryExpression { $$ = new_unary_expression(ctx, EXPR_NEG, $2); CHECK_ERROR; } - | '+' UnaryExpression { $$ = $2; } CallExpression : PrimaryExpression { $$ = $1; }

1 0

Hans Leidekker : msi/tests: Add missing UnpublishFeatures actions.
by Alexandre Julliard Oct. 28, 2019

Oct. 28, 2019

Module: wine Branch: master Commit: 4f7bd33a838afca7086e993a9be7fa2d8dbdb5b6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4f7bd33a838afca7086e993a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Oct 28 14:54:29 2019 +0100 msi/tests: Add missing UnpublishFeatures actions. Reported by Sven Baars. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47992 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/action.c | 22 ++++++++++++++++++++-- dlls/msi/tests/install.c | 16 +++++++++++----- dlls/msi/tests/msi.c | 6 +++--- dlls/msi/tests/patch.c | 1 + 4 files changed, 35 insertions(+), 10 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4f7bd33a838afca7086e…

1 0

Roman Pišl : rstrtmgr: Add stubs RmAddFilter and RmRemoveFilter.
by Alexandre Julliard Oct. 28, 2019

Oct. 28, 2019

Module: wine Branch: master Commit: c18ebdfe724bd1f3a36bb9136d5e5edddcc23899 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c18ebdfe724bd1f3a36bb913… Author: Roman Pišl <rpisl(a)seznam.cz> Date: Sun Oct 27 11:16:48 2019 +0100 rstrtmgr: Add stubs RmAddFilter and RmRemoveFilter. Signed-off-by: Roman Pišl <rpisl(a)seznam.cz> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rstrtmgr/main.c | 22 ++++++++++++++++++++++ dlls/rstrtmgr/rstrtmgr.spec | 4 ++-- 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/rstrtmgr/main.c b/dlls/rstrtmgr/main.c index dfe53359d9..d78c9f590f 100644 --- a/dlls/rstrtmgr/main.c +++ b/dlls/rstrtmgr/main.c @@ -114,3 +114,25 @@ DWORD WINAPI RmShutdown(DWORD handle, ULONG flags, RM_WRITE_STATUS_CALLBACK stat FIXME("%u, 0x%08x, %p stub!\n", handle, flags, status); return ERROR_SUCCESS; } + +/*********************************************************************** + * RmAddFilter (rstrtmgr.@) + */ +DWORD WINAPI RmAddFilter(DWORD handle, LPCWSTR moduleName, RM_UNIQUE_PROCESS *process, + LPCWSTR serviceShortName, RM_FILTER_ACTION filter) +{ + FIXME("%u, %s %p %s 0x%08x stub!\n", handle, debugstr_w(moduleName), process, + debugstr_w(serviceShortName), filter); + return ERROR_SUCCESS; +} + +/*********************************************************************** + * RmRemoveFilter (rstrtmgr.@) + */ +DWORD WINAPI RmRemoveFilter(DWORD handle, LPCWSTR moduleName, RM_UNIQUE_PROCESS *process, + LPCWSTR serviceShortName) +{ + FIXME("%u, %s %p %s stub!\n", handle, debugstr_w(moduleName), process, + debugstr_w(serviceShortName)); + return ERROR_SUCCESS; +} diff --git a/dlls/rstrtmgr/rstrtmgr.spec b/dlls/rstrtmgr/rstrtmgr.spec index 6c6a9c9625..fed3b26a5c 100644 --- a/dlls/rstrtmgr/rstrtmgr.spec +++ b/dlls/rstrtmgr/rstrtmgr.spec @@ -1,11 +1,11 @@ -@ stub RmAddFilter +@ stdcall RmAddFilter(long wstr ptr wstr long) @ stub RmCancelCurrentTask @ stdcall RmEndSession(long) @ stub RmGetFilterList @ stdcall RmGetList(long ptr ptr ptr ptr) @ stub RmJoinSession @ stdcall RmRegisterResources(long long ptr long ptr long ptr) -@ stub RmRemoveFilter +@ stdcall RmRemoveFilter(long wstr ptr wstr) @ stub RmReserveHeap @ stdcall RmRestart(long long ptr) @ stdcall RmShutdown(long long ptr)

1 0

Roman Pišl : rstrtmgr: Fake API implementation by returning success.
by Alexandre Julliard Oct. 28, 2019

Oct. 28, 2019

Module: wine Branch: master Commit: 91570a55c016678c41ea0316b5168c7ab6060235 URL: https://source.winehq.org/git/wine.git/?a=commit;h=91570a55c016678c41ea0316… Author: Roman Pišl <rpisl(a)seznam.cz> Date: Sun Oct 27 11:16:47 2019 +0100 rstrtmgr: Fake API implementation by returning success. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47626 Signed-off-by: Roman Pišl <rpisl(a)seznam.cz> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rstrtmgr/main.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/rstrtmgr/main.c b/dlls/rstrtmgr/main.c index 0aa8094eea..dfe53359d9 100644 --- a/dlls/rstrtmgr/main.c +++ b/dlls/rstrtmgr/main.c @@ -54,7 +54,11 @@ DWORD WINAPI RmGetList(DWORD dwSessionHandle, UINT *pnProcInfoNeeded, UINT *pnPr RM_PROCESS_INFO *rgAffectedApps[], LPDWORD lpdwRebootReasons) { FIXME("%d, %p, %p, %p, %p stub!\n", dwSessionHandle, pnProcInfoNeeded, pnProcInfo, rgAffectedApps, lpdwRebootReasons); - return ERROR_CALL_NOT_IMPLEMENTED; + if (pnProcInfoNeeded) + *pnProcInfoNeeded = 0; + if (pnProcInfo) + *pnProcInfo = 0; + return ERROR_SUCCESS; } /*********************************************************************** @@ -68,7 +72,7 @@ DWORD WINAPI RmRegisterResources(DWORD dwSessionHandle, UINT nFiles, LPCWSTR rgs { FIXME("%d, %d, %p, %d, %p, %d, %p stub!\n", dwSessionHandle, nFiles, rgsFilenames, nApplications, rgApplications, nServices, rgsServiceNames); - return ERROR_CALL_NOT_IMPLEMENTED; + return ERROR_SUCCESS; } /*********************************************************************** @@ -79,7 +83,9 @@ DWORD WINAPI RmRegisterResources(DWORD dwSessionHandle, UINT nFiles, LPCWSTR rgs DWORD WINAPI RmStartSession(DWORD *sessionhandle, DWORD flags, WCHAR sessionkey[]) { FIXME("%p, %d, %p stub!\n", sessionhandle, flags, sessionkey); - return ERROR_CALL_NOT_IMPLEMENTED; + if (sessionhandle) + *sessionhandle = 0xdeadbeef; + return ERROR_SUCCESS; } /*********************************************************************** @@ -88,7 +94,7 @@ DWORD WINAPI RmStartSession(DWORD *sessionhandle, DWORD flags, WCHAR sessionkey[ DWORD WINAPI RmRestart(DWORD handle, DWORD flags, RM_WRITE_STATUS_CALLBACK status) { FIXME("%u, 0x%08x, %p stub!\n", handle, flags, status); - return ERROR_CALL_NOT_IMPLEMENTED; + return ERROR_SUCCESS; } /*********************************************************************** @@ -97,7 +103,7 @@ DWORD WINAPI RmRestart(DWORD handle, DWORD flags, RM_WRITE_STATUS_CALLBACK statu DWORD WINAPI RmEndSession(DWORD handle) { FIXME("%u stub!\n", handle); - return ERROR_CALL_NOT_IMPLEMENTED; + return ERROR_SUCCESS; } /*********************************************************************** @@ -106,5 +112,5 @@ DWORD WINAPI RmEndSession(DWORD handle) DWORD WINAPI RmShutdown(DWORD handle, ULONG flags, RM_WRITE_STATUS_CALLBACK status) { FIXME("%u, 0x%08x, %p stub!\n", handle, flags, status); - return ERROR_CALL_NOT_IMPLEMENTED; + return ERROR_SUCCESS; }

1 0

Zebediah Figura : ddraw: Handle stateblocks in d3d_device7_SetTexture().
by Alexandre Julliard Oct. 28, 2019

Oct. 28, 2019

Module: wine Branch: master Commit: d4cfa070cb9428b9954de26bb704cf5d4b8e9cd5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d4cfa070cb9428b9954de26b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Oct 24 13:43:10 2019 -0500 ddraw: Handle stateblocks in d3d_device7_SetTexture(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/device.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 3702454bde..9b7754bd8d 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -4811,7 +4811,9 @@ static HRESULT d3d_device7_SetTexture(IDirect3DDevice7 *iface, wined3d_texture = surf->wined3d_texture; wined3d_mutex_lock(); - wined3d_device_set_texture(device->wined3d_device, stage, wined3d_texture); + wined3d_stateblock_set_texture(device->update_state, stage, wined3d_texture); + if (!device->recording) + wined3d_device_set_texture(device->wined3d_device, stage, wined3d_texture); wined3d_mutex_unlock(); return D3D_OK;

1 0

Zebediah Figura : d3d9: Handle stateblocks in d3d9_device_SetTexture().
by Alexandre Julliard Oct. 28, 2019

Oct. 28, 2019

Module: wine Branch: master Commit: 95545a6667178f0ae8db108a06f814c3d0e58e7b URL: https://source.winehq.org/git/wine.git/?a=commit;h=95545a6667178f0ae8db108a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Oct 24 13:43:08 2019 -0500 d3d9: Handle stateblocks in d3d9_device_SetTexture(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index d96e7b7095..cd870c90a6 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2489,13 +2489,16 @@ static HRESULT WINAPI d3d9_device_SetTexture(IDirect3DDevice9Ex *iface, DWORD st texture_impl = unsafe_impl_from_IDirect3DBaseTexture9(texture); wined3d_mutex_lock(); - wined3d_device_set_texture(device->wined3d_device, stage, + wined3d_stateblock_set_texture(device->update_state, stage, texture_impl ? texture_impl->wined3d_texture : NULL); if (!device->recording) { unsigned int i = stage < 16 || (stage >= D3DVERTEXTEXTURESAMPLER0 && stage <= D3DVERTEXTEXTURESAMPLER3) ? stage < 16 ? stage : stage - D3DVERTEXTEXTURESAMPLER0 + 16 : ~0u; + wined3d_device_set_texture(device->wined3d_device, stage, + texture_impl ? texture_impl->wined3d_texture : NULL); + if (i < D3D9_MAX_TEXTURE_UNITS) { if (texture_impl && texture_impl->usage & D3DUSAGE_AUTOGENMIPMAP)

1 0

Jacek Caban : vbscript: Support non-member calls in compiler.
by Alexandre Julliard Oct. 28, 2019

Oct. 28, 2019

Module: wine Branch: master Commit: 25248362ea670fa077d7f41af9bb67622bd8430f URL: https://source.winehq.org/git/wine.git/?a=commit;h=25248362ea670fa077d7f41a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 28 18:40:18 2019 +0100 vbscript: Support non-member calls in compiler. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/compile.c | 13 +++++++++---- dlls/vbscript/interp.c | 12 ++++++++++++ dlls/vbscript/vbscript.h | 4 +++- 3 files changed, 24 insertions(+), 5 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index 8309e5819c..0cbdae6e19 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -453,17 +453,22 @@ static HRESULT compile_member_expression(compile_ctx_t *ctx, member_expression_t static HRESULT compile_call_expression(compile_ctx_t *ctx, call_expression_t *expr, BOOL ret_val) { unsigned arg_cnt = 0; + expression_t *call; HRESULT hres; hres = compile_args(ctx, expr->args, &arg_cnt); if(FAILED(hres)) return hres; - if(expr->call_expr->type == EXPR_MEMBER) - return compile_member_expression(ctx, (member_expression_t*)expr->call_expr, arg_cnt, ret_val); + call = expr->call_expr; + if(call->type == EXPR_MEMBER) + return compile_member_expression(ctx, (member_expression_t*)call, arg_cnt, ret_val); - FIXME("non-member call expression\n"); - return E_NOTIMPL; + hres = compile_expression(ctx, call); + if(FAILED(hres)) + return hres; + + return push_instr_uint(ctx, ret_val ? OP_vcall : OP_vcallv, arg_cnt); } static HRESULT compile_unary_expression(compile_ctx_t *ctx, unary_expression_t *expr, vbsop_t op) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index fee3e72959..d8ed679788 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -635,6 +635,18 @@ static HRESULT interp_icallv(exec_ctx_t *ctx) return do_icall(ctx, NULL); } +static HRESULT interp_vcall(exec_ctx_t *ctx) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT interp_vcallv(exec_ctx_t *ctx) +{ + FIXME("\n"); + return E_NOTIMPL; +} + static HRESULT do_mcall(exec_ctx_t *ctx, VARIANT *res) { const BSTR identifier = ctx->instr->arg1.bstr; diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 71f42aaff9..0382a80290 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -220,7 +220,7 @@ typedef enum { X(assign_ident, 1, ARG_BSTR, ARG_UINT) \ X(assign_member, 1, ARG_BSTR, ARG_UINT) \ X(bool, 1, ARG_INT, 0) \ - X(catch, 1, ARG_ADDR, ARG_UINT) \ + X(catch, 1, ARG_ADDR, ARG_UINT) \ X(case, 0, ARG_ADDR, 0) \ X(concat, 1, 0, 0) \ X(const, 1, ARG_BSTR, 0) \ @@ -271,6 +271,8 @@ typedef enum { X(string, 1, ARG_STR, 0) \ X(sub, 1, 0, 0) \ X(val, 1, 0, 0) \ + X(vcall, 1, ARG_UINT, 0) \ + X(vcallv, 1, ARG_UINT, 0) \ X(xor, 1, 0, 0) typedef enum {

1 0

Piotr Caban : msvcrt: Add _mbsspn_l implementation.
by Alexandre Julliard Oct. 28, 2019

Oct. 28, 2019

Module: wine Branch: master Commit: de8e6b6a283f3f0148d8195c33964632921fa1ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=de8e6b6a283f3f0148d8195c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Oct 28 13:29:05 2019 +0100 msvcrt: Add _mbsspn_l implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-multibyte-l1-1-0.spec | 2 +- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/mbcs.c | 16 ++++++++++++---- dlls/msvcrt/msvcrt.spec | 2 +- dlls/ucrtbase/ucrtbase.spec | 2 +- 9 files changed, 20 insertions(+), 12 deletions(-) diff --git a/dlls/api-ms-win-crt-multibyte-l1-1-0/api-ms-win-crt-multibyte-l1-1-0.spec b/dlls/api-ms-win-crt-multibyte-l1-1-0/api-ms-win-crt-multibyte-l1-1-0.spec index 3f60bb4162..059e366aea 100644 --- a/dlls/api-ms-win-crt-multibyte-l1-1-0/api-ms-win-crt-multibyte-l1-1-0.spec +++ b/dlls/api-ms-win-crt-multibyte-l1-1-0/api-ms-win-crt-multibyte-l1-1-0.spec @@ -178,7 +178,7 @@ @ stub _mbsset_s @ stub _mbsset_s_l @ cdecl _mbsspn(str str) ucrtbase._mbsspn -@ stub _mbsspn_l +@ cdecl _mbsspn_l(str str ptr) ucrtbase._mbsspn_l @ cdecl _mbsspnp(str str) ucrtbase._mbsspnp @ stub _mbsspnp_l @ cdecl _mbsstr(str str) ucrtbase._mbsstr diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index f3647ea267..b59e8cf5cc 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1184,7 +1184,7 @@ @ stub _mbsset_s @ stub _mbsset_s_l @ cdecl _mbsspn(str str) -@ stub _mbsspn_l +@ cdecl _mbsspn_l(str str ptr) @ cdecl _mbsspnp(str str) @ stub _mbsspnp_l @ cdecl _mbsstr(str str) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 343f2bd3c9..0697029962 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1541,7 +1541,7 @@ @ stub _mbsset_s @ stub _mbsset_s_l @ cdecl _mbsspn(str str) -@ stub _mbsspn_l +@ cdecl _mbsspn_l(str str ptr) @ cdecl _mbsspnp(str str) @ stub _mbsspnp_l @ cdecl _mbsstr(str str) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 9938b1ff46..07ce01c90e 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1551,7 +1551,7 @@ @ stub _mbsset_s @ stub _mbsset_s_l @ cdecl _mbsspn(str str) -@ stub _mbsspn_l +@ cdecl _mbsspn_l(str str ptr) @ cdecl _mbsspnp(str str) @ stub _mbsspnp_l @ cdecl _mbsstr(str str) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 8e59d320f0..1e03b4d4d9 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -856,7 +856,7 @@ @ stub _mbsset_s @ stub _mbsset_s_l @ cdecl _mbsspn(str str) -@ stub _mbsspn_l +@ cdecl _mbsspn_l(str str ptr) @ cdecl _mbsspnp(str str) @ stub _mbsspnp_l @ cdecl _mbsstr(str str) diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 5e8fba1c87..a8369cb6c6 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -834,7 +834,7 @@ @ stub _mbsset_s @ stub _mbsset_s_l @ cdecl _mbsspn(str str) -@ stub _mbsspn_l +@ cdecl _mbsspn_l(str str ptr) @ cdecl _mbsspnp(str str) @ stub _mbsspnp_l @ cdecl _mbsstr(str str) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index fe47e55eae..ce98749e9f 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -2021,11 +2021,11 @@ int CDECL _mbsupr_s(unsigned char* s, MSVCRT_size_t len) return 0; } - /********************************************************************* - * _mbsspn (MSVCRT.@) + * _mbsspn_l (MSVCRT.@) */ -MSVCRT_size_t CDECL _mbsspn(const unsigned char* string, const unsigned char* set) +MSVCRT_size_t CDECL _mbsspn_l(const unsigned char* string, + const unsigned char* set, MSVCRT__locale_t locale) { const unsigned char *p, *q; @@ -2033,7 +2033,7 @@ MSVCRT_size_t CDECL _mbsspn(const unsigned char* string, const unsigned char* se { for (q = set; *q; q++) { - if (_ismbblead(*q)) + if (_ismbblead_l(*q, locale)) { /* duplicate a bug in native implementation */ if (!q[1]) break; @@ -2055,6 +2055,14 @@ MSVCRT_size_t CDECL _mbsspn(const unsigned char* string, const unsigned char* se return p - string; } +/********************************************************************* + * _mbsspn (MSVCRT.@) + */ +MSVCRT_size_t CDECL _mbsspn(const unsigned char* string, const unsigned char* set) +{ + return _mbsspn_l(string, set, NULL); +} + /********************************************************************* * _mbsspnp (MSVCRT.@) */ diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 2d9f273df9..e4fad75c18 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -802,7 +802,7 @@ # stub _mbsset_s(ptr long long) # stub _mbsset_s_l(ptr long long ptr) @ cdecl _mbsspn(str str) -# stub _mbsspn_l(str str ptr) +@ cdecl _mbsspn_l(str str ptr) @ cdecl _mbsspnp(str str) # stub _mbsspnp_l(str str ptr) @ cdecl _mbsstr(str str) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index fc391b8d81..7dfa9147d7 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -697,7 +697,7 @@ @ stub _mbsset_s @ stub _mbsset_s_l @ cdecl _mbsspn(str str) -@ stub _mbsspn_l +@ cdecl _mbsspn_l(str str ptr) @ cdecl _mbsspnp(str str) @ stub _mbsspnp_l @ cdecl _mbsstr(str str)

1 0