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

Sven Baars : setupapi: Fix a path leak (Valgrind).
by Alexandre Julliard Aug. 19, 2019

Aug. 19, 2019

Module: wine Branch: master Commit: 5f0d53e20903b009ee47a238a642f2e95f27d712 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5f0d53e20903b009ee47a238… Author: Sven Baars <sven.wine(a)gmail.com> Date: Sun Aug 18 00:09:04 2019 +0200 setupapi: Fix a path leak (Valgrind). Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/queue.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/dlls/setupapi/queue.c b/dlls/setupapi/queue.c index ba750b0..e049bbe 100644 --- a/dlls/setupapi/queue.c +++ b/dlls/setupapi/queue.c @@ -1408,13 +1408,20 @@ BOOL WINAPI SetupCommitFileQueueW( HWND owner, HSPFILEQ handle, PSP_FILE_CALLBAC * actually isn't in a subdirectory, but keep track of what it * was, and then later strip it from the root path that we * ultimately resolve the source disk to. */ - WCHAR *src_path = op->src_path; + WCHAR src_path[MAX_PATH]; + size_t path_len = 0; - op->src_path = NULL; - if (src_path) + src_path[0] = 0; + if (op->src_path) { + lstrcpyW(src_path, op->src_path); + path_len = lstrlenW(src_path); + lstrcatW(op->media->root, backslashW); - lstrcatW(op->media->root, src_path); + lstrcatW(op->media->root, op->src_path); + + heap_free(op->src_path); + op->src_path = NULL; } for (;;) @@ -1450,12 +1457,11 @@ BOOL WINAPI SetupCommitFileQueueW( HWND owner, HSPFILEQ handle, PSP_FILE_CALLBAC if (queue_copy_file( paths.Source, paths.Target, op, handler, context )) { - if (src_path && !op->media->cabinet) + if (path_len > 0 && !op->media->cabinet) { - size_t root_len = lstrlenW(op->media->root), path_len = lstrlenW(src_path); + size_t root_len = lstrlenW(op->media->root); if (path_len <= root_len && !wcsnicmp(op->media->root + root_len - path_len, src_path, path_len)) op->media->root[root_len - path_len - 1] = 0; - heap_free( src_path ); } op->media->resolved = TRUE; handler( context, SPFILENOTIFY_ENDCOPY, (UINT_PTR)&paths, 0 );

1 0

Zebediah Figura : ntoskrnl.exe: Export InitializeSListHead().
by Alexandre Julliard Aug. 19, 2019

Aug. 19, 2019

Module: wine Branch: master Commit: 21cadb7c0bd55fd367f73a4b45b622aef04aea9c URL: https://source.winehq.org/git/wine.git/?a=commit;h=21cadb7c0bd55fd367f73a4b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Aug 18 20:02:41 2019 -0500 ntoskrnl.exe: Export InitializeSListHead(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47623 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index d84129a..3128c35 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -33,6 +33,7 @@ @ stdcall -arch=win64 ExpInterlockedPopEntrySList(ptr) RtlInterlockedPopEntrySList @ stdcall -arch=win64 ExpInterlockedPushEntrySList(ptr ptr) RtlInterlockedPushEntrySList @ stub HalExamineMBR +@ stdcall -arch=arm,arm64,x86_64 InitializeSListHead(ptr) RtlInitializeSListHead @ stdcall -fastcall InterlockedCompareExchange(ptr long long) NTOSKRNL_InterlockedCompareExchange @ stdcall -fastcall InterlockedDecrement(ptr) NTOSKRNL_InterlockedDecrement @ stdcall -fastcall InterlockedExchange(ptr long) NTOSKRNL_InterlockedExchange

1 0

Zebediah Figura : ntoskrnl.exe: Fix a typo in a debug trace.
by Alexandre Julliard Aug. 19, 2019

Aug. 19, 2019

Module: wine Branch: master Commit: 2543f37932a9e7f08ce3314aaf5896b8d5131a2f URL: https://source.winehq.org/git/wine.git/?a=commit;h=2543f37932a9e7f08ce3314a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Aug 18 20:02:37 2019 -0500 ntoskrnl.exe: Fix a typo in a debug trace. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 95b09ab..89cd197 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -371,7 +371,7 @@ NTSTATUS WINAPI ObOpenObjectByPointer( void *obj, ULONG attr, ACCESS_STATE *acce return STATUS_NOT_IMPLEMENTED; } - if (attr & ~OBJ_KERNEL_HANDLE) FIXME( "access %x not supported\n", access ); + if (attr & ~OBJ_KERNEL_HANDLE) FIXME( "attr %#x not supported\n", attr ); if (access_state) FIXME( "access_state not implemented\n" ); if (type && ObGetObjectType( obj ) != type) return STATUS_OBJECT_TYPE_MISMATCH;

1 0

Richard Pospesel : widl: Store the "const" type qualifier inside the decl_spec_t structure.
by Alexandre Julliard Aug. 19, 2019

Aug. 19, 2019

Module: wine Branch: master Commit: 7e4da76689ecdb9ae49eae91e3759dae03c50644 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7e4da76689ecdb9ae49eae91… Author: Richard Pospesel <richard(a)torproject.org> Date: Sat Aug 17 20:07:06 2019 -0500 widl: Store the "const" type qualifier inside the decl_spec_t structure. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/expr.c | 6 +-- tools/widl/header.c | 15 ++++--- tools/widl/parser.y | 111 +++++++++++++++++++++++++++++-------------------- tools/widl/typetree.c | 3 +- tools/widl/typetree.h | 2 +- tools/widl/widltypes.h | 9 +++- 6 files changed, 86 insertions(+), 60 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7e4da76689ecdb9ae49e…

1 0

Zebediah Figura : ntoskrnl.exe: Implement ObQueryNameString().
by Alexandre Julliard Aug. 19, 2019

Aug. 19, 2019

Module: wine Branch: master Commit: 32b2497645f183089003dba8a1b4d86ccccd8e07 URL: https://source.winehq.org/git/wine.git/?a=commit;h=32b2497645f183089003dba8… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Aug 18 20:02:38 2019 -0500 ntoskrnl.exe: Implement ObQueryNameString(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 15 ++++++-- dlls/ntoskrnl.exe/tests/driver.c | 77 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 89 insertions(+), 3 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 89cd197..f2ed76b 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3128,10 +3128,19 @@ VOID WINAPI IoStartNextPacket(PDEVICE_OBJECT deviceobject, BOOLEAN cancelable) /***************************************************** * ObQueryNameString (NTOSKRNL.EXE.@) */ -NTSTATUS WINAPI ObQueryNameString(PVOID object, POBJECT_NAME_INFORMATION name, ULONG maxlength, PULONG returnlength) +NTSTATUS WINAPI ObQueryNameString( void *object, OBJECT_NAME_INFORMATION *name, ULONG size, ULONG *ret_size ) { - FIXME("(%p %p %u %p) stub\n", object, name, maxlength, returnlength); - return STATUS_NOT_IMPLEMENTED; + HANDLE handle; + NTSTATUS ret; + + TRACE("object %p, name %p, size %u, ret_size %p.\n", object, name, size, ret_size); + + if ((ret = ObOpenObjectByPointer( object, 0, NULL, 0, NULL, KernelMode, &handle ))) + return ret; + ret = NtQueryObject( handle, ObjectNameInformation, name, size, ret_size ); + + NtClose( handle ); + return ret; } /***************************************************** diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index 525d818..9f55111 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -1524,6 +1524,82 @@ static void test_IoAttachDeviceToDeviceStack(void) IoDeleteDevice(dev3); } +static void test_object_name(void) +{ + static const WCHAR event_nameW[] = L"\\wine_test_event"; + static const WCHAR device_nameW[] = L"\\Device\\WineTestDriver"; + char buffer[1024]; + OBJECT_NAME_INFORMATION *name = (OBJECT_NAME_INFORMATION *)buffer; + OBJECT_ATTRIBUTES attr; + UNICODE_STRING string; + ULONG ret_size; + HANDLE handle; + KEVENT *event; + NTSTATUS ret; + + ret_size = 0; + ret = ObQueryNameString(lower_device, name, 0, &ret_size); + ok(ret == STATUS_INFO_LENGTH_MISMATCH, "got status %#x\n", ret); + ok(ret_size == sizeof(*name) + sizeof(device_nameW), "got size %u\n", ret_size); + + ret_size = 0; + ret = ObQueryNameString(lower_device, name, sizeof(buffer), &ret_size); + ok(!ret, "got status %#x\n", ret); + ok(!wcscmp(name->Name.Buffer, device_nameW), "got name %ls\n", name->Name.Buffer); + ok(ret_size == sizeof(*name) + sizeof(device_nameW), "got size %u\n", ret_size); + ok(name->Name.Length == wcslen(device_nameW) * sizeof(WCHAR), "got length %u\n", name->Name.Length); + ok(name->Name.MaximumLength == sizeof(device_nameW), "got maximum length %u\n", name->Name.MaximumLength); + + event = IoCreateSynchronizationEvent(NULL, &handle); + ok(!!event, "failed to create event\n"); + + ret_size = 0; + ret = ObQueryNameString(event, name, sizeof(buffer), &ret_size); + ok(!ret, "got status %#x\n", ret); + ok(!name->Name.Buffer, "got name %ls\n", name->Name.Buffer); + ok(ret_size == sizeof(*name), "got size %u\n", ret_size); + ok(!name->Name.Length, "got length %u\n", name->Name.Length); + ok(!name->Name.MaximumLength, "got maximum length %u\n", name->Name.MaximumLength); + + ret = ZwClose(handle); + ok(!ret, "got status %#x\n", ret); + + RtlInitUnicodeString(&string, event_nameW); + InitializeObjectAttributes(&attr, &string, OBJ_KERNEL_HANDLE, NULL, NULL); + ret = ZwCreateEvent(&handle, 0, &attr, NotificationEvent, TRUE); + ok(!ret, "got status %#x\n", ret); + ret = ObReferenceObjectByHandle(handle, 0, *pExEventObjectType, KernelMode, (void **)&event, NULL); + ok(!ret, "got status %#x\n", ret); + + ret_size = 0; + ret = ObQueryNameString(event, name, sizeof(buffer), &ret_size); + ok(!ret, "got status %#x\n", ret); + ok(!wcscmp(name->Name.Buffer, event_nameW), "got name %ls\n", name->Name.Buffer); + ok(ret_size == sizeof(*name) + sizeof(event_nameW), "got size %u\n", ret_size); + ok(name->Name.Length == wcslen(event_nameW) * sizeof(WCHAR), "got length %u\n", name->Name.Length); + ok(name->Name.MaximumLength == sizeof(event_nameW), "got maximum length %u\n", name->Name.MaximumLength); + + ObDereferenceObject(event); + ret = ZwClose(handle); + ok(!ret, "got status %#x\n", ret); + + ret_size = 0; + ret = ObQueryNameString(KeGetCurrentThread(), name, sizeof(buffer), &ret_size); + ok(!ret, "got status %#x\n", ret); + ok(!name->Name.Buffer, "got name %ls\n", name->Name.Buffer); + ok(ret_size == sizeof(*name), "got size %u\n", ret_size); + ok(!name->Name.Length, "got length %u\n", name->Name.Length); + ok(!name->Name.MaximumLength, "got maximum length %u\n", name->Name.MaximumLength); + + ret_size = 0; + ret = ObQueryNameString(IoGetCurrentProcess(), name, sizeof(buffer), &ret_size); + ok(!ret, "got status %#x\n", ret); + ok(!name->Name.Buffer, "got name %ls\n", name->Name.Buffer); + ok(ret_size == sizeof(*name), "got size %u\n", ret_size); + ok(!name->Name.Length, "got length %u\n", name->Name.Length); + ok(!name->Name.MaximumLength, "got maximum length %u\n", name->Name.MaximumLength); +} + static PIO_WORKITEM main_test_work_item; static void WINAPI main_test_task(DEVICE_OBJECT *device, void *context) @@ -1605,6 +1681,7 @@ static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *st test_resource(); test_lookup_thread(); test_IoAttachDeviceToDeviceStack(); + test_object_name(); if (main_test_work_item) return STATUS_UNEXPECTED_IO_ERROR;

1 0

Alistair Leslie-Hughes : include: Add more ListView macros.
by Alexandre Julliard Aug. 19, 2019

Aug. 19, 2019

Module: wine Branch: master Commit: 448ba921be25e4c57d0d1eb597edccffba5589f3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=448ba921be25e4c57d0d1eb5… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Aug 19 04:15:39 2019 +0000 include: Add more ListView macros. Remove duplicate ListView_GetGroupInfoByIndex at the same time. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/commctrl.h | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/include/commctrl.h b/include/commctrl.h index 906f2c3..700b335 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -4190,8 +4190,14 @@ typedef struct tagLVITEMINDEX ((rc) ? (((RECT*)(rc))->top = type), (LPARAM)(RECT*)(rc) : (LPARAM)(RECT*)NULL)) #define ListView_GetGroupCount(hwnd) \ SNDMSG((hwnd), LVM_GETGROUPCOUNT, (WPARAM)0, (LPARAM)0) -#define ListView_GetGroupInfoByIndex(hwnd, index, grp) \ - SNDMSG((hwnd), LVM_GETGROUPINFOBYINDEX, (WPARAM)(index), (LPARAM)(grp)) +#define ListView_GetItemIndexRect(hwnd, index, subitem, code, prc) \ + (BOOL)SNDMSG((hwnd), LVM_GETITEMINDEXRECT, (WPARAM)(LVITEMINDEX*)(index), \ + (prc ? ((((LPRECT)prc)->top = subitem), (((LPRECT)prc)->left = code), (LPARAM)prc) : (LPARAM)NULL) +#define ListView_SetItemIndexState(hwndLV, index, data, mask) \ +{ LV_ITEM macro; macro.stateMask = (mask); macro.state = data; \ + SNDMSG((hwndLV), LVM_SETITEMINDEXSTATE, (WPARAM)(LVITEMINDEX*)(index), (LPARAM)(LV_ITEM *)&macro); } +#define ListView_GetNextItemIndex(hwnd, index, flags) \ + (BOOL)SNDMSG((hwnd), LVM_GETNEXTITEMINDEX, (WPARAM)(LVITEMINDEX*)(index), MAKELPARAM((flags),0)) /* Tab Control */

