wine-commits June 2019

wine-commits@winehq.org

1 participants
865 discussions

Alexandre Julliard : olethk32: Build with msvcrt.
by Alexandre Julliard 18 Jun '19

18 Jun '19

Module: wine Branch: master Commit: ee5127647f183f2529debdba71725628194b9306 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ee5127647f183f2529debdba… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 18 09:00:55 2019 +0200 olethk32: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/olethk32/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/olethk32/Makefile.in b/dlls/olethk32/Makefile.in index 1a8f17a..6888b46 100644 --- a/dlls/olethk32/Makefile.in +++ b/dlls/olethk32/Makefile.in @@ -1,5 +1,7 @@ MODULE = olethk32.dll +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = main.c RC_SRCS = version.rc

1 0

Alexandre Julliard : olesvr32: Build with msvcrt.
by Alexandre Julliard 18 Jun '19

18 Jun '19

Module: wine Branch: master Commit: fa5042dc852ef96abe7caa638f2eae19f704fc29 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fa5042dc852ef96abe7caa63… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 18 09:00:49 2019 +0200 olesvr32: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/olesvr32/Makefile.in | 2 ++ dlls/olesvr32/olesvr_main.c | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/olesvr32/Makefile.in b/dlls/olesvr32/Makefile.in index 0cea1ad..67c612d 100644 --- a/dlls/olesvr32/Makefile.in +++ b/dlls/olesvr32/Makefile.in @@ -1,5 +1,7 @@ MODULE = olesvr32.dll IMPORTLIB = olesvr32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ olesvr_main.c diff --git a/dlls/olesvr32/olesvr_main.c b/dlls/olesvr32/olesvr_main.c index 57c28e1..0ca83ba 100644 --- a/dlls/olesvr32/olesvr_main.c +++ b/dlls/olesvr32/olesvr_main.c @@ -21,8 +21,6 @@ /* At the moment, these are only empty stubs. */ -#include "config.h" - #include <stdarg.h> #include "windef.h"

1 0

Alexandre Julliard : olesvr: Build with msvcrt.
by Alexandre Julliard 18 Jun '19

18 Jun '19

Module: wine Branch: master Commit: 15a7f2af678113015df0c1b7cc50115215473cb4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=15a7f2af678113015df0c1b7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 18 09:00:32 2019 +0200 olesvr: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/olesvr.dll16/Makefile.in | 2 +- dlls/olesvr.dll16/olesvr.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/olesvr.dll16/Makefile.in b/dlls/olesvr.dll16/Makefile.in index d894b58..02ed8ae 100644 --- a/dlls/olesvr.dll16/Makefile.in +++ b/dlls/olesvr.dll16/Makefile.in @@ -1,5 +1,5 @@ MODULE = olesvr.dll16 IMPORTS = gdi32 -EXTRADLLFLAGS = -m16 -Wb,--main-module,olesvr32.dll +EXTRADLLFLAGS = -m16 -mno-cygwin -Wb,--main-module,olesvr32.dll C_SRCS = olesvr.c diff --git a/dlls/olesvr.dll16/olesvr.c b/dlls/olesvr.dll16/olesvr.c index 0dcc705..44e6822 100644 --- a/dlls/olesvr.dll16/olesvr.c +++ b/dlls/olesvr.dll16/olesvr.c @@ -21,8 +21,6 @@ /* At the moment, these are only empty stubs. */ -#include "config.h" - #include <stdarg.h> #include "windef.h"

1 0

Alexandre Julliard : olepro32: Build with msvcrt.
by Alexandre Julliard 18 Jun '19

18 Jun '19

Module: wine Branch: master Commit: 7e2df6ed13cc716554851c1a297766a8fbe92724 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7e2df6ed13cc716554851c1a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 18 09:00:17 2019 +0200 olepro32: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/olepro32/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/olepro32/Makefile.in b/dlls/olepro32/Makefile.in index 032fdbd..4ff5afc 100644 --- a/dlls/olepro32/Makefile.in +++ b/dlls/olepro32/Makefile.in @@ -2,6 +2,8 @@ MODULE = olepro32.dll IMPORTLIB = olepro32 IMPORTS = oleaut32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = olepro32stubs.c IDL_SRCS = olepro.idl

