wine-devel July 2020

wine-devel@winehq.org

75 participants
841 discussions

[PATCH vkd3d 1/5] vkd3d-shader: Rename the vkd3d_root_descriptor_table structure to vkd3d_shader_root_descriptor_table.
by Henri Verbeet 16 Jul '20

16 Jul '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- include/vkd3d_shader.h | 4 ++-- libs/vkd3d-shader/dxbc.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 1ce701c..6fa2505 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -437,7 +437,7 @@ struct vkd3d_shader_descriptor_range unsigned int descriptor_table_offset; }; -struct vkd3d_root_descriptor_table +struct vkd3d_shader_root_descriptor_table { unsigned int descriptor_range_count; const struct vkd3d_shader_descriptor_range *descriptor_ranges; @@ -472,7 +472,7 @@ struct vkd3d_root_parameter enum vkd3d_shader_root_parameter_type parameter_type; union { - struct vkd3d_root_descriptor_table descriptor_table; + struct vkd3d_shader_root_descriptor_table descriptor_table; struct vkd3d_root_constants constants; struct vkd3d_root_descriptor descriptor; } u; diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 6297a04..0848c04 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -2300,7 +2300,7 @@ static int shader_parse_descriptor_ranges1(struct root_signature_parser_context } static int shader_parse_descriptor_table(struct root_signature_parser_context *context, - unsigned int offset, struct vkd3d_root_descriptor_table *table) + unsigned int offset, struct vkd3d_shader_root_descriptor_table *table) { struct vkd3d_shader_descriptor_range *ranges; unsigned int count; @@ -2807,7 +2807,7 @@ static int shader_write_root_signature_header(struct root_signature_writer_conte } static int shader_write_descriptor_ranges(struct root_signature_writer_context *context, - const struct vkd3d_root_descriptor_table *table) + const struct vkd3d_shader_root_descriptor_table *table) { const struct vkd3d_shader_descriptor_range *ranges = table->descriptor_ranges; unsigned int i; @@ -2855,7 +2855,7 @@ static int shader_write_descriptor_ranges1(struct root_signature_writer_context } static int shader_write_descriptor_table(struct root_signature_writer_context *context, - const struct vkd3d_root_descriptor_table *table) + const struct vkd3d_shader_root_descriptor_table *table) { if (!write_dword(context, table->descriptor_range_count)) return VKD3D_ERROR_OUT_OF_MEMORY; @@ -3036,7 +3036,7 @@ static int shader_write_root_signature(struct root_signature_writer_context *con return shader_write_static_samplers(context, desc); } -static int validate_descriptor_table_v_1_0(const struct vkd3d_root_descriptor_table *descriptor_table) +static int validate_descriptor_table_v_1_0(const struct vkd3d_shader_root_descriptor_table *descriptor_table) { bool have_srv_uav_cbv = false; bool have_sampler = false; -- 2.11.0

1 0

[PATCH] comctl32/listview: Use case-insensitive compare in LVM_FINDITEM.
by Nikolay Sivov 16 Jul '20

16 Jul '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comctl32/listview.c | 12 +++++++++--- dlls/comctl32/tests/listview.c | 13 +++++++++++++ 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index f1f09d201e0..1e9902fd6c1 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -6292,6 +6292,13 @@ static BOOL LISTVIEW_EnsureVisible(LISTVIEW_INFO *infoPtr, INT nItem, BOOL bPart return TRUE; } +static unsigned int startswithW(const WCHAR *str, const WCHAR *sub) +{ + const WCHAR *p1 = str, *p2 = sub; + while (*p1 && *p2 && towlower(*p1) == towlower(*p2)) { p1++; p2++; } + return !*p2; +} + /*** * DESCRIPTION: * Searches for an item with specific characteristics. @@ -6398,12 +6405,11 @@ again: { if (lpFindInfo->flags & (LVFI_PARTIAL | LVFI_SUBSTRING)) { - WCHAR *p = wcsstr(lvItem.pszText, lpFindInfo->psz); - if (!p || p != lvItem.pszText) continue; + if (!startswithW(lvItem.pszText, lpFindInfo->psz)) continue; } else { - if (lstrcmpW(lvItem.pszText, lpFindInfo->psz) != 0) continue; + if (lstrcmpiW(lvItem.pszText, lpFindInfo->psz)) continue; } } diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 20b9873d30d..c19de7f03f9 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -5366,6 +5366,19 @@ static void test_finditem(void) r = SendMessageA(hwnd, LVM_FINDITEMA, -1, (LPARAM)&fi); expect(0, r); + /* Case sensitivity. */ + strcpy(f, "Foo"); + fi.flags = LVFI_STRING; + fi.psz = f; + r = SendMessageA(hwnd, LVM_FINDITEMA, -1, (LPARAM)&fi); + ok(!r, "Unexpected item index %d.\n", r); + + strcpy(f, "F"); + fi.flags = LVFI_SUBSTRING; + fi.psz = f; + r = SendMessageA(hwnd, LVM_FINDITEMA, -1, (LPARAM)&fi); + ok(!r, "Unexpected item index %d.\n", r); + DestroyWindow(hwnd); } -- 2.27.0

