August 2021 - Wine-Commits - list.winehq.org

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

Aug. 26, 2021

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 : mf/tests: Avoid cast from COM object to interface.
by Alexandre Julliard Aug. 26, 2021

Aug. 26, 2021

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 : msvcrt/tests: Remove redundant NULL check before free().
by Alexandre Julliard Aug. 26, 2021

Aug. 26, 2021

Module: wine Branch: master Commit: 2d9e89a80f25ae9cf031c3662d5b65a74893a07c URL: https://source.winehq.org/git/wine.git/?a=commit;h=2d9e89a80f25ae9cf031c366… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Aug 25 22:39:08 2021 +0200 msvcrt/tests: Remove redundant NULL check before free(). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/cpp.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/msvcrt/tests/cpp.c b/dlls/msvcrt/tests/cpp.c index 80eab3364ba..15105ca60dd 100644 --- a/dlls/msvcrt/tests/cpp.c +++ b/dlls/msvcrt/tests/cpp.c @@ -1101,8 +1101,7 @@ static void test_demangle_datatype(void) name = p__unDName(0, demangle[i].mangled, 0, malloc, free, 0x2800); todo_wine_if (!demangle[i].test_in_wine) ok(name != NULL && !strcmp(name,demangle[i].result), "Got name \"%s\" for %d\n", name, i); - if(name) - free(name); + free(name); } }

1 0

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

Aug. 26, 2021

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 : winebus.sys: Print the debug string and not the pointer to it.
by Alexandre Julliard Aug. 26, 2021

Aug. 26, 2021

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

Alexandre Julliard : winecrt0: Add fallback implementation for __wine_unix_call().
by Alexandre Julliard Aug. 26, 2021

Aug. 26, 2021

Module: wine Branch: master Commit: 53bd74489d7eed82068f2351017d162a82de1abc URL: https://source.winehq.org/git/wine.git/?a=commit;h=53bd74489d7eed82068f2351… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 26 17:41:21 2021 +0200 winecrt0: Add fallback implementation for __wine_unix_call(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winecrt0/unix_lib.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/winecrt0/unix_lib.c b/dlls/winecrt0/unix_lib.c index e3a1437026a..584da22ab71 100644 --- a/dlls/winecrt0/unix_lib.c +++ b/dlls/winecrt0/unix_lib.c @@ -27,8 +27,10 @@ #include "windef.h" #include "winbase.h" #include "winternl.h" +#include "wine/unixlib.h" static NTSTATUS (__cdecl *p__wine_init_unix_lib)( HMODULE, DWORD, const void *, void * ); +static NTSTATUS (WINAPI *p__wine_unix_call)( unixlib_handle_t, unsigned int, void * ); static void load_func( void **func, const char *name, void *def ) { @@ -46,10 +48,21 @@ static NTSTATUS __cdecl fallback__wine_init_unix_lib( HMODULE module, DWORD reas return STATUS_DLL_NOT_FOUND; } +static NTSTATUS __cdecl fallback__wine_unix_call( unixlib_handle_t handle, unsigned int code, void *args ) +{ + return STATUS_DLL_NOT_FOUND; +} + NTSTATUS __cdecl __wine_init_unix_lib( HMODULE module, DWORD reason, const void *ptr_in, void *ptr_out ) { LOAD_FUNC( __wine_init_unix_lib ); return p__wine_init_unix_lib( module, reason, ptr_in, ptr_out ); } +NTSTATUS WINAPI __wine_unix_call( unixlib_handle_t handle, unsigned int code, void *args ) +{ + LOAD_FUNC( __wine_unix_call ); + return p__wine_unix_call( handle, code, args ); +} + #endif /* _WIN32 */

1 0

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

Aug. 26, 2021

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

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

Aug. 26, 2021

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

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

Aug. 26, 2021

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 : quartz: Always return S_FALSE from DllCanUnloadNow().
by Alexandre Julliard Aug. 26, 2021

Aug. 26, 2021

