April 2020 - Wine-Commits - list.winehq.org

Gabriel Ivăncescu : qedit: Implement IMediaDet::get_StreamLength().
by Alexandre Julliard April 27, 2020

April 27, 2020

Module: wine Branch: master Commit: 28ec2795186c7db83637b3b17e4fa95095ebb77d URL: https://source.winehq.org/git/wine.git/?a=commit;h=28ec2795186c7db83637b3b1… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Apr 27 14:14:05 2020 -0500 qedit: Implement IMediaDet::get_StreamLength(). Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/mediadet.c | 32 +++++++- dlls/qedit/tests/mediadet.c | 185 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 213 insertions(+), 4 deletions(-) diff --git a/dlls/qedit/mediadet.c b/dlls/qedit/mediadet.c index 5a19268985..d32679b6bb 100644 --- a/dlls/qedit/mediadet.c +++ b/dlls/qedit/mediadet.c @@ -524,11 +524,35 @@ static HRESULT WINAPI MediaDet_get_StreamTypeB(IMediaDet *iface, BSTR *bstr) return hr; } -static HRESULT WINAPI MediaDet_get_StreamLength(IMediaDet* iface, double *pVal) +static HRESULT WINAPI MediaDet_get_StreamLength(IMediaDet *iface, double *length) { - MediaDetImpl *This = impl_from_IMediaDet(iface); - FIXME("(%p): stub!\n", This); - return VFW_E_INVALIDMEDIATYPE; + MediaDetImpl *detector = impl_from_IMediaDet(iface); + IMediaSeeking *seeking; + HRESULT hr; + + TRACE("detector %p, length %p.\n", detector, length); + + if (!length) + return E_POINTER; + + if (!detector->cur_pin) + return E_INVALIDARG; + + if (SUCCEEDED(hr = IPin_QueryInterface(detector->cur_pin, + &IID_IMediaSeeking, (void **)&seeking))) + { + LONGLONG duration; + + if (SUCCEEDED(hr = IMediaSeeking_GetDuration(seeking, &duration))) + { + /* Windows assumes the time format is TIME_FORMAT_MEDIA_TIME + and does not check it nor convert it, as tests show. */ + *length = (REFTIME)duration / 10000000; + } + IMediaSeeking_Release(seeking); + } + + return hr; } static HRESULT WINAPI MediaDet_get_Filename(IMediaDet* iface, BSTR *pVal) diff --git a/dlls/qedit/tests/mediadet.c b/dlls/qedit/tests/mediadet.c index 32861476dd..9bf6c43a2a 100644 --- a/dlls/qedit/tests/mediadet.c +++ b/dlls/qedit/tests/mediadet.c @@ -135,6 +135,7 @@ struct testfilter { struct strmbase_filter filter; struct strmbase_source source; + IMediaSeeking IMediaSeeking_iface; }; static inline struct testfilter *impl_from_strmbase_filter(struct strmbase_filter *iface) @@ -163,6 +164,11 @@ static const struct strmbase_filter_ops testfilter_ops = .filter_destroy = testfilter_destroy, }; +static inline struct testfilter *impl_from_strmbase_pin(struct strmbase_pin *iface) +{ + return CONTAINING_RECORD(iface, struct testfilter, source.pin); +} + static HRESULT testsource_get_media_type(struct strmbase_pin *iface, unsigned int index, AM_MEDIA_TYPE *mt) { static const VIDEOINFOHEADER source_format = @@ -192,6 +198,19 @@ static HRESULT testsource_get_media_type(struct strmbase_pin *iface, unsigned in return S_OK; } +static HRESULT testsource_query_interface(struct strmbase_pin *iface, REFIID iid, void **out) +{ + struct testfilter *filter = impl_from_strmbase_pin(iface); + + if (IsEqualGUID(iid, &IID_IMediaSeeking)) + *out = &filter->IMediaSeeking_iface; + else + return E_NOINTERFACE; + + IUnknown_AddRef((IUnknown*)*out); + return S_OK; +} + static HRESULT WINAPI testsource_DecideAllocator(struct strmbase_source *iface, IMemInputPin *peer, IMemAllocator **allocator) { @@ -201,10 +220,164 @@ static HRESULT WINAPI testsource_DecideAllocator(struct strmbase_source *iface, static const struct strmbase_source_ops testsource_ops = { .base.pin_get_media_type = testsource_get_media_type, + .base.pin_query_interface = testsource_query_interface, .pfnAttemptConnection = BaseOutputPinImpl_AttemptConnection, .pfnDecideAllocator = testsource_DecideAllocator, }; +static inline struct testfilter *impl_from_IMediaSeeking(IMediaSeeking *iface) +{ + return CONTAINING_RECORD(iface, struct testfilter, IMediaSeeking_iface); +} + +static HRESULT WINAPI testseek_QueryInterface(IMediaSeeking *iface, REFIID iid, void **out) +{ + struct testfilter *filter = impl_from_IMediaSeeking(iface); + return IPin_QueryInterface(&filter->source.pin.IPin_iface, iid, out); +} + +static ULONG WINAPI testseek_AddRef(IMediaSeeking *iface) +{ + struct testfilter *filter = impl_from_IMediaSeeking(iface); + return IPin_AddRef(&filter->source.pin.IPin_iface); +} + +static ULONG WINAPI testseek_Release(IMediaSeeking *iface) +{ + struct testfilter *filter = impl_from_IMediaSeeking(iface); + return IPin_Release(&filter->source.pin.IPin_iface); +} + +static HRESULT WINAPI testseek_GetCapabilities(IMediaSeeking *iface, DWORD *caps) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI testseek_CheckCapabilities(IMediaSeeking *iface, DWORD *caps) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI testseek_IsFormatSupported(IMediaSeeking *iface, const GUID *format) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI testseek_QueryPreferredFormat(IMediaSeeking *iface, GUID *format) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI testseek_GetTimeFormat(IMediaSeeking *iface, GUID *format) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI testseek_IsUsingTimeFormat(IMediaSeeking *iface, const GUID *format) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI testseek_SetTimeFormat(IMediaSeeking *iface, const GUID *format) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI testseek_GetDuration(IMediaSeeking *iface, LONGLONG *duration) +{ + if (winetest_debug > 1) trace("IMediaSeeking_GetDuration()\n"); + + *duration = 42000000; + return S_OK; +} + +static HRESULT WINAPI testseek_GetStopPosition(IMediaSeeking *iface, LONGLONG *stop) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI testseek_GetCurrentPosition(IMediaSeeking *iface, LONGLONG *current) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI testseek_ConvertTimeFormat(IMediaSeeking *iface, LONGLONG *target, + const GUID *target_format, LONGLONG source, const GUID *source_format) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI testseek_SetPositions(IMediaSeeking *iface, LONGLONG *current, + DWORD current_flags, LONGLONG *stop, DWORD stop_flags) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI testseek_GetPositions(IMediaSeeking *iface, LONGLONG *current, LONGLONG *stop) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI testseek_GetAvailable(IMediaSeeking *iface, LONGLONG *earliest, LONGLONG *latest) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI testseek_SetRate(IMediaSeeking *iface, double rate) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI testseek_GetRate(IMediaSeeking *iface, double *rate) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI testseek_GetPreroll(IMediaSeeking *iface, LONGLONG *preroll) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static const IMediaSeekingVtbl testseek_vtbl = +{ + testseek_QueryInterface, + testseek_AddRef, + testseek_Release, + testseek_GetCapabilities, + testseek_CheckCapabilities, + testseek_IsFormatSupported, + testseek_QueryPreferredFormat, + testseek_GetTimeFormat, + testseek_IsUsingTimeFormat, + testseek_SetTimeFormat, + testseek_GetDuration, + testseek_GetStopPosition, + testseek_GetCurrentPosition, + testseek_ConvertTimeFormat, + testseek_SetPositions, + testseek_GetPositions, + testseek_GetAvailable, + testseek_SetRate, + testseek_GetRate, + testseek_GetPreroll +}; + static void testfilter_init(struct testfilter *filter) { static const GUID clsid = {0xabacab}; @@ -212,6 +385,7 @@ static void testfilter_init(struct testfilter *filter) memset(filter, 0, sizeof(*filter)); strmbase_filter_init(&filter->filter, NULL, &clsid, &testfilter_ops); strmbase_source_init(&filter->source, &filter->filter, L"", &testsource_ops); + filter->IMediaSeeking_iface.lpVtbl = &testseek_vtbl; } static WCHAR test_avi_filename[MAX_PATH]; @@ -571,6 +745,7 @@ static void test_put_filter(void) IMediaDet *detector; LONG index, count; AM_MEDIA_TYPE mt; + double duration; IUnknown *unk; BSTR filename; HRESULT hr; @@ -586,6 +761,12 @@ static void test_put_filter(void) hr = IMediaDet_get_Filter(detector, NULL); ok(hr == E_POINTER, "Got hr %#x.\n", hr); + hr = IMediaDet_get_StreamLength(detector, NULL); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); + + hr = IMediaDet_get_StreamLength(detector, &duration); + ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + testfilter_init(&testfilter); hr = IMediaDet_put_Filter(detector, &testfilter.filter.IUnknown_inner); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -639,6 +820,10 @@ static void test_put_filter(void) ok(hr == S_OK, "Got hr %#x.\n", hr); ok(!filename, "Got filename %s.\n", debugstr_w(filename)); + hr = IMediaDet_get_StreamLength(detector, &duration); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(duration == 4.2, "Got duration %.16e.\n", duration); + ref = IMediaDet_Release(detector); ok(!ref, "Got outstanding refcount %d.\n", ref); ref = IBaseFilter_Release(&testfilter2.filter.IBaseFilter_iface);