1 0

Alexandre Julliard : oledlg: Build with msvcrt.
by Alexandre Julliard 18 Jun '19

18 Jun '19

Module: wine Branch: master Commit: 815ae120fb2648b5c7b9aca864a58377d8947cfc URL: https://source.winehq.org/git/wine.git/?a=commit;h=815ae120fb2648b5c7b9aca8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 18 09:00:11 2019 +0200 oledlg: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oledlg/Makefile.in | 2 ++ dlls/oledlg/insobjdlg.c | 1 - dlls/oledlg/oledlg_main.c | 1 - dlls/oledlg/pastespl.c | 9 ++++----- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/oledlg/Makefile.in b/dlls/oledlg/Makefile.in index 4a16469..ee54844 100644 --- a/dlls/oledlg/Makefile.in +++ b/dlls/oledlg/Makefile.in @@ -2,6 +2,8 @@ MODULE = oledlg.dll IMPORTLIB = oledlg IMPORTS = ole32 comdlg32 user32 advapi32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ insobjdlg.c \ oledlg_main.c \ diff --git a/dlls/oledlg/insobjdlg.c b/dlls/oledlg/insobjdlg.c index 00b991e..18919b2 100644 --- a/dlls/oledlg/insobjdlg.c +++ b/dlls/oledlg/insobjdlg.c @@ -29,7 +29,6 @@ #include "wingdi.h" #include "winuser.h" #include "wine/debug.h" -#include "wine/unicode.h" #include "oledlg.h" #include "resource.h" diff --git a/dlls/oledlg/oledlg_main.c b/dlls/oledlg/oledlg_main.c index ba5b7c8..df53ad7 100644 --- a/dlls/oledlg/oledlg_main.c +++ b/dlls/oledlg/oledlg_main.c @@ -33,7 +33,6 @@ #include "resource.h" #include "wine/debug.h" -#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); diff --git a/dlls/oledlg/pastespl.c b/dlls/oledlg/pastespl.c index 0b8c8c9..2593fd5 100644 --- a/dlls/oledlg/pastespl.c +++ b/dlls/oledlg/pastespl.c @@ -35,7 +35,6 @@ #include "resource.h" #include "wine/debug.h" -#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); @@ -432,15 +431,15 @@ static void update_result_text(HWND hdlg, const ps_struct_t *ps_struct) } LoadStringW(OLEDLG_hInstance, res_id, resource_txt, ARRAY_SIZE(resource_txt)); - if((ptr = strstrW(resource_txt, percent_s))) + if((ptr = wcsstr(resource_txt, percent_s))) { /* FIXME handle %s in ResultText. Sub appname if IDS_PS_PASTE_OBJECT{_AS_ICON}. Else sub appropriate type name */ - size_t result_txt_len = strlenW(pent->lpstrResultText); + size_t result_txt_len = lstrlenW(pent->lpstrResultText); ptrdiff_t offs = (char*)ptr - (char*)resource_txt; - result_txt = HeapAlloc(GetProcessHeap(), 0, (strlenW(resource_txt) + result_txt_len - 1) * sizeof(WCHAR)); + result_txt = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(resource_txt) + result_txt_len - 1) * sizeof(WCHAR)); memcpy(result_txt, resource_txt, offs); memcpy((char*)result_txt + offs, pent->lpstrResultText, result_txt_len * sizeof(WCHAR)); - memcpy((char*)result_txt + offs + result_txt_len * sizeof(WCHAR), ptr + 2, (strlenW(ptr + 2) + 1) * sizeof(WCHAR)); + memcpy((char*)result_txt + offs + result_txt_len * sizeof(WCHAR), ptr + 2, (lstrlenW(ptr + 2) + 1) * sizeof(WCHAR)); } else result_txt = resource_txt;

1 0

Alexandre Julliard : oledb32: Build with msvcrt.
by Alexandre Julliard 18 Jun '19

