wine-commits August 2021

wine-commits@winehq.org

1 participants
1051 discussions

Michael Stefaniuc : winebus.sys: Print the debug string and not the pointer to it.
by Alexandre Julliard 26 Aug '21

26 Aug '21

Module: wine Branch: master Commit: 079c47a38e0a3d5d5dfc2323bfefd869a25d128d URL: https://source.winehq.org/git/wine.git/?a=commit;h=079c47a38e0a3d5d5dfc2323… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Aug 26 09:45:25 2021 +0200 winebus.sys: Print the debug string and not the pointer to it. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index 41aef8ab018..e9c85deb846 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -339,7 +339,7 @@ DEVICE_OBJECT *bus_enumerate_hid_devices(const WCHAR *bus_id, enum_func function DEVICE_OBJECT *ret = NULL; int cont; - TRACE("bus_id %p\n", debugstr_w(bus_id)); + TRACE("bus_id %s\n", debugstr_w(bus_id)); EnterCriticalSection(&device_list_cs); LIST_FOR_EACH_ENTRY_SAFE(ext, next, &device_list, struct device_extension, entry)

1 0

Michael Stefaniuc : msdaps: Avoid casts from COM object to interface.
by Alexandre Julliard 26 Aug '21

26 Aug '21

Module: wine Branch: master Commit: e219f5cda7e39ce61d102f992d53b76a2f611ec8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e219f5cda7e39ce61d102f99… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Aug 26 09:45:21 2021 +0200 msdaps: Avoid casts from COM object to interface. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msdaps/row_server.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msdaps/row_server.c b/dlls/msdaps/row_server.c index 2b496bece20..9cc64cd0218 100644 --- a/dlls/msdaps/row_server.c +++ b/dlls/msdaps/row_server.c @@ -589,9 +589,9 @@ static HRESULT create_server(IUnknown *outer, const CLSID *class, void **obj) server->class = *class; server->inner_unk = NULL; if(IsEqualGUID(class, &CLSID_wine_row_server)) - create_row_marshal((IUnknown*)server, (void**)&server->marshal); + create_row_marshal((IUnknown*)&server->IWineRowServer_iface, (void**)&server->marshal); else if(IsEqualGUID(class, &CLSID_wine_rowset_server)) - create_rowset_marshal((IUnknown*)server, (void**)&server->marshal); + create_rowset_marshal((IUnknown*)&server->IWineRowServer_iface, (void**)&server->marshal); else ERR("create_server called with class %s\n", debugstr_guid(class));

1 0

Michael Stefaniuc : shlwapi/tests: Avoid casts from COM object to interface.
by Alexandre Julliard 26 Aug '21

26 Aug '21

