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

[PATCH] d2d1: Implement and test a few easy functions.
by Giovanni Mascellani 17 Oct '20

17 Oct '20

Signed-off-by: Giovanni Mascellani <gio(a)debian.org> --- dlls/d2d1/d2d1.spec | 6 ++--- dlls/d2d1/factory.c | 16 +++++++++++ dlls/d2d1/tests/d2d1.c | 61 ++++++++++++++++++++++++++++++++++++++++++ include/d2d1_1.idl | 3 +++ 4 files changed, 83 insertions(+), 3 deletions(-) diff --git a/dlls/d2d1/d2d1.spec b/dlls/d2d1/d2d1.spec index 0ebcd0af553..0ae894109fb 100644 --- a/dlls/d2d1/d2d1.spec +++ b/dlls/d2d1/d2d1.spec @@ -6,6 +6,6 @@ @ stub D2D1ConvertColorSpace @ stdcall D2D1CreateDevice(ptr ptr ptr) @ stub D2D1CreateDeviceContext -@ stub D2D1SinCos -@ stub D2D1Tan -@ stub D2D1Vec3Length +@ stdcall D2D1SinCos(float ptr ptr) +@ stdcall D2D1Tan(float) +@ stdcall D2D1Vec3Length(float float float) diff --git a/dlls/d2d1/factory.c b/dlls/d2d1/factory.c index 2f50836bbcd..447b00fd2d8 100644 --- a/dlls/d2d1/factory.c +++ b/dlls/d2d1/factory.c @@ -713,6 +713,22 @@ HRESULT WINAPI D2D1CreateDevice(IDXGIDevice *dxgi_device, return hr; } +void WINAPI D2D1SinCos(FLOAT angle, FLOAT *s, FLOAT *c) +{ + *s = sinf(angle); + *c = cosf(angle); +} + +FLOAT WINAPI D2D1Tan(FLOAT angle) +{ + return tanf(angle); +} + +FLOAT WINAPI D2D1Vec3Length(FLOAT x, FLOAT y, FLOAT z) +{ + return sqrtf(x*x + y*y + z*z); +} + static BOOL get_config_key_dword(HKEY default_key, HKEY application_key, const char *name, DWORD *value) { DWORD type, data, size; diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 166cdfccda6..e6be464162d 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -9425,6 +9425,66 @@ static void test_wic_bitmap_format(void) DestroyWindow(window); } +static int compare_fp(FLOAT res, FLOAT exp) +{ + if (exp == 0.0f) + return fabsf(res) <= 10 * FLT_MIN; + else + return fabsf((res-exp) / exp) <= 10 * FLT_EPSILON; +} + +static void test_math(void) +{ + FLOAT s, c, t, l; + int i; + + static const FLOAT sc_data[] = + { + 0.0, 0.0, 1.0, + 1.0, 0.8414709568, 0.5403022766, + 2.0, 0.9092974067, -0.4161468446, + M_PI / 2.0, 1.0, -4.371138829e-008, + M_PI, -8.742277657e-008, -1.0, + }; + + static const FLOAT t_data[] = + { + 0.0, 0.0, + 1.0, 1.557407737, + 2.0, -2.185039759, + M_PI / 2.0, -22877332, + M_PI, 8.742277657e-008, + }; + + static const FLOAT l_data[] = + { + 0.0, 0.0, 0.0, 0.0, + 1.0, 0.0, 0.0, 1.0, + 0.0, 1.0, 0.0, 1.0, + 0.0, 0.0, 1.0, 1.0, + 1.0, 1.0, 1.0, 1.732050776, + 1.0, 2.0, 2.0, 3.0, + 1.0, 2.0, 3.0, 3.741657495, + }; + + for (i = 0; i < sizeof(sc_data) / sizeof(sc_data[0]); i += 3) { + D2D1SinCos(sc_data[i], &s, &c); + ok(compare_fp(s, sc_data[i+1]), "Wrong sin(%.10g) (%.10g instead of %.10g).\n", sc_data[i], s, sc_data[i+1]); + ok(compare_fp(c, sc_data[i+2]), "Wrong cos(%.10g) (%.10g instead of %.10g).\n", sc_data[i], c, sc_data[i+2]); + } + + for (i = 0; i < sizeof(t_data) / sizeof(t_data[0]); i += 2) { + t = D2D1Tan(t_data[i]); + ok(compare_fp(t, t_data[i+1]), "Wrong tan(%.10g) (%.10g instead of %.10g).\n", t_data[i], t, t_data[i+1]); + } + + for (i = 0; i < sizeof(l_data) / sizeof(l_data[0]); i += 4) { + l = D2D1Vec3Length(l_data[i], l_data[i+1], l_data[i+2]); + ok(compare_fp(l, l_data[i+3]), "Wrong len(%.10g, %.10g, %.10g) (%.10g instead of %.10g).\n", + l_data[i], l_data[i+1], l_data[i+2], l, l_data[i+3]); + } +} + START_TEST(d2d1) { unsigned int argc, i; @@ -9477,6 +9537,7 @@ START_TEST(d2d1) queue_test(test_max_bitmap_size); queue_test(test_dpi); queue_test(test_wic_bitmap_format); + queue_test(test_math); run_queued_tests(); } diff --git a/include/d2d1_1.idl b/include/d2d1_1.idl index ddb7669c24b..5a3178845ad 100644 --- a/include/d2d1_1.idl +++ b/include/d2d1_1.idl @@ -794,3 +794,6 @@ interface ID2D1Factory1 : ID2D1Factory [local] HRESULT __stdcall D2D1CreateDevice(IDXGIDevice *dxgi_device, const D2D1_CREATION_PROPERTIES *creation_properties, ID2D1Device **device); +[local] void __stdcall D2D1SinCos(FLOAT angle, FLOAT *s, FLOAT *c); +[local] FLOAT __stdcall D2D1Tan(FLOAT angle); +[local] FLOAT __stdcall D2D1Vec3Length(FLOAT x, FLOAT y, FLOAT z); -- 2.28.0

