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

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

19 Aug '19

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

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

19 Aug '19

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

Zebediah Figura : ntoskrnl.exe: Make the driver object accessible by name while in its entry point.
by Alexandre Julliard 19 Aug '19

19 Aug '19

Module: wine Branch: master Commit: 92d8ec7954c7157eee9c112480889f181c3b622f URL: https://source.winehq.org/git/wine.git/?a=commit;h=92d8ec7954c7157eee9c1124… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Aug 18 20:02:39 2019 -0500 ntoskrnl.exe: Make the driver object accessible by name while in its entry point. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 11 ++++++----- dlls/ntoskrnl.exe/tests/driver.c | 19 ++++++++++++++++++- 2 files changed, 24 insertions(+), 6 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index f2ed76b..fe66b3d 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1413,10 +1413,15 @@ NTSTATUS WINAPI IoCreateDriver( UNICODE_STRING *name, PDRIVER_INITIALIZE init ) for (i = 0; i <= IRP_MJ_MAXIMUM_FUNCTION; i++) driver->driver_obj.MajorFunction[i] = unhandled_irp; + EnterCriticalSection( &drivers_cs ); + if (wine_rb_put( &wine_drivers, &driver->driver_obj.DriverName, &driver->entry )) + ERR( "failed to insert driver %s in tree\n", debugstr_us(name) ); + LeaveCriticalSection( &drivers_cs ); + status = driver->driver_obj.DriverInit( &driver->driver_obj, &driver->driver_extension.ServiceKeyName ); if (status) { - ObDereferenceObject( driver ); + IoDeleteDriver( &driver->driver_obj ); return status; } @@ -1426,10 +1431,6 @@ NTSTATUS WINAPI IoCreateDriver( UNICODE_STRING *name, PDRIVER_INITIALIZE init ) driver->driver_obj.MajorFunction[i] = unhandled_irp; } - EnterCriticalSection( &drivers_cs ); - if (wine_rb_put( &wine_drivers, &driver->driver_obj.DriverName, &driver->entry )) - ERR( "failed to insert driver %s in tree\n", debugstr_us(name) ); - LeaveCriticalSection( &drivers_cs ); return STATUS_SUCCESS; } diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index 9f55111..c275e67 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -56,7 +56,7 @@ static int running_under_wine; static int winetest_debug; static int winetest_report_success; -static POBJECT_TYPE *pExEventObjectType, *pIoFileObjectType, *pPsThreadType; +static POBJECT_TYPE *pExEventObjectType, *pIoFileObjectType, *pPsThreadType, *pIoDriverObjectType; static PEPROCESS *pPsInitialSystemProcess; static void *create_caller_thread; @@ -1887,8 +1887,12 @@ static VOID WINAPI driver_Unload(DRIVER_OBJECT *driver) NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, PUNICODE_STRING registry) { + static const WCHAR IoDriverObjectTypeW[] = {'I','o','D','r','i','v','e','r','O','b','j','e','c','t','T','y','p','e',0}; + static const WCHAR driver_nameW[] = {'\\','D','r','i','v','e','r', + '\\','W','i','n','e','T','e','s','t','D','r','i','v','e','r',0}; UNICODE_STRING nameW, linkW; NTSTATUS status; + void *obj; DbgPrint("loading driver\n"); @@ -1903,6 +1907,19 @@ NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, PUNICODE_STRING registry) driver->MajorFunction[IRP_MJ_FLUSH_BUFFERS] = driver_FlushBuffers; driver->MajorFunction[IRP_MJ_CLOSE] = driver_Close; + RtlInitUnicodeString(&nameW, IoDriverObjectTypeW); + pIoDriverObjectType = MmGetSystemRoutineAddress(&nameW); + + RtlInitUnicodeString(&nameW, driver_nameW); + if ((status = ObReferenceObjectByName(&nameW, 0, NULL, 0, *pIoDriverObjectType, KernelMode, NULL, &obj))) + return status; + if (obj != driver) + { + ObDereferenceObject(obj); + return STATUS_UNSUCCESSFUL; + } + ObDereferenceObject(obj); + RtlInitUnicodeString(&nameW, device_name); RtlInitUnicodeString(&linkW, driver_link);

