May 2021 - Wine-devel - list.winehq.org

[PATCH] winegstreamer: Use a static buffer to enumerate stream types in media_stream_init_desc().
by Zebediah Figura 17 May '21

17 May '21

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/winegstreamer/media_source.c | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index 7f308973270..8a87992d450 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -757,8 +757,7 @@ fail: static HRESULT media_stream_init_desc(struct media_stream *stream) { IMFMediaTypeHandler *type_handler = NULL; - IMFMediaType **stream_types = NULL; - IMFMediaType *stream_type = NULL; + IMFMediaType *stream_types[6]; struct wg_format format; DWORD type_count = 0; unsigned int i; @@ -784,8 +783,6 @@ static HRESULT media_stream_init_desc(struct media_stream *stream) IMFMediaType_GetGUID(base_type, &MF_MT_SUBTYPE, &base_subtype); - stream_types = malloc(sizeof(IMFMediaType *) * (ARRAY_SIZE(video_types) + 1)); - stream_types[0] = base_type; type_count = 1; @@ -816,8 +813,6 @@ static HRESULT media_stream_init_desc(struct media_stream *stream) WG_AUDIO_FORMAT_F32LE, }; - stream_types = malloc( sizeof(IMFMediaType *) * (ARRAY_SIZE(audio_types) + 1) ); - stream_types[0] = mf_media_type_from_wg_format(&format); type_count = 1; @@ -833,14 +828,12 @@ static HRESULT media_stream_init_desc(struct media_stream *stream) } else { - stream_type = mf_media_type_from_wg_format(&format); - if (stream_type) - { - stream_types = &stream_type; + if ((stream_types[0] = mf_media_type_from_wg_format(&format))) type_count = 1; - } } + assert(type_count < ARRAY_SIZE(stream_types)); + if (!type_count) { ERR("Failed to establish an IMFMediaType from any of the possible stream caps!\n"); @@ -861,8 +854,6 @@ done: IMFMediaTypeHandler_Release(type_handler); for (i = 0; i < type_count; i++) IMFMediaType_Release(stream_types[i]); - if (stream_types != &stream_type) - free(stream_types); return hr; } -- 2.30.2

1 0

[PATCH 1/2] quartz/tests: Remove the no longer used TestFilterImpl structure.
by Zebediah Figura 16 May '21

