May 2021 - Wine-commits - list.winehq.org

Francois Gouget : user32/tests: Remove the Cygwin/XFree86 checks.
by Alexandre Julliard 07 May '21

07 May '21

Module: wine Branch: master Commit: 07293cfe7db3e2d921049e19fc1f1dc86629f90a URL: https://source.winehq.org/git/wine.git/?a=commit;h=07293cfe7db3e2d921049e19… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri May 7 19:39:12 2021 +0200 user32/tests: Remove the Cygwin/XFree86 checks. They are very old and likely no longer relevant. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/sysparams.c | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index d49d69989f6..8fab62c951e 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -821,13 +821,6 @@ static void test_SPI_SETBORDER( void ) /* 6 */ "Control Panel\\Desktop\\WindowMetrics","CaptionWidth", dpi); ncmsave.iCaptionWidth = CaptionWidth; - /* These tests hang when XFree86 4.0 for Windows is running (tested on - * WinNT, SP2, Cygwin/XFree 4.1.0. Skip the test when XFree86 is - * running. - */ - if (FindWindowA( NULL, "Cygwin/XFree86" )) - return; - trace("testing SPI_{GET,SET}BORDER\n"); SetLastError(0xdeadbeef); @@ -1127,13 +1120,6 @@ static void test_SPI_SETICONTITLEWRAP( void ) /* 26 */ unsigned int i; ICONMETRICSA im; - /* These tests hang when XFree86 4.0 for Windows is running (tested on - * WinNT, SP2, Cygwin/XFree 4.1.0. Skip the test when XFree86 is - * running. - */ - if (FindWindowA( NULL, "Cygwin/XFree86" )) - return; - trace("testing SPI_{GET,SET}ICONTITLEWRAP\n"); SetLastError(0xdeadbeef); rc=SystemParametersInfoA( SPI_GETICONTITLEWRAP, 0, &old_b, 0 );

1 0

Jacek Caban : kernel32/tests: Add syscall context handling tests.
by Alexandre Julliard 07 May '21

07 May '21

Module: wine Branch: master Commit: 058e9c773c157f1425d47bd61fb0070922194980 URL: https://source.winehq.org/git/wine.git/?a=commit;h=058e9c773c157f1425d47bd6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 7 17:37:39 2021 +0200 kernel32/tests: Add syscall context handling tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/debugger.c | 177 +++++++++++++++++++++++++++++++++++++++-- 1 file changed, 171 insertions(+), 6 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=058e9c773c157f1425d4…

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard 07 May '21

07 May '21

Module: wine Branch: master Commit: 87ee0af5cd4c9cecbcbf098a0d91b3900e31abf3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=87ee0af5cd4c9cecbcbf098a… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Fri May 7 20:59:21 2021 +0300 po: Update Finnish translation. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/fi.po | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/po/fi.po b/po/fi.po index 84cc113116a..5d6e85d91c1 100644 --- a/po/fi.po +++ b/po/fi.po @@ -3964,10 +3964,8 @@ msgid "Cannot modify non-writable property '|'" msgstr "Kirjoitussuojattua ominaisuutta '|' ei voi muokata" #: dlls/jscript/jscript.rc:77 -#, fuzzy -#| msgid "'[object]' is not a date object" msgid "'this' is not a Map object" -msgstr "'[objekti]' ei ole päivämääräobjekti" +msgstr "'this' ei ole Map-objekti" #: dlls/jscript/jscript.rc:78 msgid "Property cannot have both accessors and a value" @@ -14653,10 +14651,8 @@ msgstr "" "\n" #: programs/reg/reg.rc:172 -#, fuzzy -#| msgid "reg: Invalid system key [%1]\n" msgid "reg: Invalid system key\n" -msgstr "reg: Järjestelmäavain [%1] ei kelpaa\n" +msgstr "reg: Järjestelmäavain ei kelpaa\n" #: programs/reg/reg.rc:173 msgid "The file '%1' already exists. Do you want to overwrite it?" @@ -14687,10 +14683,8 @@ msgstr "" "\n" #: programs/reg/reg.rc:180 -#, fuzzy -#| msgid "reg: Unable to find the specified registry key\n" msgid "reg: Unable to access or create the specified registry key\n" -msgstr "reg: Annettua rekisteriavainta ei löydy\n" +msgstr "reg: Annetun rekisteriavaimen käyttö tai luonti ei onnistu\n" #: programs/regedit/regedit.rc:34 msgid "&Registry"

