May 2024 - Wine-Commits - list.winehq.org

Elizabeth Figura : wined3d: Remove the ATI_fragment_shader fragment pipeline.
by Alexandre Julliard May 13, 2024

May 13, 2024

Module: wine Branch: master Commit: 69e67d1ac61d9fe0345ab20e40109636d5d7c20d URL: https://gitlab.winehq.org/wine/wine/-/commit/69e67d1ac61d9fe0345ab20e401096… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Fri Mar 15 20:09:44 2024 -0500 wined3d: Remove the ATI_fragment_shader fragment pipeline. --- dlls/wined3d/Makefile.in | 1 - dlls/wined3d/ati_fragment_shader.c | 1387 ------------------------------------ dlls/wined3d/ffp_gl.c | 330 --------- dlls/wined3d/wined3d_gl.h | 1 - dlls/wined3d/wined3d_private.h | 7 - 5 files changed, 1726 deletions(-)

1 0

Elizabeth Figura : wined3d: Remove the ARB_fragment_program blitter.
by Alexandre Julliard May 13, 2024

May 13, 2024

Module: wine Branch: master Commit: 9c8e5928ce8295f16397d91f523789f6299d5541 URL: https://gitlab.winehq.org/wine/wine/-/commit/9c8e5928ce8295f16397d91f523789… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Fri Mar 15 20:12:28 2024 -0500 wined3d: Remove the ARB_fragment_program blitter. --- dlls/wined3d/arb_program_shader.c | 1085 ------------------------------------- dlls/wined3d/device.c | 3 +- dlls/wined3d/wined3d_gl.h | 1 - 3 files changed, 1 insertion(+), 1088 deletions(-)

1 0

Elizabeth Figura : wined3d: Remove the GL FFP fragment pipeline.
by Alexandre Julliard May 13, 2024

May 13, 2024

Module: wine Branch: master Commit: 0180c68d6a1672cef2564f244eaad29e60512a88 URL: https://gitlab.winehq.org/wine/wine/-/commit/0180c68d6a1672cef2564f244eaad2… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Fri Mar 15 20:01:48 2024 -0500 wined3d: Remove the GL FFP fragment pipeline. --- dlls/wined3d/ffp_gl.c | 290 ----------------------------------------- dlls/wined3d/wined3d_private.h | 1 - 2 files changed, 291 deletions(-)

1 0

Brendan McGrath : winegstreamer: Pass filename to wg_parser when available.
by Alexandre Julliard May 13, 2024

May 13, 2024

Module: wine Branch: master Commit: a48d34300229176c3687b0a29bc386208059f5a2 URL: https://gitlab.winehq.org/wine/wine/-/commit/a48d34300229176c3687b0a29bc386… Author: Brendan McGrath <bmcgrath(a)codeweavers.com> Date: Fri May 10 15:49:19 2024 +1000 winegstreamer: Pass filename to wg_parser when available. --- dlls/winegstreamer/wm_reader.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/winegstreamer/wm_reader.c b/dlls/winegstreamer/wm_reader.c index 1eb9d2a245f..fbbb55201a7 100644 --- a/dlls/winegstreamer/wm_reader.c +++ b/dlls/winegstreamer/wm_reader.c @@ -54,6 +54,7 @@ struct wm_reader QWORD start_time; QWORD file_size; + WCHAR *filename; IStream *source_stream; HANDLE file; HANDLE read_thread; @@ -1464,7 +1465,7 @@ static HRESULT init_stream(struct wm_reader *reader) goto out_destroy_parser; } - if (FAILED(hr = wg_parser_connect(reader->wg_parser, reader->file_size, NULL))) + if (FAILED(hr = wg_parser_connect(reader->wg_parser, reader->file_size, reader->filename))) { ERR("Failed to connect parser, hr %#lx.\n", hr); goto out_shutdown_thread; @@ -1569,7 +1570,7 @@ static HRESULT reinit_stream(struct wm_reader *reader, bool read_compressed) goto out_destroy_parser; } - if (FAILED(hr = wg_parser_connect(reader->wg_parser, reader->file_size, NULL))) + if (FAILED(hr = wg_parser_connect(reader->wg_parser, reader->file_size, reader->filename))) { ERR("Failed to connect parser, hr %#lx.\n", hr); goto out_shutdown_thread; @@ -1888,6 +1889,8 @@ static HRESULT WINAPI reader_Close(IWMSyncReader2 *iface) if (reader->file) CloseHandle(reader->file); reader->file = NULL; + free(reader->filename); + reader->filename = NULL; LeaveCriticalSection(&reader->cs); return S_OK; @@ -2212,11 +2215,17 @@ static HRESULT WINAPI reader_Open(IWMSyncReader2 *iface, const WCHAR *filename) return E_UNEXPECTED; } + reader->filename = wcsdup(filename); reader->file = file; reader->file_size = size.QuadPart; if (FAILED(hr = init_stream(reader))) + { + CloseHandle(reader->file); reader->file = NULL; + free(reader->filename); + reader->filename = NULL; + } LeaveCriticalSection(&reader->cs); return hr;