1 0

Sven Baars : ntoskrnl.exe: Don' t use irp after it has been freed by IoCompleteRequest (Coverity).
by Alexandre Julliard Aug. 19, 2019

Aug. 19, 2019

Module: wine Branch: master Commit: aa10b49c57afcdce35b167e893ce27bec07fa159 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa10b49c57afcdce35b167e8… Author: Sven Baars <sven.wine(a)gmail.com> Date: Sun Aug 18 13:11:26 2019 +0200 ntoskrnl.exe: Don't use irp after it has been freed by IoCompleteRequest (Coverity). Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/pnp.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/pnp.c b/dlls/ntoskrnl.exe/pnp.c index 30865a0..03c4c40 100644 --- a/dlls/ntoskrnl.exe/pnp.c +++ b/dlls/ntoskrnl.exe/pnp.c @@ -725,6 +725,7 @@ static NTSTATUS WINAPI pnp_manager_device_pnp( DEVICE_OBJECT *device, IRP *irp ) { IO_STACK_LOCATION *stack = IoGetCurrentIrpStackLocation( irp ); struct root_pnp_device *root_device = device->DeviceExtension; + NTSTATUS status; TRACE("device %p, irp %p, minor function %#x.\n", device, irp, stack->MinorFunction); @@ -783,8 +784,9 @@ static NTSTATUS WINAPI pnp_manager_device_pnp( DEVICE_OBJECT *device, IRP *irp ) FIXME("Unhandled PnP request %#x.\n", stack->MinorFunction); } + status = irp->IoStatus.u.Status; IoCompleteRequest( irp, IO_NO_INCREMENT ); - return irp->IoStatus.u.Status; + return status; } static NTSTATUS WINAPI pnp_manager_driver_entry( DRIVER_OBJECT *driver, UNICODE_STRING *keypath )