2 1

[PATCH 1/5] quartz/tests: Test previous filter states.
by Zebediah Figura 16 Jul '20

16 Jul '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/tests/filtergraph.c | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 0c627aaeafb..bd6562b0ed5 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -1166,14 +1166,15 @@ struct testfilter IFilterGraph *graph; WCHAR *name; IReferenceClock *clock; - FILTER_STATE state; - REFERENCE_TIME start_time; IEnumPins IEnumPins_iface; struct testpin *pins; unsigned int pin_count, enum_idx; + FILTER_STATE state; + REFERENCE_TIME start_time; HRESULT state_hr, GetState_hr, seek_hr; + FILTER_STATE expect_stop_prev, expect_run_prev; IAMFilterMiscFlags IAMFilterMiscFlags_iface; ULONG misc_flags; @@ -1358,6 +1359,10 @@ static HRESULT WINAPI testfilter_Stop(IBaseFilter *iface) struct testfilter *filter = impl_from_IBaseFilter(iface); if (winetest_debug > 1) trace("%p->Stop()\n", filter); + todo_wine_if (filter->expect_stop_prev == State_Running) + ok(filter->state == filter->expect_stop_prev, "Expected previous state %#x, got %#x.\n", + filter->expect_stop_prev, filter->state); + check_state_transition(filter, State_Stopped); filter->state = State_Stopped; @@ -1380,6 +1385,9 @@ static HRESULT WINAPI testfilter_Run(IBaseFilter *iface, REFERENCE_TIME start) struct testfilter *filter = impl_from_IBaseFilter(iface); if (winetest_debug > 1) trace("%p->Run(%s)\n", filter, wine_dbgstr_longlong(start)); + ok(filter->state == filter->expect_run_prev, "Expected previous state %#x, got %#x.\n", + filter->expect_run_prev, filter->state); + check_state_transition(filter, State_Running); filter->state = State_Running; @@ -1831,7 +1839,9 @@ static void testfilter_init(struct testfilter *filter, struct testpin *pins, int filter->pin_count = pin_count; for (i = 0; i < pin_count; i++) pins[i].filter = &filter->IBaseFilter_iface; + filter->state = State_Stopped; + filter->expect_stop_prev = filter->expect_run_prev = State_Paused; } static HRESULT WINAPI testfilter_cf_QueryInterface(IClassFactory *iface, REFIID iid, void **out) @@ -3383,6 +3393,7 @@ static void test_filter_state(void) ok(hr == S_OK, "Got hr %#x.\n", hr); check_filter_state(graph, State_Stopped); + source.expect_run_prev = sink.expect_run_prev = State_Stopped; hr = IReferenceClock_GetTime(clock, &start_time); ok(SUCCEEDED(hr), "Got hr %#x.\n", hr); hr = IMediaFilter_Run(filter, 0); @@ -3400,6 +3411,7 @@ static void test_filter_state(void) ok(hr == S_OK, "Got hr %#x.\n", hr); check_filter_state(graph, State_Paused); + source.expect_run_prev = sink.expect_run_prev = State_Paused; hr = IMediaFilter_Run(filter, 0); ok(hr == S_OK, "Got hr %#x.\n", hr); check_filter_state(graph, State_Running); @@ -3587,6 +3599,7 @@ todo_wine /* This logic doesn't apply when using IMediaFilter methods directly. */ + source.expect_run_prev = sink.expect_run_prev = State_Stopped; sink.state_hr = S_FALSE; sink.GetState_hr = VFW_S_STATE_INTERMEDIATE; hr = IMediaFilter_Run(filter, 0); @@ -3610,6 +3623,8 @@ todo_wine ok(sink.state == State_Stopped, "Got state %u.\n", sink.state); ok(source.state == State_Stopped, "Got state %u.\n", source.state); + source.expect_run_prev = sink.expect_run_prev = State_Paused; + /* Test VFW_S_CANT_CUE. */ sink.GetState_hr = VFW_S_CANT_CUE; @@ -3658,7 +3673,7 @@ todo_wine /* Destroying the graph while it's running stops all filters. */ - hr = IMediaFilter_Run(filter, 0); + hr = IMediaControl_Run(control); ok(hr == S_OK, "Got hr %#x.\n", hr); check_filter_state(graph, State_Running); todo_wine @@ -3667,6 +3682,7 @@ todo_wine ok(sink.start_time == source.start_time, "Expected time %s, got %s.\n", wine_dbgstr_longlong(source.start_time), wine_dbgstr_longlong(sink.start_time)); + source.expect_stop_prev = sink.expect_stop_prev = State_Running; IMediaFilter_Release(filter); IMediaControl_Release(control); ref = IFilterGraph2_Release(graph); -- 2.27.0

