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

[PATCH 6/6 v2] kernel32/tests: Test timeout behaviour on system clock change.
by Piotr Caban 21 Feb '20

21 Feb '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/kernel32/tests/timer.c | 188 ++++++++++++++++++++++++++++++++++++ 1 file changed, 188 insertions(+)

1 0

[PATCH 5/6 v2] server: Introduce when_t type that stores absolute timeout using regular or monotonic clock.
by Piotr Caban 21 Feb '20

21 Feb '20

1 0

[PATCH 4/6 v2] server: Use correct timeout in select.
by Piotr Caban 21 Feb '20

21 Feb '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/ntdll/server.c | 15 +++++++++++---- dlls/ntdll/sync.c | 15 +++++++++++---- server/protocol.def | 1 - server/thread.c | 38 +++++++++++++++++++------------------- 4 files changed, 41 insertions(+), 28 deletions(-)

1 0

[PATCH 3/6 v2] server: Use monotonic timer for SetTimer timeouts.
by Piotr Caban 21 Feb '20

21 Feb '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- server/queue.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)

1 0

[PATCH 2/6 v2] server: Use correct timeouts in waitable timers.
by Piotr Caban 21 Feb '20

21 Feb '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/ntdll/sync.c | 11 +++++++++-- server/fd.c | 2 +- server/file.h | 1 + server/timer.c | 22 +++++++++++++++------- 4 files changed, 26 insertions(+), 10 deletions(-)

1 0

[PATCH 1/6 v2] server: Use monotonic clock for relative timeouts.
by Piotr Caban 21 Feb '20

21 Feb '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- v2: - patch 1 - fixed monotonic_counter function - patch 6 - removed RtlWaitOnAddress tests that are failing when futexes are used server/fd.c | 43 ++++++++++++++++++++++++++++++++++--------- server/request.c | 14 +++++++------- server/request.h | 8 +++++++- 3 files changed, 48 insertions(+), 17 deletions(-)

1 0

[PATCH v4 1/2] kernel32/tests: Add tests for ContinueDebugEvent with DBG_REPLY_LATER.
by Rémi Bernon 21 Feb '20

