November 2022 - Wine-commits

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

18 Nov '22

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 unload event.
by Alexandre Julliard 18 Nov '22

18 Nov '22

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: Implement pagehide event.
by Alexandre Julliard 18 Nov '22

18 Nov '22

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

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

18 Nov '22

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

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

18 Nov '22

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 wglGetPbufferDCARB.
by Alexandre Julliard 18 Nov '22

18 Nov '22

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

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

18 Nov '22

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 thunks for glFenceSync (et al.).
by Alexandre Julliard 18 Nov '22

18 Nov '22

Module: wine Branch: master Commit: eabd176cc0e1ebc2f2a6dbddcedaadf6140d8b1a URL: https://gitlab.winehq.org/wine/wine/-/commit/eabd176cc0e1ebc2f2a6dbddcedaad… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Nov 7 15:55:24 2022 +0100 opengl32: Implement wow64 thunks for glFenceSync (et al.). --- dlls/opengl32/make_opengl | 6 ++ dlls/opengl32/unix_thunks.c | 130 +++-------------------------- dlls/opengl32/unix_wgl.c | 194 +++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 211 insertions(+), 119 deletions(-)

1 0

Alex Henrie : jscript: Use standard C functions for memory allocation in dispex.c.
by Alexandre Julliard 18 Nov '22

18 Nov '22

