April 2024 - Wine-commits - list.winehq.org

Ziqing Hui : winegstreamer/video_decoder: Change decoder attributes.
by Alexandre Julliard 29 Apr '24

29 Apr '24

Module: wine Branch: master Commit: 08fa6367b05dc1ff7ef4310e91c3e5cc29ec035f URL: https://gitlab.winehq.org/wine/wine/-/commit/08fa6367b05dc1ff7ef4310e91c3e5… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Wed Apr 24 10:31:51 2024 +0800 winegstreamer/video_decoder: Change decoder attributes. --- dlls/mf/tests/transform.c | 4 ++-- dlls/winegstreamer/video_decoder.c | 16 +++++++++++----- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/dlls/mf/tests/transform.c b/dlls/mf/tests/transform.c index d1d52d62458..2a90c49f96e 100644 --- a/dlls/mf/tests/transform.c +++ b/dlls/mf/tests/transform.c @@ -3932,9 +3932,9 @@ static void test_h264_decoder(void) static const struct attribute_desc expect_transform_attributes[] = { ATTR_UINT32(MF_LOW_LATENCY, 0), - ATTR_UINT32(MF_SA_D3D_AWARE, 1, .todo = TRUE), + ATTR_UINT32(MF_SA_D3D_AWARE, 1), ATTR_UINT32(MF_SA_D3D11_AWARE, 1), - ATTR_UINT32(MFT_DECODER_EXPOSE_OUTPUT_TYPES_IN_NATIVE_ORDER, 0, .todo = TRUE), + ATTR_UINT32(MFT_DECODER_EXPOSE_OUTPUT_TYPES_IN_NATIVE_ORDER, 0), /* more H264 decoder specific attributes from CODECAPI */ ATTR_UINT32(AVDecVideoAcceleration_H264, 1), {0}, diff --git a/dlls/winegstreamer/video_decoder.c b/dlls/winegstreamer/video_decoder.c index 61ae579686e..2aedbdf1402 100644 --- a/dlls/winegstreamer/video_decoder.c +++ b/dlls/winegstreamer/video_decoder.c @@ -835,11 +835,11 @@ static HRESULT video_decoder_create_with_types(const GUID *const *input_types, U goto failed; if (FAILED(hr = MFCreateAttributes(&decoder->attributes, 16))) goto failed; - if (FAILED(hr = IMFAttributes_SetUINT32(decoder->attributes, &MF_LOW_LATENCY, 0))) - goto failed; - if (FAILED(hr = IMFAttributes_SetUINT32(decoder->attributes, &MF_SA_D3D11_AWARE, TRUE))) - goto failed; - if (FAILED(hr = IMFAttributes_SetUINT32(decoder->attributes, &AVDecVideoAcceleration_H264, TRUE))) + if (FAILED(hr = IMFAttributes_SetUINT32(decoder->attributes, &MF_LOW_LATENCY, FALSE)) + || FAILED(hr = IMFAttributes_SetUINT32(decoder->attributes, &MF_SA_D3D_AWARE, TRUE)) + || FAILED(hr = IMFAttributes_SetUINT32(decoder->attributes, &MF_SA_D3D11_AWARE, TRUE)) + || FAILED(hr = IMFAttributes_SetUINT32(decoder->attributes, + &MFT_DECODER_EXPOSE_OUTPUT_TYPES_IN_NATIVE_ORDER, FALSE))) goto failed; if (FAILED(hr = MFCreateAttributes(&decoder->output_attributes, 0))) @@ -909,6 +909,12 @@ HRESULT h264_decoder_create(REFIID riid, void **out) return hr; decoder = impl_from_IMFTransform(iface); + if (FAILED(hr = IMFAttributes_SetUINT32(decoder->attributes, &AVDecVideoAcceleration_H264, TRUE))) + { + IMFTransform_Release(iface); + return hr; + } + decoder->input_info.dwFlags = MFT_INPUT_STREAM_WHOLE_SAMPLES | MFT_INPUT_STREAM_SINGLE_SAMPLE_PER_BUFFER | MFT_INPUT_STREAM_FIXED_SAMPLE_SIZE; decoder->input_info.cbSize = 0x1000;

