December 2020 - Wine-commits

Alexandre Julliard : ntdll: Don't use the main exe path as bindir on Android.
by Alexandre Julliard 08 Dec '20

08 Dec '20

Module: wine Branch: master Commit: 99ef6faf769bba812632ac4a18c925dc5e9f4ca1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=99ef6faf769bba812632ac4a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 8 12:41:20 2020 +0100 ntdll: Don't use the main exe path as bindir on Android. The main exe can be the JVM host process. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/loader.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 72f215eb2d3..7a9e73d9730 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -339,7 +339,7 @@ static void set_config_dir(void) } } -static void init_paths( int argc, char *argv[], char *envp[] ) +static void init_paths( char *argv[] ) { Dl_info info; @@ -350,7 +350,7 @@ static void init_paths( int argc, char *argv[], char *envp[] ) if (!(build_dir = remove_tail( dll_dir, "/dlls/ntdll" ))) { -#if defined(__linux__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) +#if (defined(__linux__) && !defined(__ANDROID__)) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) bin_dir = realpath_dirname( "/proc/self/exe" ); #elif defined (__FreeBSD__) || defined(__DragonFly__) bin_dir = realpath_dirname( "/proc/curproc/file" ); @@ -1757,7 +1757,7 @@ static void check_command_line( int argc, char *argv[] ) */ void __wine_main( int argc, char *argv[], char *envp[] ) { - init_paths( argc, argv, envp ); + init_paths( argv ); if (!getenv( "WINELOADERNOEXEC" )) /* first time around */ {

1 0

Alexandre Julliard : libwine: Move the Android JNI initialization to ntdll.
by Alexandre Julliard 08 Dec '20

08 Dec '20

Module: wine Branch: master Commit: 758e75cc46afe7d0349615998f533abca5eeca26 URL: https://source.winehq.org/git/wine.git/?a=commit;h=758e75cc46afe7d034961599… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 8 12:45:18 2020 +0100 libwine: Move the Android JNI initialization to ntdll. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/loader.c | 120 ++++++++++++++++++++++++++++++ dlls/wineandroid.drv/WineActivity.java | 9 +-- dlls/wineandroid.drv/android.h | 5 +- dlls/wineandroid.drv/device.c | 4 +- dlls/wineandroid.drv/init.c | 18 ++--- libs/wine/loader.c | 130 --------------------------------- 6 files changed, 135 insertions(+), 151 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=758e75cc46afe7d03496…

1 0

Alexandre Julliard : libwine: Mark more functions as obsolete.
by Alexandre Julliard 08 Dec '20

08 Dec '20

Module: wine Branch: master Commit: 2bf8293e8fec0aa7efb450a7bf1a14633d16abcd URL: https://source.winehq.org/git/wine.git/?a=commit;h=2bf8293e8fec0aa7efb450a7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 8 13:13:14 2020 +0100 libwine: Mark more functions as obsolete. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/wine/config.c | 9 +++++---- libs/wine/loader.c | 59 ++++++++++++++++++++++++++++++------------------------ libs/wine/mmap.c | 54 ++++++++++++++++++++++++++++--------------------- libs/wine/wine.map | 12 +++++------ 4 files changed, 75 insertions(+), 59 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2bf8293e8fec0aa7efb4…

1 0

Alexandre Julliard : ntdll: Support the Android Java %fs register being a GDT selector.
by Alexandre Julliard 08 Dec '20

08 Dec '20

