wine-commits November 2022

wine-commits@winehq.org

1 participants
1171 discussions

Gabriel Ivăncescu : mshtml: Implement pageshow event.
by Alexandre Julliard 18 Nov '22

18 Nov '22

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

Gabriel Ivăncescu : mshtml: Store the nsevent listener descs in a table.
by Alexandre Julliard 18 Nov '22

18 Nov '22

Module: wine Branch: master Commit: bc286247c4af1b84aa831941af1ef31d4f12707d URL: https://gitlab.winehq.org/wine/wine/-/commit/bc286247c4af1b84aa831941af1ef3… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Nov 18 17:20:27 2022 +0200 mshtml: Store the nsevent listener descs in a table. Rather than hardcoding them individually, so that it's all in one place when adding new ones. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/nsevents.c | 79 ++++++++++++++++++++++++++++++-------------------- 1 file changed, 47 insertions(+), 32 deletions(-) diff --git a/dlls/mshtml/nsevents.c b/dlls/mshtml/nsevents.c index 305a017d978..d70fea67ca4 100644 --- a/dlls/mshtml/nsevents.c +++ b/dlls/mshtml/nsevents.c @@ -37,16 +37,45 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); +#define EVENTLISTENER_VTBL(handler) \ + { \ + nsDOMEventListener_QueryInterface, \ + nsDOMEventListener_AddRef, \ + nsDOMEventListener_Release, \ + handler, \ + } +static nsresult NSAPI nsDOMEventListener_QueryInterface(nsIDOMEventListener*,nsIIDRef,void**); +static nsrefcnt NSAPI nsDOMEventListener_AddRef(nsIDOMEventListener*); +static nsrefcnt NSAPI nsDOMEventListener_Release(nsIDOMEventListener*); + typedef struct { nsIDOMEventListener nsIDOMEventListener_iface; nsDocumentEventListener *This; } nsEventListener; +static nsresult NSAPI handle_blur(nsIDOMEventListener*,nsIDOMEvent*); +static nsresult NSAPI handle_focus(nsIDOMEventListener*,nsIDOMEvent*); +static nsresult NSAPI handle_keypress(nsIDOMEventListener*,nsIDOMEvent*); +static nsresult NSAPI handle_load(nsIDOMEventListener*,nsIDOMEvent*); + +enum doc_event_listener_flags { + BUBBLES = 0x0001, + OVERRIDE = 0x0002, +}; + +static const struct { + eventid_t id; + enum doc_event_listener_flags flags; + nsIDOMEventListenerVtbl vtbl; +} doc_event_listeners[] = { + { EVENTID_BLUR, 0, EVENTLISTENER_VTBL(handle_blur) }, + { EVENTID_FOCUS, 0, EVENTLISTENER_VTBL(handle_focus) }, + { EVENTID_KEYPRESS, BUBBLES, EVENTLISTENER_VTBL(handle_keypress) }, + { EVENTID_LOAD, OVERRIDE, EVENTLISTENER_VTBL(handle_load), }, +}; + struct nsDocumentEventListener { - nsEventListener blur_listener; - nsEventListener focus_listener; - nsEventListener keypress_listener; - nsEventListener load_listener; + nsEventListener listener[ARRAY_SIZE(doc_event_listeners)]; nsEventListener htmlevent_listener; LONG ref; @@ -346,18 +375,6 @@ static nsresult NSAPI handle_htmlevent(nsIDOMEventListener *iface, nsIDOMEvent * return NS_OK; } -#define EVENTLISTENER_VTBL(handler) \ - { \ - nsDOMEventListener_QueryInterface, \ - nsDOMEventListener_AddRef, \ - nsDOMEventListener_Release, \ - handler, \ - } - -static const nsIDOMEventListenerVtbl blur_vtbl = EVENTLISTENER_VTBL(handle_blur); -static const nsIDOMEventListenerVtbl focus_vtbl = EVENTLISTENER_VTBL(handle_focus); -static const nsIDOMEventListenerVtbl keypress_vtbl = EVENTLISTENER_VTBL(handle_keypress); -static const nsIDOMEventListenerVtbl load_vtbl = EVENTLISTENER_VTBL(handle_load); static const nsIDOMEventListenerVtbl htmlevent_vtbl = EVENTLISTENER_VTBL(handle_htmlevent); static void init_event(nsIDOMEventTarget *target, const PRUnichar *type, @@ -438,16 +455,15 @@ void detach_nsevent(HTMLDocumentNode *doc, const WCHAR *type) void release_nsevents(HTMLDocumentNode *doc) { nsDocumentEventListener *listener = doc->nsevent_listener; + unsigned i; TRACE("%p %p\n", doc, doc->nsevent_listener); if(!listener) return; - detach_nslistener(doc, L"blur", &listener->blur_listener, TRUE); - detach_nslistener(doc, L"focus", &listener->focus_listener, TRUE); - detach_nslistener(doc, L"keypress", &listener->keypress_listener, FALSE); - detach_nslistener(doc, L"load", &listener->load_listener, TRUE); + for(i = 0; i < ARRAY_SIZE(doc_event_listeners); i++) + detach_nslistener(doc, get_event_name(doc_event_listeners[i].id), &listener->listener[i], !(doc_event_listeners[i].flags & BUBBLES)); listener->doc = NULL; release_listener(listener); @@ -458,6 +474,7 @@ void init_nsevents(HTMLDocumentNode *doc) { nsDocumentEventListener *listener; nsIDOMEventTarget *target; + unsigned i; listener = heap_alloc(sizeof(nsDocumentEventListener)); if(!listener) @@ -468,11 +485,9 @@ void init_nsevents(HTMLDocumentNode *doc) listener->ref = 1; listener->doc = doc; - init_listener(&listener->blur_listener, listener, &blur_vtbl); - init_listener(&listener->focus_listener, listener, &focus_vtbl); - init_listener(&listener->keypress_listener, listener, &keypress_vtbl); - init_listener(&listener->load_listener, listener, &load_vtbl); - init_listener(&listener->htmlevent_listener, listener, &htmlevent_vtbl); + for(i = 0; i < ARRAY_SIZE(doc_event_listeners); i++) + init_listener(&listener->listener[i], listener, &doc_event_listeners[i].vtbl); + init_listener(&listener->htmlevent_listener, listener, &htmlevent_vtbl); doc->nsevent_listener = listener; @@ -480,13 +495,13 @@ void init_nsevents(HTMLDocumentNode *doc) if(!target) return; - init_event(target, L"blur", &listener->blur_listener.nsIDOMEventListener_iface, TRUE); - init_event(target, L"focus", &listener->focus_listener.nsIDOMEventListener_iface, TRUE); - init_event(target, L"keypress", &listener->keypress_listener.nsIDOMEventListener_iface, FALSE); - init_event(target, L"load", &listener->load_listener.nsIDOMEventListener_iface, TRUE); + for(i = 0; i < ARRAY_SIZE(doc_event_listeners); i++) { + init_event(target, get_event_name(doc_event_listeners[i].id), &listener->listener[i].nsIDOMEventListener_iface, + !(doc_event_listeners[i].flags & BUBBLES)); - nsIDOMEventTarget_Release(target); + if(doc_event_listeners[i].flags & OVERRIDE) + doc->event_vector[doc_event_listeners[i].id] = TRUE; + } - /* handle_load already takes care of dispatching the load event */ - doc->event_vector[EVENTID_LOAD] = TRUE; + nsIDOMEventTarget_Release(target); }