18 Jun '19

Module: wine Branch: master Commit: ff91ac6403b1eedf69b87a6db1aefded23b6230c URL: https://source.winehq.org/git/wine.git/?a=commit;h=ff91ac6403b1eedf69b87a6d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 18 08:59:55 2019 +0200 oledb32: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oledb32/Makefile.in | 2 ++ dlls/oledb32/datainit.c | 47 +++++++++++++++++++++++------------------------ dlls/oledb32/errorinfo.c | 1 - 3 files changed, 25 insertions(+), 25 deletions(-) diff --git a/dlls/oledb32/Makefile.in b/dlls/oledb32/Makefile.in index a32e9b1..b55a66c 100644 --- a/dlls/oledb32/Makefile.in +++ b/dlls/oledb32/Makefile.in @@ -1,6 +1,8 @@ MODULE = oledb32.dll IMPORTS = uuid oleaut32 ole32 user32 advapi32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ convert.c \ datainit.c \ diff --git a/dlls/oledb32/datainit.c b/dlls/oledb32/datainit.c index 6b05ef6..2acd23e 100644 --- a/dlls/oledb32/datainit.c +++ b/dlls/oledb32/datainit.c @@ -31,7 +31,6 @@ #include "wine/debug.h" #include "wine/heap.h" #include "wine/list.h" -#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(oledb); @@ -299,11 +298,11 @@ struct mode_propval DWORD value; }; -static int dbmodeprop_compare(const void *a, const void *b) +static int __cdecl dbmodeprop_compare(const void *a, const void *b) { const WCHAR *src = a; const struct mode_propval *propval = b; - return strcmpiW(src, propval->name); + return wcsicmp(src, propval->name); } static HRESULT convert_dbproperty_mode(const WCHAR *src, VARIANT *dest) @@ -447,7 +446,7 @@ static HRESULT parse_init_string(const WCHAR *initstring, struct dbprops *props) props->count = 0; start = initstring; - while (start && (eq = strchrW(start, '='))) + while (start && (eq = wcschr(start, '='))) { static const WCHAR providerW[] = {'P','r','o','v','i','d','e','r',0}; WCHAR *delim, quote; @@ -462,10 +461,10 @@ static HRESULT parse_init_string(const WCHAR *initstring, struct dbprops *props) { /* for quoted value string, skip opening mark, look for terminating one */ eq++; - delim = strchrW(eq, quote); + delim = wcschr(eq, quote); } else - delim = strchrW(eq, ';'); + delim = wcschr(eq, ';'); if (delim) value = SysAllocStringLen(eq, delim - eq); @@ -482,7 +481,7 @@ static HRESULT parse_init_string(const WCHAR *initstring, struct dbprops *props) } start = delim; - if (!strcmpiW(name, providerW)) + if (!wcsicmp(name, providerW)) { SysFreeString(name); SysFreeString(value); @@ -519,7 +518,7 @@ static const struct dbproperty *get_known_dprop_descr(BSTR name) n = (min+max)/2; - r = strcmpiW(dbproperties[n].name, name); + r = wcsicmp(dbproperties[n].name, name); if (!r) break; @@ -565,9 +564,9 @@ static HRESULT get_dbpropset_from_proplist(struct dbprops *props, DBPROPSET **pr /* provider specific property is always VT_BSTR */ len = SysStringLen(pair->name) + SysStringLen(pair->value) + 1 /* for '=' */; str = SysAllocStringLen(NULL, len); - strcpyW(str, pair->name); - strcatW(str, eqW); - strcatW(str, pair->value); + lstrcpyW(str, pair->name); + lstrcatW(str, eqW); + lstrcatW(str, pair->value); (*propset)->cProperties++; (*propset)->guidPropertySet = DBPROPSET_DBINIT; @@ -624,9 +623,9 @@ static inline WCHAR *strdupW(const WCHAR *src) { WCHAR *dest; if (!src) return NULL; - dest = heap_alloc((strlenW(src)+1)*sizeof(WCHAR)); + dest = heap_alloc((lstrlenW(src)+1)*sizeof(WCHAR)); if (dest) - strcpyW(dest, src); + lstrcpyW(dest, src); return dest; } @@ -635,7 +634,7 @@ static WCHAR *strstriW(const WCHAR *str, const WCHAR *sub) LPWSTR strlower, sublower, r; strlower = CharLowerW(strdupW(str)); sublower = CharLowerW(strdupW(sub)); - r = strstrW(strlower, sublower); + r = wcsstr(strlower, sublower); if (r) r = (LPWSTR)str + (r - strlower); heap_free(strlower); @@ -818,7 +817,7 @@ static void write_propvalue_str(WCHAR *str, DBPROP *prop) if (V_VT(v) == VT_BSTR) { - strcatW(str, V_BSTR(v)); + lstrcatW(str, V_BSTR(v)); return; } @@ -826,7 +825,7 @@ static void write_propvalue_str(WCHAR *str, DBPROP *prop) hr = VariantChangeType(&vstr, v, VARIANT_ALPHABOOL, VT_BSTR); if (hr == S_OK) { - strcatW(str, V_BSTR(&vstr)); + lstrcatW(str, V_BSTR(&vstr)); VariantClear(&vstr); } } @@ -917,14 +916,14 @@ static HRESULT WINAPI datainit_GetInitializationString(IDataInitialize *iface, I IDBProperties_Release(props); /* check if we need to skip password */ - len = strlenW(progid) + strlenW(provW) + 1; /* including ';' */ + len = lstrlenW(progid) + lstrlenW(provW) + 1; /* including ';' */ for (i = 0; i < count; i++) { WCHAR *descr = get_propinfo_descr(&propset->rgProperties[i], propinfoset); if (descr) { /* include '=' and ';' */ - len += strlenW(descr) + 2; + len += lstrlenW(descr) + 2; len += get_propvalue_length(&propset->rgProperties[i]); } @@ -938,9 +937,9 @@ static HRESULT WINAPI datainit_GetInitializationString(IDataInitialize *iface, I *init_string[0] = 0; /* provider name */ - strcatW(*init_string, provW); - strcatW(*init_string, progid); - strcatW(*init_string, colW); + lstrcatW(*init_string, provW); + lstrcatW(*init_string, progid); + lstrcatW(*init_string, colW); CoTaskMemFree(progid); for (i = 0; i < count; i++) @@ -953,10 +952,10 @@ static HRESULT WINAPI datainit_GetInitializationString(IDataInitialize *iface, I if (descr) { static const WCHAR eqW[] = {'=',0}; - strcatW(*init_string, descr); - strcatW(*init_string, eqW); + lstrcatW(*init_string, descr); + lstrcatW(*init_string, eqW); write_propvalue_str(*init_string, &propset->rgProperties[i]); - strcatW(*init_string, colW); + lstrcatW(*init_string, colW); } } diff --git a/dlls/oledb32/errorinfo.c b/dlls/oledb32/errorinfo.c index 6249167..985d583 100644 --- a/dlls/oledb32/errorinfo.c +++ b/dlls/oledb32/errorinfo.c @@ -31,7 +31,6 @@ #include "oledb_private.h" -#include "wine/unicode.h" #include "wine/heap.h" #include "wine/list.h"

