- Wine-Commits - list.winehq.org

Esme Povirk : gdiplus: Fix some degenerate cases combining infinite regions.
by Alexandre Julliard Feb. 5, 2024

Feb. 5, 2024

Module: wine Branch: master Commit: 13b2755d4d4f93f76d7e4f113affba260c857d54 URL: https://gitlab.winehq.org/wine/wine/-/commit/13b2755d4d4f93f76d7e4f113affba… Author: Esme Povirk <esme(a)codeweavers.com> Date: Mon Feb 5 20:41:23 2024 +0000 gdiplus: Fix some degenerate cases combining infinite regions. --- dlls/gdiplus/region.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/region.c b/dlls/gdiplus/region.c index 058f659561b..9617f492a51 100644 --- a/dlls/gdiplus/region.c +++ b/dlls/gdiplus/region.c @@ -1108,7 +1108,10 @@ static GpStatus get_region_hrgn(struct region_element *element, GpGraphics *grap case CombineModeXor: case CombineModeExclude: left = CreateRectRgn(-(1 << 22), -(1 << 22), 1 << 22, 1 << 22); break; - case CombineModeUnion: case CombineModeComplement: + case CombineModeComplement: + *hrgn = CreateRectRgn(0, 0, 0, 0); + return *hrgn ? Ok : OutOfMemory; + case CombineModeUnion: *hrgn = NULL; return Ok; } @@ -1133,7 +1136,11 @@ static GpStatus get_region_hrgn(struct region_element *element, GpGraphics *grap case CombineModeXor: case CombineModeComplement: right = CreateRectRgn(-(1 << 22), -(1 << 22), 1 << 22, 1 << 22); break; - case CombineModeUnion: case CombineModeExclude: + case CombineModeExclude: + DeleteObject(left); + *hrgn = CreateRectRgn(0, 0, 0, 0); + return *hrgn ? Ok : OutOfMemory; + case CombineModeUnion: DeleteObject(left); *hrgn = NULL; return Ok;

1 0

Gabriel Ivăncescu : mshtml: Implement `initMessageEvent` for MessageEvents.
by Alexandre Julliard Feb. 5, 2024

Feb. 5, 2024

Module: wine Branch: master Commit: ae0e5ee901b8e7c7b19bda3ab3bdf3553166cc66 URL: https://gitlab.winehq.org/wine/wine/-/commit/ae0e5ee901b8e7c7b19bda3ab3bdf3… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Feb 5 16:15:23 2024 +0200 mshtml: Implement `initMessageEvent` for MessageEvents. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlevent.c | 48 +++++++++++++- dlls/mshtml/tests/documentmode.js | 29 +++++++++ dlls/mshtml/tests/events.c | 130 ++++++++++++++++++++++++++++++++++++++ dlls/mshtml/tests/events.js | 1 + 4 files changed, 206 insertions(+), 2 deletions(-)

1 0

Gabriel Ivăncescu : mshtml: Return E_ABORT from postMessage called without a caller ServiceProvider.
by Alexandre Julliard Feb. 5, 2024

Feb. 5, 2024

