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

Enol Puente : wrc: Add Asturian locale.
by Alexandre Julliard May 3, 2019

May 3, 2019

Module: wine Branch: master Commit: ec3181633b0e5d2d2b66cab711eacc6241c2597a URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec3181633b0e5d2d2b66cab7… Author: Enol Puente <enolp(a)softastur.org> Date: Mon Apr 29 20:38:34 2019 -0600 wrc: Add Asturian locale. Signed-off-by: Enol Puente <enolp(a)softastur.org> Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winnt.rh | 1 + tools/wrc/po.c | 2 ++ tools/wrc/utils.c | 1 + 3 files changed, 4 insertions(+) diff --git a/include/winnt.rh b/include/winnt.rh index 50aafb1..59791bc 100644 --- a/include/winnt.rh +++ b/include/winnt.rh @@ -185,6 +185,7 @@ #define LANG_VENDA 0x33 /* non standard; keep the number high enough (but < 0xff) */ +#define LANG_ASTURIAN 0xa5 #define LANG_ESPERANTO 0x8f #define LANG_WALON 0x90 #define LANG_CORNISH 0x92 diff --git a/tools/wrc/po.c b/tools/wrc/po.c index 913a918..3f5affd 100644 --- a/tools/wrc/po.c +++ b/tools/wrc/po.c @@ -239,6 +239,8 @@ static const struct { LANG_ARMENIAN, SUBLANG_ARMENIAN_ARMENIA, "hy_AM" }, { LANG_ASSAMESE, SUBLANG_NEUTRAL, "as" }, { LANG_ASSAMESE, SUBLANG_ASSAMESE_INDIA, "as_IN" }, + { LANG_ASTURIAN, SUBLANG_NEUTRAL, "ast" }, + { LANG_ASTURIAN, SUBLANG_DEFAULT, "ast_ES" }, { LANG_AZERBAIJANI, SUBLANG_NEUTRAL, "az" }, { LANG_AZERBAIJANI, SUBLANG_AZERBAIJANI_AZERBAIJAN_LATIN,"az_AZ(a)latin" }, { LANG_AZERBAIJANI, SUBLANG_AZERBAIJANI_AZERBAIJAN_CYRILLIC, "az_AZ(a)cyrillic" }, diff --git a/tools/wrc/utils.c b/tools/wrc/utils.c index 5533a53..a1e07b8 100644 --- a/tools/wrc/utils.c +++ b/tools/wrc/utils.c @@ -457,6 +457,7 @@ static const struct lang2cp lang2cps[] = { LANG_ARABIC, SUBLANG_NEUTRAL, 1256 }, { LANG_ARMENIAN, SUBLANG_NEUTRAL, 0 }, { LANG_ASSAMESE, SUBLANG_NEUTRAL, 0 }, + { LANG_ASTURIAN, SUBLANG_NEUTRAL, 1252 }, { LANG_AZERI, SUBLANG_NEUTRAL, 1254 }, { LANG_AZERI, SUBLANG_AZERI_CYRILLIC, 1251 }, { LANG_BASHKIR, SUBLANG_NEUTRAL, 1251 },

1 0

Jacek Caban : ntoskrnl.exe: Associate file object with server object before calling IRP routine.
by Alexandre Julliard May 3, 2019

May 3, 2019

