June 2021 - Wine-Commits - list.winehq.org

Nikolay Sivov : dxva2: Accept AYUV as input format.
by Alexandre Julliard June 7, 2021

June 7, 2021

Module: wine Branch: master Commit: 0070a00cc1e6d5af0a65e8916ac0be36ea2c79c9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0070a00cc1e6d5af0a65e891… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 7 19:34:15 2021 +0300 dxva2: Accept AYUV as input format. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxva2/main.c | 12 +++++++++--- dlls/dxva2/tests/dxva2.c | 11 +++++++++++ 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/dlls/dxva2/main.c b/dlls/dxva2/main.c index 8952de17b1e..4eefffd6052 100644 --- a/dlls/dxva2/main.c +++ b/dlls/dxva2/main.c @@ -377,6 +377,14 @@ static HRESULT WINAPI device_manager_processor_service_RegisterVideoProcessorSof return E_NOTIMPL; } +static BOOL dxva_is_supported_stream_format(const DXVA2_VideoDesc *video_desc) +{ + return video_desc->Format == D3DFMT_A8R8G8B8 || + video_desc->Format == D3DFMT_X8R8G8B8 || + video_desc->Format == D3DFMT_YUY2 || + video_desc->Format == MAKEFOURCC('A','Y','U','V'); +} + static HRESULT WINAPI device_manager_processor_service_GetVideoProcessorDeviceGuids( IDirectXVideoProcessorService *iface, const DXVA2_VideoDesc *video_desc, UINT *count, GUID **guids) { @@ -399,9 +407,7 @@ static HRESULT WINAPI device_manager_processor_service_GetVideoProcessorRenderTa if (IsEqualGUID(deviceguid, &DXVA2_VideoProcSoftwareDevice)) { - if (!(video_desc->Format == D3DFMT_A8R8G8B8 || - video_desc->Format == D3DFMT_X8R8G8B8 || - video_desc->Format == D3DFMT_YUY2)) + if (!dxva_is_supported_stream_format(video_desc)) { WARN("Unsupported content format %#x.\n", video_desc->Format); return E_FAIL; diff --git a/dlls/dxva2/tests/dxva2.c b/dlls/dxva2/tests/dxva2.c index 1de1712d163..f785b2ce147 100644 --- a/dlls/dxva2/tests/dxva2.c +++ b/dlls/dxva2/tests/dxva2.c @@ -111,6 +111,7 @@ static void test_device_manager(void) D3DFMT_A8R8G8B8, D3DFMT_X8R8G8B8, D3DFMT_YUY2, + MAKEFOURCC('A','Y','U','V'), }; static const D3DFORMAT rt_unsupported_formats[] = { @@ -353,6 +354,12 @@ static void test_device_manager(void) { init_video_desc(&video_desc, rt_formats[i]); + count = 0; + hr = IDirectXVideoProcessorService_GetVideoProcessorDeviceGuids(proc_service, &video_desc, &count, &guids); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(count > 0, "Unexpected device count.\n"); + CoTaskMemFree(guids); + count = 0; hr = IDirectXVideoProcessorService_GetVideoProcessorRenderTargets(proc_service, &DXVA2_VideoProcSoftwareDevice, &video_desc, &count, &formats); @@ -371,6 +378,10 @@ static void test_device_manager(void) hr = IDirectXVideoProcessorService_GetVideoProcessorRenderTargets(proc_service, &DXVA2_VideoProcSoftwareDevice, &video_desc, &count, &formats); ok(hr == E_FAIL, "Unexpected hr %#x, format %d.\n", hr, rt_unsupported_formats[i]); + + hr = IDirectXVideoProcessorService_GetVideoProcessorDeviceGuids(proc_service, &video_desc, &count, &guids); + todo_wine + ok(hr == E_FAIL, "Unexpected hr %#x.\n", hr); } IDirectXVideoProcessorService_Release(proc_service);

1 0

Henri Verbeet : wined3d: Use the texture level count to calculate sub-resource indices for Vulkan mip-map generation.
by Alexandre Julliard June 7, 2021

June 7, 2021

Module: wine Branch: master Commit: b6ca5e50a64eb853f3aa18ebdaf413f731dcc210 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b6ca5e50a64eb853f3aa18eb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jun 7 16:55:12 2021 +0200 wined3d: Use the texture level count to calculate sub-resource indices for Vulkan mip-map generation. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/view.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index f9ba8430d08..91d26c05fae 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -1266,7 +1266,7 @@ void wined3d_shader_resource_view_gl_generate_mipmap(struct wined3d_shader_resou void wined3d_shader_resource_view_vk_generate_mipmap(struct wined3d_shader_resource_view_vk *srv_vk, struct wined3d_context_vk *context_vk) { - unsigned int i, j, layer_count, level_count, base_level, base_layer; + unsigned int i, j, layer_count, level_count, base_level, base_layer, sub_resource_idx; const struct wined3d_vk_info *vk_info = context_vk->vk_info; VkImageSubresourceRange vk_src_range, vk_dst_range; struct wined3d_texture_vk *texture_vk; @@ -1283,8 +1283,9 @@ void wined3d_shader_resource_view_vk_generate_mipmap(struct wined3d_shader_resou texture_vk = wined3d_texture_vk(texture_from_resource(srv_vk->v.resource)); for (i = 0; i < layer_count; ++i) { - if (!wined3d_texture_load_location(&texture_vk->t, - (base_layer + i) * level_count + base_level, &context_vk->c, WINED3D_LOCATION_TEXTURE_RGB)) + sub_resource_idx = (base_layer + i) * texture_vk->t.level_count + base_level; + if (!wined3d_texture_load_location(&texture_vk->t, sub_resource_idx, + &context_vk->c, WINED3D_LOCATION_TEXTURE_RGB)) ERR("Failed to load source layer %u.\n", base_layer + i); } @@ -1393,10 +1394,9 @@ void wined3d_shader_resource_view_vk_generate_mipmap(struct wined3d_shader_resou { for (j = 1; j < level_count; ++j) { - wined3d_texture_validate_location(&texture_vk->t, - (base_layer + i) * level_count + base_level + j, WINED3D_LOCATION_TEXTURE_RGB); - wined3d_texture_invalidate_location(&texture_vk->t, - (base_layer + i) * level_count + base_level + j, ~WINED3D_LOCATION_TEXTURE_RGB); + sub_resource_idx = (base_layer + i) * texture_vk->t.level_count + base_level + j; + wined3d_texture_validate_location(&texture_vk->t, sub_resource_idx, WINED3D_LOCATION_TEXTURE_RGB); + wined3d_texture_invalidate_location(&texture_vk->t, sub_resource_idx, ~WINED3D_LOCATION_TEXTURE_RGB); } }

1 0

Henri Verbeet : wined3d: Introduce wined3d_mask_from_size().
by Alexandre Julliard June 7, 2021

June 7, 2021

Module: wine Branch: master Commit: cc31ca8885a9a6977db35ba8e0f65408c3b063cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=cc31ca8885a9a6977db35ba8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jun 7 16:55:08 2021 +0200 wined3d: Introduce wined3d_mask_from_size(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 8 ++++---- dlls/wined3d/utils.c | 10 +++++----- dlls/wined3d/wined3d_private.h | 5 +++++ 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index c5d7a7d9d55..8a4ca4f5781 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -36,11 +36,11 @@ WINE_DECLARE_DEBUG_CHANNEL(d3d_perf); static const DWORD surface_simple_locations = WINED3D_LOCATION_SYSMEM | WINED3D_LOCATION_BUFFER; /* Works correctly only for <= 4 bpp formats. */ -static void get_color_masks(const struct wined3d_format *format, DWORD *masks) +static void get_color_masks(const struct wined3d_format *format, uint32_t *masks) { - masks[0] = ((1u << format->red_size) - 1) << format->red_offset; - masks[1] = ((1u << format->green_size) - 1) << format->green_offset; - masks[2] = ((1u << format->blue_size) - 1) << format->blue_offset; + masks[0] = wined3d_mask_from_size(format->red_size) << format->red_offset; + masks[1] = wined3d_mask_from_size(format->green_size) << format->green_offset; + masks[2] = wined3d_mask_from_size(format->blue_size) << format->blue_offset; } /* See also float_16_to_32() in wined3d_private.h */ diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index b39fb46cadc..8eacc52ee2c 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -5902,7 +5902,7 @@ DWORD wined3d_format_convert_from_float(const struct wined3d_format *format, con static float color_to_float(DWORD color, DWORD size, DWORD offset) { - DWORD mask = size < 32 ? (1u << size) - 1 : ~0u; + uint32_t mask = wined3d_mask_from_size(size); if (!size) return 1.0f; @@ -5938,10 +5938,10 @@ void wined3d_format_get_float_color_key(const struct wined3d_format *format, case WINED3DFMT_R8G8B8X8_UNORM: case WINED3DFMT_R16G16_UNORM: case WINED3DFMT_B10G10R10A2_UNORM: - slop.r = 0.5f / ((1u << format->red_size) - 1); - slop.g = 0.5f / ((1u << format->green_size) - 1); - slop.b = 0.5f / ((1u << format->blue_size) - 1); - slop.a = 0.5f / ((1u << format->alpha_size) - 1); + slop.r = 0.5f / wined3d_mask_from_size(format->red_size); + slop.g = 0.5f / wined3d_mask_from_size(format->green_size); + slop.b = 0.5f / wined3d_mask_from_size(format->blue_size); + slop.a = 0.5f / wined3d_mask_from_size(format->alpha_size); float_colors[0].r = color_to_float(key->color_space_low_value, format->red_size, format->red_offset) - slop.r; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b0f8ea1bf93..6d41f02e842 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -5959,6 +5959,11 @@ static inline BOOL is_rasterization_disabled(const struct wined3d_shader *geomet && geometry_shader->u.gs.so_desc->rasterizer_stream_idx == WINED3D_NO_RASTERIZER_STREAM; } +static inline uint32_t wined3d_mask_from_size(unsigned int size) +{ + return size < 32 ? (1u << size) - 1 : ~0u; +} + static inline DWORD wined3d_extract_bits(const DWORD *bitstream, unsigned int offset, unsigned int count) {

1 0

Rémi Bernon : include: Add HID haptics usage page.
by Alexandre Julliard June 7, 2021

June 7, 2021

Module: wine Branch: master Commit: 40b418bd1fe9c9cad0e206d1b57f2809fc3a37c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=40b418bd1fe9c9cad0e206d1… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jun 7 11:10:22 2021 +0200 include: Add HID haptics usage page. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/hidusage.h | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/include/hidusage.h b/include/hidusage.h index fc77dff2c6b..002040bddc0 100644 --- a/include/hidusage.h +++ b/include/hidusage.h @@ -196,6 +196,7 @@ typedef USHORT USAGE, *PUSAGE; #define HID_USAGE_PAGE_TELEPHONY ((USAGE) 0x0B) #define HID_USAGE_PAGE_CONSUMER ((USAGE) 0x0C) #define HID_USAGE_PAGE_DIGITIZER ((USAGE) 0x0D) +#define HID_USAGE_PAGE_HAPTICS ((USAGE) 0x0E) #define HID_USAGE_PAGE_UNICODE ((USAGE) 0x10) #define HID_USAGE_PAGE_ALPHANUMERIC ((USAGE) 0x14) #define HID_USAGE_PAGE_VENDOR_DEFINED_BEGIN ((USAGE) 0xff00) @@ -224,6 +225,33 @@ typedef USHORT USAGE, *PUSAGE; #define HID_USAGE_TELEPHONY_KEYPAD_D ((USAGE) 0xBF) #define HID_USAGE_TELEPHONY_HOST_AVAILABLE ((USAGE) 0xF1) +#define HID_USAGE_HAPTICS_SIMPLE_CONTROLLER ((USAGE) 0x01) +#define HID_USAGE_HAPTICS_WAVEFORM_LIST ((USAGE) 0x10) +#define HID_USAGE_HAPTICS_DURATION_LIST ((USAGE) 0x11) +#define HID_USAGE_HAPTICS_AUTO_TRIGGER ((USAGE) 0x20) +#define HID_USAGE_HAPTICS_MANUAL_TRIGGER ((USAGE) 0x21) +#define HID_USAGE_HAPTICS_AUTO_ASSOCIATED_CONTROL ((USAGE) 0x22) +#define HID_USAGE_HAPTICS_INTENSITY ((USAGE) 0x23) +#define HID_USAGE_HAPTICS_REPEAT_COUNT ((USAGE) 0x24) +#define HID_USAGE_HAPTICS_RETRIGGER_PERIOD ((USAGE) 0x25) +#define HID_USAGE_HAPTICS_WAVEFORM_VENDOR_PAGE ((USAGE) 0x26) +#define HID_USAGE_HAPTICS_WAVEFORM_VENDOR_ID ((USAGE) 0x27) +#define HID_USAGE_HAPTICS_WAVEFORM_CUTOFF_TIME ((USAGE) 0x28) +#define HID_USAGE_HAPTICS_WAVEFORM_BEGIN ((USAGE) 0x1000) +/* Differs from https://usb.org/sites/default/files/hut1_22.pdf */ +/* Waveform None */ +#define HID_USAGE_HAPTICS_WAVEFORM_STOP ((USAGE) 0x1001) +/* Waveform Stop */ +#define HID_USAGE_HAPTICS_WAVEFORM_NULL ((USAGE) 0x1002) +#define HID_USAGE_HAPTICS_WAVEFORM_CLICK ((USAGE) 0x1003) +#define HID_USAGE_HAPTICS_WAVEFORM_BUZZ ((USAGE) 0x1004) +#define HID_USAGE_HAPTICS_WAVEFORM_RUMBLE ((USAGE) 0x1005) +#define HID_USAGE_HAPTICS_WAVEFORM_PRESS ((USAGE) 0x1006) +#define HID_USAGE_HAPTICS_WAVEFORM_RELEASE ((USAGE) 0x1007) +#define HID_USAGE_HAPTICS_WAVEFORM_END ((USAGE) 0x1FFF) +#define HID_USAGE_HAPTICS_WAVEFORM_VENDOR_BEGIN ((USAGE) 0x2000) +#define HID_USAGE_HAPTICS_WAVEFORM_VENDOR_END ((USAGE) 0x2FFF) + #define HID_USAGE_MS_BTH_HF_DIALNUMBER ((USAGE) 0x21) #define HID_USAGE_MS_BTH_HF_DIALMEMORY ((USAGE) 0x22)

1 0

Rémi Bernon : hidclass.sys: Remove Delim member from struct caps.
by Alexandre Julliard June 7, 2021

June 7, 2021

Module: wine Branch: master Commit: 1f0b48abf23741c3c7b23931dce7acb351937701 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f0b48abf23741c3c7b23931… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jun 7 11:06:58 2021 +0200 hidclass.sys: Remove Delim member from struct caps. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/descriptor.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/hidclass.sys/descriptor.c b/dlls/hidclass.sys/descriptor.c index 0e0d6a6bf54..ec559f67f5f 100644 --- a/dlls/hidclass.sys/descriptor.c +++ b/dlls/hidclass.sys/descriptor.c @@ -122,8 +122,6 @@ struct caps { USHORT Reserved3; } NotRange; } DUMMYUNIONNAME; - - int Delim; }; struct feature { @@ -200,7 +198,7 @@ static void debugstr_caps(const char* type, struct caps *caps) return; TRACE("(%s Caps: UsagePage 0x%x; LogicalMin %i; LogicalMax %i; PhysicalMin %i; " "PhysicalMax %i; UnitsExp %i; Units %i; BitSize %i; ReportID %i; ReportCount %i; " - "Usage %s; StringIndex %s; DesignatorIndex %s; Delim %i;)\n", + "Usage %s; StringIndex %s; DesignatorIndex %s;)\n", type, caps->UsagePage, caps->LogicalMin, @@ -214,8 +212,7 @@ static void debugstr_caps(const char* type, struct caps *caps) caps->ReportCount, debugstr_usages(caps), debugstr_stringindex(caps), - debugstr_designatorindex(caps), - caps->Delim); + debugstr_designatorindex(caps)); } static void debug_feature(struct feature *feature) @@ -681,8 +678,8 @@ static int parse_descriptor(BYTE *descriptor, unsigned int index, unsigned int l caps->IsStringRange = TRUE; break; case TAG_LOCAL_DELIMITER: - caps->Delim = getValue(bSize, itemVal, FALSE); - break; + FIXME("delimiter %d not implemented!\n", itemVal); + return -1; default: ERR("Unknown (bTag: 0x%x, bType: 0x%x)\n", bTag, bType); return -1;

1 0

Henri Verbeet : wined3d: Implement OpenGL image UAV clears using ARB_clear_texture.
by Alexandre Julliard June 7, 2021

June 7, 2021

Module: wine Branch: master Commit: 126f0e6ed3119fdeb71b87ac7e3ab22a589dbd0e URL: https://source.winehq.org/git/wine.git/?a=commit;h=126f0e6ed3119fdeb71b87ac… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jun 7 16:55:09 2021 +0200 wined3d: Implement OpenGL image UAV clears using ARB_clear_texture. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 24 +++++------ dlls/wined3d/utils.c | 12 ++++++ dlls/wined3d/view.c | 95 +++++++++++++++++++++++++++++++++++++----- dlls/wined3d/wined3d_private.h | 1 + 4 files changed, 110 insertions(+), 22 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=126f0e6ed3119fdeb71b…

1 0

Rémi Bernon : hid/tests: Don't print buttons after HidP_GetUsages failed.
by Alexandre Julliard June 7, 2021

June 7, 2021

Module: wine Branch: master Commit: 573e8bada9054cc92dfcf184343ecb814ff939cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=573e8bada9054cc92dfcf184… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jun 7 11:06:56 2021 +0200 hid/tests: Don't print buttons after HidP_GetUsages failed. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hid/tests/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/hid/tests/device.c b/dlls/hid/tests/device.c index 3dd22b7f068..6693bc8bf5a 100644 --- a/dlls/hid/tests/device.c +++ b/dlls/hid/tests/device.c @@ -215,7 +215,7 @@ static void process_data(HIDP_CAPS Caps, PHIDP_PREPARSED_DATA ppd, CHAR *data, D status = HidP_GetUsages(HidP_Input, i, 0, button_pages, &usage_length, ppd, data, data_length); ok (status == HIDP_STATUS_SUCCESS || usage_length == 0, "HidP_GetUsages failed (%x) but usage length still %i\n", status, usage_length); - if (usage_length) + if (status == HIDP_STATUS_SUCCESS && usage_length) { CHAR report[50]; int count;

1 0

Zebediah Figura : configure: Always warn on missing GStreamer if --with-gstreamer was specified.
by Alexandre Julliard June 7, 2021

June 7, 2021

Module: wine Branch: master Commit: 9c87cdc533dd0d487088277cad1083c97d8c0fd7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9c87cdc533dd0d487088277c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jun 4 17:46:32 2021 -0500 configure: Always warn on missing GStreamer if --with-gstreamer was specified. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 5 ++++- configure.ac | 7 +++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/configure b/configure index e88a03a732a..96ab87e2fbc 100755 --- a/configure +++ b/configure @@ -14708,7 +14708,9 @@ fi CPPFLAGS=$ac_save_CPPFLAGS fi -if test "x$ac_glib2_broken" != xyes -a "x$ac_cv_lib_gstreamer_1_0_gst_pad_new" != xyes -a "x$ac_cv_header_QuickTime_ImageCompression_h" != xyes ; then : +if test "x$with_gstreamer" = xyes -o "x$ac_cv_header_QuickTime_ImageCompression_h" != xyes +then + if test "x$ac_glib2_broken" != xyes -a "x$ac_cv_lib_gstreamer_1_0_gst_pad_new" != xyes; then : case "x$with_gstreamer" in x) as_fn_append wine_notices "|gstreamer-1.0 base plugins ${notice_platform}development files not found, GStreamer won't be supported." ;; xno) ;; @@ -14716,6 +14718,7 @@ if test "x$ac_glib2_broken" != xyes -a "x$ac_cv_lib_gstreamer_1_0_gst_pad_new" ! This is an error since --with-gstreamer was requested." "$LINENO" 5 ;; esac +fi fi test "x$ac_cv_lib_gstreamer_1_0_gst_pad_new" = xyes || enable_winegstreamer=${enable_winegstreamer:-no} diff --git a/configure.ac b/configure.ac index afb4dc7432a..6c7b22b3827 100644 --- a/configure.ac +++ b/configure.ac @@ -1622,8 +1622,11 @@ then ac_glib2_broken=yes WINE_NOTICE([glib-2.0 pkgconfig configuration is for the wrong architecture, winegstreamer won't be built.])])])]) fi -WINE_NOTICE_WITH(gstreamer,[test "x$ac_glib2_broken" != xyes -a "x$ac_cv_lib_gstreamer_1_0_gst_pad_new" != xyes -a "x$ac_cv_header_QuickTime_ImageCompression_h" != xyes ], - [gstreamer-1.0 base plugins ${notice_platform}development files not found, GStreamer won't be supported.]) +if test "x$with_gstreamer" = xyes -o "x$ac_cv_header_QuickTime_ImageCompression_h" != xyes +then + WINE_NOTICE_WITH(gstreamer,[test "x$ac_glib2_broken" != xyes -a "x$ac_cv_lib_gstreamer_1_0_gst_pad_new" != xyes], + [gstreamer-1.0 base plugins ${notice_platform}development files not found, GStreamer won't be supported.]) +fi test "x$ac_cv_lib_gstreamer_1_0_gst_pad_new" = xyes || enable_winegstreamer=${enable_winegstreamer:-no} dnl **** Check for ALSA 1.x ****

1 0

Zebediah Figura : configure: Also warn on missing GStreamer if --without-quicktime was specified.
by Alexandre Julliard June 7, 2021

June 7, 2021

Module: wine Branch: master Commit: a1d029c9e16a87a9a3fd1c06bcca5603f73d0c0c URL: https://source.winehq.org/git/wine.git/?a=commit;h=a1d029c9e16a87a9a3fd1c06… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jun 4 17:46:33 2021 -0500 configure: Also warn on missing GStreamer if --without-quicktime was specified. Based on a patch by Gijs Vermeulen. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 96ab87e2fbc..9acc579ca11 100755 --- a/configure +++ b/configure @@ -14708,7 +14708,7 @@ fi CPPFLAGS=$ac_save_CPPFLAGS fi -if test "x$with_gstreamer" = xyes -o "x$ac_cv_header_QuickTime_ImageCompression_h" != xyes +if test "x$with_gstreamer" = xyes -o "x$with_quicktime" = xno -o "x$ac_cv_header_QuickTime_ImageCompression_h" != xyes then if test "x$ac_glib2_broken" != xyes -a "x$ac_cv_lib_gstreamer_1_0_gst_pad_new" != xyes; then : case "x$with_gstreamer" in diff --git a/configure.ac b/configure.ac index 6c7b22b3827..bf7efa0690c 100644 --- a/configure.ac +++ b/configure.ac @@ -1622,7 +1622,7 @@ then ac_glib2_broken=yes WINE_NOTICE([glib-2.0 pkgconfig configuration is for the wrong architecture, winegstreamer won't be built.])])])]) fi -if test "x$with_gstreamer" = xyes -o "x$ac_cv_header_QuickTime_ImageCompression_h" != xyes +if test "x$with_gstreamer" = xyes -o "x$with_quicktime" = xno -o "x$ac_cv_header_QuickTime_ImageCompression_h" != xyes then WINE_NOTICE_WITH(gstreamer,[test "x$ac_glib2_broken" != xyes -a "x$ac_cv_lib_gstreamer_1_0_gst_pad_new" != xyes], [gstreamer-1.0 base plugins ${notice_platform}development files not found, GStreamer won't be supported.])

1 0

Akihiro Sagawa : quartz: Notify EC_USERABORT event when closing video window.
by Alexandre Julliard June 7, 2021

June 7, 2021

Module: wine Branch: master Commit: 1b107ec03ea423f430d2eeb6eecc1f08b0d7ac56 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b107ec03ea423f430d2eeb6… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed Jun 2 23:08:00 2021 +0900 quartz: Notify EC_USERABORT event when closing video window. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/videorenderer.c | 4 ++-- dlls/quartz/tests/vmr7.c | 4 ++-- dlls/quartz/tests/vmr9.c | 4 ++-- dlls/quartz/window.c | 11 +++++++++++ 4 files changed, 17 insertions(+), 6 deletions(-) diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c index c1a2e882dc9..8d0003cf12e 100644 --- a/dlls/quartz/tests/videorenderer.c +++ b/dlls/quartz/tests/videorenderer.c @@ -1344,7 +1344,7 @@ static void test_window_close(IPin *pin, IMemInputPin *input, IMediaControl *con hr = IMediaControl_GetState(control, 1000, &state); ok(hr == VFW_S_STATE_INTERMEDIATE, "Got hr %#x.\n", hr); ret = check_ec_userabort(eventsrc, 0); - todo_wine ok(ret == 1, "Expected EC_USERABORT.\n"); + ok(ret == 1, "Expected EC_USERABORT.\n"); ok(IsWindow(hwnd), "Window should exist.\n"); ok(!IsWindowVisible(hwnd), "Window should be visible.\n"); @@ -1383,7 +1383,7 @@ static void test_window_close(IPin *pin, IMemInputPin *input, IMediaControl *con SendMessageW(hwnd, WM_CLOSE, 0, 0); ret = check_ec_userabort(eventsrc, 0); - todo_wine ok(ret == 1, "Expected EC_USERABORT.\n"); + ok(ret == 1, "Expected EC_USERABORT.\n"); ok(IsWindow(hwnd), "Window should exist.\n"); ok(!IsWindowVisible(hwnd), "Window should be visible.\n"); diff --git a/dlls/quartz/tests/vmr7.c b/dlls/quartz/tests/vmr7.c index b8af2163099..688770a8501 100644 --- a/dlls/quartz/tests/vmr7.c +++ b/dlls/quartz/tests/vmr7.c @@ -1375,7 +1375,7 @@ static void test_window_close(IPin *pin, IMemInputPin *input, IMediaControl *con hr = IMediaControl_GetState(control, 1000, &state); ok(hr == VFW_S_STATE_INTERMEDIATE, "Got hr %#x.\n", hr); ret = check_ec_userabort(eventsrc, 0); - todo_wine ok(ret == 1, "Expected EC_USERABORT.\n"); + ok(ret == 1, "Expected EC_USERABORT.\n"); ok(IsWindow(hwnd), "Window should exist.\n"); ok(!IsWindowVisible(hwnd), "Window should be visible.\n"); @@ -1415,7 +1415,7 @@ static void test_window_close(IPin *pin, IMemInputPin *input, IMediaControl *con SendMessageW(hwnd, WM_CLOSE, 0, 0); ret = check_ec_userabort(eventsrc, 0); - todo_wine ok(ret == 1, "Expected EC_USERABORT.\n"); + ok(ret == 1, "Expected EC_USERABORT.\n"); ok(IsWindow(hwnd), "Window should exist.\n"); ok(!IsWindowVisible(hwnd), "Window should be visible.\n"); diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index 3f6982dfb5a..154b6a6b99e 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -1580,7 +1580,7 @@ static void test_window_close(IPin *pin, IMemInputPin *input, IMediaControl *con hr = IMediaControl_GetState(control, 1000, &state); ok(hr == VFW_S_STATE_INTERMEDIATE, "Got hr %#x.\n", hr); ret = check_ec_userabort(eventsrc, 0); - todo_wine ok(ret == 1, "Expected EC_USERABORT.\n"); + ok(ret == 1, "Expected EC_USERABORT.\n"); ok(IsWindow(hwnd), "Window should exist.\n"); ok(!IsWindowVisible(hwnd), "Window should be visible.\n"); @@ -1620,7 +1620,7 @@ static void test_window_close(IPin *pin, IMemInputPin *input, IMediaControl *con SendMessageW(hwnd, WM_CLOSE, 0, 0); ret = check_ec_userabort(eventsrc, 0); - todo_wine ok(ret == 1, "Expected EC_USERABORT.\n"); + ok(ret == 1, "Expected EC_USERABORT.\n"); ok(IsWindow(hwnd), "Window should exist.\n"); ok(!IsWindowVisible(hwnd), "Window should be visible.\n"); diff --git a/dlls/quartz/window.c b/dlls/quartz/window.c index 94210e043c7..5b172d5f108 100644 --- a/dlls/quartz/window.c +++ b/dlls/quartz/window.c @@ -77,9 +77,20 @@ static LRESULT CALLBACK WndProcW(HWND hwnd, UINT message, WPARAM wparam, LPARAM DestroyWindow(hwnd); return 0; case WM_CLOSE: + { + IFilterGraph *graph = window->pFilter->graph; + IMediaEventSink *event_sink; IVideoWindow_put_Visible(&window->IVideoWindow_iface, OAFALSE); + if (graph && SUCCEEDED(IFilterGraph_QueryInterface(graph, + &IID_IMediaEventSink, + (void **)&event_sink))) + { + IMediaEventSink_Notify(event_sink, EC_USERABORT, 0, 0); + IMediaEventSink_Release(event_sink); + } return 0; } + } return DefWindowProcW(hwnd, message, wparam, lparam); }

1 0