1 0

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

18 Nov '22

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 18 Nov '22

18 Nov '22

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

Gabriel Ivăncescu : mshtml: Do not register Gecko load event handler twice.
by Alexandre Julliard 18 Nov '22

18 Nov '22

Module: wine Branch: master Commit: f658f68d63c3feb4b5e3da111b1970c7f902565a URL: https://gitlab.winehq.org/wine/wine/-/commit/f658f68d63c3feb4b5e3da111b1970… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Nov 18 17:20:27 2022 +0200 mshtml: Do not register Gecko load event handler twice. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/nsevents.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/mshtml/nsevents.c b/dlls/mshtml/nsevents.c index a8e3d503921..65de8c8c2e3 100644 --- a/dlls/mshtml/nsevents.c +++ b/dlls/mshtml/nsevents.c @@ -482,4 +482,7 @@ void init_nsevents(HTMLDocumentNode *doc) init_event(target, L"load", &listener->load_listener.nsIDOMEventListener_iface, TRUE); nsIDOMEventTarget_Release(target); + + /* handle_load already takes care of dispatching the load event */ + doc->event_vector[EVENTID_LOAD] = TRUE; }

1 0

Gabriel Ivăncescu : mshtml: Allow EVENT_BIND_TO_TARGET to bind to the window.
by Alexandre Julliard 18 Nov '22

