October 2019 - Wine-Commits

Jacek Caban : vbscript: Add support for interpreting statements.
by Alexandre Julliard Oct. 29, 2019

Oct. 29, 2019

Module: wine Branch: master Commit: e8b2f85bb1d37401f799eeb4a722052718bf8221 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e8b2f85bb1d37401f799eeb4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 29 19:01:23 2019 +0100 vbscript: Add support for interpreting statements. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/compile.c | 41 +++++++++++++++++++++++++++++++++++++++++ dlls/vbscript/interp.c | 20 ++++++++++++++++++++ dlls/vbscript/vbscript.h | 1 + dlls/vbscript/vbscript.rc | 1 + dlls/vbscript/vbscript_defs.h | 1 + 5 files changed, 64 insertions(+) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index 2023261399..07279794c6 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -32,6 +32,7 @@ typedef struct _statement_ctx_t { unsigned while_end_label; unsigned for_end_label; + unsigned with_stack_offset; struct _statement_ctx_t *next; } statement_ctx_t; @@ -475,6 +476,21 @@ static HRESULT compile_call_expression(compile_ctx_t *ctx, call_expression_t *ex return push_instr_uint(ctx, ret_val ? OP_vcall : OP_vcallv, arg_cnt); } +static HRESULT compile_dot_expression(compile_ctx_t *ctx) +{ + statement_ctx_t *stat_ctx; + + for(stat_ctx = ctx->stat_ctx; stat_ctx; stat_ctx = stat_ctx->next) { + if(!stat_ctx->with_stack_offset) + continue; + + return push_instr_uint(ctx, OP_stack, stat_ctx->with_stack_offset - 1); + } + + WARN("dot expression outside with statement\n"); + return push_instr_uint(ctx, OP_stack, ~0); +} + static HRESULT compile_unary_expression(compile_ctx_t *ctx, unary_expression_t *expr, vbsop_t op) { HRESULT hres; @@ -518,6 +534,8 @@ static HRESULT compile_expression(compile_ctx_t *ctx, expression_t *expr) return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_concat); case EXPR_DIV: return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_div); + case EXPR_DOT: + return compile_dot_expression(ctx); case EXPR_DOUBLE: return push_instr_double(ctx, OP_double, ((double_expression_t*)expr)->value); case EXPR_EMPTY: @@ -858,6 +876,26 @@ static HRESULT compile_forto_statement(compile_ctx_t *ctx, forto_statement_t *st return S_OK; } +static HRESULT compile_with_statement(compile_ctx_t *ctx, with_statement_t *stat) +{ + statement_ctx_t with_ctx = { 1 }; + HRESULT hres; + + hres = compile_expression(ctx, stat->expr); + if(FAILED(hres)) + return hres; + + if(!emit_catch(ctx, 1)) + return E_OUTOFMEMORY; + + with_ctx.with_stack_offset = stack_offset(ctx) + 1; + hres = compile_statement(ctx, &with_ctx, stat->body); + if(FAILED(hres)) + return hres; + + return push_instr_uint(ctx, OP_pop, 1); +} + static HRESULT compile_select_statement(compile_ctx_t *ctx, select_statement_t *stat) { unsigned end_label, case_cnt = 0, *case_labels = NULL, i; @@ -1320,6 +1358,9 @@ static HRESULT compile_statement(compile_ctx_t *ctx, statement_ctx_t *stat_ctx, case STAT_WHILELOOP: hres = compile_while_statement(ctx, (while_statement_t*)stat); break; + case STAT_WITH: + hres = compile_with_statement(ctx, (with_statement_t*)stat); + break; case STAT_RETVAL: hres = compile_retval_statement(ctx, (retval_statement_t*)stat); break; diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 60c4340d6e..2b681a0677 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -1028,6 +1028,26 @@ static HRESULT interp_pop(exec_ctx_t *ctx) return S_OK; } +static HRESULT interp_stack(exec_ctx_t *ctx) +{ + const unsigned n = ctx->instr->arg1.uint; + VARIANT v; + HRESULT hres; + + TRACE("%#x\n", n); + + if(n == ~0) + return MAKE_VBSERROR(505); + assert(n < ctx->top); + + V_VT(&v) = VT_EMPTY; + hres = VariantCopy(&v, ctx->stack + n); + if(FAILED(hres)) + return hres; + + return stack_push(ctx, &v); +} + static HRESULT interp_deref(exec_ctx_t *ctx) { VARIANT copy, *v = stack_top(ctx, 0); diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 33eb1e8305..fefed63edb 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -267,6 +267,7 @@ typedef enum { X(retval, 1, 0, 0) \ X(set_ident, 1, ARG_BSTR, ARG_UINT) \ X(set_member, 1, ARG_BSTR, ARG_UINT) \ + X(stack, 1, ARG_UINT, 0) \ X(step, 0, ARG_ADDR, ARG_BSTR) \ X(stop, 1, 0, 0) \ X(string, 1, ARG_STR, 0) \ diff --git a/dlls/vbscript/vbscript.rc b/dlls/vbscript/vbscript.rc index 360b1006d6..0791c3b53f 100644 --- a/dlls/vbscript/vbscript.rc +++ b/dlls/vbscript/vbscript.rc @@ -54,6 +54,7 @@ STRINGTABLE VBSE_INVALID_DLL_FUNCTION_NAME "Specified DLL function not found" VBSE_INVALID_TYPELIB_VARIABLE "Variable uses an Automation type not supported in VBScript" VBSE_SERVER_NOT_FOUND "The remote server machine does not exist or is unavailable" + VBSE_UNQUALIFIED_REFERENCE "Invalid or unqualified reference" VBS_COMPILE_ERROR "Microsoft VBScript compilation error" VBS_RUNTIME_ERROR "Microsoft VBScript runtime error" diff --git a/dlls/vbscript/vbscript_defs.h b/dlls/vbscript/vbscript_defs.h index 44f005b640..139b71255a 100644 --- a/dlls/vbscript/vbscript_defs.h +++ b/dlls/vbscript/vbscript_defs.h @@ -267,6 +267,7 @@ #define VBSE_INVALID_DLL_FUNCTION_NAME 453 #define VBSE_INVALID_TYPELIB_VARIABLE 458 #define VBSE_SERVER_NOT_FOUND 462 +#define VBSE_UNQUALIFIED_REFERENCE 505 #define VBS_COMPILE_ERROR 4096 #define VBS_RUNTIME_ERROR 4097

1 0

Hans Leidekker : msi/tests: Remove workarounds for Windows 2000.
by Alexandre Julliard Oct. 29, 2019

Oct. 29, 2019

Module: wine Branch: master Commit: 71f755820642777261c54d3fe6a04ba202059340 URL: https://source.winehq.org/git/wine.git/?a=commit;h=71f755820642777261c54d3f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Oct 29 10:58:44 2019 +0100 msi/tests: Remove workarounds for Windows 2000. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/msi.c | 84 ++++++++++++++++++---------------------------------- 1 file changed, 28 insertions(+), 56 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=71f755820642777261c5…

1 0

Hans Leidekker : msi/tests: Run the package tests from a temporary directory.
by Alexandre Julliard Oct. 29, 2019

Oct. 29, 2019

Module: wine Branch: master Commit: 8503ad172229979e9929e8d54dac546c5b799a03 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8503ad172229979e9929e8d5… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Oct 29 10:58:43 2019 +0100 msi/tests: Run the package tests from a temporary directory. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/package.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index ba1b83a6fb..3c547bf04a 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -9640,15 +9640,25 @@ static void test_top_level_action(void) START_TEST(package) { + char temp_path[MAX_PATH], prev_path[MAX_PATH]; STATEMGRSTATUS status; BOOL ret = FALSE; + DWORD len; init_functionpointers(); if (pIsWow64Process) pIsWow64Process(GetCurrentProcess(), &is_wow64); - GetCurrentDirectoryA(MAX_PATH, CURR_DIR); + GetCurrentDirectoryA(MAX_PATH, prev_path); + GetTempPathA(MAX_PATH, temp_path); + SetCurrentDirectoryA(temp_path); + + lstrcpyA(CURR_DIR, temp_path); + len = lstrlenA(CURR_DIR); + + if (len && (CURR_DIR[len - 1] == '\\')) + CURR_DIR[len - 1] = 0; /* Create a restore point ourselves so we circumvent the multitude of restore points * that would have been created by all the installation and removal tests. @@ -9706,4 +9716,6 @@ START_TEST(package) if (ret) remove_restore_point(status.llSequenceNumber); } + + SetCurrentDirectoryA(prev_path); }

1 0

Jacek Caban : vbscript: Use wide char literals for lexer keywords.
by Alexandre Julliard Oct. 29, 2019

Oct. 29, 2019

Module: wine Branch: master Commit: 55e9c896cac1160a43f79e508b323bd23167589f URL: https://source.winehq.org/git/wine.git/?a=commit;h=55e9c896cac1160a43f79e50… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 29 19:01:02 2019 +0100 vbscript: Use wide char literals for lexer keywords. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/lex.c | 172 +++++++++++++++++----------------------------------- 1 file changed, 57 insertions(+), 115 deletions(-) diff --git a/dlls/vbscript/lex.c b/dlls/vbscript/lex.c index 510ac0918b..6b20d1979d 100644 --- a/dlls/vbscript/lex.c +++ b/dlls/vbscript/lex.c @@ -28,125 +28,67 @@ WINE_DEFAULT_DEBUG_CHANNEL(vbscript); -static const WCHAR andW[] = {'a','n','d',0}; -static const WCHAR byrefW[] = {'b','y','r','e','f',0}; -static const WCHAR byvalW[] = {'b','y','v','a','l',0}; -static const WCHAR callW[] = {'c','a','l','l',0}; -static const WCHAR caseW[] = {'c','a','s','e',0}; -static const WCHAR classW[] = {'c','l','a','s','s',0}; -static const WCHAR constW[] = {'c','o','n','s','t',0}; -static const WCHAR defaultW[] = {'d','e','f','a','u','l','t',0}; -static const WCHAR dimW[] = {'d','i','m',0}; -static const WCHAR doW[] = {'d','o',0}; -static const WCHAR eachW[] = {'e','a','c','h',0}; -static const WCHAR elseW[] = {'e','l','s','e',0}; -static const WCHAR elseifW[] = {'e','l','s','e','i','f',0}; -static const WCHAR emptyW[] = {'e','m','p','t','y',0}; -static const WCHAR endW[] = {'e','n','d',0}; -static const WCHAR eqvW[] = {'e','q','v',0}; -static const WCHAR errorW[] = {'e','r','r','o','r',0}; -static const WCHAR exitW[] = {'e','x','i','t',0}; -static const WCHAR explicitW[] = {'e','x','p','l','i','c','i','t',0}; -static const WCHAR falseW[] = {'f','a','l','s','e',0}; -static const WCHAR forW[] = {'f','o','r',0}; -static const WCHAR functionW[] = {'f','u','n','c','t','i','o','n',0}; -static const WCHAR getW[] = {'g','e','t',0}; -static const WCHAR gotoW[] = {'g','o','t','o',0}; -static const WCHAR ifW[] = {'i','f',0}; -static const WCHAR impW[] = {'i','m','p',0}; -static const WCHAR inW[] = {'i','n',0}; -static const WCHAR isW[] = {'i','s',0}; -static const WCHAR letW[] = {'l','e','t',0}; -static const WCHAR loopW[] = {'l','o','o','p',0}; -static const WCHAR meW[] = {'m','e',0}; -static const WCHAR modW[] = {'m','o','d',0}; -static const WCHAR newW[] = {'n','e','w',0}; -static const WCHAR nextW[] = {'n','e','x','t',0}; -static const WCHAR notW[] = {'n','o','t',0}; -static const WCHAR nothingW[] = {'n','o','t','h','i','n','g',0}; -static const WCHAR nullW[] = {'n','u','l','l',0}; -static const WCHAR onW[] = {'o','n',0}; -static const WCHAR optionW[] = {'o','p','t','i','o','n',0}; -static const WCHAR orW[] = {'o','r',0}; -static const WCHAR privateW[] = {'p','r','i','v','a','t','e',0}; -static const WCHAR propertyW[] = {'p','r','o','p','e','r','t','y',0}; -static const WCHAR publicW[] = {'p','u','b','l','i','c',0}; -static const WCHAR remW[] = {'r','e','m',0}; -static const WCHAR resumeW[] = {'r','e','s','u','m','e',0}; -static const WCHAR selectW[] = {'s','e','l','e','c','t',0}; -static const WCHAR setW[] = {'s','e','t',0}; -static const WCHAR stepW[] = {'s','t','e','p',0}; -static const WCHAR stopW[] = {'s','t','o','p',0}; -static const WCHAR subW[] = {'s','u','b',0}; -static const WCHAR thenW[] = {'t','h','e','n',0}; -static const WCHAR toW[] = {'t','o',0}; -static const WCHAR trueW[] = {'t','r','u','e',0}; -static const WCHAR untilW[] = {'u','n','t','i','l',0}; -static const WCHAR wendW[] = {'w','e','n','d',0}; -static const WCHAR whileW[] = {'w','h','i','l','e',0}; -static const WCHAR xorW[] = {'x','o','r',0}; - static const struct { const WCHAR *word; int token; } keywords[] = { - {andW, tAND}, - {byrefW, tBYREF}, - {byvalW, tBYVAL}, - {callW, tCALL}, - {caseW, tCASE}, - {classW, tCLASS}, - {constW, tCONST}, - {defaultW, tDEFAULT}, - {dimW, tDIM}, - {doW, tDO}, - {eachW, tEACH}, - {elseW, tELSE}, - {elseifW, tELSEIF}, - {emptyW, tEMPTY}, - {endW, tEND}, - {eqvW, tEQV}, - {errorW, tERROR}, - {exitW, tEXIT}, - {explicitW, tEXPLICIT}, - {falseW, tFALSE}, - {forW, tFOR}, - {functionW, tFUNCTION}, - {getW, tGET}, - {gotoW, tGOTO}, - {ifW, tIF}, - {impW, tIMP}, - {inW, tIN}, - {isW, tIS}, - {letW, tLET}, - {loopW, tLOOP}, - {meW, tME}, - {modW, tMOD}, - {newW, tNEW}, - {nextW, tNEXT}, - {notW, tNOT}, - {nothingW, tNOTHING}, - {nullW, tNULL}, - {onW, tON}, - {optionW, tOPTION}, - {orW, tOR}, - {privateW, tPRIVATE}, - {propertyW, tPROPERTY}, - {publicW, tPUBLIC}, - {remW, tREM}, - {resumeW, tRESUME}, - {selectW, tSELECT}, - {setW, tSET}, - {stepW, tSTEP}, - {stopW, tSTOP}, - {subW, tSUB}, - {thenW, tTHEN}, - {toW, tTO}, - {trueW, tTRUE}, - {untilW, tUNTIL}, - {wendW, tWEND}, - {whileW, tWHILE}, - {xorW, tXOR} + {L"and", tAND}, + {L"byref", tBYREF}, + {L"byval", tBYVAL}, + {L"call", tCALL}, + {L"case", tCASE}, + {L"class", tCLASS}, + {L"const", tCONST}, + {L"default", tDEFAULT}, + {L"dim", tDIM}, + {L"do", tDO}, + {L"each", tEACH}, + {L"else", tELSE}, + {L"elseif", tELSEIF}, + {L"empty", tEMPTY}, + {L"end", tEND}, + {L"eqv", tEQV}, + {L"error", tERROR}, + {L"exit", tEXIT}, + {L"explicit", tEXPLICIT}, + {L"false", tFALSE}, + {L"for", tFOR}, + {L"function", tFUNCTION}, + {L"get", tGET}, + {L"goto", tGOTO}, + {L"if", tIF}, + {L"imp", tIMP}, + {L"in", tIN}, + {L"is", tIS}, + {L"let", tLET}, + {L"loop", tLOOP}, + {L"me", tME}, + {L"mod", tMOD}, + {L"new", tNEW}, + {L"next", tNEXT}, + {L"not", tNOT}, + {L"nothing", tNOTHING}, + {L"null", tNULL}, + {L"on", tON}, + {L"option", tOPTION}, + {L"or", tOR}, + {L"private", tPRIVATE}, + {L"property", tPROPERTY}, + {L"public", tPUBLIC}, + {L"rem", tREM}, + {L"resume", tRESUME}, + {L"select", tSELECT}, + {L"set", tSET}, + {L"step", tSTEP}, + {L"stop", tSTOP}, + {L"sub", tSUB}, + {L"then", tTHEN}, + {L"to", tTO}, + {L"true", tTRUE}, + {L"until", tUNTIL}, + {L"wend", tWEND}, + {L"while", tWHILE}, + {L"xor", tXOR} }; static inline BOOL is_identifier_char(WCHAR c)

1 0

Hans Leidekker : msi/tests: Fix test failures.
by Alexandre Julliard Oct. 29, 2019

Oct. 29, 2019

Module: wine Branch: master Commit: 1b4b37cc7e05724fac235cef278a97b358d0cba1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b4b37cc7e05724fac235cef… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Oct 29 10:58:42 2019 +0100 msi/tests: Fix test failures. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/msi.c | 120 ++++++++++++++++++++++++++++++++++++++++++++++- dlls/msi/tests/package.c | 9 ++++ dlls/msi/tests/source.c | 21 +++++++++ 3 files changed, 149 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1b4b37cc7e05724fac23…

1 0

Alistair Leslie-Hughes : uianimation/tests: Add IUIAnimationTimer test.
by Alexandre Julliard Oct. 29, 2019

Oct. 29, 2019

Module: wine Branch: master Commit: ecb59b0b8ce4fa219065f940b75ffae0306ef1d8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ecb59b0b8ce4fa219065f940… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Oct 29 00:29:00 2019 +0000 uianimation/tests: Add IUIAnimationTimer test. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uianimation/tests/uianimation.c | 37 ++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/dlls/uianimation/tests/uianimation.c b/dlls/uianimation/tests/uianimation.c index 0cb2fbf2b8..5c85e8f4dc 100644 --- a/dlls/uianimation/tests/uianimation.c +++ b/dlls/uianimation/tests/uianimation.c @@ -47,6 +47,42 @@ static void test_UIAnimationManager(void) IUIAnimationManager_Release(manager); } +static void test_IUIAnimationTimer(void) +{ + HRESULT hr; + IUIAnimationTimer *timer; + + hr = CoCreateInstance( &CLSID_UIAnimationTimer, NULL, CLSCTX_ALL, &IID_IUIAnimationTimer, (void**)&timer); + if(FAILED(hr)) + { + win_skip("IUIAnimationTimer not found\n"); + return; + } + + hr = IUIAnimationTimer_IsEnabled(timer); + todo_wine ok(hr == S_FALSE, "got 0x%08x\n", hr); + + hr = IUIAnimationTimer_Enable(timer); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IUIAnimationTimer_Enable(timer); + todo_wine ok(hr == S_FALSE, "got 0x%08x\n", hr); + + hr = IUIAnimationTimer_IsEnabled(timer); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IUIAnimationTimer_Disable(timer); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IUIAnimationTimer_Disable(timer); + todo_wine ok(hr == S_FALSE, "got 0x%08x\n", hr); + + hr = IUIAnimationTimer_IsEnabled(timer); + todo_wine ok(hr == S_FALSE, "got 0x%08x\n", hr); + + IUIAnimationTimer_Release(timer); +} + START_TEST(uianimation) { HRESULT hr; @@ -57,6 +93,7 @@ START_TEST(uianimation) return; test_UIAnimationManager(); + test_IUIAnimationTimer(); CoUninitialize(); }

1 0

Alexandre Julliard : winex11: Also catch X errors from XF86VidModeSetGammaRamp().
by Alexandre Julliard Oct. 29, 2019

Oct. 29, 2019

Module: wine Branch: master Commit: 81f8b6e8c215dc04a19438e4369fcba8f7f4f333 URL: https://source.winehq.org/git/wine.git/?a=commit;h=81f8b6e8c215dc04a19438e4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 29 10:49:20 2019 +0100 winex11: Also catch X errors from XF86VidModeSetGammaRamp(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/xvidmode.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/winex11.drv/xvidmode.c b/dlls/winex11.drv/xvidmode.c index 9c0c97f1eb..975575fe77 100644 --- a/dlls/winex11.drv/xvidmode.c +++ b/dlls/winex11.drv/xvidmode.c @@ -416,8 +416,12 @@ static BOOL xf86vm_set_gamma_ramp(struct x11drv_gamma_ramp *ramp) ramp->red, ramp->green, ramp->blue, GAMMA_RAMP_SIZE); } + X11DRV_expect_error(gdi_display, XVidModeErrorHandler, NULL); ret = pXF86VidModeSetGammaRamp(gdi_display, DefaultScreen(gdi_display), xf86vm_gammaramp_size, red, green, blue); + if (ret) XSync( gdi_display, FALSE ); + if (X11DRV_check_error()) ret = FALSE; + if (red != ramp->red) heap_free(red); return ret;

1 0

Alexandre Julliard : oleaut32: Fix handling of VARIANT parameters in DispCallFunc() on ARM64.
by Alexandre Julliard Oct. 29, 2019

Oct. 29, 2019

Module: wine Branch: master Commit: 03a590017e901b9473cc40afbc851eca218c96c4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=03a590017e901b9473cc40af… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 29 14:10:45 2019 +0100 oleaut32: Fix handling of VARIANT parameters in DispCallFunc() on ARM64. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/typelib.c | 27 ++++++++++++++++++++++++--- dlls/oleaut32/typelib.c | 33 +++++++++++---------------------- 2 files changed, 35 insertions(+), 25 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index a706481042..47faad7763 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -1201,17 +1201,37 @@ static HRESULT WINAPI ret_false_func(void) static const WCHAR testW[] = { 'T','e','s','t',0 }; -static void WINAPI variant_func2(VARIANT *ret, VARIANT v1, VARIANT v2) +static VARIANT WINAPI variant_func2(VARIANT v1, VARIANT v2) { + VARIANT ret; + ok(V_VT(&v1) == VT_I4, "unexpected %d\n", V_VT(&v1)); ok(V_I4(&v1) == 2, "unexpected %d\n", V_I4(&v1)); ok(V_VT(&v2) == VT_BSTR, "unexpected %d\n", V_VT(&v2)); ok(lstrcmpW(V_BSTR(&v2), testW) == 0, "unexpected %s\n", wine_dbgstr_w(V_BSTR(&v2))); - V_VT(ret) = VT_UI4; - V_I4(ret) = 4321; + V_VT(&ret) = VT_UI4; + V_I4(&ret) = 4321; + return ret; } +#ifdef __aarch64__ +static VARIANT WINAPI inst_func2(void *inst, VARIANT v1, VARIANT v2) +{ + VARIANT ret; + + ok( (*(void ***)inst)[3] == inst_func2, "wrong ptr %p\n", inst ); + + ok(V_VT(&v1) == VT_I4, "unexpected %d\n", V_VT(&v1)); + ok(V_I4(&v1) == 2, "unexpected %d\n", V_I4(&v1)); + ok(V_VT(&v2) == VT_BSTR, "unexpected %d\n", V_VT(&v2)); + ok(lstrcmpW(V_BSTR(&v2), testW) == 0, "unexpected %s\n", wine_dbgstr_w(V_BSTR(&v2))); + + V_VT(&ret) = VT_UI4; + V_I4(&ret) = 4321; + return ret; +} +#else static void WINAPI inst_func2(void *inst, VARIANT *ret, VARIANT v1, VARIANT v2) { ok( (*(void ***)inst)[3] == inst_func2, "wrong ptr %p\n", inst ); @@ -1227,6 +1247,7 @@ static void WINAPI inst_func2(void *inst, VARIANT *ret, VARIANT v1, VARIANT v2) V_VT(ret) = VT_UI4; V_I4(ret) = 4321; } +#endif static void *vtable[] = { NULL, NULL, NULL, inst_func }; static void *vtable2[] = { NULL, NULL, NULL, inst_func2 }; diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 7ad92837da..d652edc7ee 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -6882,23 +6882,8 @@ HRESULT WINAPI DispCallFunc( void *instance, ULONG_PTR offset, CALLCONV cc, VART } else func = (void *)offset; - /* Determine if we need to pass a pointer for the return value as arg 0. If so, do that */ - /* first as it will need to be in the 'x' registers: */ - switch (ret_type) - { - case VT_DECIMAL: - case VT_VARIANT: - regs.x[8] = (DWORD_PTR)result; /* x8 is a pointer to the result */ - break; - case VT_HRESULT: - WARN("invalid return type %u\n", ret_type); - return E_INVALIDARG; - default: - break; - } - - /* maximum size for an argument is sizeof(VARIANT). Also allow for return pointer and stack alignment. */ - args = heap_alloc( sizeof(VARIANT) * count + sizeof(DWORD_PTR) * 4 ); + /* maximum size for an argument is 16 */ + args = heap_alloc( 16 * count ); for (i = 0; i < count; i++) { @@ -6906,8 +6891,6 @@ HRESULT WINAPI DispCallFunc( void *instance, ULONG_PTR offset, CALLCONV cc, VART switch (types[i]) { - case VT_EMPTY: - break; case VT_R4: if (fpcount < 8) regs.fp[fpcount++].f = V_R4(arg); else *(float *)&args[argspos++] = V_R4(arg); @@ -6918,7 +6901,6 @@ HRESULT WINAPI DispCallFunc( void *instance, ULONG_PTR offset, CALLCONV cc, VART else *(double *)&args[argspos++] = V_R8(arg); break; case VT_DECIMAL: - case VT_VARIANT: if (rcount < 7) { memcpy( &regs.x[rcount], arg, sizeof(*arg) ); @@ -6930,6 +6912,10 @@ HRESULT WINAPI DispCallFunc( void *instance, ULONG_PTR offset, CALLCONV cc, VART argspos += 2; } break; + case VT_VARIANT: + if (rcount < 8) regs.x[rcount++] = (DWORD_PTR)arg; + else args[argspos++] = (DWORD_PTR)arg; + break; case VT_BOOL: /* VT_BOOL is 16-bit but BOOL is 32-bit, needs to be extended */ if (rcount < 8) regs.x[rcount++] = V_BOOL(arg); else args[argspos++] = V_BOOL(arg); @@ -6946,9 +6932,12 @@ HRESULT WINAPI DispCallFunc( void *instance, ULONG_PTR offset, CALLCONV cc, VART switch (ret_type) { - case VT_EMPTY: /* EMPTY = no return value */ - case VT_DECIMAL: /* DECIMAL and VARIANT already have a pointer argument passed (see above) */ + case VT_HRESULT: + heap_free( args ); + return E_INVALIDARG; + case VT_DECIMAL: case VT_VARIANT: + regs.x[8] = (DWORD_PTR)result; /* x8 is a pointer to the result */ call_method( func, argspos, args, (DWORD_PTR *)&regs ); break; case VT_R4:

1 0

Alexandre Julliard : atlthunk: Add support for ARM64.
by Alexandre Julliard Oct. 29, 2019

Oct. 29, 2019

Module: wine Branch: master Commit: cf1c9d88f441bdf520b0402a1c5f5440a2f77bfe URL: https://source.winehq.org/git/wine.git/?a=commit;h=cf1c9d88f441bdf520b0402a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 29 13:15:35 2019 +0100 atlthunk: Add support for ARM64. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/atlthunk/atlthunk.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/atlthunk/atlthunk.c b/dlls/atlthunk/atlthunk.c index cd37b75f04..04e592f113 100644 --- a/dlls/atlthunk/atlthunk.c +++ b/dlls/atlthunk/atlthunk.c @@ -22,7 +22,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(atlthunk); -#if defined(__i386__) || defined(__x86_64__) +#if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__) struct AtlThunkData_t { struct thunk_pool *pool; @@ -45,6 +45,11 @@ struct thunk_code DWORD mov_eax_esp; /* movl %eax, 4(%esp) */ WORD jmp; DWORD jmp_addr; /* jmp *jmp_addr */ +#elif defined(__aarch64__) + DWORD ldr_x0; /* ldr x0,data_addr */ + DWORD ldr_x16; /* ldr x16,proc_addr */ + DWORD br_x16; /* br x16 */ + DWORD pad; #endif }; #include "poppack.h" @@ -86,6 +91,10 @@ static struct thunk_pool *alloc_thunk_pool(void) thunk->mov_eax_esp = 0x04244489; /* movl %eax, 4(%esp) */ thunk->jmp = 0x25ff; /* jmp *jmp_addr */ thunk->jmp_addr = (DWORD)&thunks->data[i].proc; +#elif defined(__aarch64__) + thunk->ldr_x0 = 0x58000000 | (((DWORD *)&thunks->data[i].arg - &thunk->ldr_x0) << 5); + thunk->ldr_x16 = 0x58000010 | (((DWORD *)&thunks->data[i].proc - &thunk->ldr_x16) << 5); + thunk->br_x16 = 0xd61f0200; #endif } VirtualProtect(thunks->thunks, FIELD_OFFSET(struct thunk_pool, first_free), PAGE_EXECUTE_READ, &old_protect); @@ -161,7 +170,7 @@ void WINAPI AtlThunk_InitData(AtlThunkData_t *thunk, void *proc, SIZE_T arg) thunk->arg = arg; } -#else /* __i386__ || __x86_64__ */ +#else /* __i386__ || __x86_64__ || __aarch64__ */ AtlThunkData_t* WINAPI AtlThunk_AllocateData(void) { @@ -182,4 +191,4 @@ void WINAPI AtlThunk_InitData(AtlThunkData_t *thunk, void *proc, SIZE_T arg) { } -#endif /* __i386__ || __x86_64__ */ +#endif /* __i386__ || __x86_64__ || __aarch64__ */

1 0

Zebediah Figura : d3d8: Handle stateblocks in d3d8_device_SetTransform().
by Alexandre Julliard Oct. 29, 2019

Oct. 29, 2019

Module: wine Branch: master Commit: c8bbe970e30ca65ea6b5df67ec3450ab30d12ab1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c8bbe970e30ca65ea6b5df67… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Oct 28 18:35:54 2019 -0500 d3d8: Handle stateblocks in d3d8_device_SetTransform(). 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/d3d8/device.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 6b6f5edfbc..90bcfae498 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1610,7 +1610,9 @@ static HRESULT WINAPI d3d8_device_SetTransform(IDirect3DDevice8 *iface, /* Note: D3DMATRIX is compatible with struct wined3d_matrix. */ wined3d_mutex_lock(); - wined3d_device_set_transform(device->wined3d_device, state, (const struct wined3d_matrix *)matrix); + wined3d_stateblock_set_transform(device->update_state, state, (const struct wined3d_matrix *)matrix); + if (!device->recording) + wined3d_device_set_transform(device->wined3d_device, state, (const struct wined3d_matrix *)matrix); wined3d_mutex_unlock(); return D3D_OK;

1 0