Module: wine Branch: master Commit: 7c26da1ae93716718382e276b3b55c6495b071db URL: https://gitlab.winehq.org/wine/wine/-/commit/7c26da1ae93716718382e276b3b55c… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Nov 17 19:17:18 2022 -0700 jscript: Use standard C functions for memory allocation in dispex.c. --- dlls/jscript/dispex.c | 62 +++++++++++++++++++++++++-------------------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 42f41771ef2..699e4c87b52 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -189,7 +189,7 @@ static inline HRESULT resize_props(jsdisp_t *This) if(This->buf_size != This->prop_cnt) return S_FALSE; - props = heap_realloc(This->props, sizeof(dispex_prop_t)*This->buf_size*2); + props = realloc(This->props, sizeof(dispex_prop_t) * This->buf_size * 2); if(!props) return E_OUTOFMEMORY; This->buf_size *= 2; @@ -220,7 +220,7 @@ static inline dispex_prop_t* alloc_prop(jsdisp_t *This, const WCHAR *name, prop_ return NULL; prop = &This->props[This->prop_cnt]; - prop->name = heap_strdupW(name); + prop->name = wcsdup(name); if(!prop->name) return NULL; prop->type = type; @@ -420,7 +420,7 @@ static HRESULT convert_params(script_ctx_t *ctx, const DISPPARAMS *dp, jsval_t * cnt = dp->cArgs - dp->cNamedArgs; if(cnt > 6) { - argv = heap_alloc(cnt * sizeof(*argv)); + argv = malloc(cnt * sizeof(*argv)); if(!argv) return E_OUTOFMEMORY; }else { @@ -433,7 +433,7 @@ static HRESULT convert_params(script_ctx_t *ctx, const DISPPARAMS *dp, jsval_t * while(i--) jsval_release(argv[i]); if(argv != buf) - heap_free(argv); + free(argv); return hres; } } @@ -775,9 +775,9 @@ static ULONG WINAPI ScriptTypeInfo_Release(ITypeInfo *iface) for (i = This->num_funcs; i--;) release_bytecode(This->funcs[i].code->bytecode); IDispatchEx_Release(&This->jsdisp->IDispatchEx_iface); - heap_free(This->funcs); - heap_free(This->vars); - heap_free(This); + free(This->funcs); + free(This->vars); + free(This); } return ref; } @@ -791,7 +791,7 @@ static HRESULT WINAPI ScriptTypeInfo_GetTypeAttr(ITypeInfo *iface, TYPEATTR **pp if (!ppTypeAttr) return E_INVALIDARG; - attr = heap_alloc_zero(sizeof(*attr)); + attr = calloc(1, sizeof(*attr)); if (!attr) return E_OUTOFMEMORY; attr->guid = GUID_JScriptTypeInfo; @@ -840,7 +840,7 @@ static HRESULT WINAPI ScriptTypeInfo_GetFuncDesc(ITypeInfo *iface, UINT index, F func = &This->funcs[index]; /* Store the parameter array after the FUNCDESC structure */ - desc = heap_alloc_zero(sizeof(*desc) + sizeof(ELEMDESC) * func->code->param_cnt); + desc = calloc(1, sizeof(*desc) + sizeof(ELEMDESC) * func->code->param_cnt); if (!desc) return E_OUTOFMEMORY; desc->memid = prop_to_id(This->jsdisp, func->prop); @@ -868,7 +868,7 @@ static HRESULT WINAPI ScriptTypeInfo_GetVarDesc(ITypeInfo *iface, UINT index, VA if (!ppVarDesc) return E_INVALIDARG; if (index >= This->num_vars) return TYPE_E_ELEMENTNOTFOUND; - desc = heap_alloc_zero(sizeof(*desc)); + desc = calloc(1, sizeof(*desc)); if (!desc) return E_OUTOFMEMORY; desc->memid = prop_to_id(This->jsdisp, This->vars[index]); @@ -1213,7 +1213,7 @@ static void WINAPI ScriptTypeInfo_ReleaseTypeAttr(ITypeInfo *iface, TYPEATTR *pT TRACE("(%p)->(%p)\n", This, pTypeAttr); - heap_free(pTypeAttr); + free(pTypeAttr); } static void WINAPI ScriptTypeInfo_ReleaseFuncDesc(ITypeInfo *iface, FUNCDESC *pFuncDesc) @@ -1222,7 +1222,7 @@ static void WINAPI ScriptTypeInfo_ReleaseFuncDesc(ITypeInfo *iface, FUNCDESC *pF TRACE("(%p)->(%p)\n", This, pFuncDesc); - heap_free(pFuncDesc); + free(pFuncDesc); } static void WINAPI ScriptTypeInfo_ReleaseVarDesc(ITypeInfo *iface, VARDESC *pVarDesc) @@ -1231,7 +1231,7 @@ static void WINAPI ScriptTypeInfo_ReleaseVarDesc(ITypeInfo *iface, VARDESC *pVar TRACE("(%p)->(%p)\n", This, pVarDesc); - heap_free(pVarDesc); + free(pVarDesc); } static const ITypeInfoVtbl ScriptTypeInfoVtbl = { @@ -1464,7 +1464,7 @@ static HRESULT WINAPI DispatchEx_GetTypeInfo(IDispatchEx *iface, UINT iTInfo, LC else num_vars++; } - if (!(typeinfo = heap_alloc(sizeof(*typeinfo)))) + if (!(typeinfo = malloc(sizeof(*typeinfo)))) return E_OUTOFMEMORY; typeinfo->ITypeInfo_iface.lpVtbl = &ScriptTypeInfoVtbl; @@ -1474,18 +1474,18 @@ static HRESULT WINAPI DispatchEx_GetTypeInfo(IDispatchEx *iface, UINT iTInfo, LC typeinfo->num_funcs = num_funcs; typeinfo->jsdisp = This; - typeinfo->funcs = heap_alloc(sizeof(*typeinfo->funcs) * num_funcs); + typeinfo->funcs = malloc(sizeof(*typeinfo->funcs) * num_funcs); if (!typeinfo->funcs) { - heap_free(typeinfo); + free(typeinfo); return E_OUTOFMEMORY; } - typeinfo->vars = heap_alloc(sizeof(*typeinfo->vars) * num_vars); + typeinfo->vars = malloc(sizeof(*typeinfo->vars) * num_vars); if (!typeinfo->vars) { - heap_free(typeinfo->funcs); - heap_free(typeinfo); + free(typeinfo->funcs); + free(typeinfo); return E_OUTOFMEMORY; } @@ -1614,7 +1614,7 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc hres = jsdisp_call_value(This, get_this(pdp), wFlags, argc, argv, pvarRes ? &r : NULL); if(argv != buf) - heap_free(argv); + free(argv); if(SUCCEEDED(hres) && pvarRes) { hres = jsval_to_variant(r, pvarRes); jsval_release(r); @@ -1830,7 +1830,7 @@ HRESULT init_dispex(jsdisp_t *dispex, script_ctx_t *ctx, const builtin_info_t *b dispex->extensible = TRUE; dispex->prop_cnt = 0; - dispex->props = heap_alloc_zero(sizeof(dispex_prop_t)*(dispex->buf_size=4)); + dispex->props = calloc(1, sizeof(dispex_prop_t)*(dispex->buf_size=4)); if(!dispex->props) return E_OUTOFMEMORY; @@ -1862,13 +1862,13 @@ HRESULT create_dispex(script_ctx_t *ctx, const builtin_info_t *builtin_info, jsd jsdisp_t *ret; HRESULT hres; - ret = heap_alloc_zero(sizeof(jsdisp_t)); + ret = calloc(1, sizeof(jsdisp_t)); if(!ret) return E_OUTOFMEMORY; hres = init_dispex(ret, ctx, builtin_info ? builtin_info : &dispex_info, prototype); if(FAILED(hres)) { - heap_free(ret); + free(ret); return hres; } @@ -1896,9 +1896,9 @@ void jsdisp_free(jsdisp_t *obj) default: break; }; - heap_free(prop->name); + free(prop->name); } - heap_free(obj->props); + free(obj->props); script_release(obj->ctx); if(obj->prototype) jsdisp_release(obj->prototype); @@ -1906,7 +1906,7 @@ void jsdisp_free(jsdisp_t *obj) if(obj->builtin_info->destructor) obj->builtin_info->destructor(obj); else - heap_free(obj); + free(obj); } #ifdef TRACE_REFCNT @@ -2128,7 +2128,7 @@ HRESULT disp_call(script_ctx_t *ctx, IDispatch *disp, DISPID id, WORD flags, uns } if(dp.cArgs > ARRAY_SIZE(buf)) { - dp.rgvarg = heap_alloc(argc*sizeof(VARIANT)); + dp.rgvarg = malloc(argc * sizeof(VARIANT)); if(!dp.rgvarg) return E_OUTOFMEMORY; }else { @@ -2141,7 +2141,7 @@ HRESULT disp_call(script_ctx_t *ctx, IDispatch *disp, DISPID id, WORD flags, uns while(i--) VariantClear(dp.rgvarg+argc-i-1); if(dp.rgvarg != buf) - heap_free(dp.rgvarg); + free(dp.rgvarg); return hres; } } @@ -2152,7 +2152,7 @@ HRESULT disp_call(script_ctx_t *ctx, IDispatch *disp, DISPID id, WORD flags, uns for(i=0; i<argc; i++) VariantClear(dp.rgvarg+argc-i-1); if(dp.rgvarg != buf) - heap_free(dp.rgvarg); + free(dp.rgvarg); if(SUCCEEDED(hres) && ret) hres = variant_to_jsval(ctx, &retv, ret); @@ -2223,7 +2223,7 @@ HRESULT disp_call_value(script_ctx_t *ctx, IDispatch *disp, IDispatch *jsthis, W dp.rgdispidNamedArgs = NULL; } - if(dp.cArgs > ARRAY_SIZE(buf) && !(args = heap_alloc(dp.cArgs * sizeof(VARIANT)))) + if(dp.cArgs > ARRAY_SIZE(buf) && !(args = malloc(dp.cArgs * sizeof(VARIANT)))) return E_OUTOFMEMORY; dp.rgvarg = args; @@ -2243,7 +2243,7 @@ HRESULT disp_call_value(script_ctx_t *ctx, IDispatch *disp, IDispatch *jsthis, W for(i = 0; i < argc; i++) VariantClear(dp.rgvarg + dp.cArgs - i - 1); if(args != buf) - heap_free(args); + free(args); if(FAILED(hres)) return hres;

