February 2021 - Wine-Commits

Zebediah Figura : winegstreamer: Don't make the pad caps writable in pad_added_cb().
by Alexandre Julliard Feb. 24, 2021

Feb. 24, 2021

Module: wine Branch: master Commit: 2492bda6e1f82a170db60f25080444f36ab239dd URL: https://source.winehq.org/git/wine.git/?a=commit;h=2492bda6e1f82a170db60f25… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Feb 23 16:07:02 2021 -0600 winegstreamer: Don't make the pad caps writable in pad_added_cb(). There is no need. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/wg_parser.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index 341ca182749..a2eaf1958d6 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -1000,7 +1000,7 @@ static void pad_added_cb(GstElement *element, GstPad *pad, gpointer user) if (gst_pad_is_linked(pad)) return; - caps = gst_caps_make_writable(gst_pad_query_caps(pad, NULL)); + caps = gst_pad_query_caps(pad, NULL); name = gst_structure_get_name(gst_caps_get_structure(caps, 0)); if (!(stream = create_stream(parser)))

1 0

Jacek Caban : ntdll: Fix compacted legacy xsave area handling.
by Alexandre Julliard Feb. 24, 2021

Feb. 24, 2021

Module: wine Branch: master Commit: aae2e2adf0ab171fb11d1c559e278734e5736783 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aae2e2adf0ab171fb11d1c55… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 24 18:27:41 2021 +0100 ntdll: Fix compacted legacy xsave area handling. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_x86_64.c | 36 ++++++++++++++++++++++++++++++++++-- 1 file changed, 34 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 509ff6d460f..22a5d34e06c 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -1848,6 +1848,7 @@ NTSTATUS WINAPI NtSetContextThread( HANDLE handle, const CONTEXT *context ) if (flags & CONTEXT_FLOATING_POINT) { xsave->xsave = context->u.FltSave; + xsave->xstate.Mask |= XSTATE_MASK_LEGACY; } if (user_shared_data->XState.EnabledFeatures && (xs = xstate_from_context( context ))) { @@ -1941,8 +1942,39 @@ NTSTATUS WINAPI NtGetContextThread( HANDLE handle, CONTEXT *context ) } if (needed_flags & CONTEXT_FLOATING_POINT) { - context->u.FltSave = get_syscall_xsave(frame)->xsave; - context->MxCsr = context->u.FltSave.MxCsr; + struct syscall_xsave *xsave = get_syscall_xsave( frame ); + + if (!xstate_compaction_enabled || + (xsave->xstate.Mask & XSTATE_MASK_LEGACY_FLOATING_POINT)) + { + memcpy( &context->u.FltSave, &xsave->xsave, FIELD_OFFSET( XSAVE_FORMAT, MxCsr )); + memcpy( context->u.FltSave.FloatRegisters, xsave->xsave.FloatRegisters, + sizeof( context->u.FltSave.FloatRegisters )); + } + else + { + memset( &context->u.FltSave, 0, FIELD_OFFSET( XSAVE_FORMAT, MxCsr )); + memset( context->u.FltSave.FloatRegisters, 0, + sizeof( context->u.FltSave.FloatRegisters )); + context->u.FltSave.ControlWord = 0x37f; + } + + if (!xstate_compaction_enabled || (xsave->xstate.Mask & XSTATE_MASK_LEGACY_SSE)) + { + memcpy( context->u.FltSave.XmmRegisters, xsave->xsave.XmmRegisters, + sizeof( context->u.FltSave.XmmRegisters )); + context->u.FltSave.MxCsr = xsave->xsave.MxCsr; + context->u.FltSave.MxCsr_Mask = xsave->xsave.MxCsr_Mask; + } + else + { + memset( context->u.FltSave.XmmRegisters, 0, + sizeof( context->u.FltSave.XmmRegisters )); + context->u.FltSave.MxCsr = 0x1f80; + context->u.FltSave.MxCsr_Mask = 0x2ffff; + } + + context->MxCsr = context->u.FltSave.MxCsr; context->ContextFlags |= CONTEXT_FLOATING_POINT; } /* update the cached version of the debug registers */

