From 5ce66030babbc8331dec91f4e9067c71b7d06825 Mon Sep 17 00:00:00 2001
From: Nikolay Sivov <nsivov@codeweavers.com>
Date: Thu, 13 Aug 2020 08:29:34 +0100
Subject: [PATCH] combase: Move CoFreeUnusedLibraries().

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
---
 dlls/combase/combase.c    |  8 ++++++++
 dlls/combase/combase.spec |  2 +-
 dlls/ole32/compobj.c      | 17 -----------------
 dlls/ole32/ole32.spec     |  2 +-
 4 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/dlls/combase/combase.c b/dlls/combase/combase.c
index 4e15bd970e8..5752d90d5cc 100644
--- a/dlls/combase/combase.c
+++ b/dlls/combase/combase.c
@@ -1350,3 +1350,11 @@ HRESULT WINAPI DECLSPEC_HOTPATCH CoCreateInstanceEx(REFCLSID rclsid, IUnknown *o
 
     return return_multi_qi(unk, count, results, TRUE);
 }
+
+/***********************************************************************
+ *           CoFreeUnusedLibraries    (combase.@)
+ */
+void WINAPI DECLSPEC_HOTPATCH CoFreeUnusedLibraries(void)
+{
+    CoFreeUnusedLibrariesEx(INFINITE, 0);
+}
diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec
index 0daf321d69b..3214f54550c 100644
--- a/dlls/combase/combase.spec
+++ b/dlls/combase/combase.spec
@@ -92,7 +92,7 @@
 @ stdcall CoDisconnectObject(ptr long) ole32.CoDisconnectObject
 @ stdcall CoEnableCallCancellation(ptr) ole32.CoEnableCallCancellation
 @ stdcall CoFileTimeNow(ptr)
-@ stdcall CoFreeUnusedLibraries() ole32.CoFreeUnusedLibraries
+@ stdcall CoFreeUnusedLibraries()
 @ stdcall CoFreeUnusedLibrariesEx(long long) ole32.CoFreeUnusedLibrariesEx
 @ stdcall CoGetActivationState(int128 long ptr)
 @ stub CoGetApartmentID
diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c
index dd51542af53..f983b07f20b 100644
--- a/dlls/ole32/compobj.c
+++ b/dlls/ole32/compobj.c
@@ -3006,23 +3006,6 @@ void WINAPI DECLSPEC_HOTPATCH CoFreeUnusedLibrariesEx(DWORD dwUnloadDelay, DWORD
     apartment_freeunusedlibraries(apt, dwUnloadDelay);
 }
 
-/***********************************************************************
- *           CoFreeUnusedLibraries [OLE32.@]
- *
- * Frees any unused libraries. Unused are identified as those that return
- * S_OK from their DllCanUnloadNow function.
- *
- * RETURNS
- *  Nothing.
- *
- * SEE ALSO
- *  CoLoadLibrary, CoFreeAllLibraries, CoFreeLibrary
- */
-void WINAPI DECLSPEC_HOTPATCH CoFreeUnusedLibraries(void)
-{
-    CoFreeUnusedLibrariesEx(INFINITE, 0);
-}
-
 /******************************************************************************
  *		CoLockObjectExternal	[OLE32.@]
  *
diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec
index 57db6e38b76..a19264127f9 100644
--- a/dlls/ole32/ole32.spec
+++ b/dlls/ole32/ole32.spec
@@ -23,7 +23,7 @@
 @ stdcall CoFileTimeToDosDateTime(ptr ptr ptr) kernel32.FileTimeToDosDateTime
 @ stdcall CoFreeAllLibraries()
 @ stdcall CoFreeLibrary(long)
-@ stdcall CoFreeUnusedLibraries()
+@ stdcall CoFreeUnusedLibraries() combase.CoFreeUnusedLibraries
 @ stdcall CoFreeUnusedLibrariesEx(long long)
 @ stdcall CoGetActivationState(int128 long ptr) combase.CoGetActivationState
 @ stdcall CoGetApartmentType(ptr ptr)
-- 
2.11.4.GIT