- Wine-Commits - list.winehq.org

Rémi Bernon : opengl32: Implement wow64 thunks for input pointer arrays.
by Alexandre Julliard Nov. 18, 2022

Nov. 18, 2022

Module: wine Branch: master Commit: edcea32c6a472e586a033da5406a7de142b83480 URL: https://gitlab.winehq.org/wine/wine/-/commit/edcea32c6a472e586a033da5406a7d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Oct 6 20:29:17 2022 +0200 opengl32: Implement wow64 thunks for input pointer arrays. --- dlls/opengl32/make_opengl | 40 +++++++++++++- dlls/opengl32/unix_private.h | 11 ++++ dlls/opengl32/unix_thunks.c | 122 +++++++++++++++++++++++++++++++------------ 3 files changed, 138 insertions(+), 35 deletions(-)

1 0

Rémi Bernon : opengl32: Implement wow64 thunk for wglGetPbufferDCARB.
by Alexandre Julliard Nov. 18, 2022

Nov. 18, 2022

Module: wine Branch: master Commit: 173e91a4b60d539c544f98c4ed6275d7bd18e975 URL: https://gitlab.winehq.org/wine/wine/-/commit/173e91a4b60d539c544f98c4ed6275… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Nov 14 22:52:24 2022 +0100 opengl32: Implement wow64 thunk for wglGetPbufferDCARB. --- dlls/opengl32/make_opengl | 1 + dlls/opengl32/unix_thunks.c | 16 +--------------- dlls/opengl32/unix_wgl.c | 17 +++++++++++++++++ 3 files changed, 19 insertions(+), 15 deletions(-) diff --git a/dlls/opengl32/make_opengl b/dlls/opengl32/make_opengl index 85e01379b59..1d15234b73d 100755 --- a/dlls/opengl32/make_opengl +++ b/dlls/opengl32/make_opengl @@ -174,6 +174,7 @@ my %manual_wow64_thunks = "wglCreateContextAttribsARB" => 1, "wglCreatePbufferARB" => 1, "wglDeleteContext" => 1, + "wglGetPbufferDCARB" => 1, "wglGetProcAddress" => 1, "wglMakeContextCurrentARB" => 1, "wglMakeCurrent" => 1, diff --git a/dlls/opengl32/unix_thunks.c b/dlls/opengl32/unix_thunks.c index e891b59ac3e..09d1c145bd1 100644 --- a/dlls/opengl32/unix_thunks.c +++ b/dlls/opengl32/unix_thunks.c @@ -60717,21 +60717,6 @@ static NTSTATUS wow64_ext_wglGetExtensionsStringEXT( void *args ) return STATUS_NOT_IMPLEMENTED; } -static NTSTATUS wow64_ext_wglGetPbufferDCARB( void *args ) -{ - struct - { - PTR32 hPbuffer; - PTR32 ret; - } *params32 = args; - struct wglGetPbufferDCARB_params params = - { - .hPbuffer = ULongToPtr(params32->hPbuffer), - }; - FIXME( "params32 %p, params %p stub!\n", params32, &params ); - return STATUS_NOT_IMPLEMENTED; -} - static NTSTATUS wow64_ext_wglGetPixelFormatAttribfvARB( void *args ) { struct @@ -60966,6 +60951,7 @@ extern NTSTATUS wow64_wgl_wglMakeCurrent( void *args ) DECLSPEC_HIDDEN; extern NTSTATUS wow64_ext_glPathGlyphIndexRangeNV( void *args ) DECLSPEC_HIDDEN; extern NTSTATUS wow64_ext_wglCreateContextAttribsARB( void *args ) DECLSPEC_HIDDEN; extern NTSTATUS wow64_ext_wglCreatePbufferARB( void *args ) DECLSPEC_HIDDEN; +extern NTSTATUS wow64_ext_wglGetPbufferDCARB( void *args ) DECLSPEC_HIDDEN; extern NTSTATUS wow64_ext_wglMakeContextCurrentARB( void *args ) DECLSPEC_HIDDEN; const unixlib_entry_t __wine_unix_call_wow64_funcs[] = diff --git a/dlls/opengl32/unix_wgl.c b/dlls/opengl32/unix_wgl.c index 905cd4472be..8bf15b47bfe 100644 --- a/dlls/opengl32/unix_wgl.c +++ b/dlls/opengl32/unix_wgl.c @@ -1193,6 +1193,23 @@ NTSTATUS wow64_ext_wglMakeContextCurrentARB( void *args ) return status; } +NTSTATUS wow64_ext_wglGetPbufferDCARB( void *args ) +{ + struct + { + PTR32 hPbuffer; + PTR32 ret; + } *params32 = args; + struct wglGetPbufferDCARB_params params = + { + .hPbuffer = (HPBUFFERARB)ULongToPtr(params32->hPbuffer), + }; + NTSTATUS status; + if ((status = ext_wglGetPbufferDCARB( &params ))) return status; + params32->ret = (UINT_PTR)params.ret; + return STATUS_SUCCESS; +} + NTSTATUS wow64_wgl_wglGetProcAddress( void *args ) { struct

1 0

Gabriel Ivăncescu : mshtml: Implement pagehide event.
by Alexandre Julliard Nov. 18, 2022

Nov. 18, 2022

