winecrt0: Add a default implementation for DllCanUnloadNow().

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

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);

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

dlls/amstream/main.c

@@ -200,14 +200,6 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv)
 }
 
 /***********************************************************************
- *              DllCanUnloadNow (AMSTREAM.@)
- */
-HRESULT WINAPI DllCanUnloadNow(void)
-{
-    return S_FALSE;
-}
-
-/***********************************************************************
  *		DllRegisterServer (AMSTREAM.@)
  */
 HRESULT WINAPI DllRegisterServer(void)

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;
-}

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;
 }
 
@@ -197,14 +192,6 @@ HRESULT WINAPI DllGetClassObject(REFCLSID pclsid, REFIID piid, LPVOID *ppv)
 }
 
 /*****************************************************************************
- *		DllCanUnloadNow		(AVIFIL32.@)
- */
-HRESULT WINAPI DllCanUnloadNow(void)
-{
-  return ((AVIFILE_bLocked || AVIFILE_uUseCount) ? S_FALSE : S_OK);
-}
-
-/*****************************************************************************
  *		DllMain		[AVIFIL32.init]
  */
 BOOL WINAPI DllMain(HINSTANCE hInstDll, DWORD fdwReason, LPVOID lpvReserved)

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

dlls/bthprops.cpl/bthprops.cpl.spec

@@ -61,5 +61,5 @@
 @ stub BthpFindPnpInfo
 @ stub BthpMapStatusToErr
 #@ stub CPlApplet
-@ stub DllCanUnloadNow
+@ stdcall -private DllCanUnloadNow()
 @ stub DllGetClassObject

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 );

dlls/comcat/comcat_main.c

@@ -24,14 +24,6 @@
 #include "winbase.h"
 
 /***********************************************************************
- *		DllCanUnloadNow (COMCAT.@)
- */
-HRESULT WINAPI DllCanUnloadNow(void)
-{
-    return S_FALSE;
-}
-
-/***********************************************************************
  *		DllRegisterServer (COMCAT.@)
  */
 HRESULT WINAPI DllRegisterServer(void)

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.@)
  */

dlls/connect/connect.spec

 @ stub AddConnectionOptionListEntries
 @ stub CreateVPNConnection
-@ stub DllCanUnloadNow
+@ stdcall -private DllCanUnloadNow()
 @ stub DllGetClassObject
 @ stub GetInternetConnected
 @ stub GetNetworkConnected

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

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

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);

dlls/d3dxof/main.c

@@ -220,14 +220,6 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv)
 }
 
 /***********************************************************************
- *              DllCanUnloadNow (D3DXOF.@)
- */
-HRESULT WINAPI DllCanUnloadNow(void)
-{
-    return S_FALSE;
-}
-
-/***********************************************************************
  *		DllRegisterServer (D3DXOF.@)
  */
 HRESULT WINAPI DllRegisterServer(void)

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

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

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 );

dlls/ddrawex/main.c

@@ -207,15 +207,6 @@ static HRESULT ddrawex_factory_create(IUnknown *outer_unknown, REFIID riid, void
 }
 
 /*******************************************************************************
- * DllCanUnloadNow [DDRAWEX.@]  Determines whether the DLL is in use.
- */
-HRESULT WINAPI DllCanUnloadNow(void)
-{
-    return S_FALSE;
-}
-
-
-/*******************************************************************************
  * DllGetClassObject [DDRAWEX.@]
  */
 HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **out)

dlls/dhtmled.ocx/main.c

@@ -137,15 +137,6 @@ HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID iid, LPVOID *out)
 }
 
 /***********************************************************************
- *          DllCanUnloadNow (dhtmled.ocx.@)
- */
-HRESULT WINAPI DllCanUnloadNow(void)
-{
-    TRACE("()\n");
-    return S_FALSE;
-}
-
-/***********************************************************************
  *          DllRegisterServer (dhtmled.ocx.@)
  */
 HRESULT WINAPI DllRegisterServer(void)

