May 2019 - Wine-devel - list.winehq.org

[PATCH] ntoskrnl.exe/tests: Avoid linking directly to CancelIoEx().
by Zebediah Figura 03 May '19

03 May '19

It's not available before Vista. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 69 ++++++++++++++++-------------- 1 file changed, 37 insertions(+), 32 deletions(-) diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index d9eb28611d..33027d9e62 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -32,8 +32,9 @@ static HANDLE device; -static BOOL (WINAPI *pRtlDosPathNameToNtPathName_U)( LPCWSTR, PUNICODE_STRING, PWSTR*, CURDIR* ); -static BOOL (WINAPI *pRtlFreeUnicodeString)( PUNICODE_STRING ); +static BOOL (WINAPI *pRtlDosPathNameToNtPathName_U)(const WCHAR *, UNICODE_STRING *, WCHAR **, CURDIR *); +static BOOL (WINAPI *pRtlFreeUnicodeString)(UNICODE_STRING *); +static BOOL (WINAPI *pCancelIoEx)(HANDLE, OVERLAPPED *); static void load_resource(const char *name, char *filename) { @@ -240,36 +241,39 @@ static void test_cancel_io(void) ok(cancel_cnt == 2, "cancel_cnt = %u\n", cancel_cnt); /* test cancelling selected overlapped event */ - res = DeviceIoControl(file, IOCTL_WINETEST_RESET_CANCEL, NULL, 0, NULL, 0, NULL, &overlapped); - todo_wine - ok(res, "DeviceIoControl failed: %u\n", GetLastError()); - if (!res && GetLastError() == ERROR_IO_PENDING) WaitForSingleObject(overlapped.hEvent, INFINITE); - - res = DeviceIoControl(file, IOCTL_WINETEST_TEST_CANCEL, NULL, 0, NULL, 0, NULL, &overlapped); - ok(!res && GetLastError() == ERROR_IO_PENDING, "DeviceIoControl failed: %u\n", GetLastError()); - - res = DeviceIoControl(file, IOCTL_WINETEST_TEST_CANCEL, NULL, 0, NULL, 0, NULL, &overlapped2); - ok(!res && GetLastError() == ERROR_IO_PENDING, "DeviceIoControl failed: %u\n", GetLastError()); - - CancelIoEx(file, &overlapped); - - cancel_cnt = 0xdeadbeef; - res = DeviceIoControl(file, IOCTL_WINETEST_GET_CANCEL_COUNT, NULL, 0, &cancel_cnt, sizeof(cancel_cnt), NULL, &overlapped); - todo_wine - ok(res, "DeviceIoControl failed: %u\n", GetLastError()); - if (!res && GetLastError() == ERROR_IO_PENDING) WaitForSingleObject(overlapped.hEvent, INFINITE); - todo_wine - ok(cancel_cnt == 1, "cancel_cnt = %u\n", cancel_cnt); - - CancelIoEx(file, &overlapped2); - - cancel_cnt = 0xdeadbeef; - res = DeviceIoControl(file, IOCTL_WINETEST_GET_CANCEL_COUNT, NULL, 0, &cancel_cnt, sizeof(cancel_cnt), NULL, &overlapped); - todo_wine - ok(res, "DeviceIoControl failed: %u\n", GetLastError()); - if (!res && GetLastError() == ERROR_IO_PENDING) WaitForSingleObject(overlapped.hEvent, INFINITE); - todo_wine - ok(cancel_cnt == 2, "cancel_cnt = %u\n", cancel_cnt); + if (pCancelIoEx) + { + res = DeviceIoControl(file, IOCTL_WINETEST_RESET_CANCEL, NULL, 0, NULL, 0, NULL, &overlapped); + todo_wine + ok(res, "DeviceIoControl failed: %u\n", GetLastError()); + if (!res && GetLastError() == ERROR_IO_PENDING) WaitForSingleObject(overlapped.hEvent, INFINITE); + + res = DeviceIoControl(file, IOCTL_WINETEST_TEST_CANCEL, NULL, 0, NULL, 0, NULL, &overlapped); + ok(!res && GetLastError() == ERROR_IO_PENDING, "DeviceIoControl failed: %u\n", GetLastError()); + + res = DeviceIoControl(file, IOCTL_WINETEST_TEST_CANCEL, NULL, 0, NULL, 0, NULL, &overlapped2); + ok(!res && GetLastError() == ERROR_IO_PENDING, "DeviceIoControl failed: %u\n", GetLastError()); + + pCancelIoEx(file, &overlapped); + + cancel_cnt = 0xdeadbeef; + res = DeviceIoControl(file, IOCTL_WINETEST_GET_CANCEL_COUNT, NULL, 0, &cancel_cnt, sizeof(cancel_cnt), NULL, &overlapped); + todo_wine + ok(res, "DeviceIoControl failed: %u\n", GetLastError()); + if (!res && GetLastError() == ERROR_IO_PENDING) WaitForSingleObject(overlapped.hEvent, INFINITE); + todo_wine + ok(cancel_cnt == 1, "cancel_cnt = %u\n", cancel_cnt); + + pCancelIoEx(file, &overlapped2); + + cancel_cnt = 0xdeadbeef; + res = DeviceIoControl(file, IOCTL_WINETEST_GET_CANCEL_COUNT, NULL, 0, &cancel_cnt, sizeof(cancel_cnt), NULL, &overlapped); + todo_wine + ok(res, "DeviceIoControl failed: %u\n", GetLastError()); + if (!res && GetLastError() == ERROR_IO_PENDING) WaitForSingleObject(overlapped.hEvent, INFINITE); + todo_wine + ok(cancel_cnt == 2, "cancel_cnt = %u\n", cancel_cnt); + } CloseHandle(overlapped.hEvent); CloseHandle(overlapped2.hEvent); @@ -332,6 +336,7 @@ START_TEST(ntoskrnl) HMODULE hntdll = GetModuleHandleA("ntdll.dll"); pRtlDosPathNameToNtPathName_U = (void *)GetProcAddress(hntdll, "RtlDosPathNameToNtPathName_U"); pRtlFreeUnicodeString = (void *)GetProcAddress(hntdll, "RtlFreeUnicodeString"); + pCancelIoEx = (void *)GetProcAddress(GetModuleHandleA("kernel32.dll"), "CancelIoEx"); if (!(service = load_driver(filename, "driver.dll", "WineTestDriver"))) return; -- 2.21.0

