December 2022 - Wine-Commits

Eric Pouech : wined3d: Enable long types in adapter_vk.c.
by Alexandre Julliard Dec. 5, 2022

Dec. 5, 2022

Module: wine Branch: master Commit: 6673ad3a83f9ab28259576feb6d1203d587bdbab URL: https://gitlab.winehq.org/wine/wine/-/commit/6673ad3a83f9ab28259576feb6d120… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Sat Dec 3 09:59:14 2022 +0100 wined3d: Enable long types in adapter_vk.c. --- dlls/wined3d/adapter_vk.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 213d87a8738..f7902dfb498 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -15,7 +15,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WINE_NO_LONG_TYPES /* temporary */ #include "wined3d_private.h" @@ -496,7 +495,7 @@ static HRESULT adapter_vk_create_device(struct wined3d *wined3d, const struct wi if (FAILED(hr = wined3d_device_init(&device_vk->d, wined3d, adapter->ordinal, device_type, focus_window, flags, surface_alignment, levels, level_count, vk_info->supported, device_parent))) { - WARN("Failed to initialize device, hr %#x.\n", hr); + WARN("Failed to initialize device, hr %#lx.\n", hr); wined3d_allocator_cleanup(&device_vk->allocator); goto fail; } @@ -676,7 +675,7 @@ static HRESULT adapter_vk_init_3d(struct wined3d_device *device) if (FAILED(hr = device->shader_backend->shader_alloc_private(device, device->adapter->vertex_pipe, device->adapter->fragment_pipe))) { - ERR("Failed to allocate shader private data, hr %#x.\n", hr); + ERR("Failed to allocate shader private data, hr %#lx.\n", hr); wined3d_context_vk_cleanup(context_vk); return hr; } @@ -1300,7 +1299,7 @@ static HRESULT adapter_vk_create_swapchain(struct wined3d_device *device, if (FAILED(hr = wined3d_swapchain_vk_init(swapchain_vk, device, desc, state_parent, parent, parent_ops))) { - WARN("Failed to initialise swapchain, hr %#x.\n", hr); + WARN("Failed to initialise swapchain, hr %#lx.\n", hr); heap_free(swapchain_vk); return hr; } @@ -1351,7 +1350,7 @@ static HRESULT adapter_vk_create_buffer(struct wined3d_device *device, if (FAILED(hr = wined3d_buffer_vk_init(buffer_vk, device, desc, data, parent, parent_ops))) { - WARN("Failed to initialise buffer, hr %#x.\n", hr); + WARN("Failed to initialise buffer, hr %#lx.\n", hr); heap_free(buffer_vk); return hr; } @@ -1398,7 +1397,7 @@ static HRESULT adapter_vk_create_texture(struct wined3d_device *device, if (FAILED(hr = wined3d_texture_vk_init(texture_vk, device, desc, layer_count, level_count, flags, parent, parent_ops))) { - WARN("Failed to initialise texture, hr %#x.\n", hr); + WARN("Failed to initialise texture, hr %#lx.\n", hr); heap_free(texture_vk); return hr; } @@ -1449,7 +1448,7 @@ static HRESULT adapter_vk_create_rendertarget_view(const struct wined3d_view_des if (FAILED(hr = wined3d_rendertarget_view_vk_init(view_vk, desc, resource, parent, parent_ops))) { - WARN("Failed to initialise view, hr %#x.\n", hr); + WARN("Failed to initialise view, hr %#lx.\n", hr); heap_free(view_vk); return hr; } @@ -1591,7 +1590,7 @@ static HRESULT adapter_vk_create_shader_resource_view(const struct wined3d_view_ if (FAILED(hr = wined3d_shader_resource_view_vk_init(view_vk, desc, resource, parent, parent_ops))) { - WARN("Failed to initialise view, hr %#x.\n", hr); + WARN("Failed to initialise view, hr %#lx.\n", hr); heap_free(view_vk); return hr; } @@ -1644,7 +1643,7 @@ static HRESULT adapter_vk_create_unordered_access_view(const struct wined3d_view if (FAILED(hr = wined3d_unordered_access_view_vk_init(view_vk, desc, resource, parent, parent_ops))) { - WARN("Failed to initialise view, hr %#x.\n", hr); + WARN("Failed to initialise view, hr %#lx.\n", hr); heap_free(view_vk); return hr; }

1 0

Alex Henrie : rpcrt4: Use standard C functions for memory allocation.
by Alexandre Julliard Dec. 5, 2022

Dec. 5, 2022

Module: wine Branch: master Commit: 3bfc4493cb886d767e48b2677b07fef409a2db11 URL: https://gitlab.winehq.org/wine/wine/-/commit/3bfc4493cb886d767e48b2677b07fe… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Nov 30 07:53:59 2022 -0700 rpcrt4: Use standard C functions for memory allocation. --- dlls/rpcrt4/cproxy.c | 6 +- dlls/rpcrt4/cstub.c | 17 ++-- dlls/rpcrt4/ndr_contexthandle.c | 8 +- dlls/rpcrt4/ndr_es.c | 13 +-- dlls/rpcrt4/ndr_fullpointer.c | 47 +++++----- dlls/rpcrt4/ndr_ole.c | 4 +- dlls/rpcrt4/ndr_stubless.c | 15 ++- dlls/rpcrt4/ndr_typelib.c | 67 +++++++------ dlls/rpcrt4/rpc_assoc.c | 31 +++--- dlls/rpcrt4/rpc_binding.c | 202 ++++++++++++++++++++-------------------- dlls/rpcrt4/rpc_binding.h | 4 - dlls/rpcrt4/rpc_epmap.c | 20 ++-- dlls/rpcrt4/rpc_message.c | 79 +++++++--------- dlls/rpcrt4/rpc_message.h | 1 - dlls/rpcrt4/rpc_server.c | 102 ++++++++++---------- dlls/rpcrt4/rpc_transport.c | 195 +++++++++++++++++++------------------- dlls/rpcrt4/rpcrt4_main.c | 28 +++--- 17 files changed, 407 insertions(+), 432 deletions(-)