Module: wine Branch: master Commit: f8d4dbd70378d753c662483f07eee1e07e60fa2e URL: https://gitlab.winehq.org/wine/wine/-/commit/f8d4dbd70378d753c662483f07eee1… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Nov 18 17:20:28 2022 +0200 mshtml: Implement pagehide event. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlevent.c | 2 ++ dlls/mshtml/htmlevent.h | 1 + dlls/mshtml/nsevents.c | 22 ++++++++++++++++++++++ dlls/mshtml/tests/documentmode.js | 17 ++++++++++++++++- dlls/mshtml/tests/events.c | 37 ++++++++++++++++++++++++++++++++++++- dlls/mshtml/view.c | 10 ++++++++++ 6 files changed, 87 insertions(+), 2 deletions(-)

1 0

Gabriel Ivăncescu : mshtml: Implement unload event.
by Alexandre Julliard Nov. 18, 2022

Nov. 18, 2022

Module: wine Branch: master Commit: 570e6b2087b38c6f81cb71b796b00cb98a4497df URL: https://gitlab.winehq.org/wine/wine/-/commit/570e6b2087b38c6f81cb71b796b00c… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Nov 18 17:20:28 2022 +0200 mshtml: Implement unload event. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlevent.c | 2 +- dlls/mshtml/mshtml_private.h | 3 +- dlls/mshtml/nsevents.c | 23 ++++++++++++ dlls/mshtml/tests/documentmode.js | 12 ++++++ dlls/mshtml/tests/events.c | 78 +++++++++++++++++++++++++++++++++++++++ dlls/mshtml/tests/script.c | 22 +++++++++++ dlls/mshtml/view.c | 33 +++++++++++++++++ 7 files changed, 171 insertions(+), 2 deletions(-)

1 0

Gabriel Ivăncescu : mshtml: Dispatch beforeunload event to the window.
by Alexandre Julliard Nov. 18, 2022

Nov. 18, 2022

