October 2023 - Wine-commits

Eric Pouech : quartz: Return correct error when no audio devices are present.
by Alexandre Julliard 17 Oct '23

17 Oct '23

Module: wine Branch: master Commit: a23402f6e79a04185f06c0e63e1b4d834e96d227 URL: https://gitlab.winehq.org/wine/wine/-/commit/a23402f6e79a04185f06c0e63e1b4d… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Tue Oct 17 19:58:17 2023 +0200 quartz: Return correct error when no audio devices are present. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/quartz/dsoundrender.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 38a7d6f7ad7..10eed43422e 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -1015,7 +1015,7 @@ HRESULT dsound_render_create(IUnknown *outer, IUnknown **out) IUnknown_Release(object->system_clock); strmbase_filter_cleanup(&object->filter); free(object); - return hr; + return hr == DSERR_NODRIVER ? VFW_E_NO_AUDIO_HARDWARE : hr; } if (FAILED(hr = IDirectSound8_SetCooperativeLevel(object->dsound,

1 0

Eric Pouech : mmdevapi: Don't fail when no audio backends are present.
by Alexandre Julliard 17 Oct '23

17 Oct '23

Module: wine Branch: master Commit: 984032823b1e47c90117e355ade778f79c8ad411 URL: https://gitlab.winehq.org/wine/wine/-/commit/984032823b1e47c90117e355ade778… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Tue Oct 17 19:58:17 2023 +0200 mmdevapi: Don't fail when no audio backends are present. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/mmdevapi/main.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/mmdevapi/main.c b/dlls/mmdevapi/main.c index dfc6183aa7d..36c94908d67 100644 --- a/dlls/mmdevapi/main.c +++ b/dlls/mmdevapi/main.c @@ -295,10 +295,7 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) unsigned int i = 0; TRACE("(%s, %s, %p)\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); - if(!InitOnceExecuteOnce(&init_once, init_driver, NULL, NULL)) { - ERR("Driver initialization failed\n"); - return E_FAIL; - } + InitOnceExecuteOnce(&init_once, init_driver, NULL, NULL); if (ppv == NULL) { WARN("invalid parameter\n");

1 0

Paul Gofman : winegstreamer: Add AVDecVideoAcceleration_H264 attribute for h264 decoder MFT.
by Alexandre Julliard 17 Oct '23

17 Oct '23

Module: wine Branch: master Commit: deff1303fb822085b84653870194144ebce81067 URL: https://gitlab.winehq.org/wine/wine/-/commit/deff1303fb822085b8465387019414… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Oct 13 18:56:48 2023 -0600 winegstreamer: Add AVDecVideoAcceleration_H264 attribute for h264 decoder MFT. --- dlls/mf/tests/transform.c | 3 +++ dlls/winegstreamer/h264_decoder.c | 7 +++++++ include/codecapi.h | 2 ++ 3 files changed, 12 insertions(+) diff --git a/dlls/mf/tests/transform.c b/dlls/mf/tests/transform.c index e798601a8b5..3f5524784cc 100644 --- a/dlls/mf/tests/transform.c +++ b/dlls/mf/tests/transform.c @@ -45,6 +45,8 @@ #include "initguid.h" +#include "codecapi.h" + #include "d3d11_4.h" DEFINE_GUID(DMOVideoFormat_RGB24,D3DFMT_R8G8B8,0x524f,0x11ce,0x9f,0x53,0x00,0x20,0xaf,0x0b,0xa7,0x70); @@ -3933,6 +3935,7 @@ static void test_h264_decoder(void) ATTR_UINT32(MF_SA_D3D11_AWARE, 1), ATTR_UINT32(MFT_DECODER_EXPOSE_OUTPUT_TYPES_IN_NATIVE_ORDER, 0, .todo = TRUE), /* more H264 decoder specific attributes from CODECAPI */ + ATTR_UINT32(AVDecVideoAcceleration_H264, 1), {0}, }; static const DWORD input_width = 120, input_height = 248; diff --git a/dlls/winegstreamer/h264_decoder.c b/dlls/winegstreamer/h264_decoder.c index 6d8f2a146da..5c48130eee9 100644 --- a/dlls/winegstreamer/h264_decoder.c +++ b/dlls/winegstreamer/h264_decoder.c @@ -26,6 +26,10 @@ #include "wine/debug.h" +#include "initguid.h" + +#include "codecapi.h" + WINE_DEFAULT_DEBUG_CHANNEL(mfplat); WINE_DECLARE_DEBUG_CHANNEL(winediag); @@ -881,6 +885,9 @@ HRESULT h264_decoder_create(REFIID riid, void **ret) 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))) + goto failed; + if (FAILED(hr = MFCreateAttributes(&decoder->output_attributes, 0))) goto failed; if (FAILED(hr = wg_sample_queue_create(&decoder->wg_sample_queue))) diff --git a/include/codecapi.h b/include/codecapi.h index 9719389b081..a9fe7c9de3f 100644 --- a/include/codecapi.h +++ b/include/codecapi.h @@ -61,4 +61,6 @@ enum eAVEncH264VLevel eAVEncH264VLevel5_2 = 52 }; +DEFINE_GUID(AVDecVideoAcceleration_H264, 0xf7db8a2f, 0x4f48, 0x4ee8, 0xae, 0x31, 0x8b, 0x6e, 0xbe, 0x55, 0x8a, 0xe2); + #endif /* __CODECAPI_H */