1 0

Alex Henrie : quartz/tests: Remove redundant null check from testfilter_JoinFilterGraph.
by Alexandre Julliard Dec. 5, 2022

Dec. 5, 2022

Module: wine Branch: master Commit: b3143850c263b623defdb2885a75b6758b4978c4 URL: https://gitlab.winehq.org/wine/wine/-/commit/b3143850c263b623defdb2885a75b6… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Dec 4 20:47:43 2022 -0700 quartz/tests: Remove redundant null check from testfilter_JoinFilterGraph. On Windows, wcsdup(NULL) always returns NULL. --- dlls/quartz/tests/filtergraph.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index c06041b422f..d6ce9d31ce2 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -1501,7 +1501,7 @@ static HRESULT WINAPI testfilter_JoinFilterGraph(IBaseFilter *iface, IFilterGrap filter->graph = graph; free(filter->name); - filter->name = name ? wcsdup(name) : NULL; + filter->name = wcsdup(name); return S_OK; }

1 0

Ziqing Hui : winegstreamer: Add WMV support to wg_format.
by Alexandre Julliard Dec. 5, 2022

Dec. 5, 2022

Module: wine Branch: master Commit: 3e5d683caab65b082352e8e2d2073e297b478633 URL: https://gitlab.winehq.org/wine/wine/-/commit/3e5d683caab65b082352e8e2d2073e… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Fri Nov 25 12:33:28 2022 +0800 winegstreamer: Add WMV support to wg_format. --- dlls/winegstreamer/mfplat.c | 1 + dlls/winegstreamer/quartz_parser.c | 47 ++++++++++++++++++++++++++++++++++++++ dlls/winegstreamer/unixlib.h | 7 ++++++ dlls/winegstreamer/wg_format.c | 22 ++++++++++++++++++ dlls/winegstreamer/wg_transform.c | 2 ++ dlls/winegstreamer/wm_reader.c | 4 ++++ 6 files changed, 83 insertions(+) diff --git a/dlls/winegstreamer/mfplat.c b/dlls/winegstreamer/mfplat.c index d7d6810965e..a09c67b4f11 100644 --- a/dlls/winegstreamer/mfplat.c +++ b/dlls/winegstreamer/mfplat.c @@ -554,6 +554,7 @@ IMFMediaType *mf_media_type_from_wg_format(const struct wg_format *format) case WG_MAJOR_TYPE_AUDIO_WMA: case WG_MAJOR_TYPE_VIDEO_CINEPAK: case WG_MAJOR_TYPE_VIDEO_H264: + case WG_MAJOR_TYPE_VIDEO_WMV: FIXME("Format %u not implemented!\n", format->major_type); /* fallthrough */ case WG_MAJOR_TYPE_UNKNOWN: diff --git a/dlls/winegstreamer/quartz_parser.c b/dlls/winegstreamer/quartz_parser.c index 2a7845be737..6e31f2736fe 100644 --- a/dlls/winegstreamer/quartz_parser.c +++ b/dlls/winegstreamer/quartz_parser.c @@ -36,7 +36,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(quartz); static const GUID MEDIASUBTYPE_CVID = {mmioFOURCC('c','v','i','d'), 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}}; +static const GUID MEDIASUBTYPE_VC1S = {mmioFOURCC('V','C','1','S'), 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}}; static const GUID MEDIASUBTYPE_MP3 = {WAVE_FORMAT_MPEGLAYER3, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}}; +static const GUID MEDIASUBTYPE_WMV_Unknown = {0x7ce12ca9, 0xbfbf, 0x43d9, {0x9d, 0x00, 0x82, 0xb8, 0xed, 0x54, 0x31, 0x6b}}; struct parser { @@ -362,6 +364,7 @@ unsigned int wg_format_get_max_size(const struct wg_format *format) case WG_MAJOR_TYPE_AUDIO_MPEG4: case WG_MAJOR_TYPE_AUDIO_WMA: case WG_MAJOR_TYPE_VIDEO_H264: + case WG_MAJOR_TYPE_VIDEO_WMV: FIXME("Format %u not implemented!\n", format->major_type); return 0; @@ -532,6 +535,7 @@ bool amt_from_wg_format(AM_MEDIA_TYPE *mt, const struct wg_format *format, bool case WG_MAJOR_TYPE_AUDIO_MPEG4: case WG_MAJOR_TYPE_AUDIO_WMA: case WG_MAJOR_TYPE_VIDEO_H264: + case WG_MAJOR_TYPE_VIDEO_WMV: FIXME("Format %u not implemented!\n", format->major_type); /* fallthrough */ case WG_MAJOR_TYPE_UNKNOWN: @@ -723,12 +727,55 @@ static bool amt_to_wg_format_video(const AM_MEDIA_TYPE *mt, struct wg_format *fo return false; } +static bool amt_to_wg_format_video_wmv(const AM_MEDIA_TYPE *mt, struct wg_format *format) +{ + const VIDEOINFOHEADER *video_format = (const VIDEOINFOHEADER *)mt->pbFormat; + + if (!IsEqualGUID(&mt->formattype, &FORMAT_VideoInfo)) + { + FIXME("Unknown format type %s.\n", debugstr_guid(&mt->formattype)); + return false; + } + if (mt->cbFormat < sizeof(VIDEOINFOHEADER) || !mt->pbFormat) + { + ERR("Unexpected format size %lu.\n", mt->cbFormat); + return false; + } + + format->major_type = WG_MAJOR_TYPE_VIDEO_WMV; + format->u.video_wmv.width = video_format->bmiHeader.biWidth; + format->u.video_wmv.height = video_format->bmiHeader.biHeight; + format->u.video_wmv.fps_n = 10000000; + format->u.video_wmv.fps_d = video_format->AvgTimePerFrame; + + if (IsEqualGUID(&mt->subtype, &MEDIASUBTYPE_WMV1)) + format->u.video_wmv.version = 1; + else if (IsEqualGUID(&mt->subtype, &MEDIASUBTYPE_WMV2)) + format->u.video_wmv.version = 2; + else + format->u.video_wmv.version = 3; + + return true; +} + bool amt_to_wg_format(const AM_MEDIA_TYPE *mt, struct wg_format *format) { memset(format, 0, sizeof(*format)); if (IsEqualGUID(&mt->majortype, &MEDIATYPE_Video)) + { + if (IsEqualGUID(&mt->subtype, &MEDIASUBTYPE_WMV1) + || IsEqualGUID(&mt->subtype, &MEDIASUBTYPE_WMV2) + || IsEqualGUID(&mt->subtype, &MEDIASUBTYPE_WMVA) + || IsEqualGUID(&mt->subtype, &MEDIASUBTYPE_WMVP) + || IsEqualGUID(&mt->subtype, &MEDIASUBTYPE_WVP2) + || IsEqualGUID(&mt->subtype, &MEDIASUBTYPE_WMV_Unknown) + || IsEqualGUID(&mt->subtype, &MEDIASUBTYPE_WVC1) + || IsEqualGUID(&mt->subtype, &MEDIASUBTYPE_WMV3) + || IsEqualGUID(&mt->subtype, &MEDIASUBTYPE_VC1S)) + return amt_to_wg_format_video_wmv(mt, format); return amt_to_wg_format_video(mt, format); + } if (IsEqualGUID(&mt->majortype, &MEDIATYPE_Audio)) { if (IsEqualGUID(&mt->subtype, &MEDIASUBTYPE_MPEG1AudioPayload)) diff --git a/dlls/winegstreamer/unixlib.h b/dlls/winegstreamer/unixlib.h index 2b5b8af37d5..5424633003e 100644 --- a/dlls/winegstreamer/unixlib.h +++ b/dlls/winegstreamer/unixlib.h @@ -42,6 +42,7 @@ struct wg_format WG_MAJOR_TYPE_VIDEO, WG_MAJOR_TYPE_VIDEO_CINEPAK, WG_MAJOR_TYPE_VIDEO_H264, + WG_MAJOR_TYPE_VIDEO_WMV, } major_type; union @@ -126,6 +127,12 @@ struct wg_format uint32_t profile; uint32_t level; } video_h264; + struct + { + int32_t width, height; + uint32_t fps_n, fps_d; + uint32_t version; + } video_wmv; } u; }; diff --git a/dlls/winegstreamer/wg_format.c b/dlls/winegstreamer/wg_format.c index 7f28b4d2c90..a7876977d6c 100644 --- a/dlls/winegstreamer/wg_format.c +++ b/dlls/winegstreamer/wg_format.c @@ -554,6 +554,25 @@ static GstCaps *wg_format_to_caps_video_h264(const struct wg_format *format) return caps; } +static GstCaps *wg_format_to_caps_video_wmv(const struct wg_format *format) +{ + GstCaps *caps; + + if (!(caps = gst_caps_new_empty_simple("video/x-wmv"))) + return NULL; + + if (format->u.video_wmv.width) + gst_caps_set_simple(caps, "width", G_TYPE_INT, format->u.video_wmv.width, NULL); + if (format->u.video_wmv.height) + gst_caps_set_simple(caps, "height", G_TYPE_INT, format->u.video_wmv.height, NULL); + if (format->u.video_wmv.fps_d || format->u.video_wmv.fps_n) + gst_caps_set_simple(caps, "framerate", GST_TYPE_FRACTION, format->u.video_wmv.fps_n, format->u.video_wmv.fps_d, NULL); + if (format->u.video_wmv.version) + gst_caps_set_simple(caps, "wmvversion", G_TYPE_INT, format->u.video_wmv.version, NULL); + + return caps; +} + GstCaps *wg_format_to_caps(const struct wg_format *format) { switch (format->major_type) @@ -574,6 +593,8 @@ GstCaps *wg_format_to_caps(const struct wg_format *format) return wg_format_to_caps_video_cinepak(format); case WG_MAJOR_TYPE_VIDEO_H264: return wg_format_to_caps_video_h264(format); + case WG_MAJOR_TYPE_VIDEO_WMV: + return wg_format_to_caps_video_wmv(format); } assert(0); return NULL; @@ -590,6 +611,7 @@ bool wg_format_compare(const struct wg_format *a, const struct wg_format *b) case WG_MAJOR_TYPE_AUDIO_MPEG4: case WG_MAJOR_TYPE_AUDIO_WMA: case WG_MAJOR_TYPE_VIDEO_H264: + case WG_MAJOR_TYPE_VIDEO_WMV: GST_FIXME("Format %u not implemented!", a->major_type); /* fallthrough */ case WG_MAJOR_TYPE_UNKNOWN: diff --git a/dlls/winegstreamer/wg_transform.c b/dlls/winegstreamer/wg_transform.c index a52d7e1f722..302a64eb57b 100644 --- a/dlls/winegstreamer/wg_transform.c +++ b/dlls/winegstreamer/wg_transform.c @@ -439,6 +439,7 @@ NTSTATUS wg_transform_create(void *args) case WG_MAJOR_TYPE_VIDEO: break; case WG_MAJOR_TYPE_UNKNOWN: + case WG_MAJOR_TYPE_VIDEO_WMV: GST_FIXME("Format %u not implemented!", input_format.major_type); gst_caps_unref(raw_caps); goto out; @@ -480,6 +481,7 @@ NTSTATUS wg_transform_create(void *args) case WG_MAJOR_TYPE_VIDEO_CINEPAK: case WG_MAJOR_TYPE_VIDEO_H264: case WG_MAJOR_TYPE_UNKNOWN: + case WG_MAJOR_TYPE_VIDEO_WMV: GST_FIXME("Format %u not implemented!", output_format.major_type); goto out; } diff --git a/dlls/winegstreamer/wm_reader.c b/dlls/winegstreamer/wm_reader.c index 0e9e7927549..18b0e8a90bc 100644 --- a/dlls/winegstreamer/wm_reader.c +++ b/dlls/winegstreamer/wm_reader.c @@ -1577,6 +1577,8 @@ static const char *get_major_type_string(enum wg_major_type type) return "cinepak"; case WG_MAJOR_TYPE_VIDEO_H264: return "h264"; + case WG_MAJOR_TYPE_VIDEO_WMV: + return "wmv"; case WG_MAJOR_TYPE_UNKNOWN: return "unknown"; } @@ -1930,6 +1932,7 @@ static HRESULT WINAPI reader_GetOutputFormat(IWMSyncReader2 *iface, case WG_MAJOR_TYPE_AUDIO_WMA: case WG_MAJOR_TYPE_VIDEO_CINEPAK: case WG_MAJOR_TYPE_VIDEO_H264: + case WG_MAJOR_TYPE_VIDEO_WMV: FIXME("Format %u not implemented!\n", format.major_type); break; case WG_MAJOR_TYPE_UNKNOWN: @@ -1970,6 +1973,7 @@ static HRESULT WINAPI reader_GetOutputFormatCount(IWMSyncReader2 *iface, DWORD o case WG_MAJOR_TYPE_AUDIO_WMA: case WG_MAJOR_TYPE_VIDEO_CINEPAK: case WG_MAJOR_TYPE_VIDEO_H264: + case WG_MAJOR_TYPE_VIDEO_WMV: FIXME("Format %u not implemented!\n", format.major_type); /* fallthrough */ case WG_MAJOR_TYPE_AUDIO:

1 0

Ziqing Hui : winegstreamer: Implement media_object_SetInputType for WMV decoder.
by Alexandre Julliard Dec. 5, 2022

Dec. 5, 2022

Module: wine Branch: master Commit: c5700a63fb032463897995d94ac9cfd7c8b1b9a0 URL: https://gitlab.winehq.org/wine/wine/-/commit/c5700a63fb032463897995d94ac9cf… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Wed Nov 23 18:45:53 2022 +0800 winegstreamer: Implement media_object_SetInputType for WMV decoder. --- dlls/mf/tests/transform.c | 15 --------------- dlls/winegstreamer/wmv_decoder.c | 39 +++++++++++++++++++++++++++++++++++++-- 2 files changed, 37 insertions(+), 17 deletions(-) diff --git a/dlls/mf/tests/transform.c b/dlls/mf/tests/transform.c index ce0ccd6fb7f..09c0e83a7dc 100644 --- a/dlls/mf/tests/transform.c +++ b/dlls/mf/tests/transform.c @@ -4669,10 +4669,8 @@ static void test_wmv_decoder_media_object(void) /* Test setting the type. */ init_dmo_media_type_video(input_type, subtype, 96, 96); hr = IMediaObject_SetInputType(media_object, 0, input_type, DMO_SET_TYPEF_TEST_ONLY); - todo_wine ok(hr == S_OK, "SetInputType returned unexpected hr %#lx.\n", hr); hr = IMediaObject_SetInputType(media_object, 0, input_type, 0); - todo_wine ok(hr == S_OK, "SetInputType returned unexpected hr %#lx.\n", hr); header->dwBitRate = 0xdeadbeef; header->dwBitErrorRate = 0xdeadbeef; @@ -4683,41 +4681,35 @@ static void test_wmv_decoder_media_object(void) header->bmiHeader.biXPelsPerMeter = 0xdead; header->bmiHeader.biYPelsPerMeter = 0xdead; hr = IMediaObject_SetInputType(media_object, 0, input_type, 0); - todo_wine ok(hr == S_OK, "SetInputType returned unexpected hr %#lx.\n", hr); /* Test invalid major type. */ init_dmo_media_type_video(input_type, subtype, 96, 96); input_type->majortype = MFMediaType_Default; hr = IMediaObject_SetInputType(media_object, 0, input_type, DMO_SET_TYPEF_TEST_ONLY); - todo_wine ok(hr == DMO_E_TYPE_NOT_ACCEPTED, "SetInputType returned unexpected hr %#lx.\n", hr); /* Test invalid subtype. */ init_dmo_media_type_video(input_type, &MEDIASUBTYPE_None, 96, 96); hr = IMediaObject_SetInputType(media_object, 0, input_type, DMO_SET_TYPEF_TEST_ONLY); - todo_wine ok(hr == DMO_E_TYPE_NOT_ACCEPTED, "SetInputType returned unexpected hr %#lx.\n", hr); /* Test invalid format type. */ init_dmo_media_type_video(input_type, subtype, 96, 96); input_type->formattype = FORMAT_None; hr = IMediaObject_SetInputType(media_object, 0, input_type, DMO_SET_TYPEF_TEST_ONLY); - todo_wine ok(hr == DMO_E_TYPE_NOT_ACCEPTED, "SetInputType returned unexpected hr %#lx.\n", hr); /* Test invalid format size. */ init_dmo_media_type_video(input_type, subtype, 96, 96); input_type->cbFormat = 1; hr = IMediaObject_SetInputType(media_object, 0, input_type, DMO_SET_TYPEF_TEST_ONLY); - todo_wine ok(hr == DMO_E_TYPE_NOT_ACCEPTED, "SetInputType returned unexpected hr %#lx.\n", hr); /* Test NULL format pointer. */ init_dmo_media_type_video(input_type, subtype, 96, 96); input_type->pbFormat = NULL; hr = IMediaObject_SetInputType(media_object, 0, input_type, DMO_SET_TYPEF_TEST_ONLY); - todo_wine ok(hr == DMO_E_TYPE_NOT_ACCEPTED, "SetInputType returned unexpected hr %#lx.\n", hr); /* Test video header struct size. */ @@ -4751,7 +4743,6 @@ static void test_wmv_decoder_media_object(void) ok(hr == DMO_E_TYPE_NOT_ACCEPTED, "SetInputType returned unexpected hr %#lx.\n", hr); header->bmiHeader.biWidth = 4096; hr = IMediaObject_SetInputType(media_object, 0, input_type, DMO_SET_TYPEF_TEST_ONLY); - todo_wine ok(hr == S_OK, "SetInputType returned unexpected hr %#lx.\n", hr); /* Test height. */ @@ -4766,11 +4757,9 @@ static void test_wmv_decoder_media_object(void) ok(hr == DMO_E_TYPE_NOT_ACCEPTED, "SetInputType returned unexpected hr %#lx.\n", hr); header->bmiHeader.biHeight = 4096; hr = IMediaObject_SetInputType(media_object, 0, input_type, DMO_SET_TYPEF_TEST_ONLY); - todo_wine ok(hr == S_OK, "SetInputType returned unexpected hr %#lx.\n", hr); header->bmiHeader.biHeight = -4096; hr = IMediaObject_SetInputType(media_object, 0, input_type, DMO_SET_TYPEF_TEST_ONLY); - todo_wine ok(hr == S_OK, "SetInputType returned unexpected hr %#lx.\n", hr); /* Test compression. */ @@ -4781,15 +4770,12 @@ static void test_wmv_decoder_media_object(void) ok(hr == DMO_E_TYPE_NOT_ACCEPTED, "SetInputType returned unexpected hr %#lx.\n", hr); header->bmiHeader.biCompression = 1; hr = IMediaObject_SetInputType(media_object, 0, input_type, DMO_SET_TYPEF_TEST_ONLY); - todo_wine ok(hr == S_OK, "SetInputType returned unexpected hr %#lx.\n", hr); header->bmiHeader.biCompression = 2; hr = IMediaObject_SetInputType(media_object, 0, input_type, DMO_SET_TYPEF_TEST_ONLY); - todo_wine ok(hr == S_OK, "SetInputType returned unexpected hr %#lx.\n", hr); header->bmiHeader.biCompression = 0xdeadbeef; hr = IMediaObject_SetInputType(media_object, 0, input_type, DMO_SET_TYPEF_TEST_ONLY); - todo_wine ok(hr == S_OK, "SetInputType returned unexpected hr %#lx.\n", hr); winetest_pop_context(); @@ -4813,7 +4799,6 @@ static void test_wmv_decoder_media_object(void) type = NULL; hr = IMediaObject_SetInputType(media_object, test->stream_index, type, test->flags); - todo_wine ok(hr == test->hr, "SetInputType returned unexpected hr %#lx, expected %#lx.\n", hr, test->hr); winetest_pop_context(); diff --git a/dlls/winegstreamer/wmv_decoder.c b/dlls/winegstreamer/wmv_decoder.c index 96a2839660a..1b03d9aa639 100644 --- a/dlls/winegstreamer/wmv_decoder.c +++ b/dlls/winegstreamer/wmv_decoder.c @@ -55,6 +55,8 @@ struct wmv_decoder IPropertyStore IPropertyStore_iface; IUnknown *outer; LONG refcount; + + struct wg_format input_format; }; static inline struct wmv_decoder *impl_from_IUnknown(IUnknown *iface) @@ -392,8 +394,41 @@ static HRESULT WINAPI media_object_GetOutputType(IMediaObject *iface, DWORD inde static HRESULT WINAPI media_object_SetInputType(IMediaObject *iface, DWORD index, const DMO_MEDIA_TYPE *type, DWORD flags) { - FIXME("iface %p, index %lu, type %p, flags %#lx stub!\n", iface, index, type, flags); - return E_NOTIMPL; + struct wmv_decoder *decoder = impl_from_IMediaObject(iface); + struct wg_format wg_format; + unsigned int i; + + TRACE("iface %p, index %lu, type %p, flags %#lx.\n", iface, index, type, flags); + + if (index > 0) + return DMO_E_INVALIDSTREAMINDEX; + + if (!type) + { + if (flags & DMO_SET_TYPEF_CLEAR) + { + memset(&decoder->input_format, 0, sizeof(decoder->input_format)); + return S_OK; + } + return DMO_E_TYPE_NOT_ACCEPTED; + } + + if (!IsEqualGUID(&type->majortype, &MEDIATYPE_Video)) + return DMO_E_TYPE_NOT_ACCEPTED; + + for (i = 0; i < ARRAY_SIZE(wmv_decoder_input_types); ++i) + if (IsEqualGUID(&type->subtype, wmv_decoder_input_types[i])) + break; + if (i == ARRAY_SIZE(wmv_decoder_input_types)) + return DMO_E_TYPE_NOT_ACCEPTED; + + if (!amt_to_wg_format((const AM_MEDIA_TYPE *)type, &wg_format)) + return DMO_E_TYPE_NOT_ACCEPTED; + + if (!(flags & DMO_SET_TYPEF_TEST_ONLY)) + decoder->input_format = wg_format; + + return S_OK; } static HRESULT WINAPI media_object_SetOutputType(IMediaObject *iface, DWORD index,