18 Nov '22

Module: wine Branch: master Commit: 574e207ab722b319d923294e5f431d0d615aa5d6 URL: https://gitlab.winehq.org/wine/wine/-/commit/574e207ab722b319d923294e5f431d… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Nov 18 17:20:27 2022 +0200 mshtml: Allow EVENT_BIND_TO_TARGET to bind to the window. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlevent.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index f2c862c5b0a..e669afb7483 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -3683,10 +3683,7 @@ HRESULT ensure_doc_nsevent_handler(HTMLDocumentNode *doc, nsIDOMNode *nsnode, ev if(event_info[eid].flags & EVENT_DEFAULTLISTENER) { nsnode = NULL; - }else if(event_info[eid].flags & EVENT_BIND_TO_TARGET) { - if(!nsnode) - nsnode = doc->node.nsnode; - }else { + }else if(!(event_info[eid].flags & EVENT_BIND_TO_TARGET)) { return S_OK; }

1 0

Akihiro Sagawa : include: Fix typo in IN4ADDR_LOOPBACK_INIT.
by Alexandre Julliard 18 Nov '22

18 Nov '22

Module: wine Branch: master Commit: 6521c09d3a075759b3253d96f4503e6d557c10c1 URL: https://gitlab.winehq.org/wine/wine/-/commit/6521c09d3a075759b3253d96f4503e… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Nov 18 22:32:45 2022 +0900 include: Fix typo in IN4ADDR_LOOPBACK_INIT. --- include/mstcpip.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/mstcpip.h b/include/mstcpip.h index 08201f4ea8f..c7dffd55f12 100644 --- a/include/mstcpip.h +++ b/include/mstcpip.h @@ -46,7 +46,7 @@ struct tcp_keepalive #define RCVALL_SOCKETLEVELONLY 2 #define IN4ADDR_ANY_INIT { 0, 0, 0, 0 } -#define IN4ADDR_LOOPBACK_INIT { 126, 0, 0, 1 } +#define IN4ADDR_LOOPBACK_INIT { 127, 0, 0, 1 } #define IN4ADDR_BROADCAST_INIT { 255, 255, 255, 255 } #define IN4ADDR_ALLNODESONLINK_INIT { 224, 0, 0, 1 } #define IN4ADDR_ALLROUTERSONLINK_INIT { 224, 0, 0, 2 } @@ -74,7 +74,7 @@ struct tcp_keepalive #define WS_RCVALL_SOCKETLEVELONLY 2 #define WS_IN4ADDR_ANY_INIT { 0, 0, 0, 0 } -#define WS_IN4ADDR_LOOPBACK_INIT { 126, 0, 0, 1 } +#define WS_IN4ADDR_LOOPBACK_INIT { 127, 0, 0, 1 } #define WS_IN4ADDR_BROADCAST_INIT { 255, 255, 255, 255 } #define WS_IN4ADDR_ALLNODESONLINK_INIT { 224, 0, 0, 1 } #define WS_IN4ADDR_ALLROUTERSONLINK_INIT { 224, 0, 0, 2 }