1 0

Ziqing Hui : winegstreamer/video_decoder: Add wg_transform_attrs member.
by Alexandre Julliard 29 Apr '24

29 Apr '24

Module: wine Branch: master Commit: 930eabfff9d38de0e8804eb00c73eda0de776293 URL: https://gitlab.winehq.org/wine/wine/-/commit/930eabfff9d38de0e8804eb00c73ed… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Mon Apr 15 11:01:44 2024 +0800 winegstreamer/video_decoder: Add wg_transform_attrs member. --- dlls/winegstreamer/video_decoder.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/winegstreamer/video_decoder.c b/dlls/winegstreamer/video_decoder.c index 2aedbdf1402..065f2608ef8 100644 --- a/dlls/winegstreamer/video_decoder.c +++ b/dlls/winegstreamer/video_decoder.c @@ -64,6 +64,7 @@ struct video_decoder IMFMediaType *stream_type; wg_transform_t wg_transform; + struct wg_transform_attrs wg_transform_attrs; struct wg_sample_queue *wg_sample_queue; IMFVideoSampleAllocatorEx *allocator; @@ -84,12 +85,6 @@ static HRESULT try_create_wg_transform(struct video_decoder *decoder) * transform to be able to queue its input buffers. We need to use a buffer list * to match its expectations. */ - struct wg_transform_attrs attrs = - { - .output_plane_align = 15, - .input_queue_length = 15, - .allow_size_change = TRUE, - }; struct wg_format input_format; struct wg_format output_format; UINT32 low_latency; @@ -107,9 +102,9 @@ static HRESULT try_create_wg_transform(struct video_decoder *decoder) return MF_E_INVALIDMEDIATYPE; if (SUCCEEDED(IMFAttributes_GetUINT32(decoder->attributes, &MF_LOW_LATENCY, &low_latency))) - attrs.low_latency = !!low_latency; + decoder->wg_transform_attrs.low_latency = !!low_latency; - if (!(decoder->wg_transform = wg_transform_create(&input_format, &output_format, &attrs))) + if (!(decoder->wg_transform = wg_transform_create(&input_format, &output_format, &decoder->wg_transform_attrs))) { ERR("Failed to create transform with input major_type %u.\n", input_format.major_type); return E_FAIL; @@ -851,6 +846,9 @@ static HRESULT video_decoder_create_with_types(const GUID *const *input_types, U if (FAILED(hr = MFCreateSampleCopierMFT(&decoder->copier))) goto failed; + decoder->wg_transform_attrs.output_plane_align = 15; + decoder->wg_transform_attrs.input_queue_length = 15; + *ret = &decoder->IMFTransform_iface; TRACE("Created decoder %p\n", *ret); return S_OK; @@ -922,6 +920,8 @@ HRESULT h264_decoder_create(REFIID riid, void **out) | MFT_OUTPUT_STREAM_FIXED_SAMPLE_SIZE; decoder->output_info.cbSize = 1920 * 1088 * 2; + decoder->wg_transform_attrs.allow_size_change = TRUE; + hr = IMFTransform_QueryInterface(iface, riid, out); IMFTransform_Release(iface); return hr;

1 0

Ziqing Hui : winegstreamer/video_decoder: Support aggregation.
by Alexandre Julliard 29 Apr '24

29 Apr '24