1 0

Alistair Leslie-Hughes : ddraw: Make palette and remaining surface vtbls writable.
by Alexandre Julliard April 27, 2020

April 27, 2020

Module: wine Branch: master Commit: 0b55384f0dc5382998bb2cc39c317d393ff7657a URL: https://source.winehq.org/git/wine.git/?a=commit;h=0b55384f0dc5382998bb2cc3… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Apr 26 22:58:28 2020 -0500 ddraw: Make palette and remaining surface vtbls writable. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46949 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/palette.c | 3 ++- dlls/ddraw/surface.c | 12 ++++++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/ddraw/palette.c b/dlls/ddraw/palette.c index 980c62b60b..68fb3a5320 100644 --- a/dlls/ddraw/palette.c +++ b/dlls/ddraw/palette.c @@ -215,7 +215,8 @@ static HRESULT WINAPI ddraw_palette_GetEntries(IDirectDrawPalette *iface, return hr; } -static const struct IDirectDrawPaletteVtbl ddraw_palette_vtbl = +/* Some windowed mode wrappers expect this vtbl to be writable. */ +static struct IDirectDrawPaletteVtbl ddraw_palette_vtbl = { /*** IUnknown ***/ ddraw_palette_QueryInterface, diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 4423083835..ba56fad964 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -5406,7 +5406,8 @@ static HRESULT WINAPI d3d_texture1_Load(IDirect3DTexture *iface, IDirect3DTextur * The VTable *****************************************************************************/ -static const struct IDirectDrawSurface7Vtbl ddraw_surface7_vtbl = +/* Some windowed mode wrappers expect this vtbl to be writable. */ +static struct IDirectDrawSurface7Vtbl ddraw_surface7_vtbl = { /* IUnknown */ ddraw_surface7_QueryInterface, @@ -5465,7 +5466,8 @@ static const struct IDirectDrawSurface7Vtbl ddraw_surface7_vtbl = ddraw_surface7_GetLOD, }; -static const struct IDirectDrawSurface4Vtbl ddraw_surface4_vtbl = +/* Some windowed mode wrappers expect this vtbl to be writable. */ +static struct IDirectDrawSurface4Vtbl ddraw_surface4_vtbl = { /* IUnknown */ ddraw_surface4_QueryInterface, @@ -5519,7 +5521,8 @@ static const struct IDirectDrawSurface4Vtbl ddraw_surface4_vtbl = ddraw_surface4_ChangeUniquenessValue, }; -static const struct IDirectDrawSurface3Vtbl ddraw_surface3_vtbl = +/* Some windowed mode wrappers expect this vtbl to be writable. */ +static struct IDirectDrawSurface3Vtbl ddraw_surface3_vtbl = { /* IUnknown */ ddraw_surface3_QueryInterface, @@ -5567,7 +5570,8 @@ static const struct IDirectDrawSurface3Vtbl ddraw_surface3_vtbl = ddraw_surface3_SetSurfaceDesc, }; -static const struct IDirectDrawSurface2Vtbl ddraw_surface2_vtbl = +/* Some windowed mode wrappers expect this vtbl to be writable. */ +static struct IDirectDrawSurface2Vtbl ddraw_surface2_vtbl = { /* IUnknown */ ddraw_surface2_QueryInterface,

