wine-commits March 2020

wine-commits@winehq.org

1 participants
996 discussions

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

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

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

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

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

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

Dmitry Timoshkov : adsldp: Add more traces.
by Alexandre Julliard 27 Mar '20

27 Mar '20

Module: wine Branch: master Commit: dbe8d61c7055d0bc5713f90b0e9ce3f3389a8144 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dbe8d61c7055d0bc5713f90b… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Mar 27 17:06:16 2020 +0800 adsldp: Add more traces. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/adsldp/adsldp.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index 7385a40e25..b88867bec1 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -611,6 +611,7 @@ static HRESULT WINAPI ldapns_Get(IADs *iface, BSTR name, VARIANT *prop) for (idx = 0; idx < count; idx++) { + TRACE("=> %s\n", debugstr_w(ldap->attrs[i].values[idx])); V_VT(&item) = VT_BSTR; V_BSTR(&item) = SysAllocString(ldap->attrs[i].values[idx]); if (!V_BSTR(&item)) @@ -633,6 +634,7 @@ fail: } else { + TRACE("=> %s\n", debugstr_w(ldap->attrs[i].values[0])); V_BSTR(prop) = SysAllocString(ldap->attrs[i].values[0]); if (!V_BSTR(prop)) return E_OUTOFMEMORY; V_VT(prop) = VT_BSTR; @@ -1178,7 +1180,10 @@ static HRESULT WINAPI search_ExecuteSearch(IDirectorySearch *iface, LPWSTR filte } for (i = 0; i < count; i++) + { + TRACE("=> %s\n", debugstr_w(names[i])); props[i] = names[i]; + } props[count] = NULL; }

1 0

Piotr Caban : msvcp90: Add std:_XLgamma implementation.
by Alexandre Julliard 27 Mar '20

27 Mar '20