1 0

Hongxin Zhao : po: Add a missing \t in the Simplified Chinese translation.
by Alexandre Julliard May 13, 2024

May 13, 2024

Module: wine Branch: master Commit: f4871cb27c2399e32b429d09c77b73bf5fc71a7e URL: https://gitlab.winehq.org/wine/wine/-/commit/f4871cb27c2399e32b429d09c77b73… Author: Hongxin Zhao <zhaohongxinxin(a)163.com> Date: Mon May 13 06:54:21 2024 +0000 po: Add a missing \t in the Simplified Chinese translation. --- po/zh_CN.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index ec4a9bc96af..e3e8390a950 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -14162,7 +14162,7 @@ msgstr "" "FTYPE\t\t显示或更改文件类型关联的打开命令\n" "HELP\t\t显示某个主题的帮助信息概览\n" "MD (MKDIR)\t创建子目录\n" -"MKLINK\t创建符号链接\n" +"MKLINK\t\t创建符号链接\n" "MORE\t\t分页显示输出\n" "MOVE\t\t移动一个或多个文件，或整个目录树\n" "PATH\t\t设置或显示命令搜索路径\n"

1 0

Tim Clem : mountmgr.sys: Do not create drive letters or volumes for unbrowsable macOS volumes.
by Alexandre Julliard May 13, 2024

May 13, 2024

Module: wine Branch: master Commit: e4b78284a9728037425bd1a9324bb0b108c5ddbb URL: https://gitlab.winehq.org/wine/wine/-/commit/e4b78284a9728037425bd1a9324bb0… Author: Tim Clem <tclem(a)codeweavers.com> Date: Fri May 10 12:29:09 2024 -0700 mountmgr.sys: Do not create drive letters or volumes for unbrowsable macOS volumes. Volumes with kCFURLVolumeIsBrowsableKey set to false are invisible to users. These are generally system volumes or temporary ones (like Chrome update disk images) that we should ignore. --- dlls/mountmgr.sys/diskarb.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/mountmgr.sys/diskarb.c b/dlls/mountmgr.sys/diskarb.c index 4817cfc61d6..63986c3df93 100644 --- a/dlls/mountmgr.sys/diskarb.c +++ b/dlls/mountmgr.sys/diskarb.c @@ -65,6 +65,7 @@ static void appeared_callback( DADiskRef disk, void *context ) CFDictionaryRef dict = DADiskCopyDescription( disk ); const void *ref; char device[64]; + CFURLRef volume_url; char mount_point[PATH_MAX]; size_t model_len = 0; GUID guid, *guid_ptr = NULL; @@ -87,11 +88,23 @@ static void appeared_callback( DADiskRef disk, void *context ) strcpy( device, "/dev/r" ); CFStringGetCString( ref, device + 6, sizeof(device) - 6, kCFStringEncodingASCII ); - if ((ref = CFDictionaryGetValue( dict, CFSTR("DAVolumePath") ))) - CFURLGetFileSystemRepresentation( ref, true, (UInt8 *)mount_point, sizeof(mount_point) ); + if ((volume_url = CFDictionaryGetValue( dict, CFSTR("DAVolumePath") ))) + CFURLGetFileSystemRepresentation( volume_url, true, (UInt8 *)mount_point, sizeof(mount_point) ); else mount_point[0] = 0; + if (volume_url && CFURLCopyResourcePropertyForKey( volume_url, kCFURLVolumeIsBrowsableKey, &ref, NULL )) + { + Boolean is_browsable = CFBooleanGetValue( ref ); + CFRelease( ref ); + + if (!is_browsable) + { + TRACE( "ignoring volume %s, uuid %s: not browsable\n", device, wine_dbgstr_guid(guid_ptr) ); + goto done; + } + } + if ((ref = CFDictionaryGetValue( dict, CFSTR("DAMediaKind") ))) { if (!CFStringCompare( ref, CFSTR("IOCDMedia"), 0 ))