16 May '21

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/tests/filtergraph.c | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 4822b65a7a6..b2d5b4e26e8 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -28,19 +28,6 @@ static const GUID testguid = {0xabbccdde}; -typedef struct TestFilterImpl -{ - IBaseFilter IBaseFilter_iface; - - LONG refCount; - CRITICAL_SECTION csFilter; - FILTER_STATE state; - FILTER_INFO filterInfo; - CLSID clsid; - IPin **ppPins; - UINT nPins; -} TestFilterImpl; - static BOOL compare_time(ULONGLONG x, ULONGLONG y, unsigned int max_diff) { ULONGLONG diff = x > y ? x - y : y - x; -- 2.30.2

2 2

[PATCH] widl: Pick up the target arch from a prefix on argv[0]
by Martin Storsjo 16 May '21

16 May '21

If the executable is named <target>-widl, try to pick up the target arch implicitly from there. Signed-off-by: Martin Storsjo <martin(a)martin.st> --- tools/widl/widl.c | 99 ++++++++++++++++++++++++++++++----------------- 1 file changed, 64 insertions(+), 35 deletions(-) diff --git a/tools/widl/widl.c b/tools/widl/widl.c index 8da887ea636..9b140a47497 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -211,6 +211,31 @@ static const struct option long_options[] = { { NULL, 0, NULL, 0 } }; +static const struct +{ + const char *name; + enum target_cpu cpu; +} cpu_names[] = +{ + { "i386", CPU_x86 }, + { "i486", CPU_x86 }, + { "i586", CPU_x86 }, + { "i686", CPU_x86 }, + { "i786", CPU_x86 }, + { "amd64", CPU_x86_64 }, + { "x86_64", CPU_x86_64 }, + { "powerpc", CPU_POWERPC }, + { "powerpc64", CPU_POWERPC64 }, + { "powerpc64le", CPU_POWERPC64 }, + { "arm", CPU_ARM }, + { "armv5", CPU_ARM }, + { "armv6", CPU_ARM }, + { "armv7", CPU_ARM }, + { "armv7a", CPU_ARM }, + { "arm64", CPU_ARM64 }, + { "aarch64", CPU_ARM64 }, +}; + static void rm_tempfile(void); enum stub_mode get_stub_mode(void) @@ -274,51 +299,54 @@ static void add_widl_version_define(void) wpp_add_cmdline_define(version_str); } -/* set the target platform */ -static void set_target( const char *target ) +static void set_cpu( const char *cpu, int error_out ) { - static const struct + unsigned int i; + for (i = 0; i < ARRAY_SIZE( cpu_names ); i++) { - const char *name; - enum target_cpu cpu; - } cpu_names[] = + if (!strcmp( cpu_names[i].name, cpu )) + { + target_cpu = cpu_names[i].cpu; + return; + } + } + if (error_out) + error( "Unrecognized CPU '%s'\n", cpu ); +} + +/* Set the target platform based on a potential prefix om the executable name. + * If not found, or not matching a known CPU name, just proceed silently. */ +static void init_argv0_target( const char *argv0 ) +{ + char *p, *name; + + if ((p = strrchr(argv0, '/')) != NULL) + argv0 = p + 1; + if ((p = strrchr(argv0, '\\')) != NULL) + argv0 = p + 1; + + name = xstrdup( argv0 ); + if (!(p = strchr(name, '-'))) { - { "i386", CPU_x86 }, - { "i486", CPU_x86 }, - { "i586", CPU_x86 }, - { "i686", CPU_x86 }, - { "i786", CPU_x86 }, - { "amd64", CPU_x86_64 }, - { "x86_64", CPU_x86_64 }, - { "powerpc", CPU_POWERPC }, - { "powerpc64", CPU_POWERPC64 }, - { "powerpc64le", CPU_POWERPC64 }, - { "arm", CPU_ARM }, - { "armv5", CPU_ARM }, - { "armv6", CPU_ARM }, - { "armv7", CPU_ARM }, - { "armv7a", CPU_ARM }, - { "arm64", CPU_ARM64 }, - { "aarch64", CPU_ARM64 }, - }; + free( name ); + return; + } + *p = 0; + set_cpu( name, 0 ); + free( name ); +} - unsigned int i; +/* set the target platform */ +static void set_target( const char *target ) +{ char *p, *spec = xstrdup( target ); /* target specification is in the form CPU-MANUFACTURER-OS or CPU-MANUFACTURER-KERNEL-OS */ if (!(p = strchr( spec, '-' ))) error( "Invalid target specification '%s'\n", target ); *p++ = 0; - for (i = 0; i < ARRAY_SIZE( cpu_names ); i++) - { - if (!strcmp( cpu_names[i].name, spec )) - { - target_cpu = cpu_names[i].cpu; - free( spec ); - return; - } - } - error( "Unrecognized CPU '%s'\n", spec ); + set_cpu( spec, 1 ); + free( spec ); } /* clean things up when aborting on a signal */ @@ -607,6 +635,7 @@ int main(int argc,char *argv[]) signal( SIGHUP, exit_on_signal ); #endif init_argv0_dir( argv[0] ); + init_argv0_target( argv[0] ); now = time(NULL); -- 2.25.1

1 0

[PATCH] widl: Allow switching between 32 and 64 bit ARM with the -m32/64 option
by Martin Storsjo 16 May '21

16 May '21

Signed-off-by: Martin Storsjo <martin(a)martin.st> --- tools/widl/widl.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tools/widl/widl.c b/tools/widl/widl.c index 8da887ea636..992eef73e82 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -796,8 +796,12 @@ int main(int argc,char *argv[]) if (pointer_size == 4) target_cpu = CPU_x86; else pointer_size = 8; break; + case CPU_ARM: + if (pointer_size == 8) target_cpu = CPU_ARM64; + else pointer_size = 4; + break; case CPU_ARM64: - if (pointer_size == 4) error( "Cannot build 32-bit code for this CPU\n" ); + if (pointer_size == 4) target_cpu = CPU_ARM; pointer_size = 8; break; case CPU_POWERPC64: -- 2.25.1

1 0

[PATCH vkd3d 1/5] vkd3d-shader: Forbid declaring parameters as both "out" and "uniform".
by Zebediah Figura 16 May '21

16 May '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.y | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 4e17e806..9eef5e2f 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -763,6 +763,10 @@ static bool add_func_parameter(struct hlsl_ctx *ctx, struct list *list, if (param->type->type == HLSL_CLASS_MATRIX) assert(param->type->modifiers & HLSL_MODIFIERS_MAJORITY_MASK); + if ((param->modifiers & HLSL_STORAGE_OUT) && (param->modifiers & HLSL_STORAGE_UNIFORM)) + hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_INVALID_MODIFIER, + "Parameter '%s' is declared as both \"out\" and \"uniform\".", param->name); + if (!(var = hlsl_new_var(param->name, param->type, loc, &param->semantic, param->modifiers, param->reg_reservation))) return false; var->is_param = 1; -- 2.31.1

5 16