1 0

Jefferson Carpenter : msxml3/tests: Test mxwriter domdoc output.
by Alexandre Julliard Feb. 24, 2021

Feb. 24, 2021

Module: wine Branch: master Commit: eca796bf75da6325a479352d0983eaba7455237c URL: https://source.winehq.org/git/wine.git/?a=commit;h=eca796bf75da6325a479352d… Author: Jefferson Carpenter <jeffersoncarpenter2(a)gmail.com> Date: Wed Feb 24 12:48:02 2021 +0300 msxml3/tests: Test mxwriter domdoc output. Signed-off-by: Jefferson Carpenter <jeffersoncarpenter2(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/tests/saxreader.c | 194 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 194 insertions(+) diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index ab814c5f764..35d0e71545b 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -4367,6 +4367,199 @@ static void test_mxwriter_stream(void) free_bstrs(); } +static void test_mxwriter_domdoc(void) +{ + ISAXContentHandler *content; + IXMLDOMDocument *domdoc; + IMXWriter *writer; + HRESULT hr; + VARIANT dest; + IXMLDOMElement *root = NULL; + IXMLDOMNodeList *node_list = NULL; + IXMLDOMNode *node = NULL; + LONG list_length = 0; + BSTR str; + + /* Create writer and attach DOMDocument output */ + hr = CoCreateInstance(&CLSID_MXXMLWriter60, NULL, CLSCTX_INPROC_SERVER, &IID_IMXWriter, (void**)&writer); + ok(hr == S_OK, "Failed to create a writer, hr %#x.\n", hr); + + hr = IMXWriter_QueryInterface(writer, &IID_ISAXContentHandler, (void**)&content); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = CoCreateInstance(&CLSID_DOMDocument60, NULL, CLSCTX_INPROC_SERVER, &IID_IXMLDOMDocument, (void **)&domdoc); + ok(hr == S_OK, "Failed to create a document, hr %#x.\n", hr); + + V_VT(&dest) = VT_DISPATCH; + V_DISPATCH(&dest) = (IDispatch *)domdoc; + + hr = IMXWriter_put_output(writer, dest); +todo_wine + ok(hr == S_OK, "Failed to set writer output, hr %#x.\n", hr); + if (FAILED(hr)) + { + IXMLDOMDocument_Release(domdoc); + IMXWriter_Release(writer); + return; + } + + /* Add root element to document. */ + hr = IXMLDOMDocument_createElement(domdoc, _bstr_("TestElement"), &root); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IXMLDOMDocument_appendChild(domdoc, (IXMLDOMNode *)root, NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IXMLDOMElement_Release(root); + + hr = IXMLDOMDocument_get_documentElement(domdoc, &root); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(root != NULL, "Unexpected document root.\n"); + IXMLDOMElement_Release(root); + + /* startDocument clears root element and disables methods. */ + hr = ISAXContentHandler_startDocument(content); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IXMLDOMDocument_get_documentElement(domdoc, &root); +todo_wine + ok(hr == S_FALSE, "Unexpected hr %#x.\n", hr); + + hr = IXMLDOMDocument_createElement(domdoc, _bstr_("TestElement"), &root); +todo_wine + ok(hr == E_FAIL, "Unexpected hr %#x.\n", hr); + + /* startElement allows document root node to be accessed. */ + hr = ISAXContentHandler_startElement(content, L"", 0, L"", 0, L"BankAccount", 11, NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IXMLDOMDocument_get_documentElement(domdoc, &root); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(root != NULL, "Unexpected document root.\n"); + + hr = IXMLDOMElement_get_nodeName(root, &str); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); +todo_wine + ok(!lstrcmpW(L"BankAccount", str), "Unexpected name %s.\n", wine_dbgstr_w(str)); + SysFreeString(str); + + /* startElement immediately updates previous node. */ + hr = ISAXContentHandler_startElement(content, L"", 0, L"", 0, L"Number", 6, NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IXMLDOMElement_get_childNodes(root, &node_list); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IXMLDOMNodeList_get_length(node_list, &list_length); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); +todo_wine + ok(list_length == 1, "list length %i, expected 1\n", list_length); + + hr = IXMLDOMNodeList_get_item(node_list, 0, &node); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IXMLDOMNode_get_nodeName(node, &str); +todo_wine { + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!lstrcmpW(L"Number", str), "got %s\n", wine_dbgstr_w(str)); +} + SysFreeString(str); + + /* characters not immediately visible. */ + hr = ISAXContentHandler_characters(content, L"12345", 5); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IXMLDOMNode_get_text(node, &str); +todo_wine { + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!lstrcmpW(L"", str), "got %s\n", wine_dbgstr_w(str)); +} + SysFreeString(str); + + /* characters visible after endElement. */ + hr = ISAXContentHandler_endElement(content, L"", 0, L"", 0, L"Number", 6); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IXMLDOMNode_get_text(node, &str); +todo_wine { + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!lstrcmpW(L"12345", str), "got %s\n", wine_dbgstr_w(str)); +} + SysFreeString(str); + + IXMLDOMNode_Release(node); + + /* second startElement updates the existing node list. */ + + hr = ISAXContentHandler_startElement(content, L"", 0, L"", 0, L"Name", 4, NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = ISAXContentHandler_characters(content, L"Captain Ahab", 12); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = ISAXContentHandler_endElement(content, L"", 0, L"", 0, L"Name", 4); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = ISAXContentHandler_endElement(content, L"", 0, L"", 0, L"BankAccount", 11); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IXMLDOMNodeList_get_length(node_list, &list_length); +todo_wine { + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(2 == list_length, "list length %i, expected 2\n", list_length); +} + hr = IXMLDOMNodeList_get_item(node_list, 1, &node); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IXMLDOMNode_get_nodeName(node, &str); +todo_wine { + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!lstrcmpW(L"Name", str), "got %s\n", wine_dbgstr_w(str)); +} + SysFreeString(str); + + hr = IXMLDOMNode_get_text(node, &str); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); +todo_wine { + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!lstrcmpW(L"Captain Ahab", str), "got %s\n", wine_dbgstr_w(str)); +} + SysFreeString(str); + + IXMLDOMNode_Release(node); + IXMLDOMNodeList_Release(node_list); + IXMLDOMElement_Release(root); + + /* endDocument makes document modifiable again. */ + + hr = ISAXContentHandler_endDocument(content); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IXMLDOMDocument_createElement(domdoc, _bstr_("TestElement"), &root); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IXMLDOMElement_Release(root); + + /* finally check doc output */ + hr = IXMLDOMDocument_get_xml(domdoc, &str); +todo_wine { + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!lstrcmpW( + L"<BankAccount>" + "<Number>12345</Number>" + "<Name>Captain Ahab</Name>" + "</BankAccount>\r\n", + str), + "got %s\n", wine_dbgstr_w(str)); +} + SysFreeString(str); + + IXMLDOMDocument_Release(domdoc); + ISAXContentHandler_Release(content); + IMXWriter_Release(writer); + + free_bstrs(); +} + static const char *encoding_names[] = { "iso-8859-1", "iso-8859-2", @@ -5768,6 +5961,7 @@ START_TEST(saxreader) test_mxwriter_properties(); test_mxwriter_flush(); test_mxwriter_stream(); + test_mxwriter_domdoc(); test_mxwriter_encoding(); test_mxwriter_dispex(); test_mxwriter_indent();