Module: wine Branch: master Commit: 69d4be9ff0de6ecf8a4e03f11edc329e75d50a3d URL: https://gitlab.winehq.org/wine/wine/-/commit/69d4be9ff0de6ecf8a4e03f11edc32… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Feb 5 16:15:23 2024 +0200 mshtml: Return E_ABORT from postMessage called without a caller ServiceProvider. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlwindow.c | 8 ++------ dlls/mshtml/tests/events.c | 5 ++++- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index f3059ac66be..5a4707153e5 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -2473,18 +2473,14 @@ static HRESULT post_message(HTMLInnerWindow *window, VARIANT msg, BSTR targetOri static HRESULT WINAPI HTMLWindow6_postMessage(IHTMLWindow6 *iface, BSTR msg, VARIANT targetOrigin) { HTMLWindow *This = impl_from_IHTMLWindow6(iface); - VARIANT var, transfer; TRACE("(%p)->(%s %s)\n", This, debugstr_w(msg), debugstr_variant(&targetOrigin)); if(V_VT(&targetOrigin) != VT_BSTR) return E_INVALIDARG; - V_VT(&var) = VT_BSTR; - V_BSTR(&var) = msg; - V_VT(&transfer) = VT_EMPTY; - return post_message(This->inner_window, var, V_BSTR(&targetOrigin), transfer, NULL, - dispex_compat_mode(&This->inner_window->event_target.dispex)); + /* This can't obtain the source, and never works even in IE9+ modes... */ + return E_ABORT; } static HRESULT WINAPI HTMLWindow6_toStaticHTML(IHTMLWindow6 *iface, BSTR bstrHTML, BSTR *pbstrStaticHTML) diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index ffeb585ed52..aa1a60365f2 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -3218,7 +3218,6 @@ static void test_message_event(IHTMLDocument2 *doc) ok(hres == S_OK, "get_onmessage failed: %08lx\n", hres); ok(V_VT(&v[0]) == VT_DISPATCH, "V_VT(onmessage) = %d\n", V_VT(&v[0])); ok(V_DISPATCH(&v[0]) == (IDispatch*)&onmessage_obj, "V_DISPATCH(onmessage) = %p\n", V_DISPATCH(&v[0])); - IHTMLWindow6_Release(window6); if(document_mode >= 9) add_event_listener((IUnknown*)doc, L"message", (IDispatch*)&onmessage_obj, VARIANT_TRUE); @@ -3227,6 +3226,10 @@ static void test_message_event(IHTMLDocument2 *doc) V_BSTR(&v[1]) = SysAllocString(L"foobar"); V_VT(&v[0]) = VT_BSTR; V_BSTR(&v[0]) = SysAllocString(L"*"); + bstr = SysAllocString(L"foobar"); + hres = IHTMLWindow6_postMessage(window6, V_BSTR(&v[1]), v[0]); + ok(hres == E_ABORT, "postMessage returned: %08lx\n", hres); + IHTMLWindow6_Release(window6); hres = IHTMLWindow2_QueryInterface(window, &IID_IDispatchEx, (void**)&dispex); ok(hres == S_OK, "Could not get IDispatchEx iface: %08lx\n", hres);

1 0

Gabriel Ivăncescu : mshtml: Implement `origin` prop for MessageEvents.
by Alexandre Julliard Feb. 5, 2024

Feb. 5, 2024

