July 2020 - Wine-Devel - list.winehq.org

[PATCH v2 1/2] ntoskrnl.exe/tests: Add some tests for file names.
by Zebediah Figura July 30, 2020

July 30, 2020

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- I know of no application yet that requires this behaviour, or in fact even tries to query file/object information from a device file. These tests are rather meant to illustrate how ObjectNameInformation is implemented for files, which in turn may help to inform our implementation for server-based objects such as regular files and named pipes. dlls/ntoskrnl.exe/tests/driver.c | 120 +++++++++++++++++++++++++++-- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 114 +++++++++++++++++++++++++++ 2 files changed, 226 insertions(+), 8 deletions(-) diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index 0671a56efc7..d3f62879a40 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -37,6 +37,19 @@ #include "utils.h" +/* memcmp() isn't exported from ntoskrnl on i386 */ +static int kmemcmp( const void *ptr1, const void *ptr2, size_t n ) +{ + const unsigned char *p1, *p2; + + for (p1 = ptr1, p2 = ptr2; n; n--, p1++, p2++) + { + if (*p1 < *p2) return -1; + if (*p1 > *p2) return 1; + } + return 0; +} + static const WCHAR device_name[] = {'\\','D','e','v','i','c','e', '\\','W','i','n','e','T','e','s','t','D','r','i','v','e','r',0}; static const WCHAR upper_name[] = {'\\','D','e','v','i','c','e', @@ -55,6 +68,13 @@ static PETHREAD create_irp_thread; NTSTATUS WINAPI ZwQueryInformationProcess(HANDLE,PROCESSINFOCLASS,void*,ULONG,ULONG*); +struct file_context +{ + DWORD id; + ULONG namelen; + WCHAR name[10]; +}; + static void *get_proc_address(const char *name) { UNICODE_STRING name_u; @@ -2175,15 +2195,15 @@ static NTSTATUS get_fscontext(IRP *irp, IO_STACK_LOCATION *stack, ULONG_PTR *inf { ULONG length = stack->Parameters.DeviceIoControl.OutputBufferLength; char *buffer = irp->AssociatedIrp.SystemBuffer; - DWORD *context = stack->FileObject->FsContext; + struct file_context *context = stack->FileObject->FsContext; - if (!buffer || !context) + if (!buffer) return STATUS_ACCESS_VIOLATION; if (length < sizeof(DWORD)) return STATUS_BUFFER_TOO_SMALL; - *(DWORD*)buffer = *context; + *(DWORD*)buffer = context->id; *info = sizeof(DWORD); return STATUS_SUCCESS; } @@ -2271,13 +2291,21 @@ static NTSTATUS test_completion_ioctl(DEVICE_OBJECT *device, IRP *irp) static NTSTATUS WINAPI driver_Create(DEVICE_OBJECT *device, IRP *irp) { IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp ); - DWORD *context = ExAllocatePool(PagedPool, sizeof(*context)); + struct file_context *context = ExAllocatePool(PagedPool, sizeof(*context)); - last_created_file = irpsp->FileObject; - ++create_count; - if (context) - *context = create_count; + if (!context) + { + irp->IoStatus.Status = STATUS_NO_MEMORY; + IoCompleteRequest(irp, IO_NO_INCREMENT); + return STATUS_NO_MEMORY; + } + + context->id = ++create_count; + context->namelen = min(irpsp->FileObject->FileName.Length, sizeof(context->name)); + memcpy(context->name, irpsp->FileObject->FileName.Buffer, context->namelen); irpsp->FileObject->FsContext = context; + + last_created_file = irpsp->FileObject; create_caller_thread = KeGetCurrentThread(); create_irp_thread = irp->Tail.Overlay.Thread; @@ -2356,6 +2384,81 @@ static NTSTATUS WINAPI driver_FlushBuffers(DEVICE_OBJECT *device, IRP *irp) return STATUS_PENDING; } +static BOOL compare_file_name(const struct file_context *context, const WCHAR *expect) +{ + return context->namelen == wcslen(expect) * sizeof(WCHAR) + && !kmemcmp(context->name, expect, context->namelen); +} + +static NTSTATUS WINAPI driver_QueryInformation(DEVICE_OBJECT *device, IRP *irp) +{ + IO_STACK_LOCATION *stack = IoGetCurrentIrpStackLocation(irp); + NTSTATUS ret; + + switch (stack->Parameters.QueryFile.FileInformationClass) + { + case FileNameInformation: + { + const struct file_context *context = stack->FileObject->FsContext; + FILE_NAME_INFORMATION *info = irp->AssociatedIrp.SystemBuffer; + ULONG len; + + if (stack->Parameters.QueryFile.Length < sizeof(*info)) + { + ret = STATUS_INFO_LENGTH_MISMATCH; + break; + } + + if (compare_file_name(context, L"\\notimpl")) + { + ret = STATUS_NOT_IMPLEMENTED; + break; + } + else if (compare_file_name(context, L"")) + { + ret = STATUS_INVALID_DEVICE_REQUEST; + break; + } + else if (compare_file_name(context, L"\\badparam")) + { + ret = STATUS_INVALID_PARAMETER; + break; + } + else if (compare_file_name(context, L"\\genfail")) + { + ret = STATUS_UNSUCCESSFUL; + break; + } + else if (compare_file_name(context, L"\\badtype")) + { + ret = STATUS_OBJECT_TYPE_MISMATCH; + break; + } + + len = stack->Parameters.QueryFile.Length - FIELD_OFFSET(FILE_NAME_INFORMATION, FileName); + if (len < context->namelen) + ret = STATUS_BUFFER_OVERFLOW; + else + { + len = context->namelen; + ret = STATUS_SUCCESS; + } + irp->IoStatus.Information = FIELD_OFFSET(FILE_NAME_INFORMATION, FileName) + len; + info->FileNameLength = context->namelen; + memcpy(info->FileName, context->name, len); + break; + } + + default: + ret = STATUS_NOT_IMPLEMENTED; + break; + } + + irp->IoStatus.Status = ret; + IoCompleteRequest(irp, IO_NO_INCREMENT); + return ret; +} + static NTSTATUS WINAPI driver_Close(DEVICE_OBJECT *device, IRP *irp) { IO_STACK_LOCATION *stack = IoGetCurrentIrpStackLocation(irp); @@ -2400,6 +2503,7 @@ NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, PUNICODE_STRING registry) driver->MajorFunction[IRP_MJ_CREATE] = driver_Create; driver->MajorFunction[IRP_MJ_DEVICE_CONTROL] = driver_IoControl; driver->MajorFunction[IRP_MJ_FLUSH_BUFFERS] = driver_FlushBuffers; + driver->MajorFunction[IRP_MJ_QUERY_INFORMATION] = driver_QueryInformation; driver->MajorFunction[IRP_MJ_CLOSE] = driver_Close; RtlInitUnicodeString(&nameW, IoDriverObjectTypeW); diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index b4ef9d0dcb7..61b1e401c56 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -493,6 +493,119 @@ static void test_return_status(void) ok(ret_size == 3, "got size %u\n", ret_size); } +static BOOL compare_unicode_string(const WCHAR *buffer, ULONG len, const WCHAR *expect) +{ + return len == wcslen(expect) * sizeof(WCHAR) && !memcmp(buffer, expect, len); +} + +static void test_object_info(void) +{ + char buffer[200]; + OBJECT_NAME_INFORMATION *name_info = (OBJECT_NAME_INFORMATION *)buffer; + OBJECT_TYPE_INFORMATION *type_info = (OBJECT_TYPE_INFORMATION *)buffer; + FILE_NAME_INFORMATION *file_info = (FILE_NAME_INFORMATION *)buffer; + HANDLE file; + NTSTATUS status; + IO_STATUS_BLOCK io; + ULONG size; + + status = NtQueryObject(device, ObjectNameInformation, buffer, sizeof(buffer), NULL); + ok(!status, "got %#x\n", status); + todo_wine ok(compare_unicode_string(name_info->Name.Buffer, name_info->Name.Length, L"\\Device\\WineTestDriver"), + "wrong name %s\n", debugstr_w(name_info->Name.Buffer)); + + status = NtQueryObject(device, ObjectTypeInformation, buffer, sizeof(buffer), NULL); + ok(!status, "got %#x\n", status); + ok(compare_unicode_string(type_info->TypeName.Buffer, type_info->TypeName.Length, L"File"), + "wrong name %s\n", debugstr_wn(type_info->TypeName.Buffer, type_info->TypeName.Length / sizeof(WCHAR))); + + status = NtQueryInformationFile(device, &io, buffer, sizeof(buffer), FileNameInformation); + todo_wine ok(status == STATUS_INVALID_DEVICE_REQUEST, "got %#x\n", status); + + file = CreateFileA("\\\\.\\WineTestDriver\\subfile", 0, 0, NULL, OPEN_EXISTING, 0, NULL); + todo_wine ok(file != INVALID_HANDLE_VALUE, "got error %u\n", GetLastError()); + if (file == INVALID_HANDLE_VALUE) return; + + memset(buffer, 0xcc, sizeof(buffer)); + status = NtQueryObject(file, ObjectNameInformation, buffer, sizeof(buffer), &size); + ok(!status, "got %#x\n", status); + ok(size == sizeof(*name_info) + sizeof(L"\\Device\\WineTestDriver\\subfile"), "wrong size %u\n", size); + ok(compare_unicode_string(name_info->Name.Buffer, name_info->Name.Length, L"\\Device\\WineTestDriver\\subfile"), + "wrong name %s\n", debugstr_w(name_info->Name.Buffer)); + + memset(buffer, 0xcc, sizeof(buffer)); + status = NtQueryObject(file, ObjectNameInformation, buffer, size - 2, &size); + ok(status == STATUS_BUFFER_OVERFLOW, "got %#x\n", status); + ok(size == sizeof(*name_info) + sizeof(L"\\Device\\WineTestDriver\\subfile"), "wrong size %u\n", size); + ok(compare_unicode_string(name_info->Name.Buffer, name_info->Name.Length, L"\\Device\\WineTestDriver\\subfil"), + "wrong name %s\n", debugstr_w(name_info->Name.Buffer)); + + memset(buffer, 0xcc, sizeof(buffer)); + status = NtQueryObject(file, ObjectNameInformation, buffer, sizeof(*name_info), &size); + ok(status == STATUS_BUFFER_OVERFLOW, "got %#x\n", status); + ok(size == sizeof(*name_info) + sizeof(L"\\Device\\WineTestDriver\\subfile"), "wrong size %u\n", size); + + status = NtQueryObject(file, ObjectTypeInformation, buffer, sizeof(buffer), NULL); + ok(!status, "got %#x\n", status); + ok(compare_unicode_string(type_info->TypeName.Buffer, type_info->TypeName.Length, L"File"), + "wrong name %s\n", debugstr_wn(type_info->TypeName.Buffer, type_info->TypeName.Length / sizeof(WCHAR))); + + status = NtQueryInformationFile(file, &io, buffer, sizeof(buffer), FileNameInformation); + ok(!status, "got %#x\n", status); + ok(compare_unicode_string(file_info->FileName, file_info->FileNameLength, L"\\subfile"), + "wrong name %s\n", debugstr_wn(file_info->FileName, file_info->FileNameLength / sizeof(WCHAR))); + + CloseHandle(file); + + file = CreateFileA("\\\\.\\WineTestDriver\\notimpl", 0, 0, NULL, OPEN_EXISTING, 0, NULL); + ok(file != INVALID_HANDLE_VALUE, "got error %u\n", GetLastError()); + + status = NtQueryObject(file, ObjectNameInformation, buffer, sizeof(buffer), NULL); + ok(!status, "got %#x\n", status); + ok(compare_unicode_string(name_info->Name.Buffer, name_info->Name.Length, L"\\Device\\WineTestDriver"), + "wrong name %s\n", debugstr_w(name_info->Name.Buffer)); + + status = NtQueryInformationFile(file, &io, buffer, sizeof(buffer), FileNameInformation); + ok(status == STATUS_NOT_IMPLEMENTED, "got %#x\n", status); + + CloseHandle(file); + + file = CreateFileA("\\\\.\\WineTestDriver\\badparam", 0, 0, NULL, OPEN_EXISTING, 0, NULL); + ok(file != INVALID_HANDLE_VALUE, "got error %u\n", GetLastError()); + + status = NtQueryObject(file, ObjectNameInformation, buffer, sizeof(buffer), NULL); + ok(!status, "got %#x\n", status); + ok(compare_unicode_string(name_info->Name.Buffer, name_info->Name.Length, L"\\Device\\WineTestDriver"), + "wrong name %s\n", debugstr_w(name_info->Name.Buffer)); + + status = NtQueryInformationFile(file, &io, buffer, sizeof(buffer), FileNameInformation); + ok(status == STATUS_INVALID_PARAMETER, "got %#x\n", status); + + CloseHandle(file); + + file = CreateFileA("\\\\.\\WineTestDriver\\genfail", 0, 0, NULL, OPEN_EXISTING, 0, NULL); + ok(file != INVALID_HANDLE_VALUE, "got error %u\n", GetLastError()); + + status = NtQueryObject(file, ObjectNameInformation, buffer, sizeof(buffer), NULL); + ok(status == STATUS_UNSUCCESSFUL, "got %#x\n", status); + + status = NtQueryInformationFile(file, &io, buffer, sizeof(buffer), FileNameInformation); + ok(status == STATUS_UNSUCCESSFUL, "got %#x\n", status); + + CloseHandle(file); + + file = CreateFileA("\\\\.\\WineTestDriver\\badtype", 0, 0, NULL, OPEN_EXISTING, 0, NULL); + ok(file != INVALID_HANDLE_VALUE, "got error %u\n", GetLastError()); + + status = NtQueryObject(file, ObjectNameInformation, buffer, sizeof(buffer), NULL); + ok(status == STATUS_OBJECT_TYPE_MISMATCH, "got %#x\n", status); + + status = NtQueryInformationFile(file, &io, buffer, sizeof(buffer), FileNameInformation); + ok(status == STATUS_OBJECT_TYPE_MISMATCH, "got %#x\n", status); + + CloseHandle(file); +} + static void test_driver3(void) { char filename[MAX_PATH]; @@ -644,6 +757,7 @@ START_TEST(ntoskrnl) test_load_driver(service2); test_file_handles(); test_return_status(); + test_object_info(); /* We need a separate ioctl to call IoDetachDevice(); calling it in the * driver unload routine causes a live-lock. */ -- 2.27.0