1 0

Nikolay Sivov : maintainers: Add EVR to the Media Foundation section.
by Alexandre Julliard 17 Oct '23

17 Oct '23

Module: wine Branch: master Commit: 0c7a09cb1f92d55d8381ff6460e13ed085d434db URL: https://gitlab.winehq.org/wine/wine/-/commit/0c7a09cb1f92d55d8381ff6460e13e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 17 20:17:50 2023 +0200 maintainers: Add EVR to the Media Foundation section. --- MAINTAINERS | 1 + 1 file changed, 1 insertion(+) diff --git a/MAINTAINERS b/MAINTAINERS index dc5c85cc4ec..4bab36bfdf9 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -373,6 +373,7 @@ F: dlls/wmvcore/ Windows Media Foundation M: Nikolay Sivov <nsivov(a)codeweavers.com> P: Rémi Bernon <rbernon(a)codeweavers.com> +F: dlls/evr/ F: dlls/mf/ F: dlls/mferror/ F: dlls/mfmediaengine/

1 0

Alex Henrie : d3dcompiler_43: Use debugstr_fourcc instead of debugstr_an.
by Alexandre Julliard 17 Oct '23

17 Oct '23

Module: wine Branch: master Commit: aca965d7f29b075f07ebe9dcced4362a95f6e3bd URL: https://gitlab.winehq.org/wine/wine/-/commit/aca965d7f29b075f07ebe9dcced436… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Oct 16 23:28:25 2023 -0600 d3dcompiler_43: Use debugstr_fourcc instead of debugstr_an. --- dlls/d3dcompiler_43/blob.c | 4 ++-- dlls/d3dcompiler_43/reflection.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/d3dcompiler_43/blob.c b/dlls/d3dcompiler_43/blob.c index bba1c6f590b..2d729f20486 100644 --- a/dlls/d3dcompiler_43/blob.c +++ b/dlls/d3dcompiler_43/blob.c @@ -209,7 +209,7 @@ static BOOL check_blob_part(DWORD tag, D3D_BLOB_PART part) break; } - TRACE("%s tag %s\n", add ? "Add" : "Skip", debugstr_an((const char *)&tag, 4)); + TRACE("%s tag %s\n", add ? "Add" : "Skip", debugstr_fourcc(tag)); return add; } @@ -341,7 +341,7 @@ static BOOL check_blob_strip(DWORD tag, UINT flags) break; } - TRACE("%s tag %s\n", add ? "Add" : "Skip", debugstr_an((const char *)&tag, 4)); + TRACE("%s tag %s\n", add ? "Add" : "Skip", debugstr_fourcc(tag)); return add; } diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index e4080da8c21..03329022fd9 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -1705,7 +1705,7 @@ static HRESULT d3dcompiler_parse_signature(struct d3dcompiler_shader_signature * break; default: - FIXME("Unhandled section %s!\n", debugstr_an((const char *)&section->tag, 4)); + FIXME("Unhandled section %s!\n", debugstr_fourcc(section->tag)); element_size = D3DCOMPILER_SIGNATURE_ELEMENT_SIZE6; break; } @@ -1963,7 +1963,7 @@ static HRESULT d3dcompiler_shader_reflection_init(struct d3dcompiler_shader_refl break; default: - FIXME("Unhandled section %s!\n", debugstr_an((const char *)&section->tag, 4)); + FIXME("Unhandled section %s!\n", debugstr_fourcc(section->tag)); break; } }