Module: wine Branch: master Commit: bd94c43fcf1552a08856a35b15767e620850e204 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bd94c43fcf1552a08856a35b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 3 15:40:57 2019 +0200 ntoskrnl.exe: Associate file object with server object before calling IRP routine. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 12 +++++------- include/wine/server_protocol.h | 3 +-- server/device.c | 2 -- server/protocol.def | 1 - server/request.h | 3 +-- server/trace.c | 1 - 6 files changed, 7 insertions(+), 15 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 016245d..bfc8d27 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -562,7 +562,6 @@ static NTSTATUS WINAPI dispatch_irp_completion( DEVICE_OBJECT *device, IRP *irp, { req->handle = wine_server_obj_handle( irp_handle ); req->status = irp->IoStatus.u.Status; - req->file_ptr = wine_server_client_ptr( file ); if (irp->IoStatus.u.Status >= 0) { req->size = irp->IoStatus.Information; @@ -606,8 +605,10 @@ static NTSTATUS dispatch_create( const irp_params_t *params, void *in_buff, ULON IO_STACK_LOCATION *irpsp; FILE_OBJECT *file; DEVICE_OBJECT *device = wine_server_get_ptr( params->create.device ); + HANDLE handle = wine_server_ptr_handle( params->create.file ); - if (!(file = alloc_kernel_object( IoFileObjectType, NULL, sizeof(*file), 1 ))) return STATUS_NO_MEMORY; + if (!(file = alloc_kernel_object( IoFileObjectType, handle, sizeof(*file), 0 ))) + return STATUS_NO_MEMORY; TRACE( "device %p -> file %p\n", device, file ); @@ -615,12 +616,9 @@ static NTSTATUS dispatch_create( const irp_params_t *params, void *in_buff, ULON file->Size = sizeof(*file); file->DeviceObject = device; - if (!(irp = IoAllocateIrp( device->StackSize, FALSE ))) - { - ObDereferenceObject( file ); - return STATUS_NO_MEMORY; - } + if (!(irp = IoAllocateIrp( device->StackSize, FALSE ))) return STATUS_NO_MEMORY; + ObReferenceObject( file ); irpsp = IoGetNextIrpStackLocation( irp ); irpsp->MajorFunction = IRP_MJ_CREATE; irpsp->FileObject = file; diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 17d2654..a45d092 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -3429,7 +3429,6 @@ struct set_irp_result_request obj_handle_t handle; unsigned int status; data_size_t size; - client_ptr_t file_ptr; /* VARARG(data,bytes); */ }; struct set_irp_result_reply @@ -6695,6 +6694,6 @@ union generic_reply struct resume_process_reply resume_process_reply; }; -#define SERVER_PROTOCOL_VERSION 582 +#define SERVER_PROTOCOL_VERSION 583 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/device.c b/server/device.c index e2364d2..6885bf0 100644 --- a/server/device.c +++ b/server/device.c @@ -943,8 +943,6 @@ DECL_HANDLER(set_irp_result) if ((irp = (struct irp_call *)get_handle_obj( current->process, req->handle, 0, &irp_call_ops ))) { - if (irp->file && irp->file->device->manager) - set_kernel_object( irp->file->device->manager, &irp->file->obj, req->file_ptr ); set_irp_result( irp, req->status, get_req_data(), get_req_data_size(), req->size ); close_handle( current->process, req->handle ); /* avoid an extra round-trip for close */ release_object( irp ); diff --git a/server/protocol.def b/server/protocol.def index fc7c4d0..21008d7 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -2476,7 +2476,6 @@ enum message_type obj_handle_t handle; /* handle to the irp */ unsigned int status; /* status of the irp */ data_size_t size; /* result size (input or output depending on the operation) */ - client_ptr_t file_ptr; /* opaque pointer to the file object */ VARARG(data,bytes); /* output data of the irp */ @END diff --git a/server/request.h b/server/request.h index b46a1d9..07918df 100644 --- a/server/request.h +++ b/server/request.h @@ -1656,8 +1656,7 @@ C_ASSERT( sizeof(struct ioctl_reply) == 16 ); C_ASSERT( FIELD_OFFSET(struct set_irp_result_request, handle) == 12 ); C_ASSERT( FIELD_OFFSET(struct set_irp_result_request, status) == 16 ); C_ASSERT( FIELD_OFFSET(struct set_irp_result_request, size) == 20 ); -C_ASSERT( FIELD_OFFSET(struct set_irp_result_request, file_ptr) == 24 ); -C_ASSERT( sizeof(struct set_irp_result_request) == 32 ); +C_ASSERT( sizeof(struct set_irp_result_request) == 24 ); C_ASSERT( FIELD_OFFSET(struct create_named_pipe_request, access) == 12 ); C_ASSERT( FIELD_OFFSET(struct create_named_pipe_request, options) == 16 ); C_ASSERT( FIELD_OFFSET(struct create_named_pipe_request, sharing) == 20 ); diff --git a/server/trace.c b/server/trace.c index f149ed2..28bf3dd 100644 --- a/server/trace.c +++ b/server/trace.c @@ -3014,7 +3014,6 @@ static void dump_set_irp_result_request( const struct set_irp_result_request *re fprintf( stderr, " handle=%04x", req->handle ); fprintf( stderr, ", status=%08x", req->status ); fprintf( stderr, ", size=%u", req->size ); - dump_uint64( ", file_ptr=", &req->file_ptr ); dump_varargs_bytes( ", data=", cur_size ); }

1 0

Michael Müller : avifil32: Correctly handle compressed frames when desired format is specified.
by Alexandre Julliard May 3, 2019

May 3, 2019

Module: wine Branch: master Commit: da0f196c9348a80f04461d708b26db0f108dead6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=da0f196c9348a80f04461d70… Author: Michael Müller <michael(a)fds-team.de> Date: Thu May 2 02:43:03 2019 +0200 avifil32: Correctly handle compressed frames when desired format is specified. From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/avifil32/getframe.c | 102 +++++++++++++++++++++++------------------------ 1 file changed, 50 insertions(+), 52 deletions(-) diff --git a/dlls/avifil32/getframe.c b/dlls/avifil32/getframe.c index be4a2a9..2e61568 100644 --- a/dlls/avifil32/getframe.c +++ b/dlls/avifil32/getframe.c @@ -405,8 +405,6 @@ static HRESULT WINAPI IGetFrame_fnSetFormat(IGetFrame *iface, lpbi->biSize + lpbi->biClrUsed * sizeof(RGBQUAD)); if (lpbi->biBitCount <= 8) ICDecompressGetPalette(This->hic, This->lpInFormat, This->lpOutFormat); - - return AVIERR_OK; } else { if (bBestDisplay) { ICGetDisplayFormat(This->hic, This->lpInFormat, @@ -416,64 +414,64 @@ static HRESULT WINAPI IGetFrame_fnSetFormat(IGetFrame *iface, AVIFILE_CloseCompressor(This); return AVIERR_NOCOMPRESSOR; } + } - /* check output format */ - if (This->lpOutFormat->biClrUsed == 0 && - This->lpOutFormat->biBitCount <= 8) - This->lpOutFormat->biClrUsed = 1u << This->lpOutFormat->biBitCount; - if (This->lpOutFormat->biSizeImage == 0 && - This->lpOutFormat->biCompression == BI_RGB) { - This->lpOutFormat->biSizeImage = - DIBWIDTHBYTES(*This->lpOutFormat) * This->lpOutFormat->biHeight; - } + /* check output format */ + if (This->lpOutFormat->biClrUsed == 0 && + This->lpOutFormat->biBitCount <= 8) + This->lpOutFormat->biClrUsed = 1u << This->lpOutFormat->biBitCount; + if (This->lpOutFormat->biSizeImage == 0 && + This->lpOutFormat->biCompression == BI_RGB) { + This->lpOutFormat->biSizeImage = + DIBWIDTHBYTES(*This->lpOutFormat) * This->lpOutFormat->biHeight; + } - if (lpBits == NULL) { - DWORD size = This->lpOutFormat->biClrUsed * sizeof(RGBQUAD); + if (lpBits == NULL) { + DWORD size = This->lpOutFormat->biClrUsed * sizeof(RGBQUAD); - size += This->lpOutFormat->biSize + This->lpOutFormat->biSizeImage; - This->lpOutFormat = HeapReAlloc(GetProcessHeap(), 0, This->lpOutFormat, size); - if (This->lpOutFormat == NULL) { - AVIFILE_CloseCompressor(This); - return AVIERR_MEMORY; - } - This->lpOutBuffer = DIBPTR(This->lpOutFormat); - } else - This->lpOutBuffer = lpBits; - - /* for user size was irrelevant */ - if (dx == -1) - dx = This->lpOutFormat->biWidth; - if (dy == -1) - dy = This->lpOutFormat->biHeight; - - /* need to resize? */ - if (x != 0 || y != 0) { - if (dy == This->lpOutFormat->biHeight && - dx == This->lpOutFormat->biWidth) - This->bResize = FALSE; - else - This->bResize = TRUE; + size += This->lpOutFormat->biSize + This->lpOutFormat->biSizeImage; + This->lpOutFormat = HeapReAlloc(GetProcessHeap(), 0, This->lpOutFormat, size); + if (This->lpOutFormat == NULL) { + AVIFILE_CloseCompressor(This); + return AVIERR_MEMORY; } + This->lpOutBuffer = DIBPTR(This->lpOutFormat); + } else + This->lpOutBuffer = lpBits; + + /* for user size was irrelevant */ + if (dx == -1) + dx = This->lpOutFormat->biWidth; + if (dy == -1) + dy = This->lpOutFormat->biHeight; + + /* need to resize? */ + if (x != 0 || y != 0) { + if (dy == This->lpOutFormat->biHeight && + dx == This->lpOutFormat->biWidth) + This->bResize = FALSE; + else + This->bResize = TRUE; + } - if (This->bResize) { - This->x = x; - This->y = y; - This->dx = dx; - This->dy = dy; - - if (ICDecompressExBegin(This->hic,0,This->lpInFormat,This->lpInBuffer,0, - 0,This->lpInFormat->biWidth, - This->lpInFormat->biHeight,This->lpOutFormat, - This->lpOutBuffer, x, y, dx, dy) == ICERR_OK) - return AVIERR_OK; - } else if (ICDecompressBegin(This->hic, This->lpInFormat, - This->lpOutFormat) == ICERR_OK) + if (This->bResize) { + This->x = x; + This->y = y; + This->dx = dx; + This->dy = dy; + + if (ICDecompressExBegin(This->hic,0,This->lpInFormat,This->lpInBuffer,0, + 0,This->lpInFormat->biWidth, + This->lpInFormat->biHeight,This->lpOutFormat, + This->lpOutBuffer, x, y, dx, dy) == ICERR_OK) return AVIERR_OK; + } else if (ICDecompressBegin(This->hic, This->lpInFormat, + This->lpOutFormat) == ICERR_OK) + return AVIERR_OK; - AVIFILE_CloseCompressor(This); + AVIFILE_CloseCompressor(This); - return AVIERR_COMPRESSOR; - } + return AVIERR_COMPRESSOR; } static const struct IGetFrameVtbl igetframeVtbl = {

1 0

Zebediah Figura : setupapi: Add magic bytes to struct file_queue and validate them in SetupCloseFileQueue ().
by Alexandre Julliard May 3, 2019

May 3, 2019

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: Avoid linking directly to CancelIoEx ().
by Alexandre Julliard May 3, 2019

May 3, 2019

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 May 3, 2019

May 3, 2019

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: Store currently executed IRP call on server side.
by Alexandre Julliard May 3, 2019

May 3, 2019

Module: wine Branch: master Commit: 781dd9a145d0ef8e4465f78b8916ea0861b5e161 URL: https://source.winehq.org/git/wine.git/?a=commit;h=781dd9a145d0ef8e4465f78b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 3 15:40:18 2019 +0200 server: Store currently executed IRP call on server side. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/device.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/server/device.c b/server/device.c index 0fa23ca..61831b4 100644 --- a/server/device.c +++ b/server/device.c @@ -89,6 +89,7 @@ struct device_manager struct object obj; /* object header */ struct list devices; /* list of devices */ struct list requests; /* list of pending irps across all devices */ + struct irp_call *current_call; /* call currently executed on client side */ struct wine_rb_tree kernel_objects; /* map of objects that have client side pointer associated */ }; @@ -710,6 +711,12 @@ static void device_manager_destroy( struct object *obj ) struct kernel_object *kernel_object; struct list *ptr; + if (manager->current_call) + { + release_object( manager->current_call ); + manager->current_call = NULL; + } + while (manager->kernel_objects.root) { kernel_object = WINE_RB_ENTRY_VALUE( manager->kernel_objects.root, struct kernel_object, rb_entry ); @@ -740,6 +747,7 @@ static struct device_manager *create_device_manager(void) if ((manager = alloc_object( &device_manager_ops ))) { + manager->current_call = NULL; list_init( &manager->devices ); list_init( &manager->requests ); wine_rb_init( &manager->kernel_objects, compare_kernel_object ); @@ -870,6 +878,12 @@ DECL_HANDLER(get_next_device_request) clear_error(); } + if (manager->current_call) + { + release_object( manager->current_call ); + manager->current_call = NULL; + } + if ((ptr = list_head( &manager->requests ))) { irp = LIST_ENTRY( ptr, struct irp_call, mgr_entry ); @@ -889,7 +903,8 @@ DECL_HANDLER(get_next_device_request) iosb->in_size = 0; list_remove( &irp->mgr_entry ); list_init( &irp->mgr_entry ); - if (!irp->file) release_object( irp ); /* no longer on manager queue */ + if (irp->file) grab_object( irp ); /* we already own the object if it's only on manager queue */ + manager->current_call = irp; } } else set_error( STATUS_PENDING );

1 0

Zebediah Figura : ntoskrnl.exe/tests: Use coarser waits for timer tests.
by Alexandre Julliard May 3, 2019

May 3, 2019

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

Jacek Caban : server: Pass IRP output size in irp_params_t.
by Alexandre Julliard May 3, 2019

May 3, 2019

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: Pass file object handle in IRP_CALL_CREATE request.
by Alexandre Julliard May 3, 2019

May 3, 2019

Module: wine Branch: master Commit: 29914d583fe098521472332687b8da69fc692690 URL: https://source.winehq.org/git/wine.git/?a=commit;h=29914d583fe0985214723326… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 3 15:40:40 2019 +0200 server: Pass file object handle in IRP_CALL_CREATE request. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/server_protocol.h | 3 +- server/device.c | 65 ++++++++++++++++++++++++++++-------------- server/protocol.def | 1 + server/trace.c | 2 +- 4 files changed, 48 insertions(+), 23 deletions(-) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 9c5c196..17d2654 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -662,6 +662,7 @@ typedef union unsigned int sharing; unsigned int options; client_ptr_t device; + obj_handle_t file; } create; struct { @@ -6694,6 +6695,6 @@ union generic_reply struct resume_process_reply resume_process_reply; }; -#define SERVER_PROTOCOL_VERSION 581 +#define SERVER_PROTOCOL_VERSION 582 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/device.c b/server/device.c index 61831b4..e2364d2 100644 --- a/server/device.c +++ b/server/device.c @@ -539,32 +539,49 @@ static void device_file_destroy( struct object *obj ) release_object( file->device ); } -static void fill_irp_params( struct device_manager *manager, struct irp_call *irp, irp_params_t *params ) +static int fill_irp_params( struct device_manager *manager, struct irp_call *irp, irp_params_t *params ) { - *params = irp->params; - - switch (params->type) + switch (irp->params.type) { case IRP_CALL_NONE: - case IRP_CALL_CREATE: case IRP_CALL_FREE: break; + case IRP_CALL_CREATE: + irp->params.create.file = alloc_handle( current->process, irp->file, + irp->params.create.access, 0 ); + if (!irp->params.create.file) return 0; + break; case IRP_CALL_CLOSE: - params->close.file = get_kernel_object_ptr( manager, &irp->file->obj ); + irp->params.close.file = get_kernel_object_ptr( manager, &irp->file->obj ); break; case IRP_CALL_READ: - params->read.file = get_kernel_object_ptr( manager, &irp->file->obj ); - params->read.out_size = irp->iosb->out_size; + irp->params.read.file = get_kernel_object_ptr( manager, &irp->file->obj ); + irp->params.read.out_size = irp->iosb->out_size; break; case IRP_CALL_WRITE: - params->write.file = get_kernel_object_ptr( manager, &irp->file->obj ); + irp->params.write.file = get_kernel_object_ptr( manager, &irp->file->obj ); break; case IRP_CALL_FLUSH: - params->flush.file = get_kernel_object_ptr( manager, &irp->file->obj ); + irp->params.flush.file = get_kernel_object_ptr( manager, &irp->file->obj ); break; case IRP_CALL_IOCTL: - params->ioctl.file = get_kernel_object_ptr( manager, &irp->file->obj ); - params->ioctl.out_size = irp->iosb->out_size; + irp->params.ioctl.file = get_kernel_object_ptr( manager, &irp->file->obj ); + irp->params.ioctl.out_size = irp->iosb->out_size; + break; + } + + *params = irp->params; + return 1; +} + +static void free_irp_params( struct irp_call *irp ) +{ + switch (irp->params.type) + { + case IRP_CALL_CREATE: + close_handle( current->process, irp->params.create.file ); + break; + default: break; } } @@ -875,15 +892,17 @@ DECL_HANDLER(get_next_device_request) close_handle( current->process, req->prev ); /* avoid an extra round-trip for close */ release_object( irp ); } - clear_error(); } if (manager->current_call) { + free_irp_params( manager->current_call ); release_object( manager->current_call ); manager->current_call = NULL; } + clear_error(); + if ((ptr = list_head( &manager->requests ))) { irp = LIST_ENTRY( ptr, struct irp_call, mgr_entry ); @@ -897,14 +916,18 @@ DECL_HANDLER(get_next_device_request) if (iosb->in_size > get_reply_max_size()) set_error( STATUS_BUFFER_OVERFLOW ); else if (!irp->file || (reply->next = alloc_handle( current->process, irp, 0, 0 ))) { - fill_irp_params( manager, irp, &reply->params ); - set_reply_data_ptr( iosb->in_data, iosb->in_size ); - iosb->in_data = NULL; - iosb->in_size = 0; - list_remove( &irp->mgr_entry ); - list_init( &irp->mgr_entry ); - if (irp->file) grab_object( irp ); /* we already own the object if it's only on manager queue */ - manager->current_call = irp; + if (fill_irp_params( manager, irp, &reply->params )) + { + set_reply_data_ptr( iosb->in_data, iosb->in_size ); + iosb->in_data = NULL; + iosb->in_size = 0; + list_remove( &irp->mgr_entry ); + list_init( &irp->mgr_entry ); + /* we already own the object if it's only on manager queue */ + if (irp->file) grab_object( irp ); + manager->current_call = irp; + } + else close_handle( current->process, reply->next ); } } else set_error( STATUS_PENDING ); diff --git a/server/protocol.def b/server/protocol.def index 15ee31d..fc7c4d0 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -678,6 +678,7 @@ typedef union unsigned int sharing; /* sharing flags */ unsigned int options; /* file options */ client_ptr_t device; /* opaque ptr for the device */ + obj_handle_t file; /* file handle */ } create; struct { diff --git a/server/trace.c b/server/trace.c index b5f3008..f149ed2 100644 --- a/server/trace.c +++ b/server/trace.c @@ -326,7 +326,7 @@ static void dump_irp_params( const char *prefix, const irp_params_t *data ) fprintf( stderr, "%s{CREATE,access=%08x,sharing=%08x,options=%08x", prefix, data->create.access, data->create.sharing, data->create.options ); dump_uint64( ",device=", &data->create.device ); - fputc( '}', stderr ); + fprintf( stderr, ",file=%08x}", data->create.file ); break; case IRP_CALL_CLOSE: fprintf( stderr, "%s{CLOSE", prefix );

1 0