[PATCH] gdiplus: Avoid filtering of special characters.
by Haoyang Chen 16 May '21

16 May '21

Symbols such as ← should also be displayed. Signed-off-by: Haoyang Chen <chenhaoyang(a)uniontech.com> --- dlls/gdiplus/graphics.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index df4a89e8294..4a428c49869 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -5229,9 +5229,6 @@ GpStatus gdip_format_string(HDC hdc, hotkeyprefix_count = 0; for(i = 0, j = 0; i < length; i++){ - /* FIXME: This makes the indexes passed to callback inaccurate. */ - if(!iswprint(string[i]) && (string[i] != '\n')) - continue; /* FIXME: tabs should be handled using tabstops from stringformat */ if (string[i] == '\t') -- 2.20.1

3 4

[PATCH website] OSPP Summer 2021.
by Zhenbo Li 16 May '21

16 May '21

1 0

[PATCH v4] mountmgr.sys: Introduce StorageDeviceSeekPenaltyProperty
by David Koolhoven 15 May '21

15 May '21

Allows programs which demand support for StorageDeviceSeekPenaltyProperty to function. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51065 Signed-off-by: David Koolhoven <david(a)koolhoven-home.net> --- v4: Spoof there is no penalty. Add detection later. --- dlls/mountmgr.sys/device.c | 13 +++++++++++++ include/ntddstor.h | 9 ++++++++- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/dlls/mountmgr.sys/device.c b/dlls/mountmgr.sys/device.c index 04e8fe3c0f5..2ba82537728 100644 --- a/dlls/mountmgr.sys/device.c +++ b/dlls/mountmgr.sys/device.c @@ -1894,6 +1894,19 @@ static NTSTATUS query_property( struct disk_device *device, IRP *irp ) break; } + case StorageDeviceSeekPenaltyProperty: + { + DEVICE_SEEK_PENALTY_DESCRIPTOR *descriptor; + FIXME( "Faking StorageDeviceSeekPenaltyProperty data with no penalty\n" ); + memset( irp->AssociatedIrp.SystemBuffer, 0, irpsp->Parameters.DeviceIoControl.OutputBufferLength ); + descriptor = irp->AssociatedIrp.SystemBuffer; + descriptor->Version = sizeof(DEVICE_SEEK_PENALTY_DESCRIPTOR); + descriptor->Size = sizeof(DEVICE_SEEK_PENALTY_DESCRIPTOR); + descriptor->IncursSeekPenalty = FALSE; + status = STATUS_SUCCESS; + irp->IoStatus.Information = sizeof(DEVICE_SEEK_PENALTY_DESCRIPTOR); + break; + } default: FIXME( "Unsupported property %#x\n", query->PropertyId ); status = STATUS_NOT_SUPPORTED; diff --git a/include/ntddstor.h b/include/ntddstor.h index b8c4bb73b0d..836def413fe 100644 --- a/include/ntddstor.h +++ b/include/ntddstor.h @@ -214,7 +214,8 @@ typedef enum _STORAGE_QUERY_TYPE { typedef enum _STORAGE_PROPERTY_ID { StorageDeviceProperty = 0, - StorageAdapterProperty + StorageAdapterProperty = 1, + StorageDeviceSeekPenaltyProperty = 7, } STORAGE_PROPERTY_ID, *PSTORAGE_PROPERTY_ID; typedef struct _STORAGE_PROPERTY_QUERY { @@ -272,6 +273,12 @@ typedef struct _STORAGE_ADAPTER_DESCRIPTOR { USHORT BusMinorVersion; } STORAGE_ADAPTER_DESCRIPTOR, *PSTORAGE_ADAPTER_DESCRIPTOR; +typedef struct _DEVICE_SEEK_PENALTY_DESCRIPTOR { + ULONG Version; + ULONG Size; + BOOLEAN IncursSeekPenalty; +} DEVICE_SEEK_PENALTY_DESCRIPTOR, *PDEVICE_SEEK_PENALTY_DESCRIPTOR; + #ifdef __cplusplus } #endif -- 2.19.1

2 1

Re: [PATCH v3] mountmgr.sys: Implement StorageDeviceSeekPenaltyProperty
by Zebediah Figura (she/her) 15 May '21

15 May '21

Hello, apologies for the very late reply. On 5/1/21 6:54 PM, David Koolhoven wrote: > On Sat, May 01, 2021 at 02:53:57PM -0500, Zebediah Figura (she/her) wrote: >> Hello David, thanks for the patch! > Hello thanks for the review Zebediah! > >> I'm curious how the application is using this information, and if it >> makes sense to just fake it instead, for simplicity? > It's not certain how it's being used, but it solves this > bug: https://bugs.winehq.org/show_bug.cgi?id=51065 > > It could be used to collect performance statistics, or to > deploy an application level policy on data access and memory > management. I'm uncertain. > > I was recently informed this patch doesn't function on LVM > partitians, so it'll need a new version anyway. > > Spoofing a response would certainly make it easier to > implement and maintain, it sort of depends on the goals of > the WINE project for a feature like this, which leads to a > question: > > Would it be better for this to spoof an answer to the query > if platform specific testing fails, rather than reporting a > failure to the Windows program? I think there's nothing wrong with implementing things like this properly in general, but stubs do tend to be easier. The awkward thing in this case is that mountmgr is kind of a mess wrt how we track disks and partitions; that should probably be cleaned up to some degree first. > > If spoofing is better, should it spoof a seek penalty exists > or not? I think it should spoof that it does exist, but I'm > open to any implementation. I don't have strong opinions here. > > The Linux platform logic was put into it's own file because > I wanted to attempt a FreeBSD version of the same logic too. > Would renaming the function with a prefix of "wineint_" work > to clarify what it is? There's no reason to split platform-specific logic into their own files; we leave them in the same file almost everywhere else in Wine. Wrt naming, I mean that "device_seek_penalty" does not semantically communicate what the function does. A predicate should generally be named like "device_has_seek_penalty". > > I'll submit a spoofing only version and float a testing > implementation later. > > Thank you! > > I'll work out the rest.

1 0

Re: [PATCH v2] winegstreamer: Ensure that the source reports both PCM and floating point audio formats.
by Nikolay Sivov 15 May '21

15 May '21

On 5/13/21 10:47 AM, Giovanni Mascellani wrote: > Hi, > > Il 13/05/21 09:18, Nikolay Sivov ha scritto: >> On 5/12/21 6:37 PM, Giovanni Mascellani wrote: >>> diff --git a/dlls/winegstreamer/media_source.c >>> b/dlls/winegstreamer/media_source.c >>> index eb5b9e366ec..5249bc9c41d 100644 >>> --- a/dlls/winegstreamer/media_source.c >>> +++ b/dlls/winegstreamer/media_source.c >>> @@ -806,6 +806,31 @@ static HRESULT media_stream_init_desc(struct >>> media_stream *stream) >>> goto done; >>> } >>> } >>> + else if (format.major_type == WG_MAJOR_TYPE_AUDIO) >>> + { >>> + /* Expose at least one PCM and one floating point type for the >>> + consumer to pick from. */ >>> + static const enum wg_audio_format audio_types[] = >>> + { >>> + WG_AUDIO_FORMAT_S16LE, >>> + WG_AUDIO_FORMAT_F64LE, >>> + }; >> Is F64LE correct? I thought before you used an equivalent of F32LE, if >> that's what (Float, MF_MT_AUDIO_BITS_PER_SAMPLE=32) means. > > Ugh, I meant F32LE. My mistake. > >>> + >>> + stream_types = malloc( sizeof(IMFMediaType *) * >>> (ARRAY_SIZE(audio_types) + 1) ); >>> + >>> + stream_types[0] = mf_media_type_from_wg_format(&format); >>> + type_count = 1; >>> + >>> + for (i = 0; i < ARRAY_SIZE(audio_types); i++) >>> + { >>> + struct wg_format new_format; >>> + if (format.u.audio.format == audio_types[i]) >>> + continue; >>> + new_format = format; >>> + new_format.u.audio.format = audio_types[i]; >>> + stream_types[type_count++] = >>> mf_media_type_from_wg_format(&new_format); >>> + } >>> + } >>> else >>> { >>> stream_type = mf_media_type_from_wg_format(&format); >> Thanks, that looks fine to me. It could be reduced a bit more still, by >> removing 'new_format' for example, but that's minor. > > That would be wrong, wouldn't it? If I change format.u.audio.format, > then the "if () continue" at the beginning of the loop doesn't make > sense any more. Unless I remember the original format in another > variable, which would then have comparable complexity. > >> Now we need someone >> who knows gstreamer to comment, specifically if resampling PCM -> >> PCM/float -> float would work. Or maybe you can test that yourself with >> some sin wave data with rate not matching output device rate. > > I can't see how this is related to my patch: I don't think Gstreamer > does any rate change at this level. It just advertises the native rate > the audio stream supports. Whatever rate matching is required, it will > be done downstream from the media source (both before and after my > patch, which is only concerned with the sample format, not its rate). Original patch added PCM->F32LE and float->S16LE conversions, this one also adds conversions between different PCM and different float formats. So the question is does it work? It was wrong to call it rate, I meant bps of course, or format as whole. > > Thanks, Giovanni. >

2 1