Nikolay Sivov : combase: Move CLSIDFromProgIDEx().

[Alexandre Julliard]

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

Author: Nikolay Sivov <nsivov at codeweavers.com>
Date:   Wed Aug 12 11:12:30 2020 +0300

combase: Move CLSIDFromProgIDEx().

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    | 10 ++++++++++
 dlls/combase/combase.spec |  1 +
 dlls/ole32/compobj.c      | 10 ----------
 dlls/ole32/ole32.spec     |  2 +-
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/dlls/combase/combase.c b/dlls/combase/combase.c
index f7c70e1232..edd6ac0b28 100644
--- a/dlls/combase/combase.c
+++ b/dlls/combase/combase.c
@@ -1063,6 +1063,16 @@ HRESULT WINAPI DECLSPEC_HOTPATCH CLSIDFromProgID(LPCOLESTR progid, CLSID *clsid)
     return clsid_from_string_reg(progid, clsid);
 }
 
+/******************************************************************************
+ *              CLSIDFromProgIDEx        (combase.@)
+ */
+HRESULT WINAPI CLSIDFromProgIDEx(LPCOLESTR progid, CLSID *clsid)
+{
+    FIXME("%s, %p: semi-stub\n", debugstr_w(progid), clsid);
+
+    return CLSIDFromProgID(progid, clsid);
+}
+
 /******************************************************************************
  *                CLSIDFromString        (combase.@)
  */
diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec
index 79410be8be..6698c23c76 100644
--- a/dlls/combase/combase.spec
+++ b/dlls/combase/combase.spec
@@ -68,6 +68,7 @@
 @ stdcall CLIPFORMAT_UserUnmarshal(ptr ptr ptr)
 @ stub CLSIDFromOle1Class
 @ stdcall CLSIDFromProgID(wstr ptr)
+@ stdcall CLSIDFromProgIDEx(wstr ptr)
 @ stdcall CLSIDFromString(wstr ptr)
 @ stub CleanupOleStateInAllTls
 @ stdcall CleanupTlsOleState(ptr)
diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c
index 33e617cca0..32283e6d95 100644
--- a/dlls/ole32/compobj.c
+++ b/dlls/ole32/compobj.c
@@ -2255,16 +2255,6 @@ HRESULT COM_OpenKeyForAppIdFromCLSID(REFCLSID clsid, REGSAM access, HKEY *subkey
     return S_OK;
 }
 
-/******************************************************************************
- *              CLSIDFromProgIDEx [OLE32.@]
- */
-HRESULT WINAPI CLSIDFromProgIDEx(LPCOLESTR progid, LPCLSID clsid)
-{
-    FIXME("%s,%p: semi-stub\n", debugstr_w(progid), clsid);
-
-    return CLSIDFromProgID(progid, clsid);
-}
-
 static HRESULT get_ps_clsid_from_registry(const WCHAR* path, REGSAM access, CLSID *pclsid)
 {
     HKEY hkey;
diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec
index d1dedd39c3..c83f0b2716 100644
--- a/dlls/ole32/ole32.spec
+++ b/dlls/ole32/ole32.spec
@@ -4,7 +4,7 @@
 @ stdcall CLIPFORMAT_UserSize(ptr long ptr) combase.CLIPFORMAT_UserSize
 @ stdcall CLIPFORMAT_UserUnmarshal(ptr ptr ptr) combase.CLIPFORMAT_UserUnmarshal
 @ stdcall CLSIDFromProgID(wstr ptr) combase.CLSIDFromProgID
-@ stdcall CLSIDFromProgIDEx(wstr ptr)
+@ stdcall CLSIDFromProgIDEx(wstr ptr) combase.CLSIDFromProgIDEx
 @ stdcall CLSIDFromString(wstr ptr) combase.CLSIDFromString
 @ stdcall CoAddRefServerProcess()
 @ stdcall CoAllowSetForegroundWindow(ptr ptr)