wine-commits September 2019

wine-commits@winehq.org

2 participants
629 discussions

Francois Gouget : testbot/Engine: Return more specific errors when SendCmdReceiveReply() fails.
by Alexandre Julliard 24 Sep '19

24 Sep '19

Module: tools Branch: master Commit: c5a6fa1b41b03452bb2167b002fb8056086c1ad0 URL: https://source.winehq.org/git/tools.git/?a=commit;h=c5a6fa1b41b03452bb2167b… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Sep 24 11:00:04 2019 +0200 testbot/Engine: Return more specific errors when SendCmdReceiveReply() fails. In case there is a doubt they now explicitly indicate which command failed. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Engine/Notify.pm | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/testbot/lib/WineTestBot/Engine/Notify.pm b/testbot/lib/WineTestBot/Engine/Notify.pm index ddb14d2..de73425 100644 --- a/testbot/lib/WineTestBot/Engine/Notify.pm +++ b/testbot/lib/WineTestBot/Engine/Notify.pm @@ -82,7 +82,7 @@ sub Shutdown($$) my $Reply = SendCmdReceiveReply("shutdown $KillTasks $KillVMs\n"); if (length($Reply) < 1) { - return "Unrecognized reply received from engine"; + return "The Engine did not acknowledge the Shutdown command"; } if (substr($Reply, 0, 1) eq "1") { @@ -105,7 +105,7 @@ sub JobStatusChange($$$) my $Reply = SendCmdReceiveReply("jobstatuschange $JobKey $OldStatus $NewStatus\n"); if (length($Reply) < 1) { - return "Unrecognized reply received from engine"; + return "The Engine did not acknowledge the JobStatusChange command"; } if (substr($Reply, 0, 1) eq "1") { @@ -122,7 +122,7 @@ sub JobCancel($) my $Reply = SendCmdReceiveReply("jobcancel $JobKey\n"); if (length($Reply) < 1) { - return "Unrecognized reply received from engine"; + return "The Engine did not acknowledge the JobCancel command"; } if (substr($Reply, 0, 1) eq "1") { @@ -139,7 +139,7 @@ sub JobRestart($) my $Reply = SendCmdReceiveReply("jobrestart $JobKey\n"); if (length($Reply) < 1) { - return "Unrecognized reply received from engine"; + return "The Engine did not acknowledge the JobRestart command"; } if (substr($Reply, 0, 1) eq "1") { @@ -154,7 +154,7 @@ sub RescheduleJobs() my $Reply = SendCmdReceiveReply("reschedulejobs\n"); if (length($Reply) < 1) { - return "Unrecognized reply received from engine"; + return "The Engine did not acknowledge the RescheduleJobs command"; } if (substr($Reply, 0, 1) eq "1") { @@ -171,7 +171,7 @@ sub VMStatusChange($$$) my $Reply = SendCmdReceiveReply("vmstatuschange $VMKey $OldStatus $NewStatus\n"); if (length($Reply) < 1) { - return "Unrecognized reply received from engine"; + return "The Engine did not acknowledge the VMStatusChange notification"; } if (substr($Reply, 0, 1) eq "1") { @@ -186,7 +186,7 @@ sub WinePatchMLSubmission() my $Reply = SendCmdReceiveReply("winepatchmlsubmission\n"); if (length($Reply) < 1) { - return "Unrecognized reply received from engine"; + return "The Engine did not acknowledge the WinePatchMLSubmission command"; } if (substr($Reply, 0, 1) eq "1") { @@ -201,7 +201,7 @@ sub WinePatchWebSubmission() my $Reply = SendCmdReceiveReply("winepatchwebsubmission\n"); if (length($Reply) < 1) { - return "Unrecognized reply received from engine"; + return "The Engine did not acknowledge the WinePatchWebSubmission command"; } if (substr($Reply, 0, 1) eq "1") { @@ -218,7 +218,7 @@ sub GetScreenshot($) my $Reply = SendCmdReceiveReply("getscreenshot $VMName\n"); if (length($Reply) < 1) { - return "Unrecognized reply received from engine"; + return "The Engine did not acknowledge the GetScreenshot command"; } if (substr($Reply, 0, 1) eq "1") {

1 0

Francois Gouget : testbot/WineRunReconfig: Fix a typo in a comment.
by Alexandre Julliard 24 Sep '19