1 0

Ziqing Hui : mf/tests: Test IMediaObject_SetInputType for WMV decoder.
by Alexandre Julliard Dec. 5, 2022

Dec. 5, 2022

Module: wine Branch: master Commit: 1ddf00ab71bd30df7421264009ec163214a1742f URL: https://gitlab.winehq.org/wine/wine/-/commit/1ddf00ab71bd30df7421264009ec16… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Wed Nov 23 12:03:48 2022 +0800 mf/tests: Test IMediaObject_SetInputType for WMV decoder. --- dlls/mf/tests/transform.c | 240 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 239 insertions(+), 1 deletion(-)

1 0

Piotr Caban : winprint: Register winprint print processor.
by Alexandre Julliard Dec. 5, 2022

Dec. 5, 2022

Module: wine Branch: master Commit: 3285363da68b9b0839f2467977c417324b1f0573 URL: https://gitlab.winehq.org/wine/wine/-/commit/3285363da68b9b0839f2467977c417… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Dec 5 17:20:51 2022 +0100 winprint: Register winprint print processor. --- dlls/winprint/printproc.c | 7 +++++++ dlls/winprint/winprint.spec | 1 + loader/wine.inf.in | 1 + 3 files changed, 9 insertions(+) diff --git a/dlls/winprint/printproc.c b/dlls/winprint/printproc.c index 03275bb4afb..3c2fb3ad3c8 100644 --- a/dlls/winprint/printproc.c +++ b/dlls/winprint/printproc.c @@ -193,3 +193,10 @@ BOOL WINAPI ClosePrintProcessor(HANDLE pp) LocalFree(data); return TRUE; } + +HRESULT WINAPI DllRegisterServer(void) +{ + AddPrintProcessorW(NULL, (WCHAR *)L"Windows 4.0", (WCHAR *)L"winprint.dll", (WCHAR *)L"winprint"); + AddPrintProcessorW(NULL, NULL, (WCHAR *)L"winprint.dll", (WCHAR *)L"winprint"); + return S_OK; +} diff --git a/dlls/winprint/winprint.spec b/dlls/winprint/winprint.spec index b7b4642b695..5389f678528 100644 --- a/dlls/winprint/winprint.spec +++ b/dlls/winprint/winprint.spec @@ -1,3 +1,4 @@ +@ stdcall -private DllRegisterServer() @ stdcall ClosePrintProcessor(ptr) @ stdcall ControlPrintProcessor(ptr long) @ stdcall EnumPrintProcessorDatatypesW(ptr ptr long ptr long ptr ptr) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 127d1f9ad6a..32a74a5950e 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2077,6 +2077,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,winegstreamer.dll,1 11,,wineqtdecoder.dll,1 11,,winevulkan.dll,1 +55,,winprint.dll,1 11,,wintrust.dll,1 11,,iexplore.exe,1