1 0

Dmitry Timoshkov : msxml3/tests: Don't '\0' terminate output after ::save().
by Alexandre Julliard 07 May '21

07 May '21

Module: wine Branch: master Commit: ee49f13ab2c6d1f0f2e970b272880d3cf4a7c3f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ee49f13ab2c6d1f0f2e970b2… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Apr 27 12:29:39 2021 +0300 msxml3/tests: Don't '\0' terminate output after ::save(). This fixes heap corruption when running the domdoc tests. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/tests/domdoc.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 6f8e2b44ed3..ba8453430c6 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -8586,8 +8586,7 @@ todo_wine hr = GetHGlobalFromStream(stream, &global); ok(hr == S_OK, "got 0x%08x\n", hr); p = GlobalLock(global); - p[GlobalSize(global)] = 0; - ok(!strcmp(p, xml2) || !strcmp(p, xml2_wine), "got %s\n", wine_dbgstr_a(p)); + ok(!memcmp(p, xml2, sizeof(xml2) - 1) || !memcmp(p, xml2_wine, sizeof(xml2_wine) - 1), "got %s\n", wine_dbgstr_a(p)); GlobalUnlock(global); /* Verify the result after load+save */ @@ -8609,8 +8608,7 @@ todo_wine hr = GetHGlobalFromStream(stream, &global); ok(hr == S_OK, "got 0x%08x\n", hr); p = GlobalLock(global); - p[GlobalSize(global)] = 0; - ok(!strcmp(p, xml2) || !strcmp(p, xml2_wine), "got %s\n", wine_dbgstr_a(p)); + ok(!memcmp(p, xml2, sizeof(xml2) - 1) || !memcmp(p, xml2_wine, sizeof(xml2_wine) - 1), "got %s\n", wine_dbgstr_a(p)); GlobalUnlock(global); IStream_Release(stream); @@ -8631,8 +8629,7 @@ todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); p = GlobalLock(global); - p[GlobalSize(global)] = 0; - ok(!strcmp(p, xml3) || !strcmp(p, xml3_wine), "got %s\n", wine_dbgstr_a(p)); + ok(!memcmp(p, xml3, sizeof(xml3) - 1) || !memcmp(p, xml3_wine, sizeof(xml3_wine) - 1), "got %s\n", wine_dbgstr_a(p)); GlobalUnlock(global); IStream_Release(stream);

1 0

Dmitry Timoshkov : msxml3/tests: Add more tests for processing instruction attributes.
by Alexandre Julliard 07 May '21

07 May '21

