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

Nikolay Sivov : ole32/filemoniker: Use CRT allocation functions.
by Alexandre Julliard May 29, 2023

May 29, 2023

Module: wine Branch: master Commit: 0f72487b2570ff5b402ef6cd0b6613b3af0ab725 URL: https://gitlab.winehq.org/wine/wine/-/commit/0f72487b2570ff5b402ef6cd0b6613… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat May 27 10:59:28 2023 +0200 ole32/filemoniker: Use CRT allocation functions. --- dlls/ole32/filemoniker.c | 77 +++++++++++++++++++++++------------------------- 1 file changed, 37 insertions(+), 40 deletions(-)

1 0

Nikolay Sivov : ole32/git: Use CRT allocation functions.
by Alexandre Julliard May 29, 2023

May 29, 2023

Module: wine Branch: master Commit: 7ab7e299c3694ae4323b99ab3bbaf604906d6a32 URL: https://gitlab.winehq.org/wine/wine/-/commit/7ab7e299c3694ae4323b99ab3bbaf6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat May 27 11:03:40 2023 +0200 ole32/git: Use CRT allocation functions. --- dlls/ole32/git.c | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/dlls/ole32/git.c b/dlls/ole32/git.c index 50848a2a020..4e432723914 100644 --- a/dlls/ole32/git.c +++ b/dlls/ole32/git.c @@ -182,7 +182,7 @@ StdGlobalInterfaceTable_RegisterInterfaceInGlobal( zero.QuadPart = 0; IStream_Seek(stream, zero, STREAM_SEEK_SET, NULL); - entry = HeapAlloc(GetProcessHeap(), 0, sizeof(StdGITEntry)); + entry = malloc(sizeof(*entry)); if (!entry) { CoReleaseMarshalData(stream); @@ -240,8 +240,8 @@ StdGlobalInterfaceTable_RevokeInterfaceFromGlobal( return hr; } IStream_Release(entry->stream); - - HeapFree(GetProcessHeap(), 0, entry); + + free(entry); return S_OK; } @@ -306,7 +306,7 @@ HRESULT WINAPI GlobalInterfaceTable_CreateInstance(IClassFactory *iface, IUnknow if (!std_git) { - git = heap_alloc(sizeof(*git)); + git = malloc(sizeof(*git)); if (!git) return E_OUTOFMEMORY; git->IGlobalInterfaceTable_iface.lpVtbl = &StdGlobalInterfaceTableImpl_Vtbl; @@ -315,7 +315,7 @@ HRESULT WINAPI GlobalInterfaceTable_CreateInstance(IClassFactory *iface, IUnknow if (InterlockedCompareExchangePointer((void **)&std_git, &git->IGlobalInterfaceTable_iface, NULL)) { - heap_free(git); + free(git); } else TRACE("Created the GIT %p\n", git); @@ -326,20 +326,20 @@ HRESULT WINAPI GlobalInterfaceTable_CreateInstance(IClassFactory *iface, IUnknow void release_std_git(void) { - StdGlobalInterfaceTableImpl *git; - StdGITEntry *entry, *entry2; + StdGlobalInterfaceTableImpl *git; + StdGITEntry *entry, *entry2; - if (!std_git) return; + if (!std_git) return; - git = impl_from_IGlobalInterfaceTable(std_git); - LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, &git->list, StdGITEntry, entry) - { - list_remove(&entry->entry); + git = impl_from_IGlobalInterfaceTable(std_git); + LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, &git->list, StdGITEntry, entry) + { + list_remove(&entry->entry); - CoReleaseMarshalData(entry->stream); - IStream_Release(entry->stream); - HeapFree(GetProcessHeap(), 0, entry); - } + CoReleaseMarshalData(entry->stream); + IStream_Release(entry->stream); + free(entry); + } - HeapFree(GetProcessHeap(), 0, git); + free(git); }

1 0

David Kahurani : gdiplus: Handle Windows style newline.
by Alexandre Julliard May 29, 2023

May 29, 2023