1 0

Zebediah Figura : services: Don' t redirect the image file path for kernel drivers.
by Alexandre Julliard 19 Aug '19

19 Aug '19

Module: wine Branch: master Commit: 2430c17202bdb0ff099519ee5345c590d899ddf0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2430c17202bdb0ff099519ee… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Aug 18 20:02:40 2019 -0500 services: Don't redirect the image file path for kernel drivers. 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/advapi32/tests/service.c | 90 +++++++++++++++++++++++++++++++++++++++++++ programs/services/services.c | 2 +- 2 files changed, 91 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index e4ff7d7..9dad710 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -35,6 +35,8 @@ static const CHAR spooler[] = "Spooler"; /* Should be available on all platforms */ static CHAR selfname[MAX_PATH]; +static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL); + static BOOL (WINAPI *pChangeServiceConfig2A)(SC_HANDLE,DWORD,LPVOID); static BOOL (WINAPI *pChangeServiceConfig2W)(SC_HANDLE,DWORD,LPVOID); static BOOL (WINAPI *pEnumServicesStatusExA)(SC_HANDLE, SC_ENUM_TYPE, DWORD, @@ -67,6 +69,8 @@ static void init_function_pointers(void) pQueryServiceStatusEx= (void*)GetProcAddress(hadvapi32, "QueryServiceStatusEx"); pQueryServiceObjectSecurity = (void*)GetProcAddress(hadvapi32, "QueryServiceObjectSecurity"); pNotifyServiceStatusChangeW = (void*)GetProcAddress(hadvapi32, "NotifyServiceStatusChangeW"); + + pIsWow64Process = (void *)GetProcAddress(GetModuleHandleA("kernel32.dll"), "IsWow64Process"); } static void test_open_scm(void) @@ -1767,6 +1771,91 @@ static void test_close(void) ok(ret, "Expected success got error %u\n", GetLastError()); } +static void test_wow64(void) +{ + SC_HANDLE manager, service; + BOOL wow64, ret; + HANDLE file; + + if (!pIsWow64Process || !pIsWow64Process(GetCurrentProcess(), &wow64) || !wow64) + { + skip("Not running under WoW64.\n"); + return; + } + + if (!(manager = OpenSCManagerA(NULL, NULL, SC_MANAGER_CREATE_SERVICE))) + { + skip("Not enough permissions to create a service.\n"); + return; + } + + file = CreateFileA("C:\\windows\\syswow64\\winetestsvc.exe", GENERIC_WRITE, + 0, NULL, CREATE_ALWAYS, 0, NULL); + CloseHandle(file); + + service = CreateServiceA(manager, "winetestsvc", "winetestsvc", + SERVICE_START | SERVICE_STOP | SERVICE_QUERY_STATUS | DELETE, + SERVICE_WIN32_OWN_PROCESS, SERVICE_DEMAND_START, SERVICE_ERROR_NORMAL, + "C:\\windows\\system32\\winetestsvc.exe service serve", NULL, NULL, NULL, NULL, NULL); + ok(!!service, "Failed to create service, error %u.\n", GetLastError()); + ret = StartServiceA(service, 0, NULL); + ok(!ret, "Expected failure.\n"); + todo_wine ok(GetLastError() == ERROR_BAD_EXE_FORMAT, "Got error %u.\n", GetLastError()); + + ret = DeleteService(service); + ok(ret, "Failed to delete service, error %u.\n", GetLastError()); + CloseServiceHandle(service); + + service = CreateServiceA(manager, "winetestsvc", "winetestsvc", SERVICE_START | DELETE, + SERVICE_KERNEL_DRIVER, SERVICE_DEMAND_START, SERVICE_ERROR_NORMAL, + "C:\\windows\\system32\\winetestsvc.exe", NULL, NULL, NULL, NULL, NULL); + ok(!!service, "Failed to create service, error %u.\n", GetLastError()); + ret = StartServiceA(service, 0, NULL); + ok(!ret, "Expected failure.\n"); + todo_wine ok(GetLastError() == ERROR_FILE_NOT_FOUND, "Got error %u.\n", GetLastError()); + + ret = DeleteService(service); + ok(ret, "Failed to delete service, error %u.\n", GetLastError()); + CloseServiceHandle(service); + + ret = DeleteFileA("C:\\windows\\syswow64\\winetestsvc.exe"); + ok(ret, "Failed to delete file, error %u.\n", GetLastError()); + + file = CreateFileA("C:\\windows\\sysnative\\winetestsvc.exe", GENERIC_WRITE, + 0, NULL, CREATE_ALWAYS, 0, NULL); + CloseHandle(file); + + service = CreateServiceA(manager, "winetestsvc", "winetestsvc", SERVICE_START | DELETE, + SERVICE_WIN32_OWN_PROCESS, SERVICE_DEMAND_START, SERVICE_ERROR_NORMAL, + "C:\\windows\\system32\\winetestsvc.exe service serve", NULL, NULL, NULL, NULL, NULL); + ok(!!service, "Failed to create service, error %u.\n", GetLastError()); + ret = StartServiceA(service, 0, NULL); + ok(!ret, "Expected failure.\n"); + ok(GetLastError() == ERROR_FILE_NOT_FOUND, "Got error %u.\n", GetLastError()); + + ret = DeleteService(service); + ok(ret, "Failed to delete service, error %u.\n", GetLastError()); + CloseServiceHandle(service); + + service = CreateServiceA(manager, "winetestsvc", "winetestsvc", SERVICE_START | DELETE, + SERVICE_KERNEL_DRIVER, SERVICE_DEMAND_START, SERVICE_ERROR_NORMAL, + "C:\\windows\\system32\\winetestsvc.exe", NULL, NULL, NULL, NULL, NULL); + ok(!!service, "Failed to create service, error %u.\n", GetLastError()); + ret = StartServiceA(service, 0, NULL); + ok(!ret, "Expected failure.\n"); + todo_wine ok(GetLastError() == ERROR_BAD_EXE_FORMAT, "Got error %u.\n", GetLastError()); + + ret = DeleteService(service); + ok(ret, "Failed to delete service, error %u.\n", GetLastError()); + CloseServiceHandle(service); + + ret = DeleteFileA("C:\\windows\\sysnative\\winetestsvc.exe"); + ok(ret, "Failed to delete file, error %u.\n", GetLastError()); + + CloseServiceHandle(service); + CloseServiceHandle(manager); +} + static void test_sequence(void) { SC_HANDLE scm_handle, svc_handle; @@ -2689,6 +2778,7 @@ START_TEST(service) test_query_svc(); test_enum_svc(); test_close(); + test_wow64(); /* Test the creation, querying and deletion of a service */ test_sequence(); test_queryconfig2(); diff --git a/programs/services/services.c b/programs/services/services.c index ec2a8eb..5eca777 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -826,7 +826,7 @@ static DWORD get_service_binary_path(const struct service_entry *service_entry, ExpandEnvironmentStringsW(service_entry->config.lpBinaryPathName, *path, size); /* if service image is configured to systemdir, redirect it to wow64 systemdir */ - if (service_entry->is_wow64) + if (service_entry->is_wow64 && !(service_entry->config.dwServiceType & (SERVICE_FILE_SYSTEM_DRIVER | SERVICE_KERNEL_DRIVER))) { WCHAR system_dir[MAX_PATH], *redirected; DWORD len;