1 4

[PATCH 2/4] mountmgr: Add support for IRP_MJ_QUERY_VOLUME_INFORMATION.
by Erich E. Hoover 16 Jul '20

16 Jul '20

This patch allows the mountmgr to handle the volume information request IRP, allowing volume information to be queried from the mountmgr. Best, Erich

2 3

[PATCH v2 1/6] ntoskrnl.exe: Add tests for permanent objects.
by Zebediah Figura 16 Jul '20

16 Jul '20

These tests have to live in ntoskrnl, since only kernel drivers and processes running as LOCAL SYSTEM can create permanent objects. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 6 ++-- dlls/ntoskrnl.exe/tests/driver.c | 49 +++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+), 3 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 6acdec5dc5a..0f65490b487 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -1378,7 +1378,7 @@ @ stdcall ZwClose(long) NtClose @ stub ZwCloseObjectAuditAlarm @ stdcall -private ZwConnectPort(ptr ptr ptr ptr ptr ptr ptr ptr) NtConnectPort -@ stdcall -private ZwCreateDirectoryObject(ptr long ptr) NtCreateDirectoryObject +@ stdcall ZwCreateDirectoryObject(ptr long ptr) NtCreateDirectoryObject @ stdcall ZwCreateEvent(ptr long ptr long long) NtCreateEvent @ stdcall ZwCreateFile(ptr long ptr ptr ptr long long long long ptr long) NtCreateFile @ stdcall -private ZwCreateIoCompletion(ptr long ptr long) NtCreateIoCompletion @@ -1412,11 +1412,11 @@ @ stdcall -private ZwLoadKey(ptr ptr) NtLoadKey @ stdcall -private ZwLockFile(long long ptr ptr ptr ptr ptr ptr long long) NtLockFile @ stdcall -private ZwLockVirtualMemory(long ptr ptr long) NtLockVirtualMemory -@ stdcall -private ZwMakeTemporaryObject(long) NtMakeTemporaryObject +@ stdcall ZwMakeTemporaryObject(long) NtMakeTemporaryObject @ stdcall -private ZwMapViewOfSection(long long ptr long long ptr ptr long long long) NtMapViewOfSection @ stdcall -private ZwNotifyChangeDirectoryFile(long long ptr ptr ptr ptr long long long) NtNotifyChangeDirectoryFile @ stdcall -private ZwNotifyChangeKey(long long ptr ptr ptr long long ptr long long) NtNotifyChangeKey -@ stdcall -private ZwOpenDirectoryObject(ptr long ptr) NtOpenDirectoryObject +@ stdcall ZwOpenDirectoryObject(ptr long ptr) NtOpenDirectoryObject @ stdcall -private ZwOpenEvent(ptr long ptr) NtOpenEvent @ stdcall ZwOpenFile(ptr long ptr ptr long long) NtOpenFile @ stdcall -private ZwOpenJobObject(ptr long ptr) NtOpenJobObject diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index bb5bbeb4fa5..0ae63ffafb3 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -2024,6 +2024,54 @@ static void test_process_memory(const struct test_input *test_input) ObDereferenceObject(process); } +static void test_permanence(void) +{ + OBJECT_ATTRIBUTES attr; + HANDLE handle, handle2; + UNICODE_STRING str; + NTSTATUS status; + + RtlInitUnicodeString(&str, L"\\BaseNamedObjects\\wine_test_dir"); + InitializeObjectAttributes(&attr, &str, 0, 0, NULL); + status = ZwCreateDirectoryObject( &handle, GENERIC_ALL, &attr ); + ok(!status, "got %#x\n", status); + status = ZwClose( handle ); + ok(!status, "got %#x\n", status); + status = ZwOpenDirectoryObject( &handle, 0, &attr ); + ok(status == STATUS_OBJECT_NAME_NOT_FOUND, "got %#x\n", status); + + attr.Attributes = OBJ_PERMANENT; + status = ZwCreateDirectoryObject( &handle, GENERIC_ALL, &attr ); + ok(!status, "got %#x\n", status); + status = ZwClose( handle ); + ok(!status, "got %#x\n", status); + + attr.Attributes = 0; + status = ZwOpenDirectoryObject( &handle, 0, &attr ); + todo_wine ok(!status, "got %#x\n", status); + status = ZwMakeTemporaryObject( handle ); + ok(!status, "got %#x\n", status); + status = ZwMakeTemporaryObject( handle ); + ok(!status, "got %#x\n", status); + status = ZwClose( handle ); + todo_wine ok(!status, "got %#x\n", status); + status = ZwOpenDirectoryObject( &handle, 0, &attr ); + ok(status == STATUS_OBJECT_NAME_NOT_FOUND, "got %#x\n", status); + + status = ZwCreateDirectoryObject( &handle, GENERIC_ALL, &attr ); + ok(!status, "got %#x\n", status); + attr.Attributes = OBJ_PERMANENT; + status = ZwOpenDirectoryObject( &handle2, 0, &attr ); + ok(status == STATUS_SUCCESS, "got %#x\n", status); + status = ZwClose( handle2 ); + ok(!status, "got %#x\n", status); + status = ZwClose( handle ); + ok(!status, "got %#x\n", status); + attr.Attributes = 0; + status = ZwOpenDirectoryObject( &handle, 0, &attr ); + ok(status == STATUS_OBJECT_NAME_NOT_FOUND, "got %#x\n", status); +} + static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *stack) { ULONG length = stack->Parameters.DeviceIoControl.OutputBufferLength; @@ -2080,6 +2128,7 @@ static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *st test_affinity(); test_dpc(); test_process_memory(test_input); + test_permanence(); if (main_test_work_item) return STATUS_UNEXPECTED_IO_ERROR; -- 2.27.0

2 7

[PATCH 1/6] ntoskrnl.exe: Add tests for permanent objects.
by Zebediah Figura 16 Jul '20

16 Jul '20

2 8

[PATCH 1/5] ntoskrnl.exe: Store current thread object at right offset from GS.
by Derek Lesho 15 Jul '20

15 Jul '20

In kernel mode, GS base is not set to a TEB, but fortunately the offset for the current thread object, which EasyAntiCheat.sys relies on, doesn't conflict with anything in the TEB. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 33 ++++++++++++++++++++++++++++----- 1 file changed, 28 insertions(+), 5 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index d407cffee69..2430b0d9202 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -870,7 +870,7 @@ NTSTATUS CDECL wine_ntoskrnl_main_loop( HANDLE stop_event ) for (;;) { - NtCurrentTeb()->Reserved5[1] = NULL; + NtCurrentTeb()->SystemReserved1[15] = NULL; if (!context.in_buff && !(context.in_buff = HeapAlloc( GetProcessHeap(), 0, context.in_size ))) { ERR( "failed to allocate buffer\n" ); @@ -891,7 +891,7 @@ NTSTATUS CDECL wine_ntoskrnl_main_loop( HANDLE stop_event ) context.params = reply->params; context.in_size = reply->in_size; client_tid = reply->client_tid; - NtCurrentTeb()->Reserved5[1] = wine_server_get_ptr( reply->client_thread ); + NtCurrentTeb()->SystemReserved1[15] = wine_server_get_ptr( reply->client_thread ); } else { @@ -2339,7 +2339,7 @@ POBJECT_TYPE PsThreadType = &thread_type; */ PRKTHREAD WINAPI KeGetCurrentThread(void) { - struct _KTHREAD *thread = NtCurrentTeb()->Reserved5[1]; + struct _KTHREAD *thread = NtCurrentTeb()->SystemReserved1[15]; if (!thread) { @@ -2352,7 +2352,7 @@ PRKTHREAD WINAPI KeGetCurrentThread(void) kernel_object_from_handle( handle, PsThreadType, (void**)&thread ); if (handle != GetCurrentThread()) NtClose( handle ); - NtCurrentTeb()->Reserved5[1] = thread; + NtCurrentTeb()->SystemReserved1[15] = thread; } return thread; @@ -2881,6 +2881,22 @@ DEVICE_OBJECT* WINAPI IoGetAttachedDeviceReference( DEVICE_OBJECT *device ) } +struct system_thread_ctx +{ + PKSTART_ROUTINE start; + PVOID context; +}; + +static void WINAPI init_system_thread(PVOID context) +{ + struct system_thread_ctx info = *(struct system_thread_ctx *)context; + HeapFree( GetProcessHeap(), 0, context ); + + NtCurrentTeb()->SystemReserved1[15] = KeGetCurrentThread(); + + info.start(info.context); +} + /*********************************************************************** * PsCreateSystemThread (NTOSKRNL.EXE.@) */ @@ -2889,9 +2905,16 @@ NTSTATUS WINAPI PsCreateSystemThread(PHANDLE ThreadHandle, ULONG DesiredAccess, HANDLE ProcessHandle, PCLIENT_ID ClientId, PKSTART_ROUTINE StartRoutine, PVOID StartContext) { + struct system_thread_ctx *info; + if (!ProcessHandle) ProcessHandle = GetCurrentProcess(); + + info = HeapAlloc( GetProcessHeap(), 0, sizeof(*info) ); + info->start = StartRoutine; + info->context = StartContext; + return RtlCreateUserThread(ProcessHandle, 0, FALSE, 0, 0, - 0, StartRoutine, StartContext, + 0, init_system_thread, info, ThreadHandle, ClientId); } -- 2.27.0

2 6

[PATCH 1/4] msvcrt/tests: Check errno in strtod test.
by Daniel Lehman 15 Jul '20

15 Jul '20

Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> --- dlls/msvcrt/tests/string.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index b5b877e7ec..ccbd049c4c 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -1938,6 +1938,7 @@ static void test__strtod(void) const char *str; int len; double ret; + int err; } tests[] = { { "12.1", 4, 12.1 }, { "-13.721", 7, -13.721 }, @@ -1953,7 +1954,7 @@ static void test__strtod(void) { "0.82181281288121", 16, 0.82181281288121 }, { "21921922352523587651128218821", 29, 21921922352523587651128218821.0 }, { "0.1d238", 7, 0.1e238 }, - { "0.1D-4736", 9, 0 }, + { "0.1D-4736", 9, 0, ERANGE }, { "3.4028234663852887e38", 21, FLT_MAX }, { "1.7976931348623158e+308", 23, DBL_MAX }, { "00", 2, 0 }, @@ -1975,7 +1976,8 @@ static void test__strtod(void) ok(d == tests[i].ret, "%d) d = %.16e\n", i, d); ok(end == tests[i].str + tests[i].len, "%d) len = %d\n", i, (int)(end - tests[i].str)); - ok(errno = 0xdeadbeef, "%d) errno = %d\n", i, errno); + todo_wine_if(!tests[i].err) + ok(errno == tests[i].err, "%d) errno = %d\n", i, errno); } if (!p__strtod_l) -- 2.25.1

1 3

[PATCH v2 1/4] server: Introduce IOCTL_CONDRV_GET_TITLE ioctl.
by Jacek Caban 15 Jul '20

15 Jul '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- v2: Thanks, Zebediah include/wine/condrv.h | 1 + server/console.c | 4 ++++ 2 files changed, 5 insertions(+)

1 0

[PATCH 1/4] server: Introduce IOCTL_CONDRV_SET_TITLE ioctl.
by Jacek Caban 15 Jul '20

15 Jul '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/wine/condrv.h | 1 + server/console.c | 4 ++++ 2 files changed, 5 insertions(+)

2 1

← Newer
1
...
44
45
46
47
48
49
50
...
85
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel July 2020