21 Feb '20

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- The same as v3, but without the test_reply_later call on test_debugger exit. It was a bit pointless and some other thread may exit concurrently, raising unexpected events when they are resumed. dlls/kernel32/tests/debugger.c | 61 +++++++++++++++++++++++++++++++++- 1 file changed, 60 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/debugger.c b/dlls/kernel32/tests/debugger.c index a2b5d1f410e..f7ce14b15a0 100644 --- a/dlls/kernel32/tests/debugger.c +++ b/dlls/kernel32/tests/debugger.c @@ -309,6 +309,56 @@ static void fetch_process_context(struct debugger_context *ctx) #define WAIT_EVENT_TIMEOUT 20000 #define POLL_EVENT_TIMEOUT 200 +#define test_reply_later(a) test_reply_later_(__LINE__,a) +static void test_reply_later_(unsigned int line, struct debugger_context *ctx) +{ + DEBUG_EVENT de0, de1; + HANDLE thread; + NTSTATUS status; + + if (!ContinueDebugEvent(ctx->ev.dwProcessId, ctx->ev.dwThreadId, DBG_REPLY_LATER)) + todo_wine win_skip("Skipping unsupported DBG_REPLY_LATER tests\n"); + else + { + ok_(__FILE__,line)(WaitForDebugEvent(&de0, 50), "WaitForDebugEvent failed, last error:%u\n", GetLastError()); + ok_(__FILE__,line)(ctx->ev.dwDebugEventCode == de0.dwDebugEventCode, + "delayed event differ, code:%x was:%x\n", de0.dwDebugEventCode, ctx->ev.dwDebugEventCode); + ok_(__FILE__,line)(ctx->ev.dwProcessId == de0.dwProcessId, + "delayed event differ, pid:%x was:%x\n", de0.dwProcessId, ctx->ev.dwProcessId); + ok_(__FILE__,line)(ctx->ev.dwThreadId == de0.dwThreadId, + "delayed event differ, tid:%x was:%x\n", de0.dwThreadId, ctx->ev.dwThreadId); + + if (ctx->ev.dwDebugEventCode != CREATE_PROCESS_DEBUG_EVENT && + ctx->ev.dwDebugEventCode != CREATE_THREAD_DEBUG_EVENT && + ctx->ev.dwDebugEventCode != EXIT_THREAD_DEBUG_EVENT && + ctx->ev.dwDebugEventCode != EXIT_PROCESS_DEBUG_EVENT) + { + thread = OpenThread(THREAD_SUSPEND_RESUME, FALSE, ctx->ev.dwThreadId); + ok_(__FILE__,line)(thread != INVALID_HANDLE_VALUE, "OpenThread failed, last error:%u\n", GetLastError()); + + status = NtSuspendThread(thread, NULL); + ok_(__FILE__,line)(!status, "NtSuspendThread failed, last error:%u\n", GetLastError()); + + ok_(__FILE__,line)(ContinueDebugEvent(ctx->ev.dwProcessId, ctx->ev.dwThreadId, DBG_REPLY_LATER), + "ContinueDebugEvent failed, last error:%u\n", GetLastError()); + + ok_(__FILE__,line)(!WaitForDebugEvent(&de1, 50), "WaitForDebugEvent succeeded.\n"); + status = NtResumeThread(thread, NULL); + + ok_(__FILE__,line)(!status, "NtResumeThread failed, last error:%u\n", GetLastError()); + CloseHandle(thread); + + ok_(__FILE__,line)(WaitForDebugEvent(&de1, 50), "WaitForDebugEvent failed, last error:%u\n", GetLastError()); + ok_(__FILE__,line)(ctx->ev.dwDebugEventCode == de1.dwDebugEventCode, + "delayed event differ, code:%x was:%x\n", de1.dwDebugEventCode, ctx->ev.dwDebugEventCode); + ok_(__FILE__,line)(ctx->ev.dwProcessId == de1.dwProcessId, + "delayed event differ, pid:%x was:%x\n", de1.dwProcessId, ctx->ev.dwProcessId); + ok_(__FILE__,line)(ctx->ev.dwThreadId == de1.dwThreadId, + "delayed event differ, tid:%x was:%x\n", de1.dwThreadId, ctx->ev.dwThreadId); + } + } +} + #define next_event(a,b) next_event_(__LINE__,a,b) static void next_event_(unsigned line, struct debugger_context *ctx, unsigned timeout) { @@ -1273,7 +1323,11 @@ static void test_debugger(const char *argv0) next_event(&ctx, WAIT_EVENT_TIMEOUT); ok(ctx.ev.dwDebugEventCode == CREATE_PROCESS_DEBUG_EVENT, "dwDebugEventCode = %d\n", ctx.ev.dwDebugEventCode); wait_for_breakpoint(&ctx); - do next_event(&ctx, POLL_EVENT_TIMEOUT); + do + { + test_reply_later(&ctx); + next_event(&ctx, POLL_EVENT_TIMEOUT); + } while(ctx.ev.dwDebugEventCode != -1); mem = VirtualAllocEx(pi.hProcess, NULL, sizeof(buf), MEM_COMMIT, PAGE_EXECUTE_READWRITE); @@ -1297,6 +1351,7 @@ static void test_debugger(const char *argv0) debuggee_thread = get_debuggee_thread(&ctx, ctx.ev.dwThreadId); wait_for_breakpoint(&ctx); + test_reply_later(&ctx); fetch_thread_context(debuggee_thread); ok(ctx.ev.u.Exception.ExceptionRecord.ExceptionAddress == thread_proc, "ExceptionAddress = %p\n", ctx.ev.u.Exception.ExceptionRecord.ExceptionAddress); @@ -1304,8 +1359,11 @@ static void test_debugger(const char *argv0) get_ip(&debuggee_thread->ctx)); single_step(&ctx, debuggee_thread, thread_proc + 2); + test_reply_later(&ctx); single_step(&ctx, debuggee_thread, thread_proc + 3); + test_reply_later(&ctx); single_step(&ctx, debuggee_thread, thread_proc); + test_reply_later(&ctx); byte = 0xc3; /* ret */ ret = WriteProcessMemory(pi.hProcess, thread_proc, &byte, 1, NULL); @@ -1328,6 +1386,7 @@ static void test_debugger(const char *argv0) ok(thread != NULL, "CreateRemoteThread failed: %u\n", GetLastError()); expect_event(&ctx, CREATE_THREAD_DEBUG_EVENT); expect_breakpoint_exception(&ctx, NULL); + test_reply_later(&ctx); expect_event(&ctx, EXIT_THREAD_DEBUG_EVENT); /* BREAKPOINT_PROMPT */ -- 2.25.0

2 3

[tools] testbot/LogUtils: Lines have no trailing CRs in ParseWineTestReport().
by Francois Gouget 21 Feb '20

21 Feb '20