1 0

Alexandre Julliard : olecli32: Build with msvcrt.
by Alexandre Julliard 18 Jun '19

18 Jun '19

Module: wine Branch: master Commit: 4263bfb485cbb9e17322db3a997426ce6b3dfd5d URL: https://source.winehq.org/git/wine.git/?a=commit;h=4263bfb485cbb9e17322db3a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 18 08:59:33 2019 +0200 olecli32: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/olecli32/Makefile.in | 2 ++ dlls/olecli32/olecli_main.c | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/olecli32/Makefile.in b/dlls/olecli32/Makefile.in index 0eca46f..bc17a01 100644 --- a/dlls/olecli32/Makefile.in +++ b/dlls/olecli32/Makefile.in @@ -2,5 +2,7 @@ MODULE = olecli32.dll IMPORTLIB = olecli32 IMPORTS = ole32 gdi32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ olecli_main.c diff --git a/dlls/olecli32/olecli_main.c b/dlls/olecli32/olecli_main.c index 7abd438..ebffc0f 100644 --- a/dlls/olecli32/olecli_main.c +++ b/dlls/olecli32/olecli_main.c @@ -21,8 +21,6 @@ /* At the moment, these are only empty stubs. */ -#include "config.h" - #include <stdarg.h> #include "windef.h"