dlls/dinput/dinput_main.c

@@ -1665,14 +1665,6 @@ static const IClassFactoryVtbl DICF_Vtbl = {
 static IClassFactoryImpl DINPUT_CF = {{&DICF_Vtbl}, 1 };
 
 /***********************************************************************
- *		DllCanUnloadNow (DINPUT.@)
- */
-HRESULT WINAPI DllCanUnloadNow(void)
-{
-    return S_FALSE;
-}
-
-/***********************************************************************
  *		DllGetClassObject (DINPUT.@)
  */
 HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv)

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
 {

dlls/dpnet/dpnet_main.c

@@ -158,14 +158,6 @@ static IClassFactoryImpl DPNET_CFS[] = {
 };
 
 /***********************************************************************
- *             DllCanUnloadNow (DPNET.@)
- */
-HRESULT WINAPI DllCanUnloadNow(void)
-{
-    return S_FALSE;
-}
-
-/***********************************************************************
  *		DllGetClassObject (DPNET.@)
  */
 HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv)

dlls/dpnhpast/main.c

@@ -51,17 +51,6 @@ HRESULT WINAPI DllRegisterServer(void)
 
 
 /******************************************************************
- *		DllCanUnloadNow (DPNHPAST.@)
- *
- *
- */
-HRESULT WINAPI DllCanUnloadNow(void)
-{
-    return S_FALSE;
-}
-
-
-/******************************************************************
  *		DllGetClassObject (DPNHPAST.@)
  *
  *

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 );

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");

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;     \

dlls/dsquery/main.c

@@ -215,14 +215,6 @@ BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, void *reserved)
 }
 
 /***********************************************************************
- *		DllCanUnloadNow (DSQUERY.@)
- */
-HRESULT WINAPI DllCanUnloadNow(void)
-{
-    return S_FALSE;
-}
-
-/***********************************************************************
  *		DllGetClassObject (DSQUERY.@)
  */
 HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **out)

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;
-}

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);

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);

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);

dlls/hlink/hlink_main.c

@@ -58,14 +58,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
 }
 
 /***********************************************************************
- *             DllCanUnloadNow (HLINK.@)
- */
-HRESULT WINAPI DllCanUnloadNow( void )
-{
-    return S_FALSE;
-}
-
-/***********************************************************************
  *             HlinkCreateFromMoniker (HLINK.@)
  */
 HRESULT WINAPI HlinkCreateFromMoniker( IMoniker *pimkTrgt, LPCWSTR pwzLocation,

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.@)
  */

dlls/inetcomm/inetcomm_main.c

@@ -210,14 +210,6 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv)
 }
 
 /***********************************************************************
- *              DllCanUnloadNow (INETCOMM.@)
- */
-HRESULT WINAPI DllCanUnloadNow(void)
-{
-    return S_FALSE;
-}
-
-/***********************************************************************
  *		DllRegisterServer (INETCOMM.@)
  */
 HRESULT WINAPI DllRegisterServer(void)

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.@)
  */

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.@]
  */

dlls/inseng/inseng_main.c

@@ -385,14 +385,6 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv)
 }
 
 /***********************************************************************
- *              DllCanUnloadNow (INSENG.@)
- */
-HRESULT WINAPI DllCanUnloadNow(void)
-{
-    return S_FALSE;
-}
-
-/***********************************************************************
  *		DllRegisterServer (INSENG.@)
  */
 HRESULT WINAPI DllRegisterServer(void)

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;
-}

dlls/ksproxy.ax/ksproxy.ax.spec

-@ stub DllCanUnloadNow
+@ stdcall -private DllCanUnloadNow()
 @ stub DllGetClassObject
 @ stub DllRegisterServer
 @ stub DllUnregisterServer

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

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.@)
  */

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;
-}

dlls/mfplay/mfplay.spec