The trailing CRs are removed at the start of the parser's loop. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/LogUtils.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 1a87f174b7..b7d10cad7a 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -546,7 +546,7 @@ sub ParseWineTestReport($$$) _AddLogError($LogInfo, $CurGroup, $ErrLine, $LineNo); } - if ($Line =~ m%^([_.a-z0-9-]+):([_a-z0-9]*) (start|skipped) (?:-|[/_.a-z0-9-]+) (?:-|[.0-9a-f]+)\r?$%) + if ($Line =~ m%^([_.a-z0-9-]+):([_a-z0-9]*) (start|skipped) (?:-|[/_.a-z0-9-]+) (?:-|[.0-9a-f]+)$%) { my ($Dll, $Unit, $Type) = ($1, $2, $3); @@ -563,7 +563,7 @@ sub ParseWineTestReport($$$) $CurGroupLineNo = $LineNo; $CurGroup = undef; } - elsif ($Line =~ /^([_.a-z0-9-]+)\.c:\d+: Subtest ([_.a-z0-9-]+)\r?$/) + elsif ($Line =~ /^([_.a-z0-9-]+)\.c:\d+: Subtest ([_.a-z0-9-]+)$/) { my ($Unit, $SubUnit) = ($1, $2); if ($Cur->{Units}->{$Unit}) -- 2.20.1

1 0

[tools] testbot/LogUtils: Don't modify ParseWineTestReport()'s timeout lines.
by Francois Gouget 21 Feb '20

21 Feb '20

