March 2020 - Wine-commits - list.winehq.org

Dmitry Timoshkov : adsldp: Add initial version of attribute schema parser.
by Alexandre Julliard 27 Mar '20

27 Mar '20

Module: wine Branch: master Commit: 5875a659c1e338e7ce1bee53501a170b42a5a2f0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5875a659c1e338e7ce1bee53… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Mar 27 17:06:18 2020 +0800 adsldp: Add initial version of attribute schema parser. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/adsldp/Makefile.in | 3 +- dlls/adsldp/adsldp.c | 62 ++++++++-- dlls/adsldp/adsldp_private.h | 17 ++- dlls/adsldp/schema.c | 269 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 335 insertions(+), 16 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5875a659c1e338e7ce1b…

1 0

Gabriel Ivăncescu : vbscript: Lookup the identifier in the named item's disp after its script dispatch.
by Alexandre Julliard 27 Mar '20

27 Mar '20

Module: wine Branch: master Commit: 0d397dcc6112bef28d98cdbfe53e04541e80cb42 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0d397dcc6112bef28d98cdbf… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Mar 27 18:06:41 2020 +0200 vbscript: Lookup the identifier in the named item's disp after its script dispatch. If the bytecode has a named item context, its disp is looked for the identifier before any globals, but after its script dispatch. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/interp.c | 14 +++++++------- dlls/vbscript/tests/vbscript.c | 42 +++++++++++++++++++++++++++++++++++++++++- 2 files changed, 48 insertions(+), 8 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 95614b1063..d50ef4600d 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -181,6 +181,13 @@ static HRESULT lookup_identifier(exec_ctx_t *ctx, BSTR name, vbdisp_invoke_type_ } } + if(ctx->code->named_item) { + if(lookup_global_vars(ctx->code->named_item->script_obj, name, ref)) + return S_OK; + if(lookup_global_funcs(ctx->code->named_item->script_obj, name, ref)) + return S_OK; + } + if(ctx->func->code_ctx->named_item && ctx->func->code_ctx->named_item->disp) { hres = disp_get_id(ctx->func->code_ctx->named_item->disp, name, invoke_type, TRUE, &id); if(SUCCEEDED(hres)) { @@ -191,13 +198,6 @@ static HRESULT lookup_identifier(exec_ctx_t *ctx, BSTR name, vbdisp_invoke_type_ } } - if(ctx->code->named_item) { - if(lookup_global_vars(ctx->code->named_item->script_obj, name, ref)) - return S_OK; - if(lookup_global_funcs(ctx->code->named_item->script_obj, name, ref)) - return S_OK; - } - if(lookup_global_vars(script_obj, name, ref)) return S_OK; if(lookup_global_funcs(script_obj, name, ref)) diff --git a/dlls/vbscript/tests/vbscript.c b/dlls/vbscript/tests/vbscript.c index 7545ca3e86..a997a510cd 100644 --- a/dlls/vbscript/tests/vbscript.c +++ b/dlls/vbscript/tests/vbscript.c @@ -97,6 +97,7 @@ DEFINE_EXPECT(OnEnterScript); DEFINE_EXPECT(OnLeaveScript); DEFINE_EXPECT(OnScriptError); DEFINE_EXPECT(GetIDsOfNames); +DEFINE_EXPECT(GetIDsOfNames_visible); DEFINE_EXPECT(GetItemInfo_global); DEFINE_EXPECT(GetItemInfo_global_code); DEFINE_EXPECT(GetItemInfo_visible); @@ -218,6 +219,19 @@ static HRESULT WINAPI Dispatch_GetIDsOfNames(IDispatch *iface, REFIID riid, LPOL return DISP_E_UNKNOWNNAME; } +static HRESULT WINAPI visible_GetIDsOfNames(IDispatch *iface, REFIID riid, LPOLESTR *names, UINT name_cnt, + LCID lcid, DISPID *ids) +{ + ok(name_cnt == 1, "name_cnt = %u\n", name_cnt); + if(!wcscmp(names[0], L"testCall")) { + *ids = 1; + return S_OK; + } + + CHECK_EXPECT2(GetIDsOfNames_visible); + return DISP_E_UNKNOWNNAME; +} + static HRESULT WINAPI Dispatch_Invoke(IDispatch *iface, DISPID id, REFIID riid, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *res, EXCEPINFO *ei, UINT *err) { @@ -259,7 +273,7 @@ static const IDispatchVtbl visible_named_item_vtbl = { visible_Release, Dispatch_GetTypeInfoCount, Dispatch_GetTypeInfo, - Dispatch_GetIDsOfNames, + visible_GetIDsOfNames, Dispatch_Invoke }; @@ -1998,6 +2012,32 @@ static void test_named_items(void) CHECK_CALLED(OnEnterScript); CHECK_CALLED(GetIDsOfNames); CHECK_CALLED(OnLeaveScript); + + SET_EXPECT(OnEnterScript); + SET_EXPECT(GetItemInfo_visible); + SET_EXPECT(GetIDsOfNames_visible); + SET_EXPECT(OnLeaveScript); + hres = IActiveScriptParse_ParseScriptText(parse, L"dim abc\n", L"visibleItem", NULL, NULL, 0, 0, 0, NULL, NULL); + ok(hres == S_OK, "ParseScriptText failed: %08x\n", hres); + CHECK_CALLED(OnEnterScript); + todo_wine CHECK_CALLED(GetItemInfo_visible); + todo_wine CHECK_CALLED(GetIDsOfNames_visible); + CHECK_CALLED(OnLeaveScript); + SET_EXPECT(OnEnterScript); + SET_EXPECT(OnLeaveScript); + hres = IActiveScriptParse_ParseScriptText(parse, L"abc = 5\n", L"visibleItem", NULL, NULL, 0, 0, 0, NULL, NULL); + ok(hres == S_OK, "ParseScriptText failed: %08x\n", hres); + CHECK_CALLED(OnEnterScript); + CHECK_CALLED(OnLeaveScript); + SET_EXPECT(OnEnterScript); + SET_EXPECT(GetIDsOfNames_visible); + SET_EXPECT(OnLeaveScript); + hres = IActiveScriptParse_ParseScriptText(parse, L"testVar_global = 5\n", L"visibleItem", NULL, NULL, 0, 0, 0, NULL, NULL); + ok(hres == S_OK, "ParseScriptText failed: %08x\n", hres); + CHECK_CALLED(OnEnterScript); + CHECK_CALLED(GetIDsOfNames_visible); + CHECK_CALLED(OnLeaveScript); + SET_EXPECT(OnEnterScript); SET_EXPECT(OnLeaveScript); hres = IActiveScriptParse_ParseScriptText(parse, L"set global_me = me\n", L"globalItem", NULL, NULL, 0, 0, SCRIPTTEXT_ISPERSISTENT, NULL, NULL);