Module: wine Branch: master Commit: c1da4fb1670e8b05b47fb01d4bc30d62857c348b URL: https://gitlab.winehq.org/wine/wine/-/commit/c1da4fb1670e8b05b47fb01d4bc30d… Author: David Kahurani <k.kahurani(a)gmail.com> Date: Thu May 25 19:14:04 2023 +0300 gdiplus: Handle Windows style newline. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54962 Signed-off-by: David Kahurani <k.kahurani(a)gmail.com> --- dlls/gdiplus/graphics.c | 33 +++++++++++++++++++++++++++------ dlls/gdiplus/tests/graphics.c | 7 +++++++ 2 files changed, 34 insertions(+), 6 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 03542b31ea7..835c2889bd1 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -5186,7 +5186,7 @@ GpStatus gdip_format_string(HDC hdc, INT *hotkeyprefix_offsets=NULL; INT hotkeyprefix_count=0; INT hotkeyprefix_pos=0, hotkeyprefix_end_pos=0; - BOOL seen_prefix = FALSE; + BOOL seen_prefix = FALSE, unixstyle_newline = TRUE; if(length == -1) length = lstrlenW(string); @@ -5259,9 +5259,20 @@ GpStatus gdip_format_string(HDC hdc, if(fit == 0) break; - for(lret = 0; lret < fit; lret++) + for(lret = 0; lret < fit; lret++) { if(*(stringdup + sum + lret) == '\n') - break; + { + unixstyle_newline = TRUE; + break; + } + + if(*(stringdup + sum + lret) == '\r' && lret + 1 < fit + && *(stringdup + sum + lret + 1) == '\n') + { + unixstyle_newline = FALSE; + break; + } + } /* Line break code (may look strange, but it imitates windows). */ if(lret < fit) @@ -5332,9 +5343,19 @@ GpStatus gdip_format_string(HDC hdc, if (stat != Ok) break; - sum += fit + (lret < fitcpy ? 1 : 0); - height += size.cy; - lineno++; + + if (unixstyle_newline) + { + height += size.cy; + lineno++; + sum += fit + (lret < fitcpy ? 1 : 0); + } + else + { + height += size.cy; + lineno++; + sum += fit + (lret < fitcpy ? 2 : 0); + } hotkeyprefix_pos = hotkeyprefix_end_pos; diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 0ee2b73c413..0456a451970 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -3197,6 +3197,7 @@ static void test_string_functions(void) HDC hdc = GetDC( hwnd ); const WCHAR teststring[] = L"MM M\nM"; const WCHAR teststring2[] = L"j"; + const WCHAR teststring3[] = L"MM M\r\nM\0"; REAL char_width, char_height; INT codepointsfitted, linesfilled; GpStringFormat *format; @@ -3268,6 +3269,12 @@ static void test_string_functions(void) status = GdipMeasureString(graphics, teststring, 6, font, &rc, NULL, &bounds, &codepointsfitted, NULL); expect(Ok, status); + /* new line handling */ + status = GdipMeasureString(graphics, teststring3, -1, font, &rc, NULL, &bounds, &codepointsfitted, &linesfilled); + expect(Ok, status); + expect(7, codepointsfitted); + expect(2, linesfilled); + status = GdipMeasureString(graphics, teststring, 1, font, &rc, NULL, &char_bounds, &codepointsfitted, &linesfilled); expect(Ok, status); expectf(0.0, char_bounds.X);

1 0

Nikolay Sivov : ole32/pointermoniker: Use CRT allocation functions.
by Alexandre Julliard May 29, 2023

May 29, 2023