1 0

Liam Middlebrook : winevulkan: Update to VK spec version spec 1.2.139.
by Alexandre Julliard April 27, 2020

April 27, 2020

Module: wine Branch: master Commit: c4e35b9bce04c1cef0cc1ba2df52168a610da984 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c4e35b9bce04c1cef0cc1ba2… Author: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Date: Mon Apr 27 08:05:20 2020 -0700 winevulkan: Update to VK spec version spec 1.2.139. Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Daniel Koch <dkoch(a)nvidia.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 2 +- dlls/winevulkan/vulkan_thunks.c | 20 ++++++++++++++++++++ dlls/winevulkan/winevulkan.json | 2 +- include/wine/vulkan.h | 27 ++++++++++++++++++++++++++- 4 files changed, 48 insertions(+), 3 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 9cc5335c5d..5d9889620e 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -64,7 +64,7 @@ from enum import Enum LOGGER = logging.Logger("vulkan") LOGGER.addHandler(logging.StreamHandler()) -VK_XML_VERSION = "1.2.138" +VK_XML_VERSION = "1.2.139" WINE_VK_VERSION = (1, 2) # Filenames to create. diff --git a/dlls/winevulkan/vulkan_thunks.c b/dlls/winevulkan/vulkan_thunks.c index c5645f7db8..b36740a28e 100644 --- a/dlls/winevulkan/vulkan_thunks.c +++ b/dlls/winevulkan/vulkan_thunks.c @@ -2674,6 +2674,24 @@ VkResult convert_VkDeviceCreateInfo_struct_chain(const void *pNext, VkDeviceCrea break; } + case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ROBUSTNESS_2_FEATURES_EXT: + { + const VkPhysicalDeviceRobustness2FeaturesEXT *in = (const VkPhysicalDeviceRobustness2FeaturesEXT *)in_header; + VkPhysicalDeviceRobustness2FeaturesEXT *out; + + if (!(out = heap_alloc(sizeof(*out)))) goto out_of_memory; + + out->sType = in->sType; + out->pNext = NULL; + out->robustBufferAccess2 = in->robustBufferAccess2; + out->robustImageAccess2 = in->robustImageAccess2; + out->nullDescriptor = in->nullDescriptor; + + out_header->pNext = (VkBaseOutStructure *)out; + out_header = out_header->pNext; + break; + } + default: FIXME("Application requested a linked structure of type %u.\n", in_header->sType); } @@ -5614,6 +5632,7 @@ static const char * const vk_device_extensions[] = "VK_EXT_pipeline_creation_cache_control", "VK_EXT_post_depth_coverage", "VK_EXT_queue_family_foreign", + "VK_EXT_robustness2", "VK_EXT_sample_locations", "VK_EXT_sampler_filter_minmax", "VK_EXT_scalar_block_layout", @@ -5709,6 +5728,7 @@ static const char * const vk_device_extensions[] = "VK_NV_shading_rate_image", "VK_NV_viewport_array2", "VK_NV_viewport_swizzle", + "VK_QCOM_render_pass_shader_resolve", "VK_QCOM_render_pass_store_ops", "VK_QCOM_render_pass_transform", }; diff --git a/dlls/winevulkan/winevulkan.json b/dlls/winevulkan/winevulkan.json index 5137b2e13c..f6a320d917 100644 --- a/dlls/winevulkan/winevulkan.json +++ b/dlls/winevulkan/winevulkan.json @@ -2,6 +2,6 @@ "file_format_version": "1.0.0", "ICD": { "library_path": ".\\winevulkan.dll", - "api_version": "1.2.138" + "api_version": "1.2.139" } } diff --git a/include/wine/vulkan.h b/include/wine/vulkan.h index 40dbc16839..913acf9c80 100644 --- a/include/wine/vulkan.h +++ b/include/wine/vulkan.h @@ -265,6 +265,8 @@ #define VK_KHR_DRAW_INDIRECT_COUNT_EXTENSION_NAME "VK_KHR_draw_indirect_count" #define VK_EXT_FILTER_CUBIC_SPEC_VERSION 3 #define VK_EXT_FILTER_CUBIC_EXTENSION_NAME "VK_EXT_filter_cubic" +#define VK_QCOM_RENDER_PASS_SHADER_RESOLVE_SPEC_VERSION 4 +#define VK_QCOM_RENDER_PASS_SHADER_RESOLVE_EXTENSION_NAME "VK_QCOM_render_pass_shader_resolve" #define VK_EXT_GLOBAL_PRIORITY_SPEC_VERSION 2 #define VK_EXT_GLOBAL_PRIORITY_EXTENSION_NAME "VK_EXT_global_priority" #define VK_KHR_SHADER_SUBGROUP_EXTENDED_TYPES_SPEC_VERSION 1 @@ -379,6 +381,8 @@ #define VK_EXT_TEXEL_BUFFER_ALIGNMENT_EXTENSION_NAME "VK_EXT_texel_buffer_alignment" #define VK_QCOM_RENDER_PASS_TRANSFORM_SPEC_VERSION 1 #define VK_QCOM_RENDER_PASS_TRANSFORM_EXTENSION_NAME "VK_QCOM_render_pass_transform" +#define VK_EXT_ROBUSTNESS_2_SPEC_VERSION 1 +#define VK_EXT_ROBUSTNESS_2_EXTENSION_NAME "VK_EXT_robustness2" #define VK_GOOGLE_USER_TYPE_SPEC_VERSION 1 #define VK_GOOGLE_USER_TYPE_EXTENSION_NAME "VK_GOOGLE_user_type" #define VK_KHR_SHADER_NON_SEMANTIC_INFO_SPEC_VERSION 1 @@ -398,7 +402,7 @@ #define VK_API_VERSION_1_0 VK_MAKE_VERSION(1, 0, 0) #define VK_API_VERSION_1_1 VK_MAKE_VERSION(1, 1, 0) #define VK_API_VERSION_1_2 VK_MAKE_VERSION(1, 2, 0) -#define VK_HEADER_VERSION 138 +#define VK_HEADER_VERSION 139 #define VK_HEADER_VERSION_COMPLETE VK_MAKE_VERSION(1, 2, VK_HEADER_VERSION) #define VK_DEFINE_HANDLE(object) typedef struct object##_T* object; #define VK_DEFINE_NON_DISPATCHABLE_HANDLE(object) typedef uint64_t object; @@ -2844,6 +2848,8 @@ typedef enum VkStructureType VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TEXEL_BUFFER_ALIGNMENT_PROPERTIES_EXT = 1000281001, VK_STRUCTURE_TYPE_COMMAND_BUFFER_INHERITANCE_RENDER_PASS_TRANSFORM_INFO_QCOM = 1000282000, VK_STRUCTURE_TYPE_RENDER_PASS_TRANSFORM_BEGIN_INFO_QCOM = 1000282001, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ROBUSTNESS_2_FEATURES_EXT = 1000286000, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ROBUSTNESS_2_PROPERTIES_EXT = 1000286001, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PIPELINE_CREATION_CACHE_CONTROL_FEATURES_EXT = 1000297000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DIAGNOSTICS_CONFIG_FEATURES_NV = 1000300000, VK_STRUCTURE_TYPE_DEVICE_DIAGNOSTICS_CONFIG_CREATE_INFO_NV = 1000300001, @@ -2987,6 +2993,8 @@ typedef enum VkSubpassContents typedef enum VkSubpassDescriptionFlagBits { + VK_SUBPASS_DESCRIPTION_FRAGMENT_REGION_BIT_QCOM = 0x00000004, + VK_SUBPASS_DESCRIPTION_SHADER_RESOLVE_BIT_QCOM = 0x00000008, VK_SUBPASS_DESCRIPTION_FLAG_BITS_MAX_ENUM = 0x7fffffff, } VkSubpassDescriptionFlagBits; @@ -4107,6 +4115,15 @@ typedef struct VkPhysicalDeviceRayTracingPropertiesNV uint32_t maxDescriptorSetAccelerationStructures; } VkPhysicalDeviceRayTracingPropertiesNV; +typedef struct VkPhysicalDeviceRobustness2FeaturesEXT +{ + VkStructureType sType; + void *pNext; + VkBool32 robustBufferAccess2; + VkBool32 robustImageAccess2; + VkBool32 nullDescriptor; +} VkPhysicalDeviceRobustness2FeaturesEXT; + typedef struct VkPhysicalDeviceSamplerFilterMinmaxProperties { VkStructureType sType; @@ -5356,6 +5373,14 @@ typedef struct VkPhysicalDeviceProtectedMemoryFeatures VkBool32 protectedMemory; } VkPhysicalDeviceProtectedMemoryFeatures; +typedef struct VkPhysicalDeviceRobustness2PropertiesEXT +{ + VkStructureType sType; + void *pNext; + VkDeviceSize WINE_VK_ALIGN(8) robustStorageBufferAccessSizeAlignment; + VkDeviceSize WINE_VK_ALIGN(8) robustUniformBufferAccessSizeAlignment; +} VkPhysicalDeviceRobustness2PropertiesEXT; + typedef struct VkPhysicalDeviceShaderDemoteToHelperInvocationFeaturesEXT { VkStructureType sType;