-@ stub DllCanUnloadNow
+@ stdcall -private DllCanUnloadNow()
 @ stub DllGetClassObject
 @ stub DllRegisterServer
 @ stub DllUnregisterServer

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 );

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);

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 {

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.@)
  */

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
  */

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)

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");

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.@)
  */

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

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.@)
  *

dlls/msident/msident.c

@@ -307,14 +307,6 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv)
 }
 
 /***********************************************************************
- *          DllCanUnloadNow (msident.@)
- */
-HRESULT WINAPI DllCanUnloadNow(void)
-{
-    return S_FALSE;
-}
-
-/***********************************************************************
  *          DllRegisterServer (msident.@)
  */
 HRESULT WINAPI DllRegisterServer(void)

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.@)
  */

dlls/msisys.ocx/msisys.c

@@ -33,18 +33,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(msisys);
 
 
 /***********************************************************************
- *		DllCanUnloadNow (MSISYS.@)
- *
- * RETURNS
- *    Success: S_OK
- *    Failure: S_FALSE
- */
-HRESULT WINAPI DllCanUnloadNow(void)
-{
-	return S_FALSE;
-}
-
-/***********************************************************************
  *		DllGetClassObject (MSISYS.@)
  */
 HRESULT WINAPI DllGetClassObject(REFCLSID pclsid, REFIID piid, LPVOID *ppv)

dlls/msscript.ocx/msscript.c

@@ -4090,15 +4090,6 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv)
 }
 
 /***********************************************************************
- *          DllCanUnloadNow (msscript.ocx.@)
- */
-HRESULT WINAPI DllCanUnloadNow(void)
-{
-    TRACE("\n");
-    return S_FALSE;
-}
-
-/***********************************************************************
  *          DllRegisterServer (msscript.ocx.@)
  */
 HRESULT WINAPI DllRegisterServer(void)

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

dlls/msxml/main.c

@@ -39,14 +39,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstance, DWORD reason, LPVOID reserved)
 }
 
 /***********************************************************************
- *		DllCanUnloadNow (MSXML.@)
- */
-HRESULT WINAPI DllCanUnloadNow(void)
-{
-    return S_FALSE;
-}
-
-/***********************************************************************
  *		DllRegisterServer (MSXML.@)
  */
 HRESULT WINAPI DllRegisterServer(void)

dlls/msxml2/main.c

@@ -39,14 +39,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstance, DWORD reason, LPVOID reserved)
 }
 
 /***********************************************************************
- *		DllCanUnloadNow (MSXML2.@)
- */
-HRESULT WINAPI DllCanUnloadNow(void)
-{
-    return S_FALSE;
-}
-
-/***********************************************************************
  *		DllRegisterServer (MSXML2.@)
  */
 HRESULT WINAPI DllRegisterServer(void)

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;

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)

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)

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;
-}

dlls/netprofm/main.c

@@ -132,14 +132,6 @@ HRESULT WINAPI DllGetClassObject( REFCLSID rclsid, REFIID iid, LPVOID *ppv )
 }
 
 /***********************************************************************
- *      DllCanUnloadNow (NETPROFM.@)
- */
-HRESULT WINAPI DllCanUnloadNow( void )
-{
-    return S_FALSE;
-}
-
-/***********************************************************************
  *      DllRegisterServer (NETPROFM.@)
  */
 HRESULT WINAPI DllRegisterServer( void )

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.@]
  */

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
  */

dlls/olepro32/olepro32stubs.c

@@ -49,14 +49,6 @@ HRESULT WINAPI DllRegisterServer(void)
 }
 
 /***********************************************************************
- *		DllCanUnloadNow (OLEPRO32.255)
- */
-HRESULT WINAPI DllCanUnloadNow(void)
-{
-	return S_FALSE;
-}
-
-/***********************************************************************
  *		DllGetClassObject (OLEPRO32.@)
  */
 HRESULT WINAPI DllGetClassObject( REFCLSID rclsid, REFIID riid, LPVOID* ppv )

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)

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);