24 Sep '19

Module: tools Branch: master Commit: a46113d323c778a50a1e783ccd216d06b7e3f00f URL: https://source.winehq.org/git/tools.git/?a=commit;h=a46113d323c778a50a1e783… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Sep 24 10:58:59 2019 +0200 testbot/WineRunReconfig: Fix a typo in a comment. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunReconfig.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index a443027..fe36ad0 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -468,7 +468,7 @@ if ($NewStatus eq "completed") if ($FileName !~ m~^latest/~ and !$Summary->{$BaseName} and -f "$DataDir/latest/$BaseName") { - # This file was not updated to there is no point redownloading it. + # This file was not updated so there is no point in redownloading it. next; } Debug(Elapsed($Start), " Retrieving '$TaskDir/$BaseName'\n");

1 0

Conor McCarthy : vkd3d: Make all descriptor reads and writes atomic.
by Alexandre Julliard 24 Sep '19

24 Sep '19

Module: vkd3d Branch: master Commit: 8e6f5ddd24158c7402b5fe28426083539eb7f617 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=8e6f5ddd24158c7402b5fe2… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Sep 24 22:13:34 2019 +1000 vkd3d: Make all descriptor reads and writes atomic. Shadow of the Tomb Raider overwrites descriptors while they are being copied in another thread. This patch makes reads and writes atomic for CBV, SRV, UAV, and sampler descriptors, but not RTV and DSV, for which copying is not implemented. Benchmark total frames vs mutex count (the single mutex was locked only once for copying): 1 mutex: 6480 6489 6503 8 mutexes: 6691 6693 6661 16 mutexes: 6665 6682 6703 Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/device.c | 35 +++++++++++++++++------ libs/vkd3d/resource.c | 70 +++++++++++++++++++++++++++++----------------- libs/vkd3d/vkd3d_private.h | 16 +++++++++++ 3 files changed, 88 insertions(+), 33 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=8e6f5ddd24158c7402b…

1 0

Rémi Bernon : winex11.drv: Handle FocusIn/NotifyGrab and FocusOut/NotifyUngrab events.
by Alexandre Julliard 23 Sep '19

23 Sep '19