Module: wine Branch: master Commit: 00dbd769b961e3ac1ec5e5bff3d38c4d33327d07 URL: https://gitlab.winehq.org/wine/wine/-/commit/00dbd769b961e3ac1ec5e5bff3d38c… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Nov 18 17:20:28 2022 +0200 mshtml: Dispatch beforeunload event to the window. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/nsevents.c | 23 +++++++++ dlls/mshtml/tests/documentmode.js | 5 ++ dlls/mshtml/tests/events.c | 103 ++++++++++++++++++++++++++++++++++++++ dlls/mshtml/tests/iframe.html | 4 ++ dlls/mshtml/tests/rsrc.rc | 3 ++ 5 files changed, 138 insertions(+) diff --git a/dlls/mshtml/nsevents.c b/dlls/mshtml/nsevents.c index 0b76ebec5c3..7002a2cc71d 100644 --- a/dlls/mshtml/nsevents.c +++ b/dlls/mshtml/nsevents.c @@ -58,6 +58,7 @@ static nsresult NSAPI handle_focus(nsIDOMEventListener*,nsIDOMEvent*); static nsresult NSAPI handle_keypress(nsIDOMEventListener*,nsIDOMEvent*); static nsresult NSAPI handle_pageshow(nsIDOMEventListener*,nsIDOMEvent*); static nsresult NSAPI handle_load(nsIDOMEventListener*,nsIDOMEvent*); +static nsresult NSAPI handle_beforeunload(nsIDOMEventListener*,nsIDOMEvent*); enum doc_event_listener_flags { BUBBLES = 0x0001, @@ -74,6 +75,7 @@ static const struct { { EVENTID_KEYPRESS, BUBBLES, EVENTLISTENER_VTBL(handle_keypress) }, { EVENTID_PAGESHOW, OVERRIDE, EVENTLISTENER_VTBL(handle_pageshow), }, { EVENTID_LOAD, OVERRIDE, EVENTLISTENER_VTBL(handle_load), }, + { EVENTID_BEFOREUNLOAD, OVERRIDE, EVENTLISTENER_VTBL(handle_beforeunload), }, }; struct nsDocumentEventListener { @@ -333,6 +335,27 @@ static nsresult NSAPI handle_load(nsIDOMEventListener *iface, nsIDOMEvent *event return NS_OK; } +static nsresult NSAPI handle_beforeunload(nsIDOMEventListener *iface, nsIDOMEvent *nsevent) +{ + nsEventListener *This = impl_from_nsIDOMEventListener(iface); + HTMLDocumentNode *doc = This->This->doc; + HTMLInnerWindow *window; + DOMEvent *event; + HRESULT hres; + + if(!doc || !(window = doc->window)) + return NS_OK; + + /* Gecko dispatches this to the document, but IE dispatches it to the window */ + hres = create_event_from_nsevent(nsevent, dispex_compat_mode(&doc->node.event_target.dispex), &event); + if(SUCCEEDED(hres)) { + dispatch_event(&window->event_target, event); + IDOMEvent_Release(&event->IDOMEvent_iface); + } + + return NS_OK; +} + static nsresult NSAPI handle_htmlevent(nsIDOMEventListener *iface, nsIDOMEvent *nsevent) { nsEventListener *This = impl_from_nsIDOMEventListener(iface); diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index ca942501381..246974fb82e 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -20,6 +20,8 @@ var compat_version; var tests = []; var pageshow_fired = false; +window.onbeforeunload = function() { ok(false, "beforeunload fired"); }; + if(window.addEventListener) { window.addEventListener("pageshow", function(e) { pageshow_fired = true; @@ -32,6 +34,9 @@ if(window.addEventListener) { }, true); document.addEventListener("visibilitychange", function() { ok(false, "visibilitychange fired"); }); + document.addEventListener("beforeunload", function() { ok(false, "beforeunload fired on document"); }); +}else { + document.attachEvent("onbeforeunload", function() { ok(false, "beforeunload fired on document"); }); } sync_test("page transition events", function() { diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index 6d9543db96b..e12f4f666a2 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -98,6 +98,8 @@ DEFINE_EXPECT(submit_onclick_setret); DEFINE_EXPECT(elem2_cp_onclick); DEFINE_EXPECT(iframe_onload); DEFINE_EXPECT(visibilitychange); +DEFINE_EXPECT(onbeforeunload); +DEFINE_EXPECT(iframe_onbeforeunload); DEFINE_EXPECT(doc1_onstorage); DEFINE_EXPECT(doc1_onstoragecommit); DEFINE_EXPECT(window1_onstorage); @@ -1431,6 +1433,27 @@ static HRESULT WINAPI onvisibilitychange(IDispatchEx *iface, DISPID id, LCID lci EVENT_HANDLER_FUNC_OBJ(onvisibilitychange); +static HRESULT WINAPI onbeforeunload(IDispatchEx *iface, DISPID id, LCID lcid, WORD wFlags, DISPPARAMS *pdp, + VARIANT *pvarRes, EXCEPINFO *pei, IServiceProvider *pspCaller) +{ + CHECK_EXPECT(onbeforeunload); + test_event_args(NULL, id, wFlags, pdp, pvarRes, pei, pspCaller); + return S_OK; +} + +EVENT_HANDLER_FUNC_OBJ(onbeforeunload); + +static HRESULT WINAPI iframe_onbeforeunload(IDispatchEx *iface, DISPID id, LCID lcid, WORD wFlags, DISPPARAMS *pdp, + VARIANT *pvarRes, EXCEPINFO *pei, IServiceProvider *pspCaller) +{ + CHECK_EXPECT(iframe_onbeforeunload); + ok(called_onbeforeunload, "beforeunload not fired on parent window before iframe\n"); + test_event_args(NULL, id, wFlags, pdp, pvarRes, pei, pspCaller); + return S_OK; +} + +EVENT_HANDLER_FUNC_OBJ(iframe_onbeforeunload); + static HRESULT WINAPI nocall(IDispatchEx *iface, DISPID id, LCID lcid, WORD wFlags, DISPPARAMS *pdp, VARIANT *pvarRes, EXCEPINFO *pei, IServiceProvider *pspCaller) { @@ -2460,6 +2483,85 @@ static void test_visibilitychange(IHTMLDocument2 *doc) } } +static void test_unload_event(IHTMLDocument2 *doc) +{ + IHTMLDocument2 *child_doc; + IHTMLFrameBase2 *iframe; + IHTMLDocument6 *doc6; + IHTMLElement2 *elem; + IHTMLWindow2 *child; + HRESULT hres; + VARIANT v; + BSTR bstr; + + V_VT(&v) = VT_DISPATCH; + V_DISPATCH(&v) = (IDispatch*)&onbeforeunload_obj; + hres = IHTMLWindow2_put_onbeforeunload(window, v); + ok(hres == S_OK, "put_onbeforeunload failed: %08lx\n", hres); + + V_VT(&v) = VT_EMPTY; + hres = IHTMLWindow2_get_onbeforeunload(window, &v); + ok(hres == S_OK, "get_onbeforeunload failed: %08lx\n", hres); + ok(V_VT(&v) == VT_DISPATCH, "V_VT(onbeforeunload) = %d\n", V_VT(&v)); + ok(V_DISPATCH(&v) == (IDispatch*)&onbeforeunload_obj, "V_DISPATCH(onbeforeunload) = %p\n", V_DISPATCH(&v)); + + hres = IHTMLDocument2_QueryInterface(doc, &IID_IHTMLDocument6, (void**)&doc6); + ok(hres == S_OK, "Could not get IHTMLDocument6 iface: %08lx\n", hres); + bstr = SysAllocString(L"ifr"); + hres = IHTMLDocument6_getElementById(doc6, bstr, &elem); + ok(hres == S_OK, "getElementById failed: %08lx\n", hres); + IHTMLDocument6_Release(doc6); + SysFreeString(bstr); + + hres = IHTMLElement2_QueryInterface(elem, &IID_IHTMLFrameBase2, (void**)&iframe); + ok(hres == S_OK, "Could not get IHTMLFrameBase2 iface: %08lx\n", hres); + IHTMLElement2_Release(elem); + hres = IHTMLFrameBase2_get_contentWindow(iframe, &child); + ok(hres == S_OK, "get_contentWindow failed: %08lx\n", hres); + IHTMLFrameBase2_Release(iframe); + + hres = IHTMLWindow2_get_document(child, &child_doc); + ok(hres == S_OK, "get_document failed: %08lx\n", hres); + + V_VT(&v) = VT_DISPATCH; + V_DISPATCH(&v) = (IDispatch*)&iframe_onbeforeunload_obj; + hres = IHTMLWindow2_put_onbeforeunload(child, v); + ok(hres == S_OK, "put_onbeforeunload failed: %08lx\n", hres); + + V_VT(&v) = VT_EMPTY; + hres = IHTMLWindow2_get_onbeforeunload(child, &v); + ok(hres == S_OK, "get_onbeforeunload failed: %08lx\n", hres); + ok(V_VT(&v) == VT_DISPATCH, "V_VT(onbeforeunload) = %d\n", V_VT(&v)); + ok(V_DISPATCH(&v) == (IDispatch*)&iframe_onbeforeunload_obj, "V_DISPATCH(onbeforeunload) = %p\n", V_DISPATCH(&v)); + + add_event_listener((IUnknown*)doc, L"beforeunload", (IDispatch*)&nocall_obj, VARIANT_TRUE); + add_event_listener((IUnknown*)child_doc, L"beforeunload", (IDispatch*)&nocall_obj, VARIANT_TRUE); + IHTMLDocument2_Release(child_doc); + IHTMLWindow2_Release(child); + + SET_EXPECT(onbeforeunload); + SET_EXPECT(iframe_onbeforeunload); + navigate(doc, L"blank.html"); + CHECK_CALLED(iframe_onbeforeunload); + CHECK_CALLED(onbeforeunload); + + V_VT(&v) = VT_EMPTY; + hres = IHTMLWindow2_get_onbeforeunload(window, &v); + ok(hres == S_OK, "get_onbeforeunload failed: %08lx\n", hres); + ok(V_VT(&v) == VT_NULL, "V_VT(onbeforeunload) = %d\n", V_VT(&v)); + + V_VT(&v) = VT_DISPATCH; + V_DISPATCH(&v) = (IDispatch*)&onbeforeunload_obj; + hres = IHTMLWindow2_put_onbeforeunload(window, v); + ok(hres == S_OK, "put_onbeforeunload failed: %08lx\n", hres); + + V_VT(&v) = VT_EMPTY; + hres = IHTMLWindow2_get_onbeforeunload(window, &v); + ok(hres == S_OK, "get_onbeforeunload failed: %08lx\n", hres); + ok(V_VT(&v) == VT_DISPATCH, "V_VT(onbeforeunload) = %d\n", V_VT(&v)); + ok(V_DISPATCH(&v) == (IDispatch*)&onbeforeunload_obj, "V_DISPATCH(onbeforeunload) = %p\n", V_DISPATCH(&v)); +} + static void test_submit(IHTMLDocument2 *doc) { IHTMLElement *elem, *submit; @@ -5571,6 +5673,7 @@ START_TEST(events) run_test_from_res(L"doc_with_prop_ie9.html", test_doc_obj); run_test_from_res(L"doc_with_prop_ie9.html", test_visibilitychange); run_test_from_res(L"blank_ie10.html", test_visibilitychange); + run_test_from_res(L"iframe.html", test_unload_event); run_test(empty_doc_ie9_str, test_create_event); } diff --git a/dlls/mshtml/tests/iframe.html b/dlls/mshtml/tests/iframe.html new file mode 100644 index 00000000000..ec08a0eb19a --- /dev/null +++ b/dlls/mshtml/tests/iframe.html @@ -0,0 +1,4 @@ +<html> +<head><meta http-equiv="x-ua-compatible" content="IE=11" /></head> +<body><iframe src="about:blank" id="ifr"></iframe></body> +</html> diff --git a/dlls/mshtml/tests/rsrc.rc b/dlls/mshtml/tests/rsrc.rc index 01b2838be8b..e60e37198de 100644 --- a/dlls/mshtml/tests/rsrc.rc +++ b/dlls/mshtml/tests/rsrc.rc @@ -82,6 +82,9 @@ doc_with_prop.html HTML "doc_with_prop.html" /* @makedep: doc_with_prop_ie9.html */ doc_with_prop_ie9.html HTML "doc_with_prop_ie9.html" +/* @makedep: iframe.html */ +iframe.html HTML "iframe.html" + /* For res: protocol test: */ /* @makedep: jstest.html */