dlls/photometadatahandler/photometadatahandler.spec

-@ stub DllCanUnloadNow
+@ stdcall -private DllCanUnloadNow()
 @ stub DllGetClassObject
 @ stub DllRegisterServer
 @ stub DllUnregisterServer

dlls/printui/printui.spec

 @ stub ConnectToPrinterDlg
 @ stub ConnectToPrinterPropertyPage
 @ stub ConstructPrinterFriendlyName
-@ stub DllCanUnloadNow
+@ stdcall -private DllCanUnloadNow()
 @ stub DllGetClassObject
 @ stub DocumentPropertiesWrap
 @ stub PnPInterface

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

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;

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;
-}

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);

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;
-}

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

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");

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
  */

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;
-}

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;
-}

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)

dlls/shell32/shell32_main.c

@@ -1170,14 +1170,6 @@ HRESULT WINAPI DllInstall(BOOL bInstall, LPCWSTR cmdline)
 }
 
 /***********************************************************************
- *              DllCanUnloadNow (SHELL32.@)
- */
-HRESULT WINAPI DllCanUnloadNow(void)
-{
-    return S_FALSE;
-}
-
-/***********************************************************************
  *		DllRegisterServer (SHELL32.@)
  */
 HRESULT WINAPI DllRegisterServer(void)

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.@)
  */

dlls/taskschd/taskschd.c

@@ -154,14 +154,6 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *obj)
 }
 
 /***********************************************************************
- *      DllCanUnloadNow
- */
-HRESULT WINAPI DllCanUnloadNow(void)
-{
-    return S_FALSE;
-}
-
-/***********************************************************************
  *      DllRegisterServer
  */
 HRESULT WINAPI DllRegisterServer(void)

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
  */

dlls/uiautomationcore/uiautomationcore.spec

-@ stub DllCanUnloadNow
+@ stdcall -private DllCanUnloadNow()
 @ stub DllGetClassObject
 @ stub DllRegisterServer
 @ stub DllUnregisterServer

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 );

dlls/vbscript/vbscript_main.c

@@ -303,14 +303,6 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv)
 }
 
 /***********************************************************************
- *          DllCanUnloadNow (vbscript.@)
- */
-HRESULT WINAPI DllCanUnloadNow(void)
-{
-    return S_FALSE;
-}
-
-/***********************************************************************
  *          DllRegisterServer (vbscript.@)
  */
 HRESULT WINAPI DllRegisterServer(void)

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

dlls/wbemdisp/main.c

@@ -297,14 +297,6 @@ HRESULT WINAPI DllGetClassObject( REFCLSID rclsid, REFIID iid, LPVOID *obj )
 }
 
 /***********************************************************************
- *      DllCanUnloadNow (WBEMDISP.@)
- */
-HRESULT WINAPI DllCanUnloadNow(void)
-{
-    return S_FALSE;
-}
-
-/***********************************************************************
  *      DllRegisterServer (WBEMDISP.@)
  */
 HRESULT WINAPI DllRegisterServer(void)

dlls/wbemprox/main.c

@@ -149,14 +149,6 @@ HRESULT WINAPI DllGetClassObject( REFCLSID rclsid, REFIID iid, LPVOID *ppv )
 }
 
 /***********************************************************************
- *              DllCanUnloadNow (WBEMPROX.@)
- */
-HRESULT WINAPI DllCanUnloadNow( void )
-{
-    return S_FALSE;
-}
-
-/***********************************************************************
  *		DllRegisterServer (WBEMPROX.@)
  */
 HRESULT WINAPI DllRegisterServer(void)

dlls/wimgapi/wimgapi.spec

-@ stub -private DllCanUnloadNow
+@ stdcall -private DllCanUnloadNow()
 @ stdcall -private DllMain(long long ptr)
 @ stub WIMApplyImage
 @ stub WIMCaptureImage

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);

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);

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);

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);