wine-commits May 2019

wine-commits@winehq.org

2 participants
1019 discussions

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

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

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

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

Tim Schumacher : joy.cpl: Fix high CPU load in FF test window.
by Alexandre Julliard 20 May '19

20 May '19

Module: wine Branch: master Commit: f5bf3630db8bf275bdf136ac2ea3c85cb4612992 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f5bf3630db8bf275bdf136ac… Author: Tim Schumacher <timschumi(a)gmx.de> Date: Sun May 19 00:43:17 2019 +0200 joy.cpl: Fix high CPU load in FF test window. If no effects are in the effects list, the loop in ff_input_thread is immediately restarted, skipping the poll interval. This causes an incredibly high refresh rate, which maxes out at least one CPU core. Signed-off-by: Tim Schumacher <timschumi(a)gmx.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/joy.cpl/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/joy.cpl/main.c b/dlls/joy.cpl/main.c index 3c75a78..06084f3 100644 --- a/dlls/joy.cpl/main.c +++ b/dlls/joy.cpl/main.c @@ -678,6 +678,8 @@ static DWORD WINAPI ff_input_thread(void *param) DWORD flags = DIEP_AXES | DIEP_DIRECTION | DIEP_NORESTART; RECT r; + Sleep(TEST_POLL_TIME); + /* Skip this if we have no effects */ if (joy->num_effects == 0 || chosen_effect < 0) continue; @@ -702,8 +704,6 @@ static DWORD WINAPI ff_input_thread(void *param) IDirectInputEffect_Start(joy->effects[chosen_effect].effect, 1, 0); break; } - - Sleep(TEST_POLL_TIME); } return 0;

1 0

Tim Schumacher : joy.cpl: Check if effect is allocated before releasing it.
by Alexandre Julliard 20 May '19

20 May '19

Module: wine Branch: master Commit: 8bc52f5250f842f4d0527e6cde5dde2e43a9a0cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=8bc52f5250f842f4d0527e6c… Author: Tim Schumacher <timschumi(a)gmx.de> Date: Sat May 18 21:02:58 2019 +0200 joy.cpl: Check if effect is allocated before releasing it. Signed-off-by: Tim Schumacher <timschumi(a)gmx.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/joy.cpl/main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/joy.cpl/main.c b/dlls/joy.cpl/main.c index 32dfad0..3c75a78 100644 --- a/dlls/joy.cpl/main.c +++ b/dlls/joy.cpl/main.c @@ -137,7 +137,8 @@ static void destroy_joysticks(struct JoystickData *data) if (data->joysticks[i].forcefeedback && data->joysticks[i].num_effects > 0) { for (j = 0; j < data->joysticks[i].num_effects; j++) - IDirectInputEffect_Release(data->joysticks[i].effects[j].effect); + if (data->joysticks[i].effects[j].effect) + IDirectInputEffect_Release(data->joysticks[i].effects[j].effect); HeapFree(GetProcessHeap(), 0, data->joysticks[i].effects); }

1 0

Zebediah Figura : msxml3: Load the version 1 typelib before trying to access it.
by Alexandre Julliard 20 May '19

20 May '19