Module: wine Branch: master Commit: 678ae0f925d4618b908817c36e6db92913b2b4d5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=678ae0f925d4618b908817c3… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Aug 26 09:45:22 2021 +0200 shlwapi/tests: Avoid casts from COM object to interface. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/tests/ordinal.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c index 919cac8563f..bf43d35b1c2 100644 --- a/dlls/shlwapi/tests/ordinal.c +++ b/dlls/shlwapi/tests/ordinal.c @@ -1423,7 +1423,7 @@ static HRESULT WINAPI Contain_FindConnectionPoint( else { *ppCP = iface->pt[0]; - IUnknown_AddRef((IUnknown*)*ppCP); + IConnectionPoint_AddRef(*ppCP); } return S_OK; @@ -1459,7 +1459,8 @@ static void test_IConnectionPoint(void) dispatch->IDispatch_iface.lpVtbl = &disp_vtbl; dispatch->refCount = 1; - rc = pConnectToConnectionPoint((IUnknown*)dispatch, &IID_NULL, TRUE, (IUnknown*)container, &cookie, &point); + rc = pConnectToConnectionPoint((IUnknown*)&dispatch->IDispatch_iface, &IID_NULL, TRUE, + (IUnknown*)&container->IConnectionPointContainer_iface, &cookie, &point); ok(rc == S_OK, "pConnectToConnectionPoint failed with %x\n",rc); ok(point != NULL, "returned ConnectionPoint is NULL\n"); ok(cookie != 0xffffffff, "invalid cookie returned\n"); @@ -1475,15 +1476,16 @@ static void test_IConnectionPoint(void) rc = pIConnectionPoint_SimpleInvoke(point,0xa1,&params); ok(rc == S_OK, "pConnectToConnectionPoint failed with %x\n",rc); - rc = pConnectToConnectionPoint(NULL, &IID_NULL, FALSE, (IUnknown*)container, &cookie, NULL); + rc = pConnectToConnectionPoint(NULL, &IID_NULL, FALSE, + (IUnknown*)&container->IConnectionPointContainer_iface, &cookie, NULL); ok(rc == S_OK, "pConnectToConnectionPoint failed with %x\n",rc); /* MSDN says this should be required but it crashes on XP IUnknown_Release(point); */ - ref = IUnknown_Release((IUnknown*)container); + ref = IConnectionPointContainer_Release(&container->IConnectionPointContainer_iface); ok(ref == 0, "leftover IConnectionPointContainer reference %i\n",ref); - ref = IUnknown_Release((IUnknown*)dispatch); + ref = IDispatch_Release(&dispatch->IDispatch_iface); ok(ref == 0, "leftover IDispatch reference %i\n",ref); } @@ -1593,7 +1595,7 @@ static void test_SHPropertyBag_ReadLONG(void) rc = pSHPropertyBag_ReadLONG(&pb->IPropertyBag_iface, szName1, &out); ok(rc == DISP_E_BADVARTYPE || broken(rc == S_OK) || broken(rc == S_FALSE), "incorrect return %x\n",rc); ok(out == 0xfeedface || broken(out == 0xfeedfa00), "value should not have changed %x\n",out); - IUnknown_Release((IUnknown*)pb); + IPropertyBag_Release(&pb->IPropertyBag_iface); } static void test_SHSetWindowBits(void)

1 0

Michael Stefaniuc : dwrite: Avoid casts from COM object to interface.
by Alexandre Julliard 26 Aug '21

26 Aug '21

Module: wine Branch: master Commit: 431f157cd282cb44b14e8b30d3b946564316b597 URL: https://source.winehq.org/git/wine.git/?a=commit;h=431f157cd282cb44b14e8b30… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Aug 26 09:45:23 2021 +0200 dwrite: Avoid casts from COM object to interface. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index d25ba2dd06b..b7071314bb2 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -1996,7 +1996,7 @@ static HRESULT WINAPI dwritefont_GetFontFamily(IDWriteFont3 *iface, IDWriteFontF TRACE("%p, %p.\n", iface, family); - *family = (IDWriteFontFamily *)font->family; + *family = (IDWriteFontFamily *)&font->family->IDWriteFontFamily2_iface; IDWriteFontFamily_AddRef(*family); return S_OK; } @@ -2531,7 +2531,7 @@ static HRESULT WINAPI dwritefontfamily_GetFontCollection(IDWriteFontFamily2 *ifa TRACE("%p, %p.\n", iface, collection); - *collection = (IDWriteFontCollection *)family->collection; + *collection = (IDWriteFontCollection *)&family->collection->IDWriteFontCollection3_iface; IDWriteFontCollection_AddRef(*collection); return S_OK; }

1 0

Michael Stefaniuc : mf/tests: Avoid cast from COM object to interface.
by Alexandre Julliard 26 Aug '21

26 Aug '21

Module: wine Branch: master Commit: 3fa19c8c7500cc5afd15b2340dc63425ae7be76e URL: https://source.winehq.org/git/wine.git/?a=commit;h=3fa19c8c7500cc5afd15b234… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Aug 26 09:45:27 2021 +0200 mf/tests: Avoid cast from COM object to interface. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/mf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 4b894df1de0..3dfd852643c 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -1139,7 +1139,7 @@ static void test_session_events(IMFMediaSession *session) ok(hr == MF_S_MULTIPLE_BEGIN, "Unexpected hr %#x.\n", hr); /* Same callback, different state. */ - hr = IMFMediaSession_BeginGetEvent(session, &callback.IMFAsyncCallback_iface, (IUnknown *)&callback); + hr = IMFMediaSession_BeginGetEvent(session, &callback.IMFAsyncCallback_iface, (IUnknown *)&callback.IMFAsyncCallback_iface); ok(hr == MF_E_MULTIPLE_BEGIN, "Unexpected hr %#x.\n", hr); /* Different callback, same state. */