1 0

Alexandre Julliard : pidgen: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard Feb. 24, 2021

Feb. 24, 2021

Module: wine Branch: master Commit: 4394b4250b2f94174b5d786ea5db218a590ac04a URL: https://source.winehq.org/git/wine.git/?a=commit;h=4394b4250b2f94174b5d786e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 24 10:28:08 2021 +0100 pidgen: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/pidgen/Makefile.in | 2 +- dlls/pidgen/main.c | 19 ------------------- 2 files changed, 1 insertion(+), 20 deletions(-) diff --git a/dlls/pidgen/Makefile.in b/dlls/pidgen/Makefile.in index 5923cb25786..d737fff8119 100644 --- a/dlls/pidgen/Makefile.in +++ b/dlls/pidgen/Makefile.in @@ -1,6 +1,6 @@ MODULE = pidgen.dll -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ main.c diff --git a/dlls/pidgen/main.c b/dlls/pidgen/main.c index 35af226ffd2..dc0c50c83ae 100644 --- a/dlls/pidgen/main.c +++ b/dlls/pidgen/main.c @@ -24,25 +24,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(pidgen); -/***************************************************** - * DllMain - */ -BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) -{ - TRACE("(%p, %d, %p)\n", hinst, reason, reserved); - - switch(reason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls( hinst ); - break; - } - return TRUE; -} - int WINAPI PIDGenSimpA(LPCSTR str, int p1, int p2, int p3, int p4, int p5, int p6, int p7, int p8) { FIXME("%s,%d,%d,%d,%d,%d,%d,%d,%d\n", debugstr_a(str), p1, p2, p3, p4, p5, p6, p7, p8);

