September 2019 - Wine-commits

Zhiyi Zhang : winex11.drv: Support XRandR display device handler.
by Alexandre Julliard 23 Sep '19

23 Sep '19

Module: wine Branch: master Commit: be54adcffc249a44cb52c24320a7ad3db758ba54 URL: https://source.winehq.org/git/wine.git/?a=commit;h=be54adcffc249a44cb52c243… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Sep 20 16:55:22 2019 +0800 winex11.drv: Support XRandR display device handler. XRandR supports multiple GPUs and runtime device change compared to Xinerama. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 20 ++ configure.ac | 7 +- dlls/winex11.drv/x11drv.h | 1 + dlls/winex11.drv/xinerama.c | 2 +- dlls/winex11.drv/xrandr.c | 488 ++++++++++++++++++++++++++++++++++++++++++++ include/config.h.in | 3 + 6 files changed, 519 insertions(+), 2 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=be54adcffc249a44cb52…

1 0

Zhiyi Zhang : winex11.drv: Handle XRandR display device changes.
by Alexandre Julliard 23 Sep '19

23 Sep '19

Module: wine Branch: master Commit: 22795243b2d21e1a667215f54c3a15634735749c URL: https://source.winehq.org/git/wine.git/?a=commit;h=22795243b2d21e1a667215f5… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Sep 20 16:55:40 2019 +0800 winex11.drv: Handle XRandR display device changes. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/xrandr.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index ad8438252f..2a1c7ce594 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -68,6 +68,7 @@ static int primary_crtc; #endif #ifdef HAVE_XRRGETPROVIDERRESOURCES +MAKE_FUNCPTR(XRRSelectInput) MAKE_FUNCPTR(XRRGetOutputPrimary) MAKE_FUNCPTR(XRRGetProviderResources) MAKE_FUNCPTR(XRRFreeProviderResources) @@ -119,6 +120,7 @@ static int load_xrandr(void) #endif #ifdef HAVE_XRRGETPROVIDERRESOURCES + LOAD_FUNCPTR(XRRSelectInput) LOAD_FUNCPTR(XRRGetOutputPrimary) LOAD_FUNCPTR(XRRGetProviderResources) LOAD_FUNCPTR(XRRFreeProviderResources) @@ -1030,6 +1032,12 @@ static void xrandr14_free_monitors( struct x11drv_monitor *monitors ) heap_free( monitors ); } +static BOOL xrandr14_device_change_event( HWND hwnd, XEvent *event ) +{ + X11DRV_DisplayDevices_Init( TRUE ); + return TRUE; +} + #endif void X11DRV_XRandR_Init(void) @@ -1077,6 +1085,15 @@ void X11DRV_XRandR_Init(void) handler.pGetMonitors = xrandr14_get_monitors; handler.pFreeMonitors = xrandr14_free_monitors; X11DRV_DisplayDevices_SetHandler( &handler ); + + pXRRSelectInput( thread_init_display(), root_window, + RRCrtcChangeNotifyMask | RROutputChangeNotifyMask | RRProviderChangeNotifyMask); + X11DRV_register_event_handler( event_base + RRNotify_CrtcChange, xrandr14_device_change_event, + "XRandR CrtcChange" ); + X11DRV_register_event_handler( event_base + RRNotify_OutputChange, xrandr14_device_change_event, + "XRandR OutputChange" ); + X11DRV_register_event_handler( event_base + RRNotify_ProviderChange, xrandr14_device_change_event, + "XRandR ProviderChange" ); } #endif }

1 0

Zebediah Figura : wined3d: Fully clean up the device state in wined3d_device_uninit_3d().
by Alexandre Julliard 23 Sep '19

23 Sep '19

Module: wine Branch: master Commit: 90a03e79264c575ca743f2876ebb434490906e15 URL: https://source.winehq.org/git/wine.git/?a=commit;h=90a03e79264c575ca743f287… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Sep 22 21:19:30 2019 -0500 wined3d: Fully clean up the device state in wined3d_device_uninit_3d(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 92259e3ea5..c8fae1275c 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -537,8 +537,6 @@ void wined3d_device_cleanup(struct wined3d_device *device) ERR("Something's still holding the recording stateblock.\n"); device->recording = NULL; - state_cleanup(&device->state); - for (i = 0; i < ARRAY_SIZE(device->multistate_funcs); ++i) { heap_free(device->multistate_funcs[i]); @@ -1142,7 +1140,7 @@ void wined3d_device_uninit_3d(struct wined3d_device *device) wined3d_texture_decref(texture); } - state_unbind_resources(&device->state); + state_cleanup(&device->state); for (i = 0; i < device->adapter->d3d_info.limits.max_rt_count; ++i) { wined3d_device_set_rendertarget_view(device, i, NULL, FALSE);

