[PATCH v3 4/6] coml2: Move ReadClassStg from ole32

[Fabian Maurer]

From: Fabian Maurer

---
 dlls/coml2/coml2.spec  |  1 +
 dlls/coml2/storage32.c | 24 ++++++++++++++++++++++++
 dlls/ole32/ole32.spec  |  2 +-
 dlls/ole32/storage32.c | 35 -----------------------------------
 4 files changed, 26 insertions(+), 36 deletions(-)

diff --git a/dlls/coml2/coml2.spec b/dlls/coml2/coml2.spec
index 6573dfffcfb..cd3bce931b3 100644
--- a/dlls/coml2/coml2.spec
+++ b/dlls/coml2/coml2.spec
@@ -1,4 +1,5 @@
 @ stdcall CreateILockBytesOnHGlobal(ptr long ptr)
 @ stdcall GetConvertStg(ptr)
 @ stdcall GetHGlobalFromILockBytes(ptr ptr)
+@ stdcall ReadClassStg(ptr ptr)
 @ stdcall ReadClassStm(ptr ptr)
diff --git a/dlls/coml2/storage32.c b/dlls/coml2/storage32.c
index 051555566ef..06a58749c5d 100644
--- a/dlls/coml2/storage32.c
+++ b/dlls/coml2/storage32.c
@@ -50,6 +50,30 @@

WINE_DEFAULT_DEBUG_CHANNEL(storage);

+/***********************************************************************
+ *    ReadClassStg (coml2.@)
+ */
+HRESULT WINAPI ReadClassStg(IStorage *pstg, CLSID *pclsid)
+{
+    STATSTG pstatstg;
+    HRESULT hRes;
+
+    TRACE("(%p, %p)\n", pstg, pclsid);
+
+    if (!pstg || !pclsid)
+        return E_INVALIDARG;
+
+   /*
+    * read a STATSTG structure (contains the clsid) from the storage
+    */
+    hRes = IStorage_Stat(pstg, &pstatstg, STATFLAG_NONAME);
+
+    if (SUCCEEDED(hRes))
+        *pclsid = pstatstg.clsid;
+
+    return hRes;
+}
+
 /***********************************************************************
  *              ReadClassStm (coml2.@)
  */
diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec
index 6b8dd4abec9..e9b5a927491 100644
--- a/dlls/ole32/ole32.spec
+++ b/dlls/ole32/ole32.spec
@@ -246,7 +246,7 @@
 @ stdcall PropSysFreeString(wstr)
 @ stdcall PropVariantClear(ptr) combase.PropVariantClear
 @ stdcall PropVariantCopy(ptr ptr) combase.PropVariantCopy
-@ stdcall ReadClassStg(ptr ptr)
+@ stdcall -import ReadClassStg(ptr ptr)
 @ stdcall -import ReadClassStm(ptr ptr)
 @ stdcall ReadFmtUserTypeStg(ptr ptr ptr)
 @ stub ReadOleStg
diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c
index e463400d2bb..33586de5e68 100644
--- a/dlls/ole32/storage32.c
+++ b/dlls/ole32/storage32.c
@@ -9042,41 +9042,6 @@ HRESULT WINAPI WriteClassStg(IStorage* pStg, REFCLSID rclsid)
   return IStorage_SetClass(pStg, rclsid);
 }

-/***********************************************************************
- *    ReadClassStg (OLE32.@)
- *
- * This method reads the CLSID previously written to a storage object with
- * the WriteClassStg.
- *
- * PARAMS
- *  pstg    [I] IStorage pointer
- *  pclsid  [O] Pointer to where the CLSID is written
- *
- * RETURNS
- *  Success: S_OK.
- *  Failure: HRESULT code.
- */
-HRESULT WINAPI ReadClassStg(IStorage *pstg,CLSID *pclsid){
-
-    STATSTG pstatstg;
-    HRESULT hRes;
-
-    TRACE("(%p, %p)\n", pstg, pclsid);
-
-    if(!pstg || !pclsid)
-        return E_INVALIDARG;
-
-   /*
-    * read a STATSTG structure (contains the clsid) from the storage
-    */
-    hRes=IStorage_Stat(pstg,&pstatstg,STATFLAG_NONAME);
-
-    if(SUCCEEDED(hRes))
-        *pclsid=pstatstg.clsid;
-
-    return hRes;
-}
-
 /***********************************************************************
  *    OleLoadFromStream (OLE32.@)
  *