1 0

Gabriel Ivăncescu : mshtml: Implement pageshow event.
by Alexandre Julliard Nov. 18, 2022

Nov. 18, 2022

Module: wine Branch: master Commit: e2bb4c1b88874c4a4d07b3d32ee0b9d43f12d57c URL: https://gitlab.winehq.org/wine/wine/-/commit/e2bb4c1b88874c4a4d07b3d32ee0b9… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Nov 18 17:20:27 2022 +0200 mshtml: Implement pageshow event. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlevent.c | 120 +++++++++++++++++++++++++++++++++++ dlls/mshtml/htmlevent.h | 1 + dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/mshtml_private_iface.idl | 14 ++++ dlls/mshtml/nsevents.c | 22 +++++++ dlls/mshtml/tests/documentmode.js | 17 +++++ 6 files changed, 175 insertions(+)

1 0

Rémi Bernon : opengl32: Implement wow64 thunk for wglCreatePbufferARB.
by Alexandre Julliard Nov. 18, 2022

Nov. 18, 2022

Module: wine Branch: master Commit: bfb6119fb3d8c65ed98647a10f12c2820797b8c9 URL: https://gitlab.winehq.org/wine/wine/-/commit/bfb6119fb3d8c65ed98647a10f12c2… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Nov 14 22:52:14 2022 +0100 opengl32: Implement wow64 thunk for wglCreatePbufferARB. --- dlls/opengl32/make_opengl | 1 + dlls/opengl32/unix_thunks.c | 24 +----------------------- dlls/opengl32/unix_wgl.c | 25 +++++++++++++++++++++++++ 3 files changed, 27 insertions(+), 23 deletions(-) diff --git a/dlls/opengl32/make_opengl b/dlls/opengl32/make_opengl index d41b6e7c054..85e01379b59 100755 --- a/dlls/opengl32/make_opengl +++ b/dlls/opengl32/make_opengl @@ -172,6 +172,7 @@ my %manual_wow64_thunks = "glPathGlyphIndexRangeNV" => 1, "wglCreateContext" => 1, "wglCreateContextAttribsARB" => 1, + "wglCreatePbufferARB" => 1, "wglDeleteContext" => 1, "wglGetProcAddress" => 1, "wglMakeContextCurrentARB" => 1, diff --git a/dlls/opengl32/unix_thunks.c b/dlls/opengl32/unix_thunks.c index 6c8fba0b9f1..e891b59ac3e 100644 --- a/dlls/opengl32/unix_thunks.c +++ b/dlls/opengl32/unix_thunks.c @@ -60644,29 +60644,6 @@ static NTSTATUS wow64_ext_wglChoosePixelFormatARB( void *args ) return status; } -static NTSTATUS wow64_ext_wglCreatePbufferARB( void *args ) -{ - struct - { - PTR32 hDC; - int iPixelFormat; - int iWidth; - int iHeight; - PTR32 piAttribList; - PTR32 ret; - } *params32 = args; - struct wglCreatePbufferARB_params params = - { - .hDC = ULongToPtr(params32->hDC), - .iPixelFormat = params32->iPixelFormat, - .iWidth = params32->iWidth, - .iHeight = params32->iHeight, - .piAttribList = ULongToPtr(params32->piAttribList), - }; - FIXME( "params32 %p, params %p stub!\n", params32, &params ); - return STATUS_NOT_IMPLEMENTED; -} - static NTSTATUS wow64_ext_wglDestroyPbufferARB( void *args ) { struct @@ -60988,6 +60965,7 @@ extern NTSTATUS wow64_wgl_wglGetProcAddress( void *args ) DECLSPEC_HIDDEN; extern NTSTATUS wow64_wgl_wglMakeCurrent( void *args ) DECLSPEC_HIDDEN; extern NTSTATUS wow64_ext_glPathGlyphIndexRangeNV( void *args ) DECLSPEC_HIDDEN; extern NTSTATUS wow64_ext_wglCreateContextAttribsARB( void *args ) DECLSPEC_HIDDEN; +extern NTSTATUS wow64_ext_wglCreatePbufferARB( void *args ) DECLSPEC_HIDDEN; extern NTSTATUS wow64_ext_wglMakeContextCurrentARB( void *args ) DECLSPEC_HIDDEN; const unixlib_entry_t __wine_unix_call_wow64_funcs[] = diff --git a/dlls/opengl32/unix_wgl.c b/dlls/opengl32/unix_wgl.c index 8f5e8010ea8..905cd4472be 100644 --- a/dlls/opengl32/unix_wgl.c +++ b/dlls/opengl32/unix_wgl.c @@ -1111,6 +1111,31 @@ NTSTATUS wow64_ext_wglCreateContextAttribsARB( void *args ) return STATUS_SUCCESS; } +NTSTATUS wow64_ext_wglCreatePbufferARB( void *args ) +{ + struct + { + PTR32 hDC; + GLint iPixelFormat; + GLint iWidth; + GLint iHeight; + PTR32 piAttribList; + PTR32 ret; + } *params32 = args; + struct wglCreatePbufferARB_params params = + { + .hDC = ULongToPtr(params32->hDC), + .iPixelFormat = params32->iPixelFormat, + .iWidth = params32->iWidth, + .iHeight = params32->iHeight, + .piAttribList = ULongToPtr(params32->piAttribList), + }; + NTSTATUS status; + if ((status = ext_wglCreatePbufferARB( &params ))) return status; + params32->ret = (UINT_PTR)params.ret; + return STATUS_SUCCESS; +} + NTSTATUS wow64_wgl_wglDeleteContext( void *args ) { struct