Module: wine Branch: master Commit: 497e9d617e08ed3b45795a49a0fc0dae7c6c3b2e URL: https://gitlab.winehq.org/wine/wine/-/commit/497e9d617e08ed3b45795a49a0fc0d… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Feb 5 16:15:23 2024 +0200 mshtml: Implement `origin` prop for MessageEvents. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlevent.c | 53 ++++++++++++++++++++++++++++++++++----- dlls/mshtml/tests/documentmode.js | 1 + dlls/mshtml/tests/events.c | 13 ++++++++++ dlls/mshtml/tests/events.js | 2 ++ 4 files changed, 63 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index adf5422c995..f6684d9d6ee 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -25,6 +25,7 @@ #include "winuser.h" #include "ole2.h" #include "mshtmdid.h" +#include "wininet.h" #include "mshtml_private.h" #include "htmlevent.h" @@ -1876,11 +1877,19 @@ static HRESULT WINAPI HTMLEventObj5_put_origin(IHTMLEventObj5 *iface, BSTR v) static HRESULT WINAPI HTMLEventObj5_get_origin(IHTMLEventObj5 *iface, BSTR *p) { HTMLEventObj *This = impl_from_IHTMLEventObj5(iface); + IDOMMessageEvent *message_event; + HRESULT hres; - FIXME("(%p)->(%p)\n", This, p); + TRACE("(%p)->(%p)\n", This, p); - *p = NULL; - return S_OK; + if(!This->event || FAILED(IDOMEvent_QueryInterface(&This->event->IDOMEvent_iface, &IID_IDOMMessageEvent, (void**)&message_event))) { + *p = NULL; + return S_OK; + } + + hres = IDOMMessageEvent_get_origin(message_event, p); + IDOMMessageEvent_Release(message_event); + return hres; } static HRESULT WINAPI HTMLEventObj5_put_issession(IHTMLEventObj5 *iface, VARIANT_BOOL v) @@ -3669,6 +3678,7 @@ typedef struct { DOMEvent event; IDOMMessageEvent IDOMMessageEvent_iface; IHTMLWindow2 *source; + BSTR origin; VARIANT data; } DOMMessageEvent; @@ -3756,8 +3766,14 @@ static HRESULT DOMMessageEvent_get_data_hook(DispatchEx *dispex, WORD flags, DIS static HRESULT WINAPI DOMMessageEvent_get_origin(IDOMMessageEvent *iface, BSTR *p) { DOMMessageEvent *This = impl_from_IDOMMessageEvent(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + if(This->origin) + return (*p = SysAllocStringLen(This->origin, SysStringLen(This->origin))) ? S_OK : E_OUTOFMEMORY; + + *p = NULL; + return S_OK; } static HRESULT WINAPI DOMMessageEvent_get_source(IDOMMessageEvent *iface, IHTMLWindow2 **p) @@ -3829,6 +3845,7 @@ static void DOMMessageEvent_unlink(DispatchEx *dispex) static void DOMMessageEvent_destructor(DispatchEx *dispex) { DOMMessageEvent *message_event = DOMMessageEvent_from_DOMEvent(DOMEvent_from_DispatchEx(dispex)); + SysFreeString(message_event->origin); VariantClear(&message_event->data); DOMEvent_destructor(dispex); } @@ -4601,14 +4618,38 @@ HRESULT create_document_event(HTMLDocumentNode *doc, eventid_t event_id, DOMEven HRESULT create_message_event(HTMLDocumentNode *doc, IHTMLWindow2 *source, VARIANT *data, DOMEvent **ret) { + URL_COMPONENTSW url = { sizeof(url) }; DOMMessageEvent *message_event; + IHTMLLocation *location; DOMEvent *event; HRESULT hres; + BSTR origin; - hres = create_document_event(doc, EVENTID_MESSAGE, &event); + hres = IHTMLWindow2_get_location(source, &location); + if(FAILED(hres)) + return hres; + + hres = IHTMLLocation_get_href(location, &origin); + IHTMLLocation_Release(location); if(FAILED(hres)) return hres; + + url.dwUrlPathLength = 1; + if(origin && InternetCrackUrlW(origin, 0, 0, &url)) { + BSTR tmp = SysAllocStringLen(origin, url.lpszUrlPath - origin); + SysFreeString(origin); + if(!tmp) + return E_OUTOFMEMORY; + origin = tmp; + } + + hres = create_document_event(doc, EVENTID_MESSAGE, &event); + if(FAILED(hres)) { + SysFreeString(origin); + return hres; + } message_event = DOMMessageEvent_from_DOMEvent(event); + message_event->origin = origin; V_VT(&message_event->data) = VT_EMPTY; hres = VariantCopy(&message_event->data, data); diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index bec247b42d1..94183ad015e 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -2929,6 +2929,7 @@ async_test("postMessage", function() { else { ok(e.data === (v < 10 ? "10" : 10), "e.data = " + e.data); ok(e.source === window, "e.source = " + e.source); + ok(e.origin === "http://winetest.example.org", "e.origin = " + e.origin); next_test(); } } diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index 8641a2aae7d..0dd622b15c3 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -1542,6 +1542,11 @@ static HRESULT WINAPI onmessage(IDispatchEx *iface, DISPID id, LCID lcid, WORD w ok(!wcscmp(bstr, L"foobar"), "data = %s\n", wine_dbgstr_w(bstr)); SysFreeString(bstr); + hres = IHTMLEventObj5_get_origin(event_obj5, &bstr); + ok(hres == S_OK, "get_origin failed: %08lx\n", hres); + ok(!wcscmp(bstr, L"about:"), "origin = %s\n", wine_dbgstr_w(bstr)); + SysFreeString(bstr); + hres = IHTMLEventObj5_get_source(event_obj5, &disp); ok(hres == S_OK, "get_source failed: %08lx\n", hres); @@ -1558,6 +1563,9 @@ static HRESULT WINAPI onmessage(IDispatchEx *iface, DISPID id, LCID lcid, WORD w bstr = SysAllocString(L"foobar"); hres = IHTMLEventObj5_put_url(event_obj5, bstr); ok(hres == DISP_E_MEMBERNOTFOUND, "put_url returned: %08lx\n", hres); + + hres = IHTMLEventObj5_put_origin(event_obj5, bstr); + ok(hres == DISP_E_MEMBERNOTFOUND, "put_origin returned: %08lx\n", hres); SysFreeString(bstr); IHTMLEventObj5_Release(event_obj5); @@ -1572,6 +1580,11 @@ static HRESULT WINAPI onmessage(IDispatchEx *iface, DISPID id, LCID lcid, WORD w ok(!wcscmp(bstr, L"foobar"), "data = %s\n", wine_dbgstr_w(bstr)); SysFreeString(bstr); + hres = IDOMMessageEvent_get_origin(msg, &bstr); + ok(hres == S_OK, "get_origin failed: %08lx\n", hres); + ok(!wcscmp(bstr, L"about:"), "origin = %s\n", wine_dbgstr_w(bstr)); + SysFreeString(bstr); + hres = IDOMMessageEvent_get_source(msg, &source); ok(hres == S_OK, "get_source failed: %08lx\n", hres); ok(source == onmessage_source, "source != onmessage_source\n"); diff --git a/dlls/mshtml/tests/events.js b/dlls/mshtml/tests/events.js index a5f66a2f031..a130917cfda 100644 --- a/dlls/mshtml/tests/events.js +++ b/dlls/mshtml/tests/events.js @@ -830,6 +830,7 @@ async_test("message event", function() { if(listener_called) { ok(e.data === "echo", "e.data (diff origin) = " + e.data); ok(e.source === iframe.contentWindow, "e.source (diff origin) not iframe.contentWindow"); + ok(e.origin === "http://winetest.different.org:1234", "e.origin (diff origin) = " + e.origin); next_test(); return; } @@ -838,6 +839,7 @@ async_test("message event", function() { ok(e.bubbles === false, "bubbles = " + e.bubbles); ok(e.cancelable === false, "cancelable = " + e.cancelable); ok(e.source === window, "e.source = " + e.source); + ok(e.origin === "http://winetest.example.org", "e.origin = " + e.origin); iframe.onload = function() { iframe.contentWindow.postMessage("echo", "hTtP://WinEtesT.difFerent.ORG:1234"); } iframe.src = "http://winetest.different.org:1234/xhr_iframe.html";

