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

Francois Gouget : user32/tests: Fix the clipboard format id vs. atom table checks.
by Alexandre Julliard 21 May '21

21 May '21

Module: wine Branch: master Commit: cf85253a9c3db2816b3ae1fc2c7c18fc005ffbd6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cf85253a9c3db2816b3ae1fc… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri May 21 00:10:22 2021 +0200 user32/tests: Fix the clipboard format id vs. atom table checks. One cannot assume that a random integer has zero chance of being a valid atom. Reenable the GlobalFindAtomA() check in a todo_wine. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/clipboard.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index 2fceab6c0f6..d75e8fc3c32 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -391,29 +391,30 @@ static void test_RegisterClipboardFormatA(void) lstrcpyA(buf, "foo"); SetLastError(0xdeadbeef); len = GetAtomNameA((ATOM)format_id, buf, ARRAY_SIZE(buf)); - ok(len == 0, "GetAtomNameA should fail\n"); - ok(GetLastError() == ERROR_INVALID_HANDLE, "err %d\n", GetLastError()); + ok(len == 0 || lstrcmpA(buf, "my_cool_clipboard_format") != 0, + "format_id should not be a valid local atom\n"); + ok(len != 0 || GetLastError() == ERROR_INVALID_HANDLE, + "err %d\n", GetLastError()); -todo_wine -{ lstrcpyA(buf, "foo"); SetLastError(0xdeadbeef); len = GlobalGetAtomNameA((ATOM)format_id, buf, ARRAY_SIZE(buf)); - ok(len == 0, "GlobalGetAtomNameA should fail\n"); - ok(GetLastError() == ERROR_INVALID_HANDLE, "err %d\n", GetLastError()); -} + todo_wine ok(len == 0 || lstrcmpA(buf, "my_cool_clipboard_format") != 0, + "format_id should not be a valid global atom\n"); + ok(len != 0 || GetLastError() == ERROR_INVALID_HANDLE, + "err %d\n", GetLastError()); SetLastError(0xdeadbeef); atom_id = FindAtomA("my_cool_clipboard_format"); - ok(atom_id == 0, "FindAtomA should fail\n"); + ok(atom_id == 0, "FindAtomA should fail, but it returned %x (format_id=%x)\n", atom_id, format_id); ok(GetLastError() == ERROR_FILE_NOT_FOUND, "err %d\n", GetLastError()); - if (0) + todo_wine { /* this relies on the clipboard and global atom table being different */ SetLastError(0xdeadbeef); atom_id = GlobalFindAtomA("my_cool_clipboard_format"); - ok(atom_id == 0, "GlobalFindAtomA should fail\n"); + ok(atom_id == 0, "GlobalFindAtomA should fail, but it returned %x (format_id=%x)\n", atom_id, format_id); ok(GetLastError() == ERROR_FILE_NOT_FOUND, "err %d\n", GetLastError()); }

1 0

Francois Gouget : mstask/tests: Work around race conditions with the task scheduler process.
by Alexandre Julliard 21 May '21

21 May '21