Module: wine Branch: master Commit: 181b609f565125a5774f7cf852d81286697c9b12 URL: https://gitlab.winehq.org/wine/wine/-/commit/181b609f565125a5774f7cf852d812… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Wed Apr 17 17:04:48 2024 +0800 winegstreamer/video_decoder: Support aggregation. --- dlls/winegstreamer/video_decoder.c | 134 +++++++++++++++++++++++-------------- 1 file changed, 83 insertions(+), 51 deletions(-) diff --git a/dlls/winegstreamer/video_decoder.c b/dlls/winegstreamer/video_decoder.c index 065f2608ef8..4824e317174 100644 --- a/dlls/winegstreamer/video_decoder.c +++ b/dlls/winegstreamer/video_decoder.c @@ -45,7 +45,9 @@ static const GUID *const video_decoder_output_types[] = struct video_decoder { + IUnknown IUnknown_inner; IMFTransform IMFTransform_iface; + IUnknown *outer; LONG refcount; IMFAttributes *attributes; @@ -73,6 +75,79 @@ struct video_decoder IMFMediaBuffer *temp_buffer; }; +static inline struct video_decoder *impl_from_IUnknown(IUnknown *iface) +{ + return CONTAINING_RECORD(iface, struct video_decoder, IUnknown_inner); +} + +static HRESULT WINAPI unknown_QueryInterface(IUnknown *iface, REFIID iid, void **out) +{ + struct video_decoder *decoder = impl_from_IUnknown(iface); + + TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); + + if (IsEqualGUID(iid, &IID_IUnknown)) + *out = &decoder->IUnknown_inner; + else if (IsEqualGUID(iid, &IID_IMFTransform)) + *out = &decoder->IMFTransform_iface; + else + { + *out = NULL; + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown *)*out); + return S_OK; +} + +static ULONG WINAPI unknown_AddRef(IUnknown *iface) +{ + struct video_decoder *decoder = impl_from_IUnknown(iface); + ULONG refcount = InterlockedIncrement(&decoder->refcount); + + TRACE("iface %p increasing refcount to %lu.\n", decoder, refcount); + + return refcount; +} + +static ULONG WINAPI unknown_Release(IUnknown *iface) +{ + struct video_decoder *decoder = impl_from_IUnknown(iface); + ULONG refcount = InterlockedDecrement(&decoder->refcount); + + TRACE("iface %p decreasing refcount to %lu.\n", decoder, refcount); + + if (!refcount) + { + IMFTransform_Release(decoder->copier); + IMFVideoSampleAllocatorEx_Release(decoder->allocator); + if (decoder->temp_buffer) + IMFMediaBuffer_Release(decoder->temp_buffer); + if (decoder->wg_transform) + wg_transform_destroy(decoder->wg_transform); + if (decoder->input_type) + IMFMediaType_Release(decoder->input_type); + if (decoder->output_type) + IMFMediaType_Release(decoder->output_type); + if (decoder->output_attributes) + IMFAttributes_Release(decoder->output_attributes); + if (decoder->attributes) + IMFAttributes_Release(decoder->attributes); + wg_sample_queue_destroy(decoder->wg_sample_queue); + free(decoder); + } + + return refcount; +} + +static const IUnknownVtbl unknown_vtbl = +{ + unknown_QueryInterface, + unknown_AddRef, + unknown_Release, +}; + static struct video_decoder *impl_from_IMFTransform(IMFTransform *iface) { return CONTAINING_RECORD(iface, struct video_decoder, IMFTransform_iface); @@ -230,62 +305,17 @@ static void uninit_allocator(struct video_decoder *decoder) static HRESULT WINAPI transform_QueryInterface(IMFTransform *iface, REFIID iid, void **out) { - struct video_decoder *decoder = impl_from_IMFTransform(iface); - - TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); - - if (IsEqualGUID(iid, &IID_IUnknown) || - IsEqualGUID(iid, &IID_IMFTransform)) - *out = &decoder->IMFTransform_iface; - else - { - *out = NULL; - WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); - return E_NOINTERFACE; - } - - IUnknown_AddRef((IUnknown *)*out); - return S_OK; + return IUnknown_QueryInterface(impl_from_IMFTransform(iface)->outer, iid, out); } static ULONG WINAPI transform_AddRef(IMFTransform *iface) { - struct video_decoder *decoder = impl_from_IMFTransform(iface); - ULONG refcount = InterlockedIncrement(&decoder->refcount); - - TRACE("iface %p increasing refcount to %lu.\n", decoder, refcount); - - return refcount; + return IUnknown_AddRef(impl_from_IMFTransform(iface)->outer); } static ULONG WINAPI transform_Release(IMFTransform *iface) { - struct video_decoder *decoder = impl_from_IMFTransform(iface); - ULONG refcount = InterlockedDecrement(&decoder->refcount); - - TRACE("iface %p decreasing refcount to %lu.\n", decoder, refcount); - - if (!refcount) - { - IMFTransform_Release(decoder->copier); - IMFVideoSampleAllocatorEx_Release(decoder->allocator); - if (decoder->temp_buffer) - IMFMediaBuffer_Release(decoder->temp_buffer); - if (decoder->wg_transform) - wg_transform_destroy(decoder->wg_transform); - if (decoder->input_type) - IMFMediaType_Release(decoder->input_type); - if (decoder->output_type) - IMFMediaType_Release(decoder->output_type); - if (decoder->output_attributes) - IMFAttributes_Release(decoder->output_attributes); - if (decoder->attributes) - IMFAttributes_Release(decoder->attributes); - wg_sample_queue_destroy(decoder->wg_sample_queue); - free(decoder); - } - - return refcount; + return IUnknown_Release(impl_from_IMFTransform(iface)->outer); } static HRESULT WINAPI transform_GetStreamLimits(IMFTransform *iface, DWORD *input_minimum, @@ -810,7 +840,7 @@ static const IMFTransformVtbl transform_vtbl = }; static HRESULT video_decoder_create_with_types(const GUID *const *input_types, UINT input_type_count, - const GUID *const *output_types, UINT output_type_count, IMFTransform **ret) + const GUID *const *output_types, UINT output_type_count, IUnknown *outer, IMFTransform **ret) { struct video_decoder *decoder; HRESULT hr; @@ -818,8 +848,10 @@ static HRESULT video_decoder_create_with_types(const GUID *const *input_types, U if (!(decoder = calloc(1, sizeof(*decoder)))) return E_OUTOFMEMORY; + decoder->IUnknown_inner.lpVtbl = &unknown_vtbl; decoder->IMFTransform_iface.lpVtbl = &transform_vtbl; decoder->refcount = 1; + decoder->outer = outer ? outer : &decoder->IUnknown_inner; decoder->input_type_count = input_type_count; decoder->input_types = input_types; @@ -903,7 +935,7 @@ HRESULT h264_decoder_create(REFIID riid, void **out) wg_transform_destroy(transform); if (FAILED(hr = video_decoder_create_with_types(h264_decoder_input_types, ARRAY_SIZE(h264_decoder_input_types), - video_decoder_output_types, ARRAY_SIZE(video_decoder_output_types), &iface))) + video_decoder_output_types, ARRAY_SIZE(video_decoder_output_types), NULL, &iface))) return hr; decoder = impl_from_IMFTransform(iface); @@ -953,5 +985,5 @@ HRESULT WINAPI winegstreamer_create_video_decoder(IMFTransform **out) return E_FAIL; return video_decoder_create_with_types(iv50_decoder_input_types, ARRAY_SIZE(iv50_decoder_input_types), - iv50_decoder_output_types, ARRAY_SIZE(iv50_decoder_output_types), out); + iv50_decoder_output_types, ARRAY_SIZE(iv50_decoder_output_types), NULL, out); }