Module: wine Branch: master Commit: 894f1cde4acb862dbaa000e7fb9cb09b3d216f59 URL: https://gitlab.winehq.org/wine/wine/-/commit/894f1cde4acb862dbaa000e7fb9cb0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat May 27 10:45:37 2023 +0200 ole32/pointermoniker: Use CRT allocation functions. --- dlls/ole32/pointermoniker.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/ole32/pointermoniker.c b/dlls/ole32/pointermoniker.c index 0beab94c649..9b5ea8caf76 100644 --- a/dlls/ole32/pointermoniker.c +++ b/dlls/ole32/pointermoniker.c @@ -32,7 +32,6 @@ #include "objbase.h" #include "oleidl.h" #include "wine/debug.h" -#include "wine/heap.h" #include "moniker.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); @@ -110,7 +109,7 @@ static ULONG WINAPI PointerMonikerImpl_Release(IMoniker *iface) if (!refcount) { if (moniker->pObject) IUnknown_Release(moniker->pObject); - heap_free(moniker); + free(moniker); } return refcount; @@ -600,8 +599,7 @@ HRESULT WINAPI CreatePointerMoniker(IUnknown *object, IMoniker **ret) if (!ret) return E_INVALIDARG; - moniker = heap_alloc(sizeof(*moniker)); - if (!moniker) + if (!(moniker = calloc(1, sizeof(*moniker)))) { *ret = NULL; return E_OUTOFMEMORY; @@ -714,7 +712,7 @@ static ULONG WINAPI ObjrefMonikerImpl_Release(IMoniker *iface) if (!refcount) { if (moniker->pObject) IUnknown_Release(moniker->pObject); - heap_free(moniker); + free(moniker); } return refcount; @@ -1017,8 +1015,7 @@ HRESULT WINAPI CreateObjrefMoniker(IUnknown *obj, IMoniker **ret) if (!ret) return E_INVALIDARG; - moniker = heap_alloc(sizeof(*moniker)); - if (!moniker) + if (!(moniker = calloc(1, sizeof(*moniker)))) { *ret = NULL; return E_OUTOFMEMORY;

1 0

Nikolay Sivov : ole32/classmoniker: Use CRT allocation functions.
by Alexandre Julliard May 29, 2023

May 29, 2023

Module: wine Branch: master Commit: a9d3d435bcb56a38113e2c29819bd2104690e98c URL: https://gitlab.winehq.org/wine/wine/-/commit/a9d3d435bcb56a38113e2c29819bd2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat May 27 10:43:38 2023 +0200 ole32/classmoniker: Use CRT allocation functions. --- dlls/ole32/classmoniker.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/ole32/classmoniker.c b/dlls/ole32/classmoniker.c index 6199a5a5182..4b95f577b84 100644 --- a/dlls/ole32/classmoniker.c +++ b/dlls/ole32/classmoniker.c @@ -30,7 +30,6 @@ #include "winbase.h" #include "winuser.h" #include "wine/debug.h" -#include "wine/heap.h" #include "ole2.h" #include "moniker.h" @@ -138,8 +137,8 @@ static ULONG WINAPI ClassMoniker_Release(IMoniker* iface) if (!ref) { if (moniker->pMarshal) IUnknown_Release(moniker->pMarshal); - heap_free(moniker->data); - heap_free(moniker); + free(moniker->data); + free(moniker); } return ref; @@ -187,8 +186,8 @@ static HRESULT WINAPI ClassMoniker_Load(IMoniker *iface, IStream *stream) if (moniker->header.data_len) { - heap_free(moniker->data); - if (!(moniker->data = heap_alloc(moniker->header.data_len))) + free(moniker->data); + if (!(moniker->data = malloc(moniker->header.data_len))) { WARN("Failed to allocate moniker data of size %lu.\n", moniker->header.data_len); moniker->header.data_len = 0; @@ -597,7 +596,7 @@ static HRESULT create_class_moniker(const CLSID *clsid, const WCHAR *data, { ClassMoniker *object; - if (!(object = heap_alloc_zero(sizeof(*object)))) + if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; object->IMoniker_iface.lpVtbl = &ClassMonikerVtbl; @@ -608,7 +607,7 @@ static HRESULT create_class_moniker(const CLSID *clsid, const WCHAR *data, { object->header.data_len = (data_len + 1) * sizeof(WCHAR); - if (!(object->data = heap_alloc(object->header.data_len))) + if (!(object->data = malloc(object->header.data_len))) { IMoniker_Release(&object->IMoniker_iface); return E_OUTOFMEMORY;

1 0

Nikolay Sivov : ole32/antimoniker: Fix Enum() return error code.
by Alexandre Julliard May 29, 2023

May 29, 2023