1 0

Anton Baskanov : winegstreamer: Add missing format fields to WMA support check.
by Alexandre Julliard May 13, 2024

May 13, 2024

Module: wine Branch: master Commit: f8001fdc8e7fe62ccf124f764511a86d9d1662b6 URL: https://gitlab.winehq.org/wine/wine/-/commit/f8001fdc8e7fe62ccf124f764511a8… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Fri May 10 13:36:50 2024 +0700 winegstreamer: Add missing format fields to WMA support check. Fixes: cc82780c22db31fed4da8b84e85c01652a995490 --- dlls/winegstreamer/wma_decoder.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/winegstreamer/wma_decoder.c b/dlls/winegstreamer/wma_decoder.c index 15815f11374..28439b1cf7e 100644 --- a/dlls/winegstreamer/wma_decoder.c +++ b/dlls/winegstreamer/wma_decoder.c @@ -1032,8 +1032,9 @@ HRESULT wma_decoder_create(IUnknown *outer, IUnknown **out) }; static const WMAUDIO2WAVEFORMAT input_format = { - .wfx = {.wFormatTag = WAVE_FORMAT_WMAUDIO2, .nSamplesPerSec = 44100, .nChannels = 1, - .cbSize = sizeof(input_format) - sizeof(WAVEFORMATEX)}, + .wfx = {.wFormatTag = WAVE_FORMAT_WMAUDIO2, .wBitsPerSample = 16, .nSamplesPerSec = 44100, .nChannels = 1, + .nAvgBytesPerSec = 3000, .nBlockAlign = 139, .cbSize = sizeof(input_format) - sizeof(WAVEFORMATEX)}, + .wEncodeOptions = 1, }; struct wma_decoder *decoder; HRESULT hr;

1 0

Tim Clem : mountmgr.sys: Do not add drive letters or volumes for macOS volumes without mount paths.
by Alexandre Julliard May 13, 2024

May 13, 2024

Module: wine Branch: master Commit: 89481f43a547291bf060fdf0d3468a6673fd4ca3 URL: https://gitlab.winehq.org/wine/wine/-/commit/89481f43a547291bf060fdf0d3468a… Author: Tim Clem <tclem(a)codeweavers.com> Date: Fri May 10 12:29:27 2024 -0700 mountmgr.sys: Do not add drive letters or volumes for macOS volumes without mount paths. Mounted volumes that are not represented in the filesystem are system volumes that we should ignore (e.g. recovery and preboot). --- dlls/mountmgr.sys/diskarb.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/mountmgr.sys/diskarb.c b/dlls/mountmgr.sys/diskarb.c index 63986c3df93..d33f6c60afb 100644 --- a/dlls/mountmgr.sys/diskarb.c +++ b/dlls/mountmgr.sys/diskarb.c @@ -91,9 +91,12 @@ static void appeared_callback( DADiskRef disk, void *context ) if ((volume_url = CFDictionaryGetValue( dict, CFSTR("DAVolumePath") ))) CFURLGetFileSystemRepresentation( volume_url, true, (UInt8 *)mount_point, sizeof(mount_point) ); else - mount_point[0] = 0; + { + TRACE( "ignoring volume %s, uuid %s: no macOS volume path\n", device, wine_dbgstr_guid(guid_ptr) ); + goto done; + } - if (volume_url && CFURLCopyResourcePropertyForKey( volume_url, kCFURLVolumeIsBrowsableKey, &ref, NULL )) + if (CFURLCopyResourcePropertyForKey( volume_url, kCFURLVolumeIsBrowsableKey, &ref, NULL )) { Boolean is_browsable = CFBooleanGetValue( ref ); CFRelease( ref );

1 0

Anton Baskanov : winegstreamer: Recognize MFAudioFormat_MPEG and MFAudioFormat_MP3.
by Alexandre Julliard May 13, 2024

May 13, 2024