1 0

Ziqing Hui : winegstreamer/video_decoder: Use video_decoder to implement wmv decoder.
by Alexandre Julliard 29 Apr '24

29 Apr '24

Module: wine Branch: master Commit: e7225aaa94509ba7521993af597dee14510c506e URL: https://gitlab.winehq.org/wine/wine/-/commit/e7225aaa94509ba7521993af597dee… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Thu Apr 11 15:50:21 2024 +0800 winegstreamer/video_decoder: Use video_decoder to implement wmv decoder. --- dlls/mf/tests/transform.c | 69 ++- dlls/winegstreamer/Makefile.in | 3 +- dlls/winegstreamer/video_decoder.c | 750 ++++++++++++++++++++++++++++- dlls/winegstreamer/wmv_decoder.c | 942 ------------------------------------- 4 files changed, 793 insertions(+), 971 deletions(-)

1 0

Esme Povirk : windowscodecs: Check for overflow in jpeg_decoder_initialize.
by Alexandre Julliard 29 Apr '24

29 Apr '24

Module: wine Branch: master Commit: 538ef6a5e00b1aeff5c397cbc6dcc4f4d09fc723 URL: https://gitlab.winehq.org/wine/wine/-/commit/538ef6a5e00b1aeff5c397cbc6dcc4… Author: Esme Povirk <esme(a)codeweavers.com> Date: Sat Apr 27 16:32:11 2024 +0000 windowscodecs: Check for overflow in jpeg_decoder_initialize. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56590 --- dlls/windowscodecs/libjpeg.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/windowscodecs/libjpeg.c b/dlls/windowscodecs/libjpeg.c index 3d8caac065c..22903ae4340 100644 --- a/dlls/windowscodecs/libjpeg.c +++ b/dlls/windowscodecs/libjpeg.c @@ -248,6 +248,10 @@ static HRESULT CDECL jpeg_decoder_initialize(struct decoder* iface, IStream *str This->stride = (This->frame.bpp * This->cinfo.output_width + 7) / 8; data_size = This->stride * This->cinfo.output_height; + if (data_size / This->stride < This->cinfo.output_height) + /* overflow in multiplication */ + return E_OUTOFMEMORY; + This->image_data = malloc(data_size); if (!This->image_data) return E_OUTOFMEMORY;