1 0

Zebediah Figura : wined3d: Reset the CS state before cleaning up the device state.
by Alexandre Julliard 23 Sep '19

23 Sep '19

Module: wine Branch: master Commit: 96547e622b04f403bc0c78d649275d1f844ed40e URL: https://source.winehq.org/git/wine.git/?a=commit;h=96547e622b04f403bc0c78d6… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Sep 22 21:19:31 2019 -0500 wined3d: Reset the CS state before cleaning up the device state. Otherwise the CS might later try to unbind a resource that has already been freed. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index c8fae1275c..62341290ff 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1140,6 +1140,7 @@ void wined3d_device_uninit_3d(struct wined3d_device *device) wined3d_texture_decref(texture); } + wined3d_cs_emit_reset_state(device->cs); state_cleanup(&device->state); for (i = 0; i < device->adapter->d3d_info.limits.max_rt_count; ++i) {

1 0

Jactry Zeng : msscript/tests: Initialize custom engine for global.
by Alexandre Julliard 23 Sep '19

23 Sep '19

Module: wine Branch: master Commit: 690ff534161ef5c0b671c05795c801391d59f3bb URL: https://source.winehq.org/git/wine.git/?a=commit;h=690ff534161ef5c0b671c057… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Mon Sep 23 17:17:00 2019 +0800 msscript/tests: Initialize custom engine for global. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msscript.ocx/tests/msscript.c | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/dlls/msscript.ocx/tests/msscript.c b/dlls/msscript.ocx/tests/msscript.c index 2d500d8308..7a1a0f31f8 100644 --- a/dlls/msscript.ocx/tests/msscript.c +++ b/dlls/msscript.ocx/tests/msscript.c @@ -501,6 +501,8 @@ static BOOL register_script_engine(void) return TRUE; } +static BOOL have_custom_engine; + static HRESULT WINAPI OleClientSite_QueryInterface(IOleClientSite *iface, REFIID riid, void **obj) { if (IsEqualIID(riid, &IID_IOleClientSite) || IsEqualIID(riid, &IID_IUnknown)) @@ -754,7 +756,7 @@ static void test_Language(void) IScriptControl_Release(sc); /* custom script engine */ - if (register_script_engine()) { + if (have_custom_engine) { static const WCHAR testscriptW[] = {'t','e','s','t','s','c','r','i','p','t',0}; hr = CoCreateInstance(&CLSID_ScriptControl, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, @@ -786,16 +788,12 @@ static void test_Language(void) IActiveScriptSite_Release(site); - init_registry(FALSE); - SET_EXPECT(Close); IScriptControl_Release(sc); CHECK_CALLED(Close); } - else - skip("Could not register TestScript engine\n"); } static void test_connectionpoints(void) @@ -1055,7 +1053,7 @@ static void test_Reset(void) IScriptControl_Release(sc); /* custom script engine */ - if (register_script_engine()) { + if (have_custom_engine) { static const WCHAR testscriptW[] = {'t','e','s','t','s','c','r','i','p','t',0}; hr = CoCreateInstance(&CLSID_ScriptControl, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, @@ -1086,16 +1084,12 @@ static void test_Reset(void) CHECK_CALLED(SetScriptSite); IActiveScriptSite_Release(site); - init_registry(FALSE); - SET_EXPECT(Close); IScriptControl_Release(sc); CHECK_CALLED(Close); } - else - skip("Could not register TestScript engine\n"); } static HRESULT WINAPI disp_QI(IDispatch *iface, REFIID riid, void **obj) @@ -1193,7 +1187,7 @@ static void test_AddObject(void) IScriptControl_Release(sc); /* custom script engine */ - if (register_script_engine()) { + if (have_custom_engine) { static const WCHAR testscriptW[] = {'t','e','s','t','s','c','r','i','p','t',0}; hr = CoCreateInstance(&CLSID_ScriptControl, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, @@ -1225,16 +1219,12 @@ static void test_AddObject(void) CHECK_CALLED(SetScriptSite); IActiveScriptSite_Release(site); - init_registry(FALSE); - SET_EXPECT(Close); IScriptControl_Release(sc); CHECK_CALLED(Close); } - else - skip("Could not register TestScript engine\n"); SysFreeString(objname); } @@ -1502,6 +1492,10 @@ START_TEST(msscript) } IUnknown_Release(unk); + have_custom_engine = register_script_engine(); + if (!have_custom_engine) + skip("Could not register TestScript engine.\n"); + test_oleobject(); test_persiststreaminit(); test_olecontrol(); @@ -1518,5 +1512,7 @@ START_TEST(msscript) test_State(); test_IScriptControl_Eval(); + init_registry(FALSE); + CoUninitialize(); }