1 0

Zebediah Figura : widl: Don' t store the default pointer type in the type_t structure.
by Alexandre Julliard Aug. 19, 2019

Aug. 19, 2019

Module: wine Branch: master Commit: 60d668631f3efb0b88c7751aba807b21ef5b5c5b URL: https://source.winehq.org/git/wine.git/?a=commit;h=60d668631f3efb0b88c7751a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Aug 17 20:07:08 2019 -0500 widl: Don't store the default pointer type in the type_t structure. This fixes type format string generation for the following IDL: typedef int *intp; [pointer_default(ref)] interface IRef { void a(intp *a); } [pointer_default(unique)] interface IUnique { void b(intp *a); } Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/expr.c | 6 +++--- tools/widl/parser.h | 6 ------ tools/widl/parser.y | 39 +++++++++++++++------------------------ tools/widl/typegen.c | 9 +++++---- tools/widl/typetree.c | 7 ++----- tools/widl/typetree.h | 19 ++----------------- tools/widl/widltypes.h | 2 -- 7 files changed, 27 insertions(+), 61 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=60d668631f3efb0b88c7…

1 0

Sven Baars : setupapi: Fix an uninitialized variable warning (Valgrind).
by Alexandre Julliard Aug. 19, 2019

Aug. 19, 2019