1 0

Brendan Shanks : widl: Use hardcoded build time in TLB custom data.
by Alexandre Julliard 29 Apr '24

29 Apr '24

Module: wine Branch: master Commit: 563ef82416e9059f29c10eab2e48fa324170a4fb URL: https://gitlab.winehq.org/wine/wine/-/commit/563ef82416e9059f29c10eab2e48fa… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Wed Apr 24 13:08:52 2024 -0700 widl: Use hardcoded build time in TLB custom data. This makes builds reproducible, and matches the current MIDL behavior (except that MIDL's string representation will vary with the build machine timezone). --- tools/widl/write_msft.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index 31e340e6bcd..b9a3d6664f2 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -2757,7 +2757,6 @@ int create_msft_typelib(typelib_t *typelib) const statement_t *stmt; const attr_t *attr; time_t cur_time; - char *time_override; unsigned int version = 7 << 24 | 555; /* 7.00.0555 */ static const struct uuid midl_time_guid = {0xde77ba63,0x517c,0x11d1,{0xa2,0xda,0x00,0x00,0xf8,0x77,0x3c,0xe9}}; static const struct uuid midl_version_guid = {0xde77ba64,0x517c,0x11d1,{0xa2,0xda,0x00,0x00,0xf8,0x77,0x3c,0xe9}}; @@ -2813,11 +2812,13 @@ int create_msft_typelib(typelib_t *typelib) } } - /* midl adds two sets of custom data to the library: the current unix time - and midl's version number */ - time_override = getenv( "WIDL_TIME_OVERRIDE"); - cur_time = time_override ? atol( time_override) : time(NULL); - sprintf(info_string, "Created by WIDL version %s at %s", PACKAGE_VERSION, ctime(&cur_time)); + /* midl adds three sets of custom data to the library: + * - 2147483647 (INT_MAX, previously the current Unix time) + * - midl's version number + * - a string representation of those + */ + cur_time = 2147483647; + sprintf(info_string, "Created by WIDL version %s at %s", PACKAGE_VERSION, asctime(gmtime(&cur_time))); set_custdata(msft, &midl_info_guid, VT_BSTR, info_string, &msft->typelib_header.CustomDataOffset); set_custdata(msft, &midl_time_guid, VT_UI4, &cur_time, &msft->typelib_header.CustomDataOffset); set_custdata(msft, &midl_version_guid, VT_UI4, &version, &msft->typelib_header.CustomDataOffset);