Module: wine Branch: master Commit: a0dd105c655898de087c1e58fcc5a5cae6e191df URL: https://source.winehq.org/git/wine.git/?a=commit;h=a0dd105c655898de087c1e58… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Apr 27 12:29:42 2021 +0300 msxml3/tests: Add more tests for processing instruction attributes. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/tests/domdoc.c | 43 +++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 41 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index ba8453430c6..59a8a243c87 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -46,6 +46,8 @@ #include "wine/heap.h" #include "wine/test.h" +#define XML_E_UNEXPECTED_ATTRIBUTE 0xC00CE56C + /* undef the #define in msxml2 so that we can access all versions */ #undef CLSID_DOMDocument @@ -8529,10 +8531,11 @@ static void test_createProcessingInstruction(void) static const char xml3_wine[] = "<?xml version=\"1.0\" standalone=\"yes\"?>\n<test/>\n"; IXMLDOMProcessingInstruction *pi; IXMLDOMDocument *doc; - IXMLDOMNode *node; + IXMLDOMNode *node, *item; + IXMLDOMNamedNodeMap *node_map; IXMLDOMElement *element; WCHAR buff[10]; - BSTR xml; + BSTR xml, bstr; VARIANT var; HRESULT hr; IStream *stream; @@ -8543,6 +8546,10 @@ static void test_createProcessingInstruction(void) doc = create_document(&IID_IXMLDOMDocument); + hr = IXMLDOMDocument_createProcessingInstruction(doc, _bstr_("xml"), _bstr_("version=\"1.0\" encoding=\"windows-1252\" dummy=\"value\""), &pi); +todo_wine + ok(hr == XML_E_UNEXPECTED_ATTRIBUTE, "got 0x%08x\n", hr); + /* test for BSTR handling, pass broken BSTR */ memcpy(&buff[2], L"test", 5 * sizeof(WCHAR)); /* just a big length */ @@ -8561,6 +8568,38 @@ static void test_createProcessingInstruction(void) ok(hr == S_OK, "got 0x%08x\n", hr); hr = IXMLDOMDocument_appendChild(doc, node, NULL); ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXMLDOMNode_get_attributes(node, &node_map); + ok(hr == S_OK, "got 0x%08x\n", hr); + + item = (void *)0xdeadbeef; + hr = IXMLDOMNamedNodeMap_getNamedItem(node_map, _bstr_("xml"), &item); + ok(hr == S_FALSE, "got 0x%08x\n", hr); + ok(!item, "got %p\n", item); + + item = NULL; + hr = IXMLDOMNamedNodeMap_getNamedItem(node_map, _bstr_("encoding"), &item); +todo_wine + ok(hr == S_OK, "got 0x%08x\n", hr); +todo_wine + ok(item != NULL, "got NULL\n"); + +if (hr == S_OK) +{ + hr = IXMLDOMNode_get_nodeName(item, &bstr); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(bstr, L"encoding"), "got %s\n", wine_dbgstr_w(bstr)); + SysFreeString(bstr); + + VariantInit(&var); + hr = IXMLDOMNode_get_nodeValue(item, &var); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(V_VT(&var) == VT_BSTR, "got %u\n", V_VT(&var)); + ok(!lstrcmpW(V_BSTR(&var), L"windows-1252"), "got %s\n", wine_dbgstr_w(V_BSTR(&var))); + VariantClear(&var); +} + + IXMLDOMNamedNodeMap_Release(node_map); IXMLDOMNode_Release(node); IXMLDOMProcessingInstruction_Release(pi);

1 0

Alexandre Julliard : Release 6.8.
by Alexandre Julliard 07 May '21

07 May '21

Module: wine Branch: master Commit: 99e47361a37a4bf16de131401a0c231f86214a43 URL: https://source.winehq.org/git/wine.git/?a=commit;h=99e47361a37a4bf16de13140… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 7 22:40:28 2021 +0200 Release 6.8. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 970 +++++++++++++++++++++++++++++--------------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 462 insertions(+), 528 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=99e47361a37a4bf16de1…

1 0

Tag wine-6.8 : Alexandre Julliard : Release 6.8
by Alexandre Julliard 07 May '21

07 May '21

Module: wine Branch: refs/tags/wine-6.8 Tag: 6a2ffce10cb2ba65869d6e596df19cf3241aeeaf URL: https://source.winehq.org/git/wine.git/?a=tag;h=6a2ffce10cb2ba65869d6e596df… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 7 22:40:28 2021 +0200 Release 6.8

1 0

Zebediah Figura : ws2_32/tests: Add some tests for nonblocking async recv().
by Alexandre Julliard 07 May '21

07 May '21