1 0

Sven Baars : mstask: Don't assume a ONCE trigger is on the current day.
by Alexandre Julliard Dec. 5, 2022

Dec. 5, 2022

Module: wine Branch: master Commit: 7f73494302b337eeb474879842ed8072ffcc8f2e URL: https://gitlab.winehq.org/wine/wine/-/commit/7f73494302b337eeb474879842ed80… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Fri Dec 2 14:26:15 2022 +0100 mstask: Don't assume a ONCE trigger is on the current day. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52994 --- dlls/mstask/task.c | 3 +++ dlls/mstask/tests/task_trigger.c | 16 ++++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index d2a03aa8b56..3f3637f13a1 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -516,6 +516,9 @@ static HRESULT WINAPI MSTASK_ITask_GetNextRunTime(ITask *iface, SYSTEMTIME *rt) case TASK_TIME_TRIGGER_ONCE: st = current_st; + st.wYear = This->trigger[i].wBeginYear; + st.wMonth = This->trigger[i].wBeginMonth; + st.wDay = This->trigger[i].wBeginDay; st.wHour = This->trigger[i].wStartHour; st.wMinute = This->trigger[i].wStartMinute; st.wSecond = 0; diff --git a/dlls/mstask/tests/task_trigger.c b/dlls/mstask/tests/task_trigger.c index 24b873770d2..236540cf0ee 100644 --- a/dlls/mstask/tests/task_trigger.c +++ b/dlls/mstask/tests/task_trigger.c @@ -525,6 +525,22 @@ static void test_GetNextRunTime(void) hr = ITaskTrigger_SetTrigger(trigger, &data); ok(hr == S_OK, "got %#lx\n", hr); + memset(&st, 0xff, sizeof(st)); + hr = ITask_GetNextRunTime(task, &st); + ok(hr == S_OK, "got %#lx\n", hr); + ok(!memcmp(&st, &cmp, sizeof(st)), "got %u/%u/%u wday %u %u:%02u:%02u\n", + st.wDay, st.wMonth, st.wYear, st.wDayOfWeek, + st.wHour, st.wMinute, st.wSecond); + + hr = ITaskTrigger_GetTrigger(trigger, &data); + ok(hr == S_OK, "got %#lx\n", hr); + data.rgFlags &= ~TASK_TRIGGER_FLAG_DISABLED; + data.TriggerType = TASK_TIME_TRIGGER_ONCE; + /* add 1 day to test triggers in the far future */ + trigger_add_ms(&data, 24 * 60 * 60 * 1000, &cmp); + hr = ITaskTrigger_SetTrigger(trigger, &data); + ok(hr == S_OK, "got %#lx\n", hr); + memset(&st, 0xff, sizeof(st)); hr = ITask_GetNextRunTime(task, &st); ok(hr == S_OK, "got %#lx\n", hr);