2 1

[PATCH] ntoskrnl.exe/tests: Use coarser waits for timer tests.
by Zebediah Figura 03 May '19

03 May '19

In an attempt to mitigate intermittent failures on Linux. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ntoskrnl.exe/tests/driver.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index a82bc1662b..777f587481 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -648,13 +648,13 @@ static void test_sync(void) /* test timers */ KeInitializeTimerEx(&timer, NotificationTimer); - timeout.QuadPart = -100; + timeout.QuadPart = -20 * 10000; KeSetTimerEx(&timer, timeout, 0, NULL); ret = wait_single(&timer, 0); ok(ret == WAIT_TIMEOUT, "got %#x\n", ret); - ret = wait_single(&timer, -200); + ret = wait_single(&timer, -40 * 10000); ok(ret == 0, "got %#x\n", ret); ret = wait_single(&timer, 0); @@ -668,28 +668,28 @@ static void test_sync(void) ret = wait_single(&timer, 0); ok(ret == WAIT_TIMEOUT, "got %#x\n", ret); - ret = wait_single(&timer, -200); + ret = wait_single(&timer, -40 * 10000); ok(ret == 0, "got %#x\n", ret); - ret = wait_single(&timer, 0); + ret = wait_single(&timer, -40 * 10000); ok(ret == WAIT_TIMEOUT, "got %#x\n", ret); KeCancelTimer(&timer); - KeSetTimerEx(&timer, timeout, 10, NULL); + KeSetTimerEx(&timer, timeout, 20, NULL); ret = wait_single(&timer, 0); ok(ret == WAIT_TIMEOUT, "got %#x\n", ret); - ret = wait_single(&timer, -200); + ret = wait_single(&timer, -40 * 10000); ok(ret == 0, "got %#x\n", ret); ret = wait_single(&timer, 0); ok(ret == WAIT_TIMEOUT, "got %#x\n", ret); - ret = wait_single(&timer, -20 * 10000); + ret = wait_single(&timer, -40 * 10000); ok(ret == 0, "got %#x\n", ret); - ret = wait_single(&timer, -20 * 10000); + ret = wait_single(&timer, -40 * 10000); ok(ret == 0, "got %#x\n", ret); KeCancelTimer(&timer); -- 2.21.0

2 1

How can I export atexit and puts?
by Josh Branning 03 May '19

03 May '19

