Nikolay Sivov : combase: Move CoFileTimeNow().

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 444be8b98e95cef459158d07cfee218b3f843f01
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=444be8b98e95cef459158d07cfee218b3f843f01

Author: Nikolay Sivov <nsivov at codeweavers.com>
Date:   Wed Aug  5 08:55:01 2020 +0300

combase: Move CoFileTimeNow().

Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
Signed-off-by: Huw Davies <huw at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/combase/combase.c    |  9 +++++++++
 dlls/combase/combase.spec |  1 +
 dlls/ole32/compobj.c      | 17 -----------------
 dlls/ole32/ole32.spec     |  2 +-
 4 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/dlls/combase/combase.c b/dlls/combase/combase.c
index 74a7643709..bf1228a1f2 100644
--- a/dlls/combase/combase.c
+++ b/dlls/combase/combase.c
@@ -431,3 +431,12 @@ HRESULT WINAPI PropVariantCopy(PROPVARIANT *pvarDest, const PROPVARIANT *pvarSrc
 
     return S_OK;
 }
+
+/***********************************************************************
+ *           CoFileTimeNow        (combase.@)
+ */
+HRESULT WINAPI CoFileTimeNow(FILETIME *filetime)
+{
+    GetSystemTimeAsFileTime(filetime);
+    return S_OK;
+}
diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec
index 70f7b17244..9940229c46 100644
--- a/dlls/combase/combase.spec
+++ b/dlls/combase/combase.spec
@@ -90,6 +90,7 @@
 @ stub CoDisconnectContext
 @ stdcall CoDisconnectObject(ptr long) ole32.CoDisconnectObject
 @ stdcall CoEnableCallCancellation(ptr) ole32.CoEnableCallCancellation
+@ stdcall CoFileTimeNow(ptr)
 @ stdcall CoFreeUnusedLibraries() ole32.CoFreeUnusedLibraries
 @ stdcall CoFreeUnusedLibrariesEx(long long) ole32.CoFreeUnusedLibrariesEx
 @ stdcall CoGetActivationState(int128 long ptr) ole32.CoGetActivationState
diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c
index 6d9904a165..29c8ca6e13 100644
--- a/dlls/ole32/compobj.c
+++ b/dlls/ole32/compobj.c
@@ -3701,23 +3701,6 @@ void WINAPI DECLSPEC_HOTPATCH CoFreeUnusedLibraries(void)
     CoFreeUnusedLibrariesEx(INFINITE, 0);
 }
 
-/***********************************************************************
- *           CoFileTimeNow [OLE32.@]
- *
- * Retrieves the current time in FILETIME format.
- *
- * PARAMS
- *  lpFileTime [O] The current time.
- *
- * RETURNS
- *	S_OK.
- */
-HRESULT WINAPI CoFileTimeNow( FILETIME *lpFileTime )
-{
-    GetSystemTimeAsFileTime( lpFileTime );
-    return S_OK;
-}
-
 /******************************************************************************
  *		CoLockObjectExternal	[OLE32.@]
  *
diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec
index 6699d797b0..87c950cf43 100644
--- a/dlls/ole32/ole32.spec
+++ b/dlls/ole32/ole32.spec
@@ -19,7 +19,7 @@
 @ stdcall CoDisconnectObject(ptr long)
 @ stdcall CoDosDateTimeToFileTime(long long ptr) kernel32.DosDateTimeToFileTime
 @ stdcall CoEnableCallCancellation(ptr)
-@ stdcall CoFileTimeNow(ptr)
+@ stdcall CoFileTimeNow(ptr) combase.CoFileTimeNow
 @ stdcall CoFileTimeToDosDateTime(ptr ptr ptr) kernel32.FileTimeToDosDateTime
 @ stdcall CoFreeAllLibraries()
 @ stdcall CoFreeLibrary(long)