1 0

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

19 Aug '19

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

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

19 Aug '19

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

Alexandre Julliard : ntdll: Move some exception definitions to winnt.h.
by Alexandre Julliard 19 Aug '19

19 Aug '19

Module: wine Branch: master Commit: 44a60433886931384199161813039b4c63db8b03 URL: https://source.winehq.org/git/wine.git/?a=commit;h=44a604338869313841991618… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 19 13:14:33 2019 +0200 ntdll: Move some exception definitions to winnt.h. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/except_arm.c | 23 -------- dlls/msvcrt/except_arm64.c | 23 -------- dlls/msvcrt/except_x86_64.c | 22 -------- dlls/ntdll/signal_x86_64.c | 47 +++++----------- dlls/ntdll/tests/exception.c | 14 ----- include/winnt.h | 124 ++++++++++++++++++++++++++++++++++++++++--- 6 files changed, 129 insertions(+), 124 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=44a60433886931384199…

1 0

Alexandre Julliard : ntdll: Share dynamic exception table functions across platforms.
by Alexandre Julliard 19 Aug '19

19 Aug '19

Module: wine Branch: master Commit: 14e34bedbfbaa594617abbf8396830ba69ce3c55 URL: https://source.winehq.org/git/wine.git/?a=commit;h=14e34bedbfbaa594617abbf8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 19 13:21:47 2019 +0200 ntdll: Share dynamic exception table functions across platforms. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-rtlsupport-l1-1-0.spec | 2 +- dlls/ntdll/exception.c | 340 +++++++++++++++++++++ dlls/ntdll/ntdll.spec | 2 +- dlls/ntdll/ntdll_misc.h | 4 + dlls/ntdll/signal_arm.c | 121 -------- dlls/ntdll/signal_arm64.c | 57 ---- dlls/ntdll/signal_x86_64.c | 302 ------------------ include/winnt.h | 38 ++- 8 files changed, 368 insertions(+), 498 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=14e34bedbfbaa594617a…