1 0

Eric Pouech : wineconsole: Set launched process name as created console title.
by Alexandre Julliard Dec. 5, 2022

Dec. 5, 2022

Module: wine Branch: master Commit: cd0e949519cce5bda73d661a3bfbec2993bd3724 URL: https://gitlab.winehq.org/wine/wine/-/commit/cd0e949519cce5bda73d661a3bfbec… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Sun Dec 4 11:21:44 2022 +0100 wineconsole: Set launched process name as created console title. wineconsole was setting created console's title to '????\wineconsole.exe'. This was preventing conhost to load its configuration according to first running command path. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- programs/wineconsole/wineconsole.c | 38 ++++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/programs/wineconsole/wineconsole.c b/programs/wineconsole/wineconsole.c index 1924bf791e6..aeeee11aa86 100644 --- a/programs/wineconsole/wineconsole.c +++ b/programs/wineconsole/wineconsole.c @@ -41,36 +41,38 @@ int WINAPI wWinMain( HINSTANCE inst, HINSTANCE prev, WCHAR *cmdline, INT show ) static WCHAR default_cmd[] = L"cmd"; - FreeConsole(); /* make sure we're not connected to inherited console */ - if (!AllocConsole()) - { - ERR( "failed to allocate console: %lu\n", GetLastError() ); - return 1; - } - if (!*cmd) cmd = default_cmd; - startup.dwFlags = STARTF_USESTDHANDLES; - startup.hStdInput = CreateFileW( L"CONIN$", GENERIC_READ | GENERIC_WRITE, 0, NULL, - OPEN_EXISTING, 0, 0 ); - startup.hStdOutput = CreateFileW( L"CONOUT$", GENERIC_READ | GENERIC_WRITE, 0, NULL, - OPEN_EXISTING, 0, 0 ); - startup.hStdError = startup.hStdOutput; - - if (!CreateProcessW( NULL, cmd, NULL, NULL, FALSE, 0, NULL, NULL, &startup, &info )) + if (!CreateProcessW( NULL, cmd, NULL, NULL, FALSE, CREATE_NEW_CONSOLE, NULL, NULL, &startup, &info )) { + HANDLE hStdInput, hStdOutput; WCHAR format[256], *buf; INPUT_RECORD ir; DWORD len; + exit_code = GetLastError(); - WARN( "CreateProcess failed: %lu\n", exit_code ); + WARN( "CreateProcess '%ls' failed: %lu\n", cmd, exit_code ); + + /* create a new console to display error messages in it */ + FreeConsole(); /* make sure we're not connected to any console */ + if (!AllocConsole()) + { + ERR( "failed to allocate console: %lu\n", GetLastError() ); + return 1; + } + + hStdInput = CreateFileW( L"CONIN$", GENERIC_READ | GENERIC_WRITE, 0, NULL, + OPEN_EXISTING, 0, 0 ); + hStdOutput = CreateFileW( L"CONOUT$", GENERIC_READ | GENERIC_WRITE, 0, NULL, + OPEN_EXISTING, 0, 0 ); + LoadStringW( GetModuleHandleW( NULL ), IDS_CMD_LAUNCH_FAILED, format, ARRAY_SIZE(format) ); len = wcslen( format ) + wcslen( cmd ); if ((buf = malloc( len * sizeof(WCHAR) ))) { swprintf( buf, len, format, cmd ); - WriteConsoleW( startup.hStdOutput, buf, wcslen(buf), &len, NULL); - while (ReadConsoleInputW( startup.hStdInput, &ir, 1, &len ) && ir.EventType == MOUSE_EVENT); + WriteConsoleW( hStdOutput, buf, wcslen(buf), &len, NULL); + while (ReadConsoleInputW( hStdInput, &ir, 1, &len ) && ir.EventType == MOUSE_EVENT); } return exit_code; }