1 0

Gabriel Ivăncescu : mshtml: Implement `source` prop for MessageEvents.
by Alexandre Julliard Feb. 5, 2024

Feb. 5, 2024

Module: wine Branch: master Commit: b9e4680dea3ede318d1e7afbc564ded0c5f3a828 URL: https://gitlab.winehq.org/wine/wine/-/commit/b9e4680dea3ede318d1e7afbc564de… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Feb 5 16:15:23 2024 +0200 mshtml: Implement `source` prop for MessageEvents. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlevent.c | 31 +- dlls/mshtml/htmlevent.h | 2 +- dlls/mshtml/htmlwindow.c | 69 ++++- dlls/mshtml/tests/documentmode.js | 1 + dlls/mshtml/tests/events.c | 601 ++++++++++++++++++++++++++++++++++++++ dlls/mshtml/tests/events.js | 14 +- 6 files changed, 708 insertions(+), 10 deletions(-)

1 0

Gabriel Ivăncescu : mshtml: Implement `data` getter for MessageEvent objs.
by Alexandre Julliard Feb. 5, 2024

Feb. 5, 2024

Module: wine Branch: master Commit: 266ac9a809014d51cec6b07b148cfcdb2bcf1f4e URL: https://gitlab.winehq.org/wine/wine/-/commit/266ac9a809014d51cec6b07b148cfc… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Feb 5 16:15:23 2024 +0200 mshtml: Implement `data` getter for MessageEvent objs. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlevent.c | 14 +++++++++++--- dlls/mshtml/tests/events.c | 5 +++++ 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 4e1cfd2b695..adf5422c995 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -1831,11 +1831,19 @@ static HRESULT WINAPI HTMLEventObj5_put_data(IHTMLEventObj5 *iface, BSTR v) static HRESULT WINAPI HTMLEventObj5_get_data(IHTMLEventObj5 *iface, BSTR *p) { HTMLEventObj *This = impl_from_IHTMLEventObj5(iface); + IDOMMessageEvent *message_event; + HRESULT hres; - FIXME("(%p)->(%p)\n", This, p); + TRACE("(%p)->(%p)\n", This, p); - *p = NULL; - return S_OK; + if(!This->event || FAILED(IDOMEvent_QueryInterface(&This->event->IDOMEvent_iface, &IID_IDOMMessageEvent, (void**)&message_event))) { + *p = NULL; + return S_OK; + } + + hres = IDOMMessageEvent_get_data(message_event, p); + IDOMMessageEvent_Release(message_event); + return hres; } static HRESULT WINAPI HTMLEventObj5_get_source(IHTMLEventObj5 *iface, IDispatch **p) diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index aa1a60365f2..8641a2aae7d 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -1537,6 +1537,11 @@ static HRESULT WINAPI onmessage(IDispatchEx *iface, DISPID id, LCID lcid, WORD w ok(hres == S_OK, "get_url failed: %08lx\n", hres); ok(!bstr, "url = %s\n", wine_dbgstr_w(bstr)); + hres = IHTMLEventObj5_get_data(event_obj5, &bstr); + ok(hres == S_OK, "get_data failed: %08lx\n", hres); + ok(!wcscmp(bstr, L"foobar"), "data = %s\n", wine_dbgstr_w(bstr)); + SysFreeString(bstr); + hres = IHTMLEventObj5_get_source(event_obj5, &disp); ok(hres == S_OK, "get_source failed: %08lx\n", hres);