2 1

[PATCH] ws2_32/tests: Fix an intermittent test failure on w10pro64.
by Zebediah Figura 17 Oct '20

17 Oct '20

Much like 2aebe0b628. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ws2_32/tests/sock.c | 39 +++++++++++++++++++++------------------ 1 file changed, 21 insertions(+), 18 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 0b10b1bdb37..e8aea522185 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -3610,28 +3610,31 @@ static void test_select(void) ok(FD_ISSET(fdWrite, &readfds), "fdWrite socket is not in the set\n"); ret = recv(fdWrite, tmp_buf, sizeof(tmp_buf), 0); ok(ret == 0, "expected 0, got %d\n", ret); - - /* When a connection is attempted to a non-listening socket it will get to the except descriptor */ ret = closesocket(fdWrite); ok(ret == 0, "expected 0, got %d\n", ret); ret = closesocket(fdListen); ok(ret == 0, "expected 0, got %d\n", ret); - len = sizeof(address); - fdWrite = setup_connector_socket(&address, len, TRUE); - FD_ZERO_ALL(); - FD_SET(fdWrite, &writefds); - FD_SET(fdWrite, &exceptfds); - select_timeout.tv_sec = 2; /* requires more time to realize it will not connect */ - ret = select(0, &readfds, &writefds, &exceptfds, &select_timeout); - ok(ret == 1, "expected 1, got %d\n", ret); - len = sizeof(id); - id = 0xdeadbeef; - ret = getsockopt(fdWrite, SOL_SOCKET, SO_ERROR, (char*)&id, &len); - ok(!ret, "getsockopt failed with %d\n", WSAGetLastError()); - ok(id == WSAECONNREFUSED, "expected 10061, got %d\n", id); - ok(FD_ISSET(fdWrite, &exceptfds), "fdWrite socket is not in the set\n"); - ok(select_timeout.tv_usec == 250000, "select timeout should not have changed\n"); - closesocket(fdWrite); + + /* w10pro64 sometimes takes over 2 seconds for an error to be reported. */ + if (winetest_interactive) + { + len = sizeof(address); + fdWrite = setup_connector_socket(&address, len, TRUE); + FD_ZERO_ALL(); + FD_SET(fdWrite, &writefds); + FD_SET(fdWrite, &exceptfds); + select_timeout.tv_sec = 10; + ret = select(0, &readfds, &writefds, &exceptfds, &select_timeout); + ok(ret == 1, "expected 1, got %d\n", ret); + len = sizeof(id); + id = 0xdeadbeef; + ret = getsockopt(fdWrite, SOL_SOCKET, SO_ERROR, (char*)&id, &len); + ok(!ret, "getsockopt failed with %d\n", WSAGetLastError()); + ok(id == WSAECONNREFUSED, "expected 10061, got %d\n", id); + ok(FD_ISSET(fdWrite, &exceptfds), "fdWrite socket is not in the set\n"); + ok(select_timeout.tv_usec == 250000, "select timeout should not have changed\n"); + closesocket(fdWrite); + } /* Try select() on a closed socket after connection */ tcp_socketpair(&fdRead, &fdWrite); -- 2.28.0

2 1

[PATCH 2/4] ntdll: Stub NtAllocateVirtualMemoryEx.
by Myah Caron 17 Oct '20

