[PATCH v6 5/6] coml2: Move WriteClassStm from ole32

[Fabian Maurer]

From: Fabian Maurer

---
 dlls/coml2/coml2.spec  |  2 +-
 dlls/coml2/storage32.c | 13 +++++++++++++
 dlls/ole32/ole32.spec  |  2 +-
 dlls/ole32/storage32.c | 23 -----------------------
 4 files changed, 15 insertions(+), 25 deletions(-)

diff --git a/dlls/coml2/coml2.spec b/dlls/coml2/coml2.spec
index a41482bc46e..79aaba8346c 100644
--- a/dlls/coml2/coml2.spec
+++ b/dlls/coml2/coml2.spec
@@ -30,4 +30,4 @@
 @ stub StgOpenStorageOnILockBytes
 @ stub StgSetTimes
 @ stub WriteClassStg
-@ stub WriteClassStm
+@ stdcall WriteClassStm(ptr ptr)
diff --git a/dlls/coml2/storage32.c b/dlls/coml2/storage32.c
index 06a58749c5d..40fc7ff9a2e 100644
--- a/dlls/coml2/storage32.c
+++ b/dlls/coml2/storage32.c
@@ -74,6 +74,19 @@ HRESULT WINAPI ReadClassStg(IStorage *pstg, CLSID *pclsid)
     return hRes;
 }

+/***********************************************************************
+ *              WriteClassStm (coml2.@)
+ */
+HRESULT WINAPI WriteClassStm(IStream *pStm, REFCLSID rclsid)
+{
+    TRACE("(%p,%p)\n", pStm, rclsid);
+
+    if (!pStm || !rclsid)
+        return E_INVALIDARG;
+
+    return IStream_Write(pStm, rclsid, sizeof(CLSID), NULL);
+}
+
 /***********************************************************************
  *              ReadClassStm (coml2.@)
  */
diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec
index 65b867ad441..a9463b65cae 100644
--- a/dlls/ole32/ole32.spec
+++ b/dlls/ole32/ole32.spec
@@ -295,7 +295,7 @@
 @ stdcall WdtpInterfacePointer_UserSize(ptr long long ptr ptr) combase.WdtpInterfacePointer_UserSize
 @ stdcall WdtpInterfacePointer_UserUnmarshal(ptr ptr ptr ptr) combase.WdtpInterfacePointer_UserUnmarshal
 @ stdcall WriteClassStg(ptr ptr)
-@ stdcall WriteClassStm(ptr ptr)
+@ stdcall WriteClassStm(ptr ptr) coml2.WriteClassStm
 @ stdcall WriteFmtUserTypeStg(ptr long ptr)
 @ stub WriteOleStg
 @ stub WriteStringStream
diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c
index 33586de5e68..5d1299a5797 100644
--- a/dlls/ole32/storage32.c
+++ b/dlls/ole32/storage32.c
@@ -9426,29 +9426,6 @@ StgIsStorageFile(LPCOLESTR fn)
    return S_FALSE;
 }

-/***********************************************************************
- *		WriteClassStm (OLE32.@)
- *
- * Writes a CLSID to a stream.
- *
- * PARAMS
- *  pStm   [I] Stream to write to.
- *  rclsid [I] CLSID to write.
- *
- * RETURNS
- *  Success: S_OK.
- *  Failure: HRESULT code.
- */
-HRESULT WINAPI WriteClassStm(IStream *pStm,REFCLSID rclsid)
-{
-    TRACE("(%p,%p)\n",pStm,rclsid);
-
-    if (!pStm || !rclsid)
-        return E_INVALIDARG;
-
-    return IStream_Write(pStm,rclsid,sizeof(CLSID),NULL);
-}
-
 /************************************************************************
  * OleConvert Functions
  ***********************************************************************/