1 0

Gabriel Ivăncescu : mshtml: Use a hook to implement postMessage.
by Alexandre Julliard Feb. 5, 2024

Feb. 5, 2024

Module: wine Branch: master Commit: 22214ec3577a772b8e8dd6ae6459ba0c2a6ea3bd URL: https://gitlab.winehq.org/wine/wine/-/commit/22214ec3577a772b8e8dd6ae6459ba… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Feb 5 16:15:22 2024 +0200 mshtml: Use a hook to implement postMessage. We need the caller ServiceProvider to obtain the source. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlwindow.c | 373 ++++++++++++++++++++--------------- dlls/mshtml/mshtml_private_iface.idl | 2 - 2 files changed, 211 insertions(+), 164 deletions(-)

1 0

Zhiyi Zhang : user32/tests: Fix test_recursive_messages() test failures on win7.
by Alexandre Julliard Feb. 5, 2024

Feb. 5, 2024

Module: wine Branch: master Commit: d6dc917232b170cca2c0e4d9285a1b2bcb447214 URL: https://gitlab.winehq.org/wine/wine/-/commit/d6dc917232b170cca2c0e4d9285a1b… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Sun Feb 4 11:19:47 2024 +0800 user32/tests: Fix test_recursive_messages() test failures on win7. Windows 7 has a lower maximum depth for recursive hooks. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56293 --- dlls/user32/tests/msg.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index f58b95546ec..3414dda6e5a 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -12645,7 +12645,7 @@ static LRESULT WINAPI recursive_messages_proc(HWND hwnd, UINT message, WPARAM wp static int msg_depth; MSG msg; - if (message == WM_SETCURSOR && max_msg_depth < 25) + if (message == WM_SETCURSOR && max_msg_depth < 15) { msg_depth++; max_msg_depth = max(max_msg_depth, msg_depth); @@ -12678,7 +12678,7 @@ static void test_recursive_messages(void) flush_events(); /* Expect recursive_messages_proc() gets called recursively for WM_SETCURSOR */ - ok(max_msg_depth == 25, "Got expected %d.\n", max_msg_depth); + ok(max_msg_depth == 15, "Got expected %d.\n", max_msg_depth); DestroyWindow(hwnd); UnregisterClassA(cls.lpszClassName, cls.hInstance);