Module: wine Branch: master Commit: 7edbbe1ed3fe5f3e3ac94d25f7b07fbd076dcebd URL: https://source.winehq.org/git/wine.git/?a=commit;h=7edbbe1ed3fe5f3e3ac94d25… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri May 17 00:37:27 2019 -0500 msxml3: Load the version 1 typelib before trying to access it. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47214 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/dispex.c | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/dlls/msxml3/dispex.c b/dlls/msxml3/dispex.c index bd29a21..b1fb728 100644 --- a/dlls/msxml3/dispex.c +++ b/dlls/msxml3/dispex.c @@ -150,31 +150,43 @@ static inline unsigned get_libid_from_tid(tid_t tid) return tid_ids[tid].lib; } -HRESULT get_typeinfo(enum tid_t tid, ITypeInfo **typeinfo) +static HRESULT get_typelib(unsigned lib, ITypeLib **tl) { - unsigned lib = get_libid_from_tid(tid); HRESULT hres; if(!typelib[lib]) { - ITypeLib *tl; - - hres = LoadRegTypeLib(lib_ids[lib].iid, lib_ids[lib].major, 0, LOCALE_SYSTEM_DEFAULT, &tl); + hres = LoadRegTypeLib(lib_ids[lib].iid, lib_ids[lib].major, 0, LOCALE_SYSTEM_DEFAULT, tl); if(FAILED(hres)) { ERR("LoadRegTypeLib failed: %08x\n", hres); return hres; } - if(InterlockedCompareExchangePointer((void**)&typelib[lib], tl, NULL)) - ITypeLib_Release(tl); + if (InterlockedCompareExchangePointer((void**)&typelib[lib], *tl, NULL)) + ITypeLib_Release(*tl); } + *tl = typelib[lib]; + return S_OK; +} + +HRESULT get_typeinfo(enum tid_t tid, ITypeInfo **typeinfo) +{ + unsigned lib = get_libid_from_tid(tid); + ITypeLib *typelib; + HRESULT hres; + + if (FAILED(hres = get_typelib(lib, &typelib))) + return hres; + if(!typeinfos[tid]) { ITypeInfo *ti; - hres = ITypeLib_GetTypeInfoOfGuid(typelib[lib], get_riid_from_tid(tid), &ti); + hres = ITypeLib_GetTypeInfoOfGuid(typelib, get_riid_from_tid(tid), &ti); if(FAILED(hres)) { /* try harder with typelib from msxml.dll */ - hres = ITypeLib_GetTypeInfoOfGuid(typelib[LibXml], get_riid_from_tid(tid), &ti); + if (FAILED(hres = get_typelib(LibXml, &typelib))) + return hres; + hres = ITypeLib_GetTypeInfoOfGuid(typelib, get_riid_from_tid(tid), &ti); if(FAILED(hres)) { ERR("GetTypeInfoOfGuid failed: %08x\n", hres); return hres;

1 0

Nikolay Sivov : mf: Add events support for grabber sink.
by Alexandre Julliard 20 May '19

20 May '19