1 0

Alex Henrie : shell32: Don't use GetProcAddress for GetOpenFileName[AW].
by Alexandre Julliard Dec. 5, 2022

Dec. 5, 2022

Module: wine Branch: master Commit: a1ffd507e47c19fd803643aea42b9fefa90c8dea URL: https://gitlab.winehq.org/wine/wine/-/commit/a1ffd507e47c19fd803643aea42b9f… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Dec 1 20:16:00 2022 -0700 shell32: Don't use GetProcAddress for GetOpenFileName[AW]. --- dlls/shell32/Makefile.in | 2 +- dlls/shell32/dialogs.c | 14 +------------- dlls/shell32/shellord.c | 28 ++-------------------------- 3 files changed, 4 insertions(+), 40 deletions(-) diff --git a/dlls/shell32/Makefile.in b/dlls/shell32/Makefile.in index 9e2395126fc..13af5aa0dfc 100644 --- a/dlls/shell32/Makefile.in +++ b/dlls/shell32/Makefile.in @@ -1,7 +1,7 @@ MODULE = shell32.dll IMPORTLIB = shell32 IMPORTS = uuid shlwapi user32 gdi32 advapi32 -DELAYIMPORTS = ole32 oleaut32 shdocvw version comctl32 gdiplus +DELAYIMPORTS = ole32 oleaut32 shdocvw version comctl32 comdlg32 gdiplus C_SRCS = \ appbar.c \ diff --git a/dlls/shell32/dialogs.c b/dlls/shell32/dialogs.c index 9d35e15c3f4..a2ab99499b5 100644 --- a/dlls/shell32/dialogs.c +++ b/dlls/shell32/dialogs.c @@ -271,8 +271,6 @@ static INT_PTR CALLBACK RunDlgProc (HWND hwnd, UINT message, WPARAM wParam, LPAR case IDC_RUNDLG_BROWSE : { - HMODULE hComdlg = NULL ; - LPFNOFN ofnProc = NULL ; WCHAR szFName[1024] = {0}; WCHAR filter_exe[256], filter_all[256], filter[MAX_PATH], szCaption[MAX_PATH]; OPENFILENAMEW ofn; @@ -292,15 +290,7 @@ static INT_PTR CALLBACK RunDlgProc (HWND hwnd, UINT message, WPARAM wParam, LPAR ofn.Flags = OFN_ENABLESIZING | OFN_FILEMUSTEXIST | OFN_HIDEREADONLY | OFN_PATHMUSTEXIST; ofn.lpstrInitialDir = prfdp->lpstrDirectory; - if (NULL == (hComdlg = LoadLibraryExW (L"comdlg32.dll", NULL, 0)) || - NULL == (ofnProc = (LPFNOFN)GetProcAddress (hComdlg, "GetOpenFileNameW"))) - { - ERR("Couldn't get GetOpenFileName function entry (lib=%p, proc=%p)\n", hComdlg, ofnProc); - ShellMessageBoxW(shell32_hInstance, hwnd, MAKEINTRESOURCEW(IDS_RUNDLG_BROWSE_ERROR), NULL, MB_OK | MB_ICONERROR); - return TRUE ; - } - - if (ofnProc(&ofn)) + if (GetOpenFileNameW(&ofn)) { SetFocus (GetDlgItem (hwnd, IDOK)) ; SetWindowTextW (GetDlgItem (hwnd, IDC_RUNDLG_EDITPATH), szFName) ; @@ -308,8 +298,6 @@ static INT_PTR CALLBACK RunDlgProc (HWND hwnd, UINT message, WPARAM wParam, LPAR SetFocus (GetDlgItem (hwnd, IDOK)) ; } - FreeLibrary (hComdlg) ; - return TRUE ; } } diff --git a/dlls/shell32/shellord.c b/dlls/shell32/shellord.c index 66e5caf08da..ac5864cb682 100644 --- a/dlls/shell32/shellord.c +++ b/dlls/shell32/shellord.c @@ -188,8 +188,6 @@ static BOOL GetFileNameFromBrowseA( LPCSTR lpstrFilter, LPCSTR lpstrTitle) { - HMODULE hmodule; - BOOL (WINAPI *pGetOpenFileNameA)(LPOPENFILENAMEA); OPENFILENAMEA ofn; BOOL ret; @@ -197,15 +195,6 @@ static BOOL GetFileNameFromBrowseA( hwndOwner, lpstrFile, nMaxFile, lpstrInitialDir, lpstrDefExt, lpstrFilter, lpstrTitle); - hmodule = LoadLibraryA("comdlg32.dll"); - if(!hmodule) return FALSE; - pGetOpenFileNameA = (void *)GetProcAddress(hmodule, "GetOpenFileNameA"); - if(!pGetOpenFileNameA) - { - FreeLibrary(hmodule); - return FALSE; - } - memset(&ofn, 0, sizeof(ofn)); ofn.lStructSize = sizeof(ofn); @@ -217,9 +206,8 @@ static BOOL GetFileNameFromBrowseA( ofn.lpstrTitle = lpstrTitle; ofn.lpstrDefExt = lpstrDefExt; ofn.Flags = OFN_EXPLORER | OFN_HIDEREADONLY | OFN_FILEMUSTEXIST; - ret = pGetOpenFileNameA(&ofn); + ret = GetOpenFileNameA(&ofn); - FreeLibrary(hmodule); return ret; } @@ -235,8 +223,6 @@ static BOOL GetFileNameFromBrowseW( LPCWSTR lpstrFilter, LPCWSTR lpstrTitle) { - HMODULE hmodule; - BOOL (WINAPI *pGetOpenFileNameW)(LPOPENFILENAMEW); OPENFILENAMEW ofn; BOOL ret; @@ -244,15 +230,6 @@ static BOOL GetFileNameFromBrowseW( hwndOwner, debugstr_w(lpstrFile), nMaxFile, debugstr_w(lpstrInitialDir), debugstr_w(lpstrDefExt), debugstr_w(lpstrFilter), debugstr_w(lpstrTitle)); - hmodule = LoadLibraryA("comdlg32.dll"); - if(!hmodule) return FALSE; - pGetOpenFileNameW = (void *)GetProcAddress(hmodule, "GetOpenFileNameW"); - if(!pGetOpenFileNameW) - { - FreeLibrary(hmodule); - return FALSE; - } - memset(&ofn, 0, sizeof(ofn)); ofn.lStructSize = sizeof(ofn); @@ -264,9 +241,8 @@ static BOOL GetFileNameFromBrowseW( ofn.lpstrTitle = lpstrTitle; ofn.lpstrDefExt = lpstrDefExt; ofn.Flags = OFN_EXPLORER | OFN_HIDEREADONLY | OFN_FILEMUSTEXIST; - ret = pGetOpenFileNameW(&ofn); + ret = GetOpenFileNameW(&ofn); - FreeLibrary(hmodule); return ret; }

1 0