February 2019 - Wine-commits

Zebediah Figura : quartz/filesource: Remove some incorrect assertions.
by Alexandre Julliard 26 Feb '19

26 Feb '19

Module: wine Branch: master Commit: dbca5c56671692c87497e25c71022671c282a238 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dbca5c56671692c87497e25c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Feb 25 21:39:45 2019 -0600 quartz/filesource: Remove some incorrect assertions. There's no point checking the sample's time again. Moreover, short reads are not an error. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filesource.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index 9e36057..fc3e508 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -1222,7 +1222,6 @@ static HRESULT WINAPI FileAsyncReader_WaitForNext(IAsyncReader * iface, DWORD dw if (SUCCEEDED(hr)) { REFERENCE_TIME rtStart, rtStop; - REFERENCE_TIME rtSampleStart, rtSampleStop; DATAREQUEST *pDataRq = This->sample_list + buffer; DWORD dwBytes = 0; @@ -1247,16 +1246,7 @@ static HRESULT WINAPI FileAsyncReader_WaitForNext(IAsyncReader * iface, DWORD dw rtStart = MEDIATIME_FROM_BYTES(rtStart); rtStop = rtStart + MEDIATIME_FROM_BYTES(dwBytes); - IMediaSample_GetTime(pDataRq->pSample, &rtSampleStart, &rtSampleStop); - assert(rtStart == rtSampleStart); - assert(rtStop <= rtSampleStop); - IMediaSample_SetTime(pDataRq->pSample, &rtStart, &rtStop); - assert(rtStart == rtSampleStart); - if (hr == S_OK) - assert(rtStop == rtSampleStop); - else - assert(rtStop == rtStart); This->sample_list[buffer].pSample = NULL; assert(This->oldest_sample < This->samples);

1 0

Zebediah Figura : quartz/tests/filesource: Add tests for IAsyncReader_Request() and IAsyncReader_WaitForNext().
by Alexandre Julliard 26 Feb '19

26 Feb '19

Module: wine Branch: master Commit: 4a4eca6e6850169d0f6a6321c976e84f62ab7880 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4a4eca6e6850169d0f6a6321… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Feb 25 21:39:46 2019 -0600 quartz/tests/filesource: Add tests for IAsyncReader_Request() and IAsyncReader_WaitForNext(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/filesource.c | 94 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 94 insertions(+) diff --git a/dlls/quartz/tests/filesource.c b/dlls/quartz/tests/filesource.c index 36a2539..d526236 100644 --- a/dlls/quartz/tests/filesource.c +++ b/dlls/quartz/tests/filesource.c @@ -720,6 +720,99 @@ static void test_sync_read_aligned(IAsyncReader *reader, IMemAllocator *allocato IMediaSample_Release(sample); } +static void test_request(IAsyncReader *reader, IMemAllocator *allocator) +{ + IMediaSample *sample, *sample2, *ret_sample; + REFERENCE_TIME start_time, end_time; + BYTE *data, *data2; + DWORD_PTR cookie; + HRESULT hr; + LONG len; + int i; + + IMemAllocator_GetBuffer(allocator, &sample, NULL, NULL, 0); + IMediaSample_GetPointer(sample, &data); + IMemAllocator_GetBuffer(allocator, &sample2, NULL, NULL, 0); + IMediaSample_GetPointer(sample2, &data2); + + hr = IAsyncReader_WaitForNext(reader, 0, &ret_sample, &cookie); + ok(hr == VFW_E_TIMEOUT, "Got hr %#x.\n", hr); + + start_time = 0; + end_time = 512 * (LONGLONG)10000000; + hr = IMediaSample_SetTime(sample, &start_time, &end_time); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IAsyncReader_Request(reader, sample, 123); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IAsyncReader_WaitForNext(reader, 1000, &ret_sample, &cookie); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(ret_sample == sample, "Expected sample %p, got %p.\n", sample, ret_sample); + ok(cookie == 123, "Got cookie %lu.\n", cookie); + + len = IMediaSample_GetActualDataLength(sample); + ok(len == 512, "Got length %d.\n", hr); + + for (i = 0; i < 512; i++) + ok(data[i] == i % 111, "Got wrong byte %02x at %u.\n", data[i], i); + + start_time = 1024 * (LONGLONG)10000000; + end_time = 1536 * (LONGLONG)10000000; + hr = IMediaSample_SetTime(sample, &start_time, &end_time); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IAsyncReader_Request(reader, sample, 123); + ok(hr == HRESULT_FROM_WIN32(ERROR_HANDLE_EOF), "Got hr %#x.\n", hr); + + start_time = 0; + end_time = 512 * (LONGLONG)10000000; + hr = IMediaSample_SetTime(sample, &start_time, &end_time); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IAsyncReader_Request(reader, sample, 123); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + start_time = 512 * (LONGLONG)10000000; + end_time = 1024 * (LONGLONG)10000000; + hr = IMediaSample_SetTime(sample2, &start_time, &end_time); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IAsyncReader_Request(reader, sample2, 456); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IAsyncReader_WaitForNext(reader, 1000, &ret_sample, &cookie); + ok(hr == S_OK, "Got hr %#x.\n", hr); + if (cookie == 123) + { + ok(ret_sample == sample, "Expected sample %p, got %p.\n", sample, ret_sample); + + hr = IAsyncReader_WaitForNext(reader, 1000, &ret_sample, &cookie); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(ret_sample == sample2, "Expected sample %p, got %p.\n", sample2, ret_sample); + ok(cookie == 456, "Got cookie %lu.\n", cookie); + } + else + { + ok(cookie == 456, "Got cookie %lu.\n", cookie); + ok(ret_sample == sample2, "Expected sample %p, got %p.\n", sample2, ret_sample); + + hr = IAsyncReader_WaitForNext(reader, 1000, &ret_sample, &cookie); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(ret_sample == sample, "Expected sample %p, got %p.\n", sample, ret_sample); + ok(cookie == 123, "Got cookie %lu.\n", cookie); + } + + for (i = 0; i < 512; i++) + ok(data[i] == i % 111, "Got wrong byte %02x at %u.\n", data[i], i); + + for (i = 0; i < 88; i++) + ok(data2[i] == (512 + i) % 111, "Got wrong byte %02x at %u.\n", data2[i], i); + + IMediaSample_Release(sample); + IMediaSample_Release(sample2); +} + static void test_async_reader(void) { ALLOCATOR_PROPERTIES req_props = {2, 1024, 512, 0}, ret_props; @@ -800,6 +893,7 @@ static void test_async_reader(void) IMemAllocator_Commit(allocator); test_sync_read_aligned(reader, allocator); + test_request(reader, allocator); IMemAllocator_Release(allocator); IAsyncReader_Release(reader);

1 0

Zebediah Figura : quartz/tests/filesource: Add tests for IAsyncReader_BeginFlush() and IAsyncReader_EndFlush().
by Alexandre Julliard 26 Feb '19

26 Feb '19

Module: wine Branch: master Commit: f3a4b4984ee2ae2b1bde21f15952f5c0aff6dbe5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f3a4b4984ee2ae2b1bde21f1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Feb 25 21:39:47 2019 -0600 quartz/tests/filesource: Add tests for IAsyncReader_BeginFlush() and IAsyncReader_EndFlush(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/filesource.c | 61 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/dlls/quartz/tests/filesource.c b/dlls/quartz/tests/filesource.c index d526236..3960639 100644 --- a/dlls/quartz/tests/filesource.c +++ b/dlls/quartz/tests/filesource.c @@ -813,6 +813,66 @@ static void test_request(IAsyncReader *reader, IMemAllocator *allocator) IMediaSample_Release(sample2); } +static void test_flush(IAsyncReader *reader, IMemAllocator *allocator) +{ + REFERENCE_TIME start_time, end_time; + IMediaSample *sample, *ret_sample; + BYTE buffer[20], *data; + DWORD_PTR cookie; + HRESULT hr; + int i; + + IMemAllocator_GetBuffer(allocator, &sample, NULL, NULL, 0); + IMediaSample_GetPointer(sample, &data); + + start_time = 0; + end_time = 512 * (LONGLONG)10000000; + hr = IMediaSample_SetTime(sample, &start_time, &end_time); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IAsyncReader_BeginFlush(reader); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IAsyncReader_SyncRead(reader, 0, 20, buffer); + ok(hr == S_OK, "Got hr %#x.\n", hr); + for (i = 0; i < 20; i++) + ok(buffer[i] == i % 111, "Got wrong byte %02x at %u.\n", buffer[i], i); + + start_time = 0; + end_time = 512 * (LONGLONG)10000000; + hr = IMediaSample_SetTime(sample, &start_time, &end_time); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IAsyncReader_SyncReadAligned(reader, sample); + ok(hr == S_OK, "Got hr %#x.\n", hr); + for (i = 0; i < 512; i++) + ok(data[i] == i % 111, "Got wrong byte %02x at %u.\n", data[i], i); + + hr = IAsyncReader_Request(reader, sample, 456); + ok(hr == VFW_E_WRONG_STATE, "Got hr %#x.\n", hr); + + hr = IAsyncReader_EndFlush(reader); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IAsyncReader_WaitForNext(reader, 0, &ret_sample, &cookie); + ok(hr == VFW_E_TIMEOUT, "Got hr %#x.\n", hr); + + start_time = 0; + end_time = 512 * (LONGLONG)10000000; + hr = IAsyncReader_Request(reader, sample, 123); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IAsyncReader_WaitForNext(reader, 1000, &ret_sample, &cookie); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(ret_sample == sample, "Expected sample %p, got %p.\n", sample, ret_sample); + ok(cookie == 123, "Got cookie %lu.\n", cookie); + + for (i = 0; i < 512; i++) + ok(data[i] == i % 111, "Got wrong byte %02x at %u.\n", data[i], i); + + IMediaSample_Release(sample); +} + static void test_async_reader(void) { ALLOCATOR_PROPERTIES req_props = {2, 1024, 512, 0}, ret_props; @@ -894,6 +954,7 @@ static void test_async_reader(void) test_sync_read_aligned(reader, allocator); test_request(reader, allocator); + test_flush(reader, allocator); IMemAllocator_Release(allocator); IAsyncReader_Release(reader);

1 0

Zebediah Figura : quartz/tests: Rename avisplitter.c to avisplit.c.
by Alexandre Julliard 26 Feb '19

26 Feb '19

Module: wine Branch: master Commit: 6de638eac780d013926706f77e74dd42909f6af6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6de638eac780d013926706f7… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Feb 25 21:39:48 2019 -0600 quartz/tests: Rename avisplitter.c to avisplit.c. To match the Wine source file. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/Makefile.in | 2 +- dlls/quartz/tests/{avisplitter.c => avisplit.c} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/tests/Makefile.in b/dlls/quartz/tests/Makefile.in index 8ecced9..03f1389 100644 --- a/dlls/quartz/tests/Makefile.in +++ b/dlls/quartz/tests/Makefile.in @@ -2,7 +2,7 @@ TESTDLL = quartz.dll IMPORTS = oleaut32 ole32 advapi32 user32 C_SRCS = \ - avisplitter.c \ + avisplit.c \ dsoundrender.c \ filesource.c \ filtergraph.c \ diff --git a/dlls/quartz/tests/avisplitter.c b/dlls/quartz/tests/avisplit.c similarity index 99% rename from dlls/quartz/tests/avisplitter.c rename to dlls/quartz/tests/avisplit.c index 757b71c..be9ec18 100644 --- a/dlls/quartz/tests/avisplitter.c +++ b/dlls/quartz/tests/avisplit.c @@ -414,7 +414,7 @@ fail: DeleteFileW(filename); } -START_TEST(avisplitter) +START_TEST(avisplit) { CoInitialize(NULL);

1 0

Hans Leidekker : msi: Don't use globals to manage assembly cache state.
by Alexandre Julliard 26 Feb '19

26 Feb '19

Module: wine Branch: master Commit: c64d73c829c3bde7744362b2cd566075ab7e37df URL: https://source.winehq.org/git/wine.git/?a=commit;h=c64d73c829c3bde7744362b2… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Feb 26 13:27:50 2019 +0100 msi: Don't use globals to manage assembly cache state. Based on a patch by Zebediah Figura. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46719 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/assembly.c | 124 +++++++++++++++++++++++++--------------------------- dlls/msi/msipriv.h | 8 ++++ 2 files changed, 68 insertions(+), 64 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c64d73c829c3bde77443…

1 0

Jacek Caban : ntoskrnl.exe/tests: Add object reference tests.
by Alexandre Julliard 26 Feb '19

26 Feb '19

Module: wine Branch: master Commit: 99876873b8421aaf0ddca0f9795acf158c9dd575 URL: https://source.winehq.org/git/wine.git/?a=commit;h=99876873b8421aaf0ddca0f9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 26 13:38:50 2019 +0100 ntoskrnl.exe/tests: Add object reference tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 6 +- dlls/ntoskrnl.exe/tests/driver.c | 139 +++++++++++++++++++++++++++++++++++- 2 files changed, 140 insertions(+), 5 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index d087422..286d688 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -1313,8 +1313,8 @@ @ stub ZwCloseObjectAuditAlarm @ stdcall -private ZwConnectPort(ptr ptr ptr ptr ptr ptr ptr ptr) NtConnectPort @ stdcall -private ZwCreateDirectoryObject(ptr long ptr) NtCreateDirectoryObject -@ stdcall -private ZwCreateEvent(ptr long ptr long long) NtCreateEvent -@ stdcall -private ZwCreateFile(ptr long ptr ptr ptr long long long long ptr long) NtCreateFile +@ stdcall ZwCreateEvent(ptr long ptr long long) NtCreateEvent +@ stdcall ZwCreateFile(ptr long ptr ptr ptr long long long long ptr long) NtCreateFile @ stdcall -private ZwCreateJobObject(ptr long ptr) NtCreateJobObject @ stdcall -private ZwCreateKey(ptr long ptr long ptr long ptr) NtCreateKey @ stdcall -private ZwCreateSection(ptr long ptr ptr long long long) NtCreateSection @@ -1326,7 +1326,7 @@ @ stdcall -private ZwDeleteValueKey(long ptr) NtDeleteValueKey @ stdcall -private ZwDeviceIoControlFile(long long ptr ptr ptr long ptr long ptr long) NtDeviceIoControlFile @ stdcall -private ZwDisplayString(ptr) NtDisplayString -@ stdcall -private ZwDuplicateObject(long long long ptr long long long) NtDuplicateObject +@ stdcall ZwDuplicateObject(long long long ptr long long long) NtDuplicateObject @ stdcall -private ZwDuplicateToken(long long ptr long long ptr) NtDuplicateToken @ stub ZwEnumerateBootEntries @ stdcall -private ZwEnumerateKey(long long long ptr long ptr) NtEnumerateKey diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index 3984240..b16c428 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -49,6 +49,10 @@ static int running_under_wine; static int winetest_debug; static int winetest_report_success; +static POBJECT_TYPE *pExEventObjectType, *pIoFileObjectType, *pPsThreadType; + +void WINAPI ObfReferenceObject( void *obj ); + extern int CDECL _vsnprintf(char *str, size_t len, const char *format, __ms_va_list argptr); static void kvprintf(const char *format, __ms_va_list ap) @@ -174,6 +178,21 @@ static void winetest_end_todo(void) #define todo_wine_if(is_todo) todo_if((is_todo) && running_under_wine) #define win_skip(...) win_skip_(__FILE__, __LINE__, __VA_ARGS__) +static unsigned int strlenW( const WCHAR *str ) +{ + const WCHAR *s = str; + while (*s) s++; + return s - str; +} + +void *kmemcpy(void *dest, const void *src, SIZE_T n) +{ + const char *s = src; + char *d = dest; + while (n--) *d++ = *s++; + return dest; +} + static void *get_proc_address(const char *name) { UNICODE_STRING name_u; @@ -636,6 +655,113 @@ static void test_version(void) ok(*pNtBuildNumber == build, "Expected build number %u, got %u\n", build, *pNtBuildNumber); } +static void WINAPI thread_proc(void *arg) +{ + PsTerminateSystemThread(STATUS_SUCCESS); +} + +static void test_ob_reference(const WCHAR *test_path) +{ + OBJECT_ATTRIBUTES attr = { sizeof(attr) }; + HANDLE event_handle, file_handle, file_handle2, thread_handle; + void *obj1, *obj2; + UNICODE_STRING pathU; + IO_STATUS_BLOCK io; + WCHAR *tmp_path; + SIZE_T len; + NTSTATUS status; + + static const WCHAR tmpW[] = {'.','t','m','p',0}; + + InitializeObjectAttributes(&attr, NULL, OBJ_KERNEL_HANDLE, NULL, NULL); + status = ZwCreateEvent(&event_handle, SYNCHRONIZE, &attr, NotificationEvent, TRUE); + ok(!status, "ZwCreateEvent failed: %#x\n", status); + + len = strlenW(test_path); + tmp_path = ExAllocatePool(PagedPool, len * sizeof(WCHAR) + sizeof(tmpW)); + kmemcpy(tmp_path, test_path, len * sizeof(WCHAR)); + kmemcpy(tmp_path + len, tmpW, sizeof(tmpW)); + + RtlInitUnicodeString(&pathU, tmp_path); + attr.ObjectName = &pathU; + attr.Attributes = OBJ_KERNEL_HANDLE; + status = ZwCreateFile(&file_handle, DELETE | FILE_WRITE_DATA | SYNCHRONIZE, &attr, &io, NULL, 0, 0, FILE_CREATE, + FILE_DELETE_ON_CLOSE | FILE_SYNCHRONOUS_IO_NONALERT, NULL, 0); + ok(!status, "ZwCreateFile failed: %#x\n", status); + ExFreePool(tmp_path); + + status = ZwDuplicateObject(NtCurrentProcess(), file_handle, NtCurrentProcess(), &file_handle2, + 0, OBJ_KERNEL_HANDLE, DUPLICATE_SAME_ACCESS); + ok(!status, "ZwDuplicateObject failed: %#x\n", status); + + InitializeObjectAttributes(&attr, NULL, OBJ_KERNEL_HANDLE, NULL, NULL); + status = PsCreateSystemThread(&thread_handle, SYNCHRONIZE, &attr, NULL, NULL, thread_proc, NULL); + ok(!status, "PsCreateSystemThread returned: %#x\n", status); + + status = ObReferenceObjectByHandle(NULL, SYNCHRONIZE, *pExEventObjectType, KernelMode, &obj1, NULL); + todo_wine + ok(status == STATUS_INVALID_HANDLE, "ObReferenceObjectByHandle failed: %#x\n", status); + if (!status) ObDereferenceObject(obj1); + + status = ObReferenceObjectByHandle(event_handle, SYNCHRONIZE, *pIoFileObjectType, KernelMode, &obj1, NULL); + todo_wine + ok(status == STATUS_OBJECT_TYPE_MISMATCH, "ObReferenceObjectByHandle returned: %#x\n", status); + if (!status) ObDereferenceObject(obj1); + + status = ObReferenceObjectByHandle(event_handle, SYNCHRONIZE, *pExEventObjectType, KernelMode, &obj1, NULL); + ok(!status, "ObReferenceObjectByHandle failed: %#x\n", status); + + if (sizeof(void *) != 4) /* avoid dealing with fastcall */ + { + ObfReferenceObject(obj1); + ObDereferenceObject(obj1); + } + + status = ObReferenceObjectByHandle(event_handle, SYNCHRONIZE, *pIoFileObjectType, KernelMode, &obj2, NULL); + todo_wine + ok(status == STATUS_OBJECT_TYPE_MISMATCH, "ObReferenceObjectByHandle returned: %#x\n", status); + if (!status) ObDereferenceObject(obj2); + + status = ObReferenceObjectByHandle(event_handle, SYNCHRONIZE, *pExEventObjectType, KernelMode, &obj2, NULL); + ok(!status, "ObReferenceObjectByHandle failed: %#x\n", status); + ok(obj1 == obj2, "obj1 != obj2\n"); + + ObDereferenceObject(obj1); + ObDereferenceObject(obj2); + + status = ObReferenceObjectByHandle(file_handle, SYNCHRONIZE, *pIoFileObjectType, KernelMode, &obj1, NULL); + ok(!status, "ObReferenceObjectByHandle failed: %#x\n", status); + + status = ObReferenceObjectByHandle(file_handle2, SYNCHRONIZE, *pIoFileObjectType, KernelMode, &obj2, NULL); + ok(!status, "ObReferenceObjectByHandle failed: %#x\n", status); + ok(obj1 == obj2, "obj1 != obj2\n"); + + ObDereferenceObject(obj1); + ObDereferenceObject(obj2); + + status = ObReferenceObjectByHandle(thread_handle, SYNCHRONIZE, *pPsThreadType, KernelMode, &obj1, NULL); + ok(!status, "ObReferenceObjectByHandle failed: %#x\n", status); + + status = ObReferenceObjectByHandle(thread_handle, SYNCHRONIZE, *pPsThreadType, KernelMode, &obj2, NULL); + ok(!status, "ObReferenceObjectByHandle failed: %#x\n", status); + ok(obj1 == obj2, "obj1 != obj2\n"); + + ObDereferenceObject(obj1); + ObDereferenceObject(obj2); + + status = ZwClose(thread_handle); + ok(!status, "ZwClose failed: %#x\n", status); + + status = ZwClose(event_handle); + ok(!status, "ZwClose failed: %#x\n", status); + + status = ZwClose(file_handle); + ok(!status, "ZwClose failed: %#x\n", status); + + status = ZwClose(file_handle2); + ok(!status, "ZwClose failed: %#x\n", status); +} + static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *stack, ULONG_PTR *info) { ULONG length = stack->Parameters.DeviceIoControl.OutputBufferLength; @@ -647,7 +773,6 @@ static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *st if (!buffer) return STATUS_ACCESS_VIOLATION; - if (length < sizeof(failures)) return STATUS_BUFFER_TOO_SMALL; @@ -660,6 +785,15 @@ static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *st attr.Attributes = OBJ_KERNEL_HANDLE; /* needed to be accessible from system threads */ ZwOpenFile(&okfile, FILE_APPEND_DATA | SYNCHRONIZE, &attr, &io, 0, FILE_SYNCHRONOUS_IO_NONALERT); + pExEventObjectType = get_proc_address("ExEventObjectType"); + ok(!!pExEventObjectType, "ExEventObjectType not found\n"); + + pIoFileObjectType = get_proc_address("IoFileObjectType"); + ok(!!pIoFileObjectType, "IofileObjectType not found\n"); + + pPsThreadType = get_proc_address("PsThreadType"); + ok(!!pPsThreadType, "IofileObjectType not found\n"); + test_irp_struct(irp, device); test_currentprocess(); test_mdl_map(); @@ -669,9 +803,10 @@ static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *st test_version(); test_stack_callout(); test_lookaside_list(); + test_ob_reference(test_input->path); /* print process report */ - if (test_input->winetest_debug) + if (winetest_debug) { kprintf("%04x:ntoskrnl: %d tests executed (%d marked as todo, %d %s), %d skipped.\n", PsGetCurrentProcessId(), successes + failures + todo_successes + todo_failures,

1 0

Jacek Caban : ntoskrnl.exe: Export object type values.
by Alexandre Julliard 26 Feb '19

26 Feb '19

Module: wine Branch: master Commit: 38eebddc1db9db55fb0855873cadccce3ee6ba92 URL: https://source.winehq.org/git/wine.git/?a=commit;h=38eebddc1db9db55fb085587… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 26 13:38:58 2019 +0100 ntoskrnl.exe: Export object type values. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 61 ++++++++++++++++++++++++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 16 +++++----- dlls/ntoskrnl.exe/ntoskrnl_private.h | 4 +++ dlls/ntoskrnl.exe/sync.c | 17 ++++++++++ 4 files changed, 90 insertions(+), 8 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 4b62660..e7f6b1d 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -251,6 +251,16 @@ static HANDLE get_device_manager(void) return ret; } + +static const WCHAR file_type_name[] = {'F','i','l','e',0}; + +static struct _OBJECT_TYPE file_type = { + file_type_name, +}; + +POBJECT_TYPE IoFileObjectType = &file_type; + + /* transfer result of IRP back to wineserver */ static NTSTATUS WINAPI dispatch_irp_completion( DEVICE_OBJECT *device, IRP *irp, void *context ) { @@ -1090,6 +1100,16 @@ static NTSTATUS WINAPI unhandled_irp( DEVICE_OBJECT *device, IRP *irp ) } +static const WCHAR driver_type_name[] = {'D','r','i','v','e','r',0}; + +static struct _OBJECT_TYPE driver_type = +{ + driver_type_name, +}; + +POBJECT_TYPE IoDriverObjectType = &driver_type; + + /*********************************************************************** * IoCreateDriver (NTOSKRNL.EXE.@) */ @@ -1159,6 +1179,16 @@ void WINAPI IoDeleteDriver( DRIVER_OBJECT *driver_object ) } +static const WCHAR device_type_name[] = {'D','e','v','i','c','e',0}; + +static struct _OBJECT_TYPE device_type = +{ + device_type_name +}; + +POBJECT_TYPE IoDeviceObjectType = &device_type; + + /*********************************************************************** * IoCreateDevice (NTOSKRNL.EXE.@) */ @@ -2169,6 +2199,17 @@ NTSTATUS WINAPI FsRtlRegisterUncProvider(PHANDLE MupHandle, PUNICODE_STRING Redi return STATUS_NOT_IMPLEMENTED; } + +static const WCHAR process_type_name[] = {'P','r','o','c','e','s','s',0}; + +static struct _OBJECT_TYPE process_type = +{ + process_type_name +}; + +POBJECT_TYPE PsProcessType = &process_type; + + /*********************************************************************** * IoGetCurrentProcess / PsGetCurrentProcess (NTOSKRNL.EXE.@) */ @@ -2178,6 +2219,17 @@ PEPROCESS WINAPI IoGetCurrentProcess(void) return NULL; } + +static const WCHAR thread_type_name[] = {'T','h','r','e','a','d',0}; + +static struct _OBJECT_TYPE thread_type = +{ + thread_type_name, +}; + +POBJECT_TYPE PsThreadType = &thread_type; + + /*********************************************************************** * KeGetCurrentThread / PsGetCurrentThread (NTOSKRNL.EXE.@) */ @@ -3983,3 +4035,12 @@ void WINAPI KeLeaveGuardedRegion(void) { FIXME("\n"); } + +static const WCHAR token_type_name[] = {'T','o','k','e','n',0}; + +static struct _OBJECT_TYPE token_type = +{ + token_type_name +}; + +POBJECT_TYPE SeTokenObjectType = &token_type; diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 286d688..4dcd553 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -138,7 +138,7 @@ @ stub ExDesktopObjectType @ stub ExDisableResourceBoostLite @ stub ExEnumHandleTable -@ stub ExEventObjectType +@ extern ExEventObjectType @ stub ExExtendZone @ stdcall -norelay ExfUnblockPushLock(ptr ptr) @ stdcall ExFreePool(ptr) @@ -179,7 +179,7 @@ @ stub ExRegisterCallback @ stub ExReinitializeResourceLite @ stdcall ExReleaseResourceForThreadLite(ptr long) -@ stub ExSemaphoreObjectType +@ extern ExSemaphoreObjectType @ stub ExSetResourceOwnerPointer @ stub ExSetTimerResolution @ stub ExSystemExceptionFilter @@ -369,13 +369,13 @@ @ stub IoDetachDevice @ stub IoDeviceHandlerObjectSize @ stub IoDeviceHandlerObjectType -@ stub IoDeviceObjectType +@ extern IoDeviceObjectType @ stub IoDisconnectInterrupt -@ stub IoDriverObjectType +@ extern IoDriverObjectType @ stub IoEnqueueIrp @ stub IoEnumerateDeviceObjectList @ stub IoFastQueryNetworkAttributes -@ stub IoFileObjectType +@ extern IoFileObjectType @ stub IoForwardAndCatchIrp @ stub IoForwardIrpSynchronously @ stub IoFreeController @@ -914,7 +914,7 @@ @ stdcall PsLookupProcessByProcessId(ptr ptr) @ stub PsLookupProcessThreadByCid @ stub PsLookupThreadByThreadId -@ stub PsProcessType +@ extern PsProcessType @ stub PsReferenceImpersonationToken @ stub PsReferencePrimaryToken @ stdcall PsReferenceProcessFilePointer(ptr ptr) @@ -942,7 +942,7 @@ @ stub PsSetThreadHardErrorsAreDisabled @ stub PsSetThreadWin32Thread @ stdcall PsTerminateSystemThread(long) -@ stub PsThreadType +@ extern PsThreadType @ stdcall READ_REGISTER_BUFFER_UCHAR(ptr ptr long) @ stub READ_REGISTER_BUFFER_ULONG @ stub READ_REGISTER_BUFFER_USHORT @@ -1275,7 +1275,7 @@ @ stub SeTokenIsAdmin @ stub SeTokenIsRestricted @ stub SeTokenIsWriteRestricted -@ stub SeTokenObjectType +@ extern SeTokenObjectType @ stub SeTokenType @ stub SeUnlockSubjectContext @ stub SeUnregisterLogonSessionTerminatedRoutine diff --git a/dlls/ntoskrnl.exe/ntoskrnl_private.h b/dlls/ntoskrnl.exe/ntoskrnl_private.h index 241e15f..859c1d1 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl_private.h +++ b/dlls/ntoskrnl.exe/ntoskrnl_private.h @@ -21,6 +21,10 @@ #ifndef __WINE_NTOSKRNL_PRIVATE_H #define __WINE_NTOSKRNL_PRIVATE_H +struct _OBJECT_TYPE { + const WCHAR *name; /* object type name used for type validation */ +}; + #ifdef __i386__ #define DEFINE_FASTCALL1_ENTRYPOINT( name ) \ __ASM_STDCALL_FUNC( name, 4, \ diff --git a/dlls/ntoskrnl.exe/sync.c b/dlls/ntoskrnl.exe/sync.c index 98b3f9d..081306c 100644 --- a/dlls/ntoskrnl.exe/sync.c +++ b/dlls/ntoskrnl.exe/sync.c @@ -186,6 +186,14 @@ void WINAPI KeInitializeEvent( PRKEVENT event, EVENT_TYPE type, BOOLEAN state ) event->Header.WaitListHead.Flink = NULL; } +static const WCHAR event_type_name[] = {'E','v','e','n','t',0}; + +static struct _OBJECT_TYPE event_type = { + event_type_name, +}; + +POBJECT_TYPE ExEventObjectType = &event_type; + /*********************************************************************** * KeSetEvent (NTOSKRNL.EXE.@) */ @@ -267,6 +275,15 @@ LONG WINAPI KeReleaseSemaphore( PRKSEMAPHORE semaphore, KPRIORITY increment, return ret; } +static const WCHAR semaphore_type_name[] = {'S','e','m','a','p','h','o','r','e',0}; + +static struct _OBJECT_TYPE semaphore_type = +{ + semaphore_type_name +}; + +POBJECT_TYPE ExSemaphoreObjectType = &semaphore_type; + /*********************************************************************** * KeInitializeMutex (NTOSKRNL.EXE.@) */

1 0

Jacek Caban : ntoskrnl.exe: Introduce common kernel object allocator and use it for driver object.
by Alexandre Julliard 26 Feb '19

26 Feb '19

Module: wine Branch: master Commit: bb94d94bb02bc38aacce2fd79e78c5399bd28329 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bb94d94bb02bc38aacce2fd7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 26 13:39:11 2019 +0100 ntoskrnl.exe: Introduce common kernel object allocator and use it for driver object. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 57 +++++++++++++++++++++++++++++------- dlls/ntoskrnl.exe/ntoskrnl_private.h | 1 + 2 files changed, 47 insertions(+), 11 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index e7f6b1d..2ae57c8 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -98,11 +98,10 @@ static DWORD client_pid; struct wine_driver { - struct wine_rb_entry entry; - DRIVER_OBJECT driver_obj; DRIVER_EXTENSION driver_extension; SERVICE_STATUS_HANDLE service_handle; + struct wine_rb_entry entry; }; struct device_interface @@ -252,6 +251,38 @@ static HANDLE get_device_manager(void) } +struct object_header +{ + LONG ref; + POBJECT_TYPE type; +}; + +static void free_kernel_object( void *obj ) +{ + struct object_header *header = (struct object_header *)obj - 1; + HeapFree( GetProcessHeap(), 0, header ); +} + +void *alloc_kernel_object( POBJECT_TYPE type, SIZE_T size, LONG ref ) +{ + struct object_header *header; + + if (!(header = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*header) + size)) ) + return NULL; + + header->ref = ref; + header->type = type; + return header + 1; +} + +/* FIXME: Use ObDereferenceObject instead. */ +static void dereference_kernel_object( void *obj ) +{ + struct object_header *header = (struct object_header*)obj - 1; + if (!InterlockedDecrement( &header->ref ) && header->type->release) + header->type->release( obj ); +} + static const WCHAR file_type_name[] = {'F','i','l','e',0}; static struct _OBJECT_TYPE file_type = { @@ -1100,11 +1131,20 @@ static NTSTATUS WINAPI unhandled_irp( DEVICE_OBJECT *device, IRP *irp ) } +static void free_driver_object( void *obj ) +{ + struct wine_driver *driver = obj; + RtlFreeUnicodeString( &driver->driver_obj.DriverName ); + RtlFreeUnicodeString( &driver->driver_obj.DriverExtension->ServiceKeyName ); + free_kernel_object( driver ); +} + static const WCHAR driver_type_name[] = {'D','r','i','v','e','r',0}; static struct _OBJECT_TYPE driver_type = { driver_type_name, + free_driver_object }; POBJECT_TYPE IoDriverObjectType = &driver_type; @@ -1121,13 +1161,12 @@ NTSTATUS WINAPI IoCreateDriver( UNICODE_STRING *name, PDRIVER_INITIALIZE init ) TRACE("(%s, %p)\n", debugstr_us(name), init); - if (!(driver = RtlAllocateHeap( GetProcessHeap(), HEAP_ZERO_MEMORY, - sizeof(*driver) ))) + if (!(driver = alloc_kernel_object( IoDriverObjectType, sizeof(*driver), 1 ))) return STATUS_NO_MEMORY; if ((status = RtlDuplicateUnicodeString( 1, name, &driver->driver_obj.DriverName ))) { - RtlFreeHeap( GetProcessHeap(), 0, driver ); + free_kernel_object( driver ); return status; } @@ -1142,9 +1181,7 @@ NTSTATUS WINAPI IoCreateDriver( UNICODE_STRING *name, PDRIVER_INITIALIZE init ) status = driver->driver_obj.DriverInit( &driver->driver_obj, &driver->driver_extension.ServiceKeyName ); if (status) { - RtlFreeUnicodeString( &driver->driver_obj.DriverName ); - RtlFreeUnicodeString( &driver->driver_extension.ServiceKeyName ); - RtlFreeHeap( GetProcessHeap(), 0, driver ); + dereference_kernel_object( driver ); return status; } @@ -1173,9 +1210,7 @@ void WINAPI IoDeleteDriver( DRIVER_OBJECT *driver_object ) wine_rb_remove_key( &wine_drivers, &driver_object->DriverName ); LeaveCriticalSection( &drivers_cs ); - RtlFreeUnicodeString( &driver_object->DriverName ); - RtlFreeUnicodeString( &driver_object->DriverExtension->ServiceKeyName ); - RtlFreeHeap( GetProcessHeap(), 0, CONTAINING_RECORD( driver_object, struct wine_driver, driver_obj ) ); + dereference_kernel_object( driver_object ); } diff --git a/dlls/ntoskrnl.exe/ntoskrnl_private.h b/dlls/ntoskrnl.exe/ntoskrnl_private.h index 859c1d1..027036e 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl_private.h +++ b/dlls/ntoskrnl.exe/ntoskrnl_private.h @@ -23,6 +23,7 @@ struct _OBJECT_TYPE { const WCHAR *name; /* object type name used for type validation */ + void (*release)(void*); /* called when the last reference is released */ }; #ifdef __i386__

1 0

Jacek Caban : ntoskrnl.exe: Use kernel object allocators for device object.
by Alexandre Julliard 26 Feb '19

26 Feb '19

Module: wine Branch: master Commit: d01cd45b55029d8170ca8bb9dd8f85efca7da11c URL: https://source.winehq.org/git/wine.git/?a=commit;h=d01cd45b55029d8170ca8bb9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 26 13:39:21 2019 +0100 ntoskrnl.exe: Use kernel object allocators for device object. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 2ae57c8..e10f511 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1218,7 +1218,8 @@ static const WCHAR device_type_name[] = {'D','e','v','i','c','e',0}; static struct _OBJECT_TYPE device_type = { - device_type_name + device_type_name, + free_kernel_object }; POBJECT_TYPE IoDeviceObjectType = &device_type; @@ -1240,7 +1241,7 @@ NTSTATUS WINAPI IoCreateDevice( DRIVER_OBJECT *driver, ULONG ext_size, TRACE( "(%p, %u, %s, %u, %x, %u, %p)\n", driver, ext_size, debugstr_us(name), type, characteristics, exclusive, ret_device ); - if (!(device = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*device) + ext_size ))) + if (!(device = alloc_kernel_object( IoDeviceObjectType, sizeof(DEVICE_OBJECT) + ext_size, 1 ))) return STATUS_NO_MEMORY; SERVER_START_REQ( create_device ) @@ -1268,7 +1269,7 @@ NTSTATUS WINAPI IoCreateDevice( DRIVER_OBJECT *driver, ULONG ext_size, *ret_device = device; } - else HeapFree( GetProcessHeap(), 0, device ); + else free_kernel_object( device ); return status; } @@ -1296,7 +1297,7 @@ void WINAPI IoDeleteDevice( DEVICE_OBJECT *device ) while (*prev && *prev != device) prev = &(*prev)->NextDevice; if (*prev) *prev = (*prev)->NextDevice; NtClose( device->Reserved ); - HeapFree( GetProcessHeap(), 0, device ); + dereference_kernel_object( device ); } }

1 0

Jacek Caban : ntoskrnl.exe: Add missing ObReferenceObject call to ObReferenceObjectByName.
by Alexandre Julliard 26 Feb '19

26 Feb '19

Module: wine Branch: master Commit: 7fb89b126d700db9b4e518d23844ee175b5e4f4e URL: https://source.winehq.org/git/wine.git/?a=commit;h=7fb89b126d700db9b4e518d2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 26 13:39:29 2019 +0100 ntoskrnl.exe: Add missing ObReferenceObject call to ObReferenceObjectByName. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index e10f511..05291ee 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -283,6 +283,12 @@ static void dereference_kernel_object( void *obj ) header->type->release( obj ); } +static void ObReferenceObject( void *obj ) +{ + TRACE( "(%p): stub\n", obj ); +} + + static const WCHAR file_type_name[] = {'F','i','l','e',0}; static struct _OBJECT_TYPE file_type = { @@ -2631,17 +2637,11 @@ NTSTATUS WINAPI ObReferenceObjectByName( UNICODE_STRING *ObjectName, } driver = WINE_RB_ENTRY_VALUE(entry, struct wine_driver, entry); - *Object = &driver->driver_obj; + ObReferenceObject( *Object = &driver->driver_obj ); return STATUS_SUCCESS; } -static void ObReferenceObject( void *obj ) -{ - TRACE( "(%p): stub\n", obj ); -} - - /*********************************************************************** * ObReferenceObjectByPointer (NTOSKRNL.EXE.@) */

1 0