wine-commits March 2020

wine-commits@winehq.org

1 participants
996 discussions

Francois Gouget : testbot/build: Build Wine using -Werror if possible.
by Alexandre Julliard 27 Mar '20

27 Mar '20

Module: tools Branch: master Commit: 4936ba2e33c0fbb131f45c97399c68bf57b2476f URL: https://source.winehq.org/git/tools.git/?a=commit;h=4936ba2e33c0fbb131f45c9… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 25 23:43:55 2020 +0100 testbot/build: Build Wine using -Werror if possible. Warnings are very dependent on the compiler version. So make sure the TestBot will not break in case the pristine source triggers a compiler warning: first try with -Werror and build without it as a fallback. Compiling the patches then uses the same settings. Let the BuildWine() callers specify whether to try compiling with -Werror to accommodate both the *Reconfig.pl and regular build cases. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/build/Build.pl | 4 ++-- testbot/bin/build/Reconfig.pl | 14 ++++++++------ testbot/bin/build/WineReconfig.pl | 16 +++++++++------- testbot/bin/build/WineTest.pl | 6 +++--- testbot/lib/Build/Utils.pm | 26 ++++++++++++++++++++------ 5 files changed, 42 insertions(+), 24 deletions(-) diff --git a/testbot/bin/build/Build.pl b/testbot/bin/build/Build.pl index b2c13c8..23ab685 100755 --- a/testbot/bin/build/Build.pl +++ b/testbot/bin/build/Build.pl @@ -167,8 +167,8 @@ if ($DataDir =~ /'/) my $Impacts = ApplyPatch("wine", $PatchFile); if (!$Impacts or - !BuildWine($TaskMissions, "no-rm", "exe32", undef, "buildtests") or - !BuildWine($TaskMissions, "no-rm", "exe64", undef, "buildtests")) + !BuildWine($TaskMissions, 0, "exe32", undef, "buildtests") or + !BuildWine($TaskMissions, 0, "exe64", undef, "buildtests")) { exit(1); } diff --git a/testbot/bin/build/Reconfig.pl b/testbot/bin/build/Reconfig.pl index dd403ef..b72fa73 100755 --- a/testbot/bin/build/Reconfig.pl +++ b/testbot/bin/build/Reconfig.pl @@ -53,12 +53,13 @@ use WineTestBot::Missions; sub UpdateWineBuilds($$) { - my ($TaskMissions, $NoRm) = @_; + my ($TaskMissions, $Flags) = @_; + $Flags |= $Build::Utils::TRY_WERROR; my $Configure = "--without-x --without-freetype --disable-winetest"; - return BuildWine($TaskMissions, $NoRm, "exe32", + return BuildWine($TaskMissions, $Flags, "exe32", $Configure, "buildtests") && - BuildWine($TaskMissions, $NoRm, "exe64", + BuildWine($TaskMissions, $Flags, "exe64", "$Configure --enable-win64", "buildtests"); } @@ -67,7 +68,8 @@ sub UpdateWineBuilds($$) # Setup and command line processing # -my ($Usage, $OptUpdate, $OptBuild, $OptNoRm, $MissionStatement); +my ($Usage, $OptUpdate, $OptBuild, $MissionStatement); +my $OptBuildFlags = $Build::Utils::FROM_SCRATCH; while (@ARGV) { my $Arg = shift @ARGV; @@ -81,7 +83,7 @@ while (@ARGV) } elsif ($Arg eq "--no-rm") { - $OptNoRm = 1; + $OptBuildFlags &= ~$Build::Utils::FROM_SCRATCH; } elsif ($Arg =~ /^(?:-\?|-h|--help)$/) { @@ -180,7 +182,7 @@ exit(1) if ($OptBuild and !BuildNativeTestAgentd()); exit(1) if ($OptBuild and !BuildWindowsTestAgentd()); exit(1) if ($OptBuild and !BuildTestLauncher()); exit(1) if ($OptUpdate and !GitPull("wine")); -exit(1) if ($OptBuild and !UpdateWineBuilds($TaskMissions, $OptNoRm)); +exit(1) if ($OptBuild and !UpdateWineBuilds($TaskMissions, $OptBuildFlags)); LogMsg "ok\n"; exit; diff --git a/testbot/bin/build/WineReconfig.pl b/testbot/bin/build/WineReconfig.pl index 383c6bf..0c64fc3 100755 --- a/testbot/bin/build/WineReconfig.pl +++ b/testbot/bin/build/WineReconfig.pl @@ -52,11 +52,12 @@ use WineTestBot::Utils qw(ShQuote); sub UpdateWineBuilds($$) { - my ($TaskMissions, $NoRm) = @_; + my ($TaskMissions, $Flags) = @_; - return BuildWine($TaskMissions, $NoRm, "win32", "") && - BuildWine($TaskMissions, $NoRm, "wow64", "--enable-win64") && - BuildWine($TaskMissions, $NoRm, "wow32", "--with-wine64=". + $Flags |= $Build::Utils::TRY_WERROR; + return BuildWine($TaskMissions, $Flags, "win32", "") && + BuildWine($TaskMissions, $Flags, "wow64", "--enable-win64") && + BuildWine($TaskMissions, $Flags, "wow32", "--with-wine64=". ShQuote("$DataDir/wine-wow64")); } @@ -107,7 +108,8 @@ sub UpdateWinePrefixes($) # Setup and command line processing # -my ($Usage, $OptUpdate, $OptBuild, $OptNoRm, $OptAddOns, $OptWinePrefix, $MissionStatement); +my ($Usage, $OptUpdate, $OptBuild, $OptAddOns, $OptWinePrefix, $MissionStatement); +my $OptBuildFlags = $Build::Utils::FROM_SCRATCH; while (@ARGV) { my $Arg = shift @ARGV; @@ -121,7 +123,7 @@ while (@ARGV) } elsif ($Arg eq "--no-rm") { - $OptNoRm = 1; + $OptBuildFlags &= ~$Build::Utils::FROM_SCRATCH; } elsif ($Arg eq "--addons") { @@ -234,7 +236,7 @@ exit(1) if ($OptBuild and !BuildNativeTestAgentd()); exit(1) if ($OptBuild and !BuildTestLauncher()); exit(1) if ($OptUpdate and !GitPull("wine")); exit(1) if ($OptAddOns and !UpdateAddOns()); -exit(1) if ($OptBuild and !UpdateWineBuilds($TaskMissions, $OptNoRm)); +exit(1) if ($OptBuild and !UpdateWineBuilds($TaskMissions, $OptBuildFlags)); exit(1) if ($OptWinePrefix and !UpdateWinePrefixes($TaskMissions)); LogMsg "ok\n"; diff --git a/testbot/bin/build/WineTest.pl b/testbot/bin/build/WineTest.pl index 1a75076..84ba1cb 100755 --- a/testbot/bin/build/WineTest.pl +++ b/testbot/bin/build/WineTest.pl @@ -423,9 +423,9 @@ if ($Action eq "testpatch") { $Impacts = ApplyPatch("wine", "$DataDir/staging/$FileName"); exit(1) if (!$Impacts or - !BuildWine($TaskMissions, "no-rm", "win32", undef) or - !BuildWine($TaskMissions, "no-rm", "wow64", undef) or - !BuildWine($TaskMissions, "no-rm", "wow32", undef)); + !BuildWine($TaskMissions, 0, "win32", undef) or + !BuildWine($TaskMissions, 0, "wow64", undef) or + !BuildWine($TaskMissions, 0, "wow32", undef)); } foreach my $Mission (@{$TaskMissions->{Missions}}) { diff --git a/testbot/lib/Build/Utils.pm b/testbot/lib/Build/Utils.pm index 3050be1..df236fa 100644 --- a/testbot/lib/Build/Utils.pm +++ b/testbot/lib/Build/Utils.pm @@ -317,22 +317,36 @@ sub BuildTestLauncher() return 1; } +our $FROM_SCRATCH = 1; +our $TRY_WERROR = 2; + sub BuildWine($$$$;$) { - my ($TaskMissions, $NoRm, $Build, $Configure, $Targets) = @_; + my ($TaskMissions, $Flags, $Build, $Configure, $Targets) = @_; $Targets ||= ""; return 1 if (!$TaskMissions->{Builds}->{$Build}); # Rebuild from scratch to make sure cruft will not accumulate - rmtree "$DataDir/wine-$Build" if (!$NoRm); + rmtree "$DataDir/wine-$Build" if ($Flags & $FROM_SCRATCH); mkdir "$DataDir/wine-$Build" if (!-d "$DataDir/wine-$Build"); InfoMsg "\nRebuilding the $Build Wine\n"; my $CPUCount = GetCPUCount(); - system("cd '$DataDir/wine-$Build' && set -x && ". - (defined $Configure ? "time ../wine/configure $Configure && " : ""). - "time make -j$CPUCount $Targets"); - if ($? != 0) + my $Rc = 1; + if (defined $Configure and ($Flags & $TRY_WERROR)) + { + $Rc = system("cd '$DataDir/wine-$Build' && set -x && ". + "time ../wine/configure $Configure --enable-werror && ". + "time make -j$CPUCount $Targets"); + LogMsg "With -Werror the $Build Wine build fails\n" if ($Rc); + } + if ($Rc) + { + $Rc = system("cd '$DataDir/wine-$Build' && set -x && ". + (defined $Configure ? "time ../wine/configure $Configure && " : ""). + "time make -j$CPUCount $Targets"); + } + if ($Rc) { LogMsg "The $Build Wine build failed\n"; return !1;