Module: wine Branch: master Commit: d4cb70107d56416f19e44a962f732cf6cd696f86 URL: https://gitlab.winehq.org/wine/wine/-/commit/d4cb70107d56416f19e44a962f732c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat May 27 10:39:15 2023 +0200 ole32/antimoniker: Fix Enum() return error code. --- dlls/ole32/antimoniker.c | 10 +++------- dlls/ole32/tests/moniker.c | 4 +++- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/ole32/antimoniker.c b/dlls/ole32/antimoniker.c index e4ee4a729d4..855bd47fb27 100644 --- a/dlls/ole32/antimoniker.c +++ b/dlls/ole32/antimoniker.c @@ -294,16 +294,12 @@ AntiMonikerImpl_ComposeWith(IMoniker* iface, IMoniker* pmkRight, return CreateGenericComposite(iface,pmkRight,ppmkComposite); } -/****************************************************************************** - * AntiMoniker_Enum - ******************************************************************************/ -static HRESULT WINAPI -AntiMonikerImpl_Enum(IMoniker* iface,BOOL fForward, IEnumMoniker** ppenumMoniker) +static HRESULT WINAPI AntiMonikerImpl_Enum(IMoniker *iface, BOOL forward, IEnumMoniker **ppenumMoniker) { - TRACE("(%p,%d,%p)\n",iface,fForward,ppenumMoniker); + TRACE("%p, %d, %p.\n", iface, forward, ppenumMoniker); if (ppenumMoniker == NULL) - return E_POINTER; + return E_INVALIDARG; *ppenumMoniker = NULL; diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index a507c63171c..9c583d27c47 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -3037,7 +3037,9 @@ static void test_anti_moniker(void) ok(!enummoniker, "Unexpected pointer.\n"); hr = IMoniker_Enum(moniker, FALSE, NULL); - todo_wine + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); + + hr = IMoniker_Enum(moniker, TRUE, NULL); ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); /* CommonPrefixWith() */

1 0

Nikolay Sivov : ole32/antimoniker: Use CRT allocation functions.
by Alexandre Julliard May 29, 2023

May 29, 2023

Module: wine Branch: master Commit: 8e4b95e43ef04cc344fc66f9b1eb6b8d600dc7e1 URL: https://gitlab.winehq.org/wine/wine/-/commit/8e4b95e43ef04cc344fc66f9b1eb6b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat May 27 10:35:13 2023 +0200 ole32/antimoniker: Use CRT allocation functions. --- dlls/ole32/antimoniker.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/ole32/antimoniker.c b/dlls/ole32/antimoniker.c index 2a7be8e75cc..e4ee4a729d4 100644 --- a/dlls/ole32/antimoniker.c +++ b/dlls/ole32/antimoniker.c @@ -18,7 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <assert.h> #include <stdarg.h> #include <string.h> @@ -27,10 +26,8 @@ #include "windef.h" #include "winbase.h" -#include "winerror.h" #include "objbase.h" #include "wine/debug.h" -#include "wine/heap.h" #include "moniker.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); @@ -140,7 +137,7 @@ static ULONG WINAPI AntiMonikerImpl_Release(IMoniker *iface) if (!refcount) { if (moniker->pMarshal) IUnknown_Release(moniker->pMarshal); - heap_free(moniker); + free(moniker); } return refcount; @@ -616,8 +613,7 @@ HRESULT create_anti_moniker(DWORD order, IMoniker **ret) { AntiMonikerImpl *moniker; - moniker = heap_alloc_zero(sizeof(*moniker)); - if (!moniker) + if (!(moniker = calloc(1, sizeof(*moniker)))) return E_OUTOFMEMORY; moniker->IMoniker_iface.lpVtbl = &VT_AntiMonikerImpl;

1 0

Nikolay Sivov : ole32/itemmoniker: Use CRT allocation functions.
by Alexandre Julliard May 29, 2023

May 29, 2023