1 0

Jacek Caban : winevulkan: Return error if vkMapMemory would truncate pointer on wow64.
by Alexandre Julliard 18 Nov '22

18 Nov '22

Module: wine Branch: master Commit: 87a3357900015b3da18fbdf216b2a0d4c90140a6 URL: https://gitlab.winehq.org/wine/wine/-/commit/87a3357900015b3da18fbdf216b2a0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 16 20:54:51 2022 +0100 winevulkan: Return error if vkMapMemory would truncate pointer on wow64. --- dlls/winevulkan/make_vulkan | 1 + dlls/winevulkan/vulkan.c | 21 +++++++++++++++++++++ dlls/winevulkan/vulkan_thunks.c | 4 ++-- dlls/winevulkan/vulkan_thunks.h | 1 + 4 files changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index d02ebbe6b0d..71571bec180 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -209,6 +209,7 @@ FUNCTION_OVERRIDES = { "vkGetDeviceProcAddr" : {"dispatch" : False, "driver" : True, "thunk" : ThunkType.NONE, "loader_thunk" : ThunkType.NONE}, "vkGetDeviceQueue" : {"dispatch": True, "driver" : False, "thunk" : ThunkType.NONE}, "vkGetDeviceQueue2" : {"dispatch": True, "driver" : False, "thunk" : ThunkType.NONE}, + "vkMapMemory" : {"dispatch" : True, "driver" : False, "thunk" : ThunkType.PRIVATE}, # VK_KHR_surface "vkDestroySurfaceKHR" : {"dispatch" : True, "driver" : True, "thunk" : ThunkType.NONE}, diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index ac586c4dbf6..bd02edde4b6 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -1441,6 +1441,27 @@ void wine_vkDestroySurfaceKHR(VkInstance handle, VkSurfaceKHR surface, free(object); } +VkResult wine_vkMapMemory(VkDevice handle, VkDeviceMemory memory, VkDeviceSize offset, + VkDeviceSize size, VkMemoryMapFlags flags, void **data) +{ + struct wine_device *device = wine_device_from_handle(handle); + VkResult result; + + result = device->funcs.p_vkMapMemory(device->device, memory, offset, size, flags, data); + +#ifdef _WIN64 + if (NtCurrentTeb()->WowTebOffset && result == VK_SUCCESS && (UINT_PTR)*data >> 32) + { + FIXME("returned mapping %p does not fit 32-bit pointer\n", *data); + device->funcs.p_vkUnmapMemory(device->device, memory); + *data = NULL; + result = VK_ERROR_OUT_OF_HOST_MEMORY; + } +#endif + + return result; +} + static inline void adjust_max_image_count(struct wine_phys_dev *phys_dev, VkSurfaceCapabilitiesKHR* capabilities) { /* Many Windows games, for example Strange Brigade, No Man's Sky, Path of Exile diff --git a/dlls/winevulkan/vulkan_thunks.c b/dlls/winevulkan/vulkan_thunks.c index 3cb8762f146..98dd8b5eb97 100644 --- a/dlls/winevulkan/vulkan_thunks.c +++ b/dlls/winevulkan/vulkan_thunks.c @@ -38235,7 +38235,7 @@ static NTSTATUS thunk64_vkMapMemory(void *args) TRACE("%p, 0x%s, 0x%s, 0x%s, %#x, %p\n", params->device, wine_dbgstr_longlong(params->memory), wine_dbgstr_longlong(params->offset), wine_dbgstr_longlong(params->size), params->flags, params->ppData); - params->result = wine_device_from_handle(params->device)->funcs.p_vkMapMemory(wine_device_from_handle(params->device)->device, params->memory, params->offset, params->size, params->flags, params->ppData); + params->result = wine_vkMapMemory(params->device, params->memory, params->offset, params->size, params->flags, params->ppData); return STATUS_SUCCESS; } #endif /* _WIN64 */ @@ -38255,7 +38255,7 @@ static NTSTATUS thunk32_vkMapMemory(void *args) TRACE("%#x, 0x%s, 0x%s, 0x%s, %#x, %#x\n", params->device, wine_dbgstr_longlong(params->memory), wine_dbgstr_longlong(params->offset), wine_dbgstr_longlong(params->size), params->flags, params->ppData); - params->result = wine_device_from_handle((VkDevice)UlongToPtr(params->device))->funcs.p_vkMapMemory(wine_device_from_handle((VkDevice)UlongToPtr(params->device))->device, params->memory, params->offset, params->size, params->flags, (void **)UlongToPtr(params->ppData)); + params->result = wine_vkMapMemory((VkDevice)UlongToPtr(params->device), params->memory, params->offset, params->size, params->flags, (void **)UlongToPtr(params->ppData)); return STATUS_SUCCESS; } diff --git a/dlls/winevulkan/vulkan_thunks.h b/dlls/winevulkan/vulkan_thunks.h index 24c94e2b5ee..62e92c8a59f 100644 --- a/dlls/winevulkan/vulkan_thunks.h +++ b/dlls/winevulkan/vulkan_thunks.h @@ -50,6 +50,7 @@ VkResult wine_vkGetPhysicalDeviceImageFormatProperties2(VkPhysicalDevice physica VkResult wine_vkGetPhysicalDeviceImageFormatProperties2KHR(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceImageFormatInfo2 *pImageFormatInfo, VkImageFormatProperties2 *pImageFormatProperties) DECLSPEC_HIDDEN; VkResult wine_vkGetPhysicalDeviceSurfaceCapabilities2KHR(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceSurfaceInfo2KHR *pSurfaceInfo, VkSurfaceCapabilities2KHR *pSurfaceCapabilities) DECLSPEC_HIDDEN; VkResult wine_vkGetPhysicalDeviceSurfaceCapabilitiesKHR(VkPhysicalDevice physicalDevice, VkSurfaceKHR surface, VkSurfaceCapabilitiesKHR *pSurfaceCapabilities) DECLSPEC_HIDDEN; +VkResult wine_vkMapMemory(VkDevice device, VkDeviceMemory memory, VkDeviceSize offset, VkDeviceSize size, VkMemoryMapFlags flags, void **ppData) DECLSPEC_HIDDEN; /* For use by vkDevice and children */ struct vulkan_device_funcs