17 Oct '20

Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> --- This patchset doesn't yet fix anything as far as I know, I only encountered it while debugging a program that crashed soon after initializing mimalloc. While it didn't fix the program in question, I thought I might as well send it in. Considering the apparent trend of games requiring newer Windows APIs without supporting fallbacks, it may be rendered useful soon... dlls/ntdll/ntdll.spec | 2 ++ dlls/ntdll/tests/virtual.c | 21 +++++++++++++++++++++ dlls/ntdll/unix/virtual.c | 15 +++++++++++++++ include/winternl.h | 1 + 4 files changed, 39 insertions(+) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index ca427c46c04..dbd2eab1fa1 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -141,6 +141,7 @@ # @ stub NtAllocateUserPhysicalPages @ stdcall -syscall NtAllocateUuids(ptr ptr ptr ptr) @ stdcall -syscall NtAllocateVirtualMemory(long ptr long ptr long long) +@ stdcall -syscall NtAllocateVirtualMemoryEx(long ptr ptr long long ptr long) @ stdcall -syscall NtAreMappedFilesTheSame(ptr ptr) @ stdcall -syscall NtAssignProcessToJobObject(long long) @ stub NtCallbackReturn @@ -1146,6 +1147,7 @@ # @ stub ZwAllocateUserPhysicalPages @ stdcall -private -syscall ZwAllocateUuids(ptr ptr ptr ptr) NtAllocateUuids @ stdcall -private -syscall ZwAllocateVirtualMemory(long ptr long ptr long long) NtAllocateVirtualMemory +@ stdcall -private -syscall ZwAllocateVirtualMemoryEx(long ptr ptr long long ptr long) NtAllocateVirtualMemoryEx @ stdcall -private -syscall ZwAreMappedFilesTheSame(ptr ptr) NtAreMappedFilesTheSame @ stdcall -private -syscall ZwAssignProcessToJobObject(long long) NtAssignProcessToJobObject @ stub ZwCallbackReturn diff --git a/dlls/ntdll/tests/virtual.c b/dlls/ntdll/tests/virtual.c index 7049f234a9f..9c2cf824018 100644 --- a/dlls/ntdll/tests/virtual.c +++ b/dlls/ntdll/tests/virtual.c @@ -34,6 +34,8 @@ static NTSTATUS (WINAPI *pRtlCreateUserStack)(SIZE_T, SIZE_T, ULONG, SIZE_T, SIZ static ULONG64 (WINAPI *pRtlGetEnabledExtendedFeatures)(ULONG64); static NTSTATUS (WINAPI *pRtlFreeUserStack)(void *); static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL); +static NTSTATUS (WINAPI *pNtAllocateVirtualMemoryEx)(HANDLE, PVOID *, SIZE_T *, ULONG, ULONG, + MEM_EXTENDED_PARAMETER *, ULONG); static const BOOL is_win64 = sizeof(void*) != sizeof(int); static SYSTEM_BASIC_INFORMATION sbi; @@ -215,6 +217,24 @@ static void test_NtAllocateVirtualMemory(void) size = 0; status = NtFreeVirtualMemory(NtCurrentProcess(), &addr1, &size, MEM_RELEASE); ok(status == STATUS_SUCCESS, "NtFreeVirtualMemory failed\n"); + + if (!pNtAllocateVirtualMemoryEx) + { + win_skip("NtAllocateVirtualMemoryEx() is missing\n"); + return; + } + + /* simple allocation should succeed */ + size = 0x1000; + addr1 = NULL; + status = pNtAllocateVirtualMemoryEx(NtCurrentProcess(), &addr1, &size, MEM_RESERVE | MEM_COMMIT, + PAGE_EXECUTE_READWRITE, NULL, 0); + ok(status == STATUS_SUCCESS, "NtAllocateVirtualMemoryEx returned %08x\n", status); + + /* specifying a count of >0 with NULL parameters should fail */ + status = pNtAllocateVirtualMemoryEx(NtCurrentProcess(), &addr1, &size, MEM_RESERVE | MEM_COMMIT, + PAGE_EXECUTE_READWRITE, NULL, 1); + ok(status == STATUS_INVALID_PARAMETER, "NtAllocateVirtualMemoryEx returned %08x\n", status); } static void test_RtlCreateUserStack(void) @@ -648,6 +668,7 @@ START_TEST(virtual) pRtlCreateUserStack = (void *)GetProcAddress(mod, "RtlCreateUserStack"); pRtlFreeUserStack = (void *)GetProcAddress(mod, "RtlFreeUserStack"); pRtlGetEnabledExtendedFeatures = (void *)GetProcAddress(mod, "RtlGetEnabledExtendedFeatures"); + pNtAllocateVirtualMemoryEx = (void *)GetProcAddress(mod, "NtAllocateVirtualMemoryEx"); NtQuerySystemInformation(SystemBasicInformation, &sbi, sizeof(sbi), NULL); trace("system page size %#x\n", sbi.PageSize); diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index d79e3de662e..614159b7d90 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -3452,6 +3452,21 @@ NTSTATUS WINAPI NtAllocateVirtualMemory( HANDLE process, PVOID *ret, ULONG_PTR z return status; } +/*********************************************************************** + * NtAllocateVirtualMemoryEx (NTDLL.@) + * ZwAllocateVirtualMemoryEx (NTDLL.@) + */ +NTSTATUS WINAPI NtAllocateVirtualMemoryEx( HANDLE process, PVOID *ret, SIZE_T *size_ptr, ULONG type, + ULONG protect, MEM_EXTENDED_PARAMETER *parameters, + ULONG count ) +{ + if (count && !parameters) return STATUS_INVALID_PARAMETER; + + if (count) FIXME( "Ignoring %d extended parameters %p\n", count, parameters ); + + return NtAllocateVirtualMemory( process, ret, 0, size_ptr, type, protect ); +} + /*********************************************************************** * NtFreeVirtualMemory (NTDLL.@) diff --git a/include/winternl.h b/include/winternl.h index 89ea58c2d93..fbce63655ba 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -3020,6 +3020,7 @@ NTSYSAPI NTSTATUS WINAPI NtAlertThread(HANDLE ThreadHandle); NTSYSAPI NTSTATUS WINAPI NtAllocateLocallyUniqueId(PLUID lpLuid); NTSYSAPI NTSTATUS WINAPI NtAllocateUuids(PULARGE_INTEGER,PULONG,PULONG,PUCHAR); NTSYSAPI NTSTATUS WINAPI NtAllocateVirtualMemory(HANDLE,PVOID*,ULONG_PTR,SIZE_T*,ULONG,ULONG); +NTSYSAPI NTSTATUS WINAPI NtAllocateVirtualMemoryEx(HANDLE,PVOID*,SIZE_T*,ULONG,ULONG,MEM_EXTENDED_PARAMETER*,ULONG); NTSYSAPI NTSTATUS WINAPI NtAreMappedFilesTheSame(PVOID,PVOID); NTSYSAPI NTSTATUS WINAPI NtAssignProcessToJobObject(HANDLE,HANDLE); NTSYSAPI NTSTATUS WINAPI NtCallbackReturn(PVOID,ULONG,NTSTATUS); -- 2.28.0

2 1

[PATCH 4/4] kernelbase: Use VirtualAlloc2 in VirtualAllocEx.
by Myah Caron 17 Oct '20