1 0

Alexandre Julliard : olecli: Build with msvcrt.
by Alexandre Julliard 18 Jun '19

18 Jun '19

Module: wine Branch: master Commit: c9ca990627b45733a0adfd6a102c324d2c35480e URL: https://source.winehq.org/git/wine.git/?a=commit;h=c9ca990627b45733a0adfd6a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 18 08:59:19 2019 +0200 olecli: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/olecli.dll16/Makefile.in | 2 +- dlls/olecli.dll16/olecli.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/olecli.dll16/Makefile.in b/dlls/olecli.dll16/Makefile.in index 40a2446..de3e902 100644 --- a/dlls/olecli.dll16/Makefile.in +++ b/dlls/olecli.dll16/Makefile.in @@ -1,5 +1,5 @@ MODULE = olecli.dll16 IMPORTS = gdi32 -EXTRADLLFLAGS = -m16 -Wb,--main-module,olecli32.dll +EXTRADLLFLAGS = -m16 -mno-cygwin -Wb,--main-module,olecli32.dll C_SRCS = olecli.c diff --git a/dlls/olecli.dll16/olecli.c b/dlls/olecli.dll16/olecli.c index ad59fa3..599312e 100644 --- a/dlls/olecli.dll16/olecli.c +++ b/dlls/olecli.dll16/olecli.c @@ -21,8 +21,6 @@ /* At the moment, these are only empty stubs. */ -#include "config.h" - #include <stdarg.h> #include "windef.h"

1 0

Zebediah Figura : wineqtdecoder: Share sink pin and filter reference counts.
by Alexandre Julliard 18 Jun '19

18 Jun '19