Module: wine Branch: master Commit: ecbd2dd34b4239318162242caaa197ae4f0911f5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ecbd2dd34b4239318162242c… Author: Sven Baars <sven.wine(a)gmail.com> Date: Sun Aug 18 00:09:05 2019 +0200 setupapi: Fix an uninitialized variable warning (Valgrind). Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/queue.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/setupapi/queue.c b/dlls/setupapi/queue.c index e049bbe..e9b48ed 100644 --- a/dlls/setupapi/queue.c +++ b/dlls/setupapi/queue.c @@ -196,6 +196,7 @@ UINT CALLBACK QUEUE_callback_WtoA( void *context, UINT notification, switch(notification) { case SPFILENOTIFY_COPYERROR: + buffer[0] = 0; param2 = (UINT_PTR)buffer; /* fall through */ case SPFILENOTIFY_STARTDELETE:

1 0

Sven Baars : setupapi/tests: Fix a crash in the need_media tests.
by Alexandre Julliard Aug. 19, 2019

Aug. 19, 2019

Module: wine Branch: master Commit: 448f4cc9a25c6f994395978df0dfd7c7487b5dbb URL: https://source.winehq.org/git/wine.git/?a=commit;h=448f4cc9a25c6f994395978d… Author: Sven Baars <sven.wine(a)gmail.com> Date: Sun Aug 18 00:09:03 2019 +0200 setupapi/tests: Fix a crash in the need_media tests. Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/tests/install.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/setupapi/tests/install.c b/dlls/setupapi/tests/install.c index f9e5592..d761f89 100644 --- a/dlls/setupapi/tests/install.c +++ b/dlls/setupapi/tests/install.c @@ -1903,6 +1903,7 @@ static void test_need_media(void) queue = SetupOpenFileQueue(); ok(queue != INVALID_HANDLE_VALUE, "Failed to open queue, error %#x.\n", GetLastError()); copy_params.LayoutInf = hinf; + copy_params.QueueHandle = queue; /* In fact this fails with ERROR_INVALID_PARAMETER on 8+. */ if (SetupQueueCopyIndirectA(&copy_params)) {

1 0