Nikolay Sivov : shell32: Forward GetClassID() to IPersistFile.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: d64697a34ea7cedb63fa6c0572a6b50bba4a8f89
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=d64697a34ea7cedb63fa6c0572...

Author: Nikolay Sivov 
Date:   Fri Aug 16 11:34:10 2013 +0400

shell32: Forward GetClassID() to IPersistFile.

---

dlls/shell32/shelllink.c |   17 +++++++----------
 1 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/dlls/shell32/shelllink.c b/dlls/shell32/shelllink.c
index 9664df9..3ee06bc 100644
--- a/dlls/shell32/shelllink.c
+++ b/dlls/shell32/shelllink.c
@@ -280,14 +280,6 @@ static HRESULT ShellLink_QueryInterface( IShellLinkImpl *This, REFIID riid,  LPV
     return E_NOINTERFACE;
 }

-static HRESULT ShellLink_GetClassID( IShellLinkImpl *This, CLSID *pclsid )
-{
-    TRACE("%p %p\n", This, pclsid);
-
-    *pclsid = CLSID_ShellLink;
-    return S_OK;
-}
-
 /**************************************************************************
  *  IPersistFile_QueryInterface
  */
@@ -321,7 +313,12 @@ static ULONG WINAPI IPersistFile_fnRelease(IPersistFile* iface)
 static HRESULT WINAPI IPersistFile_fnGetClassID(IPersistFile* iface, CLSID *pClassID)
 {
     IShellLinkImpl *This = impl_from_IPersistFile(iface);
-    return ShellLink_GetClassID( This, pClassID );
+
+    TRACE("(%p)->(%p)\n", This, pClassID);
+
+    *pClassID = CLSID_ShellLink;
+
+    return S_OK;
 }

static HRESULT WINAPI IPersistFile_fnIsDirty(IPersistFile* iface)
@@ -545,7 +542,7 @@ static HRESULT WINAPI IPersistStream_fnGetClassID(
    CLSID* pClassID)
 {
     IShellLinkImpl *This = impl_from_IPersistStream(iface);
-    return ShellLink_GetClassID( This, pClassID );
+    return IPersistFile_GetClassID(&This->IPersistFile_iface, pClassID);
 }

/************************************************************************