1 1

[PATCH v2] amstream: Return correct media type info when enumerating AMAudioStream media types.
by Gijs Vermeulen July 30, 2020

July 30, 2020

Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/amstream/audiostream.c | 21 ++++++++++++++++++++- dlls/amstream/tests/amstream.c | 11 ++++++----- 2 files changed, 26 insertions(+), 6 deletions(-) diff --git a/dlls/amstream/audiostream.c b/dlls/amstream/audiostream.c index 072850aae7..dc6c810d19 100644 --- a/dlls/amstream/audiostream.c +++ b/dlls/amstream/audiostream.c @@ -837,6 +837,17 @@ static HRESULT WINAPI enum_media_types_Next(IEnumMediaTypes *iface, ULONG count, { struct enum_media_types *enum_media_types = impl_from_IEnumMediaTypes(iface); + static const WAVEFORMATEX wfx = + { + .wFormatTag = WAVE_FORMAT_PCM, + .nChannels = 1, + .nSamplesPerSec = 11025, + .nAvgBytesPerSec = 11025 * 2, + .nBlockAlign = 2, + .wBitsPerSample = 16, + .cbSize = 0, + }; + TRACE("iface %p, count %u, mts %p, ret_count %p.\n", iface, count, mts, ret_count); if (!ret_count) @@ -847,7 +858,15 @@ static HRESULT WINAPI enum_media_types_Next(IEnumMediaTypes *iface, ULONG count, mts[0] = CoTaskMemAlloc(sizeof(AM_MEDIA_TYPE)); memset(mts[0], 0, sizeof(AM_MEDIA_TYPE)); mts[0]->majortype = MEDIATYPE_Audio; - mts[0]->subtype = MEDIASUBTYPE_PCM; + mts[0]->subtype = GUID_NULL; + mts[0]->bFixedSizeSamples = TRUE; + mts[0]->bTemporalCompression = FALSE; + mts[0]->lSampleSize = 2; + mts[0]->formattype = FORMAT_WaveFormatEx; + mts[0]->cbFormat = sizeof(WAVEFORMATEX); + mts[0]->pbFormat = CoTaskMemAlloc(sizeof(WAVEFORMATEX)); + memcpy(mts[0]->pbFormat, &wfx, sizeof(WAVEFORMATEX)); + ++enum_media_types->index; *ret_count = 1; return count == 1 ? S_OK : S_FALSE; diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 130f9f0e0e..cf66538a7a 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -2515,20 +2515,21 @@ static void test_media_types(void) ok(count == 1, "Got count %u.\n", count); ok(IsEqualGUID(&pmt->majortype, &MEDIATYPE_Audio), "Got major type %s\n", wine_dbgstr_guid(&pmt->majortype)); - todo_wine ok(IsEqualGUID(&pmt->subtype, &GUID_NULL), "Got subtype %s\n", + ok(IsEqualGUID(&pmt->subtype, &GUID_NULL), "Got subtype %s\n", wine_dbgstr_guid(&pmt->subtype)); - todo_wine ok(pmt->bFixedSizeSamples == TRUE, "Got fixed size %d.\n", pmt->bFixedSizeSamples); + ok(pmt->bFixedSizeSamples == TRUE, "Got fixed size %d.\n", pmt->bFixedSizeSamples); ok(!pmt->bTemporalCompression, "Got temporal compression %d.\n", pmt->bTemporalCompression); - todo_wine ok(pmt->lSampleSize == 2, "Got sample size %u.\n", pmt->lSampleSize); - todo_wine ok(IsEqualGUID(&pmt->formattype, &FORMAT_WaveFormatEx), "Got format type %s.\n", + ok(pmt->lSampleSize == 2, "Got sample size %u.\n", pmt->lSampleSize); + ok(IsEqualGUID(&pmt->formattype, &FORMAT_WaveFormatEx), "Got format type %s.\n", wine_dbgstr_guid(&pmt->formattype)); ok(!pmt->pUnk, "Got pUnk %p.\n", pmt->pUnk); - todo_wine ok(pmt->cbFormat == sizeof(WAVEFORMATEX), "Got format size %u.\n", pmt->cbFormat); + ok(pmt->cbFormat == sizeof(WAVEFORMATEX), "Got format size %u.\n", pmt->cbFormat); ok(!memcmp(pmt->pbFormat, &expect_wfx, pmt->cbFormat), "Format blocks didn't match.\n"); hr = IPin_QueryAccept(pin, pmt); ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); + CoTaskMemFree(pmt->pbFormat); CoTaskMemFree(pmt); hr = IEnumMediaTypes_Next(enummt, 1, &pmt, &count); -- 2.27.0

2 1

[PATCH] winevulkan: Avoid returning 0 for swapchain maxImageCount.
by Georg Lehmann July 30, 2020

July 30, 2020

Many Windows games do not expect that maxImageCount can be set to 0. A value of 0 means that there is no limit on the number of images. Nvidia reports 8 on Windows, AMD 16. Based on a patch by Józef Kucia. Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> --- dlls/winevulkan/make_vulkan | 4 ++-- dlls/winevulkan/vulkan.c | 41 +++++++++++++++++++++++++++++++++ dlls/winevulkan/vulkan_thunks.c | 8 ++----- dlls/winevulkan/vulkan_thunks.h | 4 ++++ 4 files changed, 49 insertions(+), 8 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index fc0e2182dd..6a039bd268 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -183,12 +183,12 @@ FUNCTION_OVERRIDES = { # VK_KHR_surface "vkDestroySurfaceKHR" : {"dispatch" : True, "driver" : True, "thunk" : True}, "vkGetPhysicalDeviceSurfaceSupportKHR" : {"dispatch" : True, "driver" : True, "thunk" : True}, - "vkGetPhysicalDeviceSurfaceCapabilitiesKHR" : {"dispatch" : True, "driver" : True, "thunk" : True}, + "vkGetPhysicalDeviceSurfaceCapabilitiesKHR" : {"dispatch" : True, "driver" : True, "thunk" : False, "private_thunk" : True}, "vkGetPhysicalDeviceSurfaceFormatsKHR" : {"dispatch" : True, "driver" : True, "thunk" : True}, "vkGetPhysicalDeviceSurfacePresentModesKHR" : {"dispatch" : True, "driver" : True, "thunk" : True}, # VK_KHR_get_surface_capabilities2 - "vkGetPhysicalDeviceSurfaceCapabilities2KHR" : {"dispatch" : True, "driver" : True, "thunk" : True}, + "vkGetPhysicalDeviceSurfaceCapabilities2KHR" : {"dispatch" : True, "driver" : True, "thunk" : False, "private_thunk" : True}, "vkGetPhysicalDeviceSurfaceFormats2KHR" : {"dispatch" : True, "driver" : True, "thunk" : True}, # VK_KHR_win32_surface diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index be614f1cef..1e83defa18 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -1555,6 +1555,47 @@ void WINAPI wine_vkGetPrivateDataEXT(VkDevice device, VkObjectType object_type, device->funcs.p_vkGetPrivateDataEXT(device->device, object_type, object_handle, private_data_slot, data); } +static inline void adjust_max_image_count(VkSurfaceCapabilitiesKHR* capabilities) +{ + /* Many Windows games do not expect that maxImageCount can be set to 0. + * A value of 0 means that there is no limit on the number of images. + * Nvidia reports 8 on Windows, AMD 16.*/ + if (!capabilities->maxImageCount) + { + capabilities->maxImageCount = 16; + } +} + +VkResult WINAPI wine_vkGetPhysicalDeviceSurfaceCapabilitiesKHR(VkPhysicalDevice phys_dev, + VkSurfaceKHR surface, VkSurfaceCapabilitiesKHR *capabilities) +{ + VkResult res; + + TRACE("%p, 0x%s, %p\n", phys_dev, wine_dbgstr_longlong(surface), capabilities); + + res = thunk_vkGetPhysicalDeviceSurfaceCapabilitiesKHR(phys_dev, surface, capabilities); + + if (res == VK_SUCCESS) + adjust_max_image_count(capabilities); + + return res; +} + +VkResult WINAPI wine_vkGetPhysicalDeviceSurfaceCapabilities2KHR(VkPhysicalDevice phys_dev, + const VkPhysicalDeviceSurfaceInfo2KHR *surface_info, VkSurfaceCapabilities2KHR *capabilities) +{ + VkResult res; + + TRACE("%p, %p, %p\n", phys_dev, surface_info, capabilities); + + res = thunk_vkGetPhysicalDeviceSurfaceCapabilities2KHR(phys_dev, surface_info, capabilities); + + if (res == VK_SUCCESS) + adjust_max_image_count(&capabilities->surfaceCapabilities); + + return res; +} + BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, void *reserved) { TRACE("%p, %u, %p\n", hinst, reason, reserved); diff --git a/dlls/winevulkan/vulkan_thunks.c b/dlls/winevulkan/vulkan_thunks.c index fcefa6a767..4f75a4ec7c 100644 --- a/dlls/winevulkan/vulkan_thunks.c +++ b/dlls/winevulkan/vulkan_thunks.c @@ -4998,26 +4998,22 @@ static VkResult WINAPI wine_vkGetPhysicalDeviceSupportedFramebufferMixedSamplesC return physicalDevice->instance->funcs.p_vkGetPhysicalDeviceSupportedFramebufferMixedSamplesCombinationsNV(physicalDevice->phys_dev, pCombinationCount, pCombinations); } -VkResult WINAPI wine_vkGetPhysicalDeviceSurfaceCapabilities2KHR(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceSurfaceInfo2KHR *pSurfaceInfo, VkSurfaceCapabilities2KHR *pSurfaceCapabilities) +VkResult thunk_vkGetPhysicalDeviceSurfaceCapabilities2KHR(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceSurfaceInfo2KHR *pSurfaceInfo, VkSurfaceCapabilities2KHR *pSurfaceCapabilities) { #if defined(USE_STRUCT_CONVERSION) VkResult result; VkPhysicalDeviceSurfaceInfo2KHR_host pSurfaceInfo_host; - TRACE("%p, %p, %p\n", physicalDevice, pSurfaceInfo, pSurfaceCapabilities); - convert_VkPhysicalDeviceSurfaceInfo2KHR_win_to_host(pSurfaceInfo, &pSurfaceInfo_host); result = physicalDevice->instance->funcs.p_vkGetPhysicalDeviceSurfaceCapabilities2KHR(physicalDevice->phys_dev, &pSurfaceInfo_host, pSurfaceCapabilities); return result; #else - TRACE("%p, %p, %p\n", physicalDevice, pSurfaceInfo, pSurfaceCapabilities); return physicalDevice->instance->funcs.p_vkGetPhysicalDeviceSurfaceCapabilities2KHR(physicalDevice->phys_dev, pSurfaceInfo, pSurfaceCapabilities); #endif } -VkResult WINAPI wine_vkGetPhysicalDeviceSurfaceCapabilitiesKHR(VkPhysicalDevice physicalDevice, VkSurfaceKHR surface, VkSurfaceCapabilitiesKHR *pSurfaceCapabilities) +VkResult thunk_vkGetPhysicalDeviceSurfaceCapabilitiesKHR(VkPhysicalDevice physicalDevice, VkSurfaceKHR surface, VkSurfaceCapabilitiesKHR *pSurfaceCapabilities) { - TRACE("%p, 0x%s, %p\n", physicalDevice, wine_dbgstr_longlong(surface), pSurfaceCapabilities); return physicalDevice->instance->funcs.p_vkGetPhysicalDeviceSurfaceCapabilitiesKHR(physicalDevice->phys_dev, surface, pSurfaceCapabilities); } diff --git a/dlls/winevulkan/vulkan_thunks.h b/dlls/winevulkan/vulkan_thunks.h index f2d650decf..d35e8c4269 100644 --- a/dlls/winevulkan/vulkan_thunks.h +++ b/dlls/winevulkan/vulkan_thunks.h @@ -42,6 +42,8 @@ VkResult WINAPI wine_vkGetPhysicalDeviceImageFormatProperties2(VkPhysicalDevice VkResult WINAPI wine_vkGetPhysicalDeviceImageFormatProperties2KHR(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceImageFormatInfo2 *pImageFormatInfo, VkImageFormatProperties2 *pImageFormatProperties) DECLSPEC_HIDDEN; void WINAPI wine_vkGetPhysicalDeviceProperties2(VkPhysicalDevice physicalDevice, VkPhysicalDeviceProperties2 *pProperties); void WINAPI wine_vkGetPhysicalDeviceProperties2KHR(VkPhysicalDevice physicalDevice, VkPhysicalDeviceProperties2 *pProperties) DECLSPEC_HIDDEN; +VkResult WINAPI wine_vkGetPhysicalDeviceSurfaceCapabilities2KHR(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceSurfaceInfo2KHR *pSurfaceInfo, VkSurfaceCapabilities2KHR *pSurfaceCapabilities); +VkResult WINAPI wine_vkGetPhysicalDeviceSurfaceCapabilitiesKHR(VkPhysicalDevice physicalDevice, VkSurfaceKHR surface, VkSurfaceCapabilitiesKHR *pSurfaceCapabilities); void WINAPI wine_vkGetPrivateDataEXT(VkDevice device, VkObjectType objectType, uint64_t objectHandle, VkPrivateDataSlotEXT privateDataSlot, uint64_t *pData) DECLSPEC_HIDDEN; VkResult WINAPI wine_vkQueueSubmit(VkQueue queue, uint32_t submitCount, const VkSubmitInfo *pSubmits, VkFence fence); VkResult WINAPI wine_vkSetPrivateDataEXT(VkDevice device, VkObjectType objectType, uint64_t objectHandle, VkPrivateDataSlotEXT privateDataSlot, uint64_t data) DECLSPEC_HIDDEN; @@ -51,6 +53,8 @@ VkResult thunk_vkGetPhysicalDeviceImageFormatProperties2(VkPhysicalDevice physic VkResult thunk_vkGetPhysicalDeviceImageFormatProperties2KHR(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceImageFormatInfo2 *pImageFormatInfo, VkImageFormatProperties2 *pImageFormatProperties) DECLSPEC_HIDDEN; void thunk_vkGetPhysicalDeviceProperties2(VkPhysicalDevice physicalDevice, VkPhysicalDeviceProperties2 *pProperties) DECLSPEC_HIDDEN; void thunk_vkGetPhysicalDeviceProperties2KHR(VkPhysicalDevice physicalDevice, VkPhysicalDeviceProperties2 *pProperties) DECLSPEC_HIDDEN; +VkResult thunk_vkGetPhysicalDeviceSurfaceCapabilities2KHR(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceSurfaceInfo2KHR *pSurfaceInfo, VkSurfaceCapabilities2KHR *pSurfaceCapabilities) DECLSPEC_HIDDEN; +VkResult thunk_vkGetPhysicalDeviceSurfaceCapabilitiesKHR(VkPhysicalDevice physicalDevice, VkSurfaceKHR surface, VkSurfaceCapabilitiesKHR *pSurfaceCapabilities) DECLSPEC_HIDDEN; typedef struct VkAcquireNextImageInfoKHR_host { -- 2.28.0

3 2

[PATCH 1/2] ntoskrnl.exe/tests: Add some tests for file names.
by Zebediah Figura July 30, 2020

July 30, 2020

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- I know of no application yet that requires this behaviour, or in fact even tries to query file/object information from a device file. These tests are rather meant to illustrate how ObjectNameInformation is implemented for files, which in turn may help to inform our implementation for server-based objects such as regular files and named pipes. dlls/ntoskrnl.exe/tests/driver.c | 120 +++++++++++++++++++++++++++-- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 114 +++++++++++++++++++++++++++ 2 files changed, 226 insertions(+), 8 deletions(-) diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index 0671a56efc7..d3f62879a40 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -37,6 +37,19 @@ #include "utils.h" +/* memcmp() isn't exported from ntoskrnl on i386 */ +static int kmemcmp( const void *ptr1, const void *ptr2, size_t n ) +{ + const unsigned char *p1, *p2; + + for (p1 = ptr1, p2 = ptr2; n; n--, p1++, p2++) + { + if (*p1 < *p2) return -1; + if (*p1 > *p2) return 1; + } + return 0; +} + static const WCHAR device_name[] = {'\\','D','e','v','i','c','e', '\\','W','i','n','e','T','e','s','t','D','r','i','v','e','r',0}; static const WCHAR upper_name[] = {'\\','D','e','v','i','c','e', @@ -55,6 +68,13 @@ static PETHREAD create_irp_thread; NTSTATUS WINAPI ZwQueryInformationProcess(HANDLE,PROCESSINFOCLASS,void*,ULONG,ULONG*); +struct file_context +{ + DWORD id; + ULONG namelen; + WCHAR name[10]; +}; + static void *get_proc_address(const char *name) { UNICODE_STRING name_u; @@ -2175,15 +2195,15 @@ static NTSTATUS get_fscontext(IRP *irp, IO_STACK_LOCATION *stack, ULONG_PTR *inf { ULONG length = stack->Parameters.DeviceIoControl.OutputBufferLength; char *buffer = irp->AssociatedIrp.SystemBuffer; - DWORD *context = stack->FileObject->FsContext; + struct file_context *context = stack->FileObject->FsContext; - if (!buffer || !context) + if (!buffer) return STATUS_ACCESS_VIOLATION; if (length < sizeof(DWORD)) return STATUS_BUFFER_TOO_SMALL; - *(DWORD*)buffer = *context; + *(DWORD*)buffer = context->id; *info = sizeof(DWORD); return STATUS_SUCCESS; } @@ -2271,13 +2291,21 @@ static NTSTATUS test_completion_ioctl(DEVICE_OBJECT *device, IRP *irp) static NTSTATUS WINAPI driver_Create(DEVICE_OBJECT *device, IRP *irp) { IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp ); - DWORD *context = ExAllocatePool(PagedPool, sizeof(*context)); + struct file_context *context = ExAllocatePool(PagedPool, sizeof(*context)); - last_created_file = irpsp->FileObject; - ++create_count; - if (context) - *context = create_count; + if (!context) + { + irp->IoStatus.Status = STATUS_NO_MEMORY; + IoCompleteRequest(irp, IO_NO_INCREMENT); + return STATUS_NO_MEMORY; + } + + context->id = ++create_count; + context->namelen = min(irpsp->FileObject->FileName.Length, sizeof(context->name)); + memcpy(context->name, irpsp->FileObject->FileName.Buffer, context->namelen); irpsp->FileObject->FsContext = context; + + last_created_file = irpsp->FileObject; create_caller_thread = KeGetCurrentThread(); create_irp_thread = irp->Tail.Overlay.Thread; @@ -2356,6 +2384,81 @@ static NTSTATUS WINAPI driver_FlushBuffers(DEVICE_OBJECT *device, IRP *irp) return STATUS_PENDING; } +static BOOL compare_file_name(const struct file_context *context, const WCHAR *expect) +{ + return context->namelen == wcslen(expect) * sizeof(WCHAR) + && !kmemcmp(context->name, expect, context->namelen); +} + +static NTSTATUS WINAPI driver_QueryInformation(DEVICE_OBJECT *device, IRP *irp) +{ + IO_STACK_LOCATION *stack = IoGetCurrentIrpStackLocation(irp); + NTSTATUS ret; + + switch (stack->Parameters.QueryFile.FileInformationClass) + { + case FileNameInformation: + { + const struct file_context *context = stack->FileObject->FsContext; + FILE_NAME_INFORMATION *info = irp->AssociatedIrp.SystemBuffer; + ULONG len; + + if (stack->Parameters.QueryFile.Length < sizeof(*info)) + { + ret = STATUS_INFO_LENGTH_MISMATCH; + break; + } + + if (compare_file_name(context, L"\\notimpl")) + { + ret = STATUS_NOT_IMPLEMENTED; + break; + } + else if (compare_file_name(context, L"")) + { + ret = STATUS_INVALID_DEVICE_REQUEST; + break; + } + else if (compare_file_name(context, L"\\badparam")) + { + ret = STATUS_INVALID_PARAMETER; + break; + } + else if (compare_file_name(context, L"\\genfail")) + { + ret = STATUS_UNSUCCESSFUL; + break; + } + else if (compare_file_name(context, L"\\badtype")) + { + ret = STATUS_OBJECT_TYPE_MISMATCH; + break; + } + + len = stack->Parameters.QueryFile.Length - FIELD_OFFSET(FILE_NAME_INFORMATION, FileName); + if (len < context->namelen) + ret = STATUS_BUFFER_OVERFLOW; + else + { + len = context->namelen; + ret = STATUS_SUCCESS; + } + irp->IoStatus.Information = FIELD_OFFSET(FILE_NAME_INFORMATION, FileName) + len; + info->FileNameLength = context->namelen; + memcpy(info->FileName, context->name, len); + break; + } + + default: + ret = STATUS_NOT_IMPLEMENTED; + break; + } + + irp->IoStatus.Status = ret; + IoCompleteRequest(irp, IO_NO_INCREMENT); + return ret; +} + static NTSTATUS WINAPI driver_Close(DEVICE_OBJECT *device, IRP *irp) { IO_STACK_LOCATION *stack = IoGetCurrentIrpStackLocation(irp); @@ -2400,6 +2503,7 @@ NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, PUNICODE_STRING registry) driver->MajorFunction[IRP_MJ_CREATE] = driver_Create; driver->MajorFunction[IRP_MJ_DEVICE_CONTROL] = driver_IoControl; driver->MajorFunction[IRP_MJ_FLUSH_BUFFERS] = driver_FlushBuffers; + driver->MajorFunction[IRP_MJ_QUERY_INFORMATION] = driver_QueryInformation; driver->MajorFunction[IRP_MJ_CLOSE] = driver_Close; RtlInitUnicodeString(&nameW, IoDriverObjectTypeW); diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index b4ef9d0dcb7..61b1e401c56 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -493,6 +493,119 @@ static void test_return_status(void) ok(ret_size == 3, "got size %u\n", ret_size); } +static BOOL compare_unicode_string(const WCHAR *buffer, ULONG len, const WCHAR *expect) +{ + return len == wcslen(expect) * sizeof(WCHAR) && !memcmp(buffer, expect, len); +} + +static void test_object_info(void) +{ + char buffer[200]; + OBJECT_NAME_INFORMATION *name_info = (OBJECT_NAME_INFORMATION *)buffer; + OBJECT_TYPE_INFORMATION *type_info = (OBJECT_TYPE_INFORMATION *)buffer; + FILE_NAME_INFORMATION *file_info = (FILE_NAME_INFORMATION *)buffer; + HANDLE file; + NTSTATUS status; + IO_STATUS_BLOCK io; + ULONG size; + + status = NtQueryObject(device, ObjectNameInformation, buffer, sizeof(buffer), NULL); + ok(!status, "got %#x\n", status); + todo_wine ok(compare_unicode_string(name_info->Name.Buffer, name_info->Name.Length, L"\\Device\\WineTestDriver"), + "wrong name %s\n", debugstr_w(name_info->Name.Buffer)); + + status = NtQueryObject(device, ObjectTypeInformation, buffer, sizeof(buffer), NULL); + ok(!status, "got %#x\n", status); + ok(compare_unicode_string(type_info->TypeName.Buffer, type_info->TypeName.Length, L"File"), + "wrong name %s\n", debugstr_wn(type_info->TypeName.Buffer, type_info->TypeName.Length / sizeof(WCHAR))); + + status = NtQueryInformationFile(device, &io, buffer, sizeof(buffer), FileNameInformation); + todo_wine ok(status == STATUS_INVALID_DEVICE_REQUEST, "got %#x\n", status); + + file = CreateFileA("\\\\.\\WineTestDriver\\subfile", 0, 0, NULL, OPEN_EXISTING, 0, NULL); + todo_wine ok(file != INVALID_HANDLE_VALUE, "got error %u\n", GetLastError()); + if (file == INVALID_HANDLE_VALUE) return; + + memset(buffer, 0xcc, sizeof(buffer)); + status = NtQueryObject(file, ObjectNameInformation, buffer, sizeof(buffer), &size); + ok(!status, "got %#x\n", status); + ok(size == sizeof(*name_info) + sizeof(L"\\Device\\WineTestDriver\\subfile"), "wrong size %u\n", size); + ok(compare_unicode_string(name_info->Name.Buffer, name_info->Name.Length, L"\\Device\\WineTestDriver\\subfile"), + "wrong name %s\n", debugstr_w(name_info->Name.Buffer)); + + memset(buffer, 0xcc, sizeof(buffer)); + status = NtQueryObject(file, ObjectNameInformation, buffer, size - 2, &size); + ok(status == STATUS_BUFFER_OVERFLOW, "got %#x\n", status); + ok(size == sizeof(*name_info) + sizeof(L"\\Device\\WineTestDriver\\subfile"), "wrong size %u\n", size); + ok(compare_unicode_string(name_info->Name.Buffer, name_info->Name.Length, L"\\Device\\WineTestDriver\\subfil"), + "wrong name %s\n", debugstr_w(name_info->Name.Buffer)); + + memset(buffer, 0xcc, sizeof(buffer)); + status = NtQueryObject(file, ObjectNameInformation, buffer, sizeof(*name_info), &size); + ok(status == STATUS_BUFFER_OVERFLOW, "got %#x\n", status); + ok(size == sizeof(*name_info) + sizeof(L"\\Device\\WineTestDriver\\subfile"), "wrong size %u\n", size); + + status = NtQueryObject(file, ObjectTypeInformation, buffer, sizeof(buffer), NULL); + ok(!status, "got %#x\n", status); + ok(compare_unicode_string(type_info->TypeName.Buffer, type_info->TypeName.Length, L"File"), + "wrong name %s\n", debugstr_wn(type_info->TypeName.Buffer, type_info->TypeName.Length / sizeof(WCHAR))); + + status = NtQueryInformationFile(file, &io, buffer, sizeof(buffer), FileNameInformation); + ok(!status, "got %#x\n", status); + ok(compare_unicode_string(file_info->FileName, file_info->FileNameLength, L"\\subfile"), + "wrong name %s\n", debugstr_wn(file_info->FileName, file_info->FileNameLength / sizeof(WCHAR))); + + CloseHandle(file); + + file = CreateFileA("\\\\.\\WineTestDriver\\notimpl", 0, 0, NULL, OPEN_EXISTING, 0, NULL); + ok(file != INVALID_HANDLE_VALUE, "got error %u\n", GetLastError()); + + status = NtQueryObject(file, ObjectNameInformation, buffer, sizeof(buffer), NULL); + ok(!status, "got %#x\n", status); + ok(compare_unicode_string(name_info->Name.Buffer, name_info->Name.Length, L"\\Device\\WineTestDriver"), + "wrong name %s\n", debugstr_w(name_info->Name.Buffer)); + + status = NtQueryInformationFile(file, &io, buffer, sizeof(buffer), FileNameInformation); + ok(status == STATUS_NOT_IMPLEMENTED, "got %#x\n", status); + + CloseHandle(file); + + file = CreateFileA("\\\\.\\WineTestDriver\\badparam", 0, 0, NULL, OPEN_EXISTING, 0, NULL); + ok(file != INVALID_HANDLE_VALUE, "got error %u\n", GetLastError()); + + status = NtQueryObject(file, ObjectNameInformation, buffer, sizeof(buffer), NULL); + ok(!status, "got %#x\n", status); + ok(compare_unicode_string(name_info->Name.Buffer, name_info->Name.Length, L"\\Device\\WineTestDriver"), + "wrong name %s\n", debugstr_w(name_info->Name.Buffer)); + + status = NtQueryInformationFile(file, &io, buffer, sizeof(buffer), FileNameInformation); + ok(status == STATUS_INVALID_PARAMETER, "got %#x\n", status); + + CloseHandle(file); + + file = CreateFileA("\\\\.\\WineTestDriver\\genfail", 0, 0, NULL, OPEN_EXISTING, 0, NULL); + ok(file != INVALID_HANDLE_VALUE, "got error %u\n", GetLastError()); + + status = NtQueryObject(file, ObjectNameInformation, buffer, sizeof(buffer), NULL); + ok(status == STATUS_UNSUCCESSFUL, "got %#x\n", status); + + status = NtQueryInformationFile(file, &io, buffer, sizeof(buffer), FileNameInformation); + ok(status == STATUS_UNSUCCESSFUL, "got %#x\n", status); + + CloseHandle(file); + + file = CreateFileA("\\\\.\\WineTestDriver\\badtype", 0, 0, NULL, OPEN_EXISTING, 0, NULL); + ok(file != INVALID_HANDLE_VALUE, "got error %u\n", GetLastError()); + + status = NtQueryObject(file, ObjectNameInformation, buffer, sizeof(buffer), NULL); + ok(status == STATUS_OBJECT_TYPE_MISMATCH, "got %#x\n", status); + + status = NtQueryInformationFile(file, &io, buffer, sizeof(buffer), FileNameInformation); + ok(status == STATUS_OBJECT_TYPE_MISMATCH, "got %#x\n", status); + + CloseHandle(file); +} + static void test_driver3(void) { char filename[MAX_PATH]; @@ -644,6 +757,7 @@ START_TEST(ntoskrnl) test_load_driver(service2); test_file_handles(); test_return_status(); + test_object_info(); /* We need a separate ioctl to call IoDetachDevice(); calling it in the * driver unload routine causes a live-lock. */ -- 2.27.0

2 2

[PATCH 1/3] amstream/tests: Split test_IDirectDrawStreamSample().
by Gijs Vermeulen July 30, 2020

July 30, 2020

Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/amstream/tests/amstream.c | 326 +++++++++++++++++++++++---------- 1 file changed, 225 insertions(+), 101 deletions(-) diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 130f9f0e0e..17ff110f11 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -2542,106 +2542,6 @@ static void test_media_types(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } -static void test_IDirectDrawStreamSample(void) -{ - IDirectDrawMediaStream *ddraw_stream = NULL; - IDirectDrawStreamSample *sample = NULL; - IDirectDrawSurface *surface, *surface2; - IMediaStream *stream2, *stream = NULL; - DDSURFACEDESC desc = { sizeof(desc) }; - IAMMultiMediaStream *mmstream; - IDirectDrawSurface7 *surface7; - HRESULT hr; - RECT rect; - - if (!(mmstream = create_ammultimediastream())) - return; - if (!create_directdraw()) - { - IAMMultiMediaStream_Release(mmstream); - return; - } - - hr = IAMMultiMediaStream_Initialize(mmstream, STREAMTYPE_READ, 0, NULL); - ok(hr == S_OK, "got 0x%08x\n", hr); - - hr = IAMMultiMediaStream_AddMediaStream(mmstream, (IUnknown*)pdd7, &MSPID_PrimaryVideo, 0, NULL); - ok(hr == S_OK, "got 0x%08x\n", hr); - - hr = IAMMultiMediaStream_GetMediaStream(mmstream, &MSPID_PrimaryVideo, &stream); - ok(hr == S_OK, "got 0x%08x\n", hr); - if (FAILED(hr)) goto error; - - hr = IMediaStream_QueryInterface(stream, &IID_IDirectDrawMediaStream, (LPVOID*)&ddraw_stream); - ok(hr == S_OK, "got 0x%08x\n", hr); - if (FAILED(hr)) goto error; - - hr = IDirectDrawMediaStream_CreateSample(ddraw_stream, NULL, NULL, 0, &sample); - ok(hr == S_OK, "got 0x%08x\n", hr); - - surface = NULL; - hr = IDirectDrawStreamSample_GetSurface(sample, &surface, &rect); - ok(hr == S_OK, "got 0x%08x\n", hr); - ok(surface != NULL, "got %p\n", surface); - - /* Crashes on native. */ - if (0) - { - hr = IDirectDrawStreamSample_GetMediaStream(sample, NULL); - ok(hr == E_POINTER, "Got hr %#x.\n", hr); - } - - hr = IDirectDrawStreamSample_GetMediaStream(sample, &stream2); - ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(stream2 == stream, "Expected stream %p, got %p.\n", stream, stream2); - IMediaStream_Release(stream2); - - hr = IDirectDrawSurface_QueryInterface(surface, &IID_IDirectDrawSurface7, (void **)&surface7); - ok(hr == S_OK, "got 0x%08x\n", hr); - IDirectDrawSurface7_Release(surface7); - - hr = IDirectDrawSurface_GetSurfaceDesc(surface, &desc); - ok(hr == S_OK, "got 0x%08x\n", hr); - ok(desc.dwWidth == 100, "width %d\n", desc.dwWidth); - ok(desc.dwHeight == 100, "height %d\n", desc.dwHeight); - ok(desc.ddpfPixelFormat.dwFlags == DDPF_RGB, "format flags %08x\n", desc.ddpfPixelFormat.dwFlags); - ok(desc.ddpfPixelFormat.dwRGBBitCount, "dwRGBBitCount %d\n", desc.ddpfPixelFormat.dwRGBBitCount); - IDirectDrawSurface_Release(surface); - IDirectDrawStreamSample_Release(sample); - - hr = IDirectDrawSurface7_QueryInterface(pdds7, &IID_IDirectDrawSurface, (void **)&surface); - ok(hr == S_OK, "got 0x%08x\n", hr); - - EXPECT_REF(surface, 1); - hr = IDirectDrawMediaStream_CreateSample(ddraw_stream, surface, NULL, 0, &sample); - ok(hr == S_OK, "got 0x%08x\n", hr); - EXPECT_REF(surface, 2); - - surface2 = NULL; - SetRectEmpty(&rect); - hr = IDirectDrawStreamSample_GetSurface(sample, &surface2, &rect); - ok(hr == S_OK, "got 0x%08x\n", hr); - ok(surface == surface2, "got %p\n", surface2); - ok(rect.right > 0 && rect.bottom > 0, "got %d, %d\n", rect.right, rect.bottom); - EXPECT_REF(surface, 3); - IDirectDrawSurface_Release(surface2); - - hr = IDirectDrawStreamSample_GetSurface(sample, NULL, NULL); - ok(hr == S_OK, "got 0x%08x\n", hr); - - IDirectDrawStreamSample_Release(sample); - IDirectDrawSurface_Release(surface); - -error: - if (ddraw_stream) - IDirectDrawMediaStream_Release(ddraw_stream); - if (stream) - IMediaStream_Release(stream); - - release_directdraw(); - IAMMultiMediaStream_Release(mmstream); -} - static IUnknown *create_audio_data(void) { IUnknown *audio_data = NULL; @@ -5727,6 +5627,227 @@ static void test_audiostreamsample_get_audio_data(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } +static void test_ddrawstream_create_sample(void) +{ + IAMMultiMediaStream *mmstream = create_ammultimediastream(); + IDirectDrawMediaStream *ddraw_stream; + IDirectDrawStreamSample *sample; + IDirectDrawSurface *surface; + IMediaStream *stream; + IDirectDraw *ddraw; + DDSURFACEDESC desc; + HRESULT hr; + RECT rect; + ULONG ref; + + hr = DirectDrawCreate(NULL, &ddraw, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IDirectDraw_SetCooperativeLevel(ddraw, NULL, DDSCL_NORMAL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IAMMultiMediaStream_Initialize(mmstream, STREAMTYPE_READ, 0, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IAMMultiMediaStream_AddMediaStream(mmstream, (IUnknown *)ddraw, &MSPID_PrimaryVideo, 0, &stream); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaStream_QueryInterface(stream, &IID_IDirectDrawMediaStream, (void **)&ddraw_stream); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + /* Crashes on native. */ + if (0) + { + hr = IDirectDrawMediaStream_CreateSample(ddraw_stream, NULL, NULL, 0, NULL); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); + } + + SetRectEmpty(&rect); + hr = IDirectDrawMediaStream_CreateSample(ddraw_stream, NULL, &rect, 0, &sample); + todo_wine ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + + EXPECT_REF(stream, 3); + hr = IDirectDrawMediaStream_CreateSample(ddraw_stream, NULL, NULL, 0, &sample); + ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine EXPECT_REF(stream, 4); + IDirectDrawStreamSample_Release(sample); + EXPECT_REF(stream, 3); + + memset(&desc, 0, sizeof(desc)); + desc.dwSize = sizeof(desc); + desc.dwFlags = DDSD_CAPS; + desc.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE; + hr = IDirectDraw_CreateSurface(ddraw, &desc, &surface, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + EXPECT_REF(surface, 1); + hr = IDirectDrawMediaStream_CreateSample(ddraw_stream, surface, NULL, 0, &sample); + ok(hr == S_OK, "Got hr %#x.\n", hr); + EXPECT_REF(surface, 2); + IDirectDrawStreamSample_Release(sample); + EXPECT_REF(surface, 1); + + hr = IDirectDrawMediaStream_CreateSample(ddraw_stream, surface, &rect, 0, &sample); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + IDirectDrawMediaStream_Release(ddraw_stream); + ref = IDirectDrawStreamSample_Release(sample); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IDirectDrawSurface_Release(surface); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IAMMultiMediaStream_Release(mmstream); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IMediaStream_Release(stream); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IDirectDraw_Release(ddraw); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + +static void test_ddrawstreamsample_get_media_stream(void) +{ + IAMMultiMediaStream *mmstream = create_ammultimediastream(); + IDirectDrawMediaStream *ddraw_stream; + IDirectDrawStreamSample *sample; + IMediaStream *stream, *stream2; + IDirectDraw *ddraw; + HRESULT hr; + ULONG ref; + + hr = DirectDrawCreate(NULL, &ddraw, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IDirectDraw_SetCooperativeLevel(ddraw, NULL, DDSCL_NORMAL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IAMMultiMediaStream_Initialize(mmstream, STREAMTYPE_READ, 0, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IAMMultiMediaStream_AddMediaStream(mmstream, (IUnknown *)ddraw, &MSPID_PrimaryVideo, 0, &stream); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaStream_QueryInterface(stream, &IID_IDirectDrawMediaStream, (void **)&ddraw_stream); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IDirectDrawMediaStream_CreateSample(ddraw_stream, NULL, NULL, 0, &sample); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + /* Crashes on native. */ + if (0) + { + hr = IDirectDrawStreamSample_GetMediaStream(sample, NULL); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); + } + + todo_wine EXPECT_REF(stream, 4); + hr = IDirectDrawStreamSample_GetMediaStream(sample, &stream2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(stream2 == stream, "Expected stream %p, got %p.\n", stream, stream2); + todo_wine EXPECT_REF(stream, 5); + IMediaStream_Release(stream2); + todo_wine EXPECT_REF(stream, 4); + + IDirectDrawMediaStream_Release(ddraw_stream); + ref = IDirectDrawStreamSample_Release(sample); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IAMMultiMediaStream_Release(mmstream); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IMediaStream_Release(stream); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IDirectDraw_Release(ddraw); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + +static void test_ddrawstreamsample_get_surface(void) +{ + IAMMultiMediaStream *mmstream = create_ammultimediastream(); + IDirectDrawSurface *surface, *surface2; + DDSURFACEDESC desc = { sizeof(desc) }; + IDirectDrawMediaStream *ddraw_stream; + IDirectDrawStreamSample *sample; + IMediaStream *stream; + IDirectDraw *ddraw; + HRESULT hr; + RECT rect; + ULONG ref; + + hr = DirectDrawCreate(NULL, &ddraw, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IDirectDraw_SetCooperativeLevel(ddraw, GetDesktopWindow(), DDSCL_NORMAL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IAMMultiMediaStream_Initialize(mmstream, STREAMTYPE_READ, 0, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IAMMultiMediaStream_AddMediaStream(mmstream, (IUnknown *)ddraw, &MSPID_PrimaryVideo, 0, &stream); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaStream_QueryInterface(stream, &IID_IDirectDrawMediaStream, (void **)&ddraw_stream); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IDirectDrawMediaStream_CreateSample(ddraw_stream, NULL, NULL, 0, &sample); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IDirectDrawStreamSample_GetSurface(sample, NULL, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IDirectDrawStreamSample_GetSurface(sample, NULL, &rect); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IDirectDrawStreamSample_GetSurface(sample, &surface, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(surface != NULL, "Expected non-NULL surface.\n"); + IDirectDrawSurface_Release(surface); + + surface = NULL; + hr = IDirectDrawStreamSample_GetSurface(sample, &surface, &rect); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(surface != NULL, "Expected non-NULL surface.\n"); + + hr = IDirectDrawSurface_GetSurfaceDesc(surface, &desc); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(desc.dwWidth == 100, "Expected width 100, got %d.\n", desc.dwWidth); + ok(desc.dwHeight == 100, "Expected height 100, got %d.\n", desc.dwHeight); + ok(desc.ddpfPixelFormat.dwFlags == DDPF_RGB, "Expected format flags DDPF_RGB, got %#x.\n", desc.ddpfPixelFormat.dwFlags); + ok(desc.ddpfPixelFormat.dwRGBBitCount, "Expected non-zero RGB bit count.\n"); + IDirectDrawSurface_Release(surface); + IDirectDrawStreamSample_Release(sample); + + memset(&desc, 0, sizeof(desc)); + desc.dwSize = sizeof(desc); + desc.dwFlags = DDSD_CAPS; + desc.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE; + hr = IDirectDraw_CreateSurface(ddraw, &desc, &surface, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + EXPECT_REF(surface, 1); + hr = IDirectDrawMediaStream_CreateSample(ddraw_stream, surface, NULL, 0, &sample); + ok(hr == S_OK, "Got hr %#x.\n", hr); + EXPECT_REF(surface, 2); + + surface2 = NULL; + SetRectEmpty(&rect); + hr = IDirectDrawStreamSample_GetSurface(sample, &surface2, &rect); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(surface2 == surface, "Expected surface %p, got %p.\n", surface, surface2); + ok(rect.right > 0 && rect.bottom > 0, "Got rect %d, %d.\n", rect.right, rect.bottom); + EXPECT_REF(surface, 3); + IDirectDrawSurface_Release(surface2); + EXPECT_REF(surface, 2); + + IDirectDrawMediaStream_Release(ddraw_stream); + ref = IDirectDrawStreamSample_Release(sample); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IDirectDrawSurface_Release(surface); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IAMMultiMediaStream_Release(mmstream); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IMediaStream_Release(stream); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IDirectDraw_Release(ddraw); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + START_TEST(amstream) { const WCHAR *test_avi_path; @@ -5743,7 +5864,6 @@ START_TEST(amstream) test_set_state(); test_enum_media_types(); test_media_types(); - test_IDirectDrawStreamSample(); test_avi_path = load_resource(L"test.avi"); @@ -5779,6 +5899,10 @@ START_TEST(amstream) test_ddrawstream_initialize(); test_ddrawstream_getsetdirectdraw(); test_ddrawstream_receive_connection(); + test_ddrawstream_create_sample(); + + test_ddrawstreamsample_get_media_stream(); + test_ddrawstreamsample_get_surface(); test_ammediastream_join_am_multi_media_stream(); test_ammediastream_join_filter(); -- 2.27.0

1 2

[PATCH 7/8] kernel32/tets: Add more AllocConsole tests.
by Jacek Caban July 30, 2020

July 30, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/tests/console.c | 106 ++++++++++++++++++++++++++++++++++ 1 file changed, 106 insertions(+)

2 1

[PATCH 8/8] kernelbase: Use init_console_std_handles in AttachConsole.
by Jacek Caban July 30, 2020

July 30, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernelbase/console.c | 9 +++------ server/console.c | 14 -------------- server/protocol.def | 4 ---- 3 files changed, 3 insertions(+), 24 deletions(-)

1 0

[PATCH 6/8] kernelbase: Close handles allocated by AllocConsole in FreeConsole.
by Jacek Caban July 30, 2020

July 30, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernelbase/console.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)

1 0

[PATCH 5/8] kernelbase: Fix handling processes using STARTF_USESTDHANDLES when setting standard handles in AllocConsole.
by Jacek Caban July 30, 2020

July 30, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernelbase/console.c | 89 +++++++++++++++++++++++++-------------- 1 file changed, 57 insertions(+), 32 deletions(-)

1 0

[PATCH 4/8] kernelbase: Lock console critical section when changing current console.
by Jacek Caban July 30, 2020

July 30, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernelbase/console.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-)

1 0