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

Nikolay Sivov : mf: Implement file scheme handler.
by Alexandre Julliard 03 May '19

03 May '19

Module: wine Branch: master Commit: 8c69a77032ff8d5f0a79c387646f40716d9393ad URL: https://source.winehq.org/git/wine.git/?a=commit;h=8c69a77032ff8d5f0a79c387… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 3 14:53:00 2019 +0300 mf: Implement file scheme handler. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/Makefile.in | 2 +- dlls/mf/main.c | 381 ++++++++++++++++++++++++++++++++++++++++++++- dlls/mfplat/tests/mfplat.c | 27 ++-- 3 files changed, 385 insertions(+), 25 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8c69a77032ff8d5f0a79…

1 0

Nikolay Sivov : wmvcore: Return success from OpenStream().
by Alexandre Julliard 03 May '19

03 May '19

Module: wine Branch: master Commit: 054f95e6599f93adf7bc45b65e74f2e24b5b96c8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=054f95e6599f93adf7bc45b6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 3 14:53:32 2019 +0300 wmvcore: Return success from OpenStream(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmvcore/reader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wmvcore/reader.c b/dlls/wmvcore/reader.c index d35f29d..6041c56 100644 --- a/dlls/wmvcore/reader.c +++ b/dlls/wmvcore/reader.c @@ -2222,7 +2222,7 @@ static HRESULT WINAPI WMSyncReader_OpenStream(IWMSyncReader *iface, IStream *str { WMSyncReader *This = impl_from_IWMSyncReader(iface); FIXME("(%p)->(%p): stub!\n", This, stream); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI WMSyncReader_SetOutputProps(IWMSyncReader *iface, DWORD output_num, IWMOutputMediaProps *output)

1 0

Michael Stefaniuc : riched32/tests: Test the correct return value.
by Alexandre Julliard 03 May '19

03 May '19

Module: wine Branch: master Commit: 4b3b27a7f139471d8f479b5702c6a0a8993d8d57 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4b3b27a7f139471d8f479b57… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri May 3 15:19:51 2019 +0200 riched32/tests: Test the correct return value. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(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 7394203..0d55b7c 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);

1 0

Piotr Caban : winebus.sys: Add more traces on hidraw communication errors.
by Alexandre Julliard 03 May '19

03 May '19

Module: wine Branch: master Commit: 926797383536df797fb8f7e8643a5805559ab539 URL: https://source.winehq.org/git/wine.git/?a=commit;h=926797383536df797fb8f7e8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri May 3 11:57:52 2019 +0200 winebus.sys: Add more traces on hidraw communication errors. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_udev.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 99753d6..e8e837a 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -765,7 +765,7 @@ static DWORD CALLBACK device_report_thread(void *args) break; size = read(plfds[0].fd, report_buffer, sizeof(report_buffer)); if (size == -1) - TRACE_(hid_report)("Read failed. Likely an unplugged device\n"); + TRACE_(hid_report)("Read failed. Likely an unplugged device %d %s\n", errno, strerror(errno)); else if (size == 0) TRACE_(hid_report)("Failed to read report\n"); else @@ -827,6 +827,7 @@ static NTSTATUS hidraw_set_output_report(DEVICE_OBJECT *device, UCHAR id, BYTE * } else { + TRACE("write failed: %d %d %s\n", rc, errno, strerror(errno)); *written = 0; return STATUS_UNSUCCESSFUL; } @@ -847,6 +848,7 @@ static NTSTATUS hidraw_get_feature_report(DEVICE_OBJECT *device, UCHAR id, BYTE } else { + TRACE_(hid_report)("ioctl(HIDIOCGFEATURE(%d)) failed: %d %s\n", length, errno, strerror(errno)); *read = 0; return STATUS_UNSUCCESSFUL; } @@ -887,6 +889,7 @@ static NTSTATUS hidraw_set_feature_report(DEVICE_OBJECT *device, UCHAR id, BYTE } else { + TRACE_(hid_report)("ioctl(HIDIOCSFEATURE(%d)) failed: %d %s\n", length, errno, strerror(errno)); *written = 0; return STATUS_UNSUCCESSFUL; }

1 0

Zebediah Figura : setupapi: Add magic bytes to struct file_queue and validate them in SetupCloseFileQueue ().
by Alexandre Julliard 03 May '19

03 May '19

Module: wine Branch: master Commit: c65d98065c0038e0919f40bec4a9dc978fb2ade9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c65d98065c0038e0919f40be… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu May 2 23:10:04 2019 -0500 setupapi: Add magic bytes to struct file_queue and validate them in SetupCloseFileQueue(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=12332 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/queue.c | 11 +++++++++++ dlls/setupapi/tests/install.c | 16 ++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/dlls/setupapi/queue.c b/dlls/setupapi/queue.c index c065c6e..f267380 100644 --- a/dlls/setupapi/queue.c +++ b/dlls/setupapi/queue.c @@ -79,6 +79,7 @@ struct file_op_queue struct file_queue { + DWORD magic; struct file_op_queue copy_queue; struct file_op_queue delete_queue; struct file_op_queue rename_queue; @@ -87,6 +88,7 @@ struct file_queue unsigned int source_count; }; +#define FILE_QUEUE_MAGIC 0x21514653 /* append a file operation to a queue */ static inline void queue_file_op( struct file_op_queue *queue, struct file_op *op ) @@ -434,6 +436,7 @@ HSPFILEQ WINAPI SetupOpenFileQueue(void) if (!(queue = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*queue)))) return INVALID_HANDLE_VALUE; + queue->magic = FILE_QUEUE_MAGIC; return queue; } @@ -446,6 +449,14 @@ BOOL WINAPI SetupCloseFileQueue( HSPFILEQ handle ) struct file_queue *queue = handle; unsigned int i; + /* Windows XP DDK installer passes the handle returned from + * SetupInitDefaultQueueCallback() to this function. */ + if (queue->magic != FILE_QUEUE_MAGIC) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + free_file_op_queue( &queue->copy_queue ); free_file_op_queue( &queue->rename_queue ); free_file_op_queue( &queue->delete_queue ); diff --git a/dlls/setupapi/tests/install.c b/dlls/setupapi/tests/install.c index 15b789f..85f532a 100644 --- a/dlls/setupapi/tests/install.c +++ b/dlls/setupapi/tests/install.c @@ -1815,6 +1815,21 @@ static void test_need_media(void) ok(ret, "Failed to delete INF file, error %u.\n", GetLastError()); } +static void test_close_queue(void) +{ + void *context; + BOOL ret; + + context = SetupInitDefaultQueueCallback(NULL); + ok(!!context, "Failed to create callback context, error %#x.\n", GetLastError()); + + ret = SetupCloseFileQueue(context); + ok(!ret, "Expected failure.\n"); + ok(GetLastError() == ERROR_INVALID_HANDLE, "Got unexpected error %u.\n", GetLastError()); + + SetupTermDefaultQueueCallback(context); +} + START_TEST(install) { char temp_path[MAX_PATH], prev_path[MAX_PATH]; @@ -1841,6 +1856,7 @@ START_TEST(install) test_dirid(); test_install_files_queue(); test_need_media(); + test_close_queue(); UnhookWindowsHookEx(hhook);

1 0

Zebediah Figura : ntoskrnl.exe/tests: Use coarser waits for timer tests.
by Alexandre Julliard 03 May '19

03 May '19

Module: wine Branch: master Commit: ecdb5e82fe1e8cfda94ebdffa297bd77d6b25faa URL: https://source.winehq.org/git/wine.git/?a=commit;h=ecdb5e82fe1e8cfda94ebdff… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri May 3 09:51:41 2019 -0500 ntoskrnl.exe/tests: Use coarser waits for timer tests. In an attempt to mitigate intermittent failures on Linux. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 35a86bb..b4624e9 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);

1 0

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

03 May '19

Module: wine Branch: master Commit: 39e9b841e5ca58b95b87b610dce3ad7dfa664776 URL: https://source.winehq.org/git/wine.git/?a=commit;h=39e9b841e5ca58b95b87b610… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri May 3 10:17:17 2019 -0500 ntoskrnl.exe/tests: Avoid linking directly to CancelIoEx(). It's not available before Vista. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 d9eb286..33027d9 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;

1 0

Michael Stefaniuc : mfplat/tests: Remove a duplicated ok() check.
by Alexandre Julliard 03 May '19

03 May '19

Module: wine Branch: master Commit: de74a92eaba6747f39a2ec6021e60bb60ba4be54 URL: https://source.winehq.org/git/wine.git/?a=commit;h=de74a92eaba6747f39a2ec60… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri May 3 18:46:35 2019 +0200 mfplat/tests: Remove a duplicated ok() check. Also fix the text of the first ok() call. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/tests/mfplat.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 6eab13e..3afb330 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -192,12 +192,11 @@ if(0) count = 0; ret = MFTEnum(MFT_CATEGORY_OTHER, 0, NULL, NULL, NULL, NULL, &count); ok(ret == E_POINTER, "Failed to enumerate filters: %x\n", ret); - ok(count == 0, "Expected count > 0\n"); + ok(count == 0, "Expected count == 0\n"); clsids = NULL; ret = MFTEnum(MFT_CATEGORY_OTHER, 0, NULL, NULL, NULL, &clsids, NULL); ok(ret == E_POINTER, "Failed to enumerate filters: %x\n", ret); - ok(count == 0, "Expected count > 0\n"); } count = 0;

1 0

Jacek Caban : server: Pass IRP output size in irp_params_t.
by Alexandre Julliard 03 May '19

03 May '19

Module: wine Branch: master Commit: 8bce6309ac01cdc17eb418b4024b1c08db710ccd URL: https://source.winehq.org/git/wine.git/?a=commit;h=8bce6309ac01cdc17eb418b4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 3 15:39:27 2019 +0200 server: Pass IRP output size in irp_params_t. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 23 ++++++++++++----------- include/wine/server_protocol.h | 8 ++++++-- server/device.c | 7 ++++--- server/protocol.def | 5 ++++- server/request.h | 13 ++++++------- server/trace.c | 5 +++-- tools/make_requests | 2 +- 7 files changed, 36 insertions(+), 27 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8bce6309ac01cdc17eb4…

1 0

Jacek Caban : server: Don' t use IRP_MJ_* constants for ntoskrnl.exe communication.
by Alexandre Julliard 03 May '19

03 May '19

Module: wine Branch: master Commit: b1e1111d7b0840615eb4516462eda1cc985109dd URL: https://source.winehq.org/git/wine.git/?a=commit;h=b1e1111d7b0840615eb45164… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 3 15:40:05 2019 +0200 server: Don't use IRP_MJ_* constants for ntoskrnl.exe communication. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 59 ++++++++++++------------------------------ include/wine/server_protocol.h | 32 ++++++++++++++++------- server/device.c | 44 ++++++++++++++++--------------- server/protocol.def | 30 ++++++++++++++------- server/trace.c | 38 ++++++++++++++------------- 5 files changed, 102 insertions(+), 101 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b1e1111d7b0840615eb4…

1 0