Hi, I am trying to export atexit and puts using wine, I wrote a spec file, libwinecompat.spec with the following: @ cdecl atexit(ptr) MSVCRT_atexit @ cdecl puts(str) MSVCRT_puts _________________________________________________________________________ I build an ar archive with: winebuild --implib -o libwinecompat.a -E libwinecompat.spec _________________________________________________________________________ I then test using this program ... /* atexit example */ #include <stdio.h> /* puts */ #include <stdlib.h> /* atexit */ void fnExit1 (void) { puts ("Exit function 1."); } void fnExit2 (void) { puts ("Exit function 2."); } int main () { atexit (fnExit1); atexit (fnExit2); puts ("Main function."); return 0; } ____________________________________________________________________________ ...And compile with sudo mv /usr/i686-w64-mingw32/lib/libmsvcrt.a /usr/i686-w64-mingw32/lib/libmsvcrt.a.old i686-w64-mingw32-gcc -nostdlib test.c -lmsvcrt -L. -lwinecompat sudo mv /usr/i686-w64-mingw32/lib/libmsvcrt.a.old /usr/i686-w64-mingw32/lib/libmsvcrt.a _____________________________________________________________________________ I know mingw's msvcrt is not linked and wine's msvcrt is. Unfortuately I still get the following errors: undefined reference to `puts' undefined reference to `atexit' ________________________________________________________________________________ Any help much appreciated, Josh

2 1

[PATCH 3/6] server: Store currently executed IRP call on server side.
by Jacek Caban 03 May '19

03 May '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- server/device.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-)

2 1

[PATCH 2/6] server: Don't use IRP_MJ_* constants for ntoskrnl.exe communication.
by Jacek Caban 03 May '19

03 May '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 59 ++++++++++-------------------------- server/device.c | 44 ++++++++++++++------------- server/protocol.def | 30 ++++++++++++------ server/trace.c | 38 ++++++++++++----------- 4 files changed, 80 insertions(+), 91 deletions(-)

2 1

[PATCH 6/6] ntoskrnl.exe: Don't keep reference to driver created file objects on client side.
by Jacek Caban 03 May '19

03 May '19

Server keeps instead. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 8 -------- 1 file changed, 8 deletions(-)

1 0

[PATCH 5/6] ntoskrnl.exe: Associate file object with server object before calling IRP routine.
by Jacek Caban 03 May '19

03 May '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 12 +++++------- server/device.c | 2 -- server/protocol.def | 1 - server/trace.c | 1 - 4 files changed, 5 insertions(+), 11 deletions(-)

1 0

[PATCH 4/6] server: Pass file object handle in IRP_CALL_CREATE request.
by Jacek Caban 03 May '19

03 May '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- server/device.c | 65 ++++++++++++++++++++++++++++++--------------- server/protocol.def | 1 + server/trace.c | 2 +- 3 files changed, 46 insertions(+), 22 deletions(-)

1 0

[PATCH 1/6] server: Pass IRP output size in irp_params_t.
by Jacek Caban 03 May '19

03 May '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 23 ++++++++++++----------- server/device.c | 7 ++++--- server/protocol.def | 5 ++++- server/trace.c | 5 +++-- tools/make_requests | 2 +- 5 files changed, 24 insertions(+), 18 deletions(-)

1 0

[PATCH] riched32/tests: Test the correct return value
by Michael Stefaniuc 03 May '19

03 May '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/riched32/tests/editor.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/riched32/tests/editor.c b/dlls/riched32/tests/editor.c index 7394203cb7..0d55b7cd6e 100644 --- a/dlls/riched32/tests/editor.c +++ b/dlls/riched32/tests/editor.c @@ -1263,8 +1263,8 @@ static void test_enter(void) SendMessageW(hwndRichEdit, WM_CHAR, 'T', 0); SendMessageW(hwndRichEdit, WM_CHAR, '\r', 0); - SendMessageA(hwndRichEdit, EM_GETTEXTEX, (WPARAM)&getText, (LPARAM)buf); - ok(result == 1, "Got %d\n", (int)result); + result = SendMessageA(hwndRichEdit, EM_GETTEXTEX, (WPARAM)&getText, (LPARAM)buf); + ok(result == 3, "Got %ld\n", result); format_test_result(resultbuf, buf); format_test_result(expectedbuf, "T\r\n"); result = strcmp(resultbuf, expectedbuf); -- 2.20.1

1 0