Module: wine Branch: master Commit: 70c3e08d32407c0d8ee751b124c438fc5910fc8d URL: https://source.winehq.org/git/wine.git/?a=commit;h=70c3e08d32407c0d8ee751b1… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Mar 27 16:33:44 2020 +0100 msvcp90: Add std:_XLgamma implementation. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48806 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp100/msvcp100.spec | 6 +++--- dlls/msvcp110/msvcp110.spec | 6 +++--- dlls/msvcp120/msvcp120.spec | 6 +++--- dlls/msvcp120_app/msvcp120_app.spec | 6 +++--- dlls/msvcp140/msvcp140.spec | 6 +++--- dlls/msvcp90/math.c | 33 +++++++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.spec | 6 +++--- 7 files changed, 51 insertions(+), 18 deletions(-) diff --git a/dlls/msvcp100/msvcp100.spec b/dlls/msvcp100/msvcp100.spec index 4ca8d5b277..897b46fe90 100644 --- a/dlls/msvcp100/msvcp100.spec +++ b/dlls/msvcp100/msvcp100.spec @@ -1260,9 +1260,9 @@ @ cdecl -arch=win64 ?_Unlock@?$basic_streambuf@_WU?$char_traits@_W@std@@@std@@UEAAXXZ(ptr) basic_streambuf_wchar__Unlock @ thiscall -arch=win32 ?_Unlock@_Mutex@std@@QAEXXZ(ptr) mutex_unlock @ cdecl -arch=win64 ?_Unlock@_Mutex@std@@QEAAXXZ(ptr) mutex_unlock -@ stub ?_XLgamma@tr1@std@@YAMM@Z -@ stub ?_XLgamma@tr1@std@@YANN@Z -@ stub ?_XLgamma@tr1@std@@YAOO@Z +@ cdecl ?_XLgamma@tr1@std@@YAMM@Z(float) std__XLgamma_float +@ cdecl ?_XLgamma@tr1@std@@YANN@Z(double) std__XLgamma_double +@ cdecl ?_XLgamma@tr1@std@@YAOO@Z(double) std__XLgamma_double @ stub ?_Xbad@tr1@std@@YAXW4error_type@regex_constants@12@@Z @ stub ?_Xfunc@tr1@std@@YAXXZ @ cdecl -arch=win32 ?_Xinvalid_argument@std@@YAXPBD@Z(str) _Xinvalid_argument diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index eebc430b1e..8d79f8c9a8 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -1829,9 +1829,9 @@ @ stub -arch=win64 ?_W_Gettnames@_Locinfo@std@@QEBA?AV_Timevec@2@XZ @ stub -arch=win32 ?_Winerror_map@std@@YAPBDH@Z @ stub -arch=win64 ?_Winerror_map@std@@YAPEBDH@Z -@ stub ?_XLgamma@std@@YAMM@Z -@ stub ?_XLgamma@std@@YANN@Z -@ stub ?_XLgamma@std@@YAOO@Z +@ cdecl ?_XLgamma@std@@YAMM@Z(float) std__XLgamma_float +@ cdecl ?_XLgamma@std@@YANN@Z(double) std__XLgamma_double +@ cdecl ?_XLgamma@std@@YAOO@Z(double) std__XLgamma_double @ cdecl ?_Xbad_alloc@std@@YAXXZ() _Xmem @ stub ?_Xbad_function_call@std@@YAXXZ @ cdecl -arch=win32 ?_Xinvalid_argument@std@@YAXPBD@Z(str) _Xinvalid_argument diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec index e131d41ecc..6308c57b29 100644 --- a/dlls/msvcp120/msvcp120.spec +++ b/dlls/msvcp120/msvcp120.spec @@ -1790,9 +1790,9 @@ @ stub -arch=win64 ?_W_Gettnames@_Locinfo@std@@QEBA?AV_Timevec@2@XZ @ stub -arch=win32 ?_Winerror_map@std@@YAPBDH@Z @ stub -arch=win64 ?_Winerror_map@std@@YAPEBDH@Z -@ stub ?_XLgamma@std@@YAMM@Z -@ stub ?_XLgamma@std@@YANN@Z -@ stub ?_XLgamma@std@@YAOO@Z +@ cdecl ?_XLgamma@std@@YAMM@Z(float) std__XLgamma_float +@ cdecl ?_XLgamma@std@@YANN@Z(double) std__XLgamma_double +@ cdecl ?_XLgamma@std@@YAOO@Z(double) std__XLgamma_double @ cdecl ?_Xbad_alloc@std@@YAXXZ() _Xmem @ stub ?_Xbad_function_call@std@@YAXXZ @ cdecl -arch=win32 ?_Xinvalid_argument@std@@YAXPBD@Z(str) _Xinvalid_argument diff --git a/dlls/msvcp120_app/msvcp120_app.spec b/dlls/msvcp120_app/msvcp120_app.spec index a76149071c..a44c89fdc8 100644 --- a/dlls/msvcp120_app/msvcp120_app.spec +++ b/dlls/msvcp120_app/msvcp120_app.spec @@ -1790,9 +1790,9 @@ @ stub -arch=win64 ?_W_Gettnames@_Locinfo@std@@QEBA?AV_Timevec@2@XZ @ stub -arch=win32 ?_Winerror_map@std@@YAPBDH@Z @ stub -arch=win64 ?_Winerror_map@std@@YAPEBDH@Z -@ stub ?_XLgamma@std@@YAMM@Z -@ stub ?_XLgamma@std@@YANN@Z -@ stub ?_XLgamma@std@@YAOO@Z +@ cdecl ?_XLgamma@std@@YAMM@Z(float) msvcp120.?_XLgamma@std@@YAMM@Z +@ cdecl ?_XLgamma@std@@YANN@Z(double) msvcp120.?_XLgamma@std@@YANN@Z +@ cdecl ?_XLgamma@std@@YAOO@Z(double) msvcp120.?_XLgamma@std@@YAOO@Z @ cdecl ?_Xbad_alloc@std@@YAXXZ() msvcp120.?_Xbad_alloc@std@@YAXXZ @ stub ?_Xbad_function_call@std@@YAXXZ @ cdecl -arch=win32 ?_Xinvalid_argument@std@@YAXPBD@Z(str) msvcp120.?_Xinvalid_argument@std@@YAXPBD@Z diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index 70caad8dba..2563c7bfa7 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -1673,9 +1673,9 @@ @ cdecl -arch=win32 ?_Winerror_message@std@@YAKKPADK@Z(long ptr long) _Winerror_message @ cdecl -arch=win64 ?_Winerror_message@std@@YAKKPEADK@Z(long ptr long) _Winerror_message @ stub ?_XGetLastError@std@@YAXXZ -@ stub ?_XLgamma@std@@YAMM@Z -@ stub ?_XLgamma@std@@YANN@Z -@ stub ?_XLgamma@std@@YAOO@Z +@ cdecl ?_XLgamma@std@@YAMM@Z(float) std__XLgamma_float +@ cdecl ?_XLgamma@std@@YANN@Z(double) std__XLgamma_double +@ cdecl ?_XLgamma@std@@YAOO@Z(double) std__XLgamma_double @ cdecl ?_Xbad_alloc@std@@YAXXZ() _Xmem @ stub ?_Xbad_function_call@std@@YAXXZ @ cdecl -arch=win32 ?_Xinvalid_argument@std@@YAXPBD@Z(str) _Xinvalid_argument diff --git a/dlls/msvcp90/math.c b/dlls/msvcp90/math.c index 9bc7c0867d..4ebf8baaee 100644 --- a/dlls/msvcp90/math.c +++ b/dlls/msvcp90/math.c @@ -2362,3 +2362,36 @@ short __cdecl _FExp(float *x, float y, short scale) return dclass(*x); } + +/* ?_XLgamma@std@@YANN@Z */ +double __cdecl std__XLgamma_double(double z) +{ + /* Lanczos coefficients g=5, n=6 */ + static const double lc[] = { + 1.000000000190015, + 76.18009172947146, + -86.50532032941677, + 24.01409824083091, + -1.231739572450155, + 0.1208650973866179e-2, + -0.5395239384953e-5 + }; + static const double log_sqrt_2pi = 0.91893853320467274178; + + double base = z + 4.5, sum = 0; + int i; + + if (z < 0.5) return log(M_PI / sin(M_PI * z)) - std__XLgamma_double(1 - z); + + z--; + for(i = ARRAY_SIZE(lc) - 1; i >= 1; i--) + sum += lc[i] / (z + i); + sum += lc[0]; + return log_sqrt_2pi + log(sum) - base + log(base) * (z + 0.5); +} + +/* ?_XLgamma@tr1@std@@YAMM@Z */ +float __cdecl std__XLgamma_float(float z) +{ + return std__XLgamma_double(z); +} diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 6a5a9a20a4..c38dd041af 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -3185,9 +3185,9 @@ @ cdecl -arch=win64 ?_Widen_s@?$ctype@G@std@@QEBAPEBDPEBD0PEAG_K@Z(ptr ptr ptr ptr long) ctype_wchar__Widen_s @ thiscall -arch=win32 ?_Widen_s@?$ctype@_W@std@@QBEPBDPBD0PA_WI@Z(ptr ptr ptr ptr long) ctype_wchar__Widen_s @ cdecl -arch=win64 ?_Widen_s@?$ctype@_W@std@@QEBAPEBDPEBD0PEA_W_K@Z(ptr ptr ptr ptr long) ctype_wchar__Widen_s -@ stub ?_XLgamma@tr1@std@@YAMM@Z -@ stub ?_XLgamma@tr1@std@@YANN@Z -@ stub ?_XLgamma@tr1@std@@YAOO@Z +@ cdecl ?_XLgamma@tr1@std@@YAMM@Z(float) std__XLgamma_float +@ cdecl ?_XLgamma@tr1@std@@YANN@Z(double) std__XLgamma_double +@ cdecl ?_XLgamma@tr1@std@@YAOO@Z(double) std__XLgamma_double @ stub ?_Xbad@tr1@std@@YAXW4error_type@regex_constants@12@@Z @ stub -arch=win32 ?_Xfsopen@std@@YAPAU_iobuf@@PB_W0H@Z @ stub -arch=win64 ?_Xfsopen@std@@YAPEAU_iobuf@@PEB_W0H@Z

