April 2021 - Wine-Devel - list.winehq.org

[PATCH 1/4] netapi32: Use ntdll functions for CP_UNIXCP codepage conversions.
by Zebediah Figura April 12, 2021

April 12, 2021

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/netapi32/netapi32.c | 118 ++++++++++++++++++++++++++++++--------- 1 file changed, 91 insertions(+), 27 deletions(-) diff --git a/dlls/netapi32/netapi32.c b/dlls/netapi32/netapi32.c index 2e2ac84a49c..ad115e26257 100644 --- a/dlls/netapi32/netapi32.c +++ b/dlls/netapi32/netapi32.c @@ -52,7 +52,6 @@ #include "ifmib.h" #include "iphlpapi.h" #include "ntsecapi.h" -#include "winnls.h" #include "dsrole.h" #include "dsgetdc.h" #include "davclnt.h" @@ -65,12 +64,77 @@ WINE_DEFAULT_DEBUG_CHANNEL(netapi32); DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); +static CPTABLEINFO unix_cptable; +static ULONG unix_cp; + +static BOOL get_unix_codepage(void) +{ + static const WCHAR wineunixcpW[] = {'W','I','N','E','U','N','I','X','C','P',0}; + UNICODE_STRING name, value; + WCHAR value_buffer[13]; + SIZE_T size; + void *ptr; + + if (unix_cp) return TRUE; + + RtlInitUnicodeString( &name, wineunixcpW ); + value.Buffer = value_buffer; + value.MaximumLength = sizeof(value_buffer); + if (!RtlQueryEnvironmentVariable_U( NULL, &name, &value )) + RtlUnicodeStringToInteger( &value, 10, &unix_cp ); + if (NtGetNlsSectionPtr( 11, unix_cp, NULL, &ptr, &size )) + return FALSE; + RtlInitCodePageTable( ptr, &unix_cptable ); + return TRUE; +} + +static DWORD netapi_wcstoumbs( const WCHAR *src, char *dst, DWORD dstlen ) +{ + DWORD srclen = (strlenW( src ) + 1) * sizeof(WCHAR); + DWORD len; + + get_unix_codepage(); + + if (unix_cp == CP_UTF8) + { + RtlUnicodeToUTF8N( dst, dstlen, &len, src, srclen ); + return len; + } + else + { + len = (strlenW( src ) * 2) + 1; + if (dst) RtlUnicodeToCustomCPN( &unix_cptable, dst, dstlen, &len, src, srclen ); + return len; + } +} + +static DWORD netapi_umbstowcs( const char *src, WCHAR *dst, DWORD dstlen ) +{ + DWORD srclen = strlen( src ) + 1; + DWORD len; + + get_unix_codepage(); + + if (unix_cp == CP_UTF8) + { + RtlUTF8ToUnicodeN( dst, dstlen, &len, src, srclen ); + return len; + } + else + { + len = srclen * sizeof(WCHAR); + if (dst) RtlCustomCPToUnicodeN( &unix_cptable, dst, dstlen, &len, src, srclen ); + return len; + } +} + static char *strdup_unixcp( const WCHAR *str ) { char *ret; - int len = WideCharToMultiByte( CP_UNIXCP, 0, str, -1, NULL, 0, NULL, NULL ); + + int len = netapi_wcstoumbs( str, NULL, 0 ); if ((ret = HeapAlloc( GetProcessHeap(), 0, len ))) - WideCharToMultiByte( CP_UNIXCP, 0, str, -1, ret, len, NULL, NULL ); + netapi_wcstoumbs( str, ret, len ); return ret; } @@ -186,8 +250,8 @@ static NET_API_STATUS server_info_101_from_samba( const unsigned char *buf, BYTE DWORD len = 0; WCHAR *ptr; - if (info->sv101_name) len += MultiByteToWideChar( CP_UNIXCP, 0, info->sv101_name, -1, NULL, 0 ); - if (info->sv101_comment) len += MultiByteToWideChar( CP_UNIXCP, 0, info->sv101_comment, -1, NULL, 0 ); + if (info->sv101_name) len += netapi_umbstowcs( info->sv101_name, NULL, 0 ); + if (info->sv101_comment) len += netapi_umbstowcs( info->sv101_comment, NULL, 0 ); if (!(ret = HeapAlloc( GetProcessHeap(), 0, sizeof(*ret) + (len * sizeof(WCHAR) )))) return ERROR_OUTOFMEMORY; @@ -197,7 +261,7 @@ static NET_API_STATUS server_info_101_from_samba( const unsigned char *buf, BYTE else { ret->sv101_name = ptr; - ptr += MultiByteToWideChar( CP_UNIXCP, 0, info->sv101_name, -1, ptr, len ); + ptr += netapi_umbstowcs( info->sv101_name, ptr, len ); } ret->sv101_version_major = info->sv101_version_major; ret->sv101_version_minor = info->sv101_version_minor; @@ -206,7 +270,7 @@ static NET_API_STATUS server_info_101_from_samba( const unsigned char *buf, BYTE else { ret->sv101_comment = ptr; - MultiByteToWideChar( CP_UNIXCP, 0, info->sv101_comment, -1, ptr, len ); + netapi_umbstowcs( info->sv101_comment, ptr, len ); } *bufptr = (BYTE *)ret; return NERR_Success; @@ -260,13 +324,13 @@ static NET_API_STATUS share_info_2_to_samba( const BYTE *buf, unsigned char **bu char *ptr; if (info->shi2_netname) - len += WideCharToMultiByte( CP_UNIXCP, 0, info->shi2_netname, -1, NULL, 0, NULL, NULL ); + len += netapi_wcstoumbs( info->shi2_netname, NULL, 0 ); if (info->shi2_remark) - len += WideCharToMultiByte( CP_UNIXCP, 0, info->shi2_remark, -1, NULL, 0, NULL, NULL ); + len += netapi_wcstoumbs( info->shi2_remark, NULL, 0 ); if (info->shi2_path) - len += WideCharToMultiByte( CP_UNIXCP, 0, info->shi2_path, -1, NULL, 0, NULL, NULL ); + len += netapi_wcstoumbs( info->shi2_path, NULL, 0 ); if (info->shi2_passwd) - len += WideCharToMultiByte( CP_UNIXCP, 0, info->shi2_passwd, -1, NULL, 0, NULL, NULL ); + len += netapi_wcstoumbs( info->shi2_passwd, NULL, 0 ); if (!(ret = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*ret) + len ))) return ERROR_OUTOFMEMORY; @@ -275,14 +339,14 @@ static NET_API_STATUS share_info_2_to_samba( const BYTE *buf, unsigned char **bu else { ret->shi2_netname = ptr; - ptr += WideCharToMultiByte( CP_UNIXCP, 0, info->shi2_netname, -1, ptr, len, NULL, NULL ); + ptr += netapi_wcstoumbs( info->shi2_netname, ptr, len ); } ret->shi2_type = info->shi2_type; if (!info->shi2_remark) ret->shi2_remark = NULL; else { ret->shi2_remark = ptr; - ptr += WideCharToMultiByte( CP_UNIXCP, 0, info->shi2_remark, -1, ptr, len, NULL, NULL ); + ptr += netapi_wcstoumbs( info->shi2_remark, ptr, len ); } ret->shi2_permissions = info->shi2_permissions; ret->shi2_max_uses = info->shi2_max_uses; @@ -291,13 +355,13 @@ static NET_API_STATUS share_info_2_to_samba( const BYTE *buf, unsigned char **bu else { ret->shi2_path = ptr; - ptr += WideCharToMultiByte( CP_UNIXCP, 0, info->shi2_path, -1, ptr, len, NULL, NULL ); + ptr += netapi_wcstoumbs( info->shi2_path, ptr, len ); } if (!info->shi2_passwd) ret->shi2_passwd = NULL; else { ret->shi2_passwd = ptr; - WideCharToMultiByte( CP_UNIXCP, 0, info->shi2_passwd, -1, ptr, len, NULL, NULL ); + netapi_wcstoumbs( info->shi2_passwd, ptr, len ); } *bufptr = (unsigned char *)ret; return NERR_Success; @@ -712,13 +776,13 @@ static NET_API_STATUS share_info_502_to_samba( const BYTE *buf, unsigned char ** *bufptr = NULL; if (info->shi502_netname) - len += WideCharToMultiByte( CP_UNIXCP, 0, info->shi502_netname, -1, NULL, 0, NULL, NULL ); + len += netapi_wcstoumbs( info->shi502_netname, NULL, 0 ); if (info->shi502_remark) - len += WideCharToMultiByte( CP_UNIXCP, 0, info->shi502_remark, -1, NULL, 0, NULL, NULL ); + len += netapi_wcstoumbs( info->shi502_remark, NULL, 0 ); if (info->shi502_path) - len += WideCharToMultiByte( CP_UNIXCP, 0, info->shi502_path, -1, NULL, 0, NULL, NULL ); + len += netapi_wcstoumbs( info->shi502_path, NULL, 0 ); if (info->shi502_passwd) - len += WideCharToMultiByte( CP_UNIXCP, 0, info->shi502_passwd, -1, NULL, 0, NULL, NULL ); + len += netapi_wcstoumbs( info->shi502_passwd, NULL, 0 ); if (info->shi502_security_descriptor) size = sd_to_samba_size( info->shi502_security_descriptor ); if (!(ret = HeapAlloc( GetProcessHeap(), 0, sizeof(*ret) + (len * sizeof(WCHAR)) + size ))) @@ -729,14 +793,14 @@ static NET_API_STATUS share_info_502_to_samba( const BYTE *buf, unsigned char ** else { ret->shi502_netname = ptr; - ptr += WideCharToMultiByte( CP_UNIXCP, 0, info->shi502_netname, -1, ptr, len, NULL, NULL ); + ptr += netapi_wcstoumbs( info->shi502_netname, ptr, len ); } ret->shi502_type = info->shi502_type; if (!info->shi502_remark) ret->shi502_remark = NULL; else { ret->shi502_remark = ptr; - ptr += WideCharToMultiByte( CP_UNIXCP, 0, info->shi502_remark, -1, ptr, len, NULL, NULL ); + ptr += netapi_wcstoumbs( info->shi502_remark, ptr, len ); } ret->shi502_permissions = info->shi502_permissions; ret->shi502_max_uses = info->shi502_max_uses; @@ -745,13 +809,13 @@ static NET_API_STATUS share_info_502_to_samba( const BYTE *buf, unsigned char ** else { ret->shi502_path = ptr; - ptr += WideCharToMultiByte( CP_UNIXCP, 0, info->shi502_path, -1, ptr, len, NULL, NULL ); + ptr += netapi_wcstoumbs( info->shi502_path, ptr, len ); } if (!info->shi502_passwd) ret->shi502_passwd = NULL; else { ret->shi502_passwd = ptr; - ptr += WideCharToMultiByte( CP_UNIXCP, 0, info->shi502_passwd, -1, ptr, len, NULL, NULL ); + ptr += netapi_wcstoumbs( info->shi502_passwd, ptr, len ); } ret->shi502_reserved = info->shi502_reserved; if (!info->shi502_security_descriptor) ret->shi502_security_descriptor = NULL; @@ -835,9 +899,9 @@ static NET_API_STATUS wksta_info_100_from_samba( const unsigned char *buf, BYTE WCHAR *ptr; if (info->wki100_computername) - len += MultiByteToWideChar( CP_UNIXCP, 0, info->wki100_computername, -1, NULL, 0 ); + len += netapi_umbstowcs( info->wki100_computername, NULL, 0 ); if (info->wki100_langroup) - len += MultiByteToWideChar( CP_UNIXCP, 0, info->wki100_langroup, -1, NULL, 0 ); + len += netapi_umbstowcs( info->wki100_langroup, NULL, 0 ); if (!(ret = HeapAlloc( GetProcessHeap(), 0, sizeof(*ret) + (len * sizeof(WCHAR) )))) return ERROR_OUTOFMEMORY; @@ -847,13 +911,13 @@ static NET_API_STATUS wksta_info_100_from_samba( const unsigned char *buf, BYTE else { ret->wki100_computername = ptr; - ptr += MultiByteToWideChar( CP_UNIXCP, 0, info->wki100_computername, -1, ptr, len ); + ptr += netapi_umbstowcs( info->wki100_computername, ptr, len ); } if (!info->wki100_langroup) ret->wki100_langroup = NULL; else { ret->wki100_langroup = ptr; - MultiByteToWideChar( CP_UNIXCP, 0, info->wki100_langroup, -1, ptr, len ); + netapi_umbstowcs( info->wki100_langroup, ptr, len ); } ret->wki100_ver_major = info->wki100_ver_major; ret->wki100_ver_minor = info->wki100_ver_minor; -- 2.30.2

2 7

[PATCH 4/4] winevulkan: Move ICD functions to loader.c.
by Jacek Caban April 12, 2021

April 12, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winevulkan/loader.c | 156 ++++++++++++++++++++++++++++++++++++ dlls/winevulkan/make_vulkan | 2 +- dlls/winevulkan/vulkan.c | 156 ------------------------------------ 3 files changed, 157 insertions(+), 157 deletions(-)

1 0

[PATCH 3/4] winevulkan: Move registration functions to new loader.c file.
by Jacek Caban April 12, 2021

April 12, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- The new file is for parts that will live on PE side. dlls/winevulkan/Makefile.in | 1 + dlls/winevulkan/loader.c | 104 ++++++++++++++++++++++++++++++++++++ dlls/winevulkan/vulkan.c | 75 -------------------------- 3 files changed, 105 insertions(+), 75 deletions(-) create mode 100644 dlls/winevulkan/loader.c

1 0

[PATCH 2/4] winevulkan: Use pthread_rwlock_t in VkInstance_T.
by Jacek Caban April 12, 2021

April 12, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winevulkan/Makefile.in | 1 + dlls/winevulkan/vulkan.c | 15 ++++++++------- dlls/winevulkan/vulkan_private.h | 4 +++- 3 files changed, 12 insertions(+), 8 deletions(-)

1 0

[PATCH] winevulkan: Simplify thunk declaration.
by Georg Lehmann April 12, 2021

April 12, 2021

Previously "thunk" : True, "private_thunk" : True and "thunk" : False, "private_thunk" : True had the same effect and make_vulkan used both variant. Replacing the two bools with an enum should reduce confusion. Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> --- dlls/winevulkan/make_vulkan | 138 +++++++++++++++++++----------------- 1 file changed, 72 insertions(+), 66 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index c30beee981d..1017c09dfc7 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -134,6 +134,11 @@ CORE_EXTENSIONS = [ # in FUNCTION_OVERRIDES DRIVER_VERSION = 10 +class ThunkType(Enum): + NONE = 1 + PUBLIC = 2 + PRIVATE = 3 + # Table of functions for which we have a special implementation. # These are regular device / instance functions for which we need # to do more work compared to a regular thunk or because they are @@ -142,100 +147,104 @@ DRIVER_VERSION = 10 # / instance dispatch table. # - driver sets whether the API is part of the driver interface. # - thunk sets whether to create a thunk in vulkan_thunks.c. +# - NONE means there's a fully custom implementation. +# - PUBLIC means the implementation is fully auto generated. +# - PRIVATE thunks can be used in custom implementations for +# struct conversion. FUNCTION_OVERRIDES = { # Global functions - "vkCreateInstance" : {"dispatch" : False, "driver" : True, "thunk" : False}, - "vkEnumerateInstanceExtensionProperties" : {"dispatch" : False, "driver" : True, "thunk" : False}, - "vkEnumerateInstanceVersion": {"dispatch" : False, "driver" : False, "thunk" : False}, - "vkGetInstanceProcAddr": {"dispatch" : False, "driver" : True, "thunk" : False}, + "vkCreateInstance" : {"dispatch" : False, "driver" : True, "thunk" : ThunkType.NONE}, + "vkEnumerateInstanceExtensionProperties" : {"dispatch" : False, "driver" : True, "thunk" : ThunkType.NONE}, + "vkEnumerateInstanceVersion": {"dispatch" : False, "driver" : False, "thunk" : ThunkType.NONE}, + "vkGetInstanceProcAddr": {"dispatch" : False, "driver" : True, "thunk" : ThunkType.NONE}, # Instance functions - "vkCreateDevice" : {"dispatch" : True, "driver" : False, "thunk" : False}, - "vkDestroyInstance" : {"dispatch" : False, "driver" : True, "thunk" : False }, - "vkEnumerateDeviceExtensionProperties" : {"dispatch" : True, "driver" : False, "thunk" : False}, - "vkEnumerateDeviceLayerProperties": {"dispatch": True, "driver": False, "thunk": False}, - "vkEnumeratePhysicalDeviceGroups" : {"dispatch" : True, "driver" : False, "thunk" : False}, - "vkEnumeratePhysicalDevices" : {"dispatch" : True, "driver" : False, "thunk" : False}, - "vkGetPhysicalDeviceExternalBufferProperties" : {"dispatch" : False, "driver" : False, "thunk" : False}, - "vkGetPhysicalDeviceExternalFenceProperties" : {"dispatch" : False, "driver" : False, "thunk" : False}, - "vkGetPhysicalDeviceExternalSemaphoreProperties" : {"dispatch" : False, "driver" : False, "thunk" : False}, - "vkGetPhysicalDeviceImageFormatProperties2" : {"dispatch" : True, "driver" : False, "thunk" : True, "private_thunk" : True}, - "vkGetPhysicalDeviceProperties2" : {"dispatch" : True, "driver" : False, "thunk" : True, "private_thunk" : True}, - "vkGetPhysicalDeviceProperties2KHR" : {"dispatch" : True, "driver" : False, "thunk" : True, "private_thunk" : True}, + "vkCreateDevice" : {"dispatch" : True, "driver" : False, "thunk" : ThunkType.NONE}, + "vkDestroyInstance" : {"dispatch" : False, "driver" : True, "thunk" : ThunkType.NONE }, + "vkEnumerateDeviceExtensionProperties" : {"dispatch" : True, "driver" : False, "thunk" : ThunkType.NONE}, + "vkEnumerateDeviceLayerProperties": {"dispatch": True, "driver": False, "thunk": ThunkType.NONE}, + "vkEnumeratePhysicalDeviceGroups" : {"dispatch" : True, "driver" : False, "thunk" : ThunkType.NONE}, + "vkEnumeratePhysicalDevices" : {"dispatch" : True, "driver" : False, "thunk" : ThunkType.NONE}, + "vkGetPhysicalDeviceExternalBufferProperties" : {"dispatch" : False, "driver" : False, "thunk" : ThunkType.NONE}, + "vkGetPhysicalDeviceExternalFenceProperties" : {"dispatch" : False, "driver" : False, "thunk" : ThunkType.NONE}, + "vkGetPhysicalDeviceExternalSemaphoreProperties" : {"dispatch" : False, "driver" : False, "thunk" : ThunkType.NONE}, + "vkGetPhysicalDeviceImageFormatProperties2" : {"dispatch" : True, "driver" : False, "thunk" : ThunkType.PRIVATE}, + "vkGetPhysicalDeviceProperties2" : {"dispatch" : True, "driver" : False, "thunk" : ThunkType.PRIVATE}, + "vkGetPhysicalDeviceProperties2KHR" : {"dispatch" : True, "driver" : False, "thunk" : ThunkType.PRIVATE}, # Device functions - "vkAllocateCommandBuffers" : {"dispatch" : True, "driver" : False, "thunk" : False}, - "vkCmdExecuteCommands" : {"dispatch" : True, "driver" : False, "thunk" : False}, - "vkCreateCommandPool" : {"dispatch": True, "driver" : False, "thunk" : False}, - "vkDestroyCommandPool" : {"dispatch": True, "driver" : False, "thunk" : False}, - "vkDestroyDevice" : {"dispatch" : True, "driver" : False, "thunk" : False}, - "vkFreeCommandBuffers" : {"dispatch" : True, "driver" : False, "thunk" : False}, - "vkGetDeviceProcAddr" : {"dispatch" : False, "driver" : True, "thunk" : False}, - "vkGetDeviceQueue" : {"dispatch": True, "driver" : False, "thunk" : False}, - "vkGetDeviceQueue2" : {"dispatch": True, "driver" : False, "thunk" : False}, - "vkQueueSubmit" : {"dispatch": True, "driver" : False, "thunk" : False}, + "vkAllocateCommandBuffers" : {"dispatch" : True, "driver" : False, "thunk" : ThunkType.NONE}, + "vkCmdExecuteCommands" : {"dispatch" : True, "driver" : False, "thunk" : ThunkType.NONE}, + "vkCreateCommandPool" : {"dispatch": True, "driver" : False, "thunk" : ThunkType.NONE}, + "vkDestroyCommandPool" : {"dispatch": True, "driver" : False, "thunk" : ThunkType.NONE}, + "vkDestroyDevice" : {"dispatch" : True, "driver" : False, "thunk" : ThunkType.NONE}, + "vkFreeCommandBuffers" : {"dispatch" : True, "driver" : False, "thunk" : ThunkType.NONE}, + "vkGetDeviceProcAddr" : {"dispatch" : False, "driver" : True, "thunk" : ThunkType.NONE}, + "vkGetDeviceQueue" : {"dispatch": True, "driver" : False, "thunk" : ThunkType.NONE}, + "vkGetDeviceQueue2" : {"dispatch": True, "driver" : False, "thunk" : ThunkType.NONE}, + "vkQueueSubmit" : {"dispatch": True, "driver" : False, "thunk" : ThunkType.NONE}, # VK_KHR_surface - "vkDestroySurfaceKHR" : {"dispatch" : True, "driver" : True, "thunk" : False}, - "vkGetPhysicalDeviceSurfaceSupportKHR" : {"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}, + "vkDestroySurfaceKHR" : {"dispatch" : True, "driver" : True, "thunk" : ThunkType.NONE}, + "vkGetPhysicalDeviceSurfaceSupportKHR" : {"dispatch" : True, "driver" : True, "thunk" : ThunkType.PUBLIC}, + "vkGetPhysicalDeviceSurfaceCapabilitiesKHR" : {"dispatch" : True, "driver" : True, "thunk" : ThunkType.PRIVATE}, + "vkGetPhysicalDeviceSurfaceFormatsKHR" : {"dispatch" : True, "driver" : True, "thunk" : ThunkType.PUBLIC}, + "vkGetPhysicalDeviceSurfacePresentModesKHR" : {"dispatch" : True, "driver" : True, "thunk" : ThunkType.PUBLIC}, # VK_KHR_get_surface_capabilities2 - "vkGetPhysicalDeviceSurfaceCapabilities2KHR" : {"dispatch" : True, "driver" : True, "thunk" : False, "private_thunk" : True}, - "vkGetPhysicalDeviceSurfaceFormats2KHR" : {"dispatch" : True, "driver" : True, "thunk" : False, "private_thunk" : True}, + "vkGetPhysicalDeviceSurfaceCapabilities2KHR" : {"dispatch" : True, "driver" : True, "thunk" : ThunkType.PRIVATE}, + "vkGetPhysicalDeviceSurfaceFormats2KHR" : {"dispatch" : True, "driver" : True, "thunk" : ThunkType.PRIVATE}, # VK_KHR_win32_surface - "vkCreateWin32SurfaceKHR" : {"dispatch" : True, "driver" : True, "thunk" : False}, - "vkGetPhysicalDeviceWin32PresentationSupportKHR" : {"dispatch" : True, "driver" : True, "thunk" : True}, + "vkCreateWin32SurfaceKHR" : {"dispatch" : True, "driver" : True, "thunk" : ThunkType.NONE}, + "vkGetPhysicalDeviceWin32PresentationSupportKHR" : {"dispatch" : True, "driver" : True, "thunk" : ThunkType.PUBLIC}, # VK_KHR_swapchain - "vkCreateSwapchainKHR" : {"dispatch" : True, "driver" : True, "thunk" : False, "private_thunk" : True}, - "vkDestroySwapchainKHR" : {"dispatch" : True, "driver" : True, "thunk" : True}, - "vkGetSwapchainImagesKHR": {"dispatch" : True, "driver" : True, "thunk" : True}, - "vkQueuePresentKHR": {"dispatch" : True, "driver" : True, "thunk" : True}, + "vkCreateSwapchainKHR" : {"dispatch" : True, "driver" : True, "thunk" : ThunkType.PRIVATE}, + "vkDestroySwapchainKHR" : {"dispatch" : True, "driver" : True, "thunk" : ThunkType.PUBLIC}, + "vkGetSwapchainImagesKHR": {"dispatch" : True, "driver" : True, "thunk" : ThunkType.PUBLIC}, + "vkQueuePresentKHR": {"dispatch" : True, "driver" : True, "thunk" : ThunkType.PUBLIC}, # VK_KHR_external_fence_capabilities - "vkGetPhysicalDeviceExternalFencePropertiesKHR" : {"dispatch" : False, "driver" : False, "thunk" : False}, + "vkGetPhysicalDeviceExternalFencePropertiesKHR" : {"dispatch" : False, "driver" : False, "thunk" : ThunkType.NONE}, # VK_KHR_external_memory_capabilities - "vkGetPhysicalDeviceExternalBufferPropertiesKHR" : {"dispatch" : False, "driver" : False, "thunk" : False}, - "vkGetPhysicalDeviceImageFormatProperties2KHR" : {"dispatch" : True, "driver" : False, "thunk" : True, "private_thunk" : True}, + "vkGetPhysicalDeviceExternalBufferPropertiesKHR" : {"dispatch" : False, "driver" : False, "thunk" : ThunkType.NONE}, + "vkGetPhysicalDeviceImageFormatProperties2KHR" : {"dispatch" : True, "driver" : False, "thunk" : ThunkType.PRIVATE}, # VK_KHR_external_semaphore_capabilities - "vkGetPhysicalDeviceExternalSemaphorePropertiesKHR" : {"dispatch" : False, "driver" : False, "thunk" : False}, + "vkGetPhysicalDeviceExternalSemaphorePropertiesKHR" : {"dispatch" : False, "driver" : False, "thunk" : ThunkType.NONE}, # VK_KHR_device_group_creation - "vkEnumeratePhysicalDeviceGroupsKHR" : {"dispatch" : True, "driver" : False, "thunk" : False}, + "vkEnumeratePhysicalDeviceGroupsKHR" : {"dispatch" : True, "driver" : False, "thunk" : ThunkType.NONE}, # VK_KHR_device_group - "vkGetDeviceGroupSurfacePresentModesKHR" : {"dispatch" : True, "driver" : True, "thunk" : True}, - "vkGetPhysicalDevicePresentRectanglesKHR" : {"dispatch" : True, "driver" : True, "thunk" : True}, + "vkGetDeviceGroupSurfacePresentModesKHR" : {"dispatch" : True, "driver" : True, "thunk" : ThunkType.PUBLIC}, + "vkGetPhysicalDevicePresentRectanglesKHR" : {"dispatch" : True, "driver" : True, "thunk" : ThunkType.PUBLIC}, # VK_EXT_private_data - "vkGetPrivateDataEXT" : {"dispatch": True, "driver" : False, "thunk" : False}, - "vkSetPrivateDataEXT" : {"dispatch": True, "driver" : False, "thunk" : False}, + "vkGetPrivateDataEXT" : {"dispatch": True, "driver" : False, "thunk" : ThunkType.NONE}, + "vkSetPrivateDataEXT" : {"dispatch": True, "driver" : False, "thunk" : ThunkType.NONE}, # VK_EXT_calibrated_timestamps - "vkGetPhysicalDeviceCalibrateableTimeDomainsEXT" : {"dispatch" : True, "driver" : False, "thunk" : False}, - "vkGetCalibratedTimestampsEXT" : {"dispatch" : True, "driver" : False, "thunk" : False}, + "vkGetPhysicalDeviceCalibrateableTimeDomainsEXT" : {"dispatch" : True, "driver" : False, "thunk" : ThunkType.NONE}, + "vkGetCalibratedTimestampsEXT" : {"dispatch" : True, "driver" : False, "thunk" : ThunkType.NONE}, # VK_EXT_debug_utils - "vkCreateDebugUtilsMessengerEXT" : {"dispatch": True, "driver" : False, "thunk" : False}, - "vkDestroyDebugUtilsMessengerEXT" : {"dispatch": True, "driver" : False, "thunk" : False}, - "vkSubmitDebugUtilsMessageEXT" : {"dispatch": True, "driver" : False, "thunk" : True, "private_thunk" : True}, - "vkSetDebugUtilsObjectTagEXT" : {"dispatch": True, "driver" : False, "thunk" : True, "private_thunk" : True}, - "vkSetDebugUtilsObjectNameEXT" : {"dispatch": True, "driver" : False, "thunk" : True, "private_thunk" : True}, + "vkCreateDebugUtilsMessengerEXT" : {"dispatch": True, "driver" : False, "thunk" : ThunkType.NONE}, + "vkDestroyDebugUtilsMessengerEXT" : {"dispatch": True, "driver" : False, "thunk" : ThunkType.NONE}, + "vkSubmitDebugUtilsMessageEXT" : {"dispatch": True, "driver" : False, "thunk" : ThunkType.PRIVATE}, + "vkSetDebugUtilsObjectTagEXT" : {"dispatch": True, "driver" : False, "thunk" : ThunkType.PRIVATE}, + "vkSetDebugUtilsObjectNameEXT" : {"dispatch": True, "driver" : False, "thunk" : ThunkType.PRIVATE}, # VK_EXT_debug_report - "vkCreateDebugReportCallbackEXT" : {"dispatch": True, "driver" : False, "thunk" : False}, - "vkDestroyDebugReportCallbackEXT" : {"dispatch": True, "driver" : False, "thunk" : False}, - "vkDebugReportMessageEXT" : {"dispatch": True, "driver" : False, "thunk" : False}, + "vkCreateDebugReportCallbackEXT" : {"dispatch": True, "driver" : False, "thunk" : ThunkType.NONE}, + "vkDestroyDebugReportCallbackEXT" : {"dispatch": True, "driver" : False, "thunk" : ThunkType.NONE}, + "vkDebugReportMessageEXT" : {"dispatch": True, "driver" : False, "thunk" : ThunkType.NONE}, # VK_EXT_debug_marker - "vkDebugMarkerSetObjectNameEXT" : {"dispatch": True, "driver" : False, "thunk" : True, "private_thunk" : True}, - "vkDebugMarkerSetObjectTagEXT" : {"dispatch": True, "driver" : False, "thunk" : True, "private_thunk" : True}, + "vkDebugMarkerSetObjectNameEXT" : {"dispatch": True, "driver" : False, "thunk" : ThunkType.PRIVATE}, + "vkDebugMarkerSetObjectTagEXT" : {"dispatch": True, "driver" : False, "thunk" : ThunkType.PRIVATE}, } STRUCT_CHAIN_CONVERSIONS = [ @@ -515,10 +524,7 @@ class VkFunction(object): func_info = FUNCTION_OVERRIDES.get(self.name, None) self.dispatch = func_info["dispatch"] if func_info else True self.driver = func_info["driver"] if func_info else False - self.thunk_needed = func_info["thunk"] if func_info else True - self.private_thunk = func_info["private_thunk"] if func_info and "private_thunk" in func_info else False - if self.private_thunk: - self.thunk_needed = True + self.thunk_type = func_info["thunk"] if func_info else ThunkType.PUBLIC # Required is set while parsing which APIs and types are required # and is used by the code generation. @@ -633,10 +639,10 @@ class VkFunction(object): return self.dispatch def needs_thunk(self): - return self.thunk_needed + return self.thunk_type != ThunkType.NONE def needs_private_thunk(self): - return self.private_thunk + return self.thunk_type == ThunkType.PRIVATE def pfn(self, prefix="p", call_conv=None, conv=False): """ Create function pointer. """ -- 2.31.1

1 0

[PATCH v2] ntdll: Remove wait timeout in get_thread_context().
by Paul Gofman April 12, 2021

April 12, 2021

Fixes hangs during loading or after campaign start in Mount & Blade II: Bannerlord. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- Supersedes 203674. The hang happens when NtGetContextThread fails due to time out (after successful thread suspend). The timeout happens as the thread is busy in read() for regular file called from NtReadFile and does not process SIGUSR1 until read is complete. The read() may take a real long time when the disk is under heavy load. dlls/ntdll/unix/thread.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index 1a882a99855..543a214e056 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -617,13 +617,8 @@ NTSTATUS get_thread_context( HANDLE handle, context_t *context, unsigned int fla if (ret == STATUS_PENDING) { - LARGE_INTEGER timeout; - timeout.QuadPart = -1000000; - if (NtWaitForSingleObject( handle, FALSE, &timeout )) - { - NtClose( handle ); - return STATUS_ACCESS_DENIED; - } + NtWaitForSingleObject( handle, FALSE, NULL ); + SERVER_START_REQ( get_thread_context ) { req->handle = wine_server_obj_handle( handle ); -- 2.30.2

1 0

[PATCH] ntdll: Increase timeout in get_thread_context().
by Paul Gofman April 12, 2021

April 12, 2021

Fixes hangs during loading or after campaign start in Mount & Blade II: Bannerlord. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- The hang happens when NtGetContextThread fails due to time out (after successful thread suspend). The timeout happens as the thread is busy in read() for regular file called from NtReadFile and does not process SIGUSR1 until read is complete. The read() may take a real long time when the disk is under heavy load. dlls/ntdll/unix/thread.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index 1a882a99855..a7e2fdef248 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -618,7 +618,7 @@ NTSTATUS get_thread_context( HANDLE handle, context_t *context, unsigned int fla if (ret == STATUS_PENDING) { LARGE_INTEGER timeout; - timeout.QuadPart = -1000000; + timeout.QuadPart = -5000000; if (NtWaitForSingleObject( handle, FALSE, &timeout )) { NtClose( handle ); -- 2.30.2

2 2

[PATCH 1/3] mfplat: Read queue subscriber within the critical section.
by Rémi Bernon April 12, 2021

April 12, 2021

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- This should fix a few leaks and potential race condition. I'm not 100% sure about the last patch, as there's some questions about who's supposed to be shuting down the object. I think we set the _MF_TOPONODE_IMFActivate node when we activated the object, and after we called IMFTopologyNode_SetObject, so my understanding is that when they are set we should shutdown both the activation object and the object itself. For the sample grabber, the tests show that shutting down the activation object should not automatically shutdown the sink, so it needs to be done separately. dlls/mfplat/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 6fb8661dba4..9078702c854 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -7109,7 +7109,7 @@ static void queue_notify_subscriber(struct event_queue *queue) static HRESULT WINAPI eventqueue_BeginGetEvent(IMFMediaEventQueue *iface, IMFAsyncCallback *callback, IUnknown *state) { struct event_queue *queue = impl_from_IMFMediaEventQueue(iface); - MFASYNCRESULT *result_data = (MFASYNCRESULT *)queue->subscriber; + MFASYNCRESULT *result_data; HRESULT hr; TRACE("%p, %p, %p.\n", iface, callback, state); @@ -7121,7 +7121,7 @@ static HRESULT WINAPI eventqueue_BeginGetEvent(IMFMediaEventQueue *iface, IMFAsy if (queue->is_shut_down) hr = MF_E_SHUTDOWN; - else if (result_data) + else if ((result_data = (MFASYNCRESULT *)queue->subscriber)) { if (result_data->pCallback == callback) hr = IRtwqAsyncResult_GetStateNoAddRef(queue->subscriber) == state ? -- 2.31.0

2 4

[PATCH v3] amstream: Implement MediaStreamFilter::EndOfStream.
by Anton Baskanov April 12, 2021

April 12, 2021

Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> --- dlls/amstream/filter.c | 42 +++++++++++++++++++- dlls/amstream/tests/amstream.c | 72 +++++++++++++++++----------------- 2 files changed, 76 insertions(+), 38 deletions(-) diff --git a/dlls/amstream/filter.c b/dlls/amstream/filter.c index 3c0436a294f..081e6b29ed5 100644 --- a/dlls/amstream/filter.c +++ b/dlls/amstream/filter.c @@ -178,6 +178,7 @@ struct filter REFERENCE_TIME start_time; struct list free_events; struct list used_events; + LONG eos_count; }; struct event @@ -266,6 +267,22 @@ static HRESULT WINAPI filter_GetClassID(IMediaStreamFilter *iface, CLSID *clsid) return S_OK; } +static void send_ec_complete(struct filter *filter) +{ + IMediaEventSink *event_sink; + + if (!filter->graph) + return; + + if (FAILED(IFilterGraph_QueryInterface(filter->graph, &IID_IMediaEventSink, (void **)&event_sink))) + return; + + IMediaEventSink_Notify(event_sink, EC_COMPLETE, S_OK, + (LONG_PTR)&filter->IMediaStreamFilter_iface); + + IMediaEventSink_Release(event_sink); +} + static void set_state(struct filter *filter, FILTER_STATE state) { if (filter->state != state) @@ -287,6 +304,9 @@ static HRESULT WINAPI filter_Stop(IMediaStreamFilter *iface) EnterCriticalSection(&filter->cs); + if (filter->state != State_Stopped) + filter->eos_count = 0; + set_state(filter, State_Stopped); LIST_FOR_EACH_ENTRY(event, &filter->used_events, struct event, entry) @@ -327,6 +347,10 @@ static HRESULT WINAPI filter_Run(IMediaStreamFilter *iface, REFERENCE_TIME start EnterCriticalSection(&filter->cs); + if (filter->state != State_Running && filter->seekable_stream + && filter->eos_count == (LONG)filter->nb_streams) + send_ec_complete(filter); + filter->start_time = start; set_state(filter, State_Running); @@ -769,6 +793,9 @@ static HRESULT WINAPI filter_Flush(IMediaStreamFilter *iface, BOOL cancel_eos) } } + if (cancel_eos) + --filter->eos_count; + LeaveCriticalSection(&filter->cs); return S_OK; @@ -776,9 +803,20 @@ static HRESULT WINAPI filter_Flush(IMediaStreamFilter *iface, BOOL cancel_eos) static HRESULT WINAPI filter_EndOfStream(IMediaStreamFilter *iface) { - FIXME("(%p)->(): Stub!\n", iface); + struct filter *filter = impl_from_IMediaStreamFilter(iface); - return E_NOTIMPL; + TRACE("filter %p.\n", filter); + + EnterCriticalSection(&filter->cs); + + ++filter->eos_count; + if (filter->state == State_Running && filter->seekable_stream && + filter->eos_count == (LONG)filter->nb_streams) + send_ec_complete(filter); + + LeaveCriticalSection(&filter->cs); + + return S_OK; } static const IMediaStreamFilterVtbl filter_vtbl = diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 79cc4f52801..9cefec12442 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -6954,9 +6954,9 @@ static void test_mediastreamfilter_end_of_stream(void) graph.got_notify = 0; hr = IMediaStreamFilter_EndOfStream(filter); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IMediaStreamFilter_EndOfStream(filter); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); ok(graph.got_notify == 0, "Got %d calls to IMediaEventSink::Notify().\n", graph.got_notify); @@ -6973,9 +6973,9 @@ static void test_mediastreamfilter_end_of_stream(void) graph.got_notify = 0; hr = IMediaStreamFilter_EndOfStream(filter); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IMediaStreamFilter_EndOfStream(filter); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); ok(graph.got_notify == 0, "Got %d calls to IMediaEventSink::Notify().\n", graph.got_notify); @@ -6994,14 +6994,14 @@ static void test_mediastreamfilter_end_of_stream(void) graph.got_notify = 0; hr = IMediaStreamFilter_EndOfStream(filter); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); ok(graph.got_notify == 0, "Got %d calls to IMediaEventSink::Notify().\n", graph.got_notify); hr = IMediaStreamFilter_EndOfStream(filter); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(graph.got_notify == 1, "Got %d calls to IMediaEventSink::Notify().\n", graph.got_notify); + ok(graph.got_notify == 1, "Got %d calls to IMediaEventSink::Notify().\n", graph.got_notify); hr = IAMMultiMediaStream_SetState(mmstream, STREAMSTATE_STOP); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -7011,9 +7011,9 @@ static void test_mediastreamfilter_end_of_stream(void) graph.got_notify = 0; hr = IMediaStreamFilter_EndOfStream(filter); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IMediaStreamFilter_EndOfStream(filter); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); ok(graph.got_notify == 0, "Got %d calls to IMediaEventSink::Notify().\n", graph.got_notify); @@ -7025,12 +7025,12 @@ static void test_mediastreamfilter_end_of_stream(void) hr = IMediaControl_Run(media_control); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(graph.got_notify == 1, "Got %d calls to IMediaEventSink::Notify().\n", graph.got_notify); + ok(graph.got_notify == 1, "Got %d calls to IMediaEventSink::Notify().\n", graph.got_notify); hr = IMediaControl_Run(media_control); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(graph.got_notify == 1, "Got %d calls to IMediaEventSink::Notify().\n", graph.got_notify); + ok(graph.got_notify == 1, "Got %d calls to IMediaEventSink::Notify().\n", graph.got_notify); hr = IMediaControl_Stop(media_control); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -7040,9 +7040,9 @@ static void test_mediastreamfilter_end_of_stream(void) graph.got_notify = 0; hr = IMediaStreamFilter_EndOfStream(filter); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IMediaStreamFilter_EndOfStream(filter); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); ok(graph.got_notify == 0, "Got %d calls to IMediaEventSink::Notify().\n", graph.got_notify); @@ -7054,7 +7054,7 @@ static void test_mediastreamfilter_end_of_stream(void) hr = IMediaControl_Run(media_control); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(graph.got_notify == 1, "Got %d calls to IMediaEventSink::Notify().\n", graph.got_notify); + ok(graph.got_notify == 1, "Got %d calls to IMediaEventSink::Notify().\n", graph.got_notify); hr = IMediaControl_Stop(media_control); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -7066,7 +7066,7 @@ static void test_mediastreamfilter_end_of_stream(void) graph.got_notify = 0; hr = IMediaStreamFilter_EndOfStream(filter); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IAMMultiMediaStream_SetState(mmstream, STREAMSTATE_STOP); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -7074,7 +7074,7 @@ static void test_mediastreamfilter_end_of_stream(void) ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IMediaStreamFilter_EndOfStream(filter); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); ok(graph.got_notify == 0, "Got %d calls to IMediaEventSink::Notify().\n", graph.got_notify); @@ -7088,7 +7088,7 @@ static void test_mediastreamfilter_end_of_stream(void) graph.got_notify = 0; hr = IMediaStreamFilter_EndOfStream(filter); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IMediaControl_Pause(media_control); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -7096,29 +7096,29 @@ static void test_mediastreamfilter_end_of_stream(void) ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IMediaStreamFilter_EndOfStream(filter); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(graph.got_notify == 1, "Got %d calls to IMediaEventSink::Notify().\n", graph.got_notify); + ok(graph.got_notify == 1, "Got %d calls to IMediaEventSink::Notify().\n", graph.got_notify); hr = IMediaControl_Stop(media_control); ok(hr == S_OK, "Got hr %#x.\n", hr); /* EndOfStream count is not reset when Stop() is called on an already stopped filter. */ hr = IMediaStreamFilter_EndOfStream(filter); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IMediaStreamFilter_Stop(filter); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IMediaStreamFilter_EndOfStream(filter); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); graph.got_notify = 0; hr = IAMMultiMediaStream_SetState(mmstream, STREAMSTATE_RUN); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(graph.got_notify == 1, "Got %d calls to IMediaEventSink::Notify().\n", graph.got_notify); + ok(graph.got_notify == 1, "Got %d calls to IMediaEventSink::Notify().\n", graph.got_notify); hr = IAMMultiMediaStream_SetState(mmstream, STREAMSTATE_STOP); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -7130,12 +7130,12 @@ static void test_mediastreamfilter_end_of_stream(void) graph.got_notify = 0; hr = IMediaStreamFilter_EndOfStream(filter); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IMediaStreamFilter_Flush(filter, TRUE); hr = IMediaStreamFilter_EndOfStream(filter); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); ok(graph.got_notify == 0, "Got %d calls to IMediaEventSink::Notify().\n", graph.got_notify); @@ -7149,19 +7149,19 @@ static void test_mediastreamfilter_end_of_stream(void) graph.got_notify = 0; hr = IMediaStreamFilter_EndOfStream(filter); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IMediaStreamFilter_EndOfStream(filter); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(graph.got_notify == 1, "Got %d calls to IMediaEventSink::Notify().\n", graph.got_notify); + ok(graph.got_notify == 1, "Got %d calls to IMediaEventSink::Notify().\n", graph.got_notify); hr = IMediaStreamFilter_Flush(filter, TRUE); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IMediaStreamFilter_EndOfStream(filter); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(graph.got_notify == 2, "Got %d calls to IMediaEventSink::Notify().\n", graph.got_notify); + ok(graph.got_notify == 2, "Got %d calls to IMediaEventSink::Notify().\n", graph.got_notify); hr = IAMMultiMediaStream_SetState(mmstream, STREAMSTATE_STOP); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -7176,16 +7176,16 @@ static void test_mediastreamfilter_end_of_stream(void) ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IMediaStreamFilter_EndOfStream(filter); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IMediaStreamFilter_EndOfStream(filter); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); ok(graph.got_notify == 0, "Got %d calls to IMediaEventSink::Notify().\n", graph.got_notify); hr = IMediaStreamFilter_EndOfStream(filter); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(graph.got_notify == 1, "Got %d calls to IMediaEventSink::Notify().\n", graph.got_notify); + ok(graph.got_notify == 1, "Got %d calls to IMediaEventSink::Notify().\n", graph.got_notify); hr = IAMMultiMediaStream_SetState(mmstream, STREAMSTATE_STOP); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -7197,14 +7197,14 @@ static void test_mediastreamfilter_end_of_stream(void) graph.got_notify = 0; hr = IMediaStreamFilter_EndOfStream(filter); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IMediaStreamFilter_Flush(filter, FALSE); hr = IMediaStreamFilter_EndOfStream(filter); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(graph.got_notify == 1, "Got %d calls to IMediaEventSink::Notify().\n", graph.got_notify); + ok(graph.got_notify == 1, "Got %d calls to IMediaEventSink::Notify().\n", graph.got_notify); hr = IAMMultiMediaStream_SetState(mmstream, STREAMSTATE_STOP); ok(hr == S_OK, "Got hr %#x.\n", hr); -- 2.25.1

3 2

[PATCH] winegstreamer: Add missing RGB16 format to wg_video_format_from_gst.
by Anton Baskanov April 12, 2021

April 12, 2021

Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> --- dlls/winegstreamer/wg_parser.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index e0eff9ee309..5529321490e 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -192,6 +192,8 @@ static enum wg_video_format wg_video_format_from_gst(GstVideoFormat format) return WG_VIDEO_FORMAT_BGR; case GST_VIDEO_FORMAT_RGB15: return WG_VIDEO_FORMAT_RGB15; + case GST_VIDEO_FORMAT_RGB16: + return WG_VIDEO_FORMAT_RGB16; case GST_VIDEO_FORMAT_AYUV: return WG_VIDEO_FORMAT_AYUV; case GST_VIDEO_FORMAT_I420: -- 2.25.1

2 1