Module: wine Branch: master Commit: 6ddd6e836cf0c1f592845296428dde28df851e50 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6ddd6e836cf0c1f592845296… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 8 12:46:17 2020 +0100 ntdll: Support the Android Java %fs register being a GDT selector. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/loader.c | 1 + dlls/wineandroid.drv/device.c | 4 +++- dlls/wineandroid.drv/init.c | 2 ++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 676027fe516..31cfb43d11f 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1671,6 +1671,7 @@ static jstring wine_init_jni( JNIEnv *env, jobject obj, jobjectArray cmdline, jo { unsigned short java_fs; __asm__( "mov %%fs,%0" : "=r" (java_fs) ); + if (!(java_fs & 4)) java_gdt_sel = java_fs; __asm__( "mov %0,%%fs" :: "r" (0) ); start_main_thread(); __asm__( "mov %0,%%fs" :: "r" (java_fs) ); diff --git a/dlls/wineandroid.drv/device.c b/dlls/wineandroid.drv/device.c index 45ceb0a5c0b..5bebc5c7901 100644 --- a/dlls/wineandroid.drv/device.c +++ b/dlls/wineandroid.drv/device.c @@ -258,9 +258,11 @@ static inline void wrap_java_call(void) { __asm__( "mov %0,%%fs" :: "r" (java_ static inline void unwrap_java_call(void) { __asm__( "mov %0,%%fs" :: "r" (orig_fs) ); } static inline void init_java_thread( JavaVM *java_vm ) { + java_fs = *p_java_gdt_sel; __asm__( "mov %%fs,%0" : "=r" (orig_fs) ); + __asm__( "mov %0,%%fs" :: "r" (java_fs) ); (*java_vm)->AttachCurrentThread( java_vm, &jni_env, 0 ); - __asm__( "mov %%fs,%0" : "=r" (java_fs) ); + if (!*p_java_gdt_sel) __asm__( "mov %%fs,%0" : "=r" (java_fs) ); __asm__( "mov %0,%%fs" :: "r" (orig_fs) ); } diff --git a/dlls/wineandroid.drv/init.c b/dlls/wineandroid.drv/init.c index 638fb5726c1..d6ca79a1416 100644 --- a/dlls/wineandroid.drv/init.c +++ b/dlls/wineandroid.drv/init.c @@ -622,6 +622,7 @@ static void load_android_libs(void) JavaVM **p_java_vm = NULL; jobject *p_java_object = NULL; +unsigned short *p_java_gdt_sel = NULL; static BOOL process_attach(void) { @@ -635,6 +636,7 @@ static BOOL process_attach(void) p_java_vm = dlsym( ntdll, "java_vm" ); p_java_object = dlsym( ntdll, "java_object" ); + p_java_gdt_sel = dlsym( ntdll, "java_gdt_sel" ); object = *p_java_object;

1 0

Michael Stefaniuc : msvfw32/tests: Use wide-char string literals.
by Alexandre Julliard 07 Dec '20

07 Dec '20

Module: wine Branch: master Commit: ae59a6a92a6b13d2a8ae8fa9f78de0144475c560 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ae59a6a92a6b13d2a8ae8fa9… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Dec 4 22:13:12 2020 +0100 msvfw32/tests: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvfw32/tests/msvfw.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/msvfw32/tests/msvfw.c b/dlls/msvfw32/tests/msvfw.c index 2d85e26df19..def78f02e9d 100644 --- a/dlls/msvfw32/tests/msvfw.c +++ b/dlls/msvfw32/tests/msvfw.c @@ -401,7 +401,6 @@ static LRESULT CALLBACK enum_driver_proc(DWORD_PTR id, HDRVR driver, UINT msg, static void test_ICInfo(void) { - static const WCHAR bogusW[] = {'b','o','g','u','s',0}; static const DWORD test_type = mmioFOURCC('w','i','n','e'); static const DWORD test_handler = mmioFOURCC('t','e','s','t'); DWORD i = 0, found = 0; @@ -475,7 +474,7 @@ static void test_ICInfo(void) ok(info.dwVersionICM == ICVERSION, "Got unexpected ICM version %#x.\n", info.dwVersionICM); ok(!info.szName[0], "Got unexpected name %s.\n", wine_dbgstr_w(info.szName)); ok(!info.szDescription[0], "Got unexpected name %s.\n", wine_dbgstr_w(info.szDescription)); - ok(!lstrcmpW(info.szDriver, bogusW), "Got unexpected driver %s.\n", wine_dbgstr_w(info.szDriver)); + ok(!lstrcmpW(info.szDriver, L"bogus"), "Got unexpected driver %s.\n", wine_dbgstr_w(info.szDriver)); /* Drivers installed after msvfw32 is loaded are not enumerated. */ todo_wine @@ -503,7 +502,7 @@ todo_wine ok(info.dwVersionICM == ICVERSION, "Got unexpected ICM version %#x.\n", info.dwVersionICM); ok(!info.szName[0], "Got unexpected name %s.\n", wine_dbgstr_w(info.szName)); ok(!info.szDescription[0], "Got unexpected name %s.\n", wine_dbgstr_w(info.szDescription)); - ok(!lstrcmpW(info.szDriver, bogusW), "Got unexpected driver %s.\n", wine_dbgstr_w(info.szDriver)); + ok(!lstrcmpW(info.szDriver, L"bogus"), "Got unexpected driver %s.\n", wine_dbgstr_w(info.szDriver)); /* Drivers installed after msvfw32 is loaded are not enumerated. */ todo_wine

1 0

Michael Stefaniuc : oledlg/tests: Use wide-char string literals.
by Alexandre Julliard 07 Dec '20

07 Dec '20

Module: wine Branch: master Commit: 3118168c1a222626432df830cb5620f07472a3ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=3118168c1a222626432df830… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Dec 4 22:13:14 2020 +0100 oledlg/tests: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oledlg/tests/main.c | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/dlls/oledlg/tests/main.c b/dlls/oledlg/tests/main.c index 3bb384710b0..919cd008542 100644 --- a/dlls/oledlg/tests/main.c +++ b/dlls/oledlg/tests/main.c @@ -49,7 +49,6 @@ static ULONG WINAPI enumverbs_Release(IEnumOLEVERB *iface) } static int g_enumpos; -static const WCHAR verbW[] = {'v','e','r','b',0}; static HRESULT WINAPI enumverbs_Next(IEnumOLEVERB *iface, ULONG count, OLEVERB *verbs, ULONG *fetched) { ok(count == 1, "got %u\n", count); @@ -58,8 +57,8 @@ static HRESULT WINAPI enumverbs_Next(IEnumOLEVERB *iface, ULONG count, OLEVERB * if (g_enumpos++ == 0) { verbs->lVerb = 123; - verbs->lpszVerbName = CoTaskMemAlloc(sizeof(verbW)); - lstrcpyW(verbs->lpszVerbName, verbW); + verbs->lpszVerbName = CoTaskMemAlloc(sizeof(L"verb")); + lstrcpyW(verbs->lpszVerbName, L"verb"); verbs->fuFlags = MF_ENABLED; verbs->grfAttribs = OLEVERBATTRIB_ONCONTAINERMENU; if (fetched) *fetched = 1; @@ -207,14 +206,12 @@ static HRESULT WINAPI oleobject_GetUserClassID(IOleObject *iface, CLSID *clsid) ok(0, "unexpected call\n"); return E_NOTIMPL; } - -static const WCHAR testW[] = {'t','e','s','t',0}; static HRESULT WINAPI oleobject_GetUserType(IOleObject *iface, DWORD formoftype, LPOLESTR *usertype) { ok(formoftype == USERCLASSTYPE_SHORT, "got %d\n", formoftype); - *usertype = CoTaskMemAlloc(sizeof(testW)); - lstrcpyW(*usertype, testW); + *usertype = CoTaskMemAlloc(sizeof(L"test")); + lstrcpyW(*usertype, L"test"); return S_OK; } @@ -291,7 +288,6 @@ static IOleObject oleobject = { &oleobjectvtbl }; static void test_OleUIAddVerbMenu(void) { - static const WCHAR cadabraW[] = {'c','a','d','a','b','r','a',0}; HMENU hMenu, verbmenu; MENUITEMINFOW info; WCHAR buffW[50]; @@ -365,7 +361,7 @@ static void test_OleUIAddVerbMenu(void) /* now without object */ verbmenu = (HMENU)0xdeadbeef; - ret = OleUIAddVerbMenuW(NULL, testW, hMenu, 3, 42, 0, FALSE, 0, &verbmenu); + ret = OleUIAddVerbMenuW(NULL, L"test", hMenu, 3, 42, 0, FALSE, 0, &verbmenu); ok(!ret, "got %d\n", ret); ok(verbmenu == NULL, "got %p\n", verbmenu); @@ -399,7 +395,7 @@ static void test_OleUIAddVerbMenu(void) ok(ret, "got %d\n", ret); /* Item string contains verb, usertype and localized string for 'Object' word, exact format depends on localization. */ - ok(wcsstr(buffW, verbW) != NULL, "str %s\n", wine_dbgstr_w(buffW)); + ok(wcsstr(buffW, L"verb") != NULL, "str %s\n", wine_dbgstr_w(buffW)); ok(info.fState == 0, "got state 0x%08x\n", info.fState); ok(info.hSubMenu == NULL, "got submenu %p\n", info.hSubMenu); @@ -445,13 +441,13 @@ static void test_OleUIAddVerbMenu(void) info.fMask = MIIM_STRING|MIIM_STATE; info.fState = MFS_ENABLED; info.dwTypeData = buffW; - lstrcpyW(buffW, cadabraW); + lstrcpyW(buffW, L"cadabra"); ret = SetMenuItemInfoW(hMenu, 0, TRUE, &info); ok(ret, "got %d\n", ret); buffW[0] = 0; GetMenuStringW(hMenu, 0, buffW, ARRAY_SIZE(buffW), MF_BYPOSITION); - ok(!lstrcmpW(buffW, cadabraW), "got %s\n", wine_dbgstr_w(buffW)); + ok(!lstrcmpW(buffW, L"cadabra"), "got %s\n", wine_dbgstr_w(buffW)); verbmenu = NULL; ret = OleUIAddVerbMenuW(NULL, NULL, hMenu, 0, 5, 10, TRUE, 3, &verbmenu); @@ -466,7 +462,7 @@ static void test_OleUIAddVerbMenu(void) info.cch = ARRAY_SIZE(buffW); ret = GetMenuItemInfoW(hMenu, 0, TRUE, &info); ok(ret, "got %d\n", ret); - ok(lstrcmpW(buffW, cadabraW), "got %s\n", wine_dbgstr_w(buffW)); + ok(lstrcmpW(buffW, L"cadabra"), "got %s\n", wine_dbgstr_w(buffW)); ok(info.fState == MF_GRAYED, "got state 0x%08x\n", info.fState); count = GetMenuItemCount(hMenu);

1 0

Michael Stefaniuc : msctf/tests: Use wide-char string literals.
by Alexandre Julliard 07 Dec '20

07 Dec '20

Module: wine Branch: master Commit: 7f46f2314f7d2f8eea9323c51983c32860593c15 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f46f2314f7d2f8eea9323c5… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sat Dec 5 16:51:10 2020 +0100 msctf/tests: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msctf/tests/inputprocessor.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index 1c97d2c5d1c..55a6ab6c34c 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -1112,9 +1112,6 @@ static void test_Register(void) { HRESULT hr; - static const WCHAR szDesc[] = {'F','a','k','e',' ','W','i','n','e',' ','S','e','r','v','i','c','e',0}; - static const WCHAR szFile[] = {'F','a','k','e',' ','W','i','n','e',' ','S','e','r','v','i','c','e',' ','F','i','l','e',0}; - hr = ITfInputProcessorProfiles_GetCurrentLanguage(g_ipp,&gLangid); ok(SUCCEEDED(hr),"Unable to get current language id\n"); trace("Current Language %x\n",gLangid); @@ -1124,7 +1121,8 @@ static void test_Register(void) hr = ITfInputProcessorProfiles_Register(g_ipp, &CLSID_FakeService); ok(SUCCEEDED(hr),"Unable to register text service(%x)\n",hr); hr = ITfInputProcessorProfiles_AddLanguageProfile(g_ipp, &CLSID_FakeService, gLangid, - &CLSID_FakeService, szDesc, ARRAY_SIZE(szDesc), szFile, ARRAY_SIZE(szFile), 1); + &CLSID_FakeService, L"Fake Wine Service", ARRAY_SIZE(L"Fake Wine Service"), + L"Fake Wine Service File", ARRAY_SIZE(L"Fake Wine Service File"), 1); ok(SUCCEEDED(hr),"Unable to add Language Profile (%x)\n",hr); } @@ -2071,12 +2069,11 @@ static void test_InsertAtSelection(TfEditCookie ec, ITfContext *cxt) HRESULT hr; ITfInsertAtSelection *iis; ITfRange *range=NULL; - static const WCHAR txt[] = {'H','e','l','l','o',' ','W','o','r','l','d',0}; hr = ITfContext_QueryInterface(cxt, &IID_ITfInsertAtSelection , (LPVOID*)&iis); ok(SUCCEEDED(hr),"Failed to get ITfInsertAtSelection interface\n"); test_ACP_InsertTextAtSelection = SINK_EXPECTED; - hr = ITfInsertAtSelection_InsertTextAtSelection(iis, ec, 0, txt, 11, &range); + hr = ITfInsertAtSelection_InsertTextAtSelection(iis, ec, 0, L"Hello World", 11, &range); ok(SUCCEEDED(hr),"ITfInsertAtSelection_InsertTextAtSelection failed %x\n",hr); sink_check_ok(&test_ACP_InsertTextAtSelection,"InsertTextAtSelection"); ok(range != NULL,"No range returned\n");

1 0

Michael Stefaniuc : gameux/tests: Use wide-char string literals.
by Alexandre Julliard 07 Dec '20

07 Dec '20

Module: wine Branch: master Commit: 323d46fb93dc4f574212ff8c34f0c4a32ed074e0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=323d46fb93dc4f574212ff8c… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Dec 6 16:02:17 2020 +0100 gameux/tests: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gameux/tests/gamestatistics.c | 101 ++++++++++++++++--------------------- 1 file changed, 44 insertions(+), 57 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=323d46fb93dc4f574212…

1 0

Zebediah Figura : Revert "winegstreamer: Avoid performing color matrix conversions in videoconvert.".
by Alexandre Julliard 07 Dec '20

07 Dec '20

Module: wine Branch: master Commit: 251262a44a8f8403fd963e7bb510da778944af1b URL: https://source.winehq.org/git/wine.git/?a=commit;h=251262a44a8f8403fd963e7b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Dec 6 10:19:11 2020 -0600 Revert "winegstreamer: Avoid performing color matrix conversions in videoconvert.". This reverts commit fd25ba65e0eb9fedfb2cdfa2b7a4b16e0401dfdf. The relevant commit breaks visual correctness in many applications, for the sake of performance. As such I am rather inclined to revert it for 6.0, especially as a full solution will probably involve a revert of this patch along with upstream changes to GStreamer. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49535 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index e227ed9331d..77204bc55a2 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1024,9 +1024,6 @@ static void init_new_decoded_pad(GstElement *bin, GstPad *pad, struct gstdemux * goto out; } - /* Avoid expensive color matrix conversions. */ - gst_util_set_object_arg(G_OBJECT(vconv), "matrix-mode", "none"); - /* GStreamer outputs RGB video top-down, but DirectShow expects bottom-up. */ if (!(flip = gst_element_factory_make("videoflip", NULL))) {

1 0

Zebediah Figura : winegstreamer: Clean up a newly allocated buffer on error in bytestream_wrapper_pull().
by Alexandre Julliard 07 Dec '20

07 Dec '20

Module: wine Branch: master Commit: 43a5234bd9adb455cadf7be2c438edbcb58afb6c URL: https://source.winehq.org/git/wine.git/?a=commit;h=43a5234bd9adb455cadf7be2… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Dec 5 10:32:17 2020 -0600 winegstreamer: Clean up a newly allocated buffer on error in bytestream_wrapper_pull(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/media_source.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index 5c502cf3ed5..a9a85cf4d4b 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -441,6 +441,7 @@ GstFlowReturn bytestream_wrapper_pull(GstPad *pad, GstObject *parent, guint64 of { struct media_source *source = gst_pad_get_element_private(pad); IMFByteStream *byte_stream = source->byte_stream; + GstBuffer *new_buffer = NULL; ULONG bytes_read; GstMapInfo info; BOOL is_eof; @@ -460,7 +461,7 @@ GstFlowReturn bytestream_wrapper_pull(GstPad *pad, GstObject *parent, guint64 of return GST_FLOW_EOS; if (!(*buf)) - *buf = gst_buffer_new_and_alloc(len); + *buf = new_buffer = gst_buffer_new_and_alloc(len); gst_buffer_map(*buf, &info, GST_MAP_WRITE); hr = IMFByteStream_Read(byte_stream, info.data, len, &bytes_read); gst_buffer_unmap(*buf, &info); @@ -468,7 +469,11 @@ GstFlowReturn bytestream_wrapper_pull(GstPad *pad, GstObject *parent, guint64 of gst_buffer_set_size(*buf, bytes_read); if (FAILED(hr)) + { + if (new_buffer) + gst_buffer_unref(new_buffer); return GST_FLOW_ERROR; + } return GST_FLOW_OK; }

1 0