Module: wine Branch: master Commit: 59fe65b61992a76985c1e43363e959acdceca60f URL: https://source.winehq.org/git/wine.git/?a=commit;h=59fe65b61992a76985c1e4336...
Author: Gabriel Ivăncescu gabrielopcode@gmail.com Date: Thu Sep 3 17:50:25 2020 +0300
msscript.ocx: Return S_OK from the IActiveScriptSiteWindow::EnableModeless stub.
This is needed so e.g. vbscript can display message boxes when used from the script control.
Signed-off-by: Gabriel Ivăncescu gabrielopcode@gmail.com Signed-off-by: Jacek Caban jacek@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/msscript.ocx/msscript.c | 4 ++-- dlls/msscript.ocx/tests/msscript.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index a61763458b..7ddcb8f73d 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -775,9 +775,9 @@ static HRESULT WINAPI ActiveScriptSiteWindow_EnableModeless(IActiveScriptSiteWin { ScriptHost *This = impl_from_IActiveScriptSiteWindow(iface);
- FIXME("(%p, %d)\n", This, enable); + FIXME("(%p, %d): stub\n", This, enable);
- return E_NOTIMPL; + return S_OK; }
static const IActiveScriptSiteWindowVtbl ActiveScriptSiteWindowVtbl = { diff --git a/dlls/msscript.ocx/tests/msscript.c b/dlls/msscript.ocx/tests/msscript.c index 2df85ffb40..e6d139fd75 100644 --- a/dlls/msscript.ocx/tests/msscript.c +++ b/dlls/msscript.ocx/tests/msscript.c @@ -2000,9 +2000,9 @@ static void test_SitehWnd(void) ok(window == hwnd, "got %p, expected %p\n", window, hwnd);
hr = IActiveScriptSiteWindow_EnableModeless(site_window, FALSE); - todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08x\n", hr); hr = IActiveScriptSiteWindow_EnableModeless(site_window, TRUE); - todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08x\n", hr);
site_hwnd = 0xdeadbeef; hr = IScriptControl_put_SitehWnd(sc, 0);