1 0

Gabriel Ivăncescu : jscript/tests: Add more persistent named items tests.
by Alexandre Julliard 27 Mar '20

27 Mar '20

Module: wine Branch: master Commit: fa0ec370773b21038b33590b6c557eac8139f7b2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fa0ec370773b21038b33590b… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Mar 27 18:34:08 2020 +0100 jscript/tests: Add more persistent named items tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/tests/jscript.c | 96 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 95 insertions(+), 1 deletion(-) diff --git a/dlls/jscript/tests/jscript.c b/dlls/jscript/tests/jscript.c index 64b3588997..dce2f3b95e 100644 --- a/dlls/jscript/tests/jscript.c +++ b/dlls/jscript/tests/jscript.c @@ -105,6 +105,7 @@ DEFINE_EXPECT(OnEnterScript); DEFINE_EXPECT(OnLeaveScript); DEFINE_EXPECT(OnScriptError); DEFINE_EXPECT(GetIDsOfNames); +DEFINE_EXPECT(GetIDsOfNames_visible); DEFINE_EXPECT(GetIDsOfNames_persistent); DEFINE_EXPECT(GetItemInfo_global); DEFINE_EXPECT(GetItemInfo_global_code); @@ -214,6 +215,19 @@ static HRESULT WINAPI Dispatch_GetIDsOfNames(IDispatch *iface, REFIID riid, LPOL return DISP_E_UNKNOWNNAME; } +static HRESULT WINAPI visible_GetIDsOfNames(IDispatch *iface, REFIID riid, LPOLESTR *names, UINT name_cnt, + LCID lcid, DISPID *ids) +{ + ok(name_cnt == 1, "name_cnt = %u\n", name_cnt); + if(!wcscmp(names[0], L"testCall")) { + *ids = 1; + return S_OK; + } + + CHECK_EXPECT2(GetIDsOfNames_visible); + return DISP_E_UNKNOWNNAME; +} + static HRESULT WINAPI persistent_GetIDsOfNames(IDispatch *iface, REFIID riid, LPOLESTR *names, UINT name_cnt, LCID lcid, DISPID *ids) { @@ -264,7 +278,7 @@ static const IDispatchVtbl visible_named_item_vtbl = { visible_Release, Dispatch_GetTypeInfoCount, Dispatch_GetTypeInfo, - Dispatch_GetIDsOfNames, + visible_GetIDsOfNames, Dispatch_Invoke }; @@ -1353,6 +1367,39 @@ static void test_named_items(void) CHECK_CALLED(OnEnterScript); CHECK_CALLED(OnLeaveScript); + SET_EXPECT(OnEnterScript); + SET_EXPECT(GetIDsOfNames_visible); + SET_EXPECT(OnLeaveScript); + hr = IActiveScriptParse_ParseScriptText(parse, L"var abc;\n", L"visibleItem", NULL, NULL, 0, 0, 0, NULL, NULL); + ok(hr == S_OK, "ParseScriptText failed: %08x\n", hr); + CHECK_CALLED(OnEnterScript); + todo_wine + CHECK_CALLED(GetIDsOfNames_visible); + CHECK_CALLED(OnLeaveScript); + + SET_EXPECT(OnEnterScript); + SET_EXPECT(OnLeaveScript); + hr = IActiveScriptParse_ParseScriptText(parse, L"abc = 5;\n", L"visibleItem", NULL, NULL, 0, 0, 0, NULL, NULL); + ok(hr == S_OK, "ParseScriptText failed: %08x\n", hr); + CHECK_CALLED(OnEnterScript); + CHECK_CALLED(OnLeaveScript); + SET_EXPECT(OnEnterScript); + SET_EXPECT(GetIDsOfNames_visible); + SET_EXPECT(OnLeaveScript); + hr = IActiveScriptParse_ParseScriptText(parse, L"testVar_global = 5;\n", L"visibleItem", NULL, NULL, 0, 0, 0, NULL, NULL); + ok(hr == S_OK, "ParseScriptText failed: %08x\n", hr); + CHECK_CALLED(OnEnterScript); + todo_wine + CHECK_CALLED(GetIDsOfNames_visible); + CHECK_CALLED(OnLeaveScript); + + SET_EXPECT(OnEnterScript); + SET_EXPECT(OnLeaveScript); + hr = IActiveScriptParse_ParseScriptText(parse, L"var abc; testVar_global = 5;\n", L"visibleCodeItem", NULL, NULL, 0, 0, 0, NULL, NULL); + ok(hr == S_OK, "ParseScriptText failed: %08x\n", hr); + CHECK_CALLED(OnEnterScript); + CHECK_CALLED(OnLeaveScript); + SET_EXPECT(OnEnterScript); SET_EXPECT(OnLeaveScript); hr = IActiveScriptParse_ParseScriptText(parse, L"global_this = this;\n", L"globalItem", NULL, NULL, 0, 0, SCRIPTTEXT_ISPERSISTENT, NULL, NULL); @@ -1478,6 +1525,18 @@ static void test_named_items(void) IDispatchEx_Release(dispex2); IDispatchEx_Release(dispex); + dispex = get_script_dispatch(script, L"persistent"); + SET_EXPECT(OnEnterScript); + SET_EXPECT(OnLeaveScript); + hr = IActiveScriptParse_ParseScriptText(parse, L"this", L"persistent", NULL, NULL, 0, 0, SCRIPTTEXT_ISEXPRESSION, &var, NULL); + ok(hr == S_OK, "ParseScriptText failed: %08x\n", hr); + ok(V_VT(&var) == VT_DISPATCH && V_DISPATCH(&var) == (IDispatch*)dispex, + "Unexpected 'this': V_VT = %d, V_DISPATCH = %p\n", V_VT(&var), V_DISPATCH(&var)); + VariantClear(&var); + CHECK_CALLED(OnEnterScript); + CHECK_CALLED(OnLeaveScript); + IDispatchEx_Release(dispex); + SET_EXPECT(OnEnterScript); SET_EXPECT(OnLeaveScript); hr = IActiveScriptParse_ParseScriptText(parse, L"var x = 13;\n", L"persistent", NULL, NULL, 0, 0, SCRIPTTEXT_ISPERSISTENT, NULL, NULL); @@ -1557,6 +1616,41 @@ static void test_named_items(void) CHECK_CALLED(OnEnterScript); CHECK_CALLED(OnLeaveScript); + /* this object it set to named idem when persistent items are re-initialized, even for CODEONLY items */ + SET_EXPECT(OnEnterScript); + SET_EXPECT(OnLeaveScript); + hr = IActiveScriptParse_ParseScriptText(parse, L"this", L"persistent", NULL, NULL, 0, 0, SCRIPTTEXT_ISEXPRESSION, &var, NULL); + ok(hr == S_OK, "ParseScriptText failed: %08x\n", hr); + todo_wine + ok(V_VT(&var) == VT_DISPATCH && V_DISPATCH(&var) == &persistent_named_item, + "Unexpected 'this': V_VT = %d, V_DISPATCH = %p\n", V_VT(&var), V_DISPATCH(&var)); + VariantClear(&var); + CHECK_CALLED(OnEnterScript); + CHECK_CALLED(OnLeaveScript); + + /* lookups also query named items */ + SET_EXPECT(OnEnterScript); + SET_EXPECT(OnLeaveScript); + SET_EXPECT(GetIDsOfNames_persistent); + hr = IActiveScriptParse_ParseScriptText(parse, L"var abc123;", L"persistent", NULL, NULL, 0, 0, 0, NULL, NULL); + ok(hr == S_OK, "ParseScriptText failed: %08x\n", hr); + CHECK_CALLED(OnEnterScript); + CHECK_CALLED(OnLeaveScript); + todo_wine + CHECK_CALLED(GetIDsOfNames_persistent); + + SET_EXPECT(OnEnterScript); + SET_EXPECT(OnLeaveScript); + SET_EXPECT(GetIDsOfNames_persistent); + SET_EXPECT(OnScriptError); + hr = IActiveScriptParse_ParseScriptText(parse, L"testCall();", L"persistent", NULL, NULL, 0, 0, 0, NULL, NULL); + ok(FAILED(hr), "ParseScriptText returned: %08x\n", hr); + CHECK_CALLED(OnEnterScript); + CHECK_CALLED(OnLeaveScript); + todo_wine + CHECK_CALLED(GetIDsOfNames_persistent); + CHECK_CALLED(OnScriptError); + dispex = get_script_dispatch(script, NULL); for (i = 0; i < ARRAY_SIZE(global_idents); i++) {

1 0

Jacek Caban : jscript: Lookup the identifier in the named item's disp before the global context.
by Alexandre Julliard 27 Mar '20

27 Mar '20

Module: wine Branch: master Commit: 133918e69c33dfb7e4cfadb3a75296864663f404 URL: https://source.winehq.org/git/wine.git/?a=commit;h=133918e69c33dfb7e4cfadb3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 27 18:34:16 2020 +0100 jscript: Lookup the identifier in the named item's disp before the global context. Based on patch by Gabriel Ivăncescu. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/engine.c | 36 +++++++++++++++++++++++++----------- dlls/jscript/tests/jscript.c | 2 -- 2 files changed, 25 insertions(+), 13 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 896ba6067c..27f03084fa 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -670,13 +670,20 @@ static HRESULT identifier_eval(script_ctx_t *ctx, BSTR identifier, exprval_t *re } } - if(ctx->call_ctx->bytecode->named_item) { - jsdisp_t *script_obj = ctx->call_ctx->bytecode->named_item->script_obj; - hres = jsdisp_get_id(script_obj, identifier, 0, &id); + item = ctx->call_ctx->bytecode->named_item; + if(item) { + hres = jsdisp_get_id(item->script_obj, identifier, 0, &id); if(SUCCEEDED(hres)) { - exprval_set_disp_ref(ret, to_disp(script_obj), id); + exprval_set_disp_ref(ret, to_disp(item->script_obj), id); return S_OK; } + if(!(item->flags & SCRIPTITEM_CODEONLY)) { + hres = disp_get_id(ctx, item->disp, identifier, identifier, 0, &id); + if(SUCCEEDED(hres)) { + exprval_set_disp_ref(ret, item->disp, id); + return S_OK; + } + } } } @@ -3050,7 +3057,8 @@ HRESULT exec_source(script_ctx_t *ctx, DWORD flags, bytecode_t *bytecode, functi } if(flags & (EXEC_GLOBAL | EXEC_EVAL)) { - BOOL lookup_globals = (flags & EXEC_GLOBAL) && !bytecode->named_item; + named_item_t *item = bytecode->named_item; + DISPID id; for(i=0; i < function->var_cnt; i++) { TRACE("[%d] %s %d\n", i, debugstr_w(function->variables[i].name), function->variables[i].func_id); @@ -3063,13 +3071,19 @@ HRESULT exec_source(script_ctx_t *ctx, DWORD flags, bytecode_t *bytecode, functi hres = jsdisp_propput_name(variable_obj, function->variables[i].name, jsval_obj(func_obj)); jsdisp_release(func_obj); - }else if(!lookup_globals || !lookup_global_members(ctx, function->variables[i].name, NULL)) { - DISPID id = 0; - - hres = jsdisp_get_id(variable_obj, function->variables[i].name, fdexNameEnsure, &id); - if(FAILED(hres)) - goto fail; + continue; } + + if(item && !(item->flags & SCRIPTITEM_CODEONLY) + && SUCCEEDED(disp_get_id(ctx, item->disp, function->variables[i].name, function->variables[i].name, 0, &id))) + continue; + + if(!item && (flags & EXEC_GLOBAL) && lookup_global_members(ctx, function->variables[i].name, NULL)) + continue; + + hres = jsdisp_get_id(variable_obj, function->variables[i].name, fdexNameEnsure, &id); + if(FAILED(hres)) + goto fail; } } diff --git a/dlls/jscript/tests/jscript.c b/dlls/jscript/tests/jscript.c index dce2f3b95e..a9f128ffc0 100644 --- a/dlls/jscript/tests/jscript.c +++ b/dlls/jscript/tests/jscript.c @@ -1373,7 +1373,6 @@ static void test_named_items(void) hr = IActiveScriptParse_ParseScriptText(parse, L"var abc;\n", L"visibleItem", NULL, NULL, 0, 0, 0, NULL, NULL); ok(hr == S_OK, "ParseScriptText failed: %08x\n", hr); CHECK_CALLED(OnEnterScript); - todo_wine CHECK_CALLED(GetIDsOfNames_visible); CHECK_CALLED(OnLeaveScript); @@ -1389,7 +1388,6 @@ static void test_named_items(void) hr = IActiveScriptParse_ParseScriptText(parse, L"testVar_global = 5;\n", L"visibleItem", NULL, NULL, 0, 0, 0, NULL, NULL); ok(hr == S_OK, "ParseScriptText failed: %08x\n", hr); CHECK_CALLED(OnEnterScript); - todo_wine CHECK_CALLED(GetIDsOfNames_visible); CHECK_CALLED(OnLeaveScript);

1 0

Jacek Caban : jscript: Clear SCRIPTITEM_CODEONLY flag on script re-initialization.
by Alexandre Julliard 27 Mar '20

27 Mar '20

Module: wine Branch: master Commit: 99929c0896a94855902a3dad20d56ed539245836 URL: https://source.winehq.org/git/wine.git/?a=commit;h=99929c0896a94855902a3dad… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 27 18:34:56 2020 +0100 jscript: Clear SCRIPTITEM_CODEONLY flag on script re-initialization. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/jscript.c | 3 +++ dlls/jscript/tests/jscript.c | 5 +---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index 3fcaab0858..8e729a0432 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -757,6 +757,9 @@ static HRESULT WINAPI JScript_SetScriptSite(IActiveScript *iface, hres = retrieve_named_item_disp(pass, item); if(FAILED(hres)) return hres; } + + /* For some reason, CODEONLY flag is lost in re-initialized scripts */ + item->flags &= ~SCRIPTITEM_CODEONLY; } This->site = pass; diff --git a/dlls/jscript/tests/jscript.c b/dlls/jscript/tests/jscript.c index a9f128ffc0..c1b83d4779 100644 --- a/dlls/jscript/tests/jscript.c +++ b/dlls/jscript/tests/jscript.c @@ -1599,7 +1599,7 @@ static void test_named_items(void) CHECK_CALLED(OnStateChange_CONNECTED); CHECK_CALLED_MULTI(OnEnterScript, 5); CHECK_CALLED_MULTI(OnLeaveScript, 5); - todo_wine CHECK_CALLED(GetIDsOfNames_persistent); + CHECK_CALLED(GetIDsOfNames_persistent); test_state(script, SCRIPTSTATE_CONNECTED); dispex2 = get_script_dispatch(script, L"persistent"); @@ -1619,7 +1619,6 @@ static void test_named_items(void) SET_EXPECT(OnLeaveScript); hr = IActiveScriptParse_ParseScriptText(parse, L"this", L"persistent", NULL, NULL, 0, 0, SCRIPTTEXT_ISEXPRESSION, &var, NULL); ok(hr == S_OK, "ParseScriptText failed: %08x\n", hr); - todo_wine ok(V_VT(&var) == VT_DISPATCH && V_DISPATCH(&var) == &persistent_named_item, "Unexpected 'this': V_VT = %d, V_DISPATCH = %p\n", V_VT(&var), V_DISPATCH(&var)); VariantClear(&var); @@ -1634,7 +1633,6 @@ static void test_named_items(void) ok(hr == S_OK, "ParseScriptText failed: %08x\n", hr); CHECK_CALLED(OnEnterScript); CHECK_CALLED(OnLeaveScript); - todo_wine CHECK_CALLED(GetIDsOfNames_persistent); SET_EXPECT(OnEnterScript); @@ -1645,7 +1643,6 @@ static void test_named_items(void) ok(FAILED(hr), "ParseScriptText returned: %08x\n", hr); CHECK_CALLED(OnEnterScript); CHECK_CALLED(OnLeaveScript); - todo_wine CHECK_CALLED(GetIDsOfNames_persistent); CHECK_CALLED(OnScriptError);

1 0

Anton Baskanov : amstream: Implement adding existing streams in AMMultiMediaStream::AddMediaStream.
by Alexandre Julliard 27 Mar '20

27 Mar '20

Module: wine Branch: master Commit: 7ff63efa015f6d8f08c7b3e6697437601c76077c URL: https://source.winehq.org/git/wine.git/?a=commit;h=7ff63efa015f6d8f08c7b3e6… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Fri Mar 27 11:54:29 2020 -0500 amstream: Implement adding existing streams in AMMultiMediaStream::AddMediaStream. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/multimedia.c | 51 +++++++++++++++++++++++++++++++++--------- dlls/amstream/tests/amstream.c | 12 +++++----- 2 files changed, 47 insertions(+), 16 deletions(-) diff --git a/dlls/amstream/multimedia.c b/dlls/amstream/multimedia.c index 07c037505e..be8fd4ecbf 100644 --- a/dlls/amstream/multimedia.c +++ b/dlls/amstream/multimedia.c @@ -298,6 +298,16 @@ static HRESULT WINAPI multimedia_stream_GetFilter(IAMMultiMediaStream *iface, return S_OK; } +static void add_stream(struct multimedia_stream *mmstream, IAMMediaStream *stream, IMediaStream **ret_stream) +{ + IMediaStreamFilter_AddMediaStream(mmstream->filter, stream); + if (ret_stream) + { + *ret_stream = (IMediaStream *)stream; + IMediaStream_AddRef(*ret_stream); + } +} + static HRESULT WINAPI multimedia_stream_AddMediaStream(IAMMultiMediaStream *iface, IUnknown *stream_object, const MSPID *PurposeId, DWORD dwFlags, IMediaStream **ret_stream) { @@ -309,9 +319,6 @@ static HRESULT WINAPI multimedia_stream_AddMediaStream(IAMMultiMediaStream *ifac TRACE("mmstream %p, stream_object %p, id %s, flags %#x, ret_stream %p.\n", This, stream_object, debugstr_guid(PurposeId), dwFlags, ret_stream); - if (!IsEqualGUID(PurposeId, &MSPID_PrimaryVideo) && !IsEqualGUID(PurposeId, &MSPID_PrimaryAudio)) - return MS_E_PURPOSEID; - if (IMediaStreamFilter_GetMediaStream(This->filter, PurposeId, &stream) == S_OK) { IMediaStream_Release(stream); @@ -343,19 +350,43 @@ static HRESULT WINAPI multimedia_stream_AddMediaStream(IAMMultiMediaStream *ifac return hr; } + if (stream_object) + { + hr = IUnknown_QueryInterface(stream_object, &IID_IAMMediaStream, (void **)&pStream); + if (SUCCEEDED(hr)) + { + MSPID stream_id; + hr = IAMMediaStream_GetInformation(pStream, &stream_id, NULL); + if (SUCCEEDED(hr)) + { + if (IsEqualGUID(PurposeId, &stream_id)) + { + add_stream(This, pStream, ret_stream); + hr = S_OK; + } + else + { + hr = MS_E_PURPOSEID; + } + } + + IAMMediaStream_Release(pStream); + + return hr; + } + } + if (IsEqualGUID(PurposeId, &MSPID_PrimaryVideo)) hr = ddraw_stream_create((IMultiMediaStream*)iface, PurposeId, stream_object, This->type, &pStream); - else + else if (IsEqualGUID(PurposeId, &MSPID_PrimaryAudio)) hr = audio_stream_create((IMultiMediaStream*)iface, PurposeId, stream_object, This->type, &pStream); + else + return MS_E_PURPOSEID; if (SUCCEEDED(hr)) { - /* Add stream to the media stream filter */ - IMediaStreamFilter_AddMediaStream(This->filter, pStream); - if (ret_stream) - *ret_stream = (IMediaStream *)pStream; - else - IAMMediaStream_Release(pStream); + add_stream(This, pStream, ret_stream); + IAMMediaStream_Release(pStream); } return hr; diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index a55884d8ab..09686cfcf4 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -684,21 +684,21 @@ static void test_add_stream(void) ok(hr == MS_E_PURPOSEID, "Got hr %#x.\n", hr); hr = IAMMultiMediaStream_AddMediaStream(mmstream, (IUnknown *)&teststream, &test_mspid, 0, &stream); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(stream == (IMediaStream *)&teststream, "Streams didn't match.\n"); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(stream == (IMediaStream *)&teststream, "Streams didn't match.\n"); if (hr == S_OK) IMediaStream_Release(stream); todo_wine ok(teststream_mmstream == mmstream, "IAMMultiMediaStream objects didn't match.\n"); - todo_wine ok(teststream_filter == stream_filter, "IMediaStreamFilter objects didn't match.\n"); + ok(teststream_filter == stream_filter, "IMediaStreamFilter objects didn't match.\n"); todo_wine ok(!!teststream_graph, "Expected a non-NULL graph.\n"); check_enum_stream(mmstream, stream_filter, 0, video_stream); check_enum_stream(mmstream, stream_filter, 1, audio_stream); - todo_wine check_enum_stream(mmstream, stream_filter, 2, (IMediaStream *)&teststream); + check_enum_stream(mmstream, stream_filter, 2, (IMediaStream *)&teststream); check_enum_stream(mmstream, stream_filter, 3, NULL); check_get_stream(mmstream, stream_filter, &MSPID_PrimaryVideo, video_stream); check_get_stream(mmstream, stream_filter, &MSPID_PrimaryAudio, audio_stream); - todo_wine check_get_stream(mmstream, stream_filter, &test_mspid, (IMediaStream *)&teststream); + check_get_stream(mmstream, stream_filter, &test_mspid, (IMediaStream *)&teststream); hr = IAMMultiMediaStream_AddMediaStream(mmstream, NULL, &MSPID_PrimaryVideo, 0, &stream); ok(hr == MS_E_PURPOSEID, "Got hr %#x.\n", hr); @@ -839,7 +839,7 @@ static void test_add_stream(void) ok(hr == MS_E_PURPOSEID, "Got hr %#x.\n", hr); hr = IAMMultiMediaStream_AddMediaStream(mmstream, NULL, &test_mspid, AMMSF_ADDDEFAULTRENDERER, &audio_stream); - todo_wine ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); IMediaStreamFilter_Release(stream_filter); ref = IAMMultiMediaStream_Release(mmstream);

1 0

Paul Gofman : mshtml: Use stricmp() instead of _strnicmp(..., -1).
by Alexandre Julliard 27 Mar '20

27 Mar '20

Module: wine Branch: master Commit: 585d4fb742e7a2e6cb1f51d05a06f2226caaf6da URL: https://source.winehq.org/git/wine.git/?a=commit;h=585d4fb742e7a2e6cb1f51d0… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Fri Mar 27 13:25:58 2020 +0300 mshtml: Use stricmp() instead of _strnicmp(..., -1). Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/nsio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 0201ab5c47..7c8f029b4a 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -1180,7 +1180,7 @@ static nsresult NSAPI nsChannel_SetRequestMethod(nsIHttpChannel *iface, nsACString_GetData(aRequestMethod, &method); for(i=0; i < ARRAY_SIZE(request_method_strings); i++) { - if(!_strnicmp(method, request_method_strings[i], -1)) { + if(!stricmp(method, request_method_strings[i])) { This->request_method = i; return NS_OK; }

1 0

Paul Gofman : d3dcompiler: Use stricmp() instead of _strnicmp(..., -1).
by Alexandre Julliard 27 Mar '20

27 Mar '20

Module: wine Branch: master Commit: 2c8c06054e1497cd1be108005b0c6c538b6d3eee URL: https://source.winehq.org/git/wine.git/?a=commit;h=2c8c06054e1497cd1be10800… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Fri Mar 27 12:50:38 2020 +0300 d3dcompiler: Use stricmp() instead of _strnicmp(..., -1). Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/reflection.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index 820e5c239f..b29db47c71 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -1674,13 +1674,13 @@ static HRESULT d3dcompiler_parse_signature(struct d3dcompiler_shader_signature * if (d[i].Register == 0xffffffff) { - if (!_strnicmp(d[i].SemanticName, "sv_depth", -1)) + if (!stricmp(d[i].SemanticName, "sv_depth")) d[i].SystemValueType = D3D_NAME_DEPTH; - else if (!_strnicmp(d[i].SemanticName, "sv_coverage", -1)) + else if (!stricmp(d[i].SemanticName, "sv_coverage")) d[i].SystemValueType = D3D_NAME_COVERAGE; - else if (!_strnicmp(d[i].SemanticName, "sv_depthgreaterequal", -1)) + else if (!stricmp(d[i].SemanticName, "sv_depthgreaterequal")) d[i].SystemValueType = D3D_NAME_DEPTH_GREATER_EQUAL; - else if (!_strnicmp(d[i].SemanticName, "sv_depthlessequal", -1)) + else if (!stricmp(d[i].SemanticName, "sv_depthlessequal")) d[i].SystemValueType = D3D_NAME_DEPTH_LESS_EQUAL; } else

1 0

Paul Gofman : d3dx9: Use stricmp() instead of _strnicmp(..., -1).
by Alexandre Julliard 27 Mar '20

27 Mar '20

Module: wine Branch: master Commit: aab980a16253ff6bb6286572576899bfc0f83945 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aab980a16253ff6bb6286572… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Fri Mar 27 13:02:29 2020 +0300 d3dx9: Use stricmp() instead of _strnicmp(..., -1). Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 345bee3c3a..710e999f27 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -2202,7 +2202,7 @@ static D3DXHANDLE WINAPI d3dx_effect_GetParameterBySemantic(ID3DXEffect *iface, continue; } - if (!_strnicmp(temp_param->semantic, semantic, -1)) + if (!stricmp(temp_param->semantic, semantic)) { TRACE("Returning parameter %p\n", temp_param); return get_parameter_handle(temp_param); @@ -2225,7 +2225,7 @@ static D3DXHANDLE WINAPI d3dx_effect_GetParameterBySemantic(ID3DXEffect *iface, continue; } - if (!_strnicmp(temp_param->semantic, semantic, -1)) + if (!stricmp(temp_param->semantic, semantic)) { TRACE("Returning parameter %p\n", temp_param); return get_parameter_handle(temp_param);

1 0

Paul Gofman : d3dxof: Use stricmp() instead of _strnicmp(..., -1).
by Alexandre Julliard 27 Mar '20

27 Mar '20

Module: wine Branch: master Commit: 4f2f95195db56701eecedb39ad210e1eb4ceeb0a URL: https://source.winehq.org/git/wine.git/?a=commit;h=4f2f95195db56701eecedb39… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Fri Mar 27 13:14:21 2020 +0300 d3dxof: Use stricmp() instead of _strnicmp(..., -1). Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dxof/parsing.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3dxof/parsing.c b/dlls/d3dxof/parsing.c index 7d31627b9c..e29d17810d 100644 --- a/dlls/d3dxof/parsing.c +++ b/dlls/d3dxof/parsing.c @@ -971,7 +971,7 @@ static BOOL parse_template_members_list(parse_buffer * buf) cur_member->idx_template = 1; while (cur_member->idx_template < buf->pdxf->nb_xtemplates) { - if (!_strnicmp((char*)buf->value, buf->pdxf->xtemplates[cur_member->idx_template].name, -1)) + if (!stricmp((char*)buf->value, buf->pdxf->xtemplates[cur_member->idx_template].name)) break; cur_member->idx_template++; } @@ -1175,7 +1175,7 @@ static BOOL parse_object_members_list(parse_buffer * buf) /* To do template lookup */ for (j = 0; j < buf->pdxf->nb_xtemplates; j++) { - if (!_strnicmp(buf->pdxf->xtemplates[pt->members[i].idx_template].name, buf->pdxf->xtemplates[j].name, -1)) + if (!stricmp(buf->pdxf->xtemplates[pt->members[i].idx_template].name, buf->pdxf->xtemplates[j].name)) { buf->pxt[buf->level] = &buf->pdxf->xtemplates[j]; break; @@ -1391,7 +1391,7 @@ BOOL parse_object(parse_buffer * buf) /* To do template lookup */ for (i = 0; i < buf->pdxf->nb_xtemplates; i++) { - if (!_strnicmp((char*)buf->value, buf->pdxf->xtemplates[i].name, -1)) + if (!stricmp((char*)buf->value, buf->pdxf->xtemplates[i].name)) { buf->pxt[buf->level] = &buf->pdxf->xtemplates[i]; memcpy(&buf->pxo->type, &buf->pdxf->xtemplates[i].class_id, 16);

1 0