1 0

Michael Stefaniuc : mfplat/tests: Avoid cast from COM object to interface.
by Alexandre Julliard 26 Aug '21

26 Aug '21

Module: wine Branch: master Commit: 2a0836699754b7bb5ab8a210ed2692f6c2f263d5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a0836699754b7bb5ab8a210… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Aug 26 09:45:26 2021 +0200 mfplat/tests: Avoid cast from COM object to interface. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/tests/mfplat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 3e0907e41ad..54af1ee151d 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -3129,7 +3129,7 @@ static void test_event_queue(void) ok(hr == MF_S_MULTIPLE_BEGIN, "Unexpected hr %#x.\n", hr); /* Same callback, different state. */ - hr = IMFMediaEventQueue_BeginGetEvent(queue, &callback.IMFAsyncCallback_iface, (IUnknown *)&callback); + hr = IMFMediaEventQueue_BeginGetEvent(queue, &callback.IMFAsyncCallback_iface, (IUnknown *)&callback.IMFAsyncCallback_iface); ok(hr == MF_E_MULTIPLE_BEGIN, "Unexpected hr %#x.\n", hr); /* Different callback, same state. */

1 0

Michael Stefaniuc : msxml3/tests: Remove superfluous cast to self.
by Alexandre Julliard 26 Aug '21

26 Aug '21

Module: wine Branch: master Commit: 2433a962026f86a4cfd185c1732c1ce931acdad2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2433a962026f86a4cfd185c1… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Aug 26 09:45:24 2021 +0200 msxml3/tests: Remove superfluous cast to self. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/tests/domdoc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index d2a4d867bae..063f9433a77 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -258,7 +258,7 @@ static IDispatch* create_dispevent(void) event->IDispatch_iface.lpVtbl = &dispeventVtbl; event->ref = 1; - return (IDispatch*)&event->IDispatch_iface; + return &event->IDispatch_iface; } /* IStream */

1 0

Zebediah Figura : devenum: Always return S_FALSE from DllCanUnloadNow().
by Alexandre Julliard 26 Aug '21

26 Aug '21