Module: wine Branch: master Commit: 9a4a722fcce622af77b1a1a0892f7f71a48c6ac6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9a4a722fcce622af77b1a1a0… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Aug 25 17:10:36 2021 -0500 quartz: 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/quartz/acmwrapper.c | 2 -- dlls/quartz/avidec.c | 2 -- dlls/quartz/dsoundrender.c | 2 -- dlls/quartz/filesource.c | 2 -- dlls/quartz/filtergraph.c | 2 -- dlls/quartz/filtermapper.c | 2 -- dlls/quartz/main.c | 24 ++---------------------- dlls/quartz/memallocator.c | 2 -- dlls/quartz/passthrough.c | 2 -- dlls/quartz/quartz_private.h | 2 -- dlls/quartz/systemclock.c | 2 -- dlls/quartz/videorenderer.c | 2 -- dlls/quartz/vmr9.c | 10 ++-------- 13 files changed, 4 insertions(+), 52 deletions(-) diff --git a/dlls/quartz/acmwrapper.c b/dlls/quartz/acmwrapper.c index 81e856a00df..a07bdfef0ca 100644 --- a/dlls/quartz/acmwrapper.c +++ b/dlls/quartz/acmwrapper.c @@ -484,8 +484,6 @@ static void acm_wrapper_destroy(struct strmbase_filter *iface) FreeMediaType(&filter->mt); strmbase_filter_cleanup(&filter->filter); free(filter); - - InterlockedDecrement(&object_locks); } static HRESULT acm_wrapper_init_stream(struct strmbase_filter *iface) diff --git a/dlls/quartz/avidec.c b/dlls/quartz/avidec.c index b1e07fe5879..3d947e1b1bf 100644 --- a/dlls/quartz/avidec.c +++ b/dlls/quartz/avidec.c @@ -538,8 +538,6 @@ static void avi_decompressor_destroy(struct strmbase_filter *iface) strmbase_filter_cleanup(&filter->filter); free(filter); - - InterlockedDecrement(&object_locks); } static HRESULT avi_decompressor_init_stream(struct strmbase_filter *iface) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 68c88ea5a15..9ecdb280cc6 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -549,8 +549,6 @@ static void dsound_render_destroy(struct strmbase_filter *iface) strmbase_passthrough_cleanup(&filter->passthrough); strmbase_filter_cleanup(&filter->filter); free(filter); - - InterlockedDecrement(&object_locks); } static struct strmbase_pin *dsound_render_get_pin(struct strmbase_filter *iface, unsigned int index) diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index cf5fe457715..e5e7b482984 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -351,8 +351,6 @@ static void async_reader_destroy(struct strmbase_filter *iface) strmbase_filter_cleanup(&filter->filter); free(filter); - - InterlockedDecrement(&object_locks); } static HRESULT async_reader_query_interface(struct strmbase_filter *iface, REFIID iid, void **out) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index a1f3757a202..47b9da9510b 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -475,8 +475,6 @@ static ULONG WINAPI FilterGraphInner_Release(IUnknown *iface) DeleteCriticalSection(&This->event_cs); DeleteCriticalSection(&This->cs); free(This); - - InterlockedDecrement(&object_locks); } return ref; } diff --git a/dlls/quartz/filtermapper.c b/dlls/quartz/filtermapper.c index b3210fdcd59..230273891d4 100644 --- a/dlls/quartz/filtermapper.c +++ b/dlls/quartz/filtermapper.c @@ -487,8 +487,6 @@ static ULONG WINAPI Inner_Release(IUnknown *iface) if (ref == 0) { CoTaskMemFree(This); - - InterlockedDecrement(&object_locks); } return ref; diff --git a/dlls/quartz/main.c b/dlls/quartz/main.c index 303cc30a931..ed7080b76b9 100644 --- a/dlls/quartz/main.c +++ b/dlls/quartz/main.c @@ -24,11 +24,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(quartz); extern HRESULT WINAPI QUARTZ_DllGetClassObject(REFCLSID, REFIID, LPVOID *) DECLSPEC_HIDDEN; -extern HRESULT WINAPI QUARTZ_DllCanUnloadNow(void) DECLSPEC_HIDDEN; extern BOOL WINAPI QUARTZ_DllMain(HINSTANCE, DWORD, LPVOID) DECLSPEC_HIDDEN; -LONG object_locks = 0; - BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) { if (reason == DLL_PROCESS_DETACH && !reserved) @@ -127,21 +124,15 @@ static HRESULT WINAPI DSCF_CreateInstance(IClassFactory *iface, IUnknown *pOuter if (SUCCEEDED(hres = This->create_instance(pOuter, &punk))) { - InterlockedIncrement(&object_locks); hres = IUnknown_QueryInterface(punk, riid, ppobj); IUnknown_Release(punk); } return hres; } -static HRESULT WINAPI DSCF_LockServer(IClassFactory *iface, BOOL dolock) +static HRESULT WINAPI DSCF_LockServer(IClassFactory *iface, BOOL lock) { - IClassFactoryImpl *This = impl_from_IClassFactory(iface); - FIXME("(%p)->(%d),stub!\n",This,dolock); - if(dolock) - InterlockedIncrement(&object_locks); - else - InterlockedDecrement(&object_locks); + FIXME("iface %p, lock %d, stub!\n", iface, lock); return S_OK; } @@ -199,17 +190,6 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) return QUARTZ_DllGetClassObject( rclsid, riid, ppv ); } -/*********************************************************************** - * DllCanUnloadNow (QUARTZ.@) - */ -HRESULT WINAPI DllCanUnloadNow(void) -{ - if (!object_locks && QUARTZ_DllCanUnloadNow() == S_OK) - return S_OK; - return S_FALSE; -} - - #define OUR_GUID_ENTRY(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \ { { l, w1, w2, { b1, b2, b3, b4, b5, b6, b7, b8 } } , #name }, diff --git a/dlls/quartz/memallocator.c b/dlls/quartz/memallocator.c index cc13f776cfb..531fbe874cf 100644 --- a/dlls/quartz/memallocator.c +++ b/dlls/quartz/memallocator.c @@ -911,8 +911,6 @@ static void StdMemAllocator_Destroy(IMemAllocator *iface) DeleteCriticalSection(&This->csState); CoTaskMemFree(This); - - InterlockedDecrement(&object_locks); } HRESULT mem_allocator_create(IUnknown *lpUnkOuter, IUnknown **out) diff --git a/dlls/quartz/passthrough.c b/dlls/quartz/passthrough.c index 7f81ae8a1be..2f8fe9dc370 100644 --- a/dlls/quartz/passthrough.c +++ b/dlls/quartz/passthrough.c @@ -80,8 +80,6 @@ static ULONG WINAPI seeking_passthrough_Release(IUnknown *iface) { strmbase_passthrough_cleanup(&passthrough->passthrough); free(passthrough); - - InterlockedDecrement(&object_locks); } return refcount; } diff --git a/dlls/quartz/quartz_private.h b/dlls/quartz/quartz_private.h index de83c2535db..c706d906a26 100644 --- a/dlls/quartz/quartz_private.h +++ b/dlls/quartz/quartz_private.h @@ -58,8 +58,6 @@ static inline const char *debugstr_time(REFERENCE_TIME time) return wine_dbg_sprintf("%s", rev); } -extern LONG object_locks; - /* see IAsyncReader::Request on MSDN for the explanation of this */ #define MEDIATIME_FROM_BYTES(x) ((LONGLONG)(x) * 10000000) #define BYTES_FROM_MEDIATIME(time) ((time) / 10000000) diff --git a/dlls/quartz/systemclock.c b/dlls/quartz/systemclock.c index 73a923a7b99..cebe4846f04 100644 --- a/dlls/quartz/systemclock.c +++ b/dlls/quartz/systemclock.c @@ -115,8 +115,6 @@ static ULONG WINAPI system_clock_inner_Release(IUnknown *iface) clock->cs.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&clock->cs); heap_free(clock); - - InterlockedDecrement(&object_locks); } return refcount; } diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index 1a59a9b5213..1dbb8a02181 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -130,8 +130,6 @@ static void video_renderer_destroy(struct strmbase_renderer *iface) video_window_cleanup(&filter->window); strmbase_renderer_cleanup(&filter->renderer); free(filter); - - InterlockedDecrement(&object_locks); } static HRESULT video_renderer_query_interface(struct strmbase_renderer *iface, REFIID iid, void **out) diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 2562b74932a..4bde811c6d7 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -528,12 +528,6 @@ static void vmr_disconnect(struct strmbase_renderer *This) } } -static void vmr_free(struct quartz_vmr *filter) -{ - free(filter); - InterlockedDecrement(&object_locks); -} - static void vmr_destroy(struct strmbase_renderer *iface) { struct quartz_vmr *filter = impl_from_IBaseFilter(&iface->filter.IBaseFilter_iface); @@ -563,7 +557,7 @@ static void vmr_destroy(struct strmbase_renderer *iface) FreeLibrary(filter->hD3d9); strmbase_renderer_cleanup(&filter->renderer); if (!filter->IVMRSurfaceAllocatorNotify9_refcount) - vmr_free(filter); + free(filter); } static HRESULT vmr_query_interface(struct strmbase_renderer *iface, REFIID iid, void **out) @@ -1955,7 +1949,7 @@ static ULONG WINAPI VMR9SurfaceAllocatorNotify_Release(IVMRSurfaceAllocatorNotif TRACE("%p decreasing refcount to %u.\n", iface, refcount); if (!refcount && !filter->renderer.filter.refcount) - vmr_free(filter); + free(filter); return refcount; }

1 0