Module: wine Branch: master Commit: 1f35115360120f5f355d2948ff634093da472ce0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f35115360120f5f355d2948… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu May 6 17:54:09 2021 -0500 ws2_32/tests: Add some tests for nonblocking async recv(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 194 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 194 insertions(+) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 116f9e23224..4bb546a4b94 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -8679,6 +8679,199 @@ static void test_WSAGetOverlappedResult(void) closesocket(s); } +struct nonblocking_async_recv_params +{ + SOCKET client; + HANDLE event; +}; + +static DWORD CALLBACK nonblocking_async_recv_thread(void *arg) +{ + const struct nonblocking_async_recv_params *params = arg; + OVERLAPPED overlapped = {0}; + DWORD flags = 0, size; + char buffer[5]; + WSABUF wsabuf; + int ret; + + overlapped.hEvent = params->event; + wsabuf.buf = buffer; + wsabuf.len = sizeof(buffer); + memset(buffer, 0, sizeof(buffer)); + ret = WSARecv(params->client, &wsabuf, 1, NULL, &flags, &overlapped, NULL); + todo_wine_if (!params->event) ok(!ret, "got %d\n", ret); + ret = GetOverlappedResult((HANDLE)params->client, &overlapped, &size, FALSE); + ok(ret, "got error %u\n", GetLastError()); + todo_wine ok(size == 4, "got size %u\n", size); + todo_wine_if (!params->event) ok(!strcmp(buffer, "data"), "got %s\n", debugstr_an(buffer, size)); + + return 0; +} + +static void test_nonblocking_async_recv(void) +{ + struct nonblocking_async_recv_params params; + OVERLAPPED overlapped = {0}; + SOCKET client, server; + DWORD flags = 0, size; + HANDLE thread, event; + char buffer[5]; + WSABUF wsabuf; + int ret; + + event = CreateEventW(NULL, TRUE, FALSE, NULL); + wsabuf.buf = buffer; + wsabuf.len = sizeof(buffer); + + tcp_socketpair(&client, &server); + set_blocking(client, FALSE); + set_blocking(server, FALSE); + + WSASetLastError(0xdeadbeef); + ret = recv(client, buffer, sizeof(buffer), 0); + ok(ret == -1, "got %d\n", ret); + ok(WSAGetLastError() == WSAEWOULDBLOCK, "got error %u\n", WSAGetLastError()); + + WSASetLastError(0xdeadbeef); + overlapped.Internal = 0xdeadbeef; + ret = WSARecv(client, &wsabuf, 1, &size, &flags, NULL, NULL); + ok(ret == -1, "got %d\n", ret); + ok(WSAGetLastError() == WSAEWOULDBLOCK, "got error %u\n", WSAGetLastError()); + ok(overlapped.Internal == 0xdeadbeef, "got status %#x\n", (NTSTATUS)overlapped.Internal); + + /* Overlapped, with a NULL event. */ + + overlapped.hEvent = NULL; + + memset(buffer, 0, sizeof(buffer)); + WSASetLastError(0xdeadbeef); + ret = WSARecv(client, &wsabuf, 1, NULL, &flags, &overlapped, NULL); + ok(ret == -1, "got %d\n", ret); + ok(WSAGetLastError() == ERROR_IO_PENDING, "got error %u\n", WSAGetLastError()); + ret = WaitForSingleObject((HANDLE)client, 0); + ok(ret == WAIT_TIMEOUT, "expected timeout\n"); + + ret = send(server, "data", 4, 0); + ok(ret == 4, "got %d\n", ret); + + ret = WaitForSingleObject((HANDLE)client, 1000); + ok(!ret, "wait timed out\n"); + ret = GetOverlappedResult((HANDLE)client, &overlapped, &size, FALSE); + ok(ret, "got error %u\n", GetLastError()); + ok(size == 4, "got size %u\n", size); + ok(!strcmp(buffer, "data"), "got %s\n", debugstr_an(buffer, size)); + + /* Overlapped, with a non-NULL event. */ + + overlapped.hEvent = event; + + memset(buffer, 0, sizeof(buffer)); + WSASetLastError(0xdeadbeef); + ret = WSARecv(client, &wsabuf, 1, NULL, &flags, &overlapped, NULL); + ok(ret == -1, "got %d\n", ret); + ok(WSAGetLastError() == ERROR_IO_PENDING, "got error %u\n", WSAGetLastError()); + ret = WaitForSingleObject(event, 0); + ok(ret == WAIT_TIMEOUT, "expected timeout\n"); + + ret = send(server, "data", 4, 0); + ok(ret == 4, "got %d\n", ret); + + ret = WaitForSingleObject(event, 1000); + ok(!ret, "wait timed out\n"); + ret = GetOverlappedResult((HANDLE)client, &overlapped, &size, FALSE); + ok(ret, "got error %u\n", GetLastError()); + ok(size == 4, "got size %u\n", size); + ok(!strcmp(buffer, "data"), "got %s\n", debugstr_an(buffer, size)); + + /* With data already in the pipe; usually this does return 0 (but not + * reliably). */ + + ret = send(server, "data", 4, 0); + ok(ret == 4, "got %d\n", ret); + + memset(buffer, 0, sizeof(buffer)); + ret = WSARecv(client, &wsabuf, 1, NULL, &flags, &overlapped, NULL); + ok(!ret || WSAGetLastError() == ERROR_IO_PENDING, "got error %u\n", WSAGetLastError()); + ret = WaitForSingleObject(event, 1000); + ok(!ret, "wait timed out\n"); + ret = GetOverlappedResult((HANDLE)client, &overlapped, &size, FALSE); + ok(ret, "got error %u\n", GetLastError()); + ok(size == 4, "got size %u\n", size); + ok(!strcmp(buffer, "data"), "got %s\n", debugstr_an(buffer, size)); + + closesocket(client); + closesocket(server); + + /* With a non-overlapped socket, WSARecv() always blocks when passed an + * overlapped structure, but returns WSAEWOULDBLOCK otherwise. */ + + tcp_socketpair_flags(&client, &server, 0); + set_blocking(client, FALSE); + set_blocking(server, FALSE); + + WSASetLastError(0xdeadbeef); + ret = recv(client, buffer, sizeof(buffer), 0); + ok(ret == -1, "got %d\n", ret); + ok(WSAGetLastError() == WSAEWOULDBLOCK, "got error %u\n", WSAGetLastError()); + + WSASetLastError(0xdeadbeef); + overlapped.Internal = 0xdeadbeef; + ret = WSARecv(client, &wsabuf, 1, &size, &flags, NULL, NULL); + ok(ret == -1, "got %d\n", ret); + ok(WSAGetLastError() == WSAEWOULDBLOCK, "got error %u\n", WSAGetLastError()); + ok(overlapped.Internal == 0xdeadbeef, "got status %#x\n", (NTSTATUS)overlapped.Internal); + + /* Overlapped, with a NULL event. */ + + params.client = client; + params.event = NULL; + thread = CreateThread(NULL, 0, nonblocking_async_recv_thread, &params, 0, NULL); + + ret = WaitForSingleObject(thread, 200); + todo_wine ok(ret == WAIT_TIMEOUT, "expected timeout\n"); + + ret = send(server, "data", 4, 0); + ok(ret == 4, "got %d\n", ret); + + ret = WaitForSingleObject(thread, 200); + ok(!ret, "wait timed out\n"); + CloseHandle(thread); + + /* Overlapped, with a non-NULL event. */ + + params.client = client; + params.event = event; + thread = CreateThread(NULL, 0, nonblocking_async_recv_thread, &params, 0, NULL); + + ret = WaitForSingleObject(thread, 200); + todo_wine ok(ret == WAIT_TIMEOUT, "expected timeout\n"); + + ret = send(server, "data", 4, 0); + ok(ret == 4, "got %d\n", ret); + + ret = WaitForSingleObject(thread, 200); + ok(!ret, "wait timed out\n"); + CloseHandle(thread); + + /* With data already in the pipe. */ + + ret = send(server, "data", 4, 0); + ok(ret == 4, "got %d\n", ret); + + memset(buffer, 0, sizeof(buffer)); + ret = WSARecv(client, &wsabuf, 1, NULL, &flags, &overlapped, NULL); + ok(!ret, "got %d\n", ret); + ret = GetOverlappedResult((HANDLE)client, &overlapped, &size, FALSE); + todo_wine ok(ret, "got error %u\n", GetLastError()); + ok(size == 4, "got size %u\n", size); + todo_wine ok(!strcmp(buffer, "data"), "got %s\n", debugstr_an(buffer, size)); + + closesocket(client); + closesocket(server); + + CloseHandle(overlapped.hEvent); +} + START_TEST( sock ) { int i; @@ -8735,6 +8928,7 @@ START_TEST( sock ) test_bind(); test_connecting_socket(); test_WSAGetOverlappedResult(); + test_nonblocking_async_recv(); /* this is an io heavy test, do it at the end so the kernel doesn't start dropping packets */ test_send();

1 0

Alexandre Julliard : ntdll: Force executing IL-only binaries on the native machine.
by Alexandre Julliard 07 May '21

07 May '21

Module: wine Branch: master Commit: e9bc48e90a7f31820e3c1171cc6bbdc13a650b8f URL: https://source.winehq.org/git/wine.git/?a=commit;h=e9bc48e90a7f31820e3c1171… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 7 12:44:59 2021 +0200 ntdll: Force executing IL-only binaries on the native machine. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51101 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/env.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index 3ac1ed9ab63..5d8c14625f9 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -1954,6 +1954,8 @@ static RTL_USER_PROCESS_PARAMETERS *build_initial_params(void) if (!status) { if (main_image_info.ImageCharacteristics & IMAGE_FILE_DLL) status = STATUS_INVALID_IMAGE_FORMAT; + if (main_image_info.ImageFlags & IMAGE_FLAGS_ComPlusNativeReady) + main_image_info.Machine = native_machine; if (main_image_info.Machine != current_machine) status = STATUS_INVALID_IMAGE_FORMAT; }

1 0

Alexandre Julliard : server: Send the zero_bits parameter for remote NtCreateThreadEx() calls.
by Alexandre Julliard 07 May '21

07 May '21

Module: wine Branch: master Commit: 6a296592aa0fefeed6b7dd505b20c22c2d3174d6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6a296592aa0fefeed6b7dd50… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 7 16:01:45 2021 +0200 server: Send the zero_bits parameter for remote NtCreateThreadEx() calls. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/server.c | 3 ++- dlls/ntdll/unix/thread.c | 15 ++++++++------- include/wine/server_protocol.h | 3 ++- include/winternl.h | 2 +- server/protocol.def | 1 + server/trace.c | 1 + 6 files changed, 15 insertions(+), 10 deletions(-) diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c index ff632b7c6c0..8400c2930bb 100644 --- a/dlls/ntdll/unix/server.c +++ b/dlls/ntdll/unix/server.c @@ -550,6 +550,7 @@ static void invoke_system_apc( const apc_call_t *call, apc_result_t *result, BOO CLIENT_ID id; HANDLE handle; TEB *teb; + ULONG_PTR zero_bits = call->create_thread.zero_bits; SIZE_T reserve = call->create_thread.reserve; SIZE_T commit = call->create_thread.commit; void *func = wine_server_get_ptr( call->create_thread.func ); @@ -570,7 +571,7 @@ static void invoke_system_apc( const apc_call_t *call, apc_result_t *result, BOO attr->Attributes[1].ReturnLength = NULL; result->create_thread.status = NtCreateThreadEx( &handle, THREAD_ALL_ACCESS, NULL, NtCurrentProcess(), func, arg, - call->create_thread.flags, 0, + call->create_thread.flags, zero_bits, commit, reserve, attr ); result->create_thread.handle = wine_server_obj_handle( handle ); result->create_thread.pid = HandleToULong(id.UniqueProcess); diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index a2b9569a7b9..4e0d8321061 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -161,7 +161,7 @@ NTSTATUS WINAPI NtCreateThread( HANDLE *handle, ACCESS_MASK access, OBJECT_ATTRI */ NTSTATUS WINAPI NtCreateThreadEx( HANDLE *handle, ACCESS_MASK access, OBJECT_ATTRIBUTES *attr, HANDLE process, PRTL_THREAD_START_ROUTINE start, void *param, - ULONG flags, SIZE_T zero_bits, SIZE_T stack_commit, + ULONG flags, ULONG_PTR zero_bits, SIZE_T stack_commit, SIZE_T stack_reserve, PS_ATTRIBUTE_LIST *attr_list ) { sigset_t sigset; @@ -185,12 +185,13 @@ NTSTATUS WINAPI NtCreateThreadEx( HANDLE *handle, ACCESS_MASK access, OBJECT_ATT memset( &call, 0, sizeof(call) ); - call.create_thread.type = APC_CREATE_THREAD; - call.create_thread.flags = flags; - call.create_thread.func = wine_server_client_ptr( start ); - call.create_thread.arg = wine_server_client_ptr( param ); - call.create_thread.reserve = stack_reserve; - call.create_thread.commit = stack_commit; + call.create_thread.type = APC_CREATE_THREAD; + call.create_thread.flags = flags; + call.create_thread.func = wine_server_client_ptr( start ); + call.create_thread.arg = wine_server_client_ptr( param ); + call.create_thread.zero_bits = zero_bits; + call.create_thread.reserve = stack_reserve; + call.create_thread.commit = stack_commit; status = server_queue_process_apc( process, &call, &result ); if (status != STATUS_SUCCESS) return status; diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 8ae313e6581..f326d78bc3c 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -564,6 +564,7 @@ typedef union unsigned int flags; client_ptr_t func; client_ptr_t arg; + mem_size_t zero_bits; mem_size_t reserve; mem_size_t commit; } create_thread; @@ -6232,7 +6233,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 697 +#define SERVER_PROTOCOL_VERSION 698 /* ### protocol_version end ### */ diff --git a/include/winternl.h b/include/winternl.h index 4ccd68daa5f..48ad80c6037 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -3678,7 +3678,7 @@ NTSYSAPI NTSTATUS WINAPI NtCreateSection(HANDLE*,ACCESS_MASK,const OBJECT_ATTRI NTSYSAPI NTSTATUS WINAPI NtCreateSemaphore(PHANDLE,ACCESS_MASK,const OBJECT_ATTRIBUTES*,LONG,LONG); NTSYSAPI NTSTATUS WINAPI NtCreateSymbolicLinkObject(PHANDLE,ACCESS_MASK,POBJECT_ATTRIBUTES,PUNICODE_STRING); NTSYSAPI NTSTATUS WINAPI NtCreateThread(PHANDLE,ACCESS_MASK,POBJECT_ATTRIBUTES,HANDLE,PCLIENT_ID,PCONTEXT,PINITIAL_TEB,BOOLEAN); -NTSYSAPI NTSTATUS WINAPI NtCreateThreadEx(HANDLE*,ACCESS_MASK,OBJECT_ATTRIBUTES*,HANDLE,PRTL_THREAD_START_ROUTINE,void*,ULONG,SIZE_T,SIZE_T,SIZE_T,PS_ATTRIBUTE_LIST*); +NTSYSAPI NTSTATUS WINAPI NtCreateThreadEx(HANDLE*,ACCESS_MASK,OBJECT_ATTRIBUTES*,HANDLE,PRTL_THREAD_START_ROUTINE,void*,ULONG,ULONG_PTR,SIZE_T,SIZE_T,PS_ATTRIBUTE_LIST*); NTSYSAPI NTSTATUS WINAPI NtCreateTimer(HANDLE*, ACCESS_MASK, const OBJECT_ATTRIBUTES*, TIMER_TYPE); NTSYSAPI NTSTATUS WINAPI NtCreateToken(PHANDLE,ACCESS_MASK,POBJECT_ATTRIBUTES,TOKEN_TYPE,PLUID,PLARGE_INTEGER,PTOKEN_USER,PTOKEN_GROUPS,PTOKEN_PRIVILEGES,PTOKEN_OWNER,PTOKEN_PRIMARY_GROUP,PTOKEN_DEFAULT_DACL,PTOKEN_SOURCE); NTSYSAPI NTSTATUS WINAPI NtCreateUserProcess(HANDLE*,HANDLE*,ACCESS_MASK,ACCESS_MASK,OBJECT_ATTRIBUTES*,OBJECT_ATTRIBUTES*,ULONG,ULONG,RTL_USER_PROCESS_PARAMETERS*,PS_CREATE_INFO*,PS_ATTRIBUTE_LIST*); diff --git a/server/protocol.def b/server/protocol.def index 9361933d47c..abfd6d70240 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -580,6 +580,7 @@ typedef union unsigned int flags; /* creation flags */ client_ptr_t func; /* void (__stdcall *func)(void*); start function */ client_ptr_t arg; /* argument for start function */ + mem_size_t zero_bits; /* number of zero high bits for thread stack */ mem_size_t reserve; /* reserve size for thread stack */ mem_size_t commit; /* commit size for thread stack */ } create_thread; diff --git a/server/trace.c b/server/trace.c index 0fccf47d16a..6b8c1ad3342 100644 --- a/server/trace.c +++ b/server/trace.c @@ -216,6 +216,7 @@ static void dump_apc_call( const char *prefix, const apc_call_t *call ) case APC_CREATE_THREAD: dump_uint64( "APC_CREATE_THREAD,func=", &call->create_thread.func ); dump_uint64( ",arg=", &call->create_thread.arg ); + dump_uint64( ",zero_bits=", &call->create_thread.zero_bits ); dump_uint64( ",reserve=", &call->create_thread.reserve ); dump_uint64( ",commit=", &call->create_thread.commit ); fprintf( stderr, ",flags=%x", call->create_thread.flags );

1 0