Module: wine Branch: master Commit: 08e13d197965d4978167f0dd541d32a8cec2bbf1 URL: https://gitlab.winehq.org/wine/wine/-/commit/08e13d197965d4978167f0dd541d32… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Fri May 10 10:44:07 2024 +0700 winegstreamer: Recognize MFAudioFormat_MPEG and MFAudioFormat_MP3. Fixes: cc82780c22db31fed4da8b84e85c01652a995490 --- dlls/winegstreamer/mfplat.c | 61 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 60 insertions(+), 1 deletion(-) diff --git a/dlls/winegstreamer/mfplat.c b/dlls/winegstreamer/mfplat.c index 879ea0707fc..df3d95629c1 100644 --- a/dlls/winegstreamer/mfplat.c +++ b/dlls/winegstreamer/mfplat.c @@ -638,6 +638,61 @@ static void mf_media_type_to_wg_format_audio(IMFMediaType *type, const GUID *sub FIXME("Unrecognized audio subtype %s, depth %u.\n", debugstr_guid(subtype), depth); } +static void mf_media_type_to_wg_format_audio_mpeg(IMFMediaType *type, const GUID *subtype, struct wg_format *format) +{ + MPEG1WAVEFORMAT wfx = {0}; + UINT32 codec_data_size; + UINT32 rate, channels; + + if (FAILED(IMFMediaType_GetUINT32(type, &MF_MT_AUDIO_SAMPLES_PER_SECOND, &rate))) + { + FIXME("Sample rate is not set.\n"); + return; + } + if (FAILED(IMFMediaType_GetUINT32(type, &MF_MT_AUDIO_NUM_CHANNELS, &channels))) + { + FIXME("Channel count is not set.\n"); + return; + } + if (FAILED(IMFMediaType_GetBlob(type, &MF_MT_USER_DATA, (UINT8 *)(&wfx.wfx + 1), + sizeof(wfx) - sizeof(WAVEFORMATEX), &codec_data_size))) + { + FIXME("Codec data is not set.\n"); + return; + } + if (codec_data_size < sizeof(wfx) - sizeof(WAVEFORMATEX)) + { + FIXME("Codec data is incomplete.\n"); + return; + } + + format->major_type = WG_MAJOR_TYPE_AUDIO_MPEG1; + format->u.audio.channels = channels; + format->u.audio.rate = rate; + format->u.audio.layer = wfx.fwHeadLayer; +} + +static void mf_media_type_to_wg_format_audio_mpeg_layer3(IMFMediaType *type, const GUID *subtype, struct wg_format *format) +{ + UINT32 rate, channels; + + if (FAILED(IMFMediaType_GetUINT32(type, &MF_MT_AUDIO_SAMPLES_PER_SECOND, &rate))) + { + FIXME("Sample rate is not set.\n"); + return; + } + if (FAILED(IMFMediaType_GetUINT32(type, &MF_MT_AUDIO_NUM_CHANNELS, &channels))) + { + FIXME("Channel count is not set.\n"); + return; + } + + format->major_type = WG_MAJOR_TYPE_AUDIO_MPEG1; + format->u.audio.channels = channels; + format->u.audio.rate = rate; + format->u.audio.layer = 3; +} + static void mf_media_type_to_wg_format_audio_mpeg4(IMFMediaType *type, const GUID *subtype, struct wg_format *format) { BYTE buffer[sizeof(HEAACWAVEFORMAT) + 64]; @@ -942,7 +997,11 @@ void mf_media_type_to_wg_format(IMFMediaType *type, struct wg_format *format) if (IsEqualGUID(&major_type, &MFMediaType_Audio)) { - if (IsEqualGUID(&subtype, &MEDIASUBTYPE_MSAUDIO1) || + if (IsEqualGUID(&subtype, &MFAudioFormat_MPEG)) + mf_media_type_to_wg_format_audio_mpeg(type, &subtype, format); + else if (IsEqualGUID(&subtype, &MFAudioFormat_MP3)) + mf_media_type_to_wg_format_audio_mpeg_layer3(type, &subtype, format); + else if (IsEqualGUID(&subtype, &MEDIASUBTYPE_MSAUDIO1) || IsEqualGUID(&subtype, &MFAudioFormat_WMAudioV8) || IsEqualGUID(&subtype, &MFAudioFormat_WMAudioV9) || IsEqualGUID(&subtype, &MFAudioFormat_WMAudio_Lossless))

1 0

Elizabeth Figura : wined3d: Remove the GL FFP vertex pipeline.
by Alexandre Julliard May 13, 2024

May 13, 2024

Module: wine Branch: master Commit: 3e31a9742ce602c83a64a8f77b8e5910d997057a URL: https://gitlab.winehq.org/wine/wine/-/commit/3e31a9742ce602c83a64a8f77b8e59… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Fri Mar 15 20:00:05 2024 -0500 wined3d: Remove the GL FFP vertex pipeline. --- dlls/wined3d/ffp_gl.c | 1409 ---------------------------------------- dlls/wined3d/wined3d_private.h | 1 - 2 files changed, 1410 deletions(-)

1 0