1 0

Jactry Zeng : msscript: Cache state of IActiveScript in ScriptHost struct.
by Alexandre Julliard 23 Sep '19

23 Sep '19

Module: wine Branch: master Commit: 74c5fc5b3267eacbd933f2822c176b79ca8ed922 URL: https://source.winehq.org/git/wine.git/?a=commit;h=74c5fc5b3267eacbd933f282… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Mon Sep 23 17:17:11 2019 +0800 msscript: Cache state of IActiveScript in ScriptHost struct. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msscript.ocx/msscript.c | 23 +++++++-- dlls/msscript.ocx/tests/msscript.c | 95 ++++++++++++++++++++++++++++++++++++-- 2 files changed, 111 insertions(+), 7 deletions(-) diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index 6e4c8d166a..812c0ebcae 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -71,6 +71,7 @@ typedef struct ScriptHost { IActiveScript *script; IActiveScriptParse *parse; + SCRIPTSTATE script_state; CLSID clsid; struct list named_items; @@ -568,6 +569,7 @@ static HRESULT init_script_host(const CLSID *clsid, ScriptHost **ret) WARN("InitNew failed, %#x\n", hr); goto failed; } + host->script_state = SCRIPTSTATE_INITIALIZED; *ret = host; return S_OK; @@ -952,6 +954,16 @@ static HRESULT WINAPI ScriptControl_AddObject(IScriptControl *iface, BSTR name, return hr; } +static HRESULT set_script_state(ScriptHost *host, SCRIPTSTATE state) +{ + HRESULT hr; + + hr = IActiveScript_SetScriptState(host->script, state); + if (SUCCEEDED(hr)) + host->script_state = state; + return hr; +} + static HRESULT WINAPI ScriptControl_Reset(IScriptControl *iface) { ScriptControl *This = impl_from_IScriptControl(iface); @@ -962,7 +974,7 @@ static HRESULT WINAPI ScriptControl_Reset(IScriptControl *iface) return E_FAIL; clear_named_items(This->host); - return IActiveScript_SetScriptState(This->host->script, SCRIPTSTATE_INITIALIZED); + return set_script_state(This->host, SCRIPTSTATE_INITIALIZED); } static HRESULT WINAPI ScriptControl_AddCode(IScriptControl *iface, BSTR code) @@ -987,9 +999,12 @@ static HRESULT WINAPI ScriptControl_Eval(IScriptControl *iface, BSTR expression, if (!This->host || This->state != Initialized) return E_FAIL; - hr = IActiveScript_SetScriptState(This->host->script, SCRIPTSTATE_STARTED); - if (FAILED(hr)) - return hr; + if (This->host->script_state != SCRIPTSTATE_STARTED) + { + hr = set_script_state(This->host, SCRIPTSTATE_STARTED); + if (FAILED(hr)) + return hr; + } hr = IActiveScriptParse_ParseScriptText(This->host->parse, expression, NULL, NULL, NULL, 0, 1, SCRIPTTEXT_ISEXPRESSION, res, &excepinfo); diff --git a/dlls/msscript.ocx/tests/msscript.c b/dlls/msscript.ocx/tests/msscript.c index 7a1a0f31f8..80a1760b08 100644 --- a/dlls/msscript.ocx/tests/msscript.c +++ b/dlls/msscript.ocx/tests/msscript.c @@ -95,6 +95,8 @@ DEFINE_EXPECT(Close); DEFINE_EXPECT(SetScriptSite); DEFINE_EXPECT(QI_IActiveScriptParse); DEFINE_EXPECT(SetScriptState_INITIALIZED); +DEFINE_EXPECT(SetScriptState_STARTED); +DEFINE_EXPECT(ParseScriptText); DEFINE_EXPECT(AddNamedItem); #define EXPECT_REF(obj,ref) _expect_ref((IUnknown*)obj, ref, __LINE__) @@ -147,8 +149,17 @@ static HRESULT WINAPI ActiveScriptParse_ParseScriptText(IActiveScriptParse *ifac LPCOLESTR pstrDelimiter, CTXARG_T dwSourceContextCookie, ULONG ulStartingLine, DWORD dwFlags, VARIANT *pvarResult, EXCEPINFO *pexcepinfo) { - ok(0, "unexpected call\n"); - return E_NOTIMPL; + ok(!!pstrCode, "got wrong pointer: %p.\n", pstrCode); + ok(!pstrItemName, "got wrong pointer: %p.\n", pstrItemName); + ok(!punkContext, "got wrong pointer: %p.\n", punkContext); + ok(!pstrDelimiter, "got wrong pointer: %p.\n", pstrDelimiter); + ok(!dwSourceContextCookie, "got wrong value: %s.\n", wine_dbgstr_longlong(dwSourceContextCookie)); + ok(ulStartingLine == 1, "got wrong value: %d.\n", ulStartingLine); + ok(dwFlags == SCRIPTTEXT_ISEXPRESSION, "got wrong flags: %x.\n", dwFlags); + ok(!!pvarResult, "got wrong pointer: %p.\n", pvarResult); + ok(!!pexcepinfo, "got wrong pointer: %p.\n", pexcepinfo); + CHECK_EXPECT(ParseScriptText); + return S_OK; } static const IActiveScriptParseVtbl ActiveScriptParseVtbl = { @@ -304,6 +315,10 @@ static HRESULT WINAPI ActiveScript_SetScriptState(IActiveScript *iface, SCRIPTST CHECK_EXPECT(SetScriptState_INITIALIZED); return S_OK; } + else if (ss == SCRIPTSTATE_STARTED) { + CHECK_EXPECT(SetScriptState_STARTED); + return S_OK; + } else ok(0, "unexpected call, state %u\n", ss); @@ -1371,7 +1386,7 @@ static void _check_error(IScriptControl *sc, LONG exp_num, int line) { error_num = 0xdeadbeef; hr = IScriptError_get_Number(script_err, &error_num); - ok_(__FILE__,line)(hr == S_OK, "IScriptError_get_Number failed: 0x%08x.", hr); + ok_(__FILE__,line)(hr == S_OK, "IScriptError_get_Number failed: 0x%08x.\n", hr); ok_(__FILE__,line)(error_num == exp_num, "got wrong error number: %d, expected %d.\n", error_num, exp_num); IScriptError_Release(script_err); @@ -1475,6 +1490,80 @@ static void test_IScriptControl_Eval(void) SysFreeString(script_str); IScriptControl_Release(sc); + + if (have_custom_engine) + { + hr = CoCreateInstance(&CLSID_ScriptControl, NULL, CLSCTX_INPROC_SERVER | CLSCTX_INPROC_HANDLER, + &IID_IScriptControl, (void **)&sc); + ok(hr == S_OK, "Failed to create IScriptControl interface: 0x%08x.\n", hr); + + SET_EXPECT(CreateInstance); + SET_EXPECT(SetInterfaceSafetyOptions); + SET_EXPECT(SetScriptSite); + SET_EXPECT(QI_IActiveScriptParse); + SET_EXPECT(InitNew); + + language= a2bstr("testscript"); + hr = IScriptControl_put_Language(sc, language); + ok(hr == S_OK, "IScriptControl_put_Language failed: 0x%08x.\n", hr); + SysFreeString(language); + + CHECK_CALLED(CreateInstance); + CHECK_CALLED(SetInterfaceSafetyOptions); + CHECK_CALLED(SetScriptSite); + CHECK_CALLED(QI_IActiveScriptParse); + CHECK_CALLED(InitNew); + + SET_EXPECT(SetScriptState_STARTED); + SET_EXPECT(ParseScriptText); + script_str = a2bstr("var1 = 1 + 1"); + V_VT(&var) = VT_NULL; + V_I4(&var) = 0xdeadbeef; + hr = IScriptControl_Eval(sc, script_str, &var); + ok(hr == S_OK, "IScriptControl_Eval failed: 0x%08x.\n", hr); + ok((V_VT(&var) == VT_EMPTY) && (V_I4(&var) == 0xdeadbeef), "V_VT(var) = %d, V_I4(var) = %d.\n", + V_VT(&var), V_I4(&var)); + SysFreeString(script_str); + CHECK_CALLED(SetScriptState_STARTED); + CHECK_CALLED(ParseScriptText); + + SET_EXPECT(ParseScriptText); + script_str = a2bstr("var2 = 10 + var1"); + V_VT(&var) = VT_NULL; + V_I4(&var) = 0xdeadbeef; + hr = IScriptControl_Eval(sc, script_str, &var); + ok(hr == S_OK, "IScriptControl_Eval failed: 0x%08x.\n", hr); + ok((V_VT(&var) == VT_EMPTY) && (V_I4(&var) == 0xdeadbeef), "V_VT(var) = %d, V_I4(var) = %d.\n", + V_VT(&var), V_I4(&var)); + SysFreeString(script_str); + CHECK_CALLED(ParseScriptText); + + SET_EXPECT(SetScriptState_INITIALIZED); + hr = IScriptControl_Reset(sc); + ok(hr == S_OK, "IScriptControl_Reset failed: 0x%08x.\n", hr); + CHECK_CALLED(SetScriptState_INITIALIZED); + + SET_EXPECT(SetScriptState_STARTED); + SET_EXPECT(ParseScriptText); + script_str = a2bstr("var2 = 10 + var1"); + V_VT(&var) = VT_NULL; + V_I4(&var) = 0xdeadbeef; + hr = IScriptControl_Eval(sc, script_str, &var); + ok(hr == S_OK, "IScriptControl_Eval failed: 0x%08x.\n", hr); + ok((V_VT(&var) == VT_EMPTY) && (V_I4(&var) == 0xdeadbeef), "V_VT(var) = %d, V_I4(var) = %d.\n", + V_VT(&var), V_I4(&var)); + SysFreeString(script_str); + CHECK_CALLED(SetScriptState_STARTED); + CHECK_CALLED(ParseScriptText); + + IActiveScriptSite_Release(site); + + SET_EXPECT(Close); + + IScriptControl_Release(sc); + + CHECK_CALLED(Close); + } } START_TEST(msscript)