17 Oct '20

Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> --- I have no proof that this is what happens under Windows, this is only a guess based on the way most calls appear to be implemented (for example, USVFS needing to hook NtQueryDirectoryFileEx for newer Windows 10 versions, as NtQueryDirectoryFile was no longer being called once the new call was introduced). Feel free to disregard this patch. I'm also guessing VirtualAllocExNuma would likely call VirtualAlloc2 with MemExtendedParameterNumaNode, but since it's not yet implemented there's probably no need to do this for the moment. dlls/kernelbase/memory.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/kernelbase/memory.c b/dlls/kernelbase/memory.c index c3adf2217af..e4adce19b55 100644 --- a/dlls/kernelbase/memory.c +++ b/dlls/kernelbase/memory.c @@ -292,10 +292,7 @@ LPVOID WINAPI DECLSPEC_HOTPATCH VirtualAlloc( void *addr, SIZE_T size, DWORD typ LPVOID WINAPI DECLSPEC_HOTPATCH VirtualAllocEx( HANDLE process, void *addr, SIZE_T size, DWORD type, DWORD protect ) { - LPVOID ret = addr; - - if (!set_ntstatus( NtAllocateVirtualMemory( process, &ret, 0, &size, type, protect ))) return NULL; - return ret; + return VirtualAlloc2( process, addr, size, type, protect, NULL, 0 ); } -- 2.28.0

1 0

[PATCH 3/4] kernelbase: Implement VirtualAlloc2.
by Myah Caron 17 Oct '20

17 Oct '20

Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> --- dlls/kernelbase/kernelbase.spec | 1 + dlls/kernelbase/memory.c | 15 +++++++++++++++ include/winbase.h | 1 + 3 files changed, 17 insertions(+) diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 9c7babde7fd..16c51a15f1d 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1675,6 +1675,7 @@ @ stdcall VirtualAlloc(ptr long long long) @ stdcall VirtualAllocEx(long ptr long long long) @ stdcall VirtualAllocExNuma(long ptr long long long long) +@ stdcall VirtualAlloc2(long ptr long long long ptr long) # @ stub VirtualAllocFromApp @ stdcall VirtualFree(ptr long long) @ stdcall VirtualFreeEx(long ptr long long) diff --git a/dlls/kernelbase/memory.c b/dlls/kernelbase/memory.c index 4ead38f2bc0..c3adf2217af 100644 --- a/dlls/kernelbase/memory.c +++ b/dlls/kernelbase/memory.c @@ -299,6 +299,21 @@ LPVOID WINAPI DECLSPEC_HOTPATCH VirtualAllocEx( HANDLE process, void *addr, SIZE } +/*********************************************************************** + * VirtualAlloc2 (kernelbase.@) + */ +LPVOID WINAPI DECLSPEC_HOTPATCH VirtualAlloc2( HANDLE process, void *addr, SIZE_T size, + DWORD type, DWORD protect, + MEM_EXTENDED_PARAMETER* parameters, ULONG count ) +{ + LPVOID ret = addr; + + if (!set_ntstatus( NtAllocateVirtualMemoryEx( process, &ret, &size, type, protect, parameters, count ))) + return NULL; + return ret; +} + + /*********************************************************************** * VirtualFree (kernelbase.@) */ diff --git a/include/winbase.h b/include/winbase.h index f1c3198c21a..6bf632387a8 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2746,6 +2746,7 @@ WINBASEAPI BOOL WINAPI VerifyVersionInfoW(LPOSVERSIONINFOEXW,DWORD,DWORDL WINBASEAPI LPVOID WINAPI VirtualAlloc(LPVOID,SIZE_T,DWORD,DWORD); WINBASEAPI LPVOID WINAPI VirtualAllocEx(HANDLE,LPVOID,SIZE_T,DWORD,DWORD); WINBASEAPI LPVOID WINAPI VirtualAllocExNuma(HANDLE,void*,SIZE_T,DWORD,DWORD,DWORD); +WINBASEAPI LPVOID WINAPI VirtualAlloc2(HANDLE,LPVOID,SIZE_T,DWORD,DWORD,MEM_EXTENDED_PARAMETER*,ULONG); WINBASEAPI BOOL WINAPI VirtualFree(LPVOID,SIZE_T,DWORD); WINBASEAPI BOOL WINAPI VirtualFreeEx(HANDLE,LPVOID,SIZE_T,DWORD); WINBASEAPI BOOL WINAPI VirtualLock(LPVOID,SIZE_T); -- 2.28.0

1 0

[PATCH 1/4] include: Introduce MEM_EXTENDED_PARAMETER.
by Myah Caron 17 Oct '20

17 Oct '20

Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> --- include/winnt.h | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/include/winnt.h b/include/winnt.h index 10b3253923b..662db7e58cb 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -736,6 +736,35 @@ typedef struct _MEMORY_BASIC_INFORMATION DWORD Type; } MEMORY_BASIC_INFORMATION, *PMEMORY_BASIC_INFORMATION; +#define MEM_EXTENDED_PARAMETER_TYPE_BITS 8 + +typedef enum MEM_EXTENDED_PARAMETER_TYPE { + MemExtendedParameterInvalidType = 0, + MemExtendedParameterAddressRequirements, + MemExtendedParameterNumaNode, + MemExtendedParameterPartitionHandle, + MemExtendedParameterUserPhysicalHandle, + MemExtendedParameterAttributeFlags, + MemExtendedParameterMax +} MEM_EXTENDED_PARAMETER_TYPE, *PMEM_EXTENDED_PARAMETER_TYPE; + +typedef struct MEM_EXTENDED_PARAMETER { + struct + { + DWORD64 Type : MEM_EXTENDED_PARAMETER_TYPE_BITS; + DWORD64 Reserved : 64 - MEM_EXTENDED_PARAMETER_TYPE_BITS; + } DUMMYSTRUCTNAME; + + union + { + DWORD64 ULong64; + PVOID Pointer; + SIZE_T Size; + HANDLE Handle; + DWORD ULong; + } DUMMYUNIONNAME; +} MEM_EXTENDED_PARAMETER, *PMEM_EXTENDED_PARAMETER; + #define PAGE_NOACCESS 0x01 #define PAGE_READONLY 0x02 #define PAGE_READWRITE 0x04 -- 2.28.0

1 0

[PATCH v2 1/5] ws2_32/tests: Rewrite the CF_DEFER test in test_AcceptEx().
by Zebediah Figura 16 Oct '20

16 Oct '20

The previous test in fact regularly failed on Windows, hidden by the presence of broken(), since both sockets could be connected before the listener was signaled. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ws2_32/tests/sock.c | 92 +++++++++++++++------------------------- 1 file changed, 34 insertions(+), 58 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index ba03e16ebb1..834cca71960 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -7413,18 +7413,14 @@ static void test_ConnectEx(void) static void test_AcceptEx(void) { - SOCKET listener = INVALID_SOCKET; - SOCKET acceptor = INVALID_SOCKET; - SOCKET connector = INVALID_SOCKET; - SOCKET connector2 = INVALID_SOCKET; + SOCKET listener, acceptor, acceptor2, connector, connector2; struct sockaddr_in bindAddress, peerAddress, *readBindAddress, *readRemoteAddress; int socklen, optlen; GUID acceptExGuid = WSAID_ACCEPTEX, getAcceptExGuid = WSAID_GETACCEPTEXSOCKADDRS; LPFN_ACCEPTEX pAcceptEx = NULL; LPFN_GETACCEPTEXSOCKADDRS pGetAcceptExSockaddrs = NULL; fd_set fds_accept, fds_send; - struct timeval timeout = {0,10}; /* wait for 10 milliseconds */ - int got, conn1, i; + static const struct timeval timeout = {1, 0}; DWORD bytesReturned, connect_time; char buffer[1024], ipbuffer[32]; OVERLAPPED overlapped; @@ -7703,66 +7699,47 @@ todo_wine iret = connect(connector, (struct sockaddr*)&bindAddress, sizeof(bindAddress)); ok(iret == SOCKET_ERROR && WSAGetLastError() == WSAEWOULDBLOCK, "connecting to accepting socket failed, error %d\n", WSAGetLastError()); - FD_ZERO ( &fds_accept ); - FD_ZERO ( &fds_send ); + buffer[0] = '0'; - FD_SET ( listener, &fds_accept ); - FD_SET ( connector, &fds_send ); + FD_ZERO(&fds_accept); + FD_SET(listener, &fds_accept); + iret = select(0, &fds_accept, NULL, NULL, &timeout); + ok(iret == 1, "wait timed out\n"); - buffer[0] = '0'; - got = 0; - conn1 = 0; + acceptor2 = WSAAccept(listener, NULL, NULL, AlwaysDeferConditionFunc, 0); + ok(acceptor2 == INVALID_SOCKET, "expected failure\n"); + ok(WSAGetLastError() == WSATRY_AGAIN, "got error %u\n", WSAGetLastError()); + bret = pAcceptEx(listener, acceptor, buffer, 0, sizeof(struct sockaddr_in) + 16, + sizeof(struct sockaddr_in) + 16, &bytesReturned, &overlapped); + ok(!bret, "expected failure\n"); + ok(WSAGetLastError() == ERROR_IO_PENDING, "got error %u\n", WSAGetLastError()); - for (i = 0; i < 4000; ++i) - { - fd_set fds_openaccept = fds_accept, fds_opensend = fds_send; + FD_ZERO(&fds_send); + FD_SET(connector, &fds_send); + iret = select(0, NULL, &fds_send, NULL, &timeout); + ok(iret == 1, "wait timed out\n"); - wsa_ok ( ( select ( 0, &fds_openaccept, &fds_opensend, NULL, &timeout ) ), SOCKET_ERROR !=, - "acceptex test(%d): could not select on socket, errno %d\n" ); + iret = send(connector, "1", 1, 0); + ok(iret == 1, "got ret %d, error %u\n", iret, WSAGetLastError()); - /* check for incoming requests */ - if ( FD_ISSET ( listener, &fds_openaccept ) ) { - got++; - if (got == 1) { - SOCKET tmp = WSAAccept(listener, NULL, NULL, (LPCONDITIONPROC) AlwaysDeferConditionFunc, 0); - ok(tmp == INVALID_SOCKET && WSAGetLastError() == WSATRY_AGAIN, "Failed to defer connection, %d\n", WSAGetLastError()); - bret = pAcceptEx(listener, acceptor, buffer, 0, - sizeof(struct sockaddr_in) + 16, sizeof(struct sockaddr_in) + 16, - &bytesReturned, &overlapped); - ok(bret == FALSE && WSAGetLastError() == ERROR_IO_PENDING, "AcceptEx returned %d + errno %d\n", bret, WSAGetLastError()); - } - else if (got == 2) { - /* this should be socket #2 */ - SOCKET tmp = accept(listener, NULL, NULL); - ok(tmp != INVALID_SOCKET, "accept failed %d\n", WSAGetLastError()); - closesocket(tmp); - } - else { - ok(FALSE, "Got more than 2 connections?\n"); - } - } - if ( conn1 && FD_ISSET ( connector2, &fds_opensend ) ) { - /* Send data on second socket, and stop */ - send(connector2, "2", 1, 0); - FD_CLR ( connector2, &fds_send ); + iret = connect(connector2, (struct sockaddr *)&bindAddress, sizeof(bindAddress)); + ok(iret == SOCKET_ERROR, "expected failure\n"); + ok(WSAGetLastError() == WSAEWOULDBLOCK, "got error %u\n", WSAGetLastError()); - break; - } - if ( FD_ISSET ( connector, &fds_opensend ) ) { - /* Once #1 is connected, allow #2 to connect */ - conn1 = 1; + iret = select(0, &fds_accept, NULL, NULL, &timeout); + ok(iret == 1, "wait timed out\n"); - send(connector, "1", 1, 0); - FD_CLR ( connector, &fds_send ); + acceptor2 = accept(listener, NULL, NULL); + ok(acceptor2 != INVALID_SOCKET, "failed to accept, error %u\n", WSAGetLastError()); + closesocket(acceptor2); - iret = connect(connector2, (struct sockaddr*)&bindAddress, sizeof(bindAddress)); - ok(iret == SOCKET_ERROR && WSAGetLastError() == WSAEWOULDBLOCK, "connecting to accepting socket failed, error %d\n", WSAGetLastError()); - FD_SET ( connector2, &fds_send ); - } - } + FD_ZERO(&fds_send); + FD_SET(connector2, &fds_send); + iret = select(0, NULL, &fds_send, NULL, &timeout); + ok(iret == 1, "wait timed out\n"); - ok (got == 2 || broken(got == 1) /* NT4 */, - "Did not get both connections, got %d\n", got); + iret = send(connector2, "2", 1, 0); + ok(iret == 1, "got ret %d, error %u\n", iret, WSAGetLastError()); dwret = WaitForSingleObject(overlapped.hEvent, 0); ok(dwret == WAIT_OBJECT_0, "Waiting for accept event failed with %d + errno %d\n", dwret, GetLastError()); @@ -7774,7 +7751,6 @@ todo_wine set_blocking(acceptor, TRUE); iret = recv( acceptor, buffer, 2, 0); ok(iret == 1, "Failed to get data, %d, errno: %d\n", iret, WSAGetLastError()); - ok(buffer[0] == '1', "The wrong first client was accepted by acceptex: %c != 1\n", buffer[0]); closesocket(connector); -- 2.28.0

2 8

[PATCH 1/4] ws2_32/tests: Rewrite the CF_DEFER test in test_AcceptEx().
by Zebediah Figura 16 Oct '20

16 Oct '20

The previous test in fact regularly failed on Windows, hidden by the presence of broken(), since both sockets could be connected before the listener was signaled. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ws2_32/tests/sock.c | 92 +++++++++++++++------------------------- 1 file changed, 34 insertions(+), 58 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index ba03e16ebb1..834cca71960 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -7413,18 +7413,14 @@ static void test_ConnectEx(void) static void test_AcceptEx(void) { - SOCKET listener = INVALID_SOCKET; - SOCKET acceptor = INVALID_SOCKET; - SOCKET connector = INVALID_SOCKET; - SOCKET connector2 = INVALID_SOCKET; + SOCKET listener, acceptor, acceptor2, connector, connector2; struct sockaddr_in bindAddress, peerAddress, *readBindAddress, *readRemoteAddress; int socklen, optlen; GUID acceptExGuid = WSAID_ACCEPTEX, getAcceptExGuid = WSAID_GETACCEPTEXSOCKADDRS; LPFN_ACCEPTEX pAcceptEx = NULL; LPFN_GETACCEPTEXSOCKADDRS pGetAcceptExSockaddrs = NULL; fd_set fds_accept, fds_send; - struct timeval timeout = {0,10}; /* wait for 10 milliseconds */ - int got, conn1, i; + static const struct timeval timeout = {1, 0}; DWORD bytesReturned, connect_time; char buffer[1024], ipbuffer[32]; OVERLAPPED overlapped; @@ -7703,66 +7699,47 @@ todo_wine iret = connect(connector, (struct sockaddr*)&bindAddress, sizeof(bindAddress)); ok(iret == SOCKET_ERROR && WSAGetLastError() == WSAEWOULDBLOCK, "connecting to accepting socket failed, error %d\n", WSAGetLastError()); - FD_ZERO ( &fds_accept ); - FD_ZERO ( &fds_send ); + buffer[0] = '0'; - FD_SET ( listener, &fds_accept ); - FD_SET ( connector, &fds_send ); + FD_ZERO(&fds_accept); + FD_SET(listener, &fds_accept); + iret = select(0, &fds_accept, NULL, NULL, &timeout); + ok(iret == 1, "wait timed out\n"); - buffer[0] = '0'; - got = 0; - conn1 = 0; + acceptor2 = WSAAccept(listener, NULL, NULL, AlwaysDeferConditionFunc, 0); + ok(acceptor2 == INVALID_SOCKET, "expected failure\n"); + ok(WSAGetLastError() == WSATRY_AGAIN, "got error %u\n", WSAGetLastError()); + bret = pAcceptEx(listener, acceptor, buffer, 0, sizeof(struct sockaddr_in) + 16, + sizeof(struct sockaddr_in) + 16, &bytesReturned, &overlapped); + ok(!bret, "expected failure\n"); + ok(WSAGetLastError() == ERROR_IO_PENDING, "got error %u\n", WSAGetLastError()); - for (i = 0; i < 4000; ++i) - { - fd_set fds_openaccept = fds_accept, fds_opensend = fds_send; + FD_ZERO(&fds_send); + FD_SET(connector, &fds_send); + iret = select(0, NULL, &fds_send, NULL, &timeout); + ok(iret == 1, "wait timed out\n"); - wsa_ok ( ( select ( 0, &fds_openaccept, &fds_opensend, NULL, &timeout ) ), SOCKET_ERROR !=, - "acceptex test(%d): could not select on socket, errno %d\n" ); + iret = send(connector, "1", 1, 0); + ok(iret == 1, "got ret %d, error %u\n", iret, WSAGetLastError()); - /* check for incoming requests */ - if ( FD_ISSET ( listener, &fds_openaccept ) ) { - got++; - if (got == 1) { - SOCKET tmp = WSAAccept(listener, NULL, NULL, (LPCONDITIONPROC) AlwaysDeferConditionFunc, 0); - ok(tmp == INVALID_SOCKET && WSAGetLastError() == WSATRY_AGAIN, "Failed to defer connection, %d\n", WSAGetLastError()); - bret = pAcceptEx(listener, acceptor, buffer, 0, - sizeof(struct sockaddr_in) + 16, sizeof(struct sockaddr_in) + 16, - &bytesReturned, &overlapped); - ok(bret == FALSE && WSAGetLastError() == ERROR_IO_PENDING, "AcceptEx returned %d + errno %d\n", bret, WSAGetLastError()); - } - else if (got == 2) { - /* this should be socket #2 */ - SOCKET tmp = accept(listener, NULL, NULL); - ok(tmp != INVALID_SOCKET, "accept failed %d\n", WSAGetLastError()); - closesocket(tmp); - } - else { - ok(FALSE, "Got more than 2 connections?\n"); - } - } - if ( conn1 && FD_ISSET ( connector2, &fds_opensend ) ) { - /* Send data on second socket, and stop */ - send(connector2, "2", 1, 0); - FD_CLR ( connector2, &fds_send ); + iret = connect(connector2, (struct sockaddr *)&bindAddress, sizeof(bindAddress)); + ok(iret == SOCKET_ERROR, "expected failure\n"); + ok(WSAGetLastError() == WSAEWOULDBLOCK, "got error %u\n", WSAGetLastError()); - break; - } - if ( FD_ISSET ( connector, &fds_opensend ) ) { - /* Once #1 is connected, allow #2 to connect */ - conn1 = 1; + iret = select(0, &fds_accept, NULL, NULL, &timeout); + ok(iret == 1, "wait timed out\n"); - send(connector, "1", 1, 0); - FD_CLR ( connector, &fds_send ); + acceptor2 = accept(listener, NULL, NULL); + ok(acceptor2 != INVALID_SOCKET, "failed to accept, error %u\n", WSAGetLastError()); + closesocket(acceptor2); - iret = connect(connector2, (struct sockaddr*)&bindAddress, sizeof(bindAddress)); - ok(iret == SOCKET_ERROR && WSAGetLastError() == WSAEWOULDBLOCK, "connecting to accepting socket failed, error %d\n", WSAGetLastError()); - FD_SET ( connector2, &fds_send ); - } - } + FD_ZERO(&fds_send); + FD_SET(connector2, &fds_send); + iret = select(0, NULL, &fds_send, NULL, &timeout); + ok(iret == 1, "wait timed out\n"); - ok (got == 2 || broken(got == 1) /* NT4 */, - "Did not get both connections, got %d\n", got); + iret = send(connector2, "2", 1, 0); + ok(iret == 1, "got ret %d, error %u\n", iret, WSAGetLastError()); dwret = WaitForSingleObject(overlapped.hEvent, 0); ok(dwret == WAIT_OBJECT_0, "Waiting for accept event failed with %d + errno %d\n", dwret, GetLastError()); @@ -7774,7 +7751,6 @@ todo_wine set_blocking(acceptor, TRUE); iret = recv( acceptor, buffer, 2, 0); ok(iret == 1, "Failed to get data, %d, errno: %d\n", iret, WSAGetLastError()); - ok(buffer[0] == '1', "The wrong first client was accepted by acceptex: %c != 1\n", buffer[0]); closesocket(connector); -- 2.28.0

2 6

[PATCH] include: add DWRITE_MAKE_FONT_AXIS_TAG macro to dwrite_3.idl
by me＠snkth.com 16 Oct '20

16 Oct '20

Hi, I have attached the patch as a txt file. This is my first time submitting a patch, I think I followed the instructions here (https://wiki.winehq.org/Submitting_Patches) correctly but I might have gotten things wrong, please lemme know here or on #winehackers (I am @sanketh). Thank you. Best, Sanketh

2 2

[PATCH] qmgr/tests: Test registering an IBackgroundCopyCallback2
by Aaron Hill 16 Oct '20

16 Oct '20

Test that we can register an IBackgroundCopyCallback2 with a job successfully. This does not test that any of the callback functions in the IBackgroundCopyCallback2 are actually called. Accordings to the BITS docs, these functions are called on separate threads on Windows, so a any test will need to take this into account to avoid spurious failures. Signed-off-by: Aaron Hill <aa1ronham(a)gmail.com> --- dlls/qmgr/tests/Makefile.in | 2 +- dlls/qmgr/tests/job.c | 137 ++++++++++++++++++++++++++++++++++++ 2 files changed, 138 insertions(+), 1 deletion(-) diff --git a/dlls/qmgr/tests/Makefile.in b/dlls/qmgr/tests/Makefile.in index 6482d4d9b7a..2bf92a94019 100644 --- a/dlls/qmgr/tests/Makefile.in +++ b/dlls/qmgr/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = qmgr.dll -IMPORTS = ole32 shlwapi user32 +IMPORTS = uuid ole32 shlwapi user32 C_SRCS = \ enum_files.c \ diff --git a/dlls/qmgr/tests/job.c b/dlls/qmgr/tests/job.c index 53b724eadbf..d4e256b4469 100644 --- a/dlls/qmgr/tests/job.c +++ b/dlls/qmgr/tests/job.c @@ -38,6 +38,123 @@ static IBackgroundCopyJob *test_job; static GUID test_jobId; static BG_JOB_TYPE test_type; +typedef struct IBackgroundCopyCallback2Impl { + IBackgroundCopyCallback2 IBackgroundCopyCallback2_iface; + LONG ref; +} IBackgroundCopyCallback2Impl; + +static inline IBackgroundCopyCallback2Impl *impl_from_IBackgroundCopyCallback2(IBackgroundCopyCallback2 *iface) +{ + return CONTAINING_RECORD(iface, IBackgroundCopyCallback2Impl, IBackgroundCopyCallback2_iface); +} + +static HRESULT WINAPI IBackgroundCopyCallback2Impl_QueryInterface(IBackgroundCopyCallback2 *iface, REFIID riid, void **ppv) +{ + IBackgroundCopyCallback2Impl *This = impl_from_IBackgroundCopyCallback2(iface); + + if (!ppv) + { + return E_INVALIDARG; + } + + *ppv = NULL; + + if (IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_IBackgroundCopyCallback) || + IsEqualIID(riid, &IID_IBackgroundCopyCallback2)) + { + *ppv = &This->IBackgroundCopyCallback2_iface; + } + else + { + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI IBackgroundCopyCallback2Impl_AddRef(IBackgroundCopyCallback2 *iface) +{ + IBackgroundCopyCallback2Impl *This = impl_from_IBackgroundCopyCallback2(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + trace("IBackgroundCopyCallback2Impl_AddRef called (%p, ref = %d)\n", This, ref); + return ref; +} + +static ULONG WINAPI IBackgroundCopyCallback2Impl_Release(IBackgroundCopyCallback2 *iface) +{ + IBackgroundCopyCallback2Impl *This = impl_from_IBackgroundCopyCallback2(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + trace("IBackgroundCopyCallback2Impl_Release called (%p, ref = %d)\n", This, ref); + + if (ref == 0) + { + HeapFree(GetProcessHeap(), 0, This); + } + + return ref; +} + +static HRESULT WINAPI IBackgroundCopyCallback2Impl_JobError(IBackgroundCopyCallback2 *iface, IBackgroundCopyJob *pJob, IBackgroundCopyError *pError) +{ + trace("IBackgroundCopyCallback2Impl_JobError called (%p, %p, %p)\n", iface, pJob, pError); + return S_OK; +} + +static HRESULT WINAPI IBackgroundCopyCallback2Impl_JobModification(IBackgroundCopyCallback2 *iface, IBackgroundCopyJob *pJob, DWORD dwReserved) +{ + trace("IBackgroundCopyCallback2Impl_JobModification called (%p, %p)\n", iface, pJob); + return S_OK; +} + +static HRESULT WINAPI IBackgroundCopyCallback2Impl_JobTransferred(IBackgroundCopyCallback2 *iface, IBackgroundCopyJob *pJob) +{ + trace("IBackgroundCopyCallback2Impl_JobTransferred called (%p, %p)\n", iface, pJob); + return S_OK; +} + +static HRESULT WINAPI IBackgroundCopyCallback2Impl_FileTransferred(IBackgroundCopyCallback2 *iface, IBackgroundCopyJob *pJob, IBackgroundCopyFile *pFile) +{ + trace("IBackgroundCopyCallback2Impl_FileTransferred called (%p, %p, %p)\n", iface, pJob, pFile); + return S_OK; +} + + +static const IBackgroundCopyCallback2Vtbl copyCallback_vtbl = +{ + IBackgroundCopyCallback2Impl_QueryInterface, + IBackgroundCopyCallback2Impl_AddRef, + IBackgroundCopyCallback2Impl_Release, + IBackgroundCopyCallback2Impl_JobTransferred, + IBackgroundCopyCallback2Impl_JobError, + IBackgroundCopyCallback2Impl_JobModification, + IBackgroundCopyCallback2Impl_FileTransferred +}; + +static BOOL create_background_copy_callback2(IBackgroundCopyCallback2 **copyCallback) +{ + IBackgroundCopyCallback2Impl *obj; + *copyCallback = NULL; + + obj = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*obj)); + + if (!obj) + { + trace("Out of memory creating IBackgroundCopyCallback2\n"); + return FALSE; + } + + obj->IBackgroundCopyCallback2_iface.lpVtbl = &copyCallback_vtbl; + obj->ref = 1; + + *copyCallback = &obj->IBackgroundCopyCallback2_iface; + + return TRUE; +} + static HRESULT test_create_manager(void) { HRESULT hres; @@ -512,6 +629,20 @@ static void test_HttpOptions(void) unsigned int i; WCHAR *headers; ULONG flags, orig_flags; + IBackgroundCopyCallback2 *copyCallback; + IUnknown *copyCallbackUnknown; + + ok(create_background_copy_callback2(&copyCallback) == TRUE, "create_background_copy_callback2 failed\n"); + + hr = IBackgroundCopyCallback2_QueryInterface(copyCallback, &IID_IUnknown, (LPVOID*)&copyCallbackUnknown); + ok(hr == S_OK,"IBackgroundCopyCallback_QueryInterface(IID_IUnknown) failed: %08x\n", hr); + + hr = IBackgroundCopyJob_SetNotifyInterface(test_job, copyCallbackUnknown); + ok(hr == S_OK,"IBackgroundCopyCallback_SetNotifyInterface failed: %08x\n", hr); + + hr = IBackgroundCopyJob_SetNotifyFlags(test_job, BG_NOTIFY_JOB_TRANSFERRED | BG_NOTIFY_JOB_ERROR | BG_NOTIFY_DISABLE | BG_NOTIFY_JOB_MODIFICATION | BG_NOTIFY_FILE_TRANSFERRED); + ok(hr == S_OK,"IBackgroundCopyCallback_SetNotifyFlags failed: %08x\n", hr); + DeleteFileW(test_localPathA); hr = IBackgroundCopyJob_AddFile(test_job, L"http://test.winehq.org/", test_localPathA); @@ -619,6 +750,12 @@ static void test_HttpOptions(void) ok(hr == BG_E_INVALID_STATE, "got 0x%08x\n", hr); DeleteFileW(test_localPathA); + + hr = IBackgroundCopyJob_SetNotifyInterface(test_job, NULL); + ok(hr == BG_E_INVALID_STATE, "got 0x%08x\n", hr); + + IUnknown_Release(copyCallbackUnknown); + IBackgroundCopyCallback2_Release(copyCallback); } typedef void (*test_t)(void); -- 2.28.0

3 2