1 0

Alex Henrie : loader: Associate Wine with batch files.
by Alexandre Julliard 17 Oct '23

17 Oct '23

Module: wine Branch: master Commit: 474536c0d66ed79d23703b28e99b7c9bf4ddd3bd URL: https://gitlab.winehq.org/wine/wine/-/commit/474536c0d66ed79d23703b28e99b7c… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Oct 16 22:06:09 2023 -0600 loader: Associate Wine with batch files. --- loader/wine.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/loader/wine.desktop b/loader/wine.desktop index 36dd921d221..c839946c3a8 100644 --- a/loader/wine.desktop +++ b/loader/wine.desktop @@ -26,7 +26,7 @@ Name[hr]=Wine - dizač Windows programa Name[he]=Wine — מריץ תכניות Windows Name[ja]=Wine Windowsプログラムローダー Exec=wine start /unix %f -MimeType=application/x-ms-dos-executable;application/x-msi;application/x-ms-shortcut; +MimeType=application/x-ms-dos-executable;application/x-msi;application/x-ms-shortcut;application/x-bat Icon=wine NoDisplay=true StartupNotify=true

1 0

Alex Henrie : winemenubuilder: Disallow desktop integration for batch files.
by Alexandre Julliard 17 Oct '23

17 Oct '23

Module: wine Branch: master Commit: e86e228557dd552fcf6d3dc961c09562b64638e2 URL: https://gitlab.winehq.org/wine/wine/-/commit/e86e228557dd552fcf6d3dc961c095… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Oct 16 22:06:09 2023 -0600 winemenubuilder: Disallow desktop integration for batch files. --- programs/winemenubuilder/winemenubuilder.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 9459b77b502..82fece62eb5 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -1965,7 +1965,8 @@ static BOOL write_freedesktop_mime_type_entry(const WCHAR *packages_dir, const W static BOOL is_extension_banned(LPCWSTR extension) { /* These are managed through external tools like wine.desktop, to evade malware created file type associations */ - if (!wcsicmp(extension, L".com") || + if (!wcsicmp(extension, L".bat") || + !wcsicmp(extension, L".com") || !wcsicmp(extension, L".exe") || !wcsicmp(extension, L".msi")) return TRUE;

1 0

Alex Henrie : loader: Translate wine.desktop to Catalan.
by Alexandre Julliard 17 Oct '23

17 Oct '23

Module: wine Branch: master Commit: 7a22152ba11052eb8e26283af640d48f390a0570 URL: https://gitlab.winehq.org/wine/wine/-/commit/7a22152ba11052eb8e26283af640d4… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Oct 16 22:36:30 2023 -0600 loader: Translate wine.desktop to Catalan. --- loader/wine.desktop | 1 + 1 file changed, 1 insertion(+) diff --git a/loader/wine.desktop b/loader/wine.desktop index c839946c3a8..ce61e8769fd 100644 --- a/loader/wine.desktop +++ b/loader/wine.desktop @@ -2,6 +2,7 @@ Type=Application Name=Wine Windows Program Loader Name[ar]=منظومة واين لتشغيل برامج وندوز +Name[ca]=Wine - Carregador de programes de Windows Name[cs]=Zavaděč programů pro Wine Name[de]=Wine Windows-Programmstarter Name[es]=Wine Cargador de programas de Windows