Module: wine Branch: master Commit: 65e6165ce8a7a51babffaa0a163d330a4d6a99c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=65e6165ce8a7a51babffaa0a… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Aug 25 17:10:39 2021 -0500 devenum: Always return S_FALSE from DllCanUnloadNow(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/devenum/createdevenum.c | 4 ---- dlls/devenum/devenum_main.c | 17 +---------------- dlls/devenum/devenum_private.h | 7 ------- dlls/devenum/mediacatenum.c | 10 ---------- dlls/devenum/parsedisplayname.c | 4 ---- 5 files changed, 1 insertion(+), 41 deletions(-) diff --git a/dlls/devenum/createdevenum.c b/dlls/devenum/createdevenum.c index 8e9cf56eb09..bec462e0f5a 100644 --- a/dlls/devenum/createdevenum.c +++ b/dlls/devenum/createdevenum.c @@ -64,8 +64,6 @@ static ULONG WINAPI devenum_factory_AddRef(ICreateDevEnum *iface) { TRACE("\n"); - DEVENUM_LockModule(); - return 2; /* non-heap based object */ } @@ -73,8 +71,6 @@ static ULONG WINAPI devenum_factory_Release(ICreateDevEnum *iface) { TRACE("\n"); - DEVENUM_UnlockModule(); - return 1; /* non-heap based object */ } diff --git a/dlls/devenum/devenum_main.c b/dlls/devenum/devenum_main.c index cbeacbb5b27..87939749121 100644 --- a/dlls/devenum/devenum_main.c +++ b/dlls/devenum/devenum_main.c @@ -25,8 +25,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(devenum); -DECLSPEC_HIDDEN LONG dll_refs; - struct class_factory { IClassFactory IClassFactory_iface; @@ -56,13 +54,11 @@ static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID i static ULONG WINAPI ClassFactory_AddRef(IClassFactory *iface) { - DEVENUM_LockModule(); return 2; } static ULONG WINAPI ClassFactory_Release(IClassFactory *iface) { - DEVENUM_UnlockModule(); return 1; } @@ -82,10 +78,7 @@ static HRESULT WINAPI ClassFactory_CreateInstance(IClassFactory *iface, static HRESULT WINAPI ClassFactory_LockServer(IClassFactory *iface, BOOL lock) { - if (lock) - DEVENUM_LockModule(); - else - DEVENUM_UnlockModule(); + TRACE("iface %p, lock %d.\n", iface, lock); return S_OK; } @@ -118,14 +111,6 @@ HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID iid, void **obj) return CLASS_E_CLASSNOTAVAILABLE; } -/*********************************************************************** - * DllCanUnloadNow (DEVENUM.@) - */ -HRESULT WINAPI DllCanUnloadNow(void) -{ - return dll_refs != 0 ? S_FALSE : S_OK; -} - /*********************************************************************** * DllRegisterServer (DEVENUM.@) */ diff --git a/dlls/devenum/devenum_private.h b/dlls/devenum/devenum_private.h index 15c41afd570..adc9b377d09 100644 --- a/dlls/devenum/devenum_private.h +++ b/dlls/devenum/devenum_private.h @@ -27,13 +27,6 @@ #include "dmo.h" #include "dmodshow.h" -/********************************************************************** - * Dll lifetime tracking declaration for devenum.dll - */ -extern LONG dll_refs DECLSPEC_HIDDEN; -static inline void DEVENUM_LockModule(void) { InterlockedIncrement(&dll_refs); } -static inline void DEVENUM_UnlockModule(void) { InterlockedDecrement(&dll_refs); } - enum device_type { DEVICE_FILTER, diff --git a/dlls/devenum/mediacatenum.c b/dlls/devenum/mediacatenum.c index b24e24f7f31..9d8069a3aa2 100644 --- a/dlls/devenum/mediacatenum.c +++ b/dlls/devenum/mediacatenum.c @@ -414,7 +414,6 @@ static ULONG WINAPI moniker_Release(IMoniker *iface) if (ref == 0) { free(This->name); free(This); - DEVENUM_UnlockModule(); } return ref; } @@ -783,8 +782,6 @@ struct moniker *filter_moniker_create(const GUID *class, const WCHAR *name) object->has_class = !!class; object->name = wcsdup(name); - DEVENUM_LockModule(); - return object; } @@ -804,8 +801,6 @@ struct moniker *codec_moniker_create(const GUID *class, const WCHAR *name) object->has_class = !!class; object->name = wcsdup(name); - DEVENUM_LockModule(); - return object; } @@ -823,8 +818,6 @@ struct moniker *dmo_moniker_create(const GUID class, const GUID clsid) object->class = class; object->clsid = clsid; - DEVENUM_LockModule(); - return object; } @@ -879,7 +872,6 @@ static ULONG WINAPI enum_moniker_Release(IEnumMoniker *iface) RegCloseKey(This->sw_key); RegCloseKey(This->cm_key); free(This); - DEVENUM_UnlockModule(); return 0; } return ref; @@ -1070,7 +1062,5 @@ HRESULT enum_moniker_create(REFCLSID class, IEnumMoniker **out) *out = &object->IEnumMoniker_iface; - DEVENUM_LockModule(); - return S_OK; } diff --git a/dlls/devenum/parsedisplayname.c b/dlls/devenum/parsedisplayname.c index f24b4329c80..477f2f3d11e 100644 --- a/dlls/devenum/parsedisplayname.c +++ b/dlls/devenum/parsedisplayname.c @@ -51,8 +51,6 @@ static ULONG WINAPI devenum_parser_AddRef(IParseDisplayName *iface) { TRACE("\n"); - DEVENUM_LockModule(); - return 2; /* non-heap based object */ } @@ -60,8 +58,6 @@ static ULONG WINAPI devenum_parser_Release(IParseDisplayName *iface) { TRACE("\n"); - DEVENUM_UnlockModule(); - return 1; /* non-heap based object */ }

1 0

Zebediah Figura : winegstreamer: Always return S_FALSE from DllCanUnloadNow().
by Alexandre Julliard 26 Aug '21

26 Aug '21

Module: wine Branch: master Commit: d90ab0805f92835e9af1e59388adbcb339df4385 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d90ab0805f92835e9af1e593… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Aug 25 17:10:38 2021 -0500 winegstreamer: Always return S_FALSE from DllCanUnloadNow(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gst_private.h | 2 -- dlls/winegstreamer/main.c | 14 -------------- dlls/winegstreamer/mfplat.c | 6 ------ 3 files changed, 22 deletions(-) diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index 55a62361966..c6c99b1dd55 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -198,8 +198,6 @@ struct unix_funcs extern const struct unix_funcs *unix_funcs; -extern LONG object_locks; - HRESULT avi_splitter_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; HRESULT decodebin_parser_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; HRESULT mpeg_splitter_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; diff --git a/dlls/winegstreamer/main.c b/dlls/winegstreamer/main.c index 9211a090cf1..6742724948e 100644 --- a/dlls/winegstreamer/main.c +++ b/dlls/winegstreamer/main.c @@ -27,8 +27,6 @@ #include "initguid.h" #include "gst_guids.h" -LONG object_locks; - WINE_DEFAULT_DEBUG_CHANNEL(quartz); const struct unix_funcs *unix_funcs = NULL; @@ -43,13 +41,6 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) return TRUE; } -HRESULT WINAPI DllCanUnloadNow(void) -{ - TRACE(".\n"); - - return object_locks ? S_FALSE : S_OK; -} - struct class_factory { IClassFactory IClassFactory_iface; @@ -110,11 +101,6 @@ static HRESULT WINAPI class_factory_CreateInstance(IClassFactory *iface, IUnknow static HRESULT WINAPI class_factory_LockServer(IClassFactory *iface, BOOL lock) { TRACE("iface %p, lock %d.\n", iface, lock); - - if (lock) - InterlockedIncrement(&object_locks); - else - InterlockedDecrement(&object_locks); return S_OK; } diff --git a/dlls/winegstreamer/mfplat.c b/dlls/winegstreamer/mfplat.c index dcbd03137ba..93f4b8d5bd7 100644 --- a/dlls/winegstreamer/mfplat.c +++ b/dlls/winegstreamer/mfplat.c @@ -354,12 +354,6 @@ static HRESULT WINAPI class_factory_CreateInstance(IClassFactory *iface, IUnknow static HRESULT WINAPI class_factory_LockServer(IClassFactory *iface, BOOL dolock) { TRACE("%p, %d.\n", iface, dolock); - - if (dolock) - InterlockedIncrement(&object_locks); - else - InterlockedDecrement(&object_locks); - return S_OK; }

1 0

Zebediah Figura : qcap: Always return S_FALSE from DllCanUnloadNow().
by Alexandre Julliard 26 Aug '21

26 Aug '21

Module: wine Branch: master Commit: d3cd3ebc3cba2fae5a7fe3a41597db10580bae22 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d3cd3ebc3cba2fae5a7fe3a4… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Aug 25 17:10:37 2021 -0500 qcap: Always return S_FALSE from DllCanUnloadNow(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/avimux.c | 2 -- dlls/qcap/capturegraph.c | 2 -- dlls/qcap/qcap_main.c | 24 ------------------------ dlls/qcap/qcap_private.h | 2 -- dlls/qcap/vfwcapture.c | 2 -- 5 files changed, 32 deletions(-) diff --git a/dlls/qcap/avimux.c b/dlls/qcap/avimux.c index 5cc7d55bdf1..c3dbf71d2da 100644 --- a/dlls/qcap/avimux.c +++ b/dlls/qcap/avimux.c @@ -131,7 +131,6 @@ static void avi_mux_destroy(struct strmbase_filter *iface) free(filter->idx1); strmbase_filter_cleanup(&filter->filter); free(filter); - ObjectRefCount(FALSE); } static HRESULT avi_mux_query_interface(struct strmbase_filter *iface, REFIID iid, void **out) @@ -1851,7 +1850,6 @@ HRESULT avi_mux_create(IUnknown *outer, IUnknown **out) avimux->interleave = 10000000; TRACE("Created AVI mux %p.\n", avimux); - ObjectRefCount(TRUE); *out = &avimux->filter.IUnknown_inner; return S_OK; } diff --git a/dlls/qcap/capturegraph.c b/dlls/qcap/capturegraph.c index e5c7d9c1120..157cfc6178d 100644 --- a/dlls/qcap/capturegraph.c +++ b/dlls/qcap/capturegraph.c @@ -66,7 +66,6 @@ HRESULT capture_graph_create(IUnknown *outer, IUnknown **out) object->csFilter.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": CaptureGraphImpl.csFilter"); TRACE("Created capture graph builder %p.\n", object); - ObjectRefCount(TRUE); *out = (IUnknown *)&object->ICaptureGraphBuilder_iface; return S_OK; } @@ -123,7 +122,6 @@ static ULONG WINAPI fnCaptureGraphBuilder2_Release(ICaptureGraphBuilder2 * iface if (This->mygraph) IGraphBuilder_Release(This->mygraph); free(This); - ObjectRefCount(FALSE); } return ref; } diff --git a/dlls/qcap/qcap_main.c b/dlls/qcap/qcap_main.c index ac7ac6a26aa..3a8c89fe077 100644 --- a/dlls/qcap/qcap_main.c +++ b/dlls/qcap/qcap_main.c @@ -29,8 +29,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(quartz); HINSTANCE qcap_instance; -static LONG objects_ref = 0; - struct class_factory { IClassFactory IClassFactory_iface; @@ -91,11 +89,6 @@ static HRESULT WINAPI class_factory_CreateInstance(IClassFactory *iface, IUnknow static HRESULT WINAPI class_factory_LockServer(IClassFactory *iface, BOOL lock) { TRACE("iface %p, lock %d.\n", iface, lock); - - if (lock) - InterlockedIncrement(&objects_ref); - else - InterlockedDecrement(&objects_ref); return S_OK; } @@ -274,20 +267,3 @@ HRESULT WINAPI DllUnregisterServer(void) IFilterMapper2_Release(mapper); return S_OK; } - -/*********************************************************************** - * DllCanUnloadNow (QCAP.@) - */ -HRESULT WINAPI DllCanUnloadNow(void) -{ - TRACE(".\n"); - - return objects_ref ? S_FALSE : S_OK; -} - -DWORD ObjectRefCount(BOOL increment) -{ - if (increment) - return InterlockedIncrement(&objects_ref); - return InterlockedDecrement(&objects_ref); -} diff --git a/dlls/qcap/qcap_private.h b/dlls/qcap/qcap_private.h index 104dba6a649..2db3c509062 100644 --- a/dlls/qcap/qcap_private.h +++ b/dlls/qcap/qcap_private.h @@ -30,8 +30,6 @@ extern HINSTANCE qcap_instance DECLSPEC_HIDDEN; -extern DWORD ObjectRefCount(BOOL increment) DECLSPEC_HIDDEN; - HRESULT audio_record_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; HRESULT avi_compressor_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; HRESULT avi_mux_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c index fd5434434f2..504d41b5814 100644 --- a/dlls/qcap/vfwcapture.c +++ b/dlls/qcap/vfwcapture.c @@ -107,7 +107,6 @@ static void vfw_capture_destroy(struct strmbase_filter *iface) strmbase_source_cleanup(&filter->source); strmbase_filter_cleanup(&filter->filter); free(filter); - ObjectRefCount(FALSE); } static HRESULT vfw_capture_query_interface(struct strmbase_filter *iface, REFIID iid, void **out) @@ -861,7 +860,6 @@ HRESULT vfw_capture_create(IUnknown *outer, IUnknown **out) object->state_cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": vfw_capture.state_cs"); TRACE("Created VFW capture filter %p.\n", object); - ObjectRefCount(TRUE); *out = &object->filter.IUnknown_inner; return S_OK; }

1 0

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 August 2021