Module: wine Branch: master Commit: f194d99d20a9d8c8e228a4230962d405feda0aa4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f194d99d20a9d8c8e228a423… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jun 17 20:41:59 2019 -0500 wineqtdecoder: Share sink pin and filter reference counts. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineqtdecoder/qtsplitter.c | 45 ++++++++++++++++------------------------- 1 file changed, 17 insertions(+), 28 deletions(-) diff --git a/dlls/wineqtdecoder/qtsplitter.c b/dlls/wineqtdecoder/qtsplitter.c index 3dd530f..8a88729 100644 --- a/dlls/wineqtdecoder/qtsplitter.c +++ b/dlls/wineqtdecoder/qtsplitter.c @@ -225,7 +225,6 @@ static void qt_splitter_destroy(BaseFilter *iface) { QTSplitter *filter = impl_from_BaseFilter(iface); IPin *peer = NULL; - ULONG pinref; EnterCriticalSection(&filter->csReceive); /* Don't need to clean up output pins, disconnecting input pin will do that */ @@ -235,15 +234,15 @@ static void qt_splitter_destroy(BaseFilter *iface) IPin_Disconnect(peer); IPin_Release(peer); } - pinref = IPin_Release(&filter->pInputPin.pin.IPin_iface); - if (pinref) - { - ERR("pinref should be null, is %u, destroying anyway\n", pinref); - assert((LONG)pinref > 0); - while (pinref) - pinref = IPin_Release(&filter->pInputPin.pin.IPin_iface); - } + FreeMediaType(&filter->pInputPin.pin.mtCurrent); + if (filter->pInputPin.pAlloc) + IMemAllocator_Release(filter->pInputPin.pAlloc); + filter->pInputPin.pAlloc = NULL; + if (filter->pInputPin.pReader) + IAsyncReader_Release(filter->pInputPin.pReader); + filter->pInputPin.pReader = NULL; + filter->pInputPin.pin.IPin_iface.lpVtbl = NULL; if (filter->pQTMovie) { @@ -833,26 +832,16 @@ static inline QTInPin *impl_from_IPin( IPin *iface ) return CONTAINING_RECORD(iface, QTInPin, pin.IPin_iface); } -static ULONG WINAPI QTInPin_Release(IPin *iface) +static ULONG WINAPI QTInPin_AddRef(IPin *iface) { - QTInPin *This = impl_from_IPin(iface); - ULONG refCount = InterlockedDecrement(&This->pin.refCount); + QTInPin *pin = impl_from_IPin(iface); + return IBaseFilter_AddRef(pin->pin.pinInfo.pFilter); +} - TRACE("(%p)->() Release from %d\n", iface, refCount + 1); - if (!refCount) - { - FreeMediaType(&This->pin.mtCurrent); - if (This->pAlloc) - IMemAllocator_Release(This->pAlloc); - This->pAlloc = NULL; - if (This->pReader) - IAsyncReader_Release(This->pReader); - This->pReader = NULL; - This->pin.IPin_iface.lpVtbl = NULL; - return 0; - } - else - return refCount; +static ULONG WINAPI QTInPin_Release(IPin *iface) +{ + QTInPin *pin = impl_from_IPin(iface); + return IBaseFilter_Release(pin->pin.pinInfo.pFilter); } static HRESULT QT_Process_Video_Track(QTSplitter* filter, Track trk) @@ -1288,7 +1277,7 @@ static HRESULT WINAPI QTInPin_EnumMediaTypes(IPin *iface, IEnumMediaTypes **ppEn static const IPinVtbl QT_InputPin_Vtbl = { QTInPin_QueryInterface, - BasePinImpl_AddRef, + QTInPin_AddRef, QTInPin_Release, BaseInputPinImpl_Connect, QTInPin_ReceiveConnection,

1 0

Zebediah Figura : winegstreamer: Share source pin and filter reference counts.
by Alexandre Julliard 18 Jun '19

18 Jun '19

Module: wine Branch: master Commit: 8983528f6050c39305107f79b5aaf14d728bf8ef URL: https://source.winehq.org/git/wine.git/?a=commit;h=8983528f6050c39305107f79… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jun 17 20:41:58 2019 -0500 winegstreamer: Share source pin and filter reference counts. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 99 +++++++++++++++++++------------------------ 1 file changed, 44 insertions(+), 55 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 3640fd9..bc2cb2b 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1688,41 +1688,16 @@ static HRESULT WINAPI GSTOutPin_QueryInterface(IPin *iface, REFIID riid, void ** return E_NOINTERFACE; } -static ULONG WINAPI GSTOutPin_Release(IPin *iface) +static ULONG WINAPI GSTOutPin_AddRef(IPin *iface) { - GSTOutPin *This = impl_source_from_IPin(iface); - ULONG refCount = InterlockedDecrement(&This->pin.pin.refCount); - - TRACE("(%p)->() Release from %d\n", This, refCount + 1); - - mark_wine_thread(); + GSTOutPin *pin = impl_source_from_IPin(iface); + return IBaseFilter_AddRef(pin->pin.pin.pinInfo.pFilter); +} - if (!refCount) { - if (This->their_src) { - if (This->flipfilter) { - gst_pad_unlink(This->their_src, This->flip_sink); - gst_pad_unlink(This->flip_src, This->my_sink); - gst_object_unref(This->flip_src); - gst_object_unref(This->flip_sink); - This->flipfilter = NULL; - This->flip_src = This->flip_sink = NULL; - } else - gst_pad_unlink(This->their_src, This->my_sink); - gst_object_unref(This->their_src); - } - gst_object_unref(This->my_sink); - CloseHandle(This->caps_event); - DeleteMediaType(This->pmt); - FreeMediaType(&This->pin.pin.mtCurrent); - gst_segment_free(This->segment); - if(This->gstpool) - gst_object_unref(This->gstpool); - if (This->pin.pAllocator) - IMemAllocator_Release(This->pin.pAllocator); - CoTaskMemFree(This); - return 0; - } - return refCount; +static ULONG WINAPI GSTOutPin_Release(IPin *iface) +{ + GSTOutPin *pin = impl_source_from_IPin(iface); + return IBaseFilter_Release(pin->pin.pin.pinInfo.pFilter); } static HRESULT WINAPI GSTOutPin_CheckMediaType(BasePin *base, const AM_MEDIA_TYPE *amt) @@ -1780,30 +1755,47 @@ static HRESULT WINAPI GSTOutPin_DecideAllocator(BaseOutputPin *base, IMemInputPi return hr; } -static HRESULT break_source_connection(BaseOutputPin *This) +static void free_source_pin(GSTOutPin *pin) { - HRESULT hr; - - TRACE("(%p)->()\n", This); - - EnterCriticalSection(This->pin.pCritSec); - if (!This->pin.pConnectedTo || !This->pMemInputPin) - hr = VFW_E_NOT_CONNECTED; - else + EnterCriticalSection(pin->pin.pin.pCritSec); + if (pin->pin.pin.pConnectedTo) { - hr = IMemAllocator_Decommit(This->pAllocator); - if (SUCCEEDED(hr)) - hr = IPin_Disconnect(This->pin.pConnectedTo); - IPin_Disconnect((IPin *)This); + if (SUCCEEDED(IMemAllocator_Decommit(pin->pin.pAllocator))) + IPin_Disconnect(pin->pin.pin.pConnectedTo); + IPin_Disconnect(&pin->pin.pin.IPin_iface); } - LeaveCriticalSection(This->pin.pCritSec); + LeaveCriticalSection(pin->pin.pin.pCritSec); - return hr; + if (pin->their_src) + { + if (pin->flipfilter) + { + gst_pad_unlink(pin->their_src, pin->flip_sink); + gst_pad_unlink(pin->flip_src, pin->my_sink); + gst_object_unref(pin->flip_src); + gst_object_unref(pin->flip_sink); + pin->flipfilter = NULL; + pin->flip_src = pin->flip_sink = NULL; + } + else + gst_pad_unlink(pin->their_src, pin->my_sink); + gst_object_unref(pin->their_src); + } + gst_object_unref(pin->my_sink); + CloseHandle(pin->caps_event); + DeleteMediaType(pin->pmt); + FreeMediaType(&pin->pin.pin.mtCurrent); + gst_segment_free(pin->segment); + if (pin->gstpool) + gst_object_unref(pin->gstpool); + if (pin->pin.pAllocator) + IMemAllocator_Release(pin->pin.pAllocator); + CoTaskMemFree(pin); } static const IPinVtbl GST_OutputPin_Vtbl = { GSTOutPin_QueryInterface, - BasePinImpl_AddRef, + GSTOutPin_AddRef, GSTOutPin_Release, BaseOutputPinImpl_Connect, BaseOutputPinImpl_ReceiveConnection, @@ -1857,7 +1849,6 @@ static HRESULT GST_AddPin(GSTImpl *This, const PIN_INFO *piOutput, const AM_MEDI static HRESULT GST_RemoveOutputPins(GSTImpl *This) { - HRESULT hr; ULONG i; TRACE("(%p)\n", This); @@ -1871,11 +1862,9 @@ static HRESULT GST_RemoveOutputPins(GSTImpl *This) gst_object_unref(This->their_sink); This->my_src = This->their_sink = NULL; - for (i = 0; i < This->cStreams; i++) { - hr = break_source_connection(&This->ppPins[i]->pin); - TRACE("Disconnect: %08x\n", hr); - IPin_Release(&This->ppPins[i]->pin.pin.IPin_iface); - } + for (i = 0; i < This->cStreams; ++i) + free_source_pin(This->ppPins[i]); + This->cStreams = 0; CoTaskMemFree(This->ppPins); This->ppPins = NULL;

1 0

← Newer
1
...
34
35
36
37
38
39
40
...
87
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2019