1 0

Fabian Maurer : msi: Don't write past end of string when selecting parent directory.
by Alexandre Julliard Feb. 5, 2024

Feb. 5, 2024

Module: wine Branch: master Commit: bbce5d014db7f023b133d6d09e6846e027586f7d URL: https://gitlab.winehq.org/wine/wine/-/commit/bbce5d014db7f023b133d6d09e6846… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sat Feb 3 08:59:32 2024 +0100 msi: Don't write past end of string when selecting parent directory. --- dlls/msi/dialog.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index ba8ca526266..f70b127a7a5 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -2862,8 +2862,11 @@ static UINT dialog_directorylist_up( msi_dialog *dialog ) /* strip off the last directory */ ptr = PathFindFileNameW( path ); - if (ptr != path) *(ptr - 1) = '\0'; - PathAddBackslashW( path ); + if (ptr != path) + { + *(ptr - 1) = '\0'; + PathAddBackslashW( path ); + } dialog_set_property( dialog->package, prop, path );

1 0

Alexandre Julliard : winebuild: Remove some no longer used code for ARM platforms.
by Alexandre Julliard Feb. 5, 2024

Feb. 5, 2024

Module: wine Branch: master Commit: e25b1ab7e9d495de58423d24b3d3e4eaa8bb4f0b URL: https://gitlab.winehq.org/wine/wine/-/commit/e25b1ab7e9d495de58423d24b3d3e4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 5 20:44:04 2024 +0100 winebuild: Remove some no longer used code for ARM platforms. --- tools/winebuild/import.c | 96 +++++------------------------------------------- tools/winebuild/spec32.c | 19 ++-------- tools/winebuild/utils.c | 20 +--------- 3 files changed, 15 insertions(+), 120 deletions(-) diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 9325837b749..b020d938522 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -778,19 +778,9 @@ static void output_import_thunk( const char *name, const char *table, int pos ) output( "\tjmpq *%s+%d(%%rip)\n", table, pos ); break; case CPU_ARM: - if (UsePIC) - { - output( "\tldr ip, 2f\n"); - output( "1:\tadd ip, pc\n" ); - output( "\tldr pc, [ip]\n"); - output( "2:\t.long %s+%u-1b-%u\n", table, pos, thumb_mode ? 4 : 8 ); - } - else - { - output( "\tldr ip, 1f\n"); - output( "\tldr pc, [ip]\n"); - output( "1:\t.long %s+%u\n", table, pos ); - } + output( "\tldr ip, 1f\n"); + output( "\tldr pc, [ip]\n"); + output( "1:\t.long %s+%u\n", table, pos ); break; case CPU_ARM64: output( "\tadrp x16, %s\n", arm64_page( table ) ); @@ -1088,39 +1078,7 @@ static void output_delayed_import_thunks( const DLLSPEC *spec ) output( "\tjmp *%%rax\n" ); break; case CPU_ARM: - output( "\tpush {r0-r3,FP,LR}\n" ); - output( "\tmov r1,IP\n" ); - output( "\tldr r0, 1f\n"); - if (UsePIC) output( "2:\tadd r0, pc\n" ); - output( "\tbl %s\n", asm_name("__delayLoadHelper2") ); - output( "\tmov IP,r0\n"); - output( "\tpop {r0-r3,FP,LR}\n" ); - output( "\tbx IP\n"); - if (UsePIC) - output( "1:\t.long .L__wine_spec_delay_imports+%u-2b-%u\n", pos, thumb_mode ? 4 : 8 ); - else - output( "1:\t.long .L__wine_spec_delay_imports+%u\n", pos ); - break; case CPU_ARM64: - output( "\tstp x29, x30, [sp,#-80]!\n" ); - output( "\tmov x29, sp\n" ); - output( "\tstp x0, x1, [sp,#16]\n" ); - output( "\tstp x2, x3, [sp,#32]\n" ); - output( "\tstp x4, x5, [sp,#48]\n" ); - output( "\tstp x6, x7, [sp,#64]\n" ); - output( "\tmov x1, x16\n" ); - output( "\tadrp x0, %s\n", arm64_page(".L__wine_spec_delay_imports") ); - output( "\tadd x0, x0, #%s\n", arm64_pageoff(".L__wine_spec_delay_imports") ); - if (pos) output( "\tadd x0, x0, #%u\n", pos ); - output( "\tbl %s\n", asm_name("__delayLoadHelper2") ); - output( "\tmov x16, x0\n" ); - output( "\tldp x0, x1, [sp,#16]\n" ); - output( "\tldp x2, x3, [sp,#32]\n" ); - output( "\tldp x4, x5, [sp,#48]\n" ); - output( "\tldp x6, x7, [sp,#64]\n" ); - output( "\tldp x29, x30, [sp],#80\n" ); - output( "\tbr x16\n" ); - break; case CPU_ARM64EC: assert( 0 ); break; @@ -1134,7 +1092,6 @@ static void output_delayed_import_thunks( const DLLSPEC *spec ) struct import_func *func = &import->imports[j]; const char *name = func->name ? func->name : func->export_name; - if (thumb_mode) output( "\t.thumb_func\n" ); output( "__wine_delay_imp_%s_%s:\n", import->c_name, name ); switch (target.cpu) { @@ -1153,26 +1110,7 @@ static void output_delayed_import_thunks( const DLLSPEC *spec ) output( "\tjmp %s\n", asm_name(module_func) ); break; case CPU_ARM: - if (UsePIC) - { - output( "\tldr ip, 2f\n"); - output( "1:\tadd ip, pc\n" ); - output( "\tb %s\n", asm_name(module_func) ); - output( "2:\t.long .L__wine_delay_IAT+%u-1b-%u\n", iat_pos, thumb_mode ? 4 : 8 ); - } - else - { - output( "\tldr ip, 1f\n"); - output( "\tb %s\n", asm_name(module_func) ); - output( "1:\t.long .L__wine_delay_IAT+%u\n", iat_pos ); - } - break; case CPU_ARM64: - output( "\tadrp x16, %s\n", arm64_page(".L__wine_delay_IAT") ); - output( "\tadd x16, x16, #%s\n", arm64_pageoff(".L__wine_delay_IAT") ); - if (iat_pos) output( "\tadd x16, x16, #%u\n", iat_pos ); - output( "\tb %s\n", asm_name(module_func) ); - break; case CPU_ARM64EC: assert( 0 ); break; @@ -1318,29 +1256,15 @@ void output_stubs( DLLSPEC *spec ) output_seh( ".seh_endproc" ); break; case CPU_ARM: - if (UsePIC) - { - output( "\tldr r0,3f\n"); - output( "1:\tadd r0,PC\n"); - output( "\tldr r1,3f+4\n"); - if (exp_name) output( "2:\tadd r1,PC\n"); - output( "\tbl %s\n", asm_name("__wine_spec_unimplemented_stub") ); - output( "3:\t.long .L__wine_spec_file_name-1b-%u\n", thumb_mode ? 4 : 8 ); - if (exp_name) output( "\t.long .L%s_string-2b-%u\n", name, thumb_mode ? 4 : 8 ); - else output( "\t.long %u\n", odp->ordinal ); - } - else + output( "\tmovw r0,:lower16:.L__wine_spec_file_name\n"); + output( "\tmovt r0,:upper16:.L__wine_spec_file_name\n"); + if (exp_name) { - output( "\tmovw r0,:lower16:.L__wine_spec_file_name\n"); - output( "\tmovt r0,:upper16:.L__wine_spec_file_name\n"); - if (exp_name) - { - output( "\tmovw r1,:lower16:.L%s_string\n", name ); - output( "\tmovt r1,:upper16:.L%s_string\n", name ); - } - else output( "\tmov r1,#%u\n", odp->ordinal ); - output( "\tbl %s\n", asm_name("__wine_spec_unimplemented_stub") ); + output( "\tmovw r1,:lower16:.L%s_string\n", name ); + output( "\tmovt r1,:upper16:.L%s_string\n", name ); } + else output( "\tmov r1,#%u\n", odp->ordinal ); + output( "\tbl %s\n", asm_name("__wine_spec_unimplemented_stub") ); break; case CPU_ARM64: case CPU_ARM64EC: diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index 6e3a0941310..63292cf0989 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -245,7 +245,6 @@ static void output_relay_debug( DLLSPEC *spec ) /* then the relay thunks */ output( "\t.text\n" ); - if (thumb_mode) output( "\t.thumb_func\n" ); output( "__wine_spec_relay_entry_points:\n" ); output( "\tnop\n" ); /* to avoid 0 offset */ @@ -296,9 +295,8 @@ static void output_relay_debug( DLLSPEC *spec ) { int j, has_float = 0; - if (strcmp( float_abi_option, "soft" )) - for (j = 0; j < odp->u.func.nb_args && !has_float; j++) - has_float = is_float_arg( odp, j ); + for (j = 0; j < odp->u.func.nb_args && !has_float; j++) + has_float = is_float_arg( odp, j ); output( "\t.balign 4\n" ); output( "__wine_spec_relay_entry_point_%d:\n", i ); @@ -309,22 +307,13 @@ static void output_relay_debug( DLLSPEC *spec ) output( "\tsub SP, #4\n"); output( "\tmovw r1,#%u\n", i - spec->base ); output( "\tmovt r1,#%u\n", odp->u.func.args_str_offset ); - if (UsePIC) - { - output( "\tldr r0, 2f\n"); - output( "1:\tadd r0, PC\n"); - } - else - { - output( "\tmovw r0, :lower16:.L__wine_spec_relay_descr\n" ); - output( "\tmovt r0, :upper16:.L__wine_spec_relay_descr\n" ); - } + output( "\tmovw r0, :lower16:.L__wine_spec_relay_descr\n" ); + output( "\tmovt r0, :upper16:.L__wine_spec_relay_descr\n" ); output( "\tldr IP, [r0, #4]\n"); output( "\tblx IP\n"); output( "\tldr IP, [SP, #4]\n" ); output( "\tadd SP, #%u\n", 24 + (has_float ? 64 : 0) ); output( "\tbx IP\n"); - if (UsePIC) output( "2:\t.long .L__wine_spec_relay_descr-1b-%u\n", thumb_mode ? 4 : 8 ); break; } diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index 6048b99f267..2334611fa0d 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -466,11 +466,6 @@ void output_standard_file_header(void) output( "\t.globl @feat.00\n" ); output( ".set @feat.00, 1\n" ); } - if (thumb_mode) - { - output( "\t.syntax unified\n" ); - output( "\t.thumb\n" ); - } } /* dump a byte stream into the assembly code */ @@ -849,22 +844,9 @@ void output_function_header( const char *func, int global ) if (target.cpu == CPU_ARM64EC) output( ".section .text,\"xr\",discard,%s\n\t", name ); output( "\t.def %s\n\t.scl 2\n\t.type 32\n\t.endef\n", name ); if (global) output( "\t.globl %s\n", name ); - if (thumb_mode) output( "\t.thumb_func\n" ); break; default: - switch (target.cpu) - { - case CPU_ARM: - output( "\t.type %s,%%function\n", name ); - if (thumb_mode) output( "\t.thumb_func\n" ); - break; - case CPU_ARM64: - output( "\t.type %s,%%function\n", name ); - break; - default: - output( "\t.type %s,@function\n", name ); - break; - } + output( "\t.type %s,@function\n", name ); if (global) output( "\t.globl %s\n\t.hidden %s\n", name, name ); break; }

1 0