March 2020 - Wine-devel - list.winehq.org

[PATCH 1/2] webservices: Implement WS_ANY_ATTRIBUTES_FIELD_MAPPING for the writer.
by Hans Leidekker 20 Mar '20

20 Mar '20

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/webservices/reader.c | 3 +++ dlls/webservices/tests/writer.c | 11 +++++++++-- dlls/webservices/writer.c | 3 +++ 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index bf29990923..f1ce93b7d7 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -6085,6 +6085,9 @@ ULONG get_type_size( WS_TYPE type, const void *desc ) const WS_UNION_DESCRIPTION *desc_union = desc; return desc_union->size; } + case WS_ANY_ATTRIBUTES_TYPE: + return 0; + default: ERR( "unhandled type %u\n", type ); return 0; diff --git a/dlls/webservices/tests/writer.c b/dlls/webservices/tests/writer.c index d66c2e4319..e996e4972b 100644 --- a/dlls/webservices/tests/writer.c +++ b/dlls/webservices/tests/writer.c @@ -1586,10 +1586,11 @@ static void test_complex_struct_type(void) WS_XML_BUFFER *buffer; WS_XML_WRITER *writer; WS_STRUCT_DESCRIPTION s, s2; - WS_FIELD_DESCRIPTION f, f2, *fields[1], *fields2[1]; + WS_FIELD_DESCRIPTION f, f2, f3, *fields[1], *fields2[2]; struct services { const WCHAR *generationtime; + BYTE dummy[12]; }; struct officeconfig { @@ -1619,11 +1620,17 @@ static void test_complex_struct_type(void) f2.options = WS_FIELD_OPTIONAL; fields2[0] = &f2; + memset( &f3, 0, sizeof(f3) ); + f3.mapping = WS_ANY_ATTRIBUTES_FIELD_MAPPING; + f3.type = WS_ANY_ATTRIBUTES_TYPE; + f3.offset = FIELD_OFFSET(struct services, dummy); + fields2[1] = &f3; + memset( &s2, 0, sizeof(s2) ); s2.size = sizeof(*test->services); s2.alignment = 4; s2.fields = fields2; - s2.fieldCount = 1; + s2.fieldCount = 2; s2.typeLocalName = &str_services; s2.typeNs = &ns; diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index 53489786cd..989ea0986d 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -3831,6 +3831,9 @@ static HRESULT write_type_field( struct writer *writer, const WS_FIELD_DESCRIPTI } break; + case WS_ANY_ATTRIBUTES_FIELD_MAPPING: + return S_OK; + default: FIXME( "field mapping %u not supported\n", desc->mapping ); return E_NOTIMPL; -- 2.20.1

1 0

[PATCH] kernel32/test: Fix the semaphore handling in test_WaitForJobObject().
by Francois Gouget 20 Mar '20

20 Mar '20

Don't include 'sync ' in the semaphore name because it will end up as a separate argument in the child process, causing it to not find the semaphore. Switch the child to OpenSemaphoreA() to reduce the risk of accidentally create a new semaphore instead of opening the parent's one. Use wait_child_process() instead of a raw WaitForSingleObject(). The timeout is longer but the process is expected to exit immediately anyway and this allows proper handling of child failures (such as if there is a bug with the semaphore handling). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- The lack of checks and the short 1s timeout that this caused mostly masked the issue. dlls/kernel32/tests/process.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 264f737178f..e54c43ca942 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -2832,7 +2832,8 @@ static void test_WaitForJobObject(void) ok(dwret == WAIT_TIMEOUT, "WaitForSingleObject returned %u\n", dwret); sprintf(buffer, "sync kernel32-process-%x", GetCurrentProcessId()); - sem = CreateSemaphoreA(NULL, 0, 1, buffer); + sem = CreateSemaphoreA(NULL, 0, 1, buffer + 5); + ok(sem != NULL, "CreateSemaphoreA failed le=%u\n", GetLastError()); create_process(buffer, &pi); ret = pAssignProcessToJobObject(job, pi.hProcess); @@ -2842,10 +2843,11 @@ static void test_WaitForJobObject(void) dwret = WaitForSingleObject(job, 100); ok(dwret == WAIT_TIMEOUT, "WaitForSingleObject returned %u\n", dwret); - WaitForSingleObject(pi.hProcess, 1000); + wait_child_process(pi.hProcess); CloseHandle(pi.hProcess); CloseHandle(pi.hThread); CloseHandle(job); + CloseHandle(sem); } static HANDLE test_AddSelfToJob(void) @@ -4057,9 +4059,14 @@ START_TEST(process) } else if (!strcmp(myARGV[2], "sync") && myARGC >= 4) { - HANDLE sem = CreateSemaphoreA(NULL, 0, 1, myARGV[3]); - ok(sem != 0, "Could not get the %s semaphore: le=%u\n", myARGV[3], GetLastError()); - if (sem) WaitForSingleObject(sem, 30000); + HANDLE sem = OpenSemaphoreA(SYNCHRONIZE, FALSE, myARGV[3]); + ok(sem != 0, "OpenSemaphoreA(%s) failed le=%u\n", myARGV[3], GetLastError()); + if (sem) + { + DWORD ret = WaitForSingleObject(sem, 30000); + ok(ret == WAIT_OBJECT_0, "WaitForSingleObject(%s) returned %u\n", myARGV[3], ret); + CloseHandle(sem); + } return; } else if (!strcmp(myARGV[2], "exit")) -- 2.20.1

1 0

[PATCH 4/5] makefiles: Explicitly import msvrcrt in modules that need specific crt version.
by Jacek Caban 20 Mar '20

20 Mar '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/msvcirt/Makefile.in | 1 + dlls/msvcp60/Makefile.in | 1 + dlls/msvcrt20/Makefile.in | 1 + dlls/ntoskrnl.exe/Makefile.in | 2 +- 4 files changed, 4 insertions(+), 1 deletion(-)

2 1

[PATCH 5/5] makedep: Build builtin DLLs with ucrtbase.
by Jacek Caban 20 Mar '20

20 Mar '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- tools/makedep.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)

2 1

[PATCH 2/5] wininet: Use _ltow sprintf for port number in InternetCreateUrl.
by Jacek Caban 20 Mar '20

20 Mar '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/wininet/internet.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-)

1 0

(resend) [PATCH 1/2] ntdll: add stub implementation for ProcessQuotaLimits
by Vijay Kiran Kamuju 20 Mar '20

20 Mar '20

based on patch from Qian Hong Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44812 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

2 2

[PATCH 1/5] jscript: Simplify Object.prototype.toString implementation.
by Jacek Caban 20 Mar '20

20 Mar '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/object.c | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-)

1 0

[PATCH 2/2] msvcp140: Don't load __processing_throw dynamically.
by Piotr Caban 20 Mar '20

20 Mar '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp90/exception.c | 3 ++- dlls/msvcp90/msvcp90.h | 4 ---- dlls/msvcp90/msvcp_main.c | 5 ----- 3 files changed, 2 insertions(+), 10 deletions(-)

1 0

[PATCH 1/2] msvcp140: Remove custom standard streams definition.
by Piotr Caban 20 Mar '20

20 Mar '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp90/ios.c | 10 ---------- 1 file changed, 10 deletions(-)

1 0

[PATCH] include: Add xact3.h
by Vijay Kiran Kamuju 20 Mar '20

20 Mar '20

Based on work by Ethan Lee and Alistair Leslie-Hughes Use the header file directly instead of idl file just like other directx headers like dsound.h Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 1