1 0

Alexandre Julliard : rstrtmgr: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard Feb. 24, 2021

Feb. 24, 2021

Module: wine Branch: master Commit: 2722f5122f3ab0bf15d97f8f47bb4a2dcd02e410 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2722f5122f3ab0bf15d97f8f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 24 10:28:33 2021 +0100 rstrtmgr: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rstrtmgr/Makefile.in | 2 +- dlls/rstrtmgr/main.c | 19 ------------------- 2 files changed, 1 insertion(+), 20 deletions(-) diff --git a/dlls/rstrtmgr/Makefile.in b/dlls/rstrtmgr/Makefile.in index b2be9b401bd..7a3754735d6 100644 --- a/dlls/rstrtmgr/Makefile.in +++ b/dlls/rstrtmgr/Makefile.in @@ -1,6 +1,6 @@ MODULE = rstrtmgr.dll -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ main.c diff --git a/dlls/rstrtmgr/main.c b/dlls/rstrtmgr/main.c index d78c9f590fe..b9f29c7060c 100644 --- a/dlls/rstrtmgr/main.c +++ b/dlls/rstrtmgr/main.c @@ -26,25 +26,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(rstrtmgr); -/***************************************************** - * DllMain - */ -BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) -{ - TRACE("(%p, %d, %p)\n", hinst, reason, reserved); - - switch(reason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls( hinst ); - break; - } - return TRUE; -} - /*********************************************************************** * RmGetList (rstrtmgr.@) *

1 0

Alexandre Julliard : sccbase: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard Feb. 24, 2021

Feb. 24, 2021

Module: wine Branch: master Commit: b2a40e2e3237877fa9f358a7a0406d22fd550553 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b2a40e2e3237877fa9f358a7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 24 10:28:37 2021 +0100 sccbase: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/sccbase/Makefile.in | 2 +- dlls/sccbase/main.c | 15 --------------- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/dlls/sccbase/Makefile.in b/dlls/sccbase/Makefile.in index 744d5f89d1e..605bd958a20 100644 --- a/dlls/sccbase/Makefile.in +++ b/dlls/sccbase/Makefile.in @@ -1,6 +1,6 @@ MODULE = sccbase.dll -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ main.c diff --git a/dlls/sccbase/main.c b/dlls/sccbase/main.c index b263d4dc5dd..f1325cf4341 100644 --- a/dlls/sccbase/main.c +++ b/dlls/sccbase/main.c @@ -24,21 +24,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(sccbase); -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); - - switch (fdwReason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hinstDLL); - break; - } - return TRUE; -} - /***************************************************** * DllRegisterServer (SCCBASE.@) */

1 0

Alexandre Julliard : slbcsp: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard Feb. 24, 2021

Feb. 24, 2021