1 0

Henri Verbeet : wined3d: Implement clears in the Vulkan blitter.
by Alexandre Julliard April 27, 2020

April 27, 2020

Module: wine Branch: master Commit: f5d4d3ebbd3216105e1fccdf814046b53ec04a7c URL: https://source.winehq.org/git/wine.git/?a=commit;h=f5d4d3ebbd3216105e1fccdf… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 27 20:36:47 2020 +0430 wined3d: Implement clears in the Vulkan blitter. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context_vk.c | 202 +++++++++++++++++++++++++++- dlls/wined3d/texture.c | 294 ++++++++++++++++++++++++++++++++++++++++- dlls/wined3d/view.c | 2 +- dlls/wined3d/wined3d_private.h | 49 ++++++- 4 files changed, 535 insertions(+), 12 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f5d4d3ebbd3216105e1f…

1 0

Henri Verbeet : wined3d: Create Vulkan image views for rendertarget views.
by Alexandre Julliard April 27, 2020

April 27, 2020

Module: wine Branch: master Commit: a8e34f385167ff784016df65b38dd9f596af74c7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a8e34f385167ff784016df65… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 27 20:36:46 2020 +0430 wined3d: Create Vulkan image views for rendertarget views. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_vk.c | 59 ++++++++++++++++++- dlls/wined3d/context_vk.c | 30 ++++++++++ dlls/wined3d/texture.c | 4 +- dlls/wined3d/view.c | 128 ++++++++++++++++++++++++++++++++++++++++- dlls/wined3d/wined3d_private.h | 9 +++ 5 files changed, 226 insertions(+), 4 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a8e34f385167ff784016…