1 0

Jactry Zeng : msscript: Partially implement IScriptControl::AddCode().
by Alexandre Julliard 23 Sep '19

23 Sep '19

Module: wine Branch: master Commit: 85408ea191f727f81c939915da38a024a925bb5a URL: https://source.winehq.org/git/wine.git/?a=commit;h=85408ea191f727f81c939915… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Mon Sep 23 17:17:19 2019 +0800 msscript: Partially implement IScriptControl::AddCode(). Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msscript.ocx/msscript.c | 47 ++++++++------- dlls/msscript.ocx/tests/msscript.c | 114 ++++++++++++++++++++++++++++++++++++- 2 files changed, 139 insertions(+), 22 deletions(-) diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index 812c0ebcae..c615e63ed4 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -977,40 +977,47 @@ static HRESULT WINAPI ScriptControl_Reset(IScriptControl *iface) return set_script_state(This->host, SCRIPTSTATE_INITIALIZED); } +static HRESULT parse_script_text(ScriptControl *control, BSTR script_text, DWORD flag, VARIANT *res) +{ + EXCEPINFO excepinfo; + HRESULT hr; + + if (!control->host || control->state != Initialized) + return E_FAIL; + + if (control->host->script_state != SCRIPTSTATE_STARTED) + { + hr = set_script_state(control->host, SCRIPTSTATE_STARTED); + if (FAILED(hr)) + return hr; + } + + hr = IActiveScriptParse_ParseScriptText(control->host->parse, script_text, NULL, + NULL, NULL, 0, 1, flag, res, &excepinfo); + /* FIXME: more error handling */ + return hr; +} + static HRESULT WINAPI ScriptControl_AddCode(IScriptControl *iface, BSTR code) { ScriptControl *This = impl_from_IScriptControl(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(code)); - return E_NOTIMPL; + + TRACE("(%p)->(%s).\n", This, debugstr_w(code)); + + return parse_script_text(This, code, SCRIPTTEXT_ISVISIBLE, NULL); } static HRESULT WINAPI ScriptControl_Eval(IScriptControl *iface, BSTR expression, VARIANT *res) { ScriptControl *This = impl_from_IScriptControl(iface); - EXCEPINFO excepinfo; - HRESULT hr; - FIXME("(%p)->(%s %p)\n", This, debugstr_w(expression), res); + TRACE("(%p)->(%s, %p).\n", This, debugstr_w(expression), res); if (!res) return E_POINTER; V_VT(res) = VT_EMPTY; - if (!This->host || This->state != Initialized) - return E_FAIL; - - if (This->host->script_state != SCRIPTSTATE_STARTED) - { - hr = set_script_state(This->host, SCRIPTSTATE_STARTED); - if (FAILED(hr)) - return hr; - } - - hr = IActiveScriptParse_ParseScriptText(This->host->parse, expression, NULL, NULL, NULL, - 0, 1, SCRIPTTEXT_ISEXPRESSION, res, &excepinfo); - /* FIXME: more error handling */ - - return hr; + return parse_script_text(This, expression, SCRIPTTEXT_ISEXPRESSION, res); } static HRESULT WINAPI ScriptControl_ExecuteStatement(IScriptControl *iface, BSTR statement) diff --git a/dlls/msscript.ocx/tests/msscript.c b/dlls/msscript.ocx/tests/msscript.c index 80a1760b08..d3f0955ca7 100644 --- a/dlls/msscript.ocx/tests/msscript.c +++ b/dlls/msscript.ocx/tests/msscript.c @@ -144,6 +144,8 @@ static HRESULT WINAPI ActiveScriptParse_AddScriptlet(IActiveScriptParse *iface, return E_NOTIMPL; } +static DWORD parse_flags = 0; + static HRESULT WINAPI ActiveScriptParse_ParseScriptText(IActiveScriptParse *iface, LPCOLESTR pstrCode, LPCOLESTR pstrItemName, IUnknown *punkContext, LPCOLESTR pstrDelimiter, CTXARG_T dwSourceContextCookie, ULONG ulStartingLine, @@ -155,9 +157,13 @@ static HRESULT WINAPI ActiveScriptParse_ParseScriptText(IActiveScriptParse *ifac ok(!pstrDelimiter, "got wrong pointer: %p.\n", pstrDelimiter); ok(!dwSourceContextCookie, "got wrong value: %s.\n", wine_dbgstr_longlong(dwSourceContextCookie)); ok(ulStartingLine == 1, "got wrong value: %d.\n", ulStartingLine); - ok(dwFlags == SCRIPTTEXT_ISEXPRESSION, "got wrong flags: %x.\n", dwFlags); - ok(!!pvarResult, "got wrong pointer: %p.\n", pvarResult); ok(!!pexcepinfo, "got wrong pointer: %p.\n", pexcepinfo); + ok(dwFlags == parse_flags, "got wrong flags: %x.\n", dwFlags); + if (parse_flags == SCRIPTTEXT_ISEXPRESSION) + ok(!!pvarResult, "got wrong pointer: %p.\n", pvarResult); + else + ok(!pvarResult, "got wrong pointer: %p.\n", pvarResult); + CHECK_EXPECT(ParseScriptText); return S_OK; } @@ -1516,6 +1522,7 @@ static void test_IScriptControl_Eval(void) SET_EXPECT(SetScriptState_STARTED); SET_EXPECT(ParseScriptText); + parse_flags = SCRIPTTEXT_ISEXPRESSION; script_str = a2bstr("var1 = 1 + 1"); V_VT(&var) = VT_NULL; V_I4(&var) = 0xdeadbeef; @@ -1566,6 +1573,108 @@ static void test_IScriptControl_Eval(void) } } +static void test_IScriptControl_AddCode(void) +{ + BSTR code_str, language; + IScriptControl *sc; + VARIANT var; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_ScriptControl, NULL, CLSCTX_INPROC_SERVER | CLSCTX_INPROC_HANDLER, + &IID_IScriptControl, (void **)&sc); + ok(hr == S_OK, "Failed to create IScriptControl interface: 0x%08x.\n", hr); + + code_str = a2bstr("1 + 1"); + hr = IScriptControl_AddCode(sc, code_str); + ok(hr == E_FAIL, "IScriptControl_AddCode returned: 0x%08x.\n", hr); + SysFreeString(code_str); + + hr = IScriptControl_AddCode(sc, NULL); + ok(hr == E_FAIL, "IScriptControl_AddCode returned: 0x%08x.\n", hr); + + language = a2bstr("jscript"); + hr = IScriptControl_put_Language(sc, language); + ok(hr == S_OK, "IScriptControl_put_Language failed: 0x%08x.\n", hr); + SysFreeString(language); + + code_str = a2bstr("1 + 1"); + hr = IScriptControl_AddCode(sc, code_str); + ok(hr == S_OK, "IScriptControl_AddCode failed: 0x%08x.\n", hr); + SysFreeString(code_str); + todo_wine CHECK_ERROR(sc, 0); + + code_str = a2bstr("invalid syntax"); + hr = IScriptControl_AddCode(sc, code_str); + todo_wine ok(hr == 0x800a03ec, "IScriptControl_AddCode returned: 0x%08x.\n", hr); + SysFreeString(code_str); + todo_wine CHECK_ERROR(sc, 1004); + + IScriptControl_Release(sc); + + /* custom script engine */ + if (have_custom_engine) + { + hr = CoCreateInstance(&CLSID_ScriptControl, NULL, CLSCTX_INPROC_SERVER | CLSCTX_INPROC_HANDLER, + &IID_IScriptControl, (void **)&sc); + ok(hr == S_OK, "Failed to create IScriptControl interface: 0x%08x.\n", hr); + + SET_EXPECT(CreateInstance); + SET_EXPECT(SetInterfaceSafetyOptions); + SET_EXPECT(SetScriptSite); + SET_EXPECT(QI_IActiveScriptParse); + SET_EXPECT(InitNew); + + language = a2bstr("testscript"); + hr = IScriptControl_put_Language(sc, language); + ok(hr == S_OK, "IScriptControl_put_Language failed: 0x%08x.\n", hr); + SysFreeString(language); + + CHECK_CALLED(CreateInstance); + CHECK_CALLED(SetInterfaceSafetyOptions); + CHECK_CALLED(SetScriptSite); + CHECK_CALLED(QI_IActiveScriptParse); + CHECK_CALLED(InitNew); + + SET_EXPECT(SetScriptState_STARTED); + SET_EXPECT(ParseScriptText); + parse_flags = SCRIPTTEXT_ISVISIBLE; + code_str = a2bstr("1 + 1"); + hr = IScriptControl_AddCode(sc, code_str); + ok(hr == S_OK, "IScriptControl_AddCode failed: 0x%08x.\n", hr); + SysFreeString(code_str); + CHECK_CALLED(SetScriptState_STARTED); + CHECK_CALLED(ParseScriptText); + + SET_EXPECT(ParseScriptText); + code_str = a2bstr("0x100"); + hr = IScriptControl_AddCode(sc, code_str); + ok(hr == S_OK, "IScriptControl_AddCode failed: 0x%08x.\n", hr); + SysFreeString(code_str); + CHECK_CALLED(ParseScriptText); + + /* Call Eval() after AddCode() for checking if it will call SetScriptState() again. */ + SET_EXPECT(ParseScriptText); + parse_flags = SCRIPTTEXT_ISEXPRESSION; + code_str = a2bstr("var2 = 10 + var1"); + V_VT(&var) = VT_NULL; + V_I4(&var) = 0xdeadbeef; + hr = IScriptControl_Eval(sc, code_str, &var); + ok(hr == S_OK, "IScriptControl_Eval failed: 0x%08x.\n", hr); + ok((V_VT(&var) == VT_EMPTY) && (V_I4(&var) == 0xdeadbeef), "V_VT(var) = %d, V_I4(var) = %d.\n", + V_VT(&var), V_I4(&var)); + SysFreeString(code_str); + CHECK_CALLED(ParseScriptText); + + IActiveScriptSite_Release(site); + + SET_EXPECT(Close); + + IScriptControl_Release(sc); + + CHECK_CALLED(Close); + } +} + START_TEST(msscript) { IUnknown *unk; @@ -1600,6 +1709,7 @@ START_TEST(msscript) test_UseSafeSubset(); test_State(); test_IScriptControl_Eval(); + test_IScriptControl_AddCode(); init_registry(FALSE);