1 0

Alex Henrie : jscript: Use standard C functions for memory allocation in jscript.c.
by Alexandre Julliard 18 Nov '22

18 Nov '22

Module: wine Branch: master Commit: 844f771b1301e9c43a0bb6f3229d1471a5d7540a URL: https://gitlab.winehq.org/wine/wine/-/commit/844f771b1301e9c43a0bb6f3229d14… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Nov 18 09:20:57 2022 -0700 jscript: Use standard C functions for memory allocation in jscript.c. --- dlls/jscript/jscript.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index 190a2876900..a138d26db3f 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -88,7 +88,7 @@ void script_release(script_ctx_t *ctx) ctx->jscaller->ctx = NULL; IServiceProvider_Release(&ctx->jscaller->IServiceProvider_iface); - heap_free(ctx); + free(ctx); } static void script_globals_release(script_ctx_t *ctx) @@ -192,8 +192,8 @@ void release_named_item(named_item_t *item) { if(--item->ref) return; - heap_free(item->name); - heap_free(item); + free(item->name); + free(item); } static inline JScriptError *impl_from_IActiveScriptError(IActiveScriptError *iface) @@ -240,7 +240,7 @@ static ULONG WINAPI JScriptError_Release(IActiveScriptError *iface) if(!ref) { reset_ei(&This->ei); - heap_free(This); + free(This); } return ref; @@ -367,7 +367,7 @@ HRESULT leave_script(script_ctx_t *ctx, HRESULT result) } if(FAILED(result)) { WARN("%08lx\n", result); - if(ctx->site && (error = heap_alloc(sizeof(*error)))) { + if(ctx->site && (error = malloc(sizeof(*error)))) { HRESULT hres; error->IActiveScriptError_iface.lpVtbl = &JScriptErrorVtbl; @@ -575,7 +575,7 @@ static ULONG WINAPI AXSite_Release(IServiceProvider *iface) if(This->sp) IServiceProvider_Release(This->sp); - heap_free(This); + free(This); } return ref; @@ -612,7 +612,7 @@ IUnknown *create_ax_site(script_ctx_t *ctx) TRACE("Could not get IServiceProvider iface: %08lx\n", hres); } - ret = heap_alloc(sizeof(AXSite)); + ret = malloc(sizeof(AXSite)); if(!ret) { IServiceProvider_Release(sp); return NULL; @@ -695,7 +695,7 @@ static ULONG WINAPI JScript_Release(IActiveScript *iface) This->ctx->active_script = NULL; script_release(This->ctx); } - heap_free(This); + free(This); unlock_module(); } @@ -722,7 +722,7 @@ static HRESULT WINAPI JScript_SetScriptSite(IActiveScript *iface, return E_UNEXPECTED; if(!This->ctx) { - script_ctx_t *ctx = heap_alloc_zero(sizeof(script_ctx_t)); + script_ctx_t *ctx = calloc(1, sizeof(script_ctx_t)); if(!ctx) return E_OUTOFMEMORY; @@ -738,7 +738,7 @@ static HRESULT WINAPI JScript_SetScriptSite(IActiveScript *iface, hres = create_jscaller(ctx); if(FAILED(hres)) { - heap_free(ctx); + free(ctx); return hres; } @@ -895,7 +895,7 @@ static HRESULT WINAPI JScript_AddNamedItem(IActiveScript *iface, } } - item = heap_alloc(sizeof(*item)); + item = malloc(sizeof(*item)); if(!item) { if(disp) IDispatch_Release(disp); @@ -906,11 +906,11 @@ static HRESULT WINAPI JScript_AddNamedItem(IActiveScript *iface, item->disp = disp; item->flags = dwFlags; item->script_obj = NULL; - item->name = heap_strdupW(pstrName); + item->name = wcsdup(pstrName); if(!item->name) { if(disp) IDispatch_Release(disp); - heap_free(item); + free(item); return E_OUTOFMEMORY; } @@ -1414,7 +1414,7 @@ HRESULT create_jscript_object(BOOL is_encode, REFIID riid, void **ppv) JScript *ret; HRESULT hres; - ret = heap_alloc_zero(sizeof(*ret)); + ret = calloc(1, sizeof(*ret)); if(!ret) return E_OUTOFMEMORY;

1 0