Module: wine Branch: master Commit: 873d53d864bce7d1f7719d5562a88d7d7c0bf909 URL: https://gitlab.winehq.org/wine/wine/-/commit/873d53d864bce7d1f7719d5562a88d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat May 27 10:48:28 2023 +0200 ole32/itemmoniker: Use CRT allocation functions. --- dlls/ole32/itemmoniker.c | 41 ++++++++++++++++++++--------------------- 1 file changed, 20 insertions(+), 21 deletions(-) diff --git a/dlls/ole32/itemmoniker.c b/dlls/ole32/itemmoniker.c index 5c69266fc9c..f0c722bbf26 100644 --- a/dlls/ole32/itemmoniker.c +++ b/dlls/ole32/itemmoniker.c @@ -31,7 +31,6 @@ #include "winuser.h" #include "winnls.h" #include "wine/debug.h" -#include "wine/heap.h" #include "ole2.h" #include "moniker.h" @@ -100,7 +99,7 @@ static ULONG WINAPI container_lock_Release(IUnknown *iface) { IOleItemContainer_LockContainer(lock->container, FALSE); IOleItemContainer_Release(lock->container); - heap_free(lock); + free(lock); } return refcount; @@ -118,12 +117,12 @@ static HRESULT set_container_lock(IOleItemContainer *container, IBindCtx *pbc) struct container_lock *lock; HRESULT hr; - if (!(lock = heap_alloc(sizeof(*lock)))) + if (!(lock = malloc(sizeof(*lock)))) return E_OUTOFMEMORY; if (FAILED(hr = IOleItemContainer_LockContainer(container, TRUE))) { - heap_free(lock); + free(lock); return hr; } @@ -203,9 +202,9 @@ static ULONG WINAPI ItemMonikerImpl_Release(IMoniker* iface) if (!refcount) { if (moniker->pMarshal) IUnknown_Release(moniker->pMarshal); - heap_free(moniker->itemName); - heap_free(moniker->itemDelimiter); - heap_free(moniker); + free(moniker->itemName); + free(moniker->itemDelimiter); + free(moniker); } return refcount; @@ -253,18 +252,18 @@ static HRESULT item_moniker_load_string_record(IStream *stream, WCHAR **ret) if (!str_len) { - heap_free(*ret); + free(*ret); *ret = NULL; return S_OK; } - if (!(buffer = heap_alloc(str_len))) + if (!(buffer = malloc(str_len))) return E_OUTOFMEMORY; IStream_Read(stream, buffer, str_len, &read_len); if (read_len != str_len) { - heap_free(buffer); + free(buffer); return E_FAIL; } @@ -291,7 +290,7 @@ static HRESULT item_moniker_load_string_record(IStream *stream, WCHAR **ret) goto end; } - str = heap_alloc(str_len + sizeof(WCHAR)); + str = malloc(str_len + sizeof(WCHAR)); if (str) { memcpy(str, &buffer[i + 1], str_len); @@ -301,21 +300,21 @@ static HRESULT item_moniker_load_string_record(IStream *stream, WCHAR **ret) else { lenW = MultiByteToWideChar(CP_ACP, 0, buffer, -1, NULL, 0); - str = heap_alloc(lenW * sizeof(WCHAR)); + str = malloc(lenW * sizeof(WCHAR)); if (str) MultiByteToWideChar(CP_ACP, 0, buffer, -1, str, lenW); } if (str) { - heap_free(*ret); + free(*ret); *ret = str; } else hr = E_OUTOFMEMORY; end: - heap_free(buffer); + free(buffer); return hr; } @@ -361,13 +360,13 @@ static HRESULT WINAPI ItemMonikerImpl_Save(IMoniker *iface, IStream *stream, BOO if (This->itemDelimiter) { str_len = WideCharToMultiByte(CP_ACP, 0, This->itemDelimiter, -1, NULL, 0, NULL, NULL); - str = heap_alloc(str_len); + str = malloc(str_len); WideCharToMultiByte(CP_ACP, 0, This->itemDelimiter, -1, str, str_len, NULL, NULL); hr = IStream_Write(stream, &str_len, sizeof(str_len), NULL); hr = IStream_Write(stream, str, str_len, NULL); - heap_free(str); + free(str); } else { @@ -376,11 +375,11 @@ static HRESULT WINAPI ItemMonikerImpl_Save(IMoniker *iface, IStream *stream, BOO } str_len = WideCharToMultiByte(CP_ACP, 0, This->itemName, -1, NULL, 0, NULL, NULL); - str = heap_alloc(str_len); + str = malloc(str_len); WideCharToMultiByte(CP_ACP, 0, This->itemName, -1, str, str_len, NULL, NULL); hr = IStream_Write(stream, &str_len, sizeof(str_len), NULL); hr = IStream_Write(stream, str, str_len, NULL); - heap_free(str); + free(str); return hr; } @@ -940,7 +939,7 @@ HRESULT WINAPI CreateItemMoniker(const WCHAR *delimiter, const WCHAR *name, IMon TRACE("%s, %s, %p.\n", debugstr_w(delimiter), debugstr_w(name), ret); - if (!(moniker = heap_alloc_zero(sizeof(*moniker)))) + if (!(moniker = calloc(1, sizeof(*moniker)))) return E_OUTOFMEMORY; moniker->IMoniker_iface.lpVtbl = &VT_ItemMonikerImpl; @@ -948,7 +947,7 @@ HRESULT WINAPI CreateItemMoniker(const WCHAR *delimiter, const WCHAR *name, IMon moniker->ref = 1; str_len = (lstrlenW(name) + 1) * sizeof(WCHAR); - moniker->itemName = heap_alloc(str_len); + moniker->itemName = malloc(str_len); if (!moniker->itemName) { hr = E_OUTOFMEMORY; @@ -959,7 +958,7 @@ HRESULT WINAPI CreateItemMoniker(const WCHAR *delimiter, const WCHAR *name, IMon if (delimiter) { str_len = (lstrlenW(delimiter) + 1) * sizeof(WCHAR); - moniker->itemDelimiter = heap_alloc(str_len); + moniker->itemDelimiter = malloc(str_len); if (!moniker->itemDelimiter) { hr = E_OUTOFMEMORY;