1 0

Gabriel Ivăncescu : vbscript: Handle NULL code text in ParseScriptText and ParseProcedureText.
by Alexandre Julliard 23 Sep '19

23 Sep '19

Module: wine Branch: master Commit: 7c9139dffb612a0a9699b354beaf7eb6c8128c00 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7c9139dffb612a0a9699b354… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Sep 23 16:19:07 2019 +0300 vbscript: Handle NULL code text in ParseScriptText and ParseProcedureText. 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/compile.c | 2 ++ dlls/vbscript/tests/run.c | 9 +++++++++ 2 files changed, 11 insertions(+) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index 0527297e1e..d78e096285 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -1822,6 +1822,8 @@ HRESULT compile_script(script_ctx_t *script, const WCHAR *src, const WCHAR *deli vbscode_t *code; HRESULT hres; + if (!src) src = L""; + hres = parse_script(&ctx.parser, src, delimiter, flags); if(FAILED(hres)) return hres; diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index 8e51e3c966..ebcc8836c4 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -1917,6 +1917,10 @@ static void test_parse_context(void) hres = IActiveScript_QueryInterface(engine, &IID_IActiveScriptParse, (void**)&parser); ok(hres == S_OK, "Could not get IActiveScriptParse: %08x\n", hres); + /* NULL code text succeeds but does nothing */ + hres = IActiveScriptParse_ParseScriptText(parser, NULL, NULL, NULL, NULL, 0, 0, 0, NULL, NULL); + ok(hres == S_OK, "ParseScriptText failed: %08x\n", hres); + /* unknown identifier context is not a valid argument */ str = a2bstr("Call reportSuccess()\n"); hres = IActiveScriptParse_ParseScriptText(parser, str, yW, NULL, NULL, 0, 0, 0, NULL, NULL); @@ -2003,6 +2007,7 @@ static void test_procedures(void) DISPPARAMS dp = {NULL}; IActiveScript *script; IDispatchEx *proc; + IDispatch *disp; EXCEPINFO ei = {0}; VARIANT v; HRESULT hres; @@ -2012,6 +2017,10 @@ static void test_procedures(void) hres = IActiveScript_QueryInterface(script, &IID_IActiveScriptParseProcedure2, (void**)&parse_proc); ok(hres == S_OK, "Could not get IActiveScriptParseProcedure2 iface: %08x\n", hres); + hres = IActiveScriptParseProcedure2_ParseProcedureText(parse_proc, NULL, NULL, emptyW, NULL, NULL, NULL, 0, 0, 0, &disp); + ok(hres == S_OK, "ParseProcedureText failed: %08x\n", hres); + IDispatch_Release(disp); + proc = parse_procedure(parse_proc, "dim x\nif true then x=false", 0); V_VT(&v) = VT_EMPTY;

1 0

Hans Leidekker : bcrypt: Add support for generating RSA keys.
by Alexandre Julliard 23 Sep '19

23 Sep '19

Module: wine Branch: master Commit: b2bbb6f48f24ada876f952e9c0921ca584fe307d URL: https://source.winehq.org/git/wine.git/?a=commit;h=b2bbb6f48f24ada876f952e9… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Sep 23 15:48:51 2019 +0200 bcrypt: Add support for generating RSA keys. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt_internal.h | 4 +- dlls/bcrypt/bcrypt_main.c | 24 +++++++--- dlls/bcrypt/gnutls.c | 101 +++++++++++++++++++++++++++++++++++++++--- dlls/bcrypt/macos.c | 3 +- 4 files changed, 118 insertions(+), 14 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b2bbb6f48f24ada876f9…

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