1 0

Rémi Bernon : opengl32: Implement wow64 thunk for wglCreateContextAttribsARB.
by Alexandre Julliard Nov. 18, 2022

Nov. 18, 2022

Module: wine Branch: master Commit: 4f1ed0873d77e6281993ceff68ff0728b4328e2d URL: https://gitlab.winehq.org/wine/wine/-/commit/4f1ed0873d77e6281993ceff68ff07… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Nov 14 22:52:02 2022 +0100 opengl32: Implement wow64 thunk for wglCreateContextAttribsARB. --- dlls/opengl32/make_opengl | 1 + dlls/opengl32/unix_thunks.c | 20 +------------------- dlls/opengl32/unix_wgl.c | 21 +++++++++++++++++++++ 3 files changed, 23 insertions(+), 19 deletions(-) diff --git a/dlls/opengl32/make_opengl b/dlls/opengl32/make_opengl index 3155a2d797e..d41b6e7c054 100755 --- a/dlls/opengl32/make_opengl +++ b/dlls/opengl32/make_opengl @@ -171,6 +171,7 @@ my %manual_wow64_thunks = ( "glPathGlyphIndexRangeNV" => 1, "wglCreateContext" => 1, + "wglCreateContextAttribsARB" => 1, "wglDeleteContext" => 1, "wglGetProcAddress" => 1, "wglMakeContextCurrentARB" => 1, diff --git a/dlls/opengl32/unix_thunks.c b/dlls/opengl32/unix_thunks.c index 5accad6fc0b..6c8fba0b9f1 100644 --- a/dlls/opengl32/unix_thunks.c +++ b/dlls/opengl32/unix_thunks.c @@ -60644,25 +60644,6 @@ static NTSTATUS wow64_ext_wglChoosePixelFormatARB( void *args ) return status; } -static NTSTATUS wow64_ext_wglCreateContextAttribsARB( void *args ) -{ - struct - { - PTR32 hDC; - PTR32 hShareContext; - PTR32 attribList; - PTR32 ret; - } *params32 = args; - struct wglCreateContextAttribsARB_params params = - { - .hDC = ULongToPtr(params32->hDC), - .hShareContext = ULongToPtr(params32->hShareContext), - .attribList = ULongToPtr(params32->attribList), - }; - FIXME( "params32 %p, params %p stub!\n", params32, &params ); - return STATUS_NOT_IMPLEMENTED; -} - static NTSTATUS wow64_ext_wglCreatePbufferARB( void *args ) { struct @@ -61006,6 +60987,7 @@ extern NTSTATUS wow64_wgl_wglDeleteContext( void *args ) DECLSPEC_HIDDEN; extern NTSTATUS wow64_wgl_wglGetProcAddress( void *args ) DECLSPEC_HIDDEN; extern NTSTATUS wow64_wgl_wglMakeCurrent( void *args ) DECLSPEC_HIDDEN; extern NTSTATUS wow64_ext_glPathGlyphIndexRangeNV( void *args ) DECLSPEC_HIDDEN; +extern NTSTATUS wow64_ext_wglCreateContextAttribsARB( void *args ) DECLSPEC_HIDDEN; extern NTSTATUS wow64_ext_wglMakeContextCurrentARB( void *args ) DECLSPEC_HIDDEN; const unixlib_entry_t __wine_unix_call_wow64_funcs[] = diff --git a/dlls/opengl32/unix_wgl.c b/dlls/opengl32/unix_wgl.c index 6dc659dcca5..8f5e8010ea8 100644 --- a/dlls/opengl32/unix_wgl.c +++ b/dlls/opengl32/unix_wgl.c @@ -1090,6 +1090,27 @@ NTSTATUS wow64_wgl_wglCreateContext( void *args ) return STATUS_SUCCESS; } +NTSTATUS wow64_ext_wglCreateContextAttribsARB( void *args ) +{ + struct + { + PTR32 hDC; + PTR32 hShareContext; + PTR32 attribList; + PTR32 ret; + } *params32 = args; + struct wglCreateContextAttribsARB_params params = + { + .hDC = ULongToPtr(params32->hDC), + .hShareContext = ULongToPtr(params32->hShareContext), + .attribList = ULongToPtr(params32->attribList), + }; + NTSTATUS status; + if ((status = ext_wglCreateContextAttribsARB( &params ))) return status; + params32->ret = (UINT_PTR)params.ret; + return STATUS_SUCCESS; +} + NTSTATUS wow64_wgl_wglDeleteContext( void *args ) { struct