Changing the timeout lines for reporting prevented the parser from recognizing them and lead to extraneous missing failure / todo / skip errors. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/LogUtils.pm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 863cca6bf4..1a87f174b7 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -532,17 +532,18 @@ sub ParseWineTestReport($$$) if (GetReportLineCategory($Line) eq "error") { # Make the timeout messages more user-friendly - if ($Line =~ m/^[^:]+:([^:]*):[0-9a-f]+ done $258$/) + my $ErrLine = $Line; + if ($ErrLine =~ /^[^:]+:([^:]*):[0-9a-f]+ done $258$/) { my $Unit = $1; - $Line = $Unit ne "" ? "$Unit: Timeout" : "Timeout"; + $ErrLine = $Unit ne "" ? "$Unit: Timeout" : "Timeout"; } if (!$CurGroup) { $CurGroup = _AddLogGroup($LogInfo, $CurGroupName, $CurGroupLineNo || $LineNo); } - _AddLogError($LogInfo, $CurGroup, $Line, $LineNo); + _AddLogError($LogInfo, $CurGroup, $ErrLine, $LineNo); } if ($Line =~ m%^([_.a-z0-9-]+):([_a-z0-9]*) (start|skipped) (?:-|[/_.a-z0-9-]+) (?:-|[.0-9a-f]+)\r?$%) -- 2.20.1

1 0

[PATCH] kernel32/tests: Link to activation context API directly.
by Nikolay Sivov 21 Feb '20

21 Feb '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/kernel32/tests/path.c | 35 ++++++------------------------ dlls/kernel32/tests/thread.c | 41 +++++++++++------------------------- 2 files changed, 19 insertions(+), 57 deletions(-) diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index 3d717f7b1f..7342a865af 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -80,12 +80,6 @@ static NTSTATUS (WINAPI *pRtlGetSearchPath)(LPWSTR*); static void (WINAPI *pRtlReleasePath)(LPWSTR); static NTSTATUS (WINAPI *pLdrGetDllPath)(LPCWSTR,ULONG,LPWSTR*,LPWSTR*); -static BOOL (WINAPI *pActivateActCtx)(HANDLE,ULONG_PTR*); -static HANDLE (WINAPI *pCreateActCtxW)(PCACTCTXW); -static BOOL (WINAPI *pDeactivateActCtx)(DWORD,ULONG_PTR); -static BOOL (WINAPI *pGetCurrentActCtx)(HANDLE *); -static void (WINAPI *pReleaseActCtx)(HANDLE); - static BOOL (WINAPI *pCheckNameLegalDOS8Dot3W)(const WCHAR *, char *, DWORD, BOOL *, BOOL *); static BOOL (WINAPI *pCheckNameLegalDOS8Dot3A)(const char *, char *, DWORD, BOOL *, BOOL *); @@ -1758,7 +1752,7 @@ static HANDLE test_create(const char *file) actctx.cbSize = sizeof(ACTCTXW); actctx.lpSource = manifest_path; - handle = pCreateActCtxW(&actctx); + handle = CreateActCtxW(&actctx); ok(handle != INVALID_HANDLE_VALUE, "failed to create context, error %u\n", GetLastError()); ok(actctx.cbSize == sizeof(actctx), "cbSize=%d\n", actctx.cbSize); @@ -1825,9 +1819,6 @@ static void test_SearchPathA(void) DeleteFileA(path2A); - if (!pActivateActCtx) - return; - GetWindowsDirectoryA(pathA, ARRAY_SIZE(pathA)); create_manifest_file("testdep1.manifest", manifest_dep); @@ -1844,7 +1835,7 @@ static void test_SearchPathA(void) ret = SearchPathA(NULL, kernel32A, NULL, ARRAY_SIZE(path2A), path2A, NULL); ok(ret && ret == strlen(path2A), "got %d\n", ret); - ret = pActivateActCtx(handle, &cookie); + ret = ActivateActCtx(handle, &cookie); ok(ret, "failed to activate context, %u\n", GetLastError()); /* works when activated */ @@ -1873,9 +1864,9 @@ static void test_SearchPathA(void) ok(ret && ret == strlen(buffA), "got %d\n", ret); ok(strcmp(buffA, path2A), "got wrong path %s, %s\n", buffA, path2A); - ret = pDeactivateActCtx(0, cookie); + ret = DeactivateActCtx(0, cookie); ok(ret, "failed to deactivate context, %u\n", GetLastError()); - pReleaseActCtx(handle); + ReleaseActCtx(handle); /* test the search path priority of the working directory */ GetTempPathA(sizeof(tmpdirA), tmpdirA); @@ -1957,9 +1948,6 @@ if (0) DeleteFileW(path2W); - if (!pActivateActCtx) - return; - GetWindowsDirectoryW(pathW, ARRAY_SIZE(pathW)); create_manifest_file("testdep1.manifest", manifest_dep); @@ -1983,7 +1971,7 @@ if (0) GetWindowsDirectoryW(pathW, ARRAY_SIZE(pathW)); - ret = pActivateActCtx(handle, &cookie); + ret = ActivateActCtx(handle, &cookie); ok(ret, "failed to activate context, %u\n", GetLastError()); /* works when activated */ @@ -2016,9 +2004,9 @@ if (0) ret = SearchPathW(NULL, ole32W, NULL, ARRAY_SIZE(buffW), buffW, NULL); ok(ret && ret == lstrlenW(buffW), "got %d\n", ret); - ret = pDeactivateActCtx(0, cookie); + ret = DeactivateActCtx(0, cookie); ok(ret, "failed to deactivate context, %u\n", GetLastError()); - pReleaseActCtx(handle); + ReleaseActCtx(handle); } static void test_GetFullPathNameA(void) @@ -2157,11 +2145,6 @@ static void init_pointers(void) MAKEFUNC(RemoveDllDirectory); MAKEFUNC(SetDllDirectoryW); MAKEFUNC(SetDefaultDllDirectories); - MAKEFUNC(ActivateActCtx); - MAKEFUNC(CreateActCtxW); - MAKEFUNC(DeactivateActCtx); - MAKEFUNC(GetCurrentActCtx); - MAKEFUNC(ReleaseActCtx); MAKEFUNC(CheckNameLegalDOS8Dot3W); MAKEFUNC(CheckNameLegalDOS8Dot3A); mod = GetModuleHandleA("ntdll.dll"); @@ -2695,10 +2678,6 @@ START_TEST(path) init_pointers(); - /* Report only once */ - if (!pActivateActCtx) - win_skip("Activation contexts not supported, some tests will be skipped\n"); - test_relative_path(); test_InitPathA(curdir, &curDrive, &otherDrive); test_CurrentDirectoryA(origdir,curdir); diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index 8c27024cf2..3b9a407e73 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -90,11 +90,6 @@ static BOOL (WINAPI *pIsWow64Process)(HANDLE,PBOOL); static BOOL (WINAPI *pSetThreadErrorMode)(DWORD,PDWORD); static DWORD (WINAPI *pGetThreadErrorMode)(void); static DWORD (WINAPI *pRtlGetThreadErrorMode)(void); -static BOOL (WINAPI *pActivateActCtx)(HANDLE,ULONG_PTR*); -static HANDLE (WINAPI *pCreateActCtxW)(PCACTCTXW); -static BOOL (WINAPI *pDeactivateActCtx)(DWORD,ULONG_PTR); -static BOOL (WINAPI *pGetCurrentActCtx)(HANDLE *); -static void (WINAPI *pReleaseActCtx)(HANDLE); static PTP_POOL (WINAPI *pCreateThreadpool)(PVOID); static void (WINAPI *pCloseThreadpool)(PTP_POOL); static PTP_WORK (WINAPI *pCreateThreadpoolWork)(PTP_WORK_CALLBACK,PVOID,PTP_CALLBACK_ENVIRON); @@ -312,7 +307,7 @@ static DWORD WINAPI thread_actctx_func(void *p) BOOL ret; cur = (void*)0xdeadbeef; - ret = pGetCurrentActCtx(&cur); + ret = GetCurrentActCtx(&cur); ok(ret, "thread GetCurrentActCtx failed, %u\n", GetLastError()); ok(cur == param->handle, "got %p, expected %p\n", cur, param->handle); param->thread_context = cur; @@ -1852,7 +1847,7 @@ static HANDLE test_create(const char *file) actctx.cbSize = sizeof(ACTCTXW); actctx.lpSource = path; - handle = pCreateActCtxW(&actctx); + handle = CreateActCtxW(&actctx); ok(handle != INVALID_HANDLE_VALUE, "failed to create context, error %u\n", GetLastError()); ok(actctx.cbSize == sizeof(actctx), "cbSize=%d\n", actctx.cbSize); @@ -1876,12 +1871,6 @@ static void test_thread_actctx(void) DWORD tid, ret; BOOL b; - if (!pActivateActCtx) - { - win_skip("skipping activation context tests\n"); - return; - } - create_manifest_file("testdep1.manifest", manifest_dep); create_manifest_file("main.manifest", manifest_main); @@ -1890,7 +1879,7 @@ static void test_thread_actctx(void) DeleteFileA("main.manifest"); handle = (void*)0xdeadbeef; - b = pGetCurrentActCtx(&handle); + b = GetCurrentActCtx(&handle); ok(b, "GetCurrentActCtx failed: %u\n", GetLastError()); ok(handle == 0, "active context %p\n", handle); @@ -1905,17 +1894,17 @@ static void test_thread_actctx(void) ok(param.thread_context == NULL, "got wrong thread context %p\n", param.thread_context); CloseHandle(thread); - b = pActivateActCtx(context, &cookie); + b = ActivateActCtx(context, &cookie); ok(b, "activation failed: %u\n", GetLastError()); handle = 0; - b = pGetCurrentActCtx(&handle); + b = GetCurrentActCtx(&handle); ok(b, "GetCurrentActCtx failed: %u\n", GetLastError()); ok(handle != 0, "no active context\n"); - pReleaseActCtx(handle); + ReleaseActCtx(handle); param.handle = NULL; - b = pGetCurrentActCtx(&param.handle); + b = GetCurrentActCtx(&param.handle); ok(b && param.handle != NULL, "failed to get context, %u\n", GetLastError()); param.thread_context = (void*)0xdeadbeef; @@ -1925,7 +1914,7 @@ static void test_thread_actctx(void) ret = WaitForSingleObject(thread, 1000); ok(ret == WAIT_OBJECT_0, "wait timeout\n"); ok(param.thread_context == context, "got wrong thread context %p, %p\n", param.thread_context, context); - pReleaseActCtx(param.thread_context); + ReleaseActCtx(param.thread_context); CloseHandle(thread); /* similar test for CreateRemoteThread() */ @@ -1936,17 +1925,16 @@ static void test_thread_actctx(void) ret = WaitForSingleObject(thread, 1000); ok(ret == WAIT_OBJECT_0, "wait timeout\n"); ok(param.thread_context == context, "got wrong thread context %p, %p\n", param.thread_context, context); - pReleaseActCtx(param.thread_context); + ReleaseActCtx(param.thread_context); CloseHandle(thread); - pReleaseActCtx(param.handle); + ReleaseActCtx(param.handle); - b = pDeactivateActCtx(0, cookie); + b = DeactivateActCtx(0, cookie); ok(b, "DeactivateActCtx failed: %u\n", GetLastError()); - pReleaseActCtx(context); + ReleaseActCtx(context); } - static void WINAPI threadpool_workcallback(PTP_CALLBACK_INSTANCE instance, void *context, PTP_WORK work) { int *foo = (int*)context; @@ -2267,11 +2255,6 @@ static void init_funcs(void) X(IsWow64Process); X(SetThreadErrorMode); X(GetThreadErrorMode); - X(ActivateActCtx); - X(CreateActCtxW); - X(DeactivateActCtx); - X(GetCurrentActCtx); - X(ReleaseActCtx); X(CreateThreadpool); X(CloseThreadpool); -- 2.25.0

1 0