1 0

Hans Leidekker : webservices: Support WS_CHARSET_UTF16LE for buffer input.
by Alexandre Julliard 27 Mar '20

27 Mar '20

Module: wine Branch: master Commit: 18d32bfb55a85ddacb6ffe02f00969d451584fa3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=18d32bfb55a85ddacb6ffe02… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Mar 27 15:47:41 2020 +0100 webservices: Support WS_CHARSET_UTF16LE for buffer input. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 85 +++++++++++++++++++++++++++++------------ dlls/webservices/tests/reader.c | 2 +- 2 files changed, 61 insertions(+), 26 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 0d0e7d09f0..ffa789fb6e 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -395,7 +395,7 @@ struct reader WS_READ_CALLBACK input_cb; void *input_cb_state; struct xmlbuf *input_buf; - const unsigned char *input_data; + unsigned char *input_conv; ULONG input_size; ULONG text_conv_offset; unsigned char *stream_buf; @@ -519,6 +519,7 @@ static void free_reader( struct reader *reader ) clear_prefixes( reader->prefixes, reader->nb_prefixes ); heap_free( reader->prefixes ); heap_free( reader->stream_buf ); + heap_free( reader->input_conv ); reader->cs.DebugInfo->Spare[0] = 0; DeleteCriticalSection( &reader->cs ); @@ -6893,18 +6894,40 @@ static WS_CHARSET detect_charset( const unsigned char *data, ULONG size, ULONG * return ret; } -static void set_input_buffer( struct reader *reader, const unsigned char *data, ULONG size ) +static HRESULT utf16le_to_utf8( const unsigned char *data, ULONG size, unsigned char **buf, ULONG *buflen ) +{ + if (size % sizeof(WCHAR)) return E_INVALIDARG; + *buflen = WideCharToMultiByte( CP_UTF8, 0, (const WCHAR *)data, size / sizeof(WCHAR), NULL, 0, NULL, NULL ); + if (!(*buf = heap_alloc( *buflen ))) return E_OUTOFMEMORY; + WideCharToMultiByte( CP_UTF8, 0, (const WCHAR *)data, size / sizeof(WCHAR), (char *)*buf, *buflen, NULL, NULL ); + return S_OK; +} + +static HRESULT set_input_buffer( struct reader *reader, const unsigned char *data, ULONG size ) { reader->input_type = WS_XML_READER_INPUT_TYPE_BUFFER; reader->input_buf = NULL; - reader->input_data = data; - reader->input_size = size; - reader->read_size = reader->input_size; - reader->read_pos = 0; - reader->read_bufptr = reader->input_data; + if (reader->input_enc == WS_XML_READER_ENCODING_TYPE_TEXT && reader->input_charset == WS_CHARSET_UTF16LE) + { + unsigned char *buf; + ULONG buflen; + HRESULT hr; + + if ((hr = utf16le_to_utf8( data, size, &buf, &buflen )) != S_OK) return hr; + heap_free( reader->input_conv ); + reader->read_bufptr = reader->input_conv = buf; + reader->read_size = reader->input_size = buflen; + } + else + { + reader->read_bufptr = data; + reader->read_size = reader->input_size = size; + } + reader->read_pos = 0; reader->text_conv_offset = 0; + return S_OK; } static void set_input_stream( struct reader *reader, WS_READ_CALLBACK callback, void *state ) @@ -6913,7 +6936,6 @@ static void set_input_stream( struct reader *reader, WS_READ_CALLBACK callback, reader->input_cb = callback; reader->input_cb_state = state; reader->input_buf = NULL; - reader->input_data = reader->stream_buf; reader->input_size = STREAM_BUFSIZE; if (reader->read_pos >= reader->read_size) reader->read_size = 0; @@ -6922,9 +6944,8 @@ static void set_input_stream( struct reader *reader, WS_READ_CALLBACK callback, memmove( reader->stream_buf, reader->stream_buf + reader->read_pos, reader->read_size - reader->read_pos ); reader->read_size -= reader->read_pos; } - reader->read_pos = 0; - reader->read_bufptr = reader->input_data; - + reader->read_pos = 0; + reader->read_bufptr = reader->stream_buf; reader->text_conv_offset = 0; } @@ -6997,7 +7018,8 @@ HRESULT WINAPI WsSetInput( WS_XML_READER *handle, const WS_XML_READER_ENCODING * case WS_XML_READER_INPUT_TYPE_BUFFER: { const WS_XML_READER_BUFFER_INPUT *buf = (const WS_XML_READER_BUFFER_INPUT *)input; - set_input_buffer( reader, (const unsigned char *)buf->encodedData + offset, buf->encodedDataSize - offset ); + hr = set_input_buffer( reader, (const unsigned char *)buf->encodedData + offset, buf->encodedDataSize - offset ); + if (hr != S_OK) goto done; break; } case WS_XML_READER_INPUT_TYPE_STREAM: @@ -7026,22 +7048,35 @@ done: return hr; } -static void set_input_xml_buffer( struct reader *reader, struct xmlbuf *buf ) +static HRESULT set_input_xml_buffer( struct reader *reader, struct xmlbuf *xmlbuf ) { reader->input_type = WS_XML_READER_INPUT_TYPE_BUFFER; - reader->input_buf = buf; - reader->input_enc = buf->encoding; - reader->input_charset = buf->charset; - reader->input_data = buf->bytes.bytes; - reader->input_size = buf->bytes.length; - reader->dict_static = buf->dict_static; - reader->dict = buf->dict; - - reader->read_size = reader->input_size; - reader->read_pos = 0; - reader->read_bufptr = reader->input_data; + reader->input_buf = xmlbuf; + reader->input_enc = xmlbuf->encoding; + reader->input_charset = xmlbuf->charset; + reader->dict_static = xmlbuf->dict_static; + reader->dict = xmlbuf->dict; + + if (reader->input_enc == WS_XML_READER_ENCODING_TYPE_TEXT && reader->input_charset == WS_CHARSET_UTF16LE) + { + unsigned char *buf; + ULONG buflen; + HRESULT hr; + if ((hr = utf16le_to_utf8( xmlbuf->bytes.bytes, xmlbuf->bytes.length, &buf, &buflen )) != S_OK) return hr; + heap_free( reader->input_conv ); + reader->read_bufptr = reader->input_conv = buf; + reader->read_size = reader->input_size = buflen; + } + else + { + reader->read_bufptr = xmlbuf->bytes.bytes; + reader->read_size = reader->input_size = xmlbuf->bytes.length; + } + + reader->read_pos = 0; reader->text_conv_offset = 0; + return S_OK; } /************************************************************************** @@ -7078,7 +7113,7 @@ HRESULT WINAPI WsSetInputToBuffer( WS_XML_READER *handle, WS_XML_BUFFER *buffer, } if ((hr = init_reader( reader )) != S_OK) goto done; - set_input_xml_buffer( reader, xmlbuf ); + if ((hr = set_input_xml_buffer( reader, xmlbuf )) != S_OK) goto done; if (!(node = alloc_node( WS_XML_NODE_TYPE_BOF ))) hr = E_OUTOFMEMORY; else read_insert_bof( reader, node ); diff --git a/dlls/webservices/tests/reader.c b/dlls/webservices/tests/reader.c index 4b9b589d8d..7d56ebccd5 100644 --- a/dlls/webservices/tests/reader.c +++ b/dlls/webservices/tests/reader.c @@ -524,7 +524,7 @@ static void test_WsSetInput(void) found = -1; hr = WsReadToStartElement( reader, NULL, NULL, &found, NULL ); - todo_wine ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08x\n", hr ); if (hr == S_OK) { ok( found == TRUE, "got %d\n", found );

1 0

Hans Leidekker : webservices: Implement WS_TYPE_ATTRIBUTE_FIELD_MAPPING for the reader.
by Alexandre Julliard 27 Mar '20

27 Mar '20

Module: wine Branch: master Commit: df7e24ff136cfcbaf7999a6e93afe84f12d662ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=df7e24ff136cfcbaf7999a6e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Mar 27 15:47:40 2020 +0100 webservices: Implement WS_TYPE_ATTRIBUTE_FIELD_MAPPING for the reader. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 45 ++++++++++++++++++++++++------ dlls/webservices/tests/reader.c | 62 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 99 insertions(+), 8 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 4d37a38a8a..0d0e7d09f0 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -5968,6 +5968,29 @@ static HRESULT read_type_qname( struct reader *reader, WS_TYPE_MAPPING mapping, return S_OK; } +static HRESULT read_type_description( struct reader *reader, WS_TYPE_MAPPING mapping, + const WS_XML_STRING *localname, const WS_XML_STRING *ns, + const WS_STRUCT_DESCRIPTION *desc, WS_READ_OPTION option, + WS_HEAP *heap, void *ret, ULONG size, BOOL *found ) +{ + switch (option) + { + case WS_READ_REQUIRED_POINTER: + case WS_READ_OPTIONAL_POINTER: + { + if (size != sizeof(desc)) return E_INVALIDARG; + *(const WS_STRUCT_DESCRIPTION **)ret = desc; + *found = TRUE; + break; + } + default: + FIXME( "read option %u not supported\n", option ); + return E_NOTIMPL; + } + + return S_OK; +} + static BOOL is_empty_text_node( const struct node *node ) { const WS_XML_TEXT_NODE *text = (const WS_XML_TEXT_NODE *)node; @@ -6165,7 +6188,8 @@ static WS_READ_OPTION get_field_read_option( WS_TYPE type, ULONG options ) } } -static HRESULT read_type_field( struct reader *, const WS_FIELD_DESCRIPTION *, WS_HEAP *, char *, ULONG ); +static HRESULT read_type_field( struct reader *, const WS_STRUCT_DESCRIPTION *, const WS_FIELD_DESCRIPTION *, + WS_HEAP *, char *, ULONG ); static HRESULT read_type_union( struct reader *reader, const WS_UNION_DESCRIPTION *desc, WS_HEAP *heap, void *ret, ULONG size, BOOL *found ) @@ -6193,7 +6217,7 @@ static HRESULT read_type_union( struct reader *reader, const WS_UNION_DESCRIPTIO else { ULONG offset = desc->fields[i]->field.offset; - if ((hr = read_type_field( reader, &desc->fields[i]->field, heap, ret, offset )) != S_OK) return hr; + if ((hr = read_type_field( reader, NULL, &desc->fields[i]->field, heap, ret, offset )) != S_OK) return hr; *(int *)((char *)ret + desc->enumOffset) = desc->fields[i]->value; } @@ -6297,8 +6321,8 @@ static HRESULT read_type_text( struct reader *reader, const WS_FIELD_DESCRIPTION return hr; } -static HRESULT read_type_field( struct reader *reader, const WS_FIELD_DESCRIPTION *desc, WS_HEAP *heap, char *buf, - ULONG offset ) +static HRESULT read_type_field( struct reader *reader, const WS_STRUCT_DESCRIPTION *desc_struct, + const WS_FIELD_DESCRIPTION *desc, WS_HEAP *heap, char *buf, ULONG offset ) { char *ptr; WS_READ_OPTION option; @@ -6323,8 +6347,9 @@ static HRESULT read_type_field( struct reader *reader, const WS_FIELD_DESCRIPTIO switch (desc->mapping) { case WS_TYPE_ATTRIBUTE_FIELD_MAPPING: - FIXME( "WS_TYPE_ATTRIBUTE_FIELD_MAPPING not supported\n" ); - return S_OK; + hr = read_type( reader, WS_ATTRIBUTE_TYPE_MAPPING, desc->type, desc->localName, desc->ns, + desc_struct, option, heap, ptr, size, &found ); + break; case WS_ATTRIBUTE_FIELD_MAPPING: hr = read_type( reader, WS_ATTRIBUTE_TYPE_MAPPING, desc->type, desc->localName, desc->ns, @@ -6424,7 +6449,7 @@ static HRESULT read_type_struct( struct reader *reader, WS_TYPE_MAPPING mapping, for (i = 0; i < desc->fieldCount; i++) { offset = desc->fields[i]->offset; - if ((hr = read_type_field( reader, desc->fields[i], heap, buf, offset )) != S_OK) break; + if ((hr = read_type_field( reader, desc, desc->fields[i], heap, buf, offset )) != S_OK) break; } switch (option) @@ -6651,6 +6676,10 @@ static HRESULT read_type( struct reader *reader, WS_TYPE_MAPPING mapping, WS_TYP hr = read_type_qname( reader, mapping, localname, ns, desc, option, heap, value, size, found ); break; + case WS_DESCRIPTION_TYPE: + hr = read_type_description( reader, mapping, localname, ns, desc, option, heap, value, size, found ); + break; + case WS_STRUCT_TYPE: hr = read_type_struct( reader, mapping, localname, ns, desc, option, heap, value, size, found ); break; @@ -7419,7 +7448,7 @@ static ULONG get_field_size( const WS_FIELD_DESCRIPTION *desc ) static HRESULT read_param( struct reader *reader, const WS_FIELD_DESCRIPTION *desc, WS_HEAP *heap, void *ret ) { if (!ret && !(ret = ws_alloc_zero( heap, get_field_size(desc) ))) return WS_E_QUOTA_EXCEEDED; - return read_type_field( reader, desc, heap, ret, 0 ); + return read_type_field( reader, NULL, desc, heap, ret, 0 ); } static HRESULT read_param_array( struct reader *reader, const WS_FIELD_DESCRIPTION *desc, WS_HEAP *heap, diff --git a/dlls/webservices/tests/reader.c b/dlls/webservices/tests/reader.c index 733ebe3eb1..4b9b589d8d 100644 --- a/dlls/webservices/tests/reader.c +++ b/dlls/webservices/tests/reader.c @@ -6841,6 +6841,67 @@ static void test_stream_input(void) WsFreeReader( reader ); } +static void test_description_type(void) +{ + static WS_XML_STRING ns = {0, NULL}, ns2 = {2, (BYTE *)"ns"}, localname = {1, (BYTE *)"t"}; + static WS_XML_STRING val = {3, (BYTE *)"val"}; + HRESULT hr; + WS_XML_READER *reader; + WS_HEAP *heap; + WS_FIELD_DESCRIPTION f, f2, *fields[2]; + WS_STRUCT_DESCRIPTION s; + struct test + { + const WS_STRUCT_DESCRIPTION *desc; + INT32 val; + } *test; + + hr = WsCreateHeap( 1 << 16, 0, NULL, 0, &heap, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsCreateReader( NULL, 0, &reader, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + memset( &f, 0, sizeof(f) ); + f.mapping = WS_TYPE_ATTRIBUTE_FIELD_MAPPING; + f.type = WS_DESCRIPTION_TYPE; + fields[0] = &f; + + memset( &f2, 0, sizeof(f2) ); + f2.mapping = WS_ATTRIBUTE_FIELD_MAPPING; + f2.localName = &val; + f2.ns = &ns; + f2.offset = FIELD_OFFSET(struct test, val); + f2.type = WS_INT32_TYPE; + fields[1] = &f2; + + memset( &s, 0, sizeof(s) ); + s.size = sizeof(struct test); + s.alignment = TYPE_ALIGNMENT(struct test); + s.fields = fields; + s.fieldCount = 2; + s.typeLocalName = &localname; + s.typeNs = &ns; + + prepare_struct_type_test( reader, "<t val=\"-1\" xmlns=\"ns\"/>" ); + hr = WsReadToStartElement( reader, &localname, &ns2, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + test = NULL; + hr = WsReadType( reader, WS_ELEMENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, + WS_READ_REQUIRED_POINTER, heap, &test, sizeof(test), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( test != NULL, "test not set\n" ); + if (test) + { + ok( test->val == -1, "got %d\n", test->val ); + ok( test->desc == &s, "got %p\n", test->desc ); + } + + WsFreeReader( reader ); + WsFreeHeap( heap ); +} + START_TEST(reader) { test_WsCreateError(); @@ -6891,4 +6952,5 @@ START_TEST(reader) test_repeating_element_choice(); test_empty_text_field(); test_stream_input(); + test_description_type(); }

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 March 2020