1 0

Alexandre Julliard : systeminfo: Pass proper Unicode strings to fwprintf.
by Alexandre Julliard 29 Apr '24

29 Apr '24

Module: wine Branch: master Commit: 4679ceb7ed8b643a5dc001ae3cbdb6faaf0dc7c8 URL: https://gitlab.winehq.org/wine/wine/-/commit/4679ceb7ed8b643a5dc001ae3cbdb6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 29 16:35:55 2024 +0200 systeminfo: Pass proper Unicode strings to fwprintf. --- programs/systeminfo/main.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/programs/systeminfo/main.c b/programs/systeminfo/main.c index fefb2f1a1a7..81df549bb0e 100644 --- a/programs/systeminfo/main.c +++ b/programs/systeminfo/main.c @@ -60,7 +60,7 @@ static void output_processors( IWbemServices *services, enum format_flags flags, while (IEnumWbemClassObject_Skip( iter, WBEM_INFINITE, 1 ) == S_OK) num_cpus++; - fwprintf( stdout, L"Processor(s):%*s %u Processor(s) Installed.\n", width - wcslen(L"Processor(s)"), " ", num_cpus ); + fwprintf( stdout, L"Processor(s):%*s %u Processor(s) Installed.\n", width - wcslen(L"Processor(s)"), L" ", num_cpus ); IEnumWbemClassObject_Reset( iter ); for (i = 0; i < num_cpus; i++) @@ -74,7 +74,7 @@ static void output_processors( IWbemServices *services, enum format_flags flags, IWbemClassObject_Release( obj ); goto done; } - fwprintf( stdout, L"%*s[%02u]: %s", width + 2, " ", i + 1, V_BSTR(&value) ); + fwprintf( stdout, L"%*s[%02u]: %s", width + 2, L" ", i + 1, V_BSTR(&value) ); VariantClear( &value ); hr = IWbemClassObject_Get( obj, L"Manufacturer", 0, &value, NULL, NULL ); @@ -117,7 +117,7 @@ static void output_hotfixes( IWbemServices *services, enum format_flags flags, U while (IEnumWbemClassObject_Skip( iter, WBEM_INFINITE, 1 ) == S_OK) num_hotfixes++; - fwprintf( stdout, L"Hotfix(es):%*s %u Hotfix(es) Installed.\n", width - wcslen(L"Hotfix(es)"), " ", num_hotfixes ); + fwprintf( stdout, L"Hotfix(es):%*s %u Hotfix(es) Installed.\n", width - wcslen(L"Hotfix(es)"), L" ", num_hotfixes ); IEnumWbemClassObject_Reset( iter ); for (i = 0; i < num_hotfixes; i++) @@ -131,7 +131,7 @@ static void output_hotfixes( IWbemServices *services, enum format_flags flags, U IWbemClassObject_Release( obj ); goto done; } - fwprintf( stdout, L"%*s[%02u]: %s\n", width + 2, " ", i + 1, V_BSTR(&value) ); + fwprintf( stdout, L"%*s[%02u]: %s\n", width + 2, L" ", i + 1, V_BSTR(&value) ); VariantClear( &value ); IWbemClassObject_Release( obj ); @@ -159,7 +159,7 @@ static void output_nics( IWbemServices *services, enum format_flags flags, UINT3 while (IEnumWbemClassObject_Skip( iter, WBEM_INFINITE, 1 ) == S_OK) num_nics++; - fwprintf( stdout, L"Network Card(s):%*s %u NICs(s) Installed.\n", width - wcslen(L"Network Card(s)"), " ", num_nics ); + fwprintf( stdout, L"Network Card(s):%*s %u NICs(s) Installed.\n", width - wcslen(L"Network Card(s)"), L" ", num_nics ); IEnumWbemClassObject_Reset( iter ); for (i = 0; i < num_nics; i++) @@ -173,7 +173,7 @@ static void output_nics( IWbemServices *services, enum format_flags flags, UINT3 IWbemClassObject_Release( obj ); goto done; } - fwprintf( stdout, L"%*s[%02u]: %s\n", width + 2, " ", i + 1, V_BSTR(&value) ); + fwprintf( stdout, L"%*s[%02u]: %s\n", width + 2, L" ", i + 1, V_BSTR(&value) ); VariantClear( &value ); /* FIXME: Connection Name, DHCP Server */ @@ -184,7 +184,7 @@ static void output_nics( IWbemServices *services, enum format_flags flags, UINT3 IWbemClassObject_Release( obj ); goto done; } - fwprintf( stdout, L"%*s DHCP Enabled: %s\n", width + 2, " ", V_BOOL(&value) ? L"Yes" : L"No" ); + fwprintf( stdout, L"%*s DHCP Enabled: %s\n", width + 2, L" ", V_BOOL(&value) ? L"Yes" : L"No" ); hr = IWbemClassObject_Get( obj, L"IPAddress", 0, &value, NULL, NULL ); if (FAILED( hr )) @@ -198,11 +198,11 @@ static void output_nics( IWbemServices *services, enum format_flags flags, UINT3 SafeArrayGetUBound( sa, 1, &bound ); if (bound >= 0) { - fwprintf( stdout, L"%*s IP Addresse(es)\n", width + 2, " " ); + fwprintf( stdout, L"%*s IP Addresse(es)\n", width + 2, L" " ); for (j = 0; j <= bound; j++) { SafeArrayGetElement( sa, &j, &str ); - fwprintf( stdout, L"%*s [%02u]: %s\n", width + 2, " ", j + 1, str ); + fwprintf( stdout, L"%*s [%02u]: %s\n", width + 2, L" ", j + 1, str ); SysFreeString( str ); } } @@ -231,7 +231,7 @@ static void output_timezone( IWbemServices *services, enum format_flags flags, U RegQueryValueExW( key_name, L"Display", NULL, NULL, (BYTE *)timezone, &count ); done: - fwprintf( stdout, L"Time Zone:%*s %s\n", width - wcslen(L"Time Zone"), " ", timezone ); + fwprintf( stdout, L"Time Zone:%*s %s\n", width - wcslen(L"Time Zone"), L" ", timezone ); RegCloseKey( key_name ); RegCloseKey( key_timezones ); RegCloseKey( key_current ); @@ -284,7 +284,7 @@ static void output_item( IWbemServices *services, const struct sysinfo *info, UI if (!info->class) { if (info->property) - fwprintf( stdout, L"%s:%*s %s\n", info->item, width - wcslen(info->item), " ", info->property ); + fwprintf( stdout, L"%s:%*s %s\n", info->item, width - wcslen(info->item), L" ", info->property ); else info->callback( services, info->flags, width ); return; @@ -315,7 +315,7 @@ static void output_item( IWbemServices *services, const struct sysinfo *info, UI &st.wYear, &st.wMonth, &st.wDay, &st.wHour, &st.wMinute, &st.wSecond ); GetDateFormatW( LOCALE_SYSTEM_DEFAULT, 0, &st, NULL, date, ARRAY_SIZE(date) ); GetTimeFormatW( LOCALE_SYSTEM_DEFAULT, 0, &st, NULL, time, ARRAY_SIZE(time) ); - fwprintf( stdout, L"%s:%*s %s, %s\n", info->item, width - wcslen(info->item), " ", date, time ); + fwprintf( stdout, L"%s:%*s %s, %s\n", info->item, width - wcslen(info->item), L" ", date, time ); break; } case FORMAT_LOCALE: @@ -326,18 +326,18 @@ static void output_item( IWbemServices *services, const struct sysinfo *info, UI swscanf( V_BSTR(&value), L"%x", &lcid ); LCIDToLocaleName( lcid, name, ARRAY_SIZE(name), 0 ); GetLocaleInfoW( lcid, LOCALE_SENGLISHDISPLAYNAME, displayname, ARRAY_SIZE(displayname) ); - fwprintf( stdout, L"%s:%*s %s;%s\n", info->item, width - wcslen(info->item), " ", name, displayname ); + fwprintf( stdout, L"%s:%*s %s;%s\n", info->item, width - wcslen(info->item), L" ", name, displayname ); break; } case FORMAT_SIZE: { UINT64 size = 0; swscanf( V_BSTR(&value), L"%I64u", &size ); - fwprintf( stdout, L"%s:%*s %I64u MB\n", info->item, width - wcslen(info->item), " ", size / 1024 ); + fwprintf( stdout, L"%s:%*s %I64u MB\n", info->item, width - wcslen(info->item), L" ", size / 1024 ); break; } default: - fwprintf( stdout, L"%s:%*s %s\n", info->item, width - wcslen(info->item), " ", V_BSTR(&value) ); + fwprintf( stdout, L"%s:%*s %s\n", info->item, width - wcslen(info->item), L" ", V_BSTR(&value) ); break; } VariantClear( &value );