Module: wine Branch: master Commit: c742a4e18dc7b8d82aa9dc3ba1880dc5d53ab209 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c742a4e18dc7b8d82aa9dc3b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 20 15:22:32 2019 +0300 mf: Add events support for grabber sink. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/samplegrabber.c | 107 +++++++++++++++++++++++++++++++++++++++++++++--- dlls/mf/tests/mf.c | 4 +- 2 files changed, 102 insertions(+), 9 deletions(-) diff --git a/dlls/mf/samplegrabber.c b/dlls/mf/samplegrabber.c index a94b825..b62502f 100644 --- a/dlls/mf/samplegrabber.c +++ b/dlls/mf/samplegrabber.c @@ -41,11 +41,13 @@ struct sample_grabber { IMFMediaSink IMFMediaSink_iface; IMFClockStateSink IMFClockStateSink_iface; + IMFMediaEventGenerator IMFMediaEventGenerator_iface; LONG refcount; IMFSampleGrabberSinkCallback *callback; IMFMediaType *media_type; BOOL is_shut_down; IMFStreamSink *stream; + IMFMediaEventQueue *event_queue; CRITICAL_SECTION cs; }; @@ -73,6 +75,11 @@ static struct sample_grabber *impl_from_IMFClockStateSink(IMFClockStateSink *ifa return CONTAINING_RECORD(iface, struct sample_grabber, IMFClockStateSink_iface); } +static struct sample_grabber *impl_from_IMFMediaEventGenerator(IMFMediaEventGenerator *iface) +{ + return CONTAINING_RECORD(iface, struct sample_grabber, IMFMediaEventGenerator_iface); +} + static struct sample_grabber_stream *impl_from_IMFStreamSink(IMFStreamSink *iface) { return CONTAINING_RECORD(iface, struct sample_grabber_stream, IMFStreamSink_iface); @@ -130,8 +137,11 @@ static ULONG WINAPI sample_grabber_stream_Release(IMFStreamSink *iface) if (!refcount) { IMFMediaSink_Release(stream->sink); - IMFMediaEventQueue_Shutdown(stream->event_queue); - IMFMediaEventQueue_Release(stream->event_queue); + if (stream->event_queue) + { + IMFMediaEventQueue_Shutdown(stream->event_queue); + IMFMediaEventQueue_Release(stream->event_queue); + } heap_free(stream); } @@ -342,6 +352,10 @@ static HRESULT WINAPI sample_grabber_sink_QueryInterface(IMFMediaSink *iface, RE { *obj = &grabber->IMFClockStateSink_iface; } + else if (IsEqualIID(riid, &IID_IMFMediaEventGenerator)) + { + *obj = &grabber->IMFMediaEventGenerator_iface; + } else { WARN("Unsupported %s.\n", debugstr_guid(riid)); @@ -375,6 +389,11 @@ static ULONG WINAPI sample_grabber_sink_Release(IMFMediaSink *iface) { IMFSampleGrabberSinkCallback_Release(grabber->callback); IMFMediaType_Release(grabber->media_type); + if (grabber->event_queue) + { + IMFMediaEventQueue_Shutdown(grabber->event_queue); + IMFMediaEventQueue_Release(grabber->event_queue); + } DeleteCriticalSection(&grabber->cs); heap_free(grabber); } @@ -583,6 +602,74 @@ static HRESULT WINAPI sample_grabber_clock_sink_OnClockSetRate(IMFClockStateSink return E_NOTIMPL; } +static HRESULT WINAPI sample_grabber_events_QueryInterface(IMFMediaEventGenerator *iface, REFIID riid, void **obj) +{ + struct sample_grabber *grabber = impl_from_IMFMediaEventGenerator(iface); + return IMFMediaSink_QueryInterface(&grabber->IMFMediaSink_iface, riid, obj); +} + +static ULONG WINAPI sample_grabber_events_AddRef(IMFMediaEventGenerator *iface) +{ + struct sample_grabber *grabber = impl_from_IMFMediaEventGenerator(iface); + return IMFMediaSink_AddRef(&grabber->IMFMediaSink_iface); +} + +static ULONG WINAPI sample_grabber_events_Release(IMFMediaEventGenerator *iface) +{ + struct sample_grabber *grabber = impl_from_IMFMediaEventGenerator(iface); + return IMFMediaSink_Release(&grabber->IMFMediaSink_iface); +} + +static HRESULT WINAPI sample_grabber_events_GetEvent(IMFMediaEventGenerator *iface, DWORD flags, IMFMediaEvent **event) +{ + struct sample_grabber *grabber = impl_from_IMFMediaEventGenerator(iface); + + TRACE("%p, %#x, %p.\n", iface, flags, event); + + return IMFMediaEventQueue_GetEvent(grabber->event_queue, flags, event); +} + +static HRESULT WINAPI sample_grabber_events_BeginGetEvent(IMFMediaEventGenerator *iface, IMFAsyncCallback *callback, + IUnknown *state) +{ + struct sample_grabber *grabber = impl_from_IMFMediaEventGenerator(iface); + + TRACE("%p, %p, %p.\n", iface, callback, state); + + return IMFMediaEventQueue_BeginGetEvent(grabber->event_queue, callback, state); +} + +static HRESULT WINAPI sample_grabber_events_EndGetEvent(IMFMediaEventGenerator *iface, IMFAsyncResult *result, + IMFMediaEvent **event) +{ + struct sample_grabber *grabber = impl_from_IMFMediaEventGenerator(iface); + + TRACE("%p, %p, %p.\n", iface, result, event); + + return IMFMediaEventQueue_EndGetEvent(grabber->event_queue, result, event); +} + +static HRESULT WINAPI sample_grabber_events_QueueEvent(IMFMediaEventGenerator *iface, MediaEventType event_type, + REFGUID ext_type, HRESULT hr, const PROPVARIANT *value) +{ + struct sample_grabber *grabber = impl_from_IMFMediaEventGenerator(iface); + + TRACE("%p, %u, %s, %#x, %p.\n", iface, event_type, debugstr_guid(ext_type), hr, value); + + return IMFMediaEventQueue_QueueEventParamVar(grabber->event_queue, event_type, ext_type, hr, value); +} + +static const IMFMediaEventGeneratorVtbl sample_grabber_sink_events_vtbl = +{ + sample_grabber_events_QueryInterface, + sample_grabber_events_AddRef, + sample_grabber_events_Release, + sample_grabber_events_GetEvent, + sample_grabber_events_BeginGetEvent, + sample_grabber_events_EndGetEvent, + sample_grabber_events_QueueEvent, +}; + static const IMFClockStateSinkVtbl sample_grabber_clock_sink_vtbl = { sample_grabber_clock_sink_QueryInterface, @@ -637,23 +724,31 @@ static HRESULT sample_grabber_create_object(IMFAttributes *attributes, void *use object->IMFMediaSink_iface.lpVtbl = &sample_grabber_sink_vtbl; object->IMFClockStateSink_iface.lpVtbl = &sample_grabber_clock_sink_vtbl; + object->IMFMediaEventGenerator_iface.lpVtbl = &sample_grabber_sink_events_vtbl; object->refcount = 1; object->callback = context->callback; IMFSampleGrabberSinkCallback_AddRef(object->callback); object->media_type = context->media_type; IMFMediaType_AddRef(object->media_type); InitializeCriticalSection(&object->cs); + if (FAILED(hr = sample_grabber_create_stream(&object->IMFMediaSink_iface, &object->stream))) - { - IMFMediaSink_Release(&object->IMFMediaSink_iface); - return hr; - } + goto failed; + + if (FAILED(hr = MFCreateEventQueue(&object->event_queue))) + goto failed; *obj = (IUnknown *)&object->IMFMediaSink_iface; TRACE("Created %p.\n", *obj); return S_OK; + +failed: + + IMFMediaSink_Release(&object->IMFMediaSink_iface); + + return hr; } static const struct activate_funcs sample_grabber_activate_funcs = diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 43d2690..317d611 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -1713,10 +1713,8 @@ static void test_sample_grabber(void) IMFClockStateSink_Release(clocksink); hr = IMFMediaSink_QueryInterface(sink, &IID_IMFMediaEventGenerator, (void **)&eg); -todo_wine ok(hr == S_OK, "Failed to get interface, hr %#x.\n", hr); - if (SUCCEEDED(hr)) - IMFMediaEventGenerator_Release(eg); + IMFMediaEventGenerator_Release(eg); hr = IMFMediaSink_QueryInterface(sink, &IID_IMFPresentationTimeSource, (void **)&unk); ok(hr == E_NOINTERFACE, "Unexpected hr %#x.\n", hr);

1 0

Nikolay Sivov : mf: Add events support for grabber stream.
by Alexandre Julliard 20 May '19

20 May '19

Module: wine Branch: master Commit: 2045afe45087f2fe2896d7c37c4ed2d7143a6df7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2045afe45087f2fe2896d7c3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 20 15:22:31 2019 +0300 mf: Add events support for grabber stream. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/samplegrabber.c | 37 +++++++++++++++++++++++++++++-------- 1 file changed, 29 insertions(+), 8 deletions(-) diff --git a/dlls/mf/samplegrabber.c b/dlls/mf/samplegrabber.c index f0b2324..a94b825 100644 --- a/dlls/mf/samplegrabber.c +++ b/dlls/mf/samplegrabber.c @@ -18,6 +18,7 @@ #define COBJMACROS +#include "mfapi.h" #include "mfidl.h" #include "mferror.h" #include "mf_private.h" @@ -33,6 +34,7 @@ struct sample_grabber_stream IMFMediaTypeHandler IMFMediaTypeHandler_iface; LONG refcount; IMFMediaSink *sink; + IMFMediaEventQueue *event_queue; }; struct sample_grabber @@ -128,6 +130,8 @@ static ULONG WINAPI sample_grabber_stream_Release(IMFStreamSink *iface) if (!refcount) { IMFMediaSink_Release(stream->sink); + IMFMediaEventQueue_Shutdown(stream->event_queue); + IMFMediaEventQueue_Release(stream->event_queue); heap_free(stream); } @@ -136,33 +140,41 @@ static ULONG WINAPI sample_grabber_stream_Release(IMFStreamSink *iface) static HRESULT WINAPI sample_grabber_stream_GetEvent(IMFStreamSink *iface, DWORD flags, IMFMediaEvent **event) { - FIXME("%p, %#x, %p.\n", iface, flags, event); + struct sample_grabber_stream *stream = impl_from_IMFStreamSink(iface); - return E_NOTIMPL; + TRACE("%p, %#x, %p.\n", iface, flags, event); + + return IMFMediaEventQueue_GetEvent(stream->event_queue, flags, event); } static HRESULT WINAPI sample_grabber_stream_BeginGetEvent(IMFStreamSink *iface, IMFAsyncCallback *callback, IUnknown *state) { - FIXME("%p, %p, %p.\n", iface, callback, state); + struct sample_grabber_stream *stream = impl_from_IMFStreamSink(iface); - return E_NOTIMPL; + TRACE("%p, %p, %p.\n", iface, callback, state); + + return IMFMediaEventQueue_BeginGetEvent(stream->event_queue, callback, state); } static HRESULT WINAPI sample_grabber_stream_EndGetEvent(IMFStreamSink *iface, IMFAsyncResult *result, IMFMediaEvent **event) { - FIXME("%p, %p, %p.\n", iface, result, event); + struct sample_grabber_stream *stream = impl_from_IMFStreamSink(iface); - return E_NOTIMPL; + TRACE("%p, %p, %p.\n", iface, result, event); + + return IMFMediaEventQueue_EndGetEvent(stream->event_queue, result, event); } static HRESULT WINAPI sample_grabber_stream_QueueEvent(IMFStreamSink *iface, MediaEventType event_type, REFGUID ext_type, HRESULT hr, const PROPVARIANT *value) { - FIXME("%p, %u, %s, %#x, %p.\n", iface, event_type, debugstr_guid(ext_type), hr, value); + struct sample_grabber_stream *stream = impl_from_IMFStreamSink(iface); - return E_NOTIMPL; + TRACE("%p, %u, %s, %#x, %p.\n", iface, event_type, debugstr_guid(ext_type), hr, value); + + return IMFMediaEventQueue_QueueEventParamVar(stream->event_queue, event_type, ext_type, hr, value); } static HRESULT WINAPI sample_grabber_stream_GetMediaSink(IMFStreamSink *iface, IMFMediaSink **sink) @@ -586,6 +598,7 @@ static const IMFClockStateSinkVtbl sample_grabber_clock_sink_vtbl = static HRESULT sample_grabber_create_stream(IMFMediaSink *sink, IMFStreamSink **stream) { struct sample_grabber_stream *object; + HRESULT hr; object = heap_alloc_zero(sizeof(*object)); if (!object) @@ -597,9 +610,17 @@ static HRESULT sample_grabber_create_stream(IMFMediaSink *sink, IMFStreamSink ** object->sink = sink; IMFMediaSink_AddRef(object->sink); + if (FAILED(hr = MFCreateEventQueue(&object->event_queue))) + goto failed; + *stream = &object->IMFStreamSink_iface; return S_OK; + +failed: + IMFStreamSink_Release(&object->IMFStreamSink_iface); + + return hr; } static HRESULT sample_grabber_create_object(IMFAttributes *attributes, void *user_context, IUnknown **obj)

1 0

Nikolay Sivov : mf: Add clock state sink stub for grabber.
by Alexandre Julliard 20 May '19

20 May '19

Module: wine Branch: master Commit: e6c488de36a968e6338579fa9691169f301969d2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e6c488de36a968e6338579fa… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 20 15:22:30 2019 +0300 mf: Add clock state sink stub for grabber. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/samplegrabber.c | 76 +++++++++++++++++++++++++++++++++++++++++++++++++ dlls/mf/tests/mf.c | 4 +-- 2 files changed, 77 insertions(+), 3 deletions(-) diff --git a/dlls/mf/samplegrabber.c b/dlls/mf/samplegrabber.c index a6a18dd..f0b2324 100644 --- a/dlls/mf/samplegrabber.c +++ b/dlls/mf/samplegrabber.c @@ -38,6 +38,7 @@ struct sample_grabber_stream struct sample_grabber { IMFMediaSink IMFMediaSink_iface; + IMFClockStateSink IMFClockStateSink_iface; LONG refcount; IMFSampleGrabberSinkCallback *callback; IMFMediaType *media_type; @@ -65,6 +66,11 @@ static struct sample_grabber *impl_from_IMFMediaSink(IMFMediaSink *iface) return CONTAINING_RECORD(iface, struct sample_grabber, IMFMediaSink_iface); } +static struct sample_grabber *impl_from_IMFClockStateSink(IMFClockStateSink *iface) +{ + return CONTAINING_RECORD(iface, struct sample_grabber, IMFClockStateSink_iface); +} + static struct sample_grabber_stream *impl_from_IMFStreamSink(IMFStreamSink *iface) { return CONTAINING_RECORD(iface, struct sample_grabber_stream, IMFStreamSink_iface); @@ -320,6 +326,10 @@ static HRESULT WINAPI sample_grabber_sink_QueryInterface(IMFMediaSink *iface, RE { *obj = &grabber->IMFMediaSink_iface; } + else if (IsEqualIID(riid, &IID_IMFClockStateSink)) + { + *obj = &grabber->IMFClockStateSink_iface; + } else { WARN("Unsupported %s.\n", debugstr_guid(riid)); @@ -508,6 +518,71 @@ static const IMFMediaSinkVtbl sample_grabber_sink_vtbl = sample_grabber_sink_Shutdown, }; +static HRESULT WINAPI sample_grabber_clock_sink_QueryInterface(IMFClockStateSink *iface, REFIID riid, void **obj) +{ + struct sample_grabber *grabber = impl_from_IMFClockStateSink(iface); + return IMFMediaSink_QueryInterface(&grabber->IMFMediaSink_iface, riid, obj); +} + +static ULONG WINAPI sample_grabber_clock_sink_AddRef(IMFClockStateSink *iface) +{ + struct sample_grabber *grabber = impl_from_IMFClockStateSink(iface); + return IMFMediaSink_AddRef(&grabber->IMFMediaSink_iface); +} + +static ULONG WINAPI sample_grabber_clock_sink_Release(IMFClockStateSink *iface) +{ + struct sample_grabber *grabber = impl_from_IMFClockStateSink(iface); + return IMFMediaSink_Release(&grabber->IMFMediaSink_iface); +} + +static HRESULT WINAPI sample_grabber_clock_sink_OnClockStart(IMFClockStateSink *iface, MFTIME systime, LONGLONG offset) +{ + FIXME("%p, %s, %s.\n", iface, wine_dbgstr_longlong(systime), wine_dbgstr_longlong(offset)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI sample_grabber_clock_sink_OnClockStop(IMFClockStateSink *iface, MFTIME systime) +{ + FIXME("%p, %s.\n", iface, wine_dbgstr_longlong(systime)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI sample_grabber_clock_sink_OnClockPause(IMFClockStateSink *iface, MFTIME systime) +{ + FIXME("%p, %s.\n", iface, wine_dbgstr_longlong(systime)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI sample_grabber_clock_sink_OnClockRestart(IMFClockStateSink *iface, MFTIME systime) +{ + FIXME("%p, %s.\n", iface, wine_dbgstr_longlong(systime)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI sample_grabber_clock_sink_OnClockSetRate(IMFClockStateSink *iface, MFTIME systime, float rate) +{ + FIXME("%p, %s, %f.\n", iface, wine_dbgstr_longlong(systime), rate); + + return E_NOTIMPL; +} + +static const IMFClockStateSinkVtbl sample_grabber_clock_sink_vtbl = +{ + sample_grabber_clock_sink_QueryInterface, + sample_grabber_clock_sink_AddRef, + sample_grabber_clock_sink_Release, + sample_grabber_clock_sink_OnClockStart, + sample_grabber_clock_sink_OnClockStop, + sample_grabber_clock_sink_OnClockPause, + sample_grabber_clock_sink_OnClockRestart, + sample_grabber_clock_sink_OnClockSetRate, +}; + static HRESULT sample_grabber_create_stream(IMFMediaSink *sink, IMFStreamSink **stream) { struct sample_grabber_stream *object; @@ -540,6 +615,7 @@ static HRESULT sample_grabber_create_object(IMFAttributes *attributes, void *use return E_OUTOFMEMORY; object->IMFMediaSink_iface.lpVtbl = &sample_grabber_sink_vtbl; + object->IMFClockStateSink_iface.lpVtbl = &sample_grabber_clock_sink_vtbl; object->refcount = 1; object->callback = context->callback; IMFSampleGrabberSinkCallback_AddRef(object->callback); diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index b37fdba..43d2690 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -1709,10 +1709,8 @@ static void test_sample_grabber(void) ok(hr == MF_E_STREAMSINKS_FIXED, "Unexpected hr %#x.\n", hr); hr = IMFMediaSink_QueryInterface(sink, &IID_IMFClockStateSink, (void **)&clocksink); -todo_wine ok(hr == S_OK, "Failed to get interface, hr %#x.\n", hr); - if (SUCCEEDED(hr)) - IMFClockStateSink_Release(clocksink); + IMFClockStateSink_Release(clocksink); hr = IMFMediaSink_QueryInterface(sink, &IID_IMFMediaEventGenerator, (void **)&eg); todo_wine

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2019