1 0

Jacek Caban : winevulkan: Never copy pNext pointer in 32-bit struct conversion functions.
by Alexandre Julliard 18 Nov '22

18 Nov '22

Module: wine Branch: master Commit: 1396f04f024519c45eaf9bf84953b9f815336ea4 URL: https://gitlab.winehq.org/wine/wine/-/commit/1396f04f024519c45eaf9bf84953b9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Nov 12 17:26:09 2022 +0100 winevulkan: Never copy pNext pointer in 32-bit struct conversion functions. --- dlls/winevulkan/make_vulkan | 5 +- dlls/winevulkan/vulkan_thunks.c | 564 ++++++++++++++++++++++++++++++---------- 2 files changed, 427 insertions(+), 142 deletions(-)

1 0

Jacek Caban : winevulkan: Add __wine_unix_call_wow64_funcs support.
by Alexandre Julliard 18 Nov '22

18 Nov '22

Module: wine Branch: master Commit: 5135cabb0214ef1ce1ebaabb429dc883b3e10630 URL: https://gitlab.winehq.org/wine/wine/-/commit/5135cabb0214ef1ce1ebaabb429dc8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Oct 23 21:37:20 2022 +0200 winevulkan: Add __wine_unix_call_wow64_funcs support. --- dlls/winevulkan/make_vulkan | 47 +- dlls/winevulkan/vulkan_private.h | 4 - dlls/winevulkan/vulkan_thunks.c | 5118 ++++++++------------------------------ 3 files changed, 1120 insertions(+), 4049 deletions(-)

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2022