1 0

Alexandre Julliard : avifil32: Use fully interpreted IDL stubs.
by Alexandre Julliard 29 Apr '24

29 Apr '24

Module: wine Branch: master Commit: 767d21fe5f6475e24b2c08ab1a5f57aa1148adb6 URL: https://gitlab.winehq.org/wine/wine/-/commit/767d21fe5f6475e24b2c08ab1a5f57… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 29 10:31:08 2024 +0200 avifil32: Use fully interpreted IDL stubs. --- dlls/avifil32/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/avifil32/Makefile.in b/dlls/avifil32/Makefile.in index fd19511712c..7a08f06717b 100644 --- a/dlls/avifil32/Makefile.in +++ b/dlls/avifil32/Makefile.in @@ -2,6 +2,8 @@ MODULE = avifil32.dll IMPORTLIB = avifil32 IMPORTS = uuid msacm32 msvfw32 winmm ole32 user32 advapi32 rpcrt4 +EXTRAIDLFLAGS = -Oicf + SOURCES = \ acmstream.c \ api.c \

1 0

Alexandre Julliard : combase: Use fully interpreted IDL stubs.
by Alexandre Julliard 29 Apr '24

29 Apr '24

Module: wine Branch: master Commit: 1588fc4fb784c57e2bf9a4b9782cd1cdc273a59b URL: https://gitlab.winehq.org/wine/wine/-/commit/1588fc4fb784c57e2bf9a4b9782cd1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 29 10:31:21 2024 +0200 combase: Use fully interpreted IDL stubs. --- dlls/combase/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/combase/Makefile.in b/dlls/combase/Makefile.in index f0acc33751f..7fd47cdb104 100644 --- a/dlls/combase/Makefile.in +++ b/dlls/combase/Makefile.in @@ -4,6 +4,8 @@ IMPORTLIB = combase IMPORTS = advapi32 ole32 user32 gdi32 uuid rpcrt4 DELAYIMPORTS = oleaut32 +EXTRAIDLFLAGS = -Oicf + SOURCES = \ apartment.c \ combase.c \

1 0

Alexandre Julliard : dispex: Use fully interpreted IDL stubs.
by Alexandre Julliard 29 Apr '24

29 Apr '24

Module: wine Branch: master Commit: cfa1deb541c138f8cfaaf82a766c9ba68f87e701 URL: https://gitlab.winehq.org/wine/wine/-/commit/cfa1deb541c138f8cfaaf82a766c9b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 29 10:31:38 2024 +0200 dispex: Use fully interpreted IDL stubs. --- dlls/dispex/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/dispex/Makefile.in b/dlls/dispex/Makefile.in index d8a542acb71..1fbdc7bc226 100644 --- a/dlls/dispex/Makefile.in +++ b/dlls/dispex/Makefile.in @@ -1,6 +1,8 @@ MODULE = dispex.dll IMPORTS = uuid oleaut32 ole32 rpcrt4 advapi32 +EXTRAIDLFLAGS = -Oicf + SOURCES = \ disp_ex.idl \ usrmarshal.c

1 0