1 0

Huw Davies : riched20: Clearly separate the selection setting functions.
by Alexandre Julliard 19 Aug '19

19 Aug '19

Module: wine Branch: master Commit: 5419a9804ab5299cb9ed5c0d4fc81966956363e4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5419a9804ab5299cb9ed5c0d… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Aug 19 10:55:25 2019 +0100 riched20: Clearly separate the selection setting functions. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/caret.c | 13 ++++++++----- dlls/riched20/editor.c | 22 +++++++++++----------- dlls/riched20/editor.h | 3 ++- dlls/riched20/richole.c | 8 ++++---- dlls/riched20/txtsrv.c | 2 +- 5 files changed, 26 insertions(+), 22 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 0951bb9..212c9e9 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -122,8 +122,14 @@ int ME_GetTextLengthEx(ME_TextEditor *editor, const GETTEXTLENGTHEX *how) return length; } - -int ME_SetSelection(ME_TextEditor *editor, int from, int to) +/****************************************************************** + * set_selection_cursors + * + * Updates the selection cursors. + * + * Note that this does not invalidate either the old or the new selections. + */ +int set_selection_cursors(ME_TextEditor *editor, int from, int to) { int selectionEnd = 0; const int len = ME_GetTextLength(editor); @@ -139,7 +145,6 @@ int ME_SetSelection(ME_TextEditor *editor, int from, int to) { ME_SetCursorToStart(editor, &editor->pCursors[1]); ME_SetCursorToEnd(editor, &editor->pCursors[0], TRUE); - ME_InvalidateSelection(editor); return len + 1; } @@ -165,7 +170,6 @@ int ME_SetSelection(ME_TextEditor *editor, int from, int to) end --; } editor->pCursors[1] = editor->pCursors[0]; - ME_Repaint(editor); } return end; } @@ -194,7 +198,6 @@ int ME_SetSelection(ME_TextEditor *editor, int from, int to) { ME_SetCursorToEnd(editor, &editor->pCursors[0], FALSE); editor->pCursors[1] = editor->pCursors[0]; - ME_InvalidateSelection(editor); return len; } diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 61f7a0e..118c646 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1622,7 +1622,7 @@ static LRESULT ME_StreamIn(ME_TextEditor *editor, DWORD format, EDITSTREAM *stre } else { style = editor->pBuffer->pDefaultStyle; ME_AddRefStyle(style); - ME_SetSelection(editor, 0, 0); + set_selection_cursors(editor, 0, 0); ME_InternalDeleteText(editor, &editor->pCursors[1], ME_GetTextLength(editor), FALSE); from = to = 0; @@ -1756,9 +1756,9 @@ static LRESULT ME_StreamIn(ME_TextEditor *editor, DWORD format, EDITSTREAM *stre cf.dwMask = CFM_ALL2; ME_MoveCursorChars(editor, &lastcharCursor, -1, FALSE); ME_GetCharFormat(editor, &lastcharCursor, &linebreakCursor, &cf); - ME_SetSelection(editor, newto, -1); + set_selection_cursors(editor, newto, -1); ME_SetSelectionCharFormat(editor, &cf); - ME_SetSelection(editor, newto, newto); + set_selection_cursors(editor, newto, newto); ME_MoveCursorChars(editor, &linebreakCursor, -linebreakSize, FALSE); ME_GetTextW(editor, lastchar, 2, &linebreakCursor, linebreakSize, FALSE, FALSE); @@ -1781,7 +1781,7 @@ static LRESULT ME_StreamIn(ME_TextEditor *editor, DWORD format, EDITSTREAM *stre ERR("EM_STREAMIN without SF_TEXT or SF_RTF\n"); /* put the cursor at the top */ if (!(format & SFF_SELECTION)) - ME_SetSelection(editor, 0, 0); + set_selection_cursors(editor, 0, 0); ME_CursorFromCharOfs(editor, from, &start); ME_UpdateLinkAttribute(editor, &start, to - from); } @@ -2147,14 +2147,14 @@ static int ME_GetTextRange(ME_TextEditor *editor, WCHAR *strText, } } -static int handle_EM_EXSETSEL( ME_TextEditor *editor, int to, int from ) +int set_selection( ME_TextEditor *editor, int to, int from ) { int end; TRACE("%d - %d\n", to, from ); ME_InvalidateSelection( editor ); - end = ME_SetSelection( editor, to, from ); + end = set_selection_cursors( editor, to, from ); ME_InvalidateSelection( editor ); update_caret( editor ); ME_SendSelChange( editor ); @@ -2682,7 +2682,7 @@ ME_KeyDown(ME_TextEditor *editor, WORD nKey) case 'A': if (ctrl_is_down) { - handle_EM_EXSETSEL( editor, 0, -1 ); + set_selection( editor, 0, -1 ); return TRUE; } break; @@ -3796,7 +3796,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, } case EM_SETSEL: { - return handle_EM_EXSETSEL( editor, wParam, lParam ); + return set_selection( editor, wParam, lParam ); } case EM_SETSCROLLPOS: { @@ -3821,7 +3821,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, { CHARRANGE range = *(CHARRANGE *)lParam; - return handle_EM_EXSETSEL( editor, range.cpMin, range.cpMax ); + return set_selection( editor, range.cpMin, range.cpMax ); } case EM_SHOWSCROLLBAR: { @@ -4122,7 +4122,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, TRACE("WM_SETTEXT - NULL\n"); ME_SetCursorToStart(editor, &cursor); ME_UpdateLinkAttribute(editor, &cursor, INT_MAX); - ME_SetSelection(editor, 0, 0); + set_selection_cursors(editor, 0, 0); editor->nModifyStep = 0; ME_CommitUndo(editor); ME_EmptyUndoStack(editor); @@ -4813,7 +4813,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, HeapFree(GetProcessHeap(), 0, lpCompStr); if (dwIndex == GCS_COMPSTR) - ME_SetSelection(editor,editor->imeStartIndex, + set_selection_cursors(editor,editor->imeStartIndex, editor->imeStartIndex + dwBufLen/sizeof(WCHAR)); } ME_ReleaseStyle(style); diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index f56d2a2..800f588 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -149,7 +149,7 @@ void ME_SetDefaultCharFormat(ME_TextEditor *editor, CHARFORMAT2W *mod) DECLSPEC_ /* caret.c */ void ME_SetCursorToStart(ME_TextEditor *editor, ME_Cursor *cursor) DECLSPEC_HIDDEN; -int ME_SetSelection(ME_TextEditor *editor, int from, int to) DECLSPEC_HIDDEN; +int set_selection_cursors(ME_TextEditor *editor, int from, int to) DECLSPEC_HIDDEN; BOOL ME_MoveCursorWords(ME_TextEditor *editor, ME_Cursor *cursor, int nRelOfs) DECLSPEC_HIDDEN; void hide_caret(ME_TextEditor *ed) DECLSPEC_HIDDEN; void show_caret(ME_TextEditor *ed) DECLSPEC_HIDDEN; @@ -255,6 +255,7 @@ void ME_RTFSpecialCharHook(struct _RTF_Info *info) DECLSPEC_HIDDEN; void ME_StreamInFill(ME_InStream *stream) DECLSPEC_HIDDEN; extern BOOL me_debug DECLSPEC_HIDDEN; void ME_ReplaceSel(ME_TextEditor *editor, BOOL can_undo, const WCHAR *str, int len) DECLSPEC_HIDDEN; +int set_selection( ME_TextEditor *editor, int to, int from ) DECLSPEC_HIDDEN; /* table.c */ BOOL ME_IsInTable(ME_DisplayItem *pItem) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 5a102a7..4e8d450 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -2149,7 +2149,7 @@ static HRESULT WINAPI ITextRange_fnSelect(ITextRange *me) if (!This->child.reole) return CO_E_RELEASED; - ME_SetSelection(This->child.reole->editor, This->start, This->end); + set_selection(This->child.reole->editor, This->start, This->end); return S_OK; } @@ -4649,7 +4649,7 @@ static HRESULT WINAPI ITextSelection_fnSetStart(ITextSelection *me, LONG value) ME_GetSelectionOfs(This->reOle->editor, &start, &end); hr = textrange_setstart(This->reOle, value, &start, &end); if (hr == S_OK) - ME_SetSelection(This->reOle->editor, start, end); + set_selection(This->reOle->editor, start, end); return hr; } @@ -4684,7 +4684,7 @@ static HRESULT WINAPI ITextSelection_fnSetEnd(ITextSelection *me, LONG value) ME_GetSelectionOfs(This->reOle->editor, &start, &end); hr = textrange_setend(This->reOle, value, &start, &end); if (hr == S_OK) - ME_SetSelection(This->reOle->editor, start, end); + set_selection(This->reOle->editor, start, end); return hr; } @@ -4803,7 +4803,7 @@ static HRESULT WINAPI ITextSelection_fnCollapse(ITextSelection *me, LONG bStart) ME_GetSelectionOfs(This->reOle->editor, &start, &end); hres = range_Collapse(bStart, &start, &end); if (SUCCEEDED(hres)) - ME_SetSelection(This->reOle->editor, start, end); + set_selection(This->reOle->editor, start, end); return hres; } diff --git a/dlls/riched20/txtsrv.c b/dlls/riched20/txtsrv.c index 9ce1d47..1276162 100644 --- a/dlls/riched20/txtsrv.c +++ b/dlls/riched20/txtsrv.c @@ -290,7 +290,7 @@ DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_TxSetText(ITextServices *iface, LPC ME_InternalDeleteText(This->editor, &cursor, ME_GetTextLength(This->editor), FALSE); if(pszText) ME_InsertTextFromCursor(This->editor, 0, pszText, -1, This->editor->pBuffer->pDefaultStyle); - ME_SetSelection(This->editor, 0, 0); + set_selection_cursors(This->editor, 0, 0); This->editor->nModifyStep = 0; OleFlushClipboard(); ME_EmptyUndoStack(This->editor);

1 0

Huw Davies : riched20: Only invalidate the selection if it's not hidden.
by Alexandre Julliard 19 Aug '19

19 Aug '19

Module: wine Branch: master Commit: b9e1ed0668119dc76afdd3d7dc01b5a5626003e2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b9e1ed0668119dc76afdd3d7… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Aug 19 10:55:26 2019 +0100 riched20: Only invalidate the selection if it's not hidden. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 118c646..b10f719 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2153,9 +2153,9 @@ int set_selection( ME_TextEditor *editor, int to, int from ) TRACE("%d - %d\n", to, from ); - ME_InvalidateSelection( editor ); + if (!editor->bHideSelection) ME_InvalidateSelection( editor ); end = set_selection_cursors( editor, to, from ); - ME_InvalidateSelection( editor ); + if (!editor->bHideSelection) ME_InvalidateSelection( editor ); update_caret( editor ); ME_SendSelChange( editor );

1 0