wine-devel August 2021

wine-devel@winehq.org

78 participants
929 discussions

[PATCH 1/4] msvcrt/tests: Add test for fopen sequential access hint
by Luke Deller 02 Aug '21

02 Aug '21

Test that adding "S" to the fopen mode results in the underlying file handle having the sequential access hint set. Signed-off-by: Luke Deller <luke(a)deller.id.au> --- dlls/msvcrt/tests/file.c | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index fb242d81282..d02087be46c 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -35,6 +35,7 @@ #include <process.h> #include <errno.h> #include <locale.h> +#include <winternl.h> #define MSVCRT_FD_BLOCK_SIZE 32 typedef struct { @@ -2731,6 +2732,39 @@ static void test_lseek(void) DeleteFileA("_creat.tst"); } +static void test_fopen_hints(void) +{ + char *tempf; + FILE *fp; + HANDLE handle; + FILE_MODE_INFORMATION mode_info; + IO_STATUS_BLOCK io; + NTSTATUS status; + + /* create a test file */ + tempf = _tempnam(".","wne"); + fp = fopen(tempf, "wb"); + ok(fp != NULL, "unable to create test file\n"); + fwrite("abc\n", 1, 4, fp); + fclose(fp); + + /* open test file with sequential access hint */ + fp = fopen(tempf, "rbS"); + ok(fp != NULL, "unable to open test file with sequential access hint\n"); + + /* check that sequential access hint is set on underlying file handle */ + handle = (HANDLE)_get_osfhandle(_fileno(fp)); + status = NtQueryInformationFile(handle, &io, &mode_info, sizeof(mode_info), + FileModeInformation); + ok(!status, "NtQueryInformationFile failed\n"); + ok(mode_info.Mode & FILE_SEQUENTIAL_ONLY, "handle missing hint\n"); + + /* clean up */ + fclose(fp); + unlink(tempf); + free(tempf); +} + START_TEST(file) { int arg_c; @@ -2803,6 +2837,7 @@ START_TEST(file) test_close(); test__creat(); test_lseek(); + test_fopen_hints(); /* Wait for the (_P_NOWAIT) spawned processes to finish to make sure the report * file contains lines in the correct order -- 2.25.1

2 5

[PATCH vkd3d 1/7] vkd3d: Resolve D3D12_DESCRIPTOR_RANGE_OFFSET_APPEND during table parsing.
by Conor McCarthy 02 Aug '21

02 Aug '21

Simplifies the code path for handling array bindings and unbounded ranges. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- libs/vkd3d/command.c | 6 +----- libs/vkd3d/state.c | 26 +++++++++++++++++++++----- 2 files changed, 22 insertions(+), 10 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 7150c59b..8bed7303 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -2674,7 +2674,6 @@ static void d3d12_command_list_update_descriptor_table(struct d3d12_command_list descriptor_table = root_signature_get_descriptor_table(root_signature, index); - descriptor = base_descriptor; descriptor_count = 0; current_descriptor_write = descriptor_writes; current_image_info = image_infos; @@ -2682,10 +2681,7 @@ static void d3d12_command_list_update_descriptor_table(struct d3d12_command_list { range = &descriptor_table->ranges[i]; - if (range->offset != D3D12_DESCRIPTOR_RANGE_OFFSET_APPEND) - { - descriptor = base_descriptor + range->offset; - } + descriptor = base_descriptor + range->offset; for (j = 0; j < range->descriptor_count; ++j, ++descriptor) { diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index a381679e..d62cb9a0 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -591,6 +591,8 @@ static HRESULT d3d12_root_signature_init_root_descriptor_tables(struct d3d12_roo for (i = 0; i < desc->NumParameters; ++i) { const D3D12_ROOT_PARAMETER *p = &desc->pParameters[i]; + unsigned int offset = 0; + if (p->ParameterType != D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE) continue; @@ -604,6 +606,25 @@ static HRESULT d3d12_root_signature_init_root_descriptor_tables(struct d3d12_roo if (!(table->ranges = vkd3d_calloc(table->range_count, sizeof(*table->ranges)))) return E_OUTOFMEMORY; + for (j = 0; j < range_count; ++j) + { + range = &p->u.DescriptorTable.pDescriptorRanges[j]; + + if (range->OffsetInDescriptorsFromTableStart != D3D12_DESCRIPTOR_RANGE_OFFSET_APPEND) + offset = range->OffsetInDescriptorsFromTableStart; + + table->ranges[j].offset = offset; + table->ranges[j].descriptor_count = range->NumDescriptors; + table->ranges[j].descriptor_magic = vkd3d_descriptor_magic_from_d3d12(range->RangeType); + table->ranges[j].register_space = range->RegisterSpace; + table->ranges[j].base_register_idx = range->BaseShaderRegister; + + TRACE("Descriptor table %u, range %u, offset %u, type %#x, count %u.\n", i, j, + offset, range->RangeType, range->NumDescriptors); + + offset += range->NumDescriptors; + } + for (j = 0; j < range_count; ++j) { range = &p->u.DescriptorTable.pDescriptorRanges[j]; @@ -638,12 +659,7 @@ static HRESULT d3d12_root_signature_init_root_descriptor_tables(struct d3d12_roo ++cur_binding; } - table->ranges[j].offset = range->OffsetInDescriptorsFromTableStart; - table->ranges[j].descriptor_count = range->NumDescriptors; table->ranges[j].binding = vk_binding; - table->ranges[j].descriptor_magic = vkd3d_descriptor_magic_from_d3d12(range->RangeType); - table->ranges[j].register_space = range->RegisterSpace; - table->ranges[j].base_register_idx = range->BaseShaderRegister; } } -- 2.32.0

3 14

[PATCH v13 1/4] winevulkan: Support use of extensions which mustn't be exposed.
by Derek Lesho 02 Aug '21

02 Aug '21

Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> --- dlls/winevulkan/make_vulkan | 35 ++++++++++++++++++++++++----------- 1 file changed, 24 insertions(+), 11 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index e8534cbd5f5..c46ef02dcb9 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -124,6 +124,11 @@ UNSUPPORTED_EXTENSIONS = [ "VK_NV_external_memory_win32", ] +# Either internal extensions which aren't present on the win32 platform which +# winevulkan may nonetheless use, or extensions we want to generate headers for +# but not expose to applications (useful for test commits) +UNEXPOSED_EXTENSIONS = {} + # The Vulkan loader provides entry-points for core functionality and important # extensions. Based on vulkan-1.def this amounts to WSI extensions on 1.0.51. CORE_EXTENSIONS = [ @@ -513,8 +518,8 @@ class VkEnumValue(object): class VkFunction(object): - def __init__(self, _type=None, name=None, params=[], extensions=[], alias=None): - self.extensions = [] + def __init__(self, _type=None, name=None, params=[], alias=None): + self.extensions = set() self.name = name self.type = _type self.params = params @@ -657,6 +662,10 @@ class VkFunction(object): def needs_private_thunk(self): return self.thunk_type == ThunkType.PRIVATE + def needs_exposing(self): + # The function needs exposed if at-least one extension isn't both UNSUPPORTED and UNEXPOSED + return self.is_required() and (not self.extensions or not self.extensions.issubset(UNEXPOSED_EXTENSIONS)) + def pfn(self, prefix="p", call_conv=None, conv=False): """ Create function pointer. """ @@ -2682,7 +2691,7 @@ class VkGenerator(object): # Create thunks for instance and device functions. # Global functions don't go through the thunks. for vk_func in self.registry.funcs.values(): - if not vk_func.is_required(): + if not vk_func.needs_exposing(): continue if vk_func.is_global_func(): @@ -2702,6 +2711,8 @@ class VkGenerator(object): for ext in self.registry.extensions: if ext["type"] != "device": continue + if ext["name"] in UNEXPOSED_EXTENSIONS: + continue f.write(" \"{0}\",\n".format(ext["name"])) f.write("};\n\n") @@ -2711,6 +2722,8 @@ class VkGenerator(object): for ext in self.registry.extensions: if ext["type"] != "instance": continue + if ext["name"] in UNEXPOSED_EXTENSIONS: + continue f.write(" \"{0}\",\n".format(ext["name"])) f.write("};\n\n") @@ -2770,7 +2783,7 @@ class VkGenerator(object): f.write("const struct unix_funcs loader_funcs =\n") f.write("{\n") for vk_func in self.registry.funcs.values(): - if not vk_func.is_required(): + if not vk_func.needs_exposing(): continue if vk_func.loader_thunk_type == ThunkType.NONE: continue @@ -2789,7 +2802,7 @@ class VkGenerator(object): # Generate prototypes for device and instance functions requiring a custom implementation. f.write("/* Functions for which we have custom implementations outside of the thunks. */\n") for vk_func in self.registry.funcs.values(): - if not vk_func.is_required(): + if not vk_func.needs_exposing(): continue if vk_func.needs_thunk() and not vk_func.needs_private_thunk(): continue @@ -2888,7 +2901,7 @@ class VkGenerator(object): f.write("WINE_DEFAULT_DEBUG_CHANNEL(vulkan);\n\n") for vk_func in self.registry.funcs.values(): - if not vk_func.is_required(): + if not vk_func.needs_exposing(): continue if vk_func.loader_thunk_type != ThunkType.PUBLIC: continue @@ -2897,7 +2910,7 @@ class VkGenerator(object): f.write("static const struct vulkan_func vk_device_dispatch_table[] =\n{\n") for vk_func in self.registry.device_funcs: - if not vk_func.is_required(): + if not vk_func.needs_exposing(): continue f.write(" {{\"{0}\", &{0}}},\n".format(vk_func.name)) @@ -2905,7 +2918,7 @@ class VkGenerator(object): f.write("static const struct vulkan_func vk_phys_dev_dispatch_table[] =\n{\n") for vk_func in self.registry.phys_dev_funcs: - if not vk_func.is_required(): + if not vk_func.needs_exposing(): continue f.write(" {{\"{0}\", &{0}}},\n".format(vk_func.name)) @@ -2913,7 +2926,7 @@ class VkGenerator(object): f.write("static const struct vulkan_func vk_instance_dispatch_table[] =\n{\n") for vk_func in self.registry.instance_funcs: - if not vk_func.is_required(): + if not vk_func.needs_exposing(): continue f.write(" {{\"{0}\", &{0}}},\n".format(vk_func.name)) @@ -2970,7 +2983,7 @@ class VkGenerator(object): f.write("struct unix_funcs\n") f.write("{\n") for vk_func in self.registry.funcs.values(): - if not vk_func.is_required(): + if not vk_func.needs_exposing(): continue if vk_func.loader_thunk_type == ThunkType.NONE: continue @@ -3464,7 +3477,7 @@ class VkRegistry(object): # the XML file to handle this, but because of the manner in which we parse the XML # file we pre-populate from <commands> before we check if a command is enabled. if cmd_name in self.funcs: - self.funcs[cmd_name].extensions.append(ext_name) + self.funcs[cmd_name].extensions.add(ext_name) # Some extensions are not ready or have numbers reserved as a place holder. if ext.attrib["supported"] == "disabled": -- 2.32.0

2 7

[PATCH] include: Add IMFVideoProcessorControl3 definition.
by Nikolay Sivov 02 Aug '21

02 Aug '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- include/mfidl.idl | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/include/mfidl.idl b/include/mfidl.idl index 5b16c08bb90..62e0ca3025a 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -1231,6 +1231,48 @@ interface IMFVideoProcessorControl2 : IMFVideoProcessorControl ); } +typedef enum _MFVideoSphericalFormat +{ + MFVideoSphericalFormat_Unsupported, + MFVideoSphericalFormat_Equirectangular, +} MFVideoSphericalFormat; + +typedef enum MFVideoSphericalProjectionMode +{ + MFVideoSphericalProjectionMode_Spherical, + MFVideoSphericalProjectionMode_Flat, +} MFVideoSphericalProjectionMode; + +[ + object, + uuid(2424b3f2-eb23-40f1-91aa-74bddeea0883), + local +] +interface IMFVideoProcessorControl3 : IMFVideoProcessorControl2 +{ + HRESULT GetNaturalOutputType( + [out] IMFMediaType **media_type + ); + + HRESULT EnableSphericalVideoProcessing( + [in] BOOL enable, + [in] MFVideoSphericalFormat format, + [in] MFVideoSphericalProjectionMode projection_mode + ); + + HRESULT SetSphericalVideoProperties( + [in] float x, + [in] float y, + [in] float z, + [in] float w, + [in] float fov + ); + + HRESULT SetOutputDevice( + [in] IUnknown *output_device + ); +} + [ object, uuid(2347d60b-3fb5-480c-8803-8df3adcd3ef0), -- 2.30.2

1 0

[PATCH] evr: Added MFIsFormatYUV().
by Nikolay Sivov 02 Aug '21

02 Aug '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/evr/evr.spec | 2 +- dlls/evr/main.c | 26 ++++++++++++++++++++++++++ dlls/evr/tests/evr.c | 42 ++++++++++++++++++++++++++++++++++++++++++ include/mfapi.h | 1 + 4 files changed, 70 insertions(+), 1 deletion(-) diff --git a/dlls/evr/evr.spec b/dlls/evr/evr.spec index 8aea0a607a8..fd96781e903 100644 --- a/dlls/evr/evr.spec +++ b/dlls/evr/evr.spec @@ -25,4 +25,4 @@ @ stub MFGetUncompressedVideoFormat @ stub MFInitVideoFormat @ stdcall -import MFInitVideoFormat_RGB(ptr long long long) -@ stub MFIsFormatYUV +@ stdcall MFIsFormatYUV(long) diff --git a/dlls/evr/main.c b/dlls/evr/main.c index e843f15c04f..b5bab74c4f6 100644 --- a/dlls/evr/main.c +++ b/dlls/evr/main.c @@ -25,6 +25,7 @@ #include "ole2.h" #include "rpcproxy.h" +#include "d3d9.h" #include "evr_private.h" @@ -206,3 +207,28 @@ HRESULT WINAPI MFCreateVideoMixerAndPresenter(IUnknown *mixer_outer, IUnknown *p return hr; } + +/*********************************************************************** + * MFIsFormatYUV (evr.@) + */ +BOOL WINAPI MFIsFormatYUV(DWORD format) +{ + TRACE("%s.\n", debugstr_an((char *)&format, 4)); + + switch (format) + { + case D3DFMT_UYVY: + case D3DFMT_YUY2: + case MAKEFOURCC('A','Y','U','V'): + case MAKEFOURCC('I','M','C','1'): + case MAKEFOURCC('I','M','C','2'): + case MAKEFOURCC('Y','V','1','2'): + case MAKEFOURCC('N','V','1','1'): + case MAKEFOURCC('N','V','1','2'): + case MAKEFOURCC('Y','2','1','0'): + case MAKEFOURCC('Y','2','1','6'): + return TRUE; + default: + return FALSE; + } +} diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index d240ebe4456..01edda7bc9b 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -2722,6 +2722,47 @@ done: DestroyWindow(window); } +static void test_MFIsFormatYUV(void) +{ + static const DWORD formats[] = + { + D3DFMT_UYVY, + D3DFMT_YUY2, + MAKEFOURCC('A','Y','U','V'), + MAKEFOURCC('I','M','C','1'), + MAKEFOURCC('I','M','C','2'), + MAKEFOURCC('Y','V','1','2'), + MAKEFOURCC('N','V','1','1'), + MAKEFOURCC('N','V','1','2'), + MAKEFOURCC('Y','2','1','0'), + MAKEFOURCC('Y','2','1','6'), + }; + static const DWORD unsupported_formats[] = + { + D3DFMT_A8R8G8B8, + MAKEFOURCC('I','Y','U','V'), + MAKEFOURCC('I','4','2','0'), + MAKEFOURCC('Y','V','Y','U'), + MAKEFOURCC('Y','V','U','9'), + MAKEFOURCC('Y','4','1','0'), + MAKEFOURCC('Y','4','1','6'), + }; + unsigned int i; + BOOL ret; + + for (i = 0; i < ARRAY_SIZE(formats); ++i) + { + ret = MFIsFormatYUV(formats[i]); + ok(ret, "Unexpected ret %d, format %s.\n", ret, debugstr_an((char *)&formats[i], 4)); + } + + for (i = 0; i < ARRAY_SIZE(unsupported_formats); ++i) + { + ret = MFIsFormatYUV(unsupported_formats[i]); + ok(!ret, "Unexpected ret %d, format %s.\n", ret, debugstr_an((char *)&unsupported_formats[i], 4)); + } +} + START_TEST(evr) { CoInitialize(NULL); @@ -2746,6 +2787,7 @@ START_TEST(evr) test_mixer_output_rectangle(); test_mixer_zorder(); test_mixer_samples(); + test_MFIsFormatYUV(); CoUninitialize(); } diff --git a/include/mfapi.h b/include/mfapi.h index 382210ad9e2..bcb5d26121e 100644 --- a/include/mfapi.h +++ b/include/mfapi.h @@ -558,6 +558,7 @@ HRESULT WINAPI MFTEnum2(GUID category, UINT32 flags, const MFT_REGISTER_TYPE_INF HRESULT WINAPI MFTEnumEx(GUID category, UINT32 flags, const MFT_REGISTER_TYPE_INFO *input_type, const MFT_REGISTER_TYPE_INFO *output_type, IMFActivate ***activate, UINT32 *pcount); +BOOL WINAPI MFIsFormatYUV(DWORD format); HRESULT WINAPI MFInitAttributesFromBlob(IMFAttributes *attributes, const UINT8 *buffer, UINT size); HRESULT WINAPI MFInitMediaTypeFromWaveFormatEx(IMFMediaType *mediatype, const WAVEFORMATEX *format, UINT32 size); HRESULT WINAPI MFInitVideoFormat_RGB(MFVIDEOFORMAT *format, DWORD width, DWORD height, DWORD d3dformat); -- 2.30.2

1 0

[PATCH 8/8] gdi32: Store brush origin in DC_ATTR.
by Jacek Caban 02 Aug '21

02 Aug '21

2 1

[PATCH 7/8] gdi32: Store window extent in DC_ATTR.
by Jacek Caban 02 Aug '21

02 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/clipping.c | 4 ++-- dlls/gdi32/dc.c | 24 +++++---------------- dlls/gdi32/font.c | 3 ++- dlls/gdi32/gdidc.c | 11 ++++++++++ dlls/gdi32/mapping.c | 44 +++++++++++++++++++------------------- dlls/gdi32/ntgdi_private.h | 1 - include/ntgdi.h | 1 + 7 files changed, 43 insertions(+), 45 deletions(-)

2 1

[PATCH 6/8] gdi32: Store window origin in DC_ATTR.
by Jacek Caban 02 Aug '21

02 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/dc.c | 24 +++++------------------- dlls/gdi32/gdidc.c | 11 +++++++++++ dlls/gdi32/mapping.c | 12 ++++++------ dlls/gdi32/ntgdi_private.h | 1 - include/ntgdi.h | 1 + 5 files changed, 23 insertions(+), 26 deletions(-)

2 1

[PATCH 5/8] gdi32: Store viewport origin in DC_ATTR.
by Jacek Caban 02 Aug '21

02 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/dc.c | 24 +++++------------------- dlls/gdi32/gdidc.c | 11 +++++++++++ dlls/gdi32/mapping.c | 13 ++++++------- dlls/gdi32/ntgdi_private.h | 1 - dlls/gdi32/tests/metafile.c | 2 +- include/ntgdi.h | 1 + 6 files changed, 24 insertions(+), 28 deletions(-)

2 1

[PATCH 3/8] gdi32: Store vis_rect in DC_ATTR.
by Jacek Caban 02 Aug '21

02 Aug '21

2 1

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel August 2021