[PATCH 6/6] coml2: Move WriteClassStg from ole32

[Fabian Maurer]

From: Fabian Maurer

---
 dlls/coml2/coml2.spec  |  1 +
 dlls/coml2/storage32.c | 16 ++++++++++++++++
 dlls/ole32/ole32.spec  |  2 +-
 dlls/ole32/storage32.c | 16 ----------------
 4 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/dlls/coml2/coml2.spec b/dlls/coml2/coml2.spec
index 4ffa41e2d08..71c099244c4 100644
--- a/dlls/coml2/coml2.spec
+++ b/dlls/coml2/coml2.spec
@@ -3,4 +3,5 @@
 @ stdcall GetHGlobalFromILockBytes(ptr ptr)
 @ stdcall ReadClassStg(ptr ptr)
 @ stdcall ReadClassStm(ptr ptr)
+@ stdcall WriteClassStg(ptr ptr)
 @ stdcall WriteClassStm(ptr ptr)
diff --git a/dlls/coml2/storage32.c b/dlls/coml2/storage32.c
index 63d82e2dcb8..25b617f88c1 100644
--- a/dlls/coml2/storage32.c
+++ b/dlls/coml2/storage32.c
@@ -51,6 +51,22 @@

WINE_DEFAULT_DEBUG_CHANNEL(storage);

+/******************************************************************************
+ *              WriteClassStg        [OLE32.@]
+ *
+ * This method will store the specified CLSID in the specified storage object
+ */
+HRESULT WINAPI WriteClassStg(IStorage *pStg, REFCLSID rclsid)
+{
+    if (!pStg)
+        return E_INVALIDARG;
+
+    if (!rclsid)
+        return STG_E_INVALIDPOINTER;
+
+    return IStorage_SetClass(pStg, rclsid);
+}
+
 /***********************************************************************
  *    ReadClassStg (OLE32.@)
  *
diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec
index 87244d9f696..8603fb0f09f 100644
--- a/dlls/ole32/ole32.spec
+++ b/dlls/ole32/ole32.spec
@@ -294,7 +294,7 @@
 @ stdcall WdtpInterfacePointer_UserMarshal(ptr long ptr ptr ptr) combase.WdtpInterfacePointer_UserMarshal
 @ 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 WriteClassStg(ptr ptr) coml2.WriteClassStg
 @ stdcall WriteClassStm(ptr ptr) coml2.WriteClassStm
 @ stdcall WriteFmtUserTypeStg(ptr long ptr)
 @ stub WriteOleStg
diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c
index 5d1299a5797..3335186ff90 100644
--- a/dlls/ole32/storage32.c
+++ b/dlls/ole32/storage32.c
@@ -9026,22 +9026,6 @@ HRESULT WINAPI StgIsStorageILockBytes(ILockBytes *plkbyt)
   return S_FALSE;
 }

-/******************************************************************************
- *              WriteClassStg        [OLE32.@]
- *
- * This method will store the specified CLSID in the specified storage object
- */
-HRESULT WINAPI WriteClassStg(IStorage* pStg, REFCLSID rclsid)
-{
-  if(!pStg)
-    return E_INVALIDARG;
-
-  if(!rclsid)
-    return STG_E_INVALIDPOINTER;
-
-  return IStorage_SetClass(pStg, rclsid);
-}
-
 /***********************************************************************
  *    OleLoadFromStream (OLE32.@)
  *