1 0

Gabriel Ivăncescu : qedit: Check for S_OK when enumerating the source pin.
by Alexandre Julliard April 27, 2020

April 27, 2020

Module: wine Branch: master Commit: ba5afd8c307c37ac054a4f8928cd3d565342218c URL: https://source.winehq.org/git/wine.git/?a=commit;h=ba5afd8c307c37ac054a4f89… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Apr 27 16:07:42 2020 +0300 qedit: Check for S_OK when enumerating the source pin. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/mediadet.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/qedit/mediadet.c b/dlls/qedit/mediadet.c index c3891c5cd3..392320560b 100644 --- a/dlls/qedit/mediadet.c +++ b/dlls/qedit/mediadet.c @@ -145,7 +145,7 @@ static HRESULT find_splitter(MediaDetImpl *detector) } hr = IEnumPins_Next(enum_pins, 1, &source_pin, NULL); IEnumPins_Release(enum_pins); - if (FAILED(hr)) + if (hr != S_OK) { ERR("Failed to get source pin, hr %#x.\n", hr); return hr;

1 0

Jacek Caban : msvcirt: Use __ASM_USE_THISCALL_WRAPPER macro.
by Alexandre Julliard April 27, 2020

April 27, 2020

Module: wine Branch: master Commit: acc42a9c71461ae15165d8d6b49ada37fef2eff7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=acc42a9c71461ae15165d8d6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 27 02:30:36 2020 +0200 msvcirt: Use __ASM_USE_THISCALL_WRAPPER macro. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcirt/msvcirt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 360d34653f..f76eaf6d7a 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -4459,7 +4459,7 @@ void __cdecl ios_sync_with_stdio(void) } -#if defined(__i386__) && !defined(__MINGW32__) +#ifdef __ASM_USE_THISCALL_WRAPPER #define DEFINE_VTBL_WRAPPER(off) \ __ASM_GLOBAL_FUNC(vtbl_wrapper_ ## off, \

