May 2019 - Wine-commits - list.winehq.org

Sven Baars : comctl32: Always free the tooltip text before setting it ( Valgrind).
by Alexandre Julliard 20 May '19

20 May '19

Module: wine Branch: master Commit: d2b32bac5cf62d88b6297a054a4306a368ac94a2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d2b32bac5cf62d88b6297a05… Author: Sven Baars <sven.wine(a)gmail.com> Date: Sat May 18 18:49:51 2019 +0200 comctl32: Always free the tooltip text before setting it (Valgrind). Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tooltips.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/tooltips.c b/dlls/comctl32/tooltips.c index 1aa55d1..b1e8f51 100644 --- a/dlls/comctl32/tooltips.c +++ b/dlls/comctl32/tooltips.c @@ -1660,6 +1660,13 @@ TOOLTIPS_SetToolInfoT (TOOLTIPS_INFO *infoPtr, const TTTOOLINFOW *ti, BOOL isW) toolPtr->rect = ti->rect; toolPtr->hinst = ti->hinst; + if ( (toolPtr->lpszText) && + !IS_INTRESOURCE(toolPtr->lpszText) ) { + if( toolPtr->lpszText != LPSTR_TEXTCALLBACKW) + Free (toolPtr->lpszText); + toolPtr->lpszText = NULL; + } + if (IS_INTRESOURCE(ti->lpszText)) { TRACE("set string id %x\n", LOWORD(ti->lpszText)); toolPtr->lpszText = ti->lpszText; @@ -1668,12 +1675,6 @@ TOOLTIPS_SetToolInfoT (TOOLTIPS_INFO *infoPtr, const TTTOOLINFOW *ti, BOOL isW) if (ti->lpszText == LPSTR_TEXTCALLBACKW) toolPtr->lpszText = LPSTR_TEXTCALLBACKW; else { - if ( (toolPtr->lpszText) && - !IS_INTRESOURCE(toolPtr->lpszText) ) { - if( toolPtr->lpszText != LPSTR_TEXTCALLBACKW) - Free (toolPtr->lpszText); - toolPtr->lpszText = NULL; - } if (ti->lpszText) { if (isW) { INT len = lstrlenW (ti->lpszText);

1 0

Jacek Caban : jscript: Allow calling eval function from external code.
by Alexandre Julliard 20 May '19

20 May '19

Module: wine Branch: master Commit: aac2110e8ff93d74ac99ab3bb78a47e1ea491cfa URL: https://source.winehq.org/git/wine.git/?a=commit;h=aac2110e8ff93d74ac99ab3b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 20 21:05:25 2019 +0200 jscript: Allow calling eval function from external code. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/global.c | 13 ++--- dlls/jscript/tests/run.c | 146 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 150 insertions(+), 9 deletions(-) diff --git a/dlls/jscript/global.c b/dlls/jscript/global.c index 92b146c..cdabf6f 100644 --- a/dlls/jscript/global.c +++ b/dlls/jscript/global.c @@ -181,7 +181,7 @@ static HRESULT JSGlobal_escape(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, u HRESULT JSGlobal_eval(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { - call_frame_t *frame; + call_frame_t *frame = ctx->call_ctx; DWORD exec_flags = EXEC_EVAL; bytecode_t *code; const WCHAR *src; @@ -201,11 +201,6 @@ HRESULT JSGlobal_eval(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned a return S_OK; } - if(!(frame = ctx->call_ctx)) { - FIXME("No active exec_ctx\n"); - return E_UNEXPECTED; - } - src = jsstr_flatten(get_string(argv[0])); if(!src) return E_OUTOFMEMORY; @@ -217,12 +212,12 @@ HRESULT JSGlobal_eval(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned a return throw_syntax_error(ctx, hres, NULL); } - if(frame->flags & EXEC_GLOBAL) + if(!frame || (frame->flags & EXEC_GLOBAL)) exec_flags |= EXEC_GLOBAL; if(flags & DISPATCH_JSCRIPT_CALLEREXECSSOURCE) exec_flags |= EXEC_RETURN_TO_INTERP; - hres = exec_source(ctx, exec_flags, code, &code->global_code, frame->scope, - frame->this_obj, NULL, frame->variable_obj, 0, NULL, r); + hres = exec_source(ctx, exec_flags, code, &code->global_code, frame ? frame->scope : NULL, + frame ? frame->this_obj : NULL, NULL, frame ? frame->variable_obj : ctx->global, 0, NULL, r); release_bytecode(code); return hres; } diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index c8a143b..e48f748 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -91,6 +91,7 @@ DEFINE_EXPECT(global_notexists_d); DEFINE_EXPECT(global_propargput_d); DEFINE_EXPECT(global_propargput_i); DEFINE_EXPECT(global_testargtypes_i); +DEFINE_EXPECT(global_calleval_i); DEFINE_EXPECT(puredisp_prop_d); DEFINE_EXPECT(puredisp_noprop_d); DEFINE_EXPECT(puredisp_value); @@ -149,6 +150,7 @@ DEFINE_EXPECT(BindHandler); #define DISPID_GLOBAL_GETSCRIPTSTATE 0x101c #define DISPID_GLOBAL_BINDEVENTHANDLER 0x101d #define DISPID_GLOBAL_TESTENUMOBJ 0x101e +#define DISPID_GLOBAL_CALLEVAL 0x101f #define DISPID_GLOBAL_TESTPROPDELETE 0x2000 #define DISPID_GLOBAL_TESTNOPROPDELETE 0x2001 @@ -988,6 +990,11 @@ static HRESULT WINAPI Global_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD return S_OK; } + if(!strcmp_wa(bstrName, "callEval")) { + *pid = DISPID_GLOBAL_CALLEVAL; + return S_OK; + } + if(strict_dispid_check && strcmp_wa(bstrName, "t")) ok(0, "unexpected call %s\n", wine_dbgstr_w(bstrName)); return DISP_E_UNKNOWNNAME; @@ -1492,6 +1499,43 @@ static HRESULT WINAPI Global_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, return S_OK; } + + case DISPID_GLOBAL_CALLEVAL: { + IDispatchEx *eval_func; + DISPPARAMS params; + VARIANT arg, res; + HRESULT hres; + + CHECK_EXPECT(global_calleval_i); + + 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"); + + ok(V_VT(pdp->rgvarg) == VT_DISPATCH, "V_VT(arg) = %d\n", V_VT(pdp->rgvarg)); + hres = IDispatch_QueryInterface(V_DISPATCH(pdp->rgvarg), &IID_IDispatchEx, (void**)&eval_func); + ok(hres == S_OK, "Could not get IDispatchEx iface: %08x\n", hres); + + params.rgvarg = &arg; + params.rgdispidNamedArgs = NULL; + params.cArgs = 1; + params.cNamedArgs = 0; + V_VT(&arg) = VT_BSTR; + + V_BSTR(&arg) = a2bstr("var x = 5; v"); + V_VT(&res) = VT_ERROR; + hres = IDispatchEx_InvokeEx(eval_func, DISPID_VALUE, 0, DISPATCH_METHOD, &params, &res, NULL, NULL); + ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); + ok(V_VT(&res) == VT_I4, "eval returned type %u\n", V_VT(&res)); + ok(V_I4(&res) == 2, "eval returned %d\n", V_I4(&res)); + SysFreeString(V_BSTR(&arg)); + IDispatchEx_Release(eval_func); + return S_OK; + } } ok(0, "unexpected call %x\n", id); @@ -2492,6 +2536,107 @@ static void test_invokeex(void) IActiveScript_Release(script); } +static void test_eval(void) +{ + IActiveScriptParse *parser; + IDispatchEx *script_dispex; + IDispatch *script_disp; + IActiveScript *engine; + VARIANT arg, res; + DISPPARAMS params; + DISPID id, v_id; + BSTR str; + HRESULT hres; + + engine = create_script(); + + hres = IActiveScript_QueryInterface(engine, &IID_IActiveScriptParse, (void**)&parser); + ok(hres == S_OK, "Could not get IActiveScriptParse: %08x\n", hres); + + hres = IActiveScriptParse_InitNew(parser); + ok(hres == S_OK, "InitNew failed: %08x\n", hres); + + hres = IActiveScript_SetScriptSite(engine, &ActiveScriptSite); + ok(hres == S_OK, "SetScriptSite failed: %08x\n", hres); + + SET_EXPECT(GetItemInfo_testVal); + hres = IActiveScript_AddNamedItem(engine, test_valW, + SCRIPTITEM_ISVISIBLE|SCRIPTITEM_ISSOURCE|SCRIPTITEM_GLOBALMEMBERS); + ok(hres == S_OK, "AddNamedItem failed: %08x\n", hres); + CHECK_CALLED(GetItemInfo_testVal); + + hres = IActiveScript_SetScriptState(engine, SCRIPTSTATE_STARTED); + ok(hres == S_OK, "SetScriptState(SCRIPTSTATE_STARTED) failed: %08x\n", hres); + + hres = IActiveScript_GetScriptDispatch(engine, NULL, &script_disp); + ok(hres == S_OK, "GetScriptDispatch failed: %08x\n", hres); + ok(script_disp != NULL, "script_disp == NULL\n"); + + hres = IDispatch_QueryInterface(script_disp, &IID_IDispatchEx, (void**)&script_dispex); + ok(hres == S_OK, "Coult not get IDispatchEx iface: %08x\n", hres); + IDispatch_Release(script_disp); + + str = a2bstr("eval"); + hres = IDispatchEx_GetDispID(script_dispex, str, 0, &id); + ok(hres == S_OK, "Could not get eval dispid: %08x\n", hres); + SysFreeString(str); + + params.rgvarg = &arg; + params.rgdispidNamedArgs = NULL; + params.cArgs = 1; + params.cNamedArgs = 0; + V_VT(&arg) = VT_BSTR; + + V_BSTR(&arg) = a2bstr("var v = 1;"); + V_VT(&res) = VT_ERROR; + hres = IDispatchEx_InvokeEx(script_dispex, id, 0, DISPATCH_METHOD, &params, &res, NULL, NULL); + ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); + ok(V_VT(&res) == VT_EMPTY, "eval returned type %u\n", V_VT(&res)); + SysFreeString(V_BSTR(&arg)); + + V_BSTR(&arg) = a2bstr("v"); + V_VT(&res) = VT_ERROR; + hres = IDispatchEx_InvokeEx(script_dispex, id, 0, DISPATCH_METHOD, &params, &res, NULL, NULL); + ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); + ok(V_VT(&res) == VT_I4, "eval returned type %u\n", V_VT(&res)); + ok(V_I4(&res) == 1, "eval returned %d\n", V_I4(&res)); + SysFreeString(V_BSTR(&arg)); + + str = a2bstr("v"); + hres = IDispatchEx_GetDispID(script_dispex, str, 0, &v_id); + ok(hres == S_OK, "Could not get v dispid: %08x\n", hres); + SysFreeString(str); + + params.rgvarg = NULL; + params.cArgs = 0; + V_VT(&res) = VT_ERROR; + hres = IDispatchEx_InvokeEx(script_dispex, v_id, 0, DISPATCH_PROPERTYGET, &params, &res, NULL, NULL); + ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); + ok(V_VT(&res) == VT_I4, "eval returned type %u\n", V_VT(&res)); + ok(V_I4(&res) == 1, "eval returned %d\n", V_I4(&res)); + + SET_EXPECT(global_calleval_i); + str = a2bstr("(function(){" + " var v = 2;" + " callEval(eval);" + " ok(x === 5, 'x = ' + x);" + "})();"); + hres = IActiveScriptParse_ParseScriptText(parser, str, NULL, NULL, NULL, 0, 0, 0, NULL, NULL); + ok(hres == S_OK, "ParseScriptText failed: %08x\n", hres); + SysFreeString(str); + CHECK_CALLED(global_calleval_i); + + str = a2bstr("x"); + hres = IDispatchEx_GetDispID(script_dispex, str, 0, &id); + ok(hres == DISP_E_UNKNOWNNAME, "GetDispID(x) returned %08x\n", hres); + SysFreeString(str); + + IDispatchEx_Release(script_dispex); + IActiveScriptParse_Release(parser); + IActiveScript_Close(engine); + IActiveScript_Release(engine); +} + struct bom_test { WCHAR str[1024]; @@ -2877,6 +3022,7 @@ static BOOL run_tests(void) test_script_exprs(); test_invokeex(); + test_eval(); parse_script_with_error_a( "?",

1 0

Piotr Caban : kernel32: Add more CompareStringW tests.
by Alexandre Julliard 20 May '19

20 May '19

Module: wine Branch: master Commit: 344057ef3471007ebde368306e919ad67a9eed4d URL: https://source.winehq.org/git/wine.git/?a=commit;h=344057ef3471007ebde36830… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed May 15 21:58:48 2019 +0200 kernel32: Add more CompareStringW tests. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index cf781e5..a8d6e4c 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -2001,6 +2001,9 @@ static void test_CompareStringW(void) { static const WCHAR ABC_EE[] = {'A','B','C',0,0xEE}; static const WCHAR ABC_FF[] = {'A','B','C',0,0xFF}; + static const WCHAR A_ACUTE_BC[] = {0xc1,'B','C',0}; + static const WCHAR A_ACUTE_BC_DECOMP[] = {'A',0x301,'B','C',0}; + static const WCHAR A_NULL_BC[] = {'A',0,'B','C',0}; WCHAR *str1, *str2; SYSTEM_INFO si; DWORD old_prot; @@ -2038,6 +2041,35 @@ static void test_CompareStringW(void) ok(ret == CSTR_LESS_THAN, "expected CSTR_LESS_THAN, got %d\n", ret); ret = CompareStringW(CP_ACP, 0, ABC_FF, 5, ABC_EE, 5); ok(ret == CSTR_GREATER_THAN, "expected CSTR_GREATER_THAN, got %d\n", ret); + + ret = CompareStringW(CP_ACP, 0, ABC_EE, 4, A_ACUTE_BC, 4); + todo_wine ok(ret == CSTR_LESS_THAN, "expected CSTR_LESS_THAN, got %d\n", ret); + ret = CompareStringW(CP_ACP, 0, ABC_EE, 4, A_ACUTE_BC_DECOMP, 5); + todo_wine ok(ret == CSTR_LESS_THAN, "expected CSTR_LESS_THAN, got %d\n", ret); + ret = CompareStringW(CP_ACP, 0, A_ACUTE_BC, 4, A_ACUTE_BC_DECOMP, 5); + todo_wine ok(ret == CSTR_EQUAL, "expected CSTR_EQUAL, got %d\n", ret); + + ret = CompareStringW(CP_ACP, NORM_IGNORENONSPACE, ABC_EE, 3, A_ACUTE_BC, 4); + ok(ret == CSTR_EQUAL, "expected CSTR_EQUAL, got %d\n", ret); + ret = CompareStringW(CP_ACP, NORM_IGNORENONSPACE, ABC_EE, 4, A_ACUTE_BC_DECOMP, 5); + todo_wine ok(ret == CSTR_EQUAL, "expected CSTR_EQUAL, got %d\n", ret); + ret = CompareStringW(CP_ACP, NORM_IGNORENONSPACE, A_ACUTE_BC, 4, A_ACUTE_BC_DECOMP, 5); + todo_wine ok(ret == CSTR_EQUAL, "expected CSTR_EQUAL, got %d\n", ret); + + ret = CompareStringW(CP_ACP, 0, ABC_EE, 4, A_NULL_BC, 4); + todo_wine ok(ret == CSTR_EQUAL, "expected CSTR_LESS_THAN, got %d\n", ret); + ret = CompareStringW(CP_ACP, NORM_IGNORENONSPACE, ABC_EE, 4, A_NULL_BC, 4); + todo_wine ok(ret == CSTR_EQUAL, "expected CSTR_EQUAL, got %d\n", ret); + + ret = CompareStringW(CP_ACP, 0, A_NULL_BC, 4, A_ACUTE_BC, 4); + ok(ret == CSTR_LESS_THAN, "expected CSTR_LESS_THAN, got %d\n", ret); + ret = CompareStringW(CP_ACP, NORM_IGNORENONSPACE, A_NULL_BC, 4, A_ACUTE_BC, 4); + todo_wine ok(ret == CSTR_EQUAL, "expected CSTR_EQUAL, got %d\n", ret); + + ret = CompareStringW(CP_ACP, 0, A_NULL_BC, 4, A_ACUTE_BC_DECOMP, 5); + ok(ret == CSTR_LESS_THAN, "expected CSTR_LESS_THAN, got %d\n", ret); + ret = CompareStringW(CP_ACP, NORM_IGNORENONSPACE, A_NULL_BC, 4, A_ACUTE_BC_DECOMP, 5); + todo_wine ok(ret == CSTR_EQUAL, "expected CSTR_EQUAL, got %d\n", ret); } struct comparestringex_test {

1 0

Isira Seneviratne : po: Update Sinhala translation.
by Alexandre Julliard 20 May '19

20 May '19

Module: wine Branch: master Commit: e8714e2fadd726fe8e75a3c921425b8a4f08f8fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=e8714e2fadd726fe8e75a3c9… Author: Isira Seneviratne <isirasen96(a)gmail.com> Date: Tue Apr 23 09:27:40 2019 +0530 po: Update Sinhala translation. Signed-off-by: Isira Seneviratne <isirasen96(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/si.po | 309 ++++++++++++++++++++++++++++++--------------------------------- 1 file changed, 148 insertions(+), 161 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e8714e2fadd726fe8e75…

1 0

Jactry Zeng : msscript: Partially implement IScriptControl::Eval().
by Alexandre Julliard 20 May '19

20 May '19

Module: wine Branch: master Commit: 21ae9ba1ba8ddba3ba49e916ef2b7fbd5ae9713d URL: https://source.winehq.org/git/wine.git/?a=commit;h=21ae9ba1ba8ddba3ba49e916… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Fri May 10 15:21:30 2019 +0800 msscript: Partially implement IScriptControl::Eval(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=41657 Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msscript.ocx/msscript.c | 21 +++++- dlls/msscript.ocx/tests/msscript.c | 132 +++++++++++++++++++++++++++++++++++++ 2 files changed, 152 insertions(+), 1 deletion(-) diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index ae5edb7..9044c49 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -973,8 +973,27 @@ static HRESULT WINAPI ScriptControl_AddCode(IScriptControl *iface, BSTR code) static HRESULT WINAPI ScriptControl_Eval(IScriptControl *iface, BSTR expression, VARIANT *res) { ScriptControl *This = impl_from_IScriptControl(iface); + EXCEPINFO excepinfo; + HRESULT hr; + FIXME("(%p)->(%s %p)\n", This, debugstr_w(expression), res); - return E_NOTIMPL; + + if (!res) + return E_POINTER; + V_VT(res) = VT_EMPTY; + + if (!This->host || This->state != Initialized) + return E_FAIL; + + hr = IActiveScript_SetScriptState(This->host->script, SCRIPTSTATE_STARTED); + if (FAILED(hr)) + return hr; + + hr = IActiveScriptParse_ParseScriptText(This->host->parse, expression, NULL, NULL, NULL, + 0, 1, SCRIPTTEXT_ISEXPRESSION, res, &excepinfo); + /* FIXME: more error hanlding */ + + return hr; } static HRESULT WINAPI ScriptControl_ExecuteStatement(IScriptControl *iface, BSTR statement) diff --git a/dlls/msscript.ocx/tests/msscript.c b/dlls/msscript.ocx/tests/msscript.c index 47ae76d..2d500d8 100644 --- a/dlls/msscript.ocx/tests/msscript.c +++ b/dlls/msscript.ocx/tests/msscript.c @@ -1356,6 +1356,137 @@ static void test_State(void) IScriptControl_Release(sc); } +static BSTR a2bstr(const char *str) +{ + BSTR ret; + int len; + + len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); + ret = SysAllocStringLen(NULL, len - 1); + MultiByteToWideChar(CP_ACP, 0, str, -1, ret, len); + + return ret; +} + +#define CHECK_ERROR(sc,exp_num) _check_error(sc, exp_num, __LINE__) +static void _check_error(IScriptControl *sc, LONG exp_num, int line) +{ + IScriptError *script_err; + LONG error_num; + HRESULT hr; + + hr = IScriptControl_get_Error(sc, &script_err); + ok_(__FILE__,line)(hr == S_OK, "IScriptControl_get_Error failed: 0x%08x.\n", hr); + if (SUCCEEDED(hr)) + { + error_num = 0xdeadbeef; + hr = IScriptError_get_Number(script_err, &error_num); + ok_(__FILE__,line)(hr == S_OK, "IScriptError_get_Number failed: 0x%08x.", hr); + ok_(__FILE__,line)(error_num == exp_num, "got wrong error number: %d, expected %d.\n", + error_num, exp_num); + IScriptError_Release(script_err); + } +} + +static void test_IScriptControl_Eval(void) +{ + IScriptControl *sc; + HRESULT hr; + BSTR script_str, language, expected_string; + VARIANT var; + ScriptControlStates state; + + hr = CoCreateInstance(&CLSID_ScriptControl, NULL, CLSCTX_INPROC_SERVER | CLSCTX_INPROC_HANDLER, + &IID_IScriptControl, (void **)&sc); + ok(hr == S_OK, "Failed to create IScriptControl interface: 0x%08x.\n", hr); + + hr = IScriptControl_Eval(sc, NULL, NULL); + ok(hr == E_POINTER, "IScriptControl_Eval returned: 0x%08x.\n", hr); + + script_str = a2bstr("1 + 1"); + hr = IScriptControl_Eval(sc, script_str, NULL); + ok(hr == E_POINTER, "IScriptControl_Eval returned: 0x%08x.\n", hr); + SysFreeString(script_str); + + V_VT(&var) = VT_NULL; + V_I4(&var) = 0xdeadbeef; + hr = IScriptControl_Eval(sc, NULL, &var); + ok(hr == E_FAIL, "IScriptControl_Eval returned: 0x%08x.\n", hr); + ok((V_VT(&var) == VT_EMPTY) && (V_I4(&var) == 0xdeadbeef), "V_VT(var) = %d, V_I4(var) = %d.\n", + V_VT(&var), V_I4(&var)); + todo_wine CHECK_ERROR(sc, 0); + + script_str = a2bstr("1 + 1"); + V_VT(&var) = VT_NULL; + V_I4(&var) = 0xdeadbeef; + hr = IScriptControl_Eval(sc, script_str, &var); + ok(hr == E_FAIL, "IScriptControl_Eval returned: 0x%08x.\n", hr); + ok((V_VT(&var) == VT_EMPTY) && (V_I4(&var) == 0xdeadbeef), "V_VT(var) = %d, V_I4(var) = %d.\n", + V_VT(&var), V_I4(&var)); + SysFreeString(script_str); + + language = a2bstr("jscript"); + hr = IScriptControl_put_Language(sc, language); + ok(hr == S_OK, "IScriptControl_put_Language failed: 0x%08x.\n", hr); + hr = IScriptControl_get_State(sc, &state); + ok(hr == S_OK, "IScriptControl_get_State failed: 0x%08x.\n", hr); + ok(state == Initialized, "got wrong state: %d\n", state); + SysFreeString(language); + script_str = a2bstr("var1 = 1 + 1"); + V_VT(&var) = VT_NULL; + V_I4(&var) = 0xdeadbeef; + hr = IScriptControl_Eval(sc, script_str, &var); + ok(hr == S_OK, "IScriptControl_Eval failed: 0x%08x.\n", hr); + ok((V_VT(&var) == VT_I4) && (V_I4(&var) == 2), "V_VT(var) = %d, V_I4(var) = %d.\n", + V_VT(&var), V_I4(&var)); + hr = IScriptControl_get_State(sc, &state); + ok(hr == S_OK, "IScriptControl_get_State failed: 0x%08x.\n", hr); + ok(state == Initialized, "got wrong state: %d\n", state); + SysFreeString(script_str); + + script_str = a2bstr("var2 = 10 + var1"); + V_VT(&var) = VT_NULL; + V_I4(&var) = 0xdeadbeef; + hr = IScriptControl_Eval(sc, script_str, &var); + ok(hr == S_OK, "IScriptControl_Eval failed: 0x%08x.\n", hr); + ok((V_VT(&var) == VT_I4) && (V_I4(&var) == 12), "V_VT(var) = %d, V_I4(var) = %d.\n", + V_VT(&var), V_I4(&var)); + SysFreeString(script_str); + + script_str = a2bstr("invalid syntax"); + V_VT(&var) = VT_NULL; + V_I4(&var) = 0xdeadbeef; + hr = IScriptControl_Eval(sc, script_str, &var); + todo_wine ok(hr == 0x800a03ec, "IScriptControl_Eval failed: 0x%08x.\n", hr); + ok(V_VT(&var) == VT_EMPTY, "V_VT(var) = %d\n", V_VT(&var)); + ok(V_I4(&var) == 0xdeadbeef || broken(V_I4(&var) == 0) /* after Win8 */, + "V_I4(var) = %d.\n", V_I4(&var)); + SysFreeString(script_str); + todo_wine CHECK_ERROR(sc, 1004); + + script_str = a2bstr("var2 = var1 + var2"); + V_VT(&var) = VT_NULL; + V_I4(&var) = 0xdeadbeef; + hr = IScriptControl_Eval(sc, script_str, &var); + ok(hr == S_OK, "IScriptControl_Eval failed: 0x%08x.\n", hr); + ok((V_VT(&var) == VT_I4) && (V_I4(&var) == 14), "V_VT(var) = %d, V_I4(var) = %d.\n", + V_VT(&var), V_I4(&var)); + SysFreeString(script_str); + + script_str = a2bstr("\"Hello\""); + V_VT(&var) = VT_NULL; + V_I4(&var) = 0xdeadbeef; + hr = IScriptControl_Eval(sc, script_str, &var); + ok(hr == S_OK, "IScriptControl_Eval failed: 0x%08x.\n", hr); + expected_string = a2bstr("Hello"); + ok((V_VT(&var) == VT_BSTR) && (!lstrcmpW(V_BSTR(&var), expected_string)), + "V_VT(var) = %d, V_BSTR(var) = %s.\n", V_VT(&var), wine_dbgstr_w(V_BSTR(&var))); + SysFreeString(expected_string); + SysFreeString(script_str); + + IScriptControl_Release(sc); +} + START_TEST(msscript) { IUnknown *unk; @@ -1385,6 +1516,7 @@ START_TEST(msscript) test_AllowUI(); test_UseSafeSubset(); test_State(); + test_IScriptControl_Eval(); CoUninitialize(); }

1 0

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to context_set_pixel_format().
by Alexandre Julliard 20 May '19

20 May '19

Module: wine Branch: master Commit: 6cd822c38abbe45c1b0e744e0845919671b3e90f URL: https://source.winehq.org/git/wine.git/?a=commit;h=6cd822c38abbe45c1b0e744e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun May 19 18:48:46 2019 +0430 wined3d: Pass a wined3d_context_gl structure to context_set_pixel_format(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 0908ed1..aa4d260 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1152,19 +1152,18 @@ static BOOL wined3d_context_gl_restore_pixel_format(struct wined3d_context_gl *c return ret; } -static BOOL context_set_pixel_format(struct wined3d_context *context) +static BOOL wined3d_context_gl_set_pixel_format(struct wined3d_context_gl *context_gl) { - struct wined3d_context_gl *context_gl = wined3d_context_gl(context); - const struct wined3d_gl_info *gl_info = context->gl_info; - BOOL private = context->hdc_is_private; - int format = context->pixel_format; - HDC dc = context->hdc; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; + BOOL private = context_gl->c.hdc_is_private; + int format = context_gl->c.pixel_format; + HDC dc = context_gl->c.hdc; int current; - if (private && context->hdc_has_format) + if (private && context_gl->c.hdc_has_format) return TRUE; - if (!private && WindowFromDC(dc) != context->win_handle) + if (!private && WindowFromDC(dc) != context_gl->c.win_handle) return FALSE; current = gl_info->gl_ops.wgl.p_wglGetPixelFormat(dc); @@ -1180,8 +1179,8 @@ static BOOL context_set_pixel_format(struct wined3d_context *context) return FALSE; } - context->restore_pf = 0; - context->restore_pf_win = private ? NULL : WindowFromDC(dc); + context_gl->c.restore_pf = 0; + context_gl->c.restore_pf_win = private ? NULL : WindowFromDC(dc); goto success; } @@ -1201,12 +1200,12 @@ static BOOL context_set_pixel_format(struct wined3d_context *context) } win = private ? NULL : WindowFromDC(dc); - if (win != context->restore_pf_win) + if (win != context_gl->c.restore_pf_win) { wined3d_context_gl_restore_pixel_format(context_gl); - context->restore_pf = private ? 0 : current; - context->restore_pf_win = win; + context_gl->c.restore_pf = private ? 0 : current; + context_gl->c.restore_pf_win = win; } goto success; @@ -1222,16 +1221,17 @@ static BOOL context_set_pixel_format(struct wined3d_context *context) success: if (private) - context->hdc_has_format = TRUE; + context_gl->c.hdc_has_format = TRUE; return TRUE; } static BOOL context_set_gl_context(struct wined3d_context *ctx) { + struct wined3d_context_gl *context_gl = wined3d_context_gl(ctx); struct wined3d_swapchain *swapchain = ctx->swapchain; BOOL backup = FALSE; - if (!context_set_pixel_format(ctx)) + if (!wined3d_context_gl_set_pixel_format(context_gl)) { WARN("Failed to set pixel format %d on device context %p.\n", ctx->pixel_format, ctx->hdc); @@ -1265,7 +1265,7 @@ static BOOL context_set_gl_context(struct wined3d_context *ctx) ctx->hdc_is_private = TRUE; ctx->hdc_has_format = FALSE; - if (!context_set_pixel_format(ctx)) + if (!wined3d_context_gl_set_pixel_format(context_gl)) { ERR("Failed to set pixel format %d on device context %p.\n", ctx->pixel_format, ctx->hdc); @@ -2113,7 +2113,7 @@ HRESULT wined3d_context_gl_init(struct wined3d_context_gl *context_gl, struct wi context_enter(context); - if (!context_set_pixel_format(context)) + if (!wined3d_context_gl_set_pixel_format(context_gl)) { ERR("Failed to set pixel format %d on device context %p.\n", context->pixel_format, context->hdc); context_release(context);

1 0

Henri Verbeet : wined3d: Use wined3d_texture_get_level_box() in texture2d_load_texture().
by Alexandre Julliard 20 May '19

20 May '19

Module: wine Branch: master Commit: 916bd0e4c290b0ea416df43b69e3fdf9e89efa6a URL: https://source.winehq.org/git/wine.git/?a=commit;h=916bd0e4c290b0ea416df43b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun May 19 18:48:47 2019 +0430 wined3d: Use wined3d_texture_get_level_box() in texture2d_load_texture(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index a95b18e..40e8bc1 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1548,9 +1548,7 @@ BOOL texture2d_load_texture(struct wined3d_texture *texture, unsigned int sub_re } level = sub_resource_idx % texture->level_count; - width = wined3d_texture_get_level_width(texture, level); - height = wined3d_texture_get_level_height(texture, level); - wined3d_box_set(&src_box, 0, 0, width, height, 0, 1); + wined3d_texture_get_level_box(texture, level, &src_box); if (!depth && sub_resource->locations & (WINED3D_LOCATION_TEXTURE_SRGB | WINED3D_LOCATION_TEXTURE_RGB) && (texture->resource.format_flags & WINED3DFMT_FLAG_FBO_ATTACHABLE_SRGB) @@ -1560,7 +1558,7 @@ BOOL texture2d_load_texture(struct wined3d_texture *texture, unsigned int sub_re { RECT src_rect; - SetRect(&src_rect, 0, 0, width, height); + SetRect(&src_rect, src_box.left, src_box.top, src_box.right, src_box.bottom); if (srgb) texture2d_blt_fbo(device, context, WINED3D_TEXF_POINT, texture, sub_resource_idx, WINED3D_LOCATION_TEXTURE_RGB, &src_rect, @@ -1581,7 +1579,7 @@ BOOL texture2d_load_texture(struct wined3d_texture *texture, unsigned int sub_re DWORD dst_location = srgb ? WINED3D_LOCATION_TEXTURE_SRGB : WINED3D_LOCATION_TEXTURE_RGB; RECT src_rect; - SetRect(&src_rect, 0, 0, width, height); + SetRect(&src_rect, src_box.left, src_box.top, src_box.right, src_box.bottom); if (fbo_blitter_supported(WINED3D_BLIT_OP_COLOR_BLIT, gl_info, &texture->resource, src_location, &texture->resource, dst_location)) texture2d_blt_fbo(device, context, WINED3D_TEXF_POINT, texture, sub_resource_idx, @@ -1640,6 +1638,8 @@ BOOL texture2d_load_texture(struct wined3d_texture *texture, unsigned int sub_re wined3d_texture_get_memory(texture, sub_resource_idx, &data, sub_resource->locations); if (conversion) { + width = src_box.right - src_box.left; + height = src_box.bottom - src_box.top; wined3d_format_calculate_pitch(format, device->surface_alignment, width, height, &dst_row_pitch, &dst_slice_pitch);

1 0

Dmitry Timoshkov : urlmon: Add CoInternetGetBrowserProfile stub.
by Alexandre Julliard 20 May '19

20 May '19

Module: wine Branch: master Commit: 9f89464e0e4058dd5e2d036c93fadb992fadb526 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9f89464e0e4058dd5e2d036c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu May 16 13:54:29 2019 +0800 urlmon: Add CoInternetGetBrowserProfile stub. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/urlmon.spec | 1 + dlls/urlmon/urlmon_main.c | 10 ++++++++++ 2 files changed, 11 insertions(+) diff --git a/dlls/urlmon/urlmon.spec b/dlls/urlmon/urlmon.spec index 0f9f075..d6a6b43 100644 --- a/dlls/urlmon/urlmon.spec +++ b/dlls/urlmon/urlmon.spec @@ -111,4 +111,5 @@ 423 stdcall @(long long long long) LogSqmUXCommandOffsetInternal 444 stdcall @(long long long) MapUriToBrowserEmulationState 445 stdcall @(long long) MapBrowserEmulationModeToUserAgent +446 stdcall @(long) CoInternetGetBrowserProfile 455 stdcall @() FlushUrlmonZonesCache diff --git a/dlls/urlmon/urlmon_main.c b/dlls/urlmon/urlmon_main.c index 5dc0d24..aea1a5c 100644 --- a/dlls/urlmon/urlmon_main.c +++ b/dlls/urlmon/urlmon_main.c @@ -811,6 +811,16 @@ int WINAPI MapBrowserEmulationModeToUserAgent(DWORD unk1, DWORD unk2) } /*********************************************************************** + * CoInternetGetBrowserProfile (URLMON.446) + * Undocumented, added in IE8 + */ +HRESULT WINAPI CoInternetGetBrowserProfile(DWORD unk) +{ + FIXME("%x: stub\n", unk); + return E_NOTIMPL; +} + +/*********************************************************************** * FlushUrlmonZonesCache (URLMON.455) * Undocumented, added in IE8 */

1 0

Nikolay Sivov : mfplat: Return properties for system time source.
by Alexandre Julliard 20 May '19

20 May '19

Module: wine Branch: master Commit: ac2038ef308557927500dfeae12a71c24ebbd916 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ac2038ef308557927500dfea… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 20 15:25:57 2019 +0300 mfplat: Return properties for system time source. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 12 ++++++++++-- dlls/mfplat/tests/mfplat.c | 17 +++++++++++++++++ include/mfidl.idl | 6 ++++++ 3 files changed, 33 insertions(+), 2 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index e80408d..77edabe 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -6633,9 +6633,17 @@ static HRESULT WINAPI system_time_source_GetState(IMFPresentationTimeSource *ifa static HRESULT WINAPI system_time_source_GetProperties(IMFPresentationTimeSource *iface, MFCLOCK_PROPERTIES *props) { - FIXME("%p, %p.\n", iface, props); + TRACE("%p, %p.\n", iface, props); - return E_NOTIMPL; + if (!props) + return E_POINTER; + + memset(props, 0, sizeof(*props)); + props->qwClockFrequency = MFCLOCK_FREQUENCY_HNS; + props->dwClockTolerance = MFCLOCK_TOLERANCE_UNKNOWN; + props->dwClockJitter = 1; + + return S_OK; } static HRESULT WINAPI system_time_source_GetUnderlyingClock(IMFPresentationTimeSource *iface, IMFClock **clock) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 7fa3ddd..4adfb1b8 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -2542,6 +2542,7 @@ static void test_system_time_source(void) }; IMFPresentationTimeSource *time_source; IMFClockStateSink *statesink; + MFCLOCK_PROPERTIES props; MFCLOCK_STATE state; unsigned int i; DWORD value; @@ -2595,6 +2596,22 @@ static void test_system_time_source(void) IMFClockStateSink_Release(statesink); + /* Properties. */ + hr = IMFPresentationTimeSource_GetProperties(time_source, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + hr = IMFPresentationTimeSource_GetProperties(time_source, &props); + ok(hr == S_OK, "Failed to get clock properties, hr %#x.\n", hr); + + ok(props.qwCorrelationRate == 0, "Unexpected correlation rate %s.\n", + wine_dbgstr_longlong(props.qwCorrelationRate)); + ok(IsEqualGUID(&props.guidClockId, &GUID_NULL), "Unexpected clock id %s.\n", wine_dbgstr_guid(&props.guidClockId)); + ok(props.dwClockFlags == 0, "Unexpected flags %#x.\n", props.dwClockFlags); + ok(props.qwClockFrequency == MFCLOCK_FREQUENCY_HNS, "Unexpected frequency %s.\n", + wine_dbgstr_longlong(props.qwClockFrequency)); + ok(props.dwClockTolerance == MFCLOCK_TOLERANCE_UNKNOWN, "Unexpected tolerance %u.\n", props.dwClockTolerance); + ok(props.dwClockJitter == 1, "Unexpected jitter %u.\n", props.dwClockJitter); + IMFPresentationTimeSource_Release(time_source); } diff --git a/include/mfidl.idl b/include/mfidl.idl index c024e67..8855c9a 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -47,6 +47,12 @@ typedef enum MF_OBJECT_TYPE MF_OBJECT_INVALID } MF_OBJECT_TYPE; +cpp_quote("#define MFCLOCK_FREQUENCY_HNS 10000000") +cpp_quote("#define MFCLOCK_TOLERANCE_UNKNOWN 50000") +cpp_quote("#define MFCLOCK_JITTER_ISR 1000") +cpp_quote("#define MFCLOCK_JITTER_DPC 4000") +cpp_quote("#define MFCLOCK_JITTER_PASSIVE 10000") + typedef struct _MFCLOCK_PROPERTIES { unsigned __int64 qwCorrelationRate;

1 0

Nikolay Sivov : mfplat: Create system clock instance per system time source.
by Alexandre Julliard 20 May '19

20 May '19

Module: wine Branch: master Commit: 5904eb841997a5568f42f3b3a8340f6158e90f3e URL: https://source.winehq.org/git/wine.git/?a=commit;h=5904eb841997a5568f42f3b3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 20 15:25:58 2019 +0300 mfplat: Create system clock instance per system time source. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 150 ++++++++++++++++++++++++++++++++++++++++++++- dlls/mfplat/tests/mfplat.c | 65 +++++++++++++++++++- 2 files changed, 212 insertions(+), 3 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5904eb841997a5568f42…

1 0