From bd6b53740c28c6974300e15f965c12feb0252085 Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Fri, 30 Apr 2021 12:45:24 +0200 Subject: [PATCH] winecrt0: Add a default implementation for DllCanUnloadNow(). Signed-off-by: Alexandre Julliard --- dlls/activeds/activeds.spec | 2 +- dlls/adsldp/adsldp.c | 5 ---- dlls/amsi/amsi.spec | 2 +- dlls/amstream/main.c | 8 ----- dlls/atl/atl30.c | 8 ----- dlls/avifil32/factory.c | 13 -------- dlls/bluetoothapis/bluetoothapis.spec | 2 +- dlls/bthprops.cpl/bthprops.cpl.spec | 2 +- dlls/cdosys/main.c | 5 ---- dlls/comcat/comcat_main.c | 8 ----- dlls/comsvcs/main.c | 8 ----- dlls/connect/connect.spec | 2 +- dlls/credui/credui.spec | 2 +- dlls/cryptext/cryptext.spec | 2 +- dlls/d3drm/d3drm.c | 5 ---- dlls/d3dxof/main.c | 8 ----- dlls/davclnt/davclnt.spec | 2 +- dlls/dcomp/dcomp.spec | 2 +- dlls/ddraw/main.c | 15 ---------- dlls/ddrawex/main.c | 9 ------ dlls/dhtmled.ocx/main.c | 9 ------ dlls/dinput/dinput_main.c | 8 ----- dlls/directmanipulation/directmanipulation.c | 5 ---- dlls/dpnet/dpnet_main.c | 8 ----- dlls/dpnhpast/main.c | 11 ------- dlls/dpvoice/main.c | 5 ---- dlls/dsdmo/main.c | 5 ---- dlls/dsound/dsound_main.c | 13 -------- dlls/dsquery/main.c | 8 ----- dlls/dsuiext/dsuiext.c | 5 ---- dlls/dx8vb/main.c | 5 ---- dlls/evr/main.c | 5 ---- dlls/gameux/main.c | 5 ---- dlls/hlink/hlink_main.c | 8 ----- dlls/hnetcfg/hnetcfg.c | 5 ---- dlls/inetcomm/inetcomm_main.c | 8 ----- dlls/infosoft/infosoft_main.c | 5 ---- dlls/inkobj/inkobj.c | 10 ------- dlls/inseng/inseng_main.c | 8 ----- dlls/itircl/itircl_main.c | 8 ----- dlls/ksproxy.ax/ksproxy.ax.spec | 2 +- dlls/mapistub/mapistub.spec | 2 +- dlls/mf/main.c | 8 ----- dlls/mfmediaengine/main.c | 5 ---- dlls/mfplay/mfplay.spec | 2 +- dlls/mfreadwrite/reader.c | 5 ---- dlls/mmcndmgr/mmcndmgr.c | 5 ---- dlls/mmdevapi/main.c | 5 ---- dlls/mp3dmod/mp3dmod.c | 8 ----- dlls/msado15/main.c | 8 ----- dlls/mscms/mscms.spec | 2 +- dlls/mscoree/mscoree_main.c | 5 ---- dlls/msctf/msctf.c | 8 ----- dlls/msdrm/msdrm.spec | 2 +- dlls/mshtml/main.c | 10 ------- dlls/msident/msident.c | 8 ----- dlls/msimtf/main.c | 8 ----- dlls/msisys.ocx/msisys.c | 12 -------- dlls/msscript.ocx/msscript.c | 9 ------ dlls/mstask/mstask.spec | 4 +-- dlls/msxml/main.c | 8 ----- dlls/msxml2/main.c | 8 ----- dlls/msxml3/main.c | 6 ---- dlls/msxml4/main.c | 5 ---- dlls/msxml6/main.c | 5 ---- dlls/netcfgx/main.c | 5 ---- dlls/netprofm/main.c | 8 ----- dlls/oleaut32/oleaut.c | 16 ---------- dlls/oledb32/main.c | 8 ----- dlls/olepro32/olepro32stubs.c | 8 ----- dlls/opcservices/factory.c | 5 ---- dlls/packager/packager_main.c | 5 ---- .../photometadatahandler.spec | 2 +- dlls/printui/printui.spec | 2 +- dlls/prntvpt/prntvpt.spec | 2 +- dlls/propsys/propsys_main.c | 5 ---- dlls/pstorec/pstorec.c | 5 ---- dlls/qasf/qasf_main.c | 5 ---- dlls/qdvd/qdvd_main.c | 5 ---- dlls/qedit/main.c | 8 ----- dlls/query/query_main.c | 5 ---- dlls/sapi/main.c | 9 ------ dlls/scrobj/scrobj.c | 8 ----- dlls/scrrun/scrrun.c | 8 ----- dlls/shcore/shcore.spec | 2 +- dlls/shell32/shell32_main.c | 8 ----- dlls/sti/sti_main.c | 8 ----- dlls/taskschd/taskschd.c | 8 ----- dlls/uianimation/main.c | 9 ------ dlls/uiautomationcore/uiautomationcore.spec | 2 +- dlls/uiribbon/main.c | 5 ---- dlls/vbscript/vbscript_main.c | 8 ----- dlls/vssapi/vssapi.spec | 2 +- dlls/wbemdisp/main.c | 8 ----- dlls/wbemprox/main.c | 8 ----- dlls/wimgapi/wimgapi.spec | 2 +- dlls/windows.gaming.input/main.c | 5 ---- dlls/windows.globalization/main.c | 5 ---- dlls/windows.media.devices/main.c | 5 ---- dlls/windows.media.speech/main.c | 5 ---- dlls/windowscodecs/main.c | 5 ---- dlls/winecrt0/Makefile.in | 1 + dlls/winecrt0/dll_canunload.c | 30 +++++++++++++++++++ dlls/wineqtdecoder/main.c | 6 ---- dlls/winhttp/main.c | 8 ----- dlls/wmiutils/main.c | 8 ----- dlls/wmp/wmp_main.c | 9 ------ dlls/wmphoto/main.c | 5 ---- dlls/wpc/wpc.c | 9 ------ dlls/wshom.ocx/wshom_main.c | 8 ----- dlls/wuapi/main.c | 5 ---- dlls/xactengine3_7/xact_dll.c | 5 ---- dlls/xaudio2_7/xaudio_dll.c | 5 ---- 113 files changed, 54 insertions(+), 663 deletions(-) create mode 100644 dlls/winecrt0/dll_canunload.c diff --git a/dlls/activeds/activeds.spec b/dlls/activeds/activeds.spec index 9e50d325938..641571d7aa2 100644 --- a/dlls/activeds/activeds.spec +++ b/dlls/activeds/activeds.spec @@ -22,7 +22,7 @@ 26 stub PropVariantToAdsType2 27 stub ConvertSecDescriptorToVariant 28 stub ConvertSecurityDescriptorToSecDes -#@ stub DllCanUnloadNow +@ stdcall -private DllCanUnloadNow() @ stdcall -private DllGetClassObject(ptr ptr ptr) #@ stub DllRegisterServer #@ stub DllUnregisterServer diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index 89d658c53ff..0efaee024ea 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -2115,11 +2115,6 @@ HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID iid, LPVOID *obj) return CLASS_E_CLASSNOTAVAILABLE; } -HRESULT WINAPI DllCanUnloadNow(void) -{ - return S_FALSE; -} - HRESULT WINAPI DllRegisterServer(void) { return __wine_register_resources(adsldp_hinst); diff --git a/dlls/amsi/amsi.spec b/dlls/amsi/amsi.spec index 27e6b3dbdaf..f650ba94f12 100644 --- a/dlls/amsi/amsi.spec +++ b/dlls/amsi/amsi.spec @@ -7,7 +7,7 @@ @ stub AmsiUacScan @ stub AmsiUacUninitialize @ stdcall AmsiUninitialize(ptr) -@ stub DllCanUnloadNow +@ stdcall -private DllCanUnloadNow() @ stub DllGetClassObject @ stub DllRegisterServer @ stub DllUnregisterServer diff --git a/dlls/amstream/main.c b/dlls/amstream/main.c index c581e516bd1..960e7a38040 100644 --- a/dlls/amstream/main.c +++ b/dlls/amstream/main.c @@ -199,14 +199,6 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) return S_OK; } -/*********************************************************************** - * DllCanUnloadNow (AMSTREAM.@) - */ -HRESULT WINAPI DllCanUnloadNow(void) -{ - return S_FALSE; -} - /*********************************************************************** * DllRegisterServer (AMSTREAM.@) */ diff --git a/dlls/atl/atl30.c b/dlls/atl/atl30.c index b015ea4b747..b7625bba7c7 100644 --- a/dlls/atl/atl30.c +++ b/dlls/atl/atl30.c @@ -544,11 +544,3 @@ HRESULT WINAPI DllUnregisterServer(void) { return __wine_unregister_resources( atl_instance ); } - -/*********************************************************************** - * DllCanUnloadNow (ATL.@) - */ -HRESULT WINAPI DllCanUnloadNow(void) -{ - return S_FALSE; -} diff --git a/dlls/avifil32/factory.c b/dlls/avifil32/factory.c index 3775aa51a81..276ab1dc41f 100644 --- a/dlls/avifil32/factory.c +++ b/dlls/avifil32/factory.c @@ -38,9 +38,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(avifile); HMODULE AVIFILE_hModule = NULL; -static BOOL AVIFILE_bLocked; -static UINT AVIFILE_uUseCount; - typedef struct { IClassFactory IClassFactory_iface; @@ -125,8 +122,6 @@ static HRESULT WINAPI IClassFactory_fnLockServer(IClassFactory *iface, BOOL dolo { TRACE("(%p,%d)\n",iface,dolock); - AVIFILE_bLocked = dolock; - return S_OK; } @@ -196,14 +191,6 @@ HRESULT WINAPI DllGetClassObject(REFCLSID pclsid, REFIID piid, LPVOID *ppv) return avifil32_DllGetClassObject(pclsid,piid,ppv); } -/***************************************************************************** - * DllCanUnloadNow (AVIFIL32.@) - */ -HRESULT WINAPI DllCanUnloadNow(void) -{ - return ((AVIFILE_bLocked || AVIFILE_uUseCount) ? S_FALSE : S_OK); -} - /***************************************************************************** * DllMain [AVIFIL32.init] */ diff --git a/dlls/bluetoothapis/bluetoothapis.spec b/dlls/bluetoothapis/bluetoothapis.spec index fc24cb374ba..39354b8c9a8 100644 --- a/dlls/bluetoothapis/bluetoothapis.spec +++ b/dlls/bluetoothapis/bluetoothapis.spec @@ -90,7 +90,7 @@ @ stub BthpTranspose16Bits @ stub BthpTranspose32Bits @ stub BthpTransposeAndExtendBytes -@ stub DllCanUnloadNow +@ stdcall -private DllCanUnloadNow() @ stub FindNextOpenVCOMPort @ stub InstallIncomingComPort @ stub ShouldForceAuthentication diff --git a/dlls/bthprops.cpl/bthprops.cpl.spec b/dlls/bthprops.cpl/bthprops.cpl.spec index 626b3857c51..26d2429c6ba 100644 --- a/dlls/bthprops.cpl/bthprops.cpl.spec +++ b/dlls/bthprops.cpl/bthprops.cpl.spec @@ -61,5 +61,5 @@ @ stub BthpFindPnpInfo @ stub BthpMapStatusToErr #@ stub CPlApplet -@ stub DllCanUnloadNow +@ stdcall -private DllCanUnloadNow() @ stub DllGetClassObject diff --git a/dlls/cdosys/main.c b/dlls/cdosys/main.c index 1a9affe249e..3bae7759dec 100644 --- a/dlls/cdosys/main.c +++ b/dlls/cdosys/main.c @@ -56,11 +56,6 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **obj) return CLASS_E_CLASSNOTAVAILABLE; } -HRESULT WINAPI DllCanUnloadNow(void) -{ - return S_FALSE; -} - HRESULT WINAPI DllRegisterServer(void) { return __wine_register_resources( instance ); diff --git a/dlls/comcat/comcat_main.c b/dlls/comcat/comcat_main.c index 345cf67e0b1..156d802efe4 100644 --- a/dlls/comcat/comcat_main.c +++ b/dlls/comcat/comcat_main.c @@ -23,14 +23,6 @@ #include "windef.h" #include "winbase.h" -/*********************************************************************** - * DllCanUnloadNow (COMCAT.@) - */ -HRESULT WINAPI DllCanUnloadNow(void) -{ - return S_FALSE; -} - /*********************************************************************** * DllRegisterServer (COMCAT.@) */ diff --git a/dlls/comsvcs/main.c b/dlls/comsvcs/main.c index 3023783bdf5..35acfca8ab1 100644 --- a/dlls/comsvcs/main.c +++ b/dlls/comsvcs/main.c @@ -1032,14 +1032,6 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv) return CLASS_E_CLASSNOTAVAILABLE; } -/****************************************************************** - * DllCanUnloadNow - */ -HRESULT WINAPI DllCanUnloadNow(void) -{ - return S_FALSE; -} - /*********************************************************************** * DllRegisterServer (comsvcs.@) */ diff --git a/dlls/connect/connect.spec b/dlls/connect/connect.spec index 7251c342344..8866bd4689a 100644 --- a/dlls/connect/connect.spec +++ b/dlls/connect/connect.spec @@ -1,6 +1,6 @@ @ stub AddConnectionOptionListEntries @ stub CreateVPNConnection -@ stub DllCanUnloadNow +@ stdcall -private DllCanUnloadNow() @ stub DllGetClassObject @ stub GetInternetConnected @ stub GetNetworkConnected diff --git a/dlls/credui/credui.spec b/dlls/credui/credui.spec index dd4bc751ef5..ed3e6435fa0 100644 --- a/dlls/credui/credui.spec +++ b/dlls/credui/credui.spec @@ -14,7 +14,7 @@ @ stdcall CredUIStoreSSOCredA(str str str long) @ stdcall CredUIStoreSSOCredW(wstr wstr wstr long) @ stdcall CredUnPackAuthenticationBufferW(long ptr long ptr ptr ptr ptr ptr ptr) -@ stub DllCanUnloadNow +@ stdcall -private DllCanUnloadNow() @ stub DllGetClassObject @ stub DllRegisterServer @ stub DllUnregisterServer diff --git a/dlls/cryptext/cryptext.spec b/dlls/cryptext/cryptext.spec index 0dba38e3934..d5aaef0f9a6 100644 --- a/dlls/cryptext/cryptext.spec +++ b/dlls/cryptext/cryptext.spec @@ -24,7 +24,7 @@ @ stub CryptExtOpenPKCS7W @ stub CryptExtOpenSTR @ stub CryptExtOpenSTRW -@ stub DllCanUnloadNow +@ stdcall -private DllCanUnloadNow() @ stub DllGetClassObject @ stub DllRegisterServer @ stub DllUnregisterServer diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index 8edcd7bd692..cf785b0e387 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -2339,11 +2339,6 @@ HRESULT WINAPI Direct3DRMCreate(IDirect3DRM **d3drm) return S_OK; } -HRESULT WINAPI DllCanUnloadNow(void) -{ - return S_FALSE; -} - HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv) { TRACE("(%s, %s, %p): stub\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); diff --git a/dlls/d3dxof/main.c b/dlls/d3dxof/main.c index 385609ace05..83ad62de9e3 100644 --- a/dlls/d3dxof/main.c +++ b/dlls/d3dxof/main.c @@ -219,14 +219,6 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) return S_OK; } -/*********************************************************************** - * DllCanUnloadNow (D3DXOF.@) - */ -HRESULT WINAPI DllCanUnloadNow(void) -{ - return S_FALSE; -} - /*********************************************************************** * DllRegisterServer (D3DXOF.@) */ diff --git a/dlls/davclnt/davclnt.spec b/dlls/davclnt/davclnt.spec index 2df7b6c9ff7..c5fe56e5025 100644 --- a/dlls/davclnt/davclnt.spec +++ b/dlls/davclnt/davclnt.spec @@ -5,7 +5,7 @@ @ stub DavInvalidateCache @ stdcall DavRegisterAuthCallback(ptr long) @ stdcall DavUnregisterAuthCallback(long) -@ stub DllCanUnloadNow +@ stdcall -private DllCanUnloadNow() @ stub DllGetClassObject @ stdcall -private DllMain(long long ptr) @ stub NPAddConnection3 diff --git a/dlls/dcomp/dcomp.spec b/dlls/dcomp/dcomp.spec index 428385e3a2a..8d625cc036a 100644 --- a/dlls/dcomp/dcomp.spec +++ b/dlls/dcomp/dcomp.spec @@ -18,7 +18,7 @@ @ stdcall DCompositionCreateDevice(ptr ptr ptr) @ stub DCompositionCreateSurfaceHandle @ stub DeserializeEffectDescription -@ stub DllCanUnloadNow +@ stdcall -private DllCanUnloadNow() @ stub DllGetActivationFactory @ stub DllGetClassObject @ stub DwmEnableMMCSS diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c index 4b00c016ed0..c4a7223a0a9 100644 --- a/dlls/ddraw/main.c +++ b/dlls/ddraw/main.c @@ -778,21 +778,6 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **out) } -/******************************************************************************* - * DllCanUnloadNow [DDRAW.@] Determines whether the DLL is in use. - * - * RETURNS - * Success: S_OK - * Failure: S_FALSE - */ -HRESULT WINAPI DllCanUnloadNow(void) -{ - TRACE("\n"); - - return S_FALSE; -} - - HRESULT WINAPI DllRegisterServer(void) { return __wine_register_resources( instance ); diff --git a/dlls/ddrawex/main.c b/dlls/ddrawex/main.c index 9fc6c2c2c79..dc8d7b8190c 100644 --- a/dlls/ddrawex/main.c +++ b/dlls/ddrawex/main.c @@ -206,15 +206,6 @@ static HRESULT ddrawex_factory_create(IUnknown *outer_unknown, REFIID riid, void return hr; } -/******************************************************************************* - * DllCanUnloadNow [DDRAWEX.@] Determines whether the DLL is in use. - */ -HRESULT WINAPI DllCanUnloadNow(void) -{ - return S_FALSE; -} - - /******************************************************************************* * DllGetClassObject [DDRAWEX.@] */ diff --git a/dlls/dhtmled.ocx/main.c b/dlls/dhtmled.ocx/main.c index 999341d43cf..5f8a56468f9 100644 --- a/dlls/dhtmled.ocx/main.c +++ b/dlls/dhtmled.ocx/main.c @@ -136,15 +136,6 @@ HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID iid, LPVOID *out) return CLASS_E_CLASSNOTAVAILABLE; } -/*********************************************************************** - * DllCanUnloadNow (dhtmled.ocx.@) - */ -HRESULT WINAPI DllCanUnloadNow(void) -{ - TRACE("()\n"); - return S_FALSE; -} - /*********************************************************************** * DllRegisterServer (dhtmled.ocx.@) */ diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 5da60cf1f7c..3877597675b 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -1664,14 +1664,6 @@ static const IClassFactoryVtbl DICF_Vtbl = { }; static IClassFactoryImpl DINPUT_CF = {{&DICF_Vtbl}, 1 }; -/*********************************************************************** - * DllCanUnloadNow (DINPUT.@) - */ -HRESULT WINAPI DllCanUnloadNow(void) -{ - return S_FALSE; -} - /*********************************************************************** * DllGetClassObject (DINPUT.@) */ diff --git a/dlls/directmanipulation/directmanipulation.c b/dlls/directmanipulation/directmanipulation.c index 5db998ee9c8..b79242b593e 100644 --- a/dlls/directmanipulation/directmanipulation.c +++ b/dlls/directmanipulation/directmanipulation.c @@ -57,11 +57,6 @@ HRESULT WINAPI DllUnregisterServer(void) return __wine_unregister_resources( dm_instance ); } -HRESULT WINAPI DllCanUnloadNow(void) -{ - return S_FALSE; -} - struct directmanipulation { diff --git a/dlls/dpnet/dpnet_main.c b/dlls/dpnet/dpnet_main.c index 445374cabb8..f83b7163afd 100644 --- a/dlls/dpnet/dpnet_main.c +++ b/dlls/dpnet/dpnet_main.c @@ -157,14 +157,6 @@ static IClassFactoryImpl DPNET_CFS[] = { { { NULL }, 0, NULL, NULL } }; -/*********************************************************************** - * DllCanUnloadNow (DPNET.@) - */ -HRESULT WINAPI DllCanUnloadNow(void) -{ - return S_FALSE; -} - /*********************************************************************** * DllGetClassObject (DPNET.@) */ diff --git a/dlls/dpnhpast/main.c b/dlls/dpnhpast/main.c index 0fc70cd6c7c..0aa6b3cce79 100644 --- a/dlls/dpnhpast/main.c +++ b/dlls/dpnhpast/main.c @@ -50,17 +50,6 @@ HRESULT WINAPI DllRegisterServer(void) } -/****************************************************************** - * DllCanUnloadNow (DPNHPAST.@) - * - * - */ -HRESULT WINAPI DllCanUnloadNow(void) -{ - return S_FALSE; -} - - /****************************************************************** * DllGetClassObject (DPNHPAST.@) * diff --git a/dlls/dpvoice/main.c b/dlls/dpvoice/main.c index 66d67586276..5a5b99c3fc6 100644 --- a/dlls/dpvoice/main.c +++ b/dlls/dpvoice/main.c @@ -143,11 +143,6 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv) return CLASS_E_CLASSNOTAVAILABLE; } -HRESULT WINAPI DllCanUnloadNow(void) -{ - return S_FALSE; -} - HRESULT WINAPI DllRegisterServer(void) { return __wine_register_resources( DPVOICE_hInstance ); diff --git a/dlls/dsdmo/main.c b/dlls/dsdmo/main.c index c6fc30dc2c4..4e01d18d1dd 100644 --- a/dlls/dsdmo/main.c +++ b/dlls/dsdmo/main.c @@ -914,11 +914,6 @@ HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID iid, void **out) return CLASS_E_CLASSNOTAVAILABLE; } -HRESULT WINAPI DllCanUnloadNow(void) -{ - return S_FALSE; -} - HRESULT WINAPI DllRegisterServer(void) { TRACE("()\n"); diff --git a/dlls/dsound/dsound_main.c b/dlls/dsound/dsound_main.c index 25c5f7bbf46..80976c8aec7 100644 --- a/dlls/dsound/dsound_main.c +++ b/dlls/dsound/dsound_main.c @@ -760,19 +760,6 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) } -/******************************************************************************* - * DllCanUnloadNow [DSOUND.4] - * Determines whether the DLL is in use. - * - * RETURNS - * Can unload now: S_OK - * Cannot unload now (the DLL is still active): S_FALSE - */ -HRESULT WINAPI DllCanUnloadNow(void) -{ - return S_FALSE; -} - #define INIT_GUID(guid, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \ guid.Data1 = l; guid.Data2 = w1; guid.Data3 = w2; \ guid.Data4[0] = b1; guid.Data4[1] = b2; guid.Data4[2] = b3; \ diff --git a/dlls/dsquery/main.c b/dlls/dsquery/main.c index ea367b63dee..0d95de8129e 100644 --- a/dlls/dsquery/main.c +++ b/dlls/dsquery/main.c @@ -214,14 +214,6 @@ BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, void *reserved) return TRUE; } -/*********************************************************************** - * DllCanUnloadNow (DSQUERY.@) - */ -HRESULT WINAPI DllCanUnloadNow(void) -{ - return S_FALSE; -} - /*********************************************************************** * DllGetClassObject (DSQUERY.@) */ diff --git a/dlls/dsuiext/dsuiext.c b/dlls/dsuiext/dsuiext.c index 1978a8dd4ec..fc16bf90bbf 100644 --- a/dlls/dsuiext/dsuiext.c +++ b/dlls/dsuiext/dsuiext.c @@ -321,8 +321,3 @@ HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID iid, LPVOID *obj) FIXME("class %s/%s is not implemented\n", debugstr_guid(clsid), debugstr_guid(iid)); return CLASS_E_CLASSNOTAVAILABLE; } - -HRESULT WINAPI DllCanUnloadNow(void) -{ - return S_FALSE; -} diff --git a/dlls/dx8vb/main.c b/dlls/dx8vb/main.c index 4784c84e203..a53570ba03a 100644 --- a/dlls/dx8vb/main.c +++ b/dlls/dx8vb/main.c @@ -179,11 +179,6 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv) return S_OK; } -HRESULT WINAPI DllCanUnloadNow(void) -{ - return S_FALSE; -} - HRESULT WINAPI DllRegisterServer(void) { return __wine_register_resources(instance_dx8vb); diff --git a/dlls/evr/main.c b/dlls/evr/main.c index e75fb0ad691..b6389ea8a89 100644 --- a/dlls/evr/main.c +++ b/dlls/evr/main.c @@ -181,11 +181,6 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv) return S_OK; } -HRESULT WINAPI DllCanUnloadNow(void) -{ - return S_FALSE; -} - HRESULT WINAPI DllRegisterServer(void) { return __wine_register_resources(instance_evr); diff --git a/dlls/gameux/main.c b/dlls/gameux/main.c index 0d68785f8f0..d336cb96596 100644 --- a/dlls/gameux/main.c +++ b/dlls/gameux/main.c @@ -37,11 +37,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(gameux); static HINSTANCE instance; -HRESULT WINAPI DllCanUnloadNow(void) -{ - return S_FALSE; -} - BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) { TRACE("(%p, %d, %p)\n", hInstDLL, fdwReason, lpv); diff --git a/dlls/hlink/hlink_main.c b/dlls/hlink/hlink_main.c index a9f907fa071..29ea11a80c6 100644 --- a/dlls/hlink/hlink_main.c +++ b/dlls/hlink/hlink_main.c @@ -57,14 +57,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) return TRUE; } -/*********************************************************************** - * DllCanUnloadNow (HLINK.@) - */ -HRESULT WINAPI DllCanUnloadNow( void ) -{ - return S_FALSE; -} - /*********************************************************************** * HlinkCreateFromMoniker (HLINK.@) */ diff --git a/dlls/hnetcfg/hnetcfg.c b/dlls/hnetcfg/hnetcfg.c index 5018c9f285d..f92c4eaa983 100644 --- a/dlls/hnetcfg/hnetcfg.c +++ b/dlls/hnetcfg/hnetcfg.c @@ -166,11 +166,6 @@ HRESULT WINAPI DllGetClassObject( REFCLSID rclsid, REFIID iid, LPVOID *ppv ) return IClassFactory_QueryInterface( cf, iid, ppv ); } -HRESULT WINAPI DllCanUnloadNow( void ) -{ - return S_FALSE; -} - /*********************************************************************** * DllRegisterServer (HNETCFG.@) */ diff --git a/dlls/inetcomm/inetcomm_main.c b/dlls/inetcomm/inetcomm_main.c index e9029ffb98b..2e8554af5e5 100644 --- a/dlls/inetcomm/inetcomm_main.c +++ b/dlls/inetcomm/inetcomm_main.c @@ -209,14 +209,6 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv) return IClassFactory_QueryInterface( cf, iid, ppv ); } -/*********************************************************************** - * DllCanUnloadNow (INETCOMM.@) - */ -HRESULT WINAPI DllCanUnloadNow(void) -{ - return S_FALSE; -} - /*********************************************************************** * DllRegisterServer (INETCOMM.@) */ diff --git a/dlls/infosoft/infosoft_main.c b/dlls/infosoft/infosoft_main.c index d12f6520cce..4d283682e56 100644 --- a/dlls/infosoft/infosoft_main.c +++ b/dlls/infosoft/infosoft_main.c @@ -147,11 +147,6 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv) } -HRESULT WINAPI DllCanUnloadNow(void) -{ - return S_FALSE; -} - /*********************************************************************** * DllRegisterServer (INFOSOFT.@) */ diff --git a/dlls/inkobj/inkobj.c b/dlls/inkobj/inkobj.c index d72d273a43a..37faddd9611 100644 --- a/dlls/inkobj/inkobj.c +++ b/dlls/inkobj/inkobj.c @@ -19,16 +19,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(inkobj); -static LONG INKOBJ_refCount; - -/***************************************************** - * DllCanUnloadNow (INKOBJ.@) - */ -HRESULT WINAPI DllCanUnloadNow(void) -{ - return (INKOBJ_refCount != 0)? S_FALSE : S_OK; -} - /***************************************************** * DllGetClassObject [INKOBJ.@] */ diff --git a/dlls/inseng/inseng_main.c b/dlls/inseng/inseng_main.c index c9a5988478c..7416d247b93 100644 --- a/dlls/inseng/inseng_main.c +++ b/dlls/inseng/inseng_main.c @@ -384,14 +384,6 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv) return CLASS_E_CLASSNOTAVAILABLE; } -/*********************************************************************** - * DllCanUnloadNow (INSENG.@) - */ -HRESULT WINAPI DllCanUnloadNow(void) -{ - return S_FALSE; -} - /*********************************************************************** * DllRegisterServer (INSENG.@) */ diff --git a/dlls/itircl/itircl_main.c b/dlls/itircl/itircl_main.c index d105b6608d5..e540acc6d5f 100644 --- a/dlls/itircl/itircl_main.c +++ b/dlls/itircl/itircl_main.c @@ -44,11 +44,3 @@ HRESULT WINAPI DllUnregisterServer(void) FIXME("stub\n"); return S_FALSE; } - -/*********************************************************************** - * DllCanUnloadNow (ITIRCL.@) - */ -HRESULT WINAPI DllCanUnloadNow(void) -{ - return S_FALSE; -} diff --git a/dlls/ksproxy.ax/ksproxy.ax.spec b/dlls/ksproxy.ax/ksproxy.ax.spec index db7e2112f07..7bba1c4ac15 100644 --- a/dlls/ksproxy.ax/ksproxy.ax.spec +++ b/dlls/ksproxy.ax/ksproxy.ax.spec @@ -1,4 +1,4 @@ -@ stub DllCanUnloadNow +@ stdcall -private DllCanUnloadNow() @ stub DllGetClassObject @ stub DllRegisterServer @ stub DllUnregisterServer diff --git a/dlls/mapistub/mapistub.spec b/dlls/mapistub/mapistub.spec index fce027d976a..8b6d40421f7 100644 --- a/dlls/mapistub/mapistub.spec +++ b/dlls/mapistub/mapistub.spec @@ -17,7 +17,7 @@ 25 stub LAUNCHWIZARD 26 stub LaunchWizard@20 27 stub DllGetClassObject - 28 stub DllCanUnloadNow + 28 stdcall -private DllCanUnloadNow() 29 stub MAPIOpenFormMgr 30 stub MAPIOpenFormMgr@8 31 stdcall MAPIOpenLocalFormContainer(ptr) mapi32.MAPIOpenLocalFormContainer diff --git a/dlls/mf/main.c b/dlls/mf/main.c index b59ad466c73..c922ce13f88 100644 --- a/dlls/mf/main.c +++ b/dlls/mf/main.c @@ -1048,14 +1048,6 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **obj) return CLASS_E_CLASSNOTAVAILABLE; } -/****************************************************************** - * DllCanUnloadNow (mf.@) - */ -HRESULT WINAPI DllCanUnloadNow(void) -{ - return S_FALSE; -} - /*********************************************************************** * DllRegisterServer (mf.@) */ diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index a606ce364af..c6c73b625f1 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -2028,8 +2028,3 @@ HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID riid, void **obj) *obj = NULL; return CLASS_E_CLASSNOTAVAILABLE; } - -HRESULT WINAPI DllCanUnloadNow(void) -{ - return S_FALSE; -} diff --git a/dlls/mfplay/mfplay.spec b/dlls/mfplay/mfplay.spec index 5593ebfc75f..9715a332bdb 100644 --- a/dlls/mfplay/mfplay.spec +++ b/dlls/mfplay/mfplay.spec @@ -1,4 +1,4 @@ -@ stub DllCanUnloadNow +@ stdcall -private DllCanUnloadNow() @ stub DllGetClassObject @ stub DllRegisterServer @ stub DllUnregisterServer diff --git a/dlls/mfreadwrite/reader.c b/dlls/mfreadwrite/reader.c index 8b3230ad4d2..24e7f72df6a 100644 --- a/dlls/mfreadwrite/reader.c +++ b/dlls/mfreadwrite/reader.c @@ -59,11 +59,6 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) return TRUE; } -HRESULT WINAPI DllCanUnloadNow(void) -{ - return S_FALSE; -} - HRESULT WINAPI DllRegisterServer(void) { return __wine_register_resources( mfinstance ); diff --git a/dlls/mmcndmgr/mmcndmgr.c b/dlls/mmcndmgr/mmcndmgr.c index 82f866860d6..a0d31af1182 100644 --- a/dlls/mmcndmgr/mmcndmgr.c +++ b/dlls/mmcndmgr/mmcndmgr.c @@ -166,11 +166,6 @@ HRESULT WINAPI DllUnregisterServer(void) return __wine_unregister_resources( MMC_hInstance ); } -HRESULT WINAPI DllCanUnloadNow(void) -{ - return S_FALSE; -} - BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { TRACE("(%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); diff --git a/dlls/mmdevapi/main.c b/dlls/mmdevapi/main.c index 455e6682001..95b95522599 100644 --- a/dlls/mmdevapi/main.c +++ b/dlls/mmdevapi/main.c @@ -173,11 +173,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) return TRUE; } -HRESULT WINAPI DllCanUnloadNow(void) -{ - return S_FALSE; -} - typedef HRESULT (*FnCreateInstance)(REFIID riid, LPVOID *ppobj); typedef struct { diff --git a/dlls/mp3dmod/mp3dmod.c b/dlls/mp3dmod/mp3dmod.c index 3ad3b785d29..c06ad3734b0 100644 --- a/dlls/mp3dmod/mp3dmod.c +++ b/dlls/mp3dmod/mp3dmod.c @@ -678,14 +678,6 @@ HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID iid, void **obj) return CLASS_E_CLASSNOTAVAILABLE; } -/****************************************************************** - * DllCanUnloadNow (DSDMO.@) - */ -HRESULT WINAPI DllCanUnloadNow(void) -{ - return S_FALSE; -} - /*********************************************************************** * DllRegisterServer (DSDMO.@) */ diff --git a/dlls/msado15/main.c b/dlls/msado15/main.c index 6b85c84e8e8..a6aa03a2e23 100644 --- a/dlls/msado15/main.c +++ b/dlls/msado15/main.c @@ -151,14 +151,6 @@ HRESULT WINAPI DllGetClassObject( REFCLSID clsid, REFIID iid, void **obj ) return IClassFactory_QueryInterface( cf, iid, obj ); } -/****************************************************************** - * DllCanUnloadNow - */ -HRESULT WINAPI DllCanUnloadNow(void) -{ - return S_FALSE; -} - /*********************************************************************** * DllRegisterServer */ diff --git a/dlls/mscms/mscms.spec b/dlls/mscms/mscms.spec index cfe32a826eb..800db891a4d 100644 --- a/dlls/mscms/mscms.spec +++ b/dlls/mscms/mscms.spec @@ -34,7 +34,7 @@ @ stub DeviceRenameEvent @ stdcall DisassociateColorProfileFromDeviceA(str str str) @ stdcall DisassociateColorProfileFromDeviceW(wstr wstr wstr) -#@ stub DllCanUnloadNow +@ stdcall -private DllCanUnloadNow() #@ stub DllGetClassObject @ stdcall EnumColorProfilesA(str ptr ptr ptr ptr) @ stdcall EnumColorProfilesW(wstr ptr ptr ptr ptr) diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index 59cb17a0357..a75a7ca05cd 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -891,11 +891,6 @@ HRESULT WINAPI DllUnregisterServer(void) return __wine_unregister_resources( MSCOREE_hInstance ); } -HRESULT WINAPI DllCanUnloadNow(VOID) -{ - return S_FALSE; -} - void WINAPI CoEEShutDownCOM(void) { FIXME("stub.\n"); diff --git a/dlls/msctf/msctf.c b/dlls/msctf/msctf.c index 56a36cb23c8..5b44447502f 100644 --- a/dlls/msctf/msctf.c +++ b/dlls/msctf/msctf.c @@ -568,14 +568,6 @@ BOOL WINAPI DllMain(HINSTANCE hinst, DWORD fdwReason, LPVOID fImpLoad) return TRUE; } -/************************************************************************* - * DllCanUnloadNow (MSCTF.@) - */ -HRESULT WINAPI DllCanUnloadNow(void) -{ - return S_FALSE; -} - /*********************************************************************** * DllGetClassObject (MSCTF.@) */ diff --git a/dlls/msdrm/msdrm.spec b/dlls/msdrm/msdrm.spec index 5d4d3d61bce..5a4243ca84e 100644 --- a/dlls/msdrm/msdrm.spec +++ b/dlls/msdrm/msdrm.spec @@ -82,7 +82,7 @@ @ stub DRMSetRevocationPoint @ stub DRMSetUsagePolicy @ stub DRMVerify -@ stub DllCanUnloadNow +@ stdcall -private DllCanUnloadNow() @ stub DllGetClassObject @ stub DllRegisterServer @ stub DllUnregisterServer diff --git a/dlls/mshtml/main.c b/dlls/mshtml/main.c index 7ee26076513..7e13d80d2f9 100644 --- a/dlls/mshtml/main.c +++ b/dlls/mshtml/main.c @@ -490,16 +490,6 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) return CLASS_E_CLASSNOTAVAILABLE; } -/****************************************************************** - * DllCanUnloadNow (MSHTML.@) - */ -HRESULT WINAPI DllCanUnloadNow(void) -{ - TRACE("()\n"); - /* The cost of keeping this DLL in memory is small. */ - return S_FALSE; -} - /*********************************************************************** * RunHTMLApplication (MSHTML.@) * diff --git a/dlls/msident/msident.c b/dlls/msident/msident.c index b075dcfcc16..2036241e7ef 100644 --- a/dlls/msident/msident.c +++ b/dlls/msident/msident.c @@ -306,14 +306,6 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) return CLASS_E_CLASSNOTAVAILABLE; } -/*********************************************************************** - * DllCanUnloadNow (msident.@) - */ -HRESULT WINAPI DllCanUnloadNow(void) -{ - return S_FALSE; -} - /*********************************************************************** * DllRegisterServer (msident.@) */ diff --git a/dlls/msimtf/main.c b/dlls/msimtf/main.c index c5d3e8b9f32..82c30fcaddc 100644 --- a/dlls/msimtf/main.c +++ b/dlls/msimtf/main.c @@ -144,14 +144,6 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) return CLASS_E_CLASSNOTAVAILABLE; } -/****************************************************************** - * DllCanUnloadNow (msimtf.@) - */ -HRESULT WINAPI DllCanUnloadNow(void) -{ - return S_FALSE; -} - /*********************************************************************** * DllRegisterServer (msimtf.@) */ diff --git a/dlls/msisys.ocx/msisys.c b/dlls/msisys.ocx/msisys.c index b0aaded2a4d..4d3b8390fdb 100644 --- a/dlls/msisys.ocx/msisys.c +++ b/dlls/msisys.ocx/msisys.c @@ -32,18 +32,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(msisys); -/*********************************************************************** - * DllCanUnloadNow (MSISYS.@) - * - * RETURNS - * Success: S_OK - * Failure: S_FALSE - */ -HRESULT WINAPI DllCanUnloadNow(void) -{ - return S_FALSE; -} - /*********************************************************************** * DllGetClassObject (MSISYS.@) */ diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index 15d15ab4349..29b3c374abc 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -4089,15 +4089,6 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) return CLASS_E_CLASSNOTAVAILABLE; } -/*********************************************************************** - * DllCanUnloadNow (msscript.ocx.@) - */ -HRESULT WINAPI DllCanUnloadNow(void) -{ - TRACE("\n"); - return S_FALSE; -} - /*********************************************************************** * DllRegisterServer (msscript.ocx.@) */ diff --git a/dlls/mstask/mstask.spec b/dlls/mstask/mstask.spec index df8ea7ad780..030bd50f1fc 100644 --- a/dlls/mstask/mstask.spec +++ b/dlls/mstask/mstask.spec @@ -12,8 +12,8 @@ @ stub SASetNSAccountInformation @ stub SetNetScheduleAccountInformation @ stub _ConvertAtJobsToTasks@0 -@ stub _DllCanUnloadNow@0 -@ stub _DllGetClassObject@12 +@ stdcall -private _DllCanUnloadNow@0() DllCanUnloadNow +@ stdcall -private _DllGetClassObject@12(ptr ptr ptr) DllGetClassObject @ stub _GetNetScheduleAccountInformation@12 @ stdcall _NetrJobAdd@12(wstr ptr ptr) NetrJobAdd_wrapper @ stdcall _NetrJobDel@12(wstr long long) NetrJobDel_wrapper diff --git a/dlls/msxml/main.c b/dlls/msxml/main.c index 55e4ecd4050..c4d6862b526 100644 --- a/dlls/msxml/main.c +++ b/dlls/msxml/main.c @@ -38,14 +38,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstance, DWORD reason, LPVOID reserved) return TRUE; } -/*********************************************************************** - * DllCanUnloadNow (MSXML.@) - */ -HRESULT WINAPI DllCanUnloadNow(void) -{ - return S_FALSE; -} - /*********************************************************************** * DllRegisterServer (MSXML.@) */ diff --git a/dlls/msxml2/main.c b/dlls/msxml2/main.c index 096ddc2f73b..f96d4b57002 100644 --- a/dlls/msxml2/main.c +++ b/dlls/msxml2/main.c @@ -38,14 +38,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstance, DWORD reason, LPVOID reserved) return TRUE; } -/*********************************************************************** - * DllCanUnloadNow (MSXML2.@) - */ -HRESULT WINAPI DllCanUnloadNow(void) -{ - return S_FALSE; -} - /*********************************************************************** * DllRegisterServer (MSXML2.@) */ diff --git a/dlls/msxml3/main.c b/dlls/msxml3/main.c index 5135574846b..7ae04fa12e6 100644 --- a/dlls/msxml3/main.c +++ b/dlls/msxml3/main.c @@ -418,12 +418,6 @@ const CLSID* SchemaCache_version(MSXML_VERSION v) } } -HRESULT WINAPI DllCanUnloadNow(void) -{ - return S_FALSE; -} - - BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID reserved) { MSXML_hInstance = hInstDLL; diff --git a/dlls/msxml4/main.c b/dlls/msxml4/main.c index fbe7f9eb469..d90684d5f05 100644 --- a/dlls/msxml4/main.c +++ b/dlls/msxml4/main.c @@ -26,11 +26,6 @@ static HINSTANCE instance; -HRESULT WINAPI DllCanUnloadNow(void) -{ - return S_FALSE; -} - BOOL WINAPI DllMain(HINSTANCE hinstance, DWORD reason, LPVOID reserved) { switch (reason) diff --git a/dlls/msxml6/main.c b/dlls/msxml6/main.c index 9c6f9876dec..c16ae63b569 100644 --- a/dlls/msxml6/main.c +++ b/dlls/msxml6/main.c @@ -26,11 +26,6 @@ static HINSTANCE instance; -HRESULT WINAPI DllCanUnloadNow(void) -{ - return S_FALSE; -} - BOOL WINAPI DllMain(HINSTANCE hinstance, DWORD reason, LPVOID reserved) { switch (reason) diff --git a/dlls/netcfgx/main.c b/dlls/netcfgx/main.c index f7373599554..0641fb8b1f1 100644 --- a/dlls/netcfgx/main.c +++ b/dlls/netcfgx/main.c @@ -166,8 +166,3 @@ HRESULT WINAPI DllUnregisterServer(void) { return __wine_unregister_resources( NETCFGX_hInstance ); } - -HRESULT WINAPI DllCanUnloadNow(void) -{ - return S_FALSE; -} diff --git a/dlls/netprofm/main.c b/dlls/netprofm/main.c index 1763080ec3f..bdfa0059929 100644 --- a/dlls/netprofm/main.c +++ b/dlls/netprofm/main.c @@ -131,14 +131,6 @@ HRESULT WINAPI DllGetClassObject( REFCLSID rclsid, REFIID iid, LPVOID *ppv ) return IClassFactory_QueryInterface( cf, iid, ppv ); } -/*********************************************************************** - * DllCanUnloadNow (NETPROFM.@) - */ -HRESULT WINAPI DllCanUnloadNow( void ) -{ - return S_FALSE; -} - /*********************************************************************** * DllRegisterServer (NETPROFM.@) */ diff --git a/dlls/oleaut32/oleaut.c b/dlls/oleaut32/oleaut.c index 08e6bc6e3f2..043face3459 100644 --- a/dlls/oleaut32/oleaut.c +++ b/dlls/oleaut32/oleaut.c @@ -1080,22 +1080,6 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv) return OLEAUTPS_DllGetClassObject(rclsid, iid, ppv); } -/*********************************************************************** - * DllCanUnloadNow (OLEAUT32.@) - * - * Determine if this dll can be unloaded from the callers address space. - * - * PARAMS - * None. - * - * RETURNS - * Always returns S_FALSE. This dll cannot be unloaded. - */ -HRESULT WINAPI DllCanUnloadNow(void) -{ - return S_FALSE; -} - /***************************************************************************** * DllMain [OLEAUT32.@] */ diff --git a/dlls/oledb32/main.c b/dlls/oledb32/main.c index 9c8c7f231b8..8a583188ab3 100644 --- a/dlls/oledb32/main.c +++ b/dlls/oledb32/main.c @@ -166,14 +166,6 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **obj) return CLASS_E_CLASSNOTAVAILABLE; } -/****************************************************************** - * DllCanUnloadNow - */ -HRESULT WINAPI DllCanUnloadNow(void) -{ - return S_FALSE; -} - /*********************************************************************** * DllRegisterServer */ diff --git a/dlls/olepro32/olepro32stubs.c b/dlls/olepro32/olepro32stubs.c index 70bf5c870b8..c053d4e2998 100644 --- a/dlls/olepro32/olepro32stubs.c +++ b/dlls/olepro32/olepro32stubs.c @@ -48,14 +48,6 @@ HRESULT WINAPI DllRegisterServer(void) return S_OK; } -/*********************************************************************** - * DllCanUnloadNow (OLEPRO32.255) - */ -HRESULT WINAPI DllCanUnloadNow(void) -{ - return S_FALSE; -} - /*********************************************************************** * DllGetClassObject (OLEPRO32.@) */ diff --git a/dlls/opcservices/factory.c b/dlls/opcservices/factory.c index 7ee66676c9d..d683c36bdd0 100644 --- a/dlls/opcservices/factory.c +++ b/dlls/opcservices/factory.c @@ -482,11 +482,6 @@ HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID iid, void **out) return E_NOTIMPL; } -HRESULT WINAPI DllCanUnloadNow(void) -{ - return S_FALSE; -} - static HINSTANCE OPC_hInstance; BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD reason, void *reserved) diff --git a/dlls/packager/packager_main.c b/dlls/packager/packager_main.c index de07e5ca265..0bece9bebaa 100644 --- a/dlls/packager/packager_main.c +++ b/dlls/packager/packager_main.c @@ -648,11 +648,6 @@ HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID iid, void **obj) return CLASS_E_CLASSNOTAVAILABLE; } -HRESULT WINAPI DllCanUnloadNow(void) -{ - return S_OK; -} - HRESULT WINAPI DllRegisterServer(void) { return __wine_register_resources(g_instance); diff --git a/dlls/photometadatahandler/photometadatahandler.spec b/dlls/photometadatahandler/photometadatahandler.spec index c5fc87af6d5..b4eb88b4859 100644 --- a/dlls/photometadatahandler/photometadatahandler.spec +++ b/dlls/photometadatahandler/photometadatahandler.spec @@ -1,4 +1,4 @@ -@ stub DllCanUnloadNow +@ stdcall -private DllCanUnloadNow() @ stub DllGetClassObject @ stub DllRegisterServer @ stub DllUnregisterServer diff --git a/dlls/printui/printui.spec b/dlls/printui/printui.spec index dcea8dc2e07..b498db6cf77 100644 --- a/dlls/printui/printui.spec +++ b/dlls/printui/printui.spec @@ -1,7 +1,7 @@ @ stub ConnectToPrinterDlg @ stub ConnectToPrinterPropertyPage @ stub ConstructPrinterFriendlyName -@ stub DllCanUnloadNow +@ stdcall -private DllCanUnloadNow() @ stub DllGetClassObject @ stub DocumentPropertiesWrap @ stub PnPInterface diff --git a/dlls/prntvpt/prntvpt.spec b/dlls/prntvpt/prntvpt.spec index 95470143745..374045d18c1 100644 --- a/dlls/prntvpt/prntvpt.spec +++ b/dlls/prntvpt/prntvpt.spec @@ -12,7 +12,7 @@ @ stub ConvertDevModeToPrintTicketThunk @ stub ConvertPrintTicketToDevModeThunk2 @ stub ConvertPrintTicketToDevModeThunk -@ stub DllCanUnloadNow +@ stdcall -private DllCanUnloadNow() @ stub DllGetClassObject @ stdcall -private DllMain(long long ptr) @ stub DllRegisterServer diff --git a/dlls/propsys/propsys_main.c b/dlls/propsys/propsys_main.c index ee67ab35f17..edc9b7b4176 100644 --- a/dlls/propsys/propsys_main.c +++ b/dlls/propsys/propsys_main.c @@ -130,11 +130,6 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) return CLASS_E_CLASSNOTAVAILABLE; } -HRESULT WINAPI DllCanUnloadNow(void) -{ - return S_FALSE; -} - static HRESULT WINAPI propsys_QueryInterface(IPropertySystem *iface, REFIID riid, void **obj) { *obj = NULL; diff --git a/dlls/pstorec/pstorec.c b/dlls/pstorec/pstorec.c index 65debd3e6f4..96366df9327 100644 --- a/dlls/pstorec/pstorec.c +++ b/dlls/pstorec/pstorec.c @@ -375,8 +375,3 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv) FIXME("%s %s %p\n", debugstr_guid(rclsid), debugstr_guid(iid), ppv); return CLASS_E_CLASSNOTAVAILABLE; } - -HRESULT WINAPI DllCanUnloadNow(void) -{ - return S_FALSE; -} diff --git a/dlls/qasf/qasf_main.c b/dlls/qasf/qasf_main.c index ac671d3919c..d4cc65e5e4b 100644 --- a/dlls/qasf/qasf_main.c +++ b/dlls/qasf/qasf_main.c @@ -128,11 +128,6 @@ HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID iid, void **out) return CLASS_E_CLASSNOTAVAILABLE; } -HRESULT WINAPI DllCanUnloadNow(void) -{ - return S_FALSE; -} - HRESULT WINAPI DllRegisterServer(void) { return __wine_register_resources(qasf_instance); diff --git a/dlls/qdvd/qdvd_main.c b/dlls/qdvd/qdvd_main.c index cf0620511cc..58b9cd2a401 100644 --- a/dlls/qdvd/qdvd_main.c +++ b/dlls/qdvd/qdvd_main.c @@ -134,8 +134,3 @@ HRESULT WINAPI DllUnregisterServer(void) { return __wine_unregister_resources(qdvd_instance); } - -HRESULT WINAPI DllCanUnloadNow(void) -{ - return S_FALSE; -} diff --git a/dlls/qedit/main.c b/dlls/qedit/main.c index 158fb4bc0b8..cfddc70a3bc 100644 --- a/dlls/qedit/main.c +++ b/dlls/qedit/main.c @@ -139,14 +139,6 @@ static const IClassFactoryVtbl DSCF_Vtbl = }; -/*********************************************************************** - * DllCanUnloadNow (QEDIT.@) - */ -HRESULT WINAPI DllCanUnloadNow(void) -{ - return S_FALSE; -} - /******************************************************************************* * DllGetClassObject [QEDIT.@] * Retrieves class object from a DLL object diff --git a/dlls/query/query_main.c b/dlls/query/query_main.c index 4312d483fc2..002ef5c34e9 100644 --- a/dlls/query/query_main.c +++ b/dlls/query/query_main.c @@ -46,11 +46,6 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv) return CLASS_E_CLASSNOTAVAILABLE; } -HRESULT WINAPI DllCanUnloadNow(void) -{ - return S_FALSE; -} - HRESULT WINAPI DllRegisterServer(void) { FIXME("\n"); diff --git a/dlls/sapi/main.c b/dlls/sapi/main.c index 4408e1e693f..4ce139bb485 100644 --- a/dlls/sapi/main.c +++ b/dlls/sapi/main.c @@ -157,15 +157,6 @@ BOOL WINAPI DllMain( HINSTANCE dll, DWORD reason, LPVOID reserved ) return TRUE; } -/****************************************************************** - * DllCanUnloadNow - */ -HRESULT WINAPI DllCanUnloadNow( void ) -{ - TRACE( "()\n" ); - return S_FALSE; -} - /*********************************************************************** * DllRegisterServer */ diff --git a/dlls/scrobj/scrobj.c b/dlls/scrobj/scrobj.c index 48943d235ec..10276de6f6a 100644 --- a/dlls/scrobj/scrobj.c +++ b/dlls/scrobj/scrobj.c @@ -2550,11 +2550,3 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv) FIXME("%s %s %p\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); return CLASS_E_CLASSNOTAVAILABLE; } - -/*********************************************************************** - * DllCanUnloadNow (scrobj.@) - */ -HRESULT WINAPI DllCanUnloadNow(void) -{ - return S_FALSE; -} diff --git a/dlls/scrrun/scrrun.c b/dlls/scrrun/scrrun.c index 9445c727ac7..1ce70830a42 100644 --- a/dlls/scrrun/scrrun.c +++ b/dlls/scrrun/scrrun.c @@ -290,11 +290,3 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID* ppv) FIXME("%s %s %p\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); return CLASS_E_CLASSNOTAVAILABLE; } - -/*********************************************************************** - * DllCanUnloadNow (scrrun.@) - */ -HRESULT WINAPI DllCanUnloadNow(void) -{ - return S_FALSE; -} diff --git a/dlls/shcore/shcore.spec b/dlls/shcore/shcore.spec index 3f81c340c6f..a0bc8a2463b 100644 --- a/dlls/shcore/shcore.spec +++ b/dlls/shcore/shcore.spec @@ -3,7 +3,7 @@ @ stub CreateRandomAccessStreamOnFile @ stub CreateRandomAccessStreamOverStream @ stub CreateStreamOverRandomAccessStream -@ stub DllCanUnloadNow +@ stdcall -private DllCanUnloadNow() @ stub DllGetActivationFactory @ stub DllGetClassObject @ stdcall GetCurrentProcessExplicitAppUserModelID(ptr) diff --git a/dlls/shell32/shell32_main.c b/dlls/shell32/shell32_main.c index afbf5164c9a..b569a9dddc8 100644 --- a/dlls/shell32/shell32_main.c +++ b/dlls/shell32/shell32_main.c @@ -1169,14 +1169,6 @@ HRESULT WINAPI DllInstall(BOOL bInstall, LPCWSTR cmdline) return S_OK; /* indicate success */ } -/*********************************************************************** - * DllCanUnloadNow (SHELL32.@) - */ -HRESULT WINAPI DllCanUnloadNow(void) -{ - return S_FALSE; -} - /*********************************************************************** * DllRegisterServer (SHELL32.@) */ diff --git a/dlls/sti/sti_main.c b/dlls/sti/sti_main.c index b37f4d3fee2..61118e910b6 100644 --- a/dlls/sti/sti_main.c +++ b/dlls/sti/sti_main.c @@ -159,14 +159,6 @@ HRESULT WINAPI DllGetClassObject( REFCLSID rclsid, REFIID iid, LPVOID *ppv ) return STI_DllGetClassObject( rclsid, iid, ppv ); } -/****************************************************************************** - * DllCanUnloadNow (STI.@) - */ -HRESULT WINAPI DllCanUnloadNow( void ) -{ - return S_FALSE; -} - /*********************************************************************** * DllRegisterServer (STI.@) */ diff --git a/dlls/taskschd/taskschd.c b/dlls/taskschd/taskschd.c index 42cd7711fa4..cbb58b02f14 100644 --- a/dlls/taskschd/taskschd.c +++ b/dlls/taskschd/taskschd.c @@ -153,14 +153,6 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *obj) return CLASS_E_CLASSNOTAVAILABLE; } -/*********************************************************************** - * DllCanUnloadNow - */ -HRESULT WINAPI DllCanUnloadNow(void) -{ - return S_FALSE; -} - /*********************************************************************** * DllRegisterServer */ diff --git a/dlls/uianimation/main.c b/dlls/uianimation/main.c index 412c31f5f01..5080f27aae5 100644 --- a/dlls/uianimation/main.c +++ b/dlls/uianimation/main.c @@ -1199,15 +1199,6 @@ HRESULT WINAPI DllGetClassObject( REFCLSID clsid, REFIID iid, void **obj ) return IClassFactory_QueryInterface( cf, iid, obj ); } -/****************************************************************** - * DllCanUnloadNow - */ -HRESULT WINAPI DllCanUnloadNow( void ) -{ - TRACE( "()\n" ); - return S_FALSE; -} - /*********************************************************************** * DllRegisterServer */ diff --git a/dlls/uiautomationcore/uiautomationcore.spec b/dlls/uiautomationcore/uiautomationcore.spec index 5da89c3451c..038a173a6fd 100644 --- a/dlls/uiautomationcore/uiautomationcore.spec +++ b/dlls/uiautomationcore/uiautomationcore.spec @@ -1,4 +1,4 @@ -@ stub DllCanUnloadNow +@ stdcall -private DllCanUnloadNow() @ stub DllGetClassObject @ stub DllRegisterServer @ stub DllUnregisterServer diff --git a/dlls/uiribbon/main.c b/dlls/uiribbon/main.c index a76c349ad96..eea69f88e2b 100644 --- a/dlls/uiribbon/main.c +++ b/dlls/uiribbon/main.c @@ -197,11 +197,6 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv) return S_OK; } -HRESULT WINAPI DllCanUnloadNow(void) -{ - return S_FALSE; -} - HRESULT WINAPI DllRegisterServer(void) { return __wine_register_resources( instance ); diff --git a/dlls/vbscript/vbscript_main.c b/dlls/vbscript/vbscript_main.c index 6143c5c1f1f..7135bb830f5 100644 --- a/dlls/vbscript/vbscript_main.c +++ b/dlls/vbscript/vbscript_main.c @@ -302,14 +302,6 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) return CLASS_E_CLASSNOTAVAILABLE; } -/*********************************************************************** - * DllCanUnloadNow (vbscript.@) - */ -HRESULT WINAPI DllCanUnloadNow(void) -{ - return S_FALSE; -} - /*********************************************************************** * DllRegisterServer (vbscript.@) */ diff --git a/dlls/vssapi/vssapi.spec b/dlls/vssapi/vssapi.spec index 779dab1ad5a..d3ba6407376 100644 --- a/dlls/vssapi/vssapi.spec +++ b/dlls/vssapi/vssapi.spec @@ -80,7 +80,7 @@ @ stub CreateVssExpressWriterInternal @ stub CreateWriter @ stub CreateWriterEx -@ stub DllCanUnloadNow +@ stdcall -private DllCanUnloadNow() @ stub DllGetClassObject @ stub GetProviderMgmtInterface @ stub GetProviderMgmtInterfaceInternal diff --git a/dlls/wbemdisp/main.c b/dlls/wbemdisp/main.c index 7e73d546531..5bfa8193d71 100644 --- a/dlls/wbemdisp/main.c +++ b/dlls/wbemdisp/main.c @@ -296,14 +296,6 @@ HRESULT WINAPI DllGetClassObject( REFCLSID rclsid, REFIID iid, LPVOID *obj ) return IClassFactory_QueryInterface( cf, iid, obj ); } -/*********************************************************************** - * DllCanUnloadNow (WBEMDISP.@) - */ -HRESULT WINAPI DllCanUnloadNow(void) -{ - return S_FALSE; -} - /*********************************************************************** * DllRegisterServer (WBEMDISP.@) */ diff --git a/dlls/wbemprox/main.c b/dlls/wbemprox/main.c index 0ebbd55aba9..35127d48f47 100644 --- a/dlls/wbemprox/main.c +++ b/dlls/wbemprox/main.c @@ -148,14 +148,6 @@ HRESULT WINAPI DllGetClassObject( REFCLSID rclsid, REFIID iid, LPVOID *ppv ) return IClassFactory_QueryInterface( cf, iid, ppv ); } -/*********************************************************************** - * DllCanUnloadNow (WBEMPROX.@) - */ -HRESULT WINAPI DllCanUnloadNow( void ) -{ - return S_FALSE; -} - /*********************************************************************** * DllRegisterServer (WBEMPROX.@) */ diff --git a/dlls/wimgapi/wimgapi.spec b/dlls/wimgapi/wimgapi.spec index 17380a75581..e2476755cc1 100644 --- a/dlls/wimgapi/wimgapi.spec +++ b/dlls/wimgapi/wimgapi.spec @@ -1,4 +1,4 @@ -@ stub -private DllCanUnloadNow +@ stdcall -private DllCanUnloadNow() @ stdcall -private DllMain(long long ptr) @ stub WIMApplyImage @ stub WIMCaptureImage diff --git a/dlls/windows.gaming.input/main.c b/dlls/windows.gaming.input/main.c index bf6b990a623..e8048ec440c 100644 --- a/dlls/windows.gaming.input/main.c +++ b/dlls/windows.gaming.input/main.c @@ -632,11 +632,6 @@ static struct windows_gaming_input windows_gaming_input = 1 }; -HRESULT WINAPI DllCanUnloadNow(void) -{ - return S_FALSE; -} - HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID riid, void **out) { FIXME("clsid %s, riid %s, out %p stub!\n", debugstr_guid(clsid), debugstr_guid(riid), out); diff --git a/dlls/windows.globalization/main.c b/dlls/windows.globalization/main.c index b124f79c644..519d2b8bdac 100644 --- a/dlls/windows.globalization/main.c +++ b/dlls/windows.globalization/main.c @@ -459,11 +459,6 @@ static struct windows_globalization windows_globalization = 0 }; -HRESULT WINAPI DllCanUnloadNow(void) -{ - return S_FALSE; -} - HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID riid, void **out) { FIXME("clsid %s, riid %s, out %p stub!\n", debugstr_guid(clsid), debugstr_guid(riid), out); diff --git a/dlls/windows.media.devices/main.c b/dlls/windows.media.devices/main.c index 1254ab87816..c4b5b647877 100644 --- a/dlls/windows.media.devices/main.c +++ b/dlls/windows.media.devices/main.c @@ -368,11 +368,6 @@ static struct windows_media_devices windows_media_devices = 1 }; -HRESULT WINAPI DllCanUnloadNow(void) -{ - return S_FALSE; -} - HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID riid, void **out) { FIXME("clsid %s, riid %s, out %p stub!\n", debugstr_guid(clsid), debugstr_guid(riid), out); diff --git a/dlls/windows.media.speech/main.c b/dlls/windows.media.speech/main.c index 31847a2eb6a..e34fa9d16b8 100644 --- a/dlls/windows.media.speech/main.c +++ b/dlls/windows.media.speech/main.c @@ -355,11 +355,6 @@ static struct windows_media_speech windows_media_speech = 1 }; -HRESULT WINAPI DllCanUnloadNow(void) -{ - return S_FALSE; -} - HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID riid, void **out) { FIXME("clsid %s, riid %s, out %p stub!\n", debugstr_guid(clsid), debugstr_guid(riid), out); diff --git a/dlls/windowscodecs/main.c b/dlls/windowscodecs/main.c index 4908a5f77e1..f8066f10712 100644 --- a/dlls/windowscodecs/main.c +++ b/dlls/windowscodecs/main.c @@ -51,11 +51,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) return WIC_DllMain(hinstDLL, fdwReason, lpvReserved); } -HRESULT WINAPI DllCanUnloadNow(void) -{ - return S_FALSE; -} - HRESULT get_pixelformat_bpp(const GUID *pixelformat, UINT *bpp) { HRESULT hr; diff --git a/dlls/winecrt0/Makefile.in b/dlls/winecrt0/Makefile.in index 6e0901db9f2..dcbf51099b1 100644 --- a/dlls/winecrt0/Makefile.in +++ b/dlls/winecrt0/Makefile.in @@ -5,6 +5,7 @@ C_SRCS = \ crt_fltused.c \ debug.c \ delay_load.c \ + dll_canunload.c \ dll_main.c \ exception.c \ exe16_entry.c \ diff --git a/dlls/winecrt0/dll_canunload.c b/dlls/winecrt0/dll_canunload.c new file mode 100644 index 00000000000..08a60c347e1 --- /dev/null +++ b/dlls/winecrt0/dll_canunload.c @@ -0,0 +1,30 @@ +/* + * DllCanUnloadNow default implementation + * + * Copyright 2021 Alexandre Julliard + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include +#define COBJMACROS +#include "windef.h" +#include "winbase.h" +#include "objbase.h" + +HRESULT WINAPI DllCanUnloadNow(void) +{ + return S_FALSE; +} diff --git a/dlls/wineqtdecoder/main.c b/dlls/wineqtdecoder/main.c index 82563989192..6d2f17dd4b1 100644 --- a/dlls/wineqtdecoder/main.c +++ b/dlls/wineqtdecoder/main.c @@ -255,9 +255,3 @@ HRESULT WINAPI DllUnregisterServer(void) IFilterMapper2_Release(mapper); return S_OK; } - -HRESULT WINAPI DllCanUnloadNow(void) -{ - TRACE(".\n"); - return S_FALSE; -} diff --git a/dlls/winhttp/main.c b/dlls/winhttp/main.c index 3b570fee6d5..a04772e80fb 100644 --- a/dlls/winhttp/main.c +++ b/dlls/winhttp/main.c @@ -156,14 +156,6 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) return IClassFactory_QueryInterface( cf, riid, ppv ); } -/****************************************************************** - * DllCanUnloadNow (winhttp.@) - */ -HRESULT WINAPI DllCanUnloadNow(void) -{ - return S_FALSE; -} - /*********************************************************************** * DllRegisterServer (winhttp.@) */ diff --git a/dlls/wmiutils/main.c b/dlls/wmiutils/main.c index c12b63256f8..c2409f99ba7 100644 --- a/dlls/wmiutils/main.c +++ b/dlls/wmiutils/main.c @@ -143,14 +143,6 @@ HRESULT WINAPI DllGetClassObject( REFCLSID rclsid, REFIID iid, LPVOID *ppv ) return IClassFactory_QueryInterface( cf, iid, ppv ); } -/*********************************************************************** - * DllCanUnloadNow (WMIUTILS.@) - */ -HRESULT WINAPI DllCanUnloadNow( void ) -{ - return S_FALSE; -} - /*********************************************************************** * DllRegisterServer (WMIUTILS.@) */ diff --git a/dlls/wmp/wmp_main.c b/dlls/wmp/wmp_main.c index 37ae9a1ac13..18122f54f4b 100644 --- a/dlls/wmp/wmp_main.c +++ b/dlls/wmp/wmp_main.c @@ -177,15 +177,6 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) return CLASS_E_CLASSNOTAVAILABLE; } -/*********************************************************************** - * DllCanUnloadNow (wmp.@) - */ -HRESULT WINAPI DllCanUnloadNow(void) -{ - TRACE("\n"); - return S_FALSE; -} - /*********************************************************************** * DllRegisterServer (wmp.@) */ diff --git a/dlls/wmphoto/main.c b/dlls/wmphoto/main.c index 5c92965b575..2c4a669dc97 100644 --- a/dlls/wmphoto/main.c +++ b/dlls/wmphoto/main.c @@ -140,11 +140,6 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) return TRUE; } -HRESULT WINAPI DllCanUnloadNow(void) -{ - return S_FALSE; -} - HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID iid, LPVOID *out) { struct class_factory *factory; diff --git a/dlls/wpc/wpc.c b/dlls/wpc/wpc.c index 3dcca050bcd..1edb3e60414 100644 --- a/dlls/wpc/wpc.c +++ b/dlls/wpc/wpc.c @@ -189,15 +189,6 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv) return CLASS_E_CLASSNOTAVAILABLE; } -/*********************************************************************** - * DllCanUnloadNow (wpc.@) - */ -HRESULT WINAPI DllCanUnloadNow(void) -{ - TRACE("\n"); - return S_FALSE; -} - /*********************************************************************** * DllRegisterServer (wpc.@) */ diff --git a/dlls/wshom.ocx/wshom_main.c b/dlls/wshom.ocx/wshom_main.c index 2a7e909bcce..b0056ad953e 100644 --- a/dlls/wshom.ocx/wshom_main.c +++ b/dlls/wshom.ocx/wshom_main.c @@ -249,14 +249,6 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) return CLASS_E_CLASSNOTAVAILABLE; } -/*********************************************************************** - * DllCanUnloadNow (wshom.ocx.@) - */ -HRESULT WINAPI DllCanUnloadNow(void) -{ - return S_FALSE; -} - /*********************************************************************** * DllRegisterServer (wshom.ocx.@) */ diff --git a/dlls/wuapi/main.c b/dlls/wuapi/main.c index 79530079afc..1fcc45a00d2 100644 --- a/dlls/wuapi/main.c +++ b/dlls/wuapi/main.c @@ -153,11 +153,6 @@ HRESULT WINAPI DllGetClassObject( REFCLSID rclsid, REFIID iid, LPVOID *ppv ) return IClassFactory_QueryInterface( cf, iid, ppv ); } -HRESULT WINAPI DllCanUnloadNow( void ) -{ - return S_FALSE; -} - /*********************************************************************** * DllRegisterServer (WUAPI.@) */ diff --git a/dlls/xactengine3_7/xact_dll.c b/dlls/xactengine3_7/xact_dll.c index 8a3642b89b2..04ed3b9bc85 100644 --- a/dlls/xactengine3_7/xact_dll.c +++ b/dlls/xactengine3_7/xact_dll.c @@ -1477,11 +1477,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD reason, void *pReserved) return TRUE; } -HRESULT WINAPI DllCanUnloadNow(void) -{ - return S_FALSE; -} - HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv) { if (IsEqualGUID(rclsid, &CLSID_XACTEngine)) diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index e8b81b125a0..f9a4030ea27 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -98,11 +98,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD reason, void *pReserved) return TRUE; } -HRESULT WINAPI DllCanUnloadNow(void) -{ - return S_FALSE; -} - HRESULT WINAPI DllRegisterServer(void) { TRACE("\n");