1 0

Jacek Caban : msvcp: Use __ASM_USE_THISCALL_WRAPPER macro.
by Alexandre Julliard April 27, 2020

April 27, 2020

Module: wine Branch: master Commit: 12ead6742f8f32b4b2190cab8437f1b649960e59 URL: https://source.winehq.org/git/wine.git/?a=commit;h=12ead6742f8f32b4b2190cab… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 27 02:30:58 2020 +0200 msvcp: Use __ASM_USE_THISCALL_WRAPPER macro. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/cxx.h | 2 +- dlls/msvcp90/exception.c | 2 +- dlls/msvcp90/misc.c | 2 +- dlls/msvcp90/msvcp_main.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp90/cxx.h b/dlls/msvcp90/cxx.h index b2bec6570b..721d02c548 100644 --- a/dlls/msvcp90/cxx.h +++ b/dlls/msvcp90/cxx.h @@ -263,7 +263,7 @@ static void init_ ## type ## _cxx(char *base) \ #define DEFINE_CXX_DATA4(name, cl1, cl2, cl3, cl4, dtor) \ DEFINE_CXX_DATA(name, 4, cl1, cl2, cl3, cl4, dtor) -#if defined(__i386__) && !defined(__MINGW32__) +#ifdef __ASM_USE_THISCALL_WRAPPER #define CALL_VTBL_FUNC(this, off, ret, type, args) ((ret (WINAPI*)type)&vtbl_wrapper_##off)args diff --git a/dlls/msvcp90/exception.c b/dlls/msvcp90/exception.c index 15a6548b21..e9f6b6b804 100644 --- a/dlls/msvcp90/exception.c +++ b/dlls/msvcp90/exception.c @@ -969,7 +969,7 @@ void __cdecl __ExceptionPtrCreate(exception_ptr *ep) ep->ref = NULL; } -#if defined(__i386__) && !defined(__MINGW32__) +#ifdef __ASM_USE_THISCALL_WRAPPER extern void call_dtor(const cxx_exception_type *type, void *func, void *object); __ASM_GLOBAL_FUNC( call_dtor, diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index acb13af51c..4fb7ab24c1 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -711,7 +711,7 @@ unsigned int __cdecl _Random_device(void) #endif #if _MSVCP_VER >= 110 -#if defined(__i386__) && !defined(__MINGW32__) +#ifdef __ASM_USE_THISCALL_WRAPPER extern void *call_thiscall_func; __ASM_GLOBAL_FUNC(call_thiscall_func, diff --git a/dlls/msvcp90/msvcp_main.c b/dlls/msvcp90/msvcp_main.c index e33fc6434f..677234974e 100644 --- a/dlls/msvcp90/msvcp_main.c +++ b/dlls/msvcp90/msvcp_main.c @@ -26,7 +26,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcp); -#if defined(__i386__) && !defined(__MINGW32__) +#ifdef __ASM_USE_THISCALL_WRAPPER #define DEFINE_VTBL_WRAPPER(off) \ __ASM_GLOBAL_FUNC(vtbl_wrapper_ ## off, \