Module: wine Branch: master Commit: 55615fa98ba8040f4aef06c0bf6d1fa5f984ec24 URL: https://source.winehq.org/git/wine.git/?a=commit;h=55615fa98ba8040f4aef06c0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 24 10:28:49 2021 +0100 slbcsp: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/slbcsp/Makefile.in | 2 +- dlls/slbcsp/main.c | 15 --------------- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/dlls/slbcsp/Makefile.in b/dlls/slbcsp/Makefile.in index b3dd14f0b02..ff6a0f1dc14 100644 --- a/dlls/slbcsp/Makefile.in +++ b/dlls/slbcsp/Makefile.in @@ -1,6 +1,6 @@ MODULE = slbcsp.dll -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ main.c diff --git a/dlls/slbcsp/main.c b/dlls/slbcsp/main.c index 4fd23be6442..2dbe26bee03 100644 --- a/dlls/slbcsp/main.c +++ b/dlls/slbcsp/main.c @@ -24,21 +24,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(slbcsp); -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); - - switch (fdwReason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hinstDLL); - break; - } - return TRUE; -} - /***************************************************** * DllRegisterServer (SLBCSP.@) */

1 0

Alexandre Julliard : tdh: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard Feb. 24, 2021

Feb. 24, 2021

Module: wine Branch: master Commit: 4d52323893f95ea8b8f3308a4e815cdf70635c30 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4d52323893f95ea8b8f3308a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 24 10:29:16 2021 +0100 tdh: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/tdh/Makefile.in | 2 +- dlls/tdh/tdh_main.c | 16 ---------------- 2 files changed, 1 insertion(+), 17 deletions(-) diff --git a/dlls/tdh/Makefile.in b/dlls/tdh/Makefile.in index 66bc18c88ee..eab8b56e264 100644 --- a/dlls/tdh/Makefile.in +++ b/dlls/tdh/Makefile.in @@ -1,6 +1,6 @@ MODULE = tdh.dll -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ tdh_main.c diff --git a/dlls/tdh/tdh_main.c b/dlls/tdh/tdh_main.c index 29e7d50c241..2e6a9e69a38 100644 --- a/dlls/tdh/tdh_main.c +++ b/dlls/tdh/tdh_main.c @@ -27,22 +27,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(tdh); -BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) -{ - TRACE("(%p, %u, %p)\n", instance, reason, reserved); - - switch (reason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(instance); - break; - } - - return TRUE; -} - ULONG WINAPI TdhLoadManifest(LPWSTR manifest) { FIXME("(%s): stub\n", debugstr_w(manifest));

1 0

Alexandre Julliard : traffic: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard Feb. 24, 2021

Feb. 24, 2021

Module: wine Branch: master Commit: 7905c3164224399a6ef7dc92a95b661182e366ef URL: https://source.winehq.org/git/wine.git/?a=commit;h=7905c3164224399a6ef7dc92… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 24 10:29:19 2021 +0100 traffic: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/traffic/Makefile.in | 2 +- dlls/traffic/traffic_main.c | 18 ------------------ 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/dlls/traffic/Makefile.in b/dlls/traffic/Makefile.in index e823eb380cb..a18224ac4e1 100644 --- a/dlls/traffic/Makefile.in +++ b/dlls/traffic/Makefile.in @@ -1,6 +1,6 @@ MODULE = traffic.dll -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ traffic_main.c diff --git a/dlls/traffic/traffic_main.c b/dlls/traffic/traffic_main.c index 6b8a9751e19..87646622346 100644 --- a/dlls/traffic/traffic_main.c +++ b/dlls/traffic/traffic_main.c @@ -26,24 +26,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(traffic); -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); - - switch (fdwReason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hinstDLL); - break; - default: - break; - } - - return TRUE; -} - /***************************************************************************** * TcRegisterClient [TRAFFIC.@] */

1 0

Alexandre Julliard : winebuild: Simplify constant loading on ARM.
by Alexandre Julliard Feb. 24, 2021

Feb. 24, 2021

Module: wine Branch: master Commit: abf4747ba786931a431533e84870d6b3af7e55c4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=abf4747ba786931a431533e8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 24 10:38:50 2021 +0100 winebuild: Simplify constant loading on ARM. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/import.c | 43 ++++++++++++++++++++++--------------------- tools/winebuild/spec32.c | 20 ++++++++++++-------- 2 files changed, 34 insertions(+), 29 deletions(-) diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 791ea6e400c..57b79ff187d 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -1166,23 +1166,15 @@ static void output_delayed_import_thunks( const DLLSPEC *spec ) switch(target_cpu) { case CPU_x86: - output( "\tmovl $%d, %%eax\n", (idx << 16) | j ); - output( "\tjmp %s\n", asm_name("__wine_delay_load_asm") ); - break; case CPU_x86_64: - output( "\tmovq $%d,%%rax\n", (idx << 16) | j ); + output( "\tmovl $%d,%%eax\n", (idx << 16) | j ); output( "\tjmp %s\n", asm_name("__wine_delay_load_asm") ); break; case CPU_ARM: - { - unsigned int mask, count = 0, val = (idx << 16) | j; - - for (mask = 0xff; mask; mask <<= 8) - if (val & mask) output( "\t%s IP,#%u\n", count++ ? "add" : "mov", val & mask ); - if (!count) output( "\tmov IP,#0\n" ); + output( "\tmov ip, #%u\n", j ); + if (idx) output( "\tmovt ip, #%u\n", idx ); output( "\tb %s\n", asm_name("__wine_delay_load_asm") ); break; - } case CPU_ARM64: if (idx) { @@ -1370,12 +1362,15 @@ void output_stubs( DLLSPEC *spec ) } else { - output( "\tldr r0,1f\n"); - output( "\tldr r1,1f+4\n"); + 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( "1:\t.long .L__wine_spec_file_name\n" ); - if (exp_name) output( "\t.long .L%s_string\n", name ); - else output( "\t.long %u\n", odp->ordinal ); } break; case CPU_ARM64: @@ -1823,15 +1818,21 @@ void output_syscalls( DLLSPEC *spec ) break; case CPU_ARM: output( "\tpush {r4,lr}\n" ); - output( "\tldr r4, 3f\n"); - output( "\tldr ip, 2f\n"); - if (UsePIC) output( "1:\tadd ip, pc\n" ); + output( "\tmov r4, #%u\n", i ); + if (UsePIC) + { + output( "\tldr ip, 2f\n"); + output( "1:\tadd ip, pc\n" ); + } + else + { + output( "\tmovw ip, :lower16:%s\n", asm_name("__wine_syscall_dispatcher") ); + output( "\tmovt ip, :upper16:%s\n", asm_name("__wine_syscall_dispatcher") ); + } output( "\tldr ip, [ip]\n"); output( "\tblx ip\n"); output( "\tpop {r4,pc}\n" ); if (UsePIC) output( "2:\t.long %s-1b-%u\n", asm_name("__wine_syscall_dispatcher"), thumb_mode ? 4 : 8 ); - else output( "2:\t.long %s\n", asm_name("__wine_syscall_dispatcher") ); - output( "3:\t.long %u\n", i ); break; case CPU_ARM64: output( "\tstp x29, x30, [sp,#-16]!\n" ); diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index 546d058b199..02029056b30 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -297,14 +297,12 @@ static void output_relay_debug( DLLSPEC *spec ) case CPU_ARM: { - unsigned int mask, val, count = 0; 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 ); - val = (odp->u.func.args_str_offset << 16) | (i - spec->base); output( "\t.align %d\n", get_alignment(4) ); if (thumb_mode) output( "\t.thumb_func\n" ); output( "__wine_spec_relay_entry_point_%d:\n", i ); @@ -314,18 +312,24 @@ static void output_relay_debug( DLLSPEC *spec ) if (has_float) output( "\tvpush {s0-s15}\n" ); output( "\tpush {LR}\n" ); output( "\tsub SP, #4\n"); - for (mask = 0xff; mask; mask <<= 8) - if (val & mask) output( "\t%s r1,#%u\n", count++ ? "add" : "mov", val & mask ); - if (!count) output( "\tmov r1,#0\n" ); - output( "\tldr r0, 2f\n"); - if (UsePIC) output( "1:\tadd r0, PC\n"); + output( "\tmov 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( "\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 ); - else output( "2:\t.long .L__wine_spec_relay_descr\n" ); output_cfi( ".cfi_endproc" ); break; }

1 0