Module: wine Branch: master Commit: ae8f605ede0054c8e380e809c196f2621d9cf423 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ae8f605ede0054c8e380e809… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Sep 23 09:58:17 2019 +0200 winex11.drv: Handle FocusIn/NotifyGrab and FocusOut/NotifyUngrab events. These events are received on mutter, when moving undecorated managed windows, although Wine never grabs the keyboard itself. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/event.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index f79f40c232..25730192d3 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -778,8 +778,9 @@ static BOOL X11DRV_FocusIn( HWND hwnd, XEvent *xev ) switch (event->mode) { case NotifyGrab: - WARN( "unexpected FocusIn event with NotifyGrab mode\n" ); - break; + /* these are received when moving undecorated managed windows on mutter */ + keyboard_grabbed = TRUE; + return FALSE; case NotifyWhileGrabbed: keyboard_grabbed = TRUE; break; @@ -879,8 +880,9 @@ static BOOL X11DRV_FocusOut( HWND hwnd, XEvent *xev ) switch (event->mode) { case NotifyUngrab: - WARN( "unexpected FocusOut event with NotifyUngrab mode\n" ); - break; + /* these are received when moving undecorated managed windows on mutter */ + keyboard_grabbed = FALSE; + return FALSE; case NotifyNormal: keyboard_grabbed = FALSE; break;

1 0

Jacek Caban : scrobj: Run scripts when creating a scriptlet instance.
by Alexandre Julliard 23 Sep '19

23 Sep '19

Module: wine Branch: master Commit: 9d92ea3b5a5549770d588512634fe9bcb12887ce URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d92ea3b5a5549770d588512… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 23 17:55:40 2019 +0200 scrobj: Run scripts when creating a scriptlet instance. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/scrobj/scrobj.c | 8 ++++++++ dlls/scrobj/tests/scrobj.c | 11 ----------- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/dlls/scrobj/scrobj.c b/dlls/scrobj/scrobj.c index a20a5a7580..9596c6b551 100644 --- a/dlls/scrobj/scrobj.c +++ b/dlls/scrobj/scrobj.c @@ -1032,8 +1032,16 @@ static HRESULT create_scriptlet_instance(struct scriptlet_factory *factory, IDis hres = create_script_host(factory_host->language, factory_host->active_script, &obj->hosts, &host); if (FAILED(hres)) break; host->object = obj; + + hres = IActiveScript_AddNamedItem(host->active_script, L"scriptlet", + SCRIPTITEM_ISVISIBLE | SCRIPTITEM_GLOBALMEMBERS); + if (FAILED(hres)) break; + + hres = IActiveScript_AddNamedItem(host->active_script, L"globals", SCRIPTITEM_ISVISIBLE); + if (FAILED(hres)) break; } + if (SUCCEEDED(hres)) hres = parse_scripts(factory, &obj->hosts, TRUE); if (FAILED(hres)) { IDispatchEx_Release(&obj->IDispatchEx_iface); diff --git a/dlls/scrobj/tests/scrobj.c b/dlls/scrobj/tests/scrobj.c index ef80dfb7d4..709f005080 100644 --- a/dlls/scrobj/tests/scrobj.c +++ b/dlls/scrobj/tests/scrobj.c @@ -783,9 +783,7 @@ static void test_create_object(void) CHECK_CALLED(QI_IActiveScriptParse); CHECK_CALLED(InitNew); CHECK_CALLED(SetScriptSite); - todo_wine CHECK_CALLED(AddNamedItem_scriptlet); - todo_wine CHECK_CALLED(AddNamedItem_globals); todo_wine CHECK_CALLED(GetScriptDispatch); @@ -793,9 +791,7 @@ static void test_create_object(void) CHECK_CALLED(GetDispID_vbAddOne); todo_wine CHECK_CALLED(GetDispID_wtTest); - todo_wine CHECK_CALLED(SetScriptState_STARTED); - todo_wine CHECK_CALLED(ParseScriptText); hres = IUnknown_QueryInterface(unk, &IID_IDispatch, (void**)&disp); @@ -945,9 +941,7 @@ static void test_create_object(void) CHECK_CALLED(QI_IActiveScriptParse); CHECK_CALLED(InitNew); CHECK_CALLED(SetScriptSite); - todo_wine CHECK_CALLED(AddNamedItem_scriptlet); - todo_wine CHECK_CALLED(AddNamedItem_globals); todo_wine CHECK_CALLED(GetScriptDispatch); @@ -955,9 +949,7 @@ static void test_create_object(void) CHECK_CALLED(GetDispID_vbAddOne); todo_wine CHECK_CALLED(GetDispID_wtTest); - todo_wine CHECK_CALLED(SetScriptState_STARTED); - todo_wine CHECK_CALLED(ParseScriptText); SET_EXPECT(SetScriptState_UNINITIALIZED); @@ -981,9 +973,7 @@ static void test_create_object(void) CHECK_CALLED(Clone); CHECK_CALLED(QI_IActiveScriptParse); CHECK_CALLED(SetScriptSite); - todo_wine CHECK_CALLED(AddNamedItem_scriptlet); - todo_wine CHECK_CALLED(AddNamedItem_globals); todo_wine CHECK_CALLED(GetScriptDispatch); @@ -991,7 +981,6 @@ static void test_create_object(void) CHECK_CALLED(GetDispID_vbAddOne); todo_wine CHECK_CALLED(GetDispID_wtTest); - todo_wine CHECK_CALLED(SetScriptState_STARTED); SET_EXPECT(SetScriptState_UNINITIALIZED);

1 0

Jacek Caban : scrobj: Implement GetItemInfo.
by Alexandre Julliard 23 Sep '19

23 Sep '19

Module: wine Branch: master Commit: e50eae9dc8f982566b71154134a41861e1f10cbd URL: https://source.winehq.org/git/wine.git/?a=commit;h=e50eae9dc8f982566b711541… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 23 17:55:25 2019 +0200 scrobj: Implement GetItemInfo. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/scrobj/scrobj.c | 228 +++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 221 insertions(+), 7 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e50eae9dc8f982566b71…

1 0

Jacek Caban : scrobj: Create script hosts for scriptlet instance.
by Alexandre Julliard 23 Sep '19

23 Sep '19

Module: wine Branch: master Commit: 03f89b60facaa59ad4532b902b304743140c0597 URL: https://source.winehq.org/git/wine.git/?a=commit;h=03f89b60facaa59ad4532b90… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 23 17:55:13 2019 +0200 scrobj: Create script hosts for scriptlet instance. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/scrobj/scrobj.c | 36 ++++++++++++++++++++++++++++++++++-- dlls/scrobj/tests/scrobj.c | 20 -------------------- 2 files changed, 34 insertions(+), 22 deletions(-) diff --git a/dlls/scrobj/scrobj.c b/dlls/scrobj/scrobj.c index 6b3b3ea6e8..251507ecf5 100644 --- a/dlls/scrobj/scrobj.c +++ b/dlls/scrobj/scrobj.c @@ -102,6 +102,7 @@ struct scriptlet_instance { IDispatchEx IDispatchEx_iface; LONG ref; + struct list hosts; }; struct script_host @@ -674,7 +675,10 @@ static ULONG WINAPI scriptlet_Release(IDispatchEx *iface) TRACE("(%p) ref=%d\n", This, ref); if (!ref) + { + detach_script_hosts(&This->hosts); heap_free(This); + } return ref; } @@ -798,14 +802,29 @@ static IDispatchExVtbl DispatchExVtbl = { scriptlet_GetNameSpaceParent }; -static HRESULT create_scriptlet_instance(IDispatchEx **disp) +static HRESULT create_scriptlet_instance(struct scriptlet_factory *factory, IDispatchEx **disp) { + struct script_host *factory_host; struct scriptlet_instance *obj; + HRESULT hres; if (!(obj = heap_alloc(sizeof(*obj)))) return E_OUTOFMEMORY; obj->IDispatchEx_iface.lpVtbl = &DispatchExVtbl; obj->ref = 1; + list_init(&obj->hosts); + + LIST_FOR_EACH_ENTRY(factory_host, &factory->hosts, struct script_host, entry) + { + hres = create_script_host(factory_host->language, factory_host->active_script, &obj->hosts); + if (FAILED(hres)) break; + } + + if (FAILED(hres)) + { + IDispatchEx_Release(&obj->IDispatchEx_iface); + return hres; + } *disp = &obj->IDispatchEx_iface; return S_OK; @@ -1295,7 +1314,20 @@ static HRESULT WINAPI scriptlet_factory_CreateInstance(IClassFactory *iface, IUn if (outer) FIXME("outer not supported\n"); - hres = create_scriptlet_instance(&disp); + if (list_empty(&This->hosts)) + { + hres = create_scriptlet_hosts(This, &This->hosts); + if (FAILED(hres)) return hres; + + hres = parse_scripts(This, &This->hosts, FALSE); + if (FAILED(hres)) + { + detach_script_hosts(&This->hosts); + return hres; + } + } + + hres = create_scriptlet_instance(This, &disp); if (FAILED(hres)) return hres; hres = IDispatchEx_QueryInterface(disp, riid, ppv); diff --git a/dlls/scrobj/tests/scrobj.c b/dlls/scrobj/tests/scrobj.c index f968fe21ce..ef80dfb7d4 100644 --- a/dlls/scrobj/tests/scrobj.c +++ b/dlls/scrobj/tests/scrobj.c @@ -778,15 +778,10 @@ static void test_create_object(void) SET_EXPECT(Clone); hres = IClassFactory_CreateInstance(cf, NULL, &IID_IUnknown, (void**)&unk); ok(hres == S_OK, "Could not create scriptlet instance: %08x\n", hres); - todo_wine CHECK_CALLED(Clone); - todo_wine CHECK_CALLED(CreateInstance); - todo_wine CHECK_CALLED(QI_IActiveScriptParse); - todo_wine CHECK_CALLED(InitNew); - todo_wine CHECK_CALLED(SetScriptSite); todo_wine CHECK_CALLED(AddNamedItem_scriptlet); @@ -926,9 +921,7 @@ static void test_create_object(void) todo_wine SET_EXPECT(Close); IUnknown_Release(unk); - todo_wine CHECK_CALLED(SetScriptState_UNINITIALIZED); - todo_wine CHECK_CALLED(Close); parse_flags = SCRIPTTEXT_ISVISIBLE; @@ -947,15 +940,10 @@ static void test_create_object(void) SET_EXPECT(ParseScriptText); hres = IClassFactory_CreateInstance(cf, NULL, &IID_IUnknown, (void**)&unk); ok(hres == S_OK, "Could not create scriptlet instance: %08x\n", hres); - todo_wine CHECK_CALLED(Clone); - todo_wine CHECK_CALLED(CreateInstance); - todo_wine CHECK_CALLED(QI_IActiveScriptParse); - todo_wine CHECK_CALLED(InitNew); - todo_wine CHECK_CALLED(SetScriptSite); todo_wine CHECK_CALLED(AddNamedItem_scriptlet); @@ -975,9 +963,7 @@ static void test_create_object(void) SET_EXPECT(SetScriptState_UNINITIALIZED); SET_EXPECT(Close); IUnknown_Release(unk); - todo_wine CHECK_CALLED(SetScriptState_UNINITIALIZED); - todo_wine CHECK_CALLED(Close); support_clone = TRUE; @@ -992,11 +978,8 @@ static void test_create_object(void) SET_EXPECT(SetScriptState_STARTED); hres = IClassFactory_CreateInstance(cf, NULL, &IID_IUnknown, (void**)&unk); ok(hres == S_OK, "Could not create scriptlet instance: %08x\n", hres); - todo_wine CHECK_CALLED(Clone); - todo_wine CHECK_CALLED(QI_IActiveScriptParse); - todo_wine CHECK_CALLED(SetScriptSite); todo_wine CHECK_CALLED(AddNamedItem_scriptlet); @@ -1014,14 +997,11 @@ static void test_create_object(void) SET_EXPECT(SetScriptState_UNINITIALIZED); SET_EXPECT(Close); IUnknown_Release(unk); - todo_wine CHECK_CALLED(SetScriptState_UNINITIALIZED); - todo_wine CHECK_CALLED(Close); SET_EXPECT(Close); IClassFactory_Release(cf); - todo_wine CHECK_CALLED(Close); }

1 0

Jacek Caban : scrobj: Parse scripts in DllInstall.
by Alexandre Julliard 23 Sep '19

23 Sep '19

Module: wine Branch: master Commit: 55e01ac01267ca90b99d26450938fe7d0985ea06 URL: https://source.winehq.org/git/wine.git/?a=commit;h=55e01ac01267ca90b99d2645… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 23 17:55:04 2019 +0200 scrobj: Parse scripts in DllInstall. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/scrobj/scrobj.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/scrobj/tests/scrobj.c | 2 -- 2 files changed, 54 insertions(+), 2 deletions(-) diff --git a/dlls/scrobj/scrobj.c b/dlls/scrobj/scrobj.c index 32aedcd8f9..6b3b3ea6e8 100644 --- a/dlls/scrobj/scrobj.c +++ b/dlls/scrobj/scrobj.c @@ -117,6 +117,7 @@ struct script_host IActiveScript *active_script; IActiveScriptParse *parser; + SCRIPTSTATE state; BOOL cloned; }; @@ -204,6 +205,16 @@ static WCHAR *heap_strdupW(const WCHAR *str) return ret; } +static HRESULT set_script_state(struct script_host *host, SCRIPTSTATE state) +{ + HRESULT hres; + if (state == host->state) return S_OK; + hres = IActiveScript_SetScriptState(host->active_script, state); + if (FAILED(hres)) return hres; + host->state = state; + return S_OK; +} + static inline struct script_host *impl_from_IActiveScriptSite(IActiveScriptSite *iface) { return CONTAINING_RECORD(iface, struct script_host, IActiveScriptSite_iface); @@ -437,6 +448,46 @@ static struct script_host *find_script_host(struct list *hosts, const WCHAR *lan return NULL; } +static HRESULT parse_scripts(struct scriptlet_factory *factory, struct list *hosts, BOOL start) +{ + DWORD parse_flags = SCRIPTTEXT_ISVISIBLE; + struct scriptlet_script *script; + struct script_host *host; + HRESULT hres; + + if (!start) parse_flags |= SCRIPTITEM_ISPERSISTENT; + + LIST_FOR_EACH_ENTRY(script, &factory->scripts, struct scriptlet_script, entry) + { + host = find_script_host(hosts, script->language); + + if (start && host->state != SCRIPTSTATE_STARTED) + { + hres = set_script_state(host, SCRIPTSTATE_STARTED); + if (FAILED(hres)) return hres; + } + + if (host->cloned) continue; + + hres = IActiveScriptParse_ParseScriptText(host->parser, script->body, NULL, NULL, NULL, 0, 0 /* FIXME */, + parse_flags, NULL, NULL); + if (FAILED(hres)) + { + WARN("ParseScriptText failed: %08x\n", hres); + return hres; + } + } + if (!start) + { + LIST_FOR_EACH_ENTRY(host, hosts, struct script_host, entry) + { + if (host->state != SCRIPTSTATE_UNINITIALIZED) + set_script_state(host, SCRIPTSTATE_UNINITIALIZED); + } + } + return S_OK; +} + static HRESULT init_script_host(struct script_host *host, IActiveScript *clone) { HRESULT hres; @@ -509,6 +560,7 @@ static HRESULT create_script_host(const WCHAR *language, IActiveScript *origin_s host->IActiveScriptSiteWindow_iface.lpVtbl = &ActiveScriptSiteWindowVtbl; host->IServiceProvider_iface.lpVtbl = &ServiceProviderVtbl; host->ref = 1; + host->state = SCRIPTSTATE_CLOSED; if (!(host->language = heap_strdupW(language))) { @@ -533,6 +585,7 @@ static void detach_script_hosts(struct list *hosts) while (!list_empty(hosts)) { struct script_host *host = LIST_ENTRY(list_head(hosts), struct script_host, entry); + if (host->state != SCRIPTSTATE_UNINITIALIZED) set_script_state(host, SCRIPTSTATE_UNINITIALIZED); list_remove(&host->entry); if (host->parser) { @@ -1800,6 +1853,7 @@ HRESULT WINAPI DllInstall(BOOL install, const WCHAR *arg) { /* validate scripts */ hres = create_scriptlet_hosts(factory, &factory->hosts); + if (SUCCEEDED(hres)) hres = parse_scripts(factory, &factory->hosts, FALSE); } else { diff --git a/dlls/scrobj/tests/scrobj.c b/dlls/scrobj/tests/scrobj.c index 9afa11d419..f968fe21ce 100644 --- a/dlls/scrobj/tests/scrobj.c +++ b/dlls/scrobj/tests/scrobj.c @@ -720,9 +720,7 @@ static void register_script_object(BOOL do_register, const WCHAR *file_name) CHECK_CALLED(QI_IActiveScriptParse); CHECK_CALLED(InitNew); CHECK_CALLED(SetScriptSite); - todo_wine CHECK_CALLED(ParseScriptText); - todo_wine CHECK_CALLED(SetScriptState_UNINITIALIZED); CHECK_CALLED(Close); ok(hres == S_OK, "DllInstall failed: %08x\n", hres);

1 0

Jacek Caban : scrobj: Add scriptlet instance stub implementation.
by Alexandre Julliard 23 Sep '19

23 Sep '19

Module: wine Branch: master Commit: 4d368c3dabf4d2003e632d393deb923eb679d8f3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4d368c3dabf4d2003e632d39… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 23 17:54:53 2019 +0200 scrobj: Add scriptlet instance stub implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/scrobj/scrobj.c | 213 ++++++++++++++++++++++++++++++++++++++++++++- dlls/scrobj/tests/scrobj.c | 53 +++++++++-- 2 files changed, 259 insertions(+), 7 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4d368c3dabf4d2003e63…

1 0

Hans Leidekker : bcrypt: Implement BCryptSignHash.
by Alexandre Julliard 23 Sep '19

23 Sep '19

Module: wine Branch: master Commit: 98b230f851f859e9240e8381e3deec5016082ceb URL: https://source.winehq.org/git/wine.git/?a=commit;h=98b230f851f859e9240e8381… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Sep 23 15:48:52 2019 +0200 bcrypt: Implement BCryptSignHash. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt.spec | 2 +- dlls/bcrypt/bcrypt_internal.h | 1 + dlls/bcrypt/bcrypt_main.c | 25 ++++++++ dlls/bcrypt/gnutls.c | 51 ++++++++++++++++ dlls/bcrypt/macos.c | 7 +++ dlls/bcrypt/tests/bcrypt.c | 131 +++++++++++++++++++++++++++++++++++++++++- dlls/ncrypt/ncrypt.spec | 2 +- 7 files changed, 214 insertions(+), 5 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=98b230f851f859e9240e…

1 0

← Newer
1
...
18
19
20
21
22
23
24
...
63
Older →

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 September 2019