1 0

Gabriel Ivăncescu : mshtml: Add visibilitychange event stub.
by Alexandre Julliard Nov. 18, 2022

Nov. 18, 2022

Module: wine Branch: master Commit: a85ebbcef1a0601f4ad12ed867707d029165ca66 URL: https://gitlab.winehq.org/wine/wine/-/commit/a85ebbcef1a0601f4ad12ed867707d… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Nov 18 17:20:27 2022 +0200 mshtml: Add visibilitychange event stub. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlevent.c | 2 + dlls/mshtml/htmlevent.h | 1 + dlls/mshtml/tests/blank_ie10.html | 3 ++ dlls/mshtml/tests/documentmode.js | 5 +++ dlls/mshtml/tests/events.c | 85 ++++++++++++++++++++++++++++++++++++--- dlls/mshtml/tests/rsrc.rc | 3 ++ 6 files changed, 94 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index e669afb7483..3f02f455bbf 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -206,6 +206,8 @@ static const event_info_t event_info[] = { EVENT_BIND_TO_TARGET}, {L"unload", EVENT_TYPE_UIEVENT, DISPID_EVMETH_ONUNLOAD, EVENT_FIXME}, + {L"visibilitychange", EVENT_TYPE_EVENT, DISPID_EVPROP_VISIBILITYCHANGE, + EVENT_FIXME | EVENT_BUBBLES}, /* EVENTID_LAST special entry */ {NULL, EVENT_TYPE_EVENT, 0, 0} diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index f78c4a0f188..97baf9eed7b 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -63,6 +63,7 @@ typedef enum { EVENTID_SUBMIT, EVENTID_TIMEOUT, EVENTID_UNLOAD, + EVENTID_VISIBILITYCHANGE, EVENTID_LAST } eventid_t; diff --git a/dlls/mshtml/tests/blank_ie10.html b/dlls/mshtml/tests/blank_ie10.html new file mode 100644 index 00000000000..64e6dfaa172 --- /dev/null +++ b/dlls/mshtml/tests/blank_ie10.html @@ -0,0 +1,3 @@ +<html> +<head><meta http-equiv="x-ua-compatible" content="IE=10" /></head> +</html> diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index 6b74094110f..6a1a2783062 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -19,6 +19,11 @@ var compat_version; var tests = []; +if(window.addEventListener) { + document.addEventListener("visibilitychange", function() { ok(false, "visibilitychange fired"); }); +} + + sync_test("builtin_toString", function() { var tags = [ [ "abbr", "Phrase" ], diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index dcd7160a67d..6d9543db96b 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -97,6 +97,7 @@ DEFINE_EXPECT(submit_onclick_attached_check_cancel); DEFINE_EXPECT(submit_onclick_setret); DEFINE_EXPECT(elem2_cp_onclick); DEFINE_EXPECT(iframe_onload); +DEFINE_EXPECT(visibilitychange); DEFINE_EXPECT(doc1_onstorage); DEFINE_EXPECT(doc1_onstoragecommit); DEFINE_EXPECT(window1_onstorage); @@ -1406,6 +1407,30 @@ static HRESULT WINAPI iframe_onreadystatechange(IDispatchEx *iface, DISPID id, L EVENT_HANDLER_FUNC_OBJ(iframe_onreadystatechange); +static HRESULT WINAPI onvisibilitychange(IDispatchEx *iface, DISPID id, LCID lcid, WORD wFlags, DISPPARAMS *pdp, + VARIANT *pvarRes, EXCEPINFO *pei, IServiceProvider *pspCaller) +{ + IDispatchEx *dispex; + HRESULT hres; + BSTR bstr; + + CHECK_EXPECT(visibilitychange); + test_event_args(NULL, id, wFlags, pdp, pvarRes, pei, pspCaller); + + hres = IDispatch_QueryInterface(V_DISPATCH(&pdp->rgvarg[1]), &IID_IDispatchEx, (void**)&dispex); + ok(hres == S_OK, "Could not get IDispatchEx: %08lx\n", hres); + + bstr = SysAllocString(L"toString"); + hres = IDispatchEx_GetDispID(dispex, bstr, 0, &id); + todo_wine + ok(hres == S_OK, "GetDispID(\"toString\") failed: %08lx\n", hres); + SysFreeString(bstr); + + return S_OK; +} + +EVENT_HANDLER_FUNC_OBJ(onvisibilitychange); + static HRESULT WINAPI nocall(IDispatchEx *iface, DISPID id, LCID lcid, WORD wFlags, DISPPARAMS *pdp, VARIANT *pvarRes, EXCEPINFO *pei, IServiceProvider *pspCaller) { @@ -2387,6 +2412,54 @@ static void test_focus(IHTMLDocument2 *doc) IHTMLElement4_Release(div); } +static void test_visibilitychange(IHTMLDocument2 *doc) +{ + if(!winetest_interactive) { + ShowWindow(container_hwnd, SW_SHOW); + pump_msgs(NULL); + } + add_event_listener((IUnknown*)doc, L"visibilitychange", (IDispatch*)&onvisibilitychange_obj, VARIANT_TRUE); + + ShowWindow(container_hwnd, SW_HIDE); + pump_msgs(NULL); + + ShowWindow(container_hwnd, SW_SHOW); + pump_msgs(NULL); + + if(document_mode < 10) { + ShowWindow(container_hwnd, SW_MINIMIZE); + pump_msgs(NULL); + + ShowWindow(container_hwnd, SW_RESTORE); + pump_msgs(NULL); + }else { + /* FIXME: currently not implemented in Wine, so we can't wait for it */ + BOOL *expect = broken(1) ? &called_visibilitychange : NULL; + + SET_EXPECT(visibilitychange); + ShowWindow(container_hwnd, SW_MINIMIZE); + pump_msgs(expect); + todo_wine + CHECK_CALLED(visibilitychange); + + SET_EXPECT(visibilitychange); + ShowWindow(container_hwnd, SW_RESTORE); + pump_msgs(expect); + todo_wine + CHECK_CALLED(visibilitychange); + } + + navigate(doc, document_mode < 10 ? L"blank_ie10.html" : L"blank.html"); + + if(document_mode >= 9) + add_event_listener((IUnknown*)doc, L"visibilitychange", (IDispatch*)&onvisibilitychange_obj, VARIANT_TRUE); + + if(!winetest_interactive) { + ShowWindow(container_hwnd, SW_HIDE); + pump_msgs(NULL); + } +} + static void test_submit(IHTMLDocument2 *doc) { IHTMLElement *elem, *submit; @@ -5091,6 +5164,10 @@ static IHTMLDocument2 *create_document_with_origin(const char *str) return doc; } +static LRESULT WINAPI wnd_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) +{ + return DefWindowProcA(hwnd, msg, wParam, lParam); +} typedef void (*testfunc_t)(IHTMLDocument2*); @@ -5154,6 +5231,7 @@ static void run_test_impl(const char *str, const WCHAR *res, testfunc_t test) ok(hres == S_OK, "get_parentWindow failed: %08lx\n", hres); ok(window != NULL, "window == NULL\n"); + ok((WNDPROC)GetWindowLongPtrA(container_hwnd, GWLP_WNDPROC) == wnd_proc, "container_hwnd is subclassed\n"); test(doc); IHTMLWindow2_Release(window); @@ -5176,11 +5254,6 @@ static void run_test_from_res(const WCHAR *res, testfunc_t test) return run_test_impl(NULL, res, test); } -static LRESULT WINAPI wnd_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) -{ - return DefWindowProcA(hwnd, msg, wParam, lParam); -} - static HWND create_container_window(void) { static const CHAR szHTMLDocumentTest[] = "HTMLDocumentTest"; @@ -5496,6 +5569,8 @@ START_TEST(events) if(is_ie9plus) { run_test_from_res(L"doc_with_prop.html", test_doc_obj); run_test_from_res(L"doc_with_prop_ie9.html", test_doc_obj); + run_test_from_res(L"doc_with_prop_ie9.html", test_visibilitychange); + run_test_from_res(L"blank_ie10.html", test_visibilitychange); run_test(empty_doc_ie9_str, test_create_event); } diff --git a/dlls/mshtml/tests/rsrc.rc b/dlls/mshtml/tests/rsrc.rc index 9bff32a78e9..01b2838be8b 100644 --- a/dlls/mshtml/tests/rsrc.rc +++ b/dlls/mshtml/tests/rsrc.rc @@ -73,6 +73,9 @@ blank2.html HTML "blank.html" /* @makedep: blank.html */ 123 HTML "blank.html" +/* @makedep: blank_ie10.html */ +blank_ie10.html HTML "blank_ie10.html" + /* @makedep: doc_with_prop.html */ doc_with_prop.html HTML "doc_with_prop.html"