1 0

Alex Henrie : loader: Add separating dash to Spanish translation of wine.desktop.
by Alexandre Julliard 17 Oct '23

17 Oct '23

Module: wine Branch: master Commit: e5679b5ff63d53dd158710de53e1db772e211b2c URL: https://gitlab.winehq.org/wine/wine/-/commit/e5679b5ff63d53dd158710de53e1db… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Oct 16 22:37:13 2023 -0600 loader: Add separating dash to Spanish translation of wine.desktop. --- loader/wine.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/loader/wine.desktop b/loader/wine.desktop index ce61e8769fd..277d34c48cd 100644 --- a/loader/wine.desktop +++ b/loader/wine.desktop @@ -5,7 +5,7 @@ Name[ar]=منظومة واين لتشغيل برامج وندوز Name[ca]=Wine - Carregador de programes de Windows Name[cs]=Zavaděč programů pro Wine Name[de]=Wine Windows-Programmstarter -Name[es]=Wine Cargador de programas de Windows +Name[es]=Wine - Cargador de programas de Windows Name[lt]=Wine Windows programų paleidyklė Name[nl]=Wine Windows programmalader Name[sv]=Wine Windows Programstartare

1 0

Paul Gofman : ntdll: Set EH_NESTED_CALL flag in call_stack_handlers() on x64.
by Alexandre Julliard 17 Oct '23

17 Oct '23

Module: wine Branch: master Commit: 9f4c0c4d430b4bdf1ff58f19a760c7b373badbff URL: https://gitlab.winehq.org/wine/wine/-/commit/9f4c0c4d430b4bdf1ff58f19a760c7… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Oct 16 15:03:21 2023 -0600 ntdll: Set EH_NESTED_CALL flag in call_stack_handlers() on x64. --- dlls/ntdll/signal_x86_64.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index f546aa15d94..014e00ec31f 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -351,7 +351,7 @@ static DWORD __cdecl nested_exception_handler( EXCEPTION_RECORD *rec, EXCEPTION_ CONTEXT *context, EXCEPTION_REGISTRATION_RECORD **dispatcher ) { if (!(rec->ExceptionFlags & (EH_UNWINDING | EH_EXIT_UNWIND))) - rec->ExceptionFlags |= EH_NESTED_CALL; + return ExceptionNestedException; return ExceptionContinueSearch; } @@ -360,7 +360,6 @@ static DWORD __cdecl nested_exception_handler( EXCEPTION_RECORD *rec, EXCEPTION_ * call_handler * * Call a single exception handler. - * FIXME: Handle nested exceptions. */ static DWORD call_handler( EXCEPTION_RECORD *rec, CONTEXT *context, DISPATCHER_CONTEXT *dispatch ) { @@ -447,7 +446,8 @@ static NTSTATUS call_stack_handlers( EXCEPTION_RECORD *rec, CONTEXT *orig_contex case ExceptionContinueSearch: break; case ExceptionNestedException: - FIXME_(seh)( "nested exception\n" ); + rec->ExceptionFlags |= EH_NESTED_CALL; + TRACE_(seh)( "nested exception\n" ); break; case ExceptionCollidedUnwind: { ULONG64 frame; @@ -477,7 +477,8 @@ static NTSTATUS call_stack_handlers( EXCEPTION_RECORD *rec, CONTEXT *orig_contex case ExceptionContinueSearch: break; case ExceptionNestedException: - FIXME_(seh)( "nested exception\n" ); + rec->ExceptionFlags |= EH_NESTED_CALL; + TRACE_(seh)( "nested exception\n" ); break; case ExceptionCollidedUnwind: { ULONG64 frame;

1 0