1 0

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

26 Mar '20

Module: wine Branch: master Commit: 8baf4a2a556d0e82663f882801093cf2b82c1223 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8baf4a2a556d0e82663f8828… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Mar 24 18:49:58 2020 +0200 jscript/tests: Add tests for persistent named items. 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/jscript/tests/jscript.c | 96 +++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 91 insertions(+), 5 deletions(-) diff --git a/dlls/jscript/tests/jscript.c b/dlls/jscript/tests/jscript.c index d79b974e9b..64b3588997 100644 --- a/dlls/jscript/tests/jscript.c +++ b/dlls/jscript/tests/jscript.c @@ -105,10 +105,12 @@ DEFINE_EXPECT(OnEnterScript); DEFINE_EXPECT(OnLeaveScript); DEFINE_EXPECT(OnScriptError); DEFINE_EXPECT(GetIDsOfNames); +DEFINE_EXPECT(GetIDsOfNames_persistent); DEFINE_EXPECT(GetItemInfo_global); DEFINE_EXPECT(GetItemInfo_global_code); DEFINE_EXPECT(GetItemInfo_visible); DEFINE_EXPECT(GetItemInfo_visible_code); +DEFINE_EXPECT(GetItemInfo_persistent); DEFINE_EXPECT(testCall); static const CLSID *engine_clsid = &CLSID_JScript; @@ -146,7 +148,7 @@ static ULONG WINAPI Dispatch_Release(IDispatch *iface) return 1; } -static ULONG global_named_item_ref, visible_named_item_ref, visible_code_named_item_ref; +static ULONG global_named_item_ref, visible_named_item_ref, visible_code_named_item_ref, persistent_named_item_ref; static ULONG WINAPI global_AddRef(IDispatch *iface) { @@ -178,6 +180,16 @@ static ULONG WINAPI visible_code_Release(IDispatch *iface) return --visible_code_named_item_ref; } +static ULONG WINAPI persistent_AddRef(IDispatch *iface) +{ + return ++persistent_named_item_ref; +} + +static ULONG WINAPI persistent_Release(IDispatch *iface) +{ + return --persistent_named_item_ref; +} + static HRESULT WINAPI Dispatch_GetTypeInfoCount(IDispatch *iface, UINT *pctinfo) { ok(0, "unexpected call\n"); @@ -202,6 +214,15 @@ static HRESULT WINAPI Dispatch_GetIDsOfNames(IDispatch *iface, REFIID riid, LPOL return DISP_E_UNKNOWNNAME; } +static HRESULT WINAPI persistent_GetIDsOfNames(IDispatch *iface, REFIID riid, LPOLESTR *names, UINT name_cnt, + LCID lcid, DISPID *ids) +{ + ok(name_cnt == 1, "name_cnt = %u\n", name_cnt); + + CHECK_EXPECT2(GetIDsOfNames_persistent); + 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) { @@ -261,6 +282,18 @@ static const IDispatchVtbl visible_code_named_item_vtbl = { static IDispatch visible_code_named_item = { &visible_code_named_item_vtbl }; +static const IDispatchVtbl persistent_named_item_vtbl = { + Dispatch_QueryInterface, + persistent_AddRef, + persistent_Release, + Dispatch_GetTypeInfoCount, + Dispatch_GetTypeInfo, + persistent_GetIDsOfNames, + Dispatch_Invoke +}; + +static IDispatch persistent_named_item = { &persistent_named_item_vtbl }; + static HRESULT WINAPI ActiveScriptSite_QueryInterface(IActiveScriptSite *iface, REFIID riid, void **ppv) { *ppv = NULL; @@ -320,6 +353,12 @@ static HRESULT WINAPI ActiveScriptSite_GetItemInfo(IActiveScriptSite *iface, LPC *ppiunkItem = (IUnknown*)&visible_code_named_item; return S_OK; } + if(!wcscmp(pstrName, L"persistent")) { + CHECK_EXPECT(GetItemInfo_persistent); + IDispatch_AddRef(&persistent_named_item); + *ppiunkItem = (IUnknown*)&persistent_named_item; + return S_OK; + } ok(0, "unexpected call %s\n", wine_dbgstr_w(pstrName)); return E_NOTIMPL; } @@ -1163,6 +1202,8 @@ static void test_named_items(void) ok(hr == E_UNEXPECTED, "AddNamedItem returned: %08x\n", hr); hr = IActiveScript_AddNamedItem(script, L"codeOnlyItem", SCRIPTITEM_CODEONLY); ok(hr == E_UNEXPECTED, "AddNamedItem returned: %08x\n", hr); + hr = IActiveScript_AddNamedItem(script, L"persistent", SCRIPTITEM_ISPERSISTENT | SCRIPTITEM_CODEONLY); + ok(hr == E_UNEXPECTED, "AddNamedItem returned: %08x\n", hr); SET_EXPECT(GetLCID); hr = IActiveScript_SetScriptSite(script, &ActiveScriptSite); @@ -1180,10 +1221,13 @@ static void test_named_items(void) ok(hr == S_OK, "AddNamedItem failed: %08x\n", hr); hr = IActiveScript_AddNamedItem(script, L"codeOnlyItem", SCRIPTITEM_CODEONLY); ok(hr == S_OK, "AddNamedItem failed: %08x\n", hr); + hr = IActiveScript_AddNamedItem(script, L"persistent", SCRIPTITEM_ISPERSISTENT | SCRIPTITEM_CODEONLY); + ok(hr == S_OK, "AddNamedItem failed: %08x\n", hr); ok(global_named_item_ref > 0, "global_named_item_ref = %u\n", global_named_item_ref); ok(visible_named_item_ref == 0, "visible_named_item_ref = %u\n", visible_named_item_ref); ok(visible_code_named_item_ref == 0, "visible_code_named_item_ref = %u\n", visible_code_named_item_ref); + ok(persistent_named_item_ref == 0, "persistent_named_item_ref = %u\n", persistent_named_item_ref); hr = IActiveScript_GetScriptDispatch(script, L"noContext", &disp); ok(hr == E_INVALIDARG, "GetScriptDispatch returned: %08x\n", hr); @@ -1267,6 +1311,7 @@ static void test_named_items(void) ok(global_named_item_ref > 0, "global_named_item_ref = %u\n", global_named_item_ref); ok(visible_named_item_ref > 0, "visible_named_item_ref = %u\n", visible_named_item_ref); ok(visible_code_named_item_ref > 0, "visible_code_named_item_ref = %u\n", visible_code_named_item_ref); + ok(persistent_named_item_ref == 0, "persistent_named_item_ref = %u\n", persistent_named_item_ref); SET_EXPECT(testCall); parse_script(parse, L"visibleItem.testCall();"); @@ -1433,6 +1478,28 @@ static void test_named_items(void) IDispatchEx_Release(dispex2); 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); + 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"x = 10;\n", L"persistent", 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"x", L"persistent", NULL, NULL, 0, 0, SCRIPTTEXT_ISEXPRESSION, &var, NULL); + ok(hr == S_OK, "ParseScriptText failed: %08x\n", hr); + ok(V_VT(&var) == VT_I4 && V_I4(&var) == 10, "Unexpected 'x': V_VT = %d, V_I4 = %d\n", V_VT(&var), V_I4(&var)); + CHECK_CALLED(OnEnterScript); + CHECK_CALLED(OnLeaveScript); + + dispex = get_script_dispatch(script, L"persistent"); + /* reinitialize script engine */ SET_EXPECT(OnStateChange_DISCONNECTED); @@ -1448,30 +1515,48 @@ static void test_named_items(void) ok(global_named_item_ref == 0, "global_named_item_ref = %u\n", global_named_item_ref); ok(visible_named_item_ref == 0, "visible_named_item_ref = %u\n", visible_named_item_ref); ok(visible_code_named_item_ref == 0, "visible_code_named_item_ref = %u\n", visible_code_named_item_ref); + ok(persistent_named_item_ref == 0, "persistent_named_item_ref = %u\n", persistent_named_item_ref); hr = IActiveScript_GetScriptDispatch(script, L"codeOnlyItem", &disp); ok(hr == E_UNEXPECTED, "hr = %08x, expected E_UNEXPECTED\n", hr); SET_EXPECT(GetLCID); SET_EXPECT(OnStateChange_INITIALIZED); + SET_EXPECT(GetItemInfo_persistent); hr = IActiveScript_SetScriptSite(script, &ActiveScriptSite); ok(hr == S_OK, "SetScriptSite failed: %08x\n", hr); CHECK_CALLED(GetLCID); CHECK_CALLED(OnStateChange_INITIALIZED); + CHECK_CALLED(GetItemInfo_persistent); + ok(persistent_named_item_ref > 0, "persistent_named_item_ref = %u\n", persistent_named_item_ref); hr = IActiveScript_AddNamedItem(script, L"codeOnlyItem", SCRIPTITEM_CODEONLY); ok(hr == S_OK, "AddNamedItem failed: %08x\n", hr); SET_EXPECT(OnStateChange_CONNECTED); - SET_EXPECT_MULTI(OnEnterScript, 4); - SET_EXPECT_MULTI(OnLeaveScript, 4); + SET_EXPECT_MULTI(OnEnterScript, 5); + SET_EXPECT_MULTI(OnLeaveScript, 5); + SET_EXPECT(GetIDsOfNames_persistent); hr = IActiveScript_SetScriptState(script, SCRIPTSTATE_CONNECTED); ok(hr == S_OK, "SetScriptState(SCRIPTSTATE_CONNECTED) failed: %08x\n", hr); CHECK_CALLED(OnStateChange_CONNECTED); - CHECK_CALLED_MULTI(OnEnterScript, 4); - CHECK_CALLED_MULTI(OnLeaveScript, 4); + CHECK_CALLED_MULTI(OnEnterScript, 5); + CHECK_CALLED_MULTI(OnLeaveScript, 5); + todo_wine CHECK_CALLED(GetIDsOfNames_persistent); test_state(script, SCRIPTSTATE_CONNECTED); + dispex2 = get_script_dispatch(script, L"persistent"); + ok(dispex != dispex2, "Same script dispatch returned for \"persistent\" named item\n"); + IDispatchEx_Release(dispex2); + IDispatchEx_Release(dispex); + SET_EXPECT(OnEnterScript); + SET_EXPECT(OnLeaveScript); + hr = IActiveScriptParse_ParseScriptText(parse, L"x", L"persistent", NULL, NULL, 0, 0, SCRIPTTEXT_ISEXPRESSION, &var, NULL); + ok(hr == S_OK, "ParseScriptText failed: %08x\n", hr); + ok(V_VT(&var) == VT_I4 && V_I4(&var) == 13, "Unexpected 'x': V_VT = %d, V_I4 = %d\n", V_VT(&var), V_I4(&var)); + CHECK_CALLED(OnEnterScript); + CHECK_CALLED(OnLeaveScript); + dispex = get_script_dispatch(script, NULL); for (i = 0; i < ARRAY_SIZE(global_idents); i++) { @@ -1592,6 +1677,7 @@ static void test_named_items(void) ok(global_named_item_ref == 0, "global_named_item_ref = %u\n", global_named_item_ref); ok(visible_named_item_ref == 0, "visible_named_item_ref = %u\n", visible_named_item_ref); ok(visible_code_named_item_ref == 0, "visible_code_named_item_ref = %u\n", visible_code_named_item_ref); + ok(persistent_named_item_ref == 0, "persistent_named_item_ref = %u\n", persistent_named_item_ref); test_state(script, SCRIPTSTATE_CLOSED); IActiveScriptParse_Release(parse);

1 0

Gabriel Ivăncescu : jscript: Implement persistent named items.
by Alexandre Julliard 26 Mar '20

26 Mar '20

Module: wine Branch: master Commit: f2c4594505d101dfc336be1c085c68b30f5c5563 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f2c4594505d101dfc336be1c… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Mar 24 18:49:57 2020 +0200 jscript: Implement persistent named items. 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/jscript/jscript.c | 44 ++++++++++++++++++++++++++++++++++++-------- 1 file changed, 36 insertions(+), 8 deletions(-) diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index d6fa7c9ea1..3fcaab0858 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -414,6 +414,15 @@ static void release_persistent_script_objs(JScript *This) release_named_item_script_obj(iter->named_item); } +static void release_named_item_list(JScript *This) +{ + while(!list_empty(&This->ctx->named_items)) { + named_item_t *iter = LIST_ENTRY(list_head(&This->ctx->named_items), named_item_t, entry); + list_remove(&iter->entry); + release_named_item(iter); + } +} + static void exec_queued_code(JScript *This) { bytecode_t *iter; @@ -433,6 +442,8 @@ static void exec_queued_code(JScript *This) static void decrease_state(JScript *This, SCRIPTSTATE state) { + named_item_t *item, *item_next; + if(This->ctx) { switch(This->ctx->state) { case SCRIPTSTATE_CONNECTED: @@ -453,14 +464,19 @@ static void decrease_state(JScript *This, SCRIPTSTATE state) clear_script_queue(This); release_persistent_script_objs(This); - while(!list_empty(&This->ctx->named_items)) { - named_item_t *iter = LIST_ENTRY(list_head(&This->ctx->named_items), named_item_t, entry); - - list_remove(&iter->entry); - if(iter->disp) - IDispatch_Release(iter->disp); - release_named_item_script_obj(iter); - release_named_item(iter); + LIST_FOR_EACH_ENTRY_SAFE(item, item_next, &This->ctx->named_items, named_item_t, entry) + { + if(item->disp) + { + IDispatch_Release(item->disp); + item->disp = NULL; + } + release_named_item_script_obj(item); + if(!(item->flags & SCRIPTITEM_ISPERSISTENT)) + { + list_remove(&item->entry); + release_named_item(item); + } } if(This->ctx->secmgr) { @@ -688,6 +704,7 @@ static HRESULT WINAPI JScript_SetScriptSite(IActiveScript *iface, IActiveScriptSite *pass) { JScript *This = impl_from_IActiveScript(iface); + named_item_t *item; LCID lcid; HRESULT hres; @@ -732,6 +749,16 @@ static HRESULT WINAPI JScript_SetScriptSite(IActiveScript *iface, } } + /* Retrieve new dispatches for persistent named items */ + LIST_FOR_EACH_ENTRY(item, &This->ctx->named_items, named_item_t, entry) + { + if(!item->disp) + { + hres = retrieve_named_item_disp(pass, item); + if(FAILED(hres)) return hres; + } + } + This->site = pass; IActiveScriptSite_AddRef(This->site); @@ -829,6 +856,7 @@ static HRESULT WINAPI JScript_Close(IActiveScript *iface) decrease_state(This, SCRIPTSTATE_CLOSED); clear_persistent_code_list(This); + release_named_item_list(This); return S_OK; }

1 0

Gabriel Ivăncescu : jscript: Retrieve the item's dispatch in a helper function.
by Alexandre Julliard 26 Mar '20

26 Mar '20

Module: wine Branch: master Commit: 70d8c011d205f5f91939524fe79b14307016e8b5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=70d8c011d205f5f91939524f… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Mar 24 18:49:56 2020 +0200 jscript: Retrieve the item's dispatch in a helper function. 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/jscript/jscript.c | 45 +++++++++++++++++++++++++++------------------ 1 file changed, 27 insertions(+), 18 deletions(-) diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index 31277c6fec..d6fa7c9ea1 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -129,6 +129,30 @@ static void release_named_item_script_obj(named_item_t *item) item->script_obj = NULL; } +static HRESULT retrieve_named_item_disp(IActiveScriptSite *site, named_item_t *item) +{ + IUnknown *unk; + HRESULT hr; + + if(!site) + return E_UNEXPECTED; + + hr = IActiveScriptSite_GetItemInfo(site, item->name, SCRIPTINFO_IUNKNOWN, &unk, NULL); + if(FAILED(hr)) { + WARN("GetItemInfo failed: %08x\n", hr); + return hr; + } + + hr = IUnknown_QueryInterface(unk, &IID_IDispatch, (void**)&item->disp); + IUnknown_Release(unk); + if(FAILED(hr)) { + WARN("object does not implement IDispatch\n"); + return hr; + } + + return S_OK; +} + named_item_t *lookup_named_item(script_ctx_t *ctx, const WCHAR *item_name, unsigned flags) { named_item_t *item; @@ -140,25 +164,10 @@ named_item_t *lookup_named_item(script_ctx_t *ctx, const WCHAR *item_name, unsig hr = create_named_item_script_obj(ctx, item); if(FAILED(hr)) return NULL; } + if(!item->disp && (flags || !(item->flags & SCRIPTITEM_CODEONLY))) { - IUnknown *unk; - - if(!ctx->site) - return NULL; - - hr = IActiveScriptSite_GetItemInfo(ctx->site, item_name, - SCRIPTINFO_IUNKNOWN, &unk, NULL); - if(FAILED(hr)) { - WARN("GetItemInfo failed: %08x\n", hr); - continue; - } - - hr = IUnknown_QueryInterface(unk, &IID_IDispatch, (void**)&item->disp); - IUnknown_Release(unk); - if(FAILED(hr)) { - WARN("object does not implement IDispatch\n"); - continue; - } + hr = retrieve_named_item_disp(ctx->site, item); + if(FAILED(hr)) continue; } return item;

1 0

Jacek Caban : oleaut32: Fix handling dual interfaces in ITypeInfo::GetRefTypeInfo.
by Alexandre Julliard 26 Mar '20

26 Mar '20

Module: wine Branch: master Commit: 8fac69ba50d957599869d6a62355efaf0f68f182 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8fac69ba50d957599869d6a6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 26 20:54:17 2020 +0100 oleaut32: Fix handling dual interfaces in ITypeInfo::GetRefTypeInfo. Based on patch by Puetz Kevin. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/tmarshal.idl | 23 ++++++++++++++++ dlls/oleaut32/tests/typelib.c | 58 +++++++++++++++++++++++++++++++++++++-- dlls/oleaut32/typelib.c | 59 ++++++++++++++++++++++++---------------- 3 files changed, 114 insertions(+), 26 deletions(-) diff --git a/dlls/oleaut32/tests/tmarshal.idl b/dlls/oleaut32/tests/tmarshal.idl index 9182def313..a594f9137d 100644 --- a/dlls/oleaut32/tests/tmarshal.idl +++ b/dlls/oleaut32/tests/tmarshal.idl @@ -582,4 +582,27 @@ cpp_quote("struct Coclass3 { ICoclass1 *iface; };") interface ItestIF7; } + [ + object, + uuid(ec236d8e-2cc7-44f2-b394-46c86ff3da74), + dual, + oleautomation + ] + interface ItestIF12 : IDispatch + { + [id(0x1234)] HRESULT fn4([in] int a); + [id(0x1235)] HRESULT fn5([in] int a); + } + + [ + object, + uuid(f711b105-554d-4751-818c-56fcc5d7c0d5), + dual, + oleautomation + ] + interface ItestIF13 : ItestIF12 + { + [id(0x1236)] HRESULT fn6([in] GUID a); + } + }; diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 75f8d78f07..5e5b44a034 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -1577,7 +1577,7 @@ static void test_inheritance(void) { HRESULT hr; ITypeLib *pTL; - ITypeInfo *pTI, *pTI_p; + ITypeInfo *pTI, *pTI_p, *dual_ti; TYPEATTR *pTA; HREFTYPE href; FUNCDESC *pFD; @@ -1720,7 +1720,7 @@ static void test_inheritance(void) hr = ITypeInfo_GetTypeAttr(pTI, &pTA); ok(hr == S_OK, "hr %08x\n", hr); ok(pTA->typekind == TKIND_DISPATCH, "kind %04x\n", pTA->typekind); - ok(pTA->cbSizeVft == 7 * sizeof(void *), "sizevft %d\n", pTA->cbSizeVft); + ok(pTA->cbSizeVft == sizeof(IDispatchVtbl), "sizevft %d\n", pTA->cbSizeVft); ok(pTA->wTypeFlags == TYPEFLAG_FDISPATCHABLE, "typeflags %x\n", pTA->wTypeFlags); ok(pTA->cFuncs == 3, "cfuncs %d\n", pTA->cFuncs); ok(pTA->cImplTypes == 1, "cimpltypes %d\n", pTA->cImplTypes); @@ -1815,6 +1815,60 @@ static void test_inheritance(void) ITypeInfo_ReleaseFuncDesc(pTI, pFD); ITypeInfo_Release(pTI); + /* ItestIF13 is dual with inherited dual ifaces */ + hr = ITypeLib_GetTypeInfoOfGuid(pTL, &IID_ItestIF13, &pTI); + ok(hr == S_OK, "hr %08x\n", hr); + + hr = ITypeInfo_GetTypeAttr(pTI, &pTA); + ok(hr == S_OK, "hr %08x\n", hr); + ok(pTA->typekind == TKIND_DISPATCH, "kind %04x\n", pTA->typekind); + ok(pTA->cbSizeVft == 7 * sizeof(void *), "sizevft %d\n", pTA->cbSizeVft); + ok(pTA->wTypeFlags == (TYPEFLAG_FDISPATCHABLE|TYPEFLAG_FDUAL), "typeflags %x\n", pTA->wTypeFlags); + ok(pTA->cFuncs == 10, "cfuncs %d\n", pTA->cFuncs); + ok(pTA->cImplTypes == 1, "cimpltypes %d\n", pTA->cImplTypes); + ITypeInfo_ReleaseTypeAttr(pTI, pTA); + + hr = ITypeInfo_GetRefTypeOfImplType(pTI, 0, &href); + ok(hr == S_OK, "hr %08x\n", hr); + hr = ITypeInfo_GetRefTypeInfo(pTI, href, &pTI_p); + ok(hr == S_OK, "hr %08x\n", hr); + hr = ITypeInfo_GetTypeAttr(pTI_p, &pTA); + ok(hr == S_OK, "got %08x\n", hr); + ok(IsEqualGUID(&pTA->guid, &IID_IDispatch), "guid %s\n", wine_dbgstr_guid(&pTA->guid)); + ITypeInfo_ReleaseTypeAttr(pTI_p, pTA); + + hr = ITypeInfo_GetFuncDesc(pTI, 9, &pFD); + ok(hr == S_OK, "hr %08x\n", hr); + ok(pFD->memid == 0x1236, "memid %08x\n", pFD->memid); + ITypeInfo_ReleaseFuncDesc(pTI, pFD); + + hr = ITypeInfo_GetRefTypeInfo(pTI, -2, &dual_ti); + ok(hr == S_OK, "hr %08x\n", hr); + + hr = ITypeInfo_GetTypeAttr(dual_ti, &pTA); + ok(hr == S_OK, "hr %08x\n", hr); + ok(pTA->typekind == TKIND_INTERFACE, "kind %04x\n", pTA->typekind); + ok(pTA->cbSizeVft == sizeof(ItestIF13Vtbl), "sizevft %d\n", pTA->cbSizeVft); + ok(pTA->wTypeFlags == (TYPEFLAG_FDISPATCHABLE|TYPEFLAG_FOLEAUTOMATION|TYPEFLAG_FDUAL), "typeflags %x\n", pTA->wTypeFlags); + ok(pTA->cFuncs == 1, "cfuncs %d\n", pTA->cFuncs); + ok(pTA->cImplTypes == 1, "cimpltypes %d\n", pTA->cImplTypes); + ITypeInfo_ReleaseTypeAttr(dual_ti, pTA); + + hr = ITypeInfo_GetRefTypeOfImplType(dual_ti, 0, &href); + ok(hr == S_OK, "hr %08x\n", hr); + hr = ITypeInfo_GetRefTypeInfo(dual_ti, href, &pTI_p); + ok(hr == S_OK, "hr %08x\n", hr); + hr = ITypeInfo_GetTypeAttr(pTI_p, &pTA); + ok(hr == S_OK, "got %08x\n", hr); + ok(pTA->typekind == TKIND_INTERFACE, "kind %04x\n", pTA->typekind); + ok(pTA->cbSizeVft == sizeof(ItestIF12Vtbl), "sizevft %d\n", pTA->cbSizeVft); + ok(IsEqualGUID(&pTA->guid, &IID_ItestIF12), "guid %s\n", wine_dbgstr_guid(&pTA->guid)); + ITypeInfo_ReleaseTypeAttr(pTI_p, pTA); + ITypeInfo_Release(pTI_p); + + ITypeInfo_Release(dual_ti); + ITypeInfo_Release(pTI); + ITypeLib_Release(pTL); return; diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 68c31e1d88..f8d7136834 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -7911,7 +7911,10 @@ static HRESULT WINAPI ITypeInfo_fnGetRefTypeInfo( ITypeInfo **ppTInfo) { ITypeInfoImpl *This = impl_from_ITypeInfo2(iface); + ITypeInfo *type_info = NULL; HRESULT result = E_FAIL; + TLBRefType *ref_type; + UINT i; if(!ppTInfo) return E_INVALIDARG; @@ -7944,32 +7947,32 @@ static HRESULT WINAPI ITypeInfo_fnGetRefTypeInfo( * refcount goes to zero, but we need to signal to the new instance to * not free its data structures when it is destroyed */ pTypeInfoImpl->not_attached_to_typelib = TRUE; - ITypeInfo_AddRef(*ppTInfo); - result = S_OK; - } else if ((hRefType & DISPATCH_HREF_MASK) && - (This->typeattr.typekind == TKIND_DISPATCH)) - { - HREFTYPE href_dispatch = hRefType; - result = ITypeInfoImpl_GetDispatchRefTypeInfo((ITypeInfo *)iface, &href_dispatch, ppTInfo); - } else { - TLBRefType *ref_type; - ITypeLib *pTLib = NULL; - UINT i; + TRACE("got dual interface %p\n", *ppTInfo); + return S_OK; + } - if(!(hRefType & 0x1)){ - for(i = 0; i < This->pTypeLib->TypeInfoCount; ++i) + if ((hRefType & DISPATCH_HREF_MASK) && (This->typeattr.typekind == TKIND_DISPATCH)) + return ITypeInfoImpl_GetDispatchRefTypeInfo((ITypeInfo *)iface, &hRefType, ppTInfo); + + if(!(hRefType & 0x1)) + { + for(i = 0; i < This->pTypeLib->TypeInfoCount; ++i) + { + if (This->pTypeLib->typeinfos[i]->hreftype == (hRefType&(~0x3))) { - if (This->pTypeLib->typeinfos[i]->hreftype == (hRefType&(~0x3))) - { - result = S_OK; - *ppTInfo = (ITypeInfo*)&This->pTypeLib->typeinfos[i]->ITypeInfo2_iface; - ITypeInfo_AddRef(*ppTInfo); - goto end; - } + result = S_OK; + type_info = (ITypeInfo*)&This->pTypeLib->typeinfos[i]->ITypeInfo2_iface; + ITypeInfo_AddRef(type_info); + break; } } + } + + if (!type_info) + { + ITypeLib *pTLib = NULL; LIST_FOR_EACH_ENTRY(ref_type, &This->pTypeLib->ref_list, TLBRefType, entry) { @@ -7979,7 +7982,7 @@ static HRESULT WINAPI ITypeInfo_fnGetRefTypeInfo( if(&ref_type->entry == &This->pTypeLib->ref_list) { FIXME("Can't find pRefType for ref %x\n", hRefType); - goto end; + return E_FAIL; } if(ref_type->pImpTLInfo == TLB_REF_INTERNAL) { @@ -8057,15 +8060,23 @@ static HRESULT WINAPI ITypeInfo_fnGetRefTypeInfo( } if(SUCCEEDED(result)) { if(ref_type->index == TLB_REF_USE_GUID) - result = ITypeLib_GetTypeInfoOfGuid(pTLib, TLB_get_guid_null(ref_type->guid), ppTInfo); + result = ITypeLib_GetTypeInfoOfGuid(pTLib, TLB_get_guid_null(ref_type->guid), &type_info); else - result = ITypeLib_GetTypeInfo(pTLib, ref_type->index, ppTInfo); + result = ITypeLib_GetTypeInfo(pTLib, ref_type->index, &type_info); } if (pTLib != NULL) ITypeLib_Release(pTLib); + if (FAILED(result)) + { + WARN("(%p) failed hreftype 0x%04x\n", This, hRefType); + return result; + } } -end: + if ((hRefType & 0x2) && SUCCEEDED(ITypeInfo_GetRefTypeInfo(type_info, -2, ppTInfo))) + ITypeInfo_Release(type_info); + else *ppTInfo = type_info; + TRACE("(%p) hreftype 0x%04x loaded %s (%p)\n", This, hRefType, SUCCEEDED(result)? "SUCCESS":"FAILURE", *ppTInfo); return result;

1 0

Jacek Caban : rpcrt4: Fix use after free in get_iface_info.
by Alexandre Julliard 26 Mar '20

26 Mar '20

Module: wine Branch: master Commit: bfab009e67338d3f6b0142c55ec3383a5147f6a3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bfab009e67338d3f6b0142c5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 26 20:54:05 2020 +0100 rpcrt4: Fix use after free in get_iface_info. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/ndr_typelib.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/rpcrt4/ndr_typelib.c b/dlls/rpcrt4/ndr_typelib.c index 91c4a07464..f1f25885b7 100644 --- a/dlls/rpcrt4/ndr_typelib.c +++ b/dlls/rpcrt4/ndr_typelib.c @@ -1276,18 +1276,18 @@ static HRESULT get_iface_info(ITypeInfo *typeinfo, WORD *funcs, WORD *parentfunc if (FAILED(hr)) goto err; hr = ITypeInfo_GetRefTypeInfo(*real_typeinfo, reftype, &parentinfo); - if (SUCCEEDED(hr)) - { - hr = ITypeInfo_GetTypeAttr(parentinfo, &typeattr); - ITypeInfo_Release(parentinfo); - } if (FAILED(hr)) goto err; - *parentiid = typeattr->guid; - ITypeInfo_ReleaseTypeAttr(parentinfo, typeattr); - - return S_OK; + hr = ITypeInfo_GetTypeAttr(parentinfo, &typeattr); + if (SUCCEEDED(hr)) + { + *parentiid = typeattr->guid; + ITypeInfo_ReleaseTypeAttr(parentinfo, typeattr); + } + ITypeInfo_Release(parentinfo); + if (SUCCEEDED(hr)) + return hr; err: ITypeInfo_Release(*real_typeinfo);

1 0

Zebediah Figura : quartz: Strip trailing zeroes in debugstr_time().
by Alexandre Julliard 26 Mar '20

26 Mar '20

Module: wine Branch: master Commit: be4b34590805d37fef3970da370cb0dfbf464962 URL: https://source.winehq.org/git/wine.git/?a=commit;h=be4b34590805d37fef3970da… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Mar 26 12:08:45 2020 -0500 quartz: Strip trailing zeroes in debugstr_time(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/quartz_private.h | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/quartz/quartz_private.h b/dlls/quartz/quartz_private.h index 1812b1c37e..946daeb484 100644 --- a/dlls/quartz/quartz_private.h +++ b/dlls/quartz/quartz_private.h @@ -51,6 +51,7 @@ static inline const char *debugstr_time(REFERENCE_TIME time) if (time < 0) buffer[i++] = '-'; while (i--) rev[j++] = buffer[i]; + while (rev[j-1] == '0' && rev[j-2] != '.') --j; rev[j] = 0; return wine_dbg_sprintf("%s", rev);

1 0

Zebediah Figura : mfplat: Strip trailing zeroes in debugstr_time().
by Alexandre Julliard 26 Mar '20

26 Mar '20

Module: wine Branch: master Commit: 920715108f12cc6a71a56cafdf41390e7d316a8c URL: https://source.winehq.org/git/wine.git/?a=commit;h=920715108f12cc6a71a56caf… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Mar 26 12:09:18 2020 -0500 mfplat: Strip trailing zeroes in debugstr_time(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/mfplat_private.h | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/mfplat/mfplat_private.h b/dlls/mfplat/mfplat_private.h index 0f1c5479e6..5c696ccc42 100644 --- a/dlls/mfplat/mfplat_private.h +++ b/dlls/mfplat/mfplat_private.h @@ -198,6 +198,7 @@ static inline const char *debugstr_time(LONGLONG time) if (time < 0) buffer[i++] = '-'; while (i--) rev[j++] = buffer[i]; + while (rev[j-1] == '0' && rev[j-2] != '.') --j; rev[j] = 0; return wine_dbg_sprintf("%s", rev);

1 0

Zebediah Figura : mf: Strip trailing zeroes in debugstr_time().
by Alexandre Julliard 26 Mar '20

26 Mar '20

Module: wine Branch: master Commit: ad9c30a1ad2773da2bfe8adf16a535daf2de040b URL: https://source.winehq.org/git/wine.git/?a=commit;h=ad9c30a1ad2773da2bfe8adf… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Mar 26 12:09:17 2020 -0500 mf: Strip trailing zeroes in debugstr_time(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/mf_private.h | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/mf/mf_private.h b/dlls/mf/mf_private.h index dd8f49e1bc..14f7288c9b 100644 --- a/dlls/mf/mf_private.h +++ b/dlls/mf/mf_private.h @@ -72,6 +72,7 @@ static inline const char *debugstr_time(LONGLONG time) if (time < 0) buffer[i++] = '-'; while (i--) rev[j++] = buffer[i]; + while (rev[j-1] == '0' && rev[j-2] != '.') --j; rev[j] = 0; return wine_dbg_sprintf("%s", rev);

1 0

Zebediah Figura : strmbase: Strip trailing zeroes in debugstr_time().
by Alexandre Julliard 26 Mar '20

26 Mar '20

Module: wine Branch: master Commit: 7e226781fabb773ef2f45055aa571755c8ea28c8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7e226781fabb773ef2f45055… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Mar 26 12:08:46 2020 -0500 strmbase: Strip trailing zeroes in debugstr_time(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/strmbase_private.h | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/strmbase/strmbase_private.h b/dlls/strmbase/strmbase_private.h index e0628c13a1..0a23592bd2 100644 --- a/dlls/strmbase/strmbase_private.h +++ b/dlls/strmbase/strmbase_private.h @@ -47,6 +47,7 @@ static inline const char *debugstr_time(REFERENCE_TIME time) if (time < 0) buffer[i++] = '-'; while (i--) rev[j++] = buffer[i]; + while (rev[j-1] == '0' && rev[j-2] != '.') --j; rev[j] = 0; return wine_dbg_sprintf("%s", rev);

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