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>

combase: Move CoFreeUnusedLibraries().
5ce66030 · Nikolay Sivov · Alexandre Julliard · 81694b62 · 5ce66030 · 5ce66030
Commit 5ce66030 authored Aug 13, 2020 by Nikolay Sivov Committed by Alexandre Julliard Aug 13, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 19 deletions

combase.c dlls/combase/combase.c +8 -0

combase.spec dlls/combase/combase.spec +1 -1

compobj.c dlls/ole32/compobj.c +0 -17

ole32.spec dlls/ole32/ole32.spec +1 -1

No files found.
--- 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);
+}
--- 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

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

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