1 0

Gabriel Ivăncescu : mshtml: Dispatch Gecko events to the window if there's no node.
by Alexandre Julliard Nov. 18, 2022

Nov. 18, 2022

Module: wine Branch: master Commit: 7d85bd5dde9d35511e41abfc32e743025618ae4c URL: https://gitlab.winehq.org/wine/wine/-/commit/7d85bd5dde9d35511e41abfc32e743… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Nov 18 17:20:27 2022 +0200 mshtml: Dispatch Gecko events to the window if there's no node. The window itself is not a DOM node, so this is perfectly normal to fail here. In fact, we weren't dispatching any gecko events sent to the window. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/nsevents.c | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/dlls/mshtml/nsevents.c b/dlls/mshtml/nsevents.c index 65de8c8c2e3..305a017d978 100644 --- a/dlls/mshtml/nsevents.c +++ b/dlls/mshtml/nsevents.c @@ -287,8 +287,8 @@ static nsresult NSAPI handle_htmlevent(nsIDOMEventListener *iface, nsIDOMEvent * nsEventListener *This = impl_from_nsIDOMEventListener(iface); HTMLDocumentNode *doc = This->This->doc; nsIDOMEventTarget *event_target; + EventTarget *target; nsIDOMNode *nsnode; - HTMLDOMNode *node; DOMEvent *event; nsresult nsres; HRESULT hres; @@ -309,18 +309,22 @@ static nsresult NSAPI handle_htmlevent(nsIDOMEventListener *iface, nsIDOMEvent * nsres = nsIDOMEventTarget_QueryInterface(event_target, &IID_nsIDOMNode, (void**)&nsnode); nsIDOMEventTarget_Release(event_target); if(NS_FAILED(nsres)) { - ERR("Could not get nsIDOMNode: %08lx\n", nsres); - return NS_OK; + if(!doc->window) + return S_OK; + target = &doc->window->event_target; + IHTMLWindow2_AddRef(&doc->window->base.IHTMLWindow2_iface); + }else { + HTMLDOMNode *node; + hres = get_node(nsnode, TRUE, &node); + nsIDOMNode_Release(nsnode); + if(FAILED(hres)) + return NS_OK; + target = &node->event_target; } - hres = get_node(nsnode, TRUE, &node); - nsIDOMNode_Release(nsnode); - if(FAILED(hres)) - return NS_OK; - hres = create_event_from_nsevent(nsevent, dispex_compat_mode(&doc->node.event_target.dispex), &event); if(FAILED(hres)) { - node_release(node); + IEventTarget_Release(&target->IEventTarget_iface); return NS_OK; } @@ -330,15 +334,15 @@ static nsresult NSAPI handle_htmlevent(nsIDOMEventListener *iface, nsIDOMEvent * hres = create_document_event(doc, event->event_id == EVENTID_FOCUS ? EVENTID_FOCUSIN : EVENTID_FOCUSOUT, &focus_event); if(SUCCEEDED(hres)) { - dispatch_event(&node->event_target, focus_event); + dispatch_event(target, focus_event); IDOMEvent_Release(&focus_event->IDOMEvent_iface); } } - dispatch_event(&node->event_target, event); + dispatch_event(target, event); IDOMEvent_Release(&event->IDOMEvent_iface); - node_release(node); + IEventTarget_Release(&target->IEventTarget_iface); return NS_OK; }

1 0