1 0

Rémi Bernon : winegstreamer: Set the default H264 caps profile to "baseline".
by Alexandre Julliard May 29, 2023

May 29, 2023

Module: wine Branch: master Commit: 34b990fe176672a46a63864b6e121ba88ffecb7e URL: https://gitlab.winehq.org/wine/wine/-/commit/34b990fe176672a46a63864b6e121b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu May 25 15:21:18 2023 +0200 winegstreamer: Set the default H264 caps profile to "baseline". Some elements such as openh264dec require it to be present. --- dlls/winegstreamer/wg_format.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/winegstreamer/wg_format.c b/dlls/winegstreamer/wg_format.c index da0cd052804..a579a1101d1 100644 --- a/dlls/winegstreamer/wg_format.c +++ b/dlls/winegstreamer/wg_format.c @@ -571,11 +571,10 @@ static GstCaps *wg_format_to_caps_video_h264(const struct wg_format *format) GST_FIXME("H264 profile attribute %u not implemented.", format->u.video_h264.profile); /* fallthrough */ case eAVEncH264VProfile_unknown: - profile = NULL; + profile = "baseline"; break; } - if (profile) - gst_caps_set_simple(caps, "profile", G_TYPE_STRING, profile, NULL); + gst_caps_set_simple(caps, "profile", G_TYPE_STRING, profile, NULL); switch (format->u.video_h264.level) {

1 0

Rémi Bernon : winegstreamer: Forbid vaapidecodebin when looking for a specific element.
by Alexandre Julliard May 29, 2023

May 29, 2023

Module: wine Branch: master Commit: 0c760ef70de7be47684de82fcd5dc7e71aeb3e22 URL: https://gitlab.winehq.org/wine/wine/-/commit/0c760ef70de7be47684de82fcd5dc7… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed May 17 14:23:37 2023 +0200 winegstreamer: Forbid vaapidecodebin when looking for a specific element. This will eventually fallback to vaapih264dec and similar decoders if VA-API plugins are indeed available. --- dlls/winegstreamer/unixlib.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/winegstreamer/unixlib.c b/dlls/winegstreamer/unixlib.c index 6ffd41e9712..6ed38260536 100644 --- a/dlls/winegstreamer/unixlib.c +++ b/dlls/winegstreamer/unixlib.c @@ -101,6 +101,16 @@ GstElement *find_element(GstElementFactoryListType type, GstCaps *src_caps, GstC for (tmp = transforms; tmp != NULL && element == NULL; tmp = tmp->next) { name = gst_plugin_feature_get_name(GST_PLUGIN_FEATURE(tmp->data)); + + if (!strcmp(name, "vaapidecodebin")) + { + /* vaapidecodebin adds asynchronicity which breaks wg_transform synchronous drain / flush + * requirements. Ignore it and use VA-API decoders directly instead. + */ + GST_WARNING("Ignoring vaapidecodebin decoder."); + continue; + } + if (!(element = gst_element_factory_create(GST_ELEMENT_FACTORY(tmp->data), NULL))) GST_WARNING("Failed to create %s element.", name); }

1 0