Module: wine Branch: master Commit: 2e6ae164692072abd1f4dc156581dc760f0a8046 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2e6ae164692072abd1f4dc15… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri May 21 00:13:52 2021 +0200 mstask/tests: Work around race conditions with the task scheduler process. When a task is created the process scheduler locks and loads it. This can cause ITaskScheduler_Delete() to fail with a sharing violation if it is called at the wrong time. Just retry a bit later when that happens. This fixes failures mostly in Wine but also in Windows 10 from time to time in both task and task_scheduler. Signed-off-by: Francois Gouget <fgouget(a)icodeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mstask/tests/task.c | 7 +++++-- dlls/mstask/tests/task_scheduler.c | 31 ++++++++++++++++++++++++++----- 2 files changed, 31 insertions(+), 7 deletions(-) diff --git a/dlls/mstask/tests/task.c b/dlls/mstask/tests/task.c index a9957117e9b..0c7f85394ea 100644 --- a/dlls/mstask/tests/task.c +++ b/dlls/mstask/tests/task.c @@ -29,6 +29,9 @@ static ITaskScheduler *scheduler; static const WCHAR task_name[] = {'T','e','s','t','i','n','g',0}; static const WCHAR empty[] = {0}; +extern HRESULT taskscheduler_delete(ITaskScheduler*, const WCHAR*); + + static LPCWSTR path_resolve_name(LPCWSTR base_name) { static WCHAR buffer[MAX_PATH]; @@ -552,7 +555,7 @@ static void test_Run(void) HRESULT hr, status; /* cleanup after previous runs */ - ITaskScheduler_Delete(scheduler, wine_test_runW); + taskscheduler_delete(scheduler, wine_test_runW); hr = ITaskScheduler_NewWorkItem(scheduler, wine_test_runW, &CLSID_CTask, &IID_ITask, (IUnknown **)&task); @@ -679,7 +682,7 @@ static void test_Run(void) else ITask_Release(task); - hr = ITaskScheduler_Delete(scheduler, wine_test_runW); + hr = taskscheduler_delete(scheduler, wine_test_runW); ok(hr == S_OK, "got %#x\n", hr); } diff --git a/dlls/mstask/tests/task_scheduler.c b/dlls/mstask/tests/task_scheduler.c index 5abee75e23c..fafad585f53 100644 --- a/dlls/mstask/tests/task_scheduler.c +++ b/dlls/mstask/tests/task_scheduler.c @@ -31,6 +31,27 @@ static ITaskScheduler *test_task_scheduler; static const WCHAR does_not_existW[] = {'\\','\\','d','o','e','s','_','n','o','t','_','e','x','i','s','t',0}; + +HRESULT taskscheduler_delete(ITaskScheduler *scheduler, const WCHAR *name) +{ + HRESULT hr; + int i = 0; + + while (1) + { + hr = ITaskScheduler_Delete(scheduler, name); + if (hr != HRESULT_FROM_WIN32(ERROR_SHARING_VIOLATION)) break; + if (++i == 5) break; + + /* The task scheduler locked the file to load the task (see + * ITaskScheduler_Activate()). It should be done soon. + */ + trace("Got a sharing violation deleting %s, retrying...\n", wine_dbgstr_w(name)); + Sleep(100); + } + return hr; +} + static void test_NewWorkItem(void) { HRESULT hres; @@ -225,7 +246,7 @@ static void test_Enum(void) ok(hr == S_OK, "got %#x\n", hr); /* cleanup after previous runs */ - ITaskScheduler_Delete(scheduler, Task1); + taskscheduler_delete(scheduler, Task1); hr = ITaskScheduler_NewWorkItem(scheduler, Task1, &CLSID_CTask, &IID_ITask, (IUnknown **)&task); ok(hr == S_OK, "got %#x\n", hr); @@ -291,7 +312,7 @@ static void test_Enum(void) IEnumWorkItems_Release(tasks); - hr = ITaskScheduler_Delete(scheduler, Task1); + hr = taskscheduler_delete(scheduler, Task1); ok(hr == S_OK, "got %#x\n", hr); ITaskScheduler_Release(scheduler); @@ -494,11 +515,11 @@ static void test_task_storage(void) test_save_task_curfile(task); - hr = ITaskScheduler_Delete(scheduler, Task1); + hr = taskscheduler_delete(scheduler, Task1); ok(hr == S_OK, "got %#x\n", hr); - hr = ITaskScheduler_Delete(scheduler, Task2); + hr = taskscheduler_delete(scheduler, Task2); ok(hr == S_OK, "got %#x\n", hr); - hr = ITaskScheduler_Delete(scheduler, Task3); + hr = taskscheduler_delete(scheduler, Task3); ok(hr == S_OK, "got %#x\n", hr); ITask_Release(task);

1 0

Zebediah Figura : ws2_32/tests: Extend WSARecvMsg() tests a bit.
by Alexandre Julliard 21 May '21

21 May '21

Module: wine Branch: master Commit: 40e3e959fd9e438ea4634f79e3af9c3e0218e02d URL: https://source.winehq.org/git/wine.git/?a=commit;h=40e3e959fd9e438ea4634f79… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri May 21 00:17:57 2021 -0500 ws2_32/tests: Extend WSARecvMsg() tests a bit. 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 | 63 ++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 55 insertions(+), 8 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 8bec781ac6f..5cc0725752e 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1769,6 +1769,16 @@ static void test_so_reuseaddr(void) #define IP_PKTINFO_LEN (sizeof(WSACMSGHDR) + WSA_CMSG_ALIGN(sizeof(struct in_pktinfo))) +static unsigned int got_ip_pktinfo_apc; + +static void WINAPI ip_pktinfo_apc(DWORD error, DWORD size, OVERLAPPED *overlapped, DWORD flags) +{ + ok(error == WSAEMSGSIZE, "got error %u\n", error); + ok(size == 6, "got size %u\n", size); + ok(!flags, "got flags %#x\n", flags); + ++got_ip_pktinfo_apc; +} + static void test_ip_pktinfo(void) { ULONG addresses[2] = {inet_addr("127.0.0.1"), htonl(INADDR_ANY)}; @@ -1858,14 +1868,20 @@ static void test_ip_pktinfo(void) ok(rc == sizeof(msg), "sendto() failed error: %d\n", WSAGetLastError()); ok(GetLastError() == ERROR_SUCCESS, "Expected 0, got %d\n", GetLastError()); hdr.Control.len = 1; - rc=pWSARecvMsg(s1, &hdr, &dwSize, NULL, NULL); - err=WSAGetLastError(); - ok(rc == SOCKET_ERROR && err == WSAEMSGSIZE && (hdr.dwFlags & MSG_CTRUNC), - "WSARecvMsg() failed error: %d (ret: %d, flags: %d)\n", err, rc, hdr.dwFlags); + dwSize = 0xdeadbeef; + rc = pWSARecvMsg(s1, &hdr, &dwSize, NULL, NULL); + ok(rc == -1, "expected failure\n"); + ok(WSAGetLastError() == WSAEMSGSIZE, "got error %u\n", WSAGetLastError()); + todo_wine ok(dwSize == sizeof(msg), "got size %u\n", dwSize); + ok(hdr.dwFlags == MSG_CTRUNC, "got flags %#x\n", hdr.dwFlags); hdr.dwFlags = 0; /* Reset flags */ /* Perform another short control header test, this time with an overlapped receive */ hdr.Control.len = 1; + ov.Internal = 0xdead1; + ov.InternalHigh = 0xdead2; + ov.Offset = 0xdead3; + ov.OffsetHigh = 0xdead4; rc=pWSARecvMsg(s1, &hdr, NULL, &ov, NULL); err=WSAGetLastError(); ok(rc != 0 && err == WSA_IO_PENDING, "WSARecvMsg() failed error: %d\n", err); @@ -1874,14 +1890,45 @@ static void test_ip_pktinfo(void) ok(rc == sizeof(msg), "sendto() failed error: %d\n", WSAGetLastError()); ok(GetLastError() == ERROR_SUCCESS, "Expected 0, got %d\n", GetLastError()); ok(!WaitForSingleObject(ov.hEvent, 100), "wait failed\n"); - dwFlags = 0; - WSAGetOverlappedResult(s1, &ov, NULL, FALSE, &dwFlags); - ok(dwFlags == 0, - "WSAGetOverlappedResult() returned unexpected flags %d!\n", dwFlags); + ok((NTSTATUS)ov.Internal == STATUS_BUFFER_OVERFLOW, "got status %#x\n", (NTSTATUS)ov.Internal); + todo_wine ok(ov.InternalHigh == sizeof(msg), "got size %Iu\n", ov.InternalHigh); + ok(ov.Offset == 0xdead3, "got Offset %Iu\n", ov.Offset); + ok(ov.OffsetHigh == 0xdead4, "got OffsetHigh %Iu\n", ov.OffsetHigh); + dwFlags = 0xdeadbeef; + rc = WSAGetOverlappedResult(s1, &ov, &dwSize, FALSE, &dwFlags); + ok(!rc, "expected failure\n"); + ok(WSAGetLastError() == WSAEMSGSIZE, "got error %u\n", WSAGetLastError()); + todo_wine ok(dwSize == sizeof(msg), "got size %u\n", dwSize); + todo_wine ok(dwFlags == 0xdeadbeef, "got flags %#x\n", dwFlags); ok(hdr.dwFlags == MSG_CTRUNC, "WSARecvMsg() overlapped operation set unexpected flags %d.\n", hdr.dwFlags); hdr.dwFlags = 0; /* Reset flags */ + /* And with an APC. */ + + SetLastError(0xdeadbeef); + rc = sendto(s2, msg, sizeof(msg), 0, (struct sockaddr *)&s2addr, sizeof(s2addr)); + ok(rc == sizeof(msg), "sendto() failed error: %d\n", WSAGetLastError()); + ok(GetLastError() == ERROR_SUCCESS, "Expected 0, got %d\n", GetLastError()); + hdr.Control.len = 1; + + ov.Internal = 0xdead1; + ov.InternalHigh = 0xdead2; + ov.Offset = 0xdead3; + ov.OffsetHigh = 0xdead4; + dwSize = 0xdeadbeef; + rc = pWSARecvMsg(s1, &hdr, NULL, &ov, ip_pktinfo_apc); + ok(rc == -1, "expected failure\n"); + todo_wine ok(WSAGetLastError() == ERROR_IO_PENDING, "got error %u\n", WSAGetLastError()); + + rc = SleepEx(1000, TRUE); + todo_wine ok(rc == WAIT_IO_COMPLETION, "got %d\n", rc); + todo_wine ok(got_ip_pktinfo_apc == 1, "apc was called %u times\n", got_ip_pktinfo_apc); + ok(hdr.dwFlags == MSG_CTRUNC, "got flags %#x\n", hdr.dwFlags); + got_ip_pktinfo_apc = 0; + + hdr.dwFlags = 0; /* Reset flags */ + /* * Setup an overlapped receive, send a packet, then wait for the packet to be retrieved * on the server end and check that the returned packet matches what was sent.

1 0

Zebediah Figura : ws2_32/tests: Add some tests for SO_RCVTIMEO.
by Alexandre Julliard 21 May '21

21 May '21

Module: wine Branch: master Commit: 7fb3e57d8eb6742d062fcd1d3bf7a39046992e4d URL: https://source.winehq.org/git/wine.git/?a=commit;h=7fb3e57d8eb6742d062fcd1d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri May 21 00:17:58 2021 -0500 ws2_32/tests: Add some tests for SO_RCVTIMEO. 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 | 75 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 75 insertions(+) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 5cc0725752e..912bf9ee5d8 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -9926,6 +9926,80 @@ static void test_empty_recv(void) CloseHandle(overlapped.hEvent); } +static void test_timeout(void) +{ + DWORD timeout, flags = 0, size; + OVERLAPPED overlapped = {0}; + SOCKET client, server; + WSABUF wsabuf; + int ret, len; + char buffer; + + tcp_socketpair(&client, &server); + overlapped.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); + + timeout = 0xdeadbeef; + len = sizeof(timeout); + WSASetLastError(0xdeadbeef); + ret = getsockopt(client, SOL_SOCKET, SO_RCVTIMEO, (char *)&timeout, &len); + ok(!ret, "expected success\n"); + todo_wine ok(!WSAGetLastError(), "got error %u\n", WSAGetLastError()); + ok(len == sizeof(timeout), "got size %u\n", len); + ok(!timeout, "got timeout %u\n", timeout); + + timeout = 100; + WSASetLastError(0xdeadbeef); + ret = setsockopt(client, SOL_SOCKET, SO_RCVTIMEO, (char *)&timeout, sizeof(timeout)); + ok(!ret, "expected success\n"); + todo_wine ok(!WSAGetLastError(), "got error %u\n", WSAGetLastError()); + + timeout = 0xdeadbeef; + len = sizeof(timeout); + WSASetLastError(0xdeadbeef); + ret = getsockopt(client, SOL_SOCKET, SO_RCVTIMEO, (char *)&timeout, &len); + ok(!ret, "expected success\n"); + todo_wine ok(!WSAGetLastError(), "got error %u\n", WSAGetLastError()); + todo_wine ok(timeout == 100, "got timeout %u\n", timeout); + + WSASetLastError(0xdeadbeef); + ret = recv(client, &buffer, 1, 0); + ok(ret == -1, "got %d\n", ret); + ok(WSAGetLastError() == WSAETIMEDOUT, "got error %u\n", WSAGetLastError()); + + wsabuf.buf = &buffer; + wsabuf.len = 1; + WSASetLastError(0xdeadbeef); + size = 0xdeadbeef; + ret = WSARecv(client, &wsabuf, 1, &size, &flags, NULL, NULL); + ok(ret == -1, "got %d\n", ret); + ok(WSAGetLastError() == WSAETIMEDOUT, "got error %u\n", WSAGetLastError()); + ok(size == 0xdeadbeef, "got size %u\n", size); + + wsabuf.buf = &buffer; + wsabuf.len = 1; + WSASetLastError(0xdeadbeef); + size = 0xdeadbeef; + ret = WSARecv(client, &wsabuf, 1, &size, &flags, &overlapped, NULL); + ok(ret == -1, "got %d\n", ret); + ok(WSAGetLastError() == ERROR_IO_PENDING, "got error %u\n", WSAGetLastError()); + + ret = WaitForSingleObject(overlapped.hEvent, 200); + ok(ret == WAIT_TIMEOUT, "got %d\n", ret); + + ret = send(server, "a", 1, 0); + ok(ret == 1, "got %d\n", ret); + + ret = WaitForSingleObject(overlapped.hEvent, 200); + ok(!ret, "got %d\n", ret); + ret = GetOverlappedResult((HANDLE)client, &overlapped, &size, FALSE); + ok(ret, "got error %u\n", GetLastError()); + ok(size == 1, "got size %u\n", size); + + closesocket(client); + closesocket(server); + CloseHandle(overlapped.hEvent); +} + START_TEST( sock ) { int i; @@ -9987,6 +10061,7 @@ START_TEST( sock ) test_WSAGetOverlappedResult(); test_nonblocking_async_recv(); test_empty_recv(); + test_timeout(); /* 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/tests: Only load RtlWow64GetCpuAreaInfo() on 64-bit.
by Alexandre Julliard 21 May '21

21 May '21

Module: wine Branch: master Commit: 771e9260f88c782a5ac7b1c76786c6cc469c2158 URL: https://source.winehq.org/git/wine.git/?a=commit;h=771e9260f88c782a5ac7b1c7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 21 18:08:45 2021 +0200 ntdll/tests: Only load RtlWow64GetCpuAreaInfo() on 64-bit. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/info.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 213ff3cde36..4f638721262 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -25,7 +25,6 @@ static NTSTATUS (WINAPI * pNtQuerySystemInformation)(SYSTEM_INFORMATION_CLASS, PVOID, ULONG, PULONG); static NTSTATUS (WINAPI * pNtSetSystemInformation)(SYSTEM_INFORMATION_CLASS, PVOID, ULONG); static NTSTATUS (WINAPI * pRtlGetNativeSystemInformation)(SYSTEM_INFORMATION_CLASS, PVOID, ULONG, PULONG); -static NTSTATUS (WINAPI * pRtlWow64GetCpuAreaInfo)( WOW64_CPURESERVED *cpu, ULONG reserved, WOW64_CPU_AREA_INFO *info ); static USHORT (WINAPI * pRtlWow64GetCurrentMachine)(void); static NTSTATUS (WINAPI * pRtlWow64GetProcessMachines)(HANDLE,WORD*,WORD*); static NTSTATUS (WINAPI * pRtlWow64IsWowGuestMachineSupported)(USHORT,BOOLEAN*); @@ -50,6 +49,9 @@ static NTSTATUS (WINAPI * pNtQueryObject)(HANDLE, OBJECT_INFORMATION_CLASS, void static NTSTATUS (WINAPI * pNtCreateDebugObject)( HANDLE *, ACCESS_MASK, OBJECT_ATTRIBUTES *, ULONG ); static NTSTATUS (WINAPI * pNtSetInformationDebugObject)(HANDLE,DEBUGOBJECTINFOCLASS,PVOID,ULONG,ULONG*); static NTSTATUS (WINAPI * pDbgUiConvertStateChangeStructure)(DBGUI_WAIT_STATE_CHANGE*,DEBUG_EVENT*); +#ifdef _WIN64 +static NTSTATUS (WINAPI * pRtlWow64GetCpuAreaInfo)( WOW64_CPURESERVED *cpu, ULONG reserved, WOW64_CPU_AREA_INFO *info ); +#endif static BOOL is_wow64; @@ -86,7 +88,6 @@ static void InitFunctionPtrs(void) NTDLL_GET_PROC(NtQuerySystemInformationEx); NTDLL_GET_PROC(NtSetSystemInformation); NTDLL_GET_PROC(RtlGetNativeSystemInformation); - NTDLL_GET_PROC(RtlWow64GetCpuAreaInfo); NTDLL_GET_PROC(RtlWow64GetCurrentMachine); NTDLL_GET_PROC(RtlWow64GetProcessMachines); NTDLL_GET_PROC(RtlWow64IsWowGuestMachineSupported); @@ -107,6 +108,9 @@ static void InitFunctionPtrs(void) NTDLL_GET_PROC(NtSetInformationDebugObject); NTDLL_GET_PROC(NtGetCurrentProcessorNumber); NTDLL_GET_PROC(DbgUiConvertStateChangeStructure); +#ifdef _WIN64 + NTDLL_GET_PROC(RtlWow64GetCpuAreaInfo); +#endif pIsWow64Process = (void *)GetProcAddress(hkernel32, "IsWow64Process"); if (!pIsWow64Process || !pIsWow64Process( GetCurrentProcess(), &is_wow64 )) is_wow64 = FALSE;

1 0

Piotr Caban : msvcp90: Depend on compiler in _Getcvt implementation if possible.
by Alexandre Julliard 20 May '21

20 May '21

Module: wine Branch: master Commit: 24f7abafd754bb7d706f588e97532ce3169ade9c URL: https://source.winehq.org/git/wine.git/?a=commit;h=24f7abafd754bb7d706f588e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 20 21:37:16 2021 +0200 msvcp90: Depend on compiler in _Getcvt implementation if possible. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp100/msvcp100.spec | 2 +- dlls/msvcp110/msvcp110.spec | 2 +- dlls/msvcp120/msvcp120.spec | 2 +- dlls/msvcp120/tests/msvcp120.c | 8 ++++---- dlls/msvcp120_app/msvcp120_app.spec | 2 +- dlls/msvcp140/msvcp140.spec | 2 +- dlls/msvcp60/msvcp60.spec | 2 +- dlls/msvcp70/msvcp70.spec | 2 +- dlls/msvcp71/msvcp71.spec | 2 +- dlls/msvcp80/msvcp80.spec | 2 +- dlls/msvcp90/locale.c | 38 +++++++++++++++++++++++++------------ dlls/msvcp90/msvcp90.spec | 2 +- 12 files changed, 40 insertions(+), 26 deletions(-) diff --git a/dlls/msvcp100/msvcp100.spec b/dlls/msvcp100/msvcp100.spec index 657cdc9f217..d964954dc1f 100644 --- a/dlls/msvcp100/msvcp100.spec +++ b/dlls/msvcp100/msvcp100.spec @@ -2917,7 +2917,7 @@ @ stub _GetLocaleForCP @ cdecl -ret64 _Getcoll() @ cdecl _Getctype(ptr) -@ cdecl -ret64 _Getcvt() +@ cdecl -norelay _Getcvt() @ cdecl _Getdateorder() @ cdecl _Getwctype(long ptr) @ cdecl _Getwctypes(ptr ptr ptr ptr) diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index 834c4225373..cd2236fe389 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -3780,7 +3780,7 @@ # extern _FZero @ cdecl -ret64 _Getcoll() @ cdecl _Getctype(ptr) -@ cdecl -ret64 _Getcvt() +@ cdecl -norelay _Getcvt() @ cdecl _Getdateorder() @ cdecl _Getwctype(long ptr) @ cdecl _Getwctypes(ptr ptr ptr ptr) diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec index 633b3da8552..2c5e457b2fc 100644 --- a/dlls/msvcp120/msvcp120.spec +++ b/dlls/msvcp120/msvcp120.spec @@ -3723,7 +3723,7 @@ # extern _FZero @ cdecl -ret64 _Getcoll() @ cdecl _Getctype(ptr) -@ cdecl -ret64 _Getcvt() +@ cdecl -norelay _Getcvt() @ cdecl _Getdateorder() @ cdecl _Getwctype(long ptr) @ cdecl _Getwctypes(ptr ptr ptr ptr) diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index 35e90cfa29c..495ee9dd6fb 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -209,7 +209,7 @@ static int (__cdecl *p__ismbblead)(unsigned int); static MSVCRT_long (__cdecl *p__Xtime_diff_to_millis2)(const xtime*, const xtime*); static int (__cdecl *p_xtime_get)(xtime*, int); -static _Cvtvec* (__cdecl *p__Getcvt)(_Cvtvec*); +static _Cvtvec (__cdecl *p__Getcvt)(void); static void (CDECL *p__Call_once)(int *once, void (CDECL *func)(void)); static void (CDECL *p__Call_onceEx)(int *once, void (CDECL *func)(void*), void *argv); static void (CDECL *p__Do_call)(void *this); @@ -930,7 +930,7 @@ static void test__Getcvt(void) _Cvtvec cvtvec; int i; - p__Getcvt(&cvtvec); + cvtvec = p__Getcvt(); ok(cvtvec.page == 0, "cvtvec.page = %d\n", cvtvec.page); ok(cvtvec.mb_max == 1, "cvtvec.mb_max = %d\n", cvtvec.mb_max); todo_wine ok(cvtvec.unk == 1, "cvtvec.unk = %d\n", cvtvec.unk); @@ -941,7 +941,7 @@ static void test__Getcvt(void) win_skip("_Getcvt tests\n"); return; } - p__Getcvt(&cvtvec); + cvtvec = p__Getcvt(); ok(cvtvec.page == 936, "cvtvec.page = %d\n", cvtvec.page); ok(cvtvec.mb_max == 2, "cvtvec.mb_max = %d\n", cvtvec.mb_max); ok(cvtvec.unk == 0, "cvtvec.unk = %d\n", cvtvec.unk); @@ -955,7 +955,7 @@ static void test__Getcvt(void) } p__setmbcp(936); - p__Getcvt(&cvtvec); + cvtvec = p__Getcvt(); ok(cvtvec.page == 936, "cvtvec.page = %d\n", cvtvec.page); ok(cvtvec.mb_max == 2, "cvtvec.mb_max = %d\n", cvtvec.mb_max); ok(cvtvec.unk == 0, "cvtvec.unk = %d\n", cvtvec.unk); diff --git a/dlls/msvcp120_app/msvcp120_app.spec b/dlls/msvcp120_app/msvcp120_app.spec index c35dcb2d427..93e172a944f 100644 --- a/dlls/msvcp120_app/msvcp120_app.spec +++ b/dlls/msvcp120_app/msvcp120_app.spec @@ -3723,7 +3723,7 @@ # extern _FZero @ cdecl -ret64 _Getcoll() msvcp120._Getcoll @ cdecl _Getctype(ptr) msvcp120._Getctype -@ cdecl -ret64 _Getcvt() msvcp120._Getcvt +@ cdecl -norelay _Getcvt() msvcp120._Getcvt @ cdecl _Getdateorder() msvcp120._Getdateorder @ cdecl _Getwctype(long ptr) msvcp120._Getwctype @ cdecl _Getwctypes(ptr ptr ptr ptr) msvcp120._Getwctypes diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index 6ad46186cb5..7e7ea012236 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -3651,7 +3651,7 @@ @ cdecl _File_size(wstr) @ cdecl -ret64 _Getcoll() @ cdecl _Getctype(ptr) -@ cdecl -ret64 _Getcvt() +@ cdecl -norelay _Getcvt() @ cdecl _Getdateorder() @ cdecl _Getwctype(long ptr) @ cdecl _Getwctypes(ptr ptr ptr ptr) diff --git a/dlls/msvcp60/msvcp60.spec b/dlls/msvcp60/msvcp60.spec index f3ed2e8b667..628e5f7f59e 100644 --- a/dlls/msvcp60/msvcp60.spec +++ b/dlls/msvcp60/msvcp60.spec @@ -4276,7 +4276,7 @@ # extern _FXbig @ cdecl -ret64 _Getcoll() @ cdecl _Getctype(ptr) -@ cdecl -ret64 _Getcvt() +@ cdecl -norelay _Getcvt() @ extern _Hugeval _Hugeval @ extern _Inf _Inf @ stub _LCosh diff --git a/dlls/msvcp70/msvcp70.spec b/dlls/msvcp70/msvcp70.spec index d60e37bcff6..c48945d9509 100644 --- a/dlls/msvcp70/msvcp70.spec +++ b/dlls/msvcp70/msvcp70.spec @@ -5063,7 +5063,7 @@ # extern _FZero @ cdecl -ret64 _Getcoll() @ cdecl _Getctype(ptr) -@ cdecl -ret64 _Getcvt() +@ cdecl -norelay _Getcvt() @ extern _Hugeval @ extern _Inf @ stub _LCosh diff --git a/dlls/msvcp71/msvcp71.spec b/dlls/msvcp71/msvcp71.spec index 1ccdd09825c..f9fc613b7d0 100644 --- a/dlls/msvcp71/msvcp71.spec +++ b/dlls/msvcp71/msvcp71.spec @@ -5117,7 +5117,7 @@ # extern _FZero @ cdecl -ret64 _Getcoll() @ cdecl _Getctype(ptr) -@ cdecl -ret64 _Getcvt() +@ cdecl -norelay _Getcvt() @ cdecl _Getwctype(long ptr) @ cdecl _Getwctypes(ptr ptr ptr ptr) @ extern _Hugeval diff --git a/dlls/msvcp80/msvcp80.spec b/dlls/msvcp80/msvcp80.spec index c1f409a1d78..74c0cac3669 100644 --- a/dlls/msvcp80/msvcp80.spec +++ b/dlls/msvcp80/msvcp80.spec @@ -5726,7 +5726,7 @@ # extern _FXbig @ cdecl -ret64 _Getcoll() @ cdecl _Getctype(ptr) -@ cdecl -ret64 _Getcvt() +@ cdecl -norelay _Getcvt() @ cdecl _Getdateorder() @ cdecl _Getwctype(long ptr) @ cdecl _Getwctypes(ptr ptr ptr ptr) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 0d0af6eac34..bd045333dfc 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -735,9 +735,11 @@ _Ctypevec* __thiscall _Locinfo__Getctype(const _Locinfo *this, _Ctypevec *ret) } /* _Getcvt */ -#if _MSVCP_VER < 110 +#if _MSVCP_VER < 110 && defined(__i386__) +/* Work around a gcc bug */ ULONGLONG __cdecl _Getcvt(void) { + C_ASSERT(sizeof(_Cvtvec) == sizeof(ULONGLONG)); union { _Cvtvec cvtvec; ULONGLONG ull; @@ -749,20 +751,32 @@ ULONGLONG __cdecl _Getcvt(void) ret.cvtvec.handle = ___lc_handle_func()[LC_CTYPE]; return ret.ull; } +#elif _MSVCP_VER < 110 +_Cvtvec __cdecl _Getcvt(void) +{ + _Cvtvec ret; + + TRACE("\n"); + + ret.page = ___lc_codepage_func(); + ret.handle = ___lc_handle_func()[LC_CTYPE]; + return ret; +} #else -_Cvtvec* __cdecl _Getcvt(_Cvtvec *ret) +_Cvtvec __cdecl _Getcvt(void) { + _Cvtvec ret; int i; TRACE("\n"); - memset(ret, 0, sizeof(*ret)); - ret->page = ___lc_codepage_func(); - ret->mb_max = ___mb_cur_max_func(); + memset(&ret, 0, sizeof(ret)); + ret.page = ___lc_codepage_func(); + ret.mb_max = ___mb_cur_max_func(); - if(ret->mb_max > 1) { + if(ret.mb_max > 1) { for(i=0; i<256; i++) - if(_ismbblead(i)) ret->isleadbyte[i/8] |= 1 << (i&7); + if(_ismbblead(i)) ret.isleadbyte[i/8] |= 1 << (i&7); } return ret; } @@ -773,14 +787,14 @@ _Cvtvec* __cdecl _Getcvt(_Cvtvec *ret) DEFINE_THISCALL_WRAPPER(_Locinfo__Getcvt, 8) _Cvtvec* __thiscall _Locinfo__Getcvt(const _Locinfo *this, _Cvtvec *ret) { -#if _MSVCP_VER < 110 - ULONGLONG ull = _Getcvt(); - memcpy(ret, &ull, sizeof(ull)); +#if _MSVCP_VER < 110 && defined(__i386__) + ULONGLONG cvtvec; #else _Cvtvec cvtvec; - _Getcvt(&cvtvec); - memcpy(ret, &cvtvec, sizeof(cvtvec)); #endif + + cvtvec = _Getcvt(); + memcpy(ret, &cvtvec, sizeof(cvtvec)); return ret; } diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 9274a24b706..ff6fe952053 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -6502,7 +6502,7 @@ # extern _FXbig @ cdecl -ret64 _Getcoll() @ cdecl _Getctype(ptr) -@ cdecl -ret64 _Getcvt() +@ cdecl -norelay _Getcvt() @ cdecl _Getdateorder() @ cdecl _Getwctype(long ptr) @ cdecl _Getwctypes(ptr ptr ptr ptr)

1 0

Piotr Caban : msvcp90: Depend on compiler in _Getcoll implementation if possible.
by Alexandre Julliard 20 May '21

20 May '21

Module: wine Branch: master Commit: 83cc0110f2662b5d8c3530e05de666d65d535bb8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=83cc0110f2662b5d8c3530e0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 20 21:37:23 2021 +0200 msvcp90: Depend on compiler in _Getcoll implementation if possible. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp100/msvcp100.spec | 2 +- dlls/msvcp110/msvcp110.spec | 2 +- dlls/msvcp120/msvcp120.spec | 2 +- dlls/msvcp120_app/msvcp120_app.spec | 2 +- dlls/msvcp140/msvcp140.spec | 2 +- dlls/msvcp60/msvcp60.spec | 2 +- dlls/msvcp70/msvcp70.spec | 2 +- dlls/msvcp71/msvcp71.spec | 2 +- dlls/msvcp80/msvcp80.spec | 2 +- dlls/msvcp90/locale.c | 13 ++++++++----- dlls/msvcp90/msvcp90.spec | 2 +- dlls/msvcp90/tests/misc.c | 29 +++++++++++++---------------- 12 files changed, 31 insertions(+), 31 deletions(-) diff --git a/dlls/msvcp100/msvcp100.spec b/dlls/msvcp100/msvcp100.spec index d964954dc1f..1fc93b05438 100644 --- a/dlls/msvcp100/msvcp100.spec +++ b/dlls/msvcp100/msvcp100.spec @@ -2915,7 +2915,7 @@ @ extern _FSnan # extern _FXbig @ stub _GetLocaleForCP -@ cdecl -ret64 _Getcoll() +@ cdecl -norelay _Getcoll() @ cdecl _Getctype(ptr) @ cdecl -norelay _Getcvt() @ cdecl _Getdateorder() diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index cd2236fe389..aeab529d69a 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -3778,7 +3778,7 @@ @ stub _FXp_sqrtx @ stub _FXp_subx # extern _FZero -@ cdecl -ret64 _Getcoll() +@ cdecl -norelay _Getcoll() @ cdecl _Getctype(ptr) @ cdecl -norelay _Getcvt() @ cdecl _Getdateorder() diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec index 2c5e457b2fc..0b1cb92f8ce 100644 --- a/dlls/msvcp120/msvcp120.spec +++ b/dlls/msvcp120/msvcp120.spec @@ -3721,7 +3721,7 @@ @ stub _FXp_sqrtx @ stub _FXp_subx # extern _FZero -@ cdecl -ret64 _Getcoll() +@ cdecl -norelay _Getcoll() @ cdecl _Getctype(ptr) @ cdecl -norelay _Getcvt() @ cdecl _Getdateorder() diff --git a/dlls/msvcp120_app/msvcp120_app.spec b/dlls/msvcp120_app/msvcp120_app.spec index 93e172a944f..eefb9762708 100644 --- a/dlls/msvcp120_app/msvcp120_app.spec +++ b/dlls/msvcp120_app/msvcp120_app.spec @@ -3721,7 +3721,7 @@ @ stub _FXp_sqrtx @ stub _FXp_subx # extern _FZero -@ cdecl -ret64 _Getcoll() msvcp120._Getcoll +@ cdecl -norelay _Getcoll() msvcp120._Getcoll @ cdecl _Getctype(ptr) msvcp120._Getctype @ cdecl -norelay _Getcvt() msvcp120._Getcvt @ cdecl _Getdateorder() msvcp120._Getdateorder diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index 7e7ea012236..d2cb4dbed8c 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -3649,7 +3649,7 @@ @ stub _FSinh @ extern _FSnan @ cdecl _File_size(wstr) -@ cdecl -ret64 _Getcoll() +@ cdecl -norelay _Getcoll() @ cdecl _Getctype(ptr) @ cdecl -norelay _Getcvt() @ cdecl _Getdateorder() diff --git a/dlls/msvcp60/msvcp60.spec b/dlls/msvcp60/msvcp60.spec index 628e5f7f59e..de7aafa73b7 100644 --- a/dlls/msvcp60/msvcp60.spec +++ b/dlls/msvcp60/msvcp60.spec @@ -4274,7 +4274,7 @@ @ stub _FSinh @ extern _FSnan _FSnan # extern _FXbig -@ cdecl -ret64 _Getcoll() +@ cdecl -norelay _Getcoll() @ cdecl _Getctype(ptr) @ cdecl -norelay _Getcvt() @ extern _Hugeval _Hugeval diff --git a/dlls/msvcp70/msvcp70.spec b/dlls/msvcp70/msvcp70.spec index c48945d9509..d1a152ff0e3 100644 --- a/dlls/msvcp70/msvcp70.spec +++ b/dlls/msvcp70/msvcp70.spec @@ -5061,7 +5061,7 @@ @ extern _FSnan # extern _FXbig # extern _FZero -@ cdecl -ret64 _Getcoll() +@ cdecl -norelay _Getcoll() @ cdecl _Getctype(ptr) @ cdecl -norelay _Getcvt() @ extern _Hugeval diff --git a/dlls/msvcp71/msvcp71.spec b/dlls/msvcp71/msvcp71.spec index f9fc613b7d0..6176c9be2df 100644 --- a/dlls/msvcp71/msvcp71.spec +++ b/dlls/msvcp71/msvcp71.spec @@ -5115,7 +5115,7 @@ @ extern _FSnan # extern _FXbig # extern _FZero -@ cdecl -ret64 _Getcoll() +@ cdecl -norelay _Getcoll() @ cdecl _Getctype(ptr) @ cdecl -norelay _Getcvt() @ cdecl _Getwctype(long ptr) diff --git a/dlls/msvcp80/msvcp80.spec b/dlls/msvcp80/msvcp80.spec index 74c0cac3669..f450286505a 100644 --- a/dlls/msvcp80/msvcp80.spec +++ b/dlls/msvcp80/msvcp80.spec @@ -5724,7 +5724,7 @@ @ stub _FSinh @ extern _FSnan # extern _FXbig -@ cdecl -ret64 _Getcoll() +@ cdecl -norelay _Getcoll() @ cdecl _Getctype(ptr) @ cdecl -norelay _Getcvt() @ cdecl _Getdateorder() diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index bd045333dfc..2f6c103b2a2 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -669,20 +669,23 @@ static _Collvec* getcoll(_Collvec *ret) } /* _Getcoll */ -#if defined(__i386__) || _MSVCP_VER<110 +#if defined(__i386__) +/* Work around a gcc bug */ ULONGLONG __cdecl _Getcoll(void) { + C_ASSERT(sizeof(_Collvec) == sizeof(ULONGLONG)); ULONGLONG ret; - C_ASSERT(sizeof(_Collvec) <= sizeof(ULONGLONG)); - getcoll((_Collvec*)&ret); return ret; } #else -_Collvec* __cdecl _Getcoll(_Collvec *ret) +_Collvec __cdecl _Getcoll(void) { - return getcoll(ret); + _Collvec ret; + + getcoll(&ret); + return ret; } #endif diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index ff6fe952053..15b16ed7f12 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -6500,7 +6500,7 @@ @ stub _FSinh @ extern _FSnan # extern _FXbig -@ cdecl -ret64 _Getcoll() +@ cdecl -norelay _Getcoll() @ cdecl _Getctype(ptr) @ cdecl -norelay _Getcvt() @ cdecl _Getdateorder() diff --git a/dlls/msvcp90/tests/misc.c b/dlls/msvcp90/tests/misc.c index 9d6fe2b9bcc..546f10f6858 100644 --- a/dlls/msvcp90/tests/misc.c +++ b/dlls/msvcp90/tests/misc.c @@ -101,7 +101,7 @@ static char* (__cdecl *p_Copy_s)(char*, size_t, const char*, size_t); static unsigned short (__cdecl *p_wctype)(const char*); static MSVCP__Ctypevec* (__cdecl *p__Getctype)(MSVCP__Ctypevec*); -static /*MSVCP__Collvec*/ULONGLONG (__cdecl *p__Getcoll)(void); +static MSVCP__Collvec (__cdecl *p__Getcoll)(void); static wctrans_t (__cdecl *p_wctrans)(const char*); static wint_t (__cdecl *p_towctrans)(wint_t, wctrans_t); static void (__cdecl *p_locale__Locimp__Locimp_Addfac)(locale__Locimp*,locale_facet*,size_t); @@ -604,26 +604,23 @@ static void test__Getctype(void) static void test__Getcoll(void) { - ULONGLONG (__cdecl *p__Getcoll_arg)(MSVCP__Collvec*); +#ifdef __i386__ + /* Workaround a gcc bug */ + ULONGLONG tmp; +#define call__Getcoll(ret) tmp = ((ULONGLONG (__cdecl*)(void))p__Getcoll)(); \ + memcpy(&ret, &tmp, sizeof(tmp)) +#else +#define call__Getcoll(ret) ret = p__Getcoll() +#endif _locale_t locale; - - union { - MSVCP__Collvec collvec; - ULONGLONG ull; - }ret; + MSVCP__Collvec ret; locale = p__get_current_locale(); locale->locinfo->lc_handle[LC_COLLATE] = 0x7654321; p__free_locale(locale); - ret.ull = 0; - p__Getcoll_arg = (void*)p__Getcoll; - p__Getcoll_arg(&ret.collvec); - ok(ret.collvec.handle == 0, "ret.handle = %x\n", ret.collvec.handle); - ok(ret.collvec.page == 0, "ret.page = %x\n", ret.collvec.page); - - ret.ull = p__Getcoll(); - ok(ret.collvec.handle == 0x7654321, "ret.collvec.handle = %x\n", ret.collvec.handle); - ok(ret.collvec.page == 0, "ret.page = %x\n", ret.collvec.page); + call__Getcoll(ret); + ok(ret.handle == 0x7654321, "ret.handle = %x\n", ret.handle); + ok(ret.page == 0, "ret.page = %x\n", ret.page); } static void test_towctrans(void)

1 0

Piotr Caban : msvcp90: Depend on compiler to handle returning struct in _Getctype.
by Alexandre Julliard 20 May '21

20 May '21

Module: wine Branch: master Commit: dff85646517526562644c23648d11596daeb26d0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dff85646517526562644c236… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 20 21:37:26 2021 +0200 msvcp90: Depend on compiler to handle returning struct in _Getctype. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp100/msvcp100.spec | 2 +- dlls/msvcp110/msvcp110.spec | 2 +- dlls/msvcp120/msvcp120.spec | 2 +- dlls/msvcp120_app/msvcp120_app.spec | 2 +- dlls/msvcp140/msvcp140.spec | 2 +- dlls/msvcp60/msvcp60.spec | 2 +- dlls/msvcp70/msvcp70.spec | 2 +- dlls/msvcp71/msvcp71.spec | 2 +- dlls/msvcp80/msvcp80.spec | 2 +- dlls/msvcp90/locale.c | 22 ++++++++++++---------- dlls/msvcp90/msvcp90.spec | 2 +- dlls/msvcp90/tests/misc.c | 6 +++--- 12 files changed, 25 insertions(+), 23 deletions(-) diff --git a/dlls/msvcp100/msvcp100.spec b/dlls/msvcp100/msvcp100.spec index 1fc93b05438..c0a4910eb4b 100644 --- a/dlls/msvcp100/msvcp100.spec +++ b/dlls/msvcp100/msvcp100.spec @@ -2916,7 +2916,7 @@ # extern _FXbig @ stub _GetLocaleForCP @ cdecl -norelay _Getcoll() -@ cdecl _Getctype(ptr) +@ cdecl -norelay _Getctype() @ cdecl -norelay _Getcvt() @ cdecl _Getdateorder() @ cdecl _Getwctype(long ptr) diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index aeab529d69a..33f93c9e8cf 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -3779,7 +3779,7 @@ @ stub _FXp_subx # extern _FZero @ cdecl -norelay _Getcoll() -@ cdecl _Getctype(ptr) +@ cdecl -norelay _Getctype() @ cdecl -norelay _Getcvt() @ cdecl _Getdateorder() @ cdecl _Getwctype(long ptr) diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec index 0b1cb92f8ce..9dfe0b186c5 100644 --- a/dlls/msvcp120/msvcp120.spec +++ b/dlls/msvcp120/msvcp120.spec @@ -3722,7 +3722,7 @@ @ stub _FXp_subx # extern _FZero @ cdecl -norelay _Getcoll() -@ cdecl _Getctype(ptr) +@ cdecl -norelay _Getctype() @ cdecl -norelay _Getcvt() @ cdecl _Getdateorder() @ cdecl _Getwctype(long ptr) diff --git a/dlls/msvcp120_app/msvcp120_app.spec b/dlls/msvcp120_app/msvcp120_app.spec index eefb9762708..e9ff7256419 100644 --- a/dlls/msvcp120_app/msvcp120_app.spec +++ b/dlls/msvcp120_app/msvcp120_app.spec @@ -3722,7 +3722,7 @@ @ stub _FXp_subx # extern _FZero @ cdecl -norelay _Getcoll() msvcp120._Getcoll -@ cdecl _Getctype(ptr) msvcp120._Getctype +@ cdecl -norelay _Getctype() msvcp120._Getctype @ cdecl -norelay _Getcvt() msvcp120._Getcvt @ cdecl _Getdateorder() msvcp120._Getdateorder @ cdecl _Getwctype(long ptr) msvcp120._Getwctype diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index d2cb4dbed8c..343571ae401 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -3650,7 +3650,7 @@ @ extern _FSnan @ cdecl _File_size(wstr) @ cdecl -norelay _Getcoll() -@ cdecl _Getctype(ptr) +@ cdecl -norelay _Getctype() @ cdecl -norelay _Getcvt() @ cdecl _Getdateorder() @ cdecl _Getwctype(long ptr) diff --git a/dlls/msvcp60/msvcp60.spec b/dlls/msvcp60/msvcp60.spec index de7aafa73b7..c616a10b4a4 100644 --- a/dlls/msvcp60/msvcp60.spec +++ b/dlls/msvcp60/msvcp60.spec @@ -4275,7 +4275,7 @@ @ extern _FSnan _FSnan # extern _FXbig @ cdecl -norelay _Getcoll() -@ cdecl _Getctype(ptr) +@ cdecl -norelay _Getctype() @ cdecl -norelay _Getcvt() @ extern _Hugeval _Hugeval @ extern _Inf _Inf diff --git a/dlls/msvcp70/msvcp70.spec b/dlls/msvcp70/msvcp70.spec index d1a152ff0e3..a35949e15fb 100644 --- a/dlls/msvcp70/msvcp70.spec +++ b/dlls/msvcp70/msvcp70.spec @@ -5062,7 +5062,7 @@ # extern _FXbig # extern _FZero @ cdecl -norelay _Getcoll() -@ cdecl _Getctype(ptr) +@ cdecl -norelay _Getctype() @ cdecl -norelay _Getcvt() @ extern _Hugeval @ extern _Inf diff --git a/dlls/msvcp71/msvcp71.spec b/dlls/msvcp71/msvcp71.spec index 6176c9be2df..41c8bb01a9c 100644 --- a/dlls/msvcp71/msvcp71.spec +++ b/dlls/msvcp71/msvcp71.spec @@ -5116,7 +5116,7 @@ # extern _FXbig # extern _FZero @ cdecl -norelay _Getcoll() -@ cdecl _Getctype(ptr) +@ cdecl -norelay _Getctype() @ cdecl -norelay _Getcvt() @ cdecl _Getwctype(long ptr) @ cdecl _Getwctypes(ptr ptr ptr ptr) diff --git a/dlls/msvcp80/msvcp80.spec b/dlls/msvcp80/msvcp80.spec index f450286505a..020e8d26fc7 100644 --- a/dlls/msvcp80/msvcp80.spec +++ b/dlls/msvcp80/msvcp80.spec @@ -5725,7 +5725,7 @@ @ extern _FSnan # extern _FXbig @ cdecl -norelay _Getcoll() -@ cdecl _Getctype(ptr) +@ cdecl -norelay _Getctype() @ cdecl -norelay _Getcvt() @ cdecl _Getdateorder() @ cdecl _Getwctype(long ptr) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 2f6c103b2a2..ea0729cf4f9 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -698,8 +698,9 @@ _Collvec* __thiscall _Locinfo__Getcoll(const _Locinfo *this, _Collvec *ret) } /* _Getctype */ -_Ctypevec* __cdecl _Getctype(_Ctypevec *ret) +_Ctypevec __cdecl _Getctype(void) { + _Ctypevec ret; short *table; #if _MSVCP_VER >= 110 wchar_t *name; @@ -708,24 +709,24 @@ _Ctypevec* __cdecl _Getctype(_Ctypevec *ret) TRACE("\n"); - ret->page = ___lc_codepage_func(); + ret.page = ___lc_codepage_func(); #if _MSVCP_VER < 110 - ret->handle = ___lc_handle_func()[LC_COLLATE]; + ret.handle = ___lc_handle_func()[LC_COLLATE]; #else if((name = ___lc_locale_name_func()[LC_COLLATE])) { size = wcslen(name)+1; - ret->name = malloc(size*sizeof(*name)); - if(!ret->name) throw_exception(EXCEPTION_BAD_ALLOC, NULL); - memcpy(ret->name, name, size*sizeof(*name)); + ret.name = malloc(size*sizeof(*name)); + if(!ret.name) throw_exception(EXCEPTION_BAD_ALLOC, NULL); + memcpy(ret.name, name, size*sizeof(*name)); } else { - ret->name = NULL; + ret.name = NULL; } #endif - ret->delfl = TRUE; + ret.delfl = TRUE; table = malloc(sizeof(short[256])); if(!table) throw_exception(EXCEPTION_BAD_ALLOC, NULL); memcpy(table, __pctype_func(), sizeof(short[256])); - ret->table = table; + ret.table = table; return ret; } @@ -734,7 +735,8 @@ _Ctypevec* __cdecl _Getctype(_Ctypevec *ret) DEFINE_THISCALL_WRAPPER(_Locinfo__Getctype, 8) _Ctypevec* __thiscall _Locinfo__Getctype(const _Locinfo *this, _Ctypevec *ret) { - return _Getctype(ret); + *ret = _Getctype(); + return ret; } /* _Getcvt */ diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 15b16ed7f12..1e79400e469 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -6501,7 +6501,7 @@ @ extern _FSnan # extern _FXbig @ cdecl -norelay _Getcoll() -@ cdecl _Getctype(ptr) +@ cdecl -norelay _Getctype() @ cdecl -norelay _Getcvt() @ cdecl _Getdateorder() @ cdecl _Getwctype(long ptr) diff --git a/dlls/msvcp90/tests/misc.c b/dlls/msvcp90/tests/misc.c index 546f10f6858..40858bc5594 100644 --- a/dlls/msvcp90/tests/misc.c +++ b/dlls/msvcp90/tests/misc.c @@ -100,7 +100,7 @@ static BYTE (__cdecl *p_short_eq)(const void*, const void*); static char* (__cdecl *p_Copy_s)(char*, size_t, const char*, size_t); static unsigned short (__cdecl *p_wctype)(const char*); -static MSVCP__Ctypevec* (__cdecl *p__Getctype)(MSVCP__Ctypevec*); +static MSVCP__Ctypevec (__cdecl *p__Getctype)(void); static MSVCP__Collvec (__cdecl *p__Getcoll)(void); static wctrans_t (__cdecl *p_wctrans)(const char*); static wint_t (__cdecl *p_towctrans)(wint_t, wctrans_t); @@ -584,7 +584,7 @@ static void test__Getctype(void) MSVCP__Ctypevec ret; _locale_t locale; - ok(p__Getctype(&ret) == &ret, "__Getctype returned incorrect pointer\n"); + ret = p__Getctype(); ok(ret.handle == 0, "ret.handle = %d\n", ret.handle); ok(ret.page == 0, "ret.page = %d\n", ret.page); ok(ret.delfl == 1, "ret.delfl = %d\n", ret.delfl); @@ -594,7 +594,7 @@ static void test__Getctype(void) locale = p__get_current_locale(); locale->locinfo->lc_handle[LC_COLLATE] = 0x1234567; p__free_locale(locale); - ok(p__Getctype(&ret) == &ret, "__Getctype returned incorrect pointer\n"); + ret = p__Getctype(); ok(ret.handle == 0x1234567, "ret.handle = %d\n", ret.handle); ok(ret.page == 0, "ret.page = %d\n", ret.page); ok(ret.delfl == 1, "ret.delfl = %d\n", ret.delfl);

1 0

Paul Gofman : ntdll: Validate job handles at process creation.
by Alexandre Julliard 20 May '21

20 May '21

Module: wine Branch: master Commit: ddd161f3393d626d41e4c33b65a0567686cfa753 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ddd161f3393d626d41e4c33b… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu May 20 03:29:03 2021 +0300 ntdll: Validate job handles at process creation. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/process.c | 27 +++++++++++++++++++++++++++ dlls/ntdll/unix/process.c | 20 +++++++++++++++++--- include/wine/server_protocol.h | 5 ++++- server/process.c | 27 +++++++++++++++++++++++++++ server/protocol.def | 2 ++ server/request.h | 3 ++- server/trace.c | 3 +++ 7 files changed, 82 insertions(+), 5 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ddd161f3393d626d41e4…

1 0

Paul Gofman : server: Support process job lists.
by Alexandre Julliard 20 May '21

20 May '21

Module: wine Branch: master Commit: d430efb64a1b56aaffcf3eb8c245cacfb0c7c31a URL: https://source.winehq.org/git/wine.git/?a=commit;h=d430efb64a1b56aaffcf3eb8… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu May 20 03:29:04 2021 +0300 server: Support process job lists. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/process.c | 260 +++++++++++++++++++++++++++++++++++++++++- server/process.c | 12 ++ 2 files changed, 268 insertions(+), 4 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d430efb64a1b56aaffcf…

1 0