1 0

Jacek Caban : msvcrt: Use __ASM_USE_THISCALL_WRAPPER macro.
by Alexandre Julliard April 27, 2020

April 27, 2020

Module: wine Branch: master Commit: 95e117b3dcd604b544b816c230a4ee8252f0f2f9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=95e117b3dcd604b544b816c2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 27 02:31:12 2020 +0200 msvcrt: Use __ASM_USE_THISCALL_WRAPPER macro. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/cpp.c | 2 +- dlls/msvcrt/scheduler.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/cpp.c b/dlls/msvcrt/cpp.c index 500549c31e..16efc88755 100644 --- a/dlls/msvcrt/cpp.c +++ b/dlls/msvcrt/cpp.c @@ -1713,7 +1713,7 @@ void __cdecl __ExceptionPtrCreate(exception_ptr *ep) ep->ref = NULL; } -#if defined(__i386__) && !defined(__MINGW32__) +#ifdef __ASM_USE_THISCALL_WRAPPER extern void call_dtor(const cxx_exception_type *type, void *func, void *object); __ASM_GLOBAL_FUNC( call_dtor, diff --git a/dlls/msvcrt/scheduler.c b/dlls/msvcrt/scheduler.c index 68003e03f6..59e177b5ae 100644 --- a/dlls/msvcrt/scheduler.c +++ b/dlls/msvcrt/scheduler.c @@ -1058,7 +1058,7 @@ void __cdecl _CurrentScheduler__ScheduleTask(void (__cdecl *proc)(void*), void * CurrentScheduler_ScheduleTask(proc, data); } -#if defined(__i386__) && !defined(__MINGW32__) +#ifdef __ASM_USE_THISCALL_WRAPPER #define DEFINE_VTBL_WRAPPER(off) \ __ASM_GLOBAL_FUNC(vtbl_wrapper_ ## off, \

1 0

Jacek Caban : riched20: Use __ASM_USE_THISCALL_WRAPPER macro.
by Alexandre Julliard April 27, 2020

April 27, 2020

Module: wine Branch: master Commit: 650aebadb7ade8b95766b5f2a9062c2210b0eca1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=650aebadb7ade8b95766b5f2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 27 02:31:39 2020 +0200 riched20: Use __ASM_USE_THISCALL_WRAPPER macro. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.h | 2 +- dlls/riched20/editstr.h | 2 +- dlls/riched20/txthost.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 1f033b4187..02bff7cceb 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -276,7 +276,7 @@ void ME_InitTableDef(ME_TextEditor *editor, struct RTFTable *tableDef) DECLSPEC_ /* txthost.c */ ITextHost *ME_CreateTextHost(HWND hwnd, CREATESTRUCTW *cs, BOOL bEmulateVersion10) DECLSPEC_HIDDEN; -#if defined(__i386__) && !defined(__MINGW32__) /* Use wrappers to perform thiscall on i386 */ +#ifdef __ASM_USE_THISCALL_WRAPPER #define TXTHOST_VTABLE(This) (&itextHostStdcallVtbl) #else /* __i386__ */ #define TXTHOST_VTABLE(This) (This)->lpVtbl diff --git a/dlls/riched20/editstr.h b/dlls/riched20/editstr.h index 608901a5e2..a65169056e 100644 --- a/dlls/riched20/editstr.h +++ b/dlls/riched20/editstr.h @@ -47,7 +47,7 @@ #include "wine/heap.h" #include "wine/list.h" -#if defined(__i386__) && !defined(__MINGW32__) +#ifdef __ASM_USE_THISCALL_WRAPPER extern const struct ITextHostVtbl itextHostStdcallVtbl DECLSPEC_HIDDEN; #endif /* __i386__ */ diff --git a/dlls/riched20/txthost.c b/dlls/riched20/txthost.c index 3f25625ed5..5992fc0b06 100644 --- a/dlls/riched20/txthost.c +++ b/dlls/riched20/txthost.c @@ -522,7 +522,7 @@ DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxGetSelectionBarWidth(ITextHos } -#if defined(__i386__) && !defined(__MINGW32__) /* thiscall functions are i386-specific */ +#ifdef __ASM_USE_THISCALL_WRAPPER #define STDCALL(func) (void *) __stdcall_ ## func #ifdef _MSC_VER

1 0