Adds the IPersistFile Interface to IShellLink[W] and gave both own

dlls/shell32/shelllink.c

@@ -23,6 +23,236 @@
 
 #include "shell32_main.h"
 
+/* IPersistFile Implementation */
+static HRESULT WINAPI IPersistFile_QueryInterface(LPPERSISTFILE this, REFIID riid, LPVOID * ppvObj);
+static ULONG WINAPI IPersistFile_AddRef(LPPERSISTFILE this);
+static ULONG WINAPI IPersistFile_Release(LPPERSISTFILE this);
+
+static HRESULT WINAPI IPersistFile_GetClassID (LPPERSISTFILE this, CLSID *pClassID);
+static HRESULT WINAPI IPersistFile_IsDirty (LPPERSISTFILE this);
+static HRESULT WINAPI IPersistFile_Load (LPPERSISTFILE this, LPCOLESTR32 pszFileName, DWORD dwMode);
+static HRESULT WINAPI IPersistFile_Save (LPPERSISTFILE this, LPCOLESTR32 pszFileName, BOOL32 fRemember);
+static HRESULT WINAPI IPersistFile_SaveCompleted (LPPERSISTFILE this, LPCOLESTR32 pszFileName);
+static HRESULT WINAPI IPersistFile_GetCurFile (LPPERSISTFILE this, LPOLESTR32 *ppszFileName);
+
+static struct IPersistFile_VTable pfvt = 
+{	IPersistFile_QueryInterface,
+	IPersistFile_AddRef,
+	IPersistFile_Release,
+	IPersistFile_GetClassID,
+	IPersistFile_IsDirty,
+	IPersistFile_Load,
+	IPersistFile_Save,
+	IPersistFile_SaveCompleted,
+	IPersistFile_GetCurFile
+};
+/**************************************************************************
+ *	  IPersistFile_Constructor
+ */
+LPPERSISTFILE IPersistFile_Constructor(void) 
+{	LPPERSISTFILE sl;
+
+	sl = (LPPERSISTFILE)HeapAlloc(GetProcessHeap(),0,sizeof(IPersistFile));
+	sl->ref = 1;
+	sl->lpvtbl = &pfvt;
+
+	TRACE(shell,"(%p)->()\n",sl);
+	return sl;
+}
+
+/**************************************************************************
+ *  IPersistFile_QueryInterface
+ */
+static HRESULT WINAPI IPersistFile_QueryInterface(
+  LPPERSISTFILE this, REFIID riid, LPVOID *ppvObj)
+{	char    xriid[50];
+	WINE_StringFromCLSID((LPCLSID)riid,xriid);
+	TRACE(shell,"(%p)->(\n\tIID:\t%s)\n",this,xriid);
+
+	*ppvObj = NULL;
+
+	if(IsEqualIID(riid, &IID_IUnknown))          /*IUnknown*/
+	{ *ppvObj = this; 
+	}
+	else if(IsEqualIID(riid, &IID_IPersistFile))  /*IPersistFile*/
+	{    *ppvObj = (LPPERSISTFILE)this;
+	}   
+
+	if(*ppvObj)
+	{ (*(LPPERSISTFILE*)ppvObj)->lpvtbl->fnAddRef(this);      
+	  TRACE(shell,"-- Interface: (%p)->(%p)\n",ppvObj,*ppvObj);
+	  return S_OK;
+	}
+	TRACE(shell,"-- Interface: E_NOINTERFACE\n");
+	return E_NOINTERFACE;
+}  
+/******************************************************************************
+ * IPersistFile_AddRef
+ */
+static ULONG WINAPI IPersistFile_AddRef(LPPERSISTFILE this)
+{	TRACE(shell,"(%p)->(count=%lu)\n",this,this->ref);
+	return ++(this->ref);
+}
+/******************************************************************************
+ * IPersistFile_Release
+ */
+static ULONG WINAPI IPersistFile_Release(LPPERSISTFILE this)
+{	TRACE(shell,"(%p)->(count=%lu)\n",this,this->ref);
+	if (!--(this->ref)) 
+	{ TRACE(shell,"-- destroying IPersistFile(%p)\n",this);
+	  HeapFree(GetProcessHeap(),0,this);
+	  return 0;
+	}
+	return this->ref;
+}
+
+static HRESULT WINAPI IPersistFile_GetClassID (LPPERSISTFILE this, CLSID *pClassID)
+{	FIXME(shell,"(%p)\n",this);
+	return NOERROR;
+}
+static HRESULT WINAPI IPersistFile_IsDirty (LPPERSISTFILE this)
+{	FIXME(shell,"(%p)\n",this);
+	return NOERROR;
+}
+static HRESULT WINAPI IPersistFile_Load (LPPERSISTFILE this, LPCOLESTR32 pszFileName, DWORD dwMode)
+{	FIXME(shell,"(%p)\n",this);
+	return NOERROR;
+}
+static HRESULT WINAPI IPersistFile_Save (LPPERSISTFILE this, LPCOLESTR32 pszFileName, BOOL32 fRemember)
+{	FIXME(shell,"(%p)\n",this);
+	return NOERROR;
+}
+static HRESULT WINAPI IPersistFile_SaveCompleted (LPPERSISTFILE this, LPCOLESTR32 pszFileName)
+{	FIXME(shell,"(%p)\n",this);
+	return NOERROR;
+}
+static HRESULT WINAPI IPersistFile_GetCurFile (LPPERSISTFILE this, LPOLESTR32 *ppszFileName)
+{	FIXME(shell,"(%p)\n",this);
+	return NOERROR;
+}
+
+
+/**************************************************************************
+*  IClassFactory Implementation
+*/
+static HRESULT WINAPI IShellLink_CF_QueryInterface(LPCLASSFACTORY,REFIID,LPVOID*);
+static ULONG WINAPI IShellLink_CF_AddRef(LPCLASSFACTORY);
+static ULONG WINAPI IShellLink_CF_Release(LPCLASSFACTORY);
+static HRESULT WINAPI IShellLink_CF_CreateInstance(LPCLASSFACTORY, LPUNKNOWN, REFIID, LPVOID *);
+static HRESULT WINAPI IShellLink_CF_LockServer(LPCLASSFACTORY, BOOL32);
+/**************************************************************************
+ *  IShellLink_CF_VTable
+ */
+static IClassFactory_VTable slcfvt = 
+{	IShellLink_CF_QueryInterface,
+	IShellLink_CF_AddRef,
+	IShellLink_CF_Release,
+	IShellLink_CF_CreateInstance,
+	IShellLink_CF_LockServer
+};
+
+/**************************************************************************
+ *  IShellLink_CF_Constructor
+ */
+
+LPCLASSFACTORY IShellLink_CF_Constructor(void)
+{	LPCLASSFACTORY	lpclf;
+
+	lpclf= (LPCLASSFACTORY)HeapAlloc(GetProcessHeap(),0,sizeof(IClassFactory));
+	lpclf->ref = 1;
+	lpclf->lpvtbl = &slcfvt;
+	TRACE(shell,"(%p)->()\n",lpclf);
+	return lpclf;
+}
+/**************************************************************************
+ *  IShellLink_CF_QueryInterface
+ */
+static HRESULT WINAPI IShellLink_CF_QueryInterface(
+  LPCLASSFACTORY this, REFIID riid, LPVOID *ppvObj)
+{	char	xriid[50];
+	WINE_StringFromCLSID((LPCLSID)riid,xriid);
+	TRACE(shell,"(%p)->(\n\tIID:\t%s)\n",this,xriid);
+
+	*ppvObj = NULL;
+
+	if(IsEqualIID(riid, &IID_IUnknown))          	/*IUnknown*/
+	{ *ppvObj = (LPUNKNOWN)this; 
+	}
+	else if(IsEqualIID(riid, &IID_IClassFactory))  /*IClassFactory*/
+	{ *ppvObj = (LPCLASSFACTORY)this;
+	}   
+
+	if(*ppvObj)
+	{ (*(LPCLASSFACTORY*)ppvObj)->lpvtbl->fnAddRef(this);  	
+	  TRACE(shell,"-- Interface: (%p)->(%p)\n",ppvObj,*ppvObj);
+	  return S_OK;
+	}
+	TRACE(shell,"-- Interface: E_NOINTERFACE\n");
+	return E_NOINTERFACE;
+}  
+/******************************************************************************
+ * IShellLink_CF_AddRef
+ */
+static ULONG WINAPI IShellLink_CF_AddRef(LPCLASSFACTORY this)
+{ TRACE(shell,"(%p)->(count=%lu)\n",this,this->ref);
+	return ++(this->ref);
+}
+/******************************************************************************
+ * IShellLink_CF_Release
+ */
+static ULONG WINAPI IShellLink_CF_Release(LPCLASSFACTORY this)
+{	TRACE(shell,"(%p)->(count=%lu)\n",this,this->ref);
+	if (!--(this->ref)) 
+	{ TRACE(shell,"-- destroying IClassFactory(%p)\n",this);
+		HeapFree(GetProcessHeap(),0,this);
+		return 0;
+	}
+	return this->ref;
+}
+/******************************************************************************
+ * IShellLink_CF_CreateInstance
+ */
+static HRESULT WINAPI IShellLink_CF_CreateInstance(
+  LPCLASSFACTORY this, LPUNKNOWN pUnknown, REFIID riid, LPVOID *ppObject)
+{	IUnknown *pObj = NULL;
+	HRESULT hres;
+	char	xriid[50];
+
+	WINE_StringFromCLSID((LPCLSID)riid,xriid);
+	TRACE(shell,"%p->(%p,\n\tIID:\t%s,%p)\n",this,pUnknown,xriid,ppObject);
+
+	*ppObject = NULL;
+		
+	if(pUnknown)
+	{	return(CLASS_E_NOAGGREGATION);
+	}
+
+	if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IShellLink))
+	{ pObj = (IUnknown *)IShellLink_Constructor();
+	} 
+	else
+	{ ERR(shell,"unknown IID requested\n\tIID:\t%s\n",xriid);
+	  return(E_NOINTERFACE);
+	}
+	
+	if (!pObj)
+	{ return(E_OUTOFMEMORY);
+	}
+	 
+	hres = pObj->lpvtbl->fnQueryInterface(pObj,riid, ppObject);
+	pObj->lpvtbl->fnRelease(pObj);
+	TRACE(shell,"-- Object created: (%p)->%p\n",this,*ppObject);
+
+	return hres;
+}
+/******************************************************************************
+ * IShellLink_CF_LockServer
+ */
+static HRESULT WINAPI IShellLink_CF_LockServer(LPCLASSFACTORY this, BOOL32 fLock)
+{	TRACE(shell,"%p->(0x%x), not implemented\n",this, fLock);
+	return E_NOTIMPL;
+}
+
 /* IShellLink Implementation */
 static HRESULT WINAPI IShellLink_QueryInterface(LPSHELLLINK,REFIID,LPVOID*);
 static ULONG WINAPI IShellLink_AddRef(LPSHELLLINK);
@@ -77,12 +307,15 @@ static struct IShellLink_VTable slvt =
 /**************************************************************************
  *	  IShellLink_Constructor
  */
-LPSHELLLINK IShellLink_Constructor() 
+LPSHELLLINK IShellLink_Constructor(void) 
 {	LPSHELLLINK sl;
 
 	sl = (LPSHELLLINK)HeapAlloc(GetProcessHeap(),0,sizeof(IShellLink));
 	sl->ref = 1;
 	sl->lpvtbl = &slvt;
+
+	sl->lppf = IPersistFile_Constructor();
+
 	TRACE(shell,"(%p)->()\n",sl);
 	return sl;
 }
@@ -92,45 +325,49 @@ LPSHELLLINK IShellLink_Constructor()
  */
 static HRESULT WINAPI IShellLink_QueryInterface(
   LPSHELLLINK this, REFIID riid, LPVOID *ppvObj)
-{  char    xriid[50];
-   WINE_StringFromCLSID((LPCLSID)riid,xriid);
-   TRACE(shell,"(%p)->(\n\tIID:\t%s)\n",this,xriid);
+{	char    xriid[50];
+	WINE_StringFromCLSID((LPCLSID)riid,xriid);
+	TRACE(shell,"(%p)->(\n\tIID:\t%s)\n",this,xriid);
 
-  *ppvObj = NULL;
+	*ppvObj = NULL;
 
-  if(IsEqualIID(riid, &IID_IUnknown))          /*IUnknown*/
-  { *ppvObj = this; 
-  }
-  else if(IsEqualIID(riid, &IID_IShellLink))  /*IShellLink*/
-  {    *ppvObj = (LPSHELLLINK)this;
-  }   
+	if(IsEqualIID(riid, &IID_IUnknown))          /*IUnknown*/
+	{ *ppvObj = this; 
+	}
+	else if(IsEqualIID(riid, &IID_IShellLink))  /*IShellLink*/
+	{    *ppvObj = (LPSHELLLINK)this;
+	}   
+	else if(IsEqualIID(riid, &IID_IPersistFile))  /*IPersistFile*/
+	{    *ppvObj = (LPPERSISTFILE)this->lppf;
+	}   
 
-  if(*ppvObj)
-  { (*(LPSHELLLINK*)ppvObj)->lpvtbl->fnAddRef(this);      
-    TRACE(shell,"-- Interface: (%p)->(%p)\n",ppvObj,*ppvObj);
-    return S_OK;
-  }
-    TRACE(shell,"-- Interface: E_NOINTERFACE\n");
-  return E_NOINTERFACE;
+	if(*ppvObj)
+	{ (*(LPSHELLLINK*)ppvObj)->lpvtbl->fnAddRef(this);      
+	  TRACE(shell,"-- Interface: (%p)->(%p)\n",ppvObj,*ppvObj);
+	  return S_OK;
+	}
+	TRACE(shell,"-- Interface: E_NOINTERFACE\n");
+	return E_NOINTERFACE;
 }  
 /******************************************************************************
  * IShellLink_AddRef
  */
 static ULONG WINAPI IShellLink_AddRef(LPSHELLLINK this)
-{ TRACE(shell,"(%p)->(count=%lu)\n",this,this->ref);
-    return ++(this->ref);
+{	TRACE(shell,"(%p)->(count=%lu)\n",this,this->ref);
+	return ++(this->ref);
 }
 /******************************************************************************
- * IClassFactory_Release
+ *	IShellLink_Release
  */
 static ULONG WINAPI IShellLink_Release(LPSHELLLINK this)
-{ TRACE(shell,"(%p)->(count=%lu)\n",this,this->ref);
-  if (!--(this->ref)) 
-  { TRACE(shell,"-- destroying IShellLink(%p)\n",this);
-    HeapFree(GetProcessHeap(),0,this);
-    return 0;
-  }
-  return this->ref;
+{	TRACE(shell,"(%p)->(count=%lu)\n",this,this->ref);
+	if (!--(this->ref)) 
+	{ TRACE(shell,"-- destroying IShellLink(%p)\n",this);
+	  this->lppf->lpvtbl->fnRelease(this->lppf);	/* IPersistFile*/
+	  HeapFree(GetProcessHeap(),0,this);
+	  return 0;
+	}
+	return this->ref;
 }
 
 static HRESULT WINAPI IShellLink_GetPath(LPSHELLLINK this, LPSTR pszFile,INT32 cchMaxPath, WIN32_FIND_DATA32A *pfd, DWORD fFlags)
@@ -215,6 +452,128 @@ static HRESULT WINAPI IShellLink_SetPath(LPSHELLLINK this, LPCSTR pszFile)
 	return NOERROR;
 }
 
+/**************************************************************************
+*  IClassFactory for IShellLinkW 
+*/
+static HRESULT WINAPI IShellLinkW_CF_QueryInterface(LPCLASSFACTORY,REFIID,LPVOID*);
+static ULONG WINAPI IShellLinkW_CF_AddRef(LPCLASSFACTORY);
+static ULONG WINAPI IShellLinkW_CF_Release(LPCLASSFACTORY);
+static HRESULT WINAPI IShellLinkW_CF_CreateInstance(LPCLASSFACTORY, LPUNKNOWN, REFIID, LPVOID *);
+static HRESULT WINAPI IShellLinkW_CF_LockServer(LPCLASSFACTORY, BOOL32);
+/**************************************************************************
+ *  IShellLinkW_CF_VTable
+ */
+static IClassFactory_VTable slwcfvt = 
+{	IShellLinkW_CF_QueryInterface,
+	IShellLinkW_CF_AddRef,
+	IShellLinkW_CF_Release,
+	IShellLinkW_CF_CreateInstance,
+	IShellLinkW_CF_LockServer
+};
+
+/**************************************************************************
+ *  IShellLinkW_CF_Constructor
+ */
+
+LPCLASSFACTORY IShellLinkW_CF_Constructor(void)
+{	LPCLASSFACTORY	lpclf;
+
+	lpclf= (LPCLASSFACTORY)HeapAlloc(GetProcessHeap(),0,sizeof(IClassFactory));
+	lpclf->ref = 1;
+	lpclf->lpvtbl = &slwcfvt;
+	TRACE(shell,"(%p)->()\n",lpclf);
+	return lpclf;
+}
+/**************************************************************************
+ *  IShellLinkW_CF_QueryInterface
+ */
+static HRESULT WINAPI IShellLinkW_CF_QueryInterface(
+  LPCLASSFACTORY this, REFIID riid, LPVOID *ppvObj)
+{	char	xriid[50];
+	WINE_StringFromCLSID((LPCLSID)riid,xriid);
+	TRACE(shell,"(%p)->(\n\tIID:\t%s)\n",this,xriid);
+
+	*ppvObj = NULL;
+
+	if(IsEqualIID(riid, &IID_IUnknown))          	/*IUnknown*/
+	{ *ppvObj = (LPUNKNOWN)this; 
+	}
+	else if(IsEqualIID(riid, &IID_IClassFactory))  /*IClassFactory*/
+	{ *ppvObj = (LPCLASSFACTORY)this;
+	}   
+
+	if(*ppvObj)
+	{ (*(LPCLASSFACTORY*)ppvObj)->lpvtbl->fnAddRef(this);  	
+	  TRACE(shell,"-- Interface: (%p)->(%p)\n",ppvObj,*ppvObj);
+	  return S_OK;
+	}
+	TRACE(shell,"-- Interface: E_NOINTERFACE\n");
+	return E_NOINTERFACE;
+}  
+/******************************************************************************
+ * IShellLinkW_CF_AddRef
+ */
+static ULONG WINAPI IShellLinkW_CF_AddRef(LPCLASSFACTORY this)
+{ TRACE(shell,"(%p)->(count=%lu)\n",this,this->ref);
+	return ++(this->ref);
+}
+/******************************************************************************
+ * IShellLinkW_CF_Release
+ */
+static ULONG WINAPI IShellLinkW_CF_Release(LPCLASSFACTORY this)
+{	TRACE(shell,"(%p)->(count=%lu)\n",this,this->ref);
+	if (!--(this->ref)) 
+	{ TRACE(shell,"-- destroying IClassFactory(%p)\n",this);
+		HeapFree(GetProcessHeap(),0,this);
+		return 0;
+	}
+	return this->ref;
+}
+/******************************************************************************
+ * IShellLinkW_CF_CreateInstance
+ */
+static HRESULT WINAPI IShellLinkW_CF_CreateInstance(
+  LPCLASSFACTORY this, LPUNKNOWN pUnknown, REFIID riid, LPVOID *ppObject)
+{	IUnknown *pObj = NULL;
+	HRESULT hres;
+	char	xriid[50];
+
+	WINE_StringFromCLSID((LPCLSID)riid,xriid);
+	TRACE(shell,"%p->(%p,\n\tIID:\t%s,%p)\n",this,pUnknown,xriid,ppObject);
+
+	*ppObject = NULL;
+		
+	if(pUnknown)
+	{ return(CLASS_E_NOAGGREGATION);
+	}
+
+	if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IShellLinkW))
+	{ pObj = (IUnknown *)IShellLinkW_Constructor();
+	} 
+	else
+	{ ERR(shell,"unknown IID requested\n\tIID:\t%s\n",xriid);
+	  return(E_NOINTERFACE);
+	}
+	
+	if (!pObj)
+	{ return(E_OUTOFMEMORY);
+	}
+	 
+	hres = pObj->lpvtbl->fnQueryInterface(pObj,riid, ppObject);
+	pObj->lpvtbl->fnRelease(pObj);
+	TRACE(shell,"-- Object created: (%p)->%p\n",this,*ppObject);
+
+	return hres;
+}
+/******************************************************************************
+ * IShellLinkW_CF_LockServer
+ */
+
+static HRESULT WINAPI IShellLinkW_CF_LockServer(LPCLASSFACTORY this, BOOL32 fLock)
+{	TRACE(shell,"%p->(0x%x), not implemented\n",this, fLock);
+	return E_NOTIMPL;
+}
+
 /* IShellLinkW Implementation */
 static HRESULT WINAPI IShellLinkW_QueryInterface(LPSHELLLINKW,REFIID,LPVOID*);
 static ULONG WINAPI IShellLinkW_AddRef(LPSHELLLINKW);
@@ -269,12 +628,15 @@ static struct IShellLinkW_VTable slvtw =
 /**************************************************************************
  *	  IShellLinkW_Constructor
  */
-LPSHELLLINKW IShellLinkW_Constructor() 
+LPSHELLLINKW IShellLinkW_Constructor(void) 
 {	LPSHELLLINKW sl;
 
 	sl = (LPSHELLLINKW)HeapAlloc(GetProcessHeap(),0,sizeof(IShellLinkW));
 	sl->ref = 1;
 	sl->lpvtbl = &slvtw;
+
+	sl->lppf = IPersistFile_Constructor();
+
 	TRACE(shell,"(%p)->()\n",sl);
 	return sl;
 }
@@ -296,6 +658,9 @@ static HRESULT WINAPI IShellLinkW_QueryInterface(
   else if(IsEqualIID(riid, &IID_IShellLinkW))  /*IShellLinkW*/
   {    *ppvObj = (LPSHELLLINKW)this;
   }   
+  else if(IsEqualIID(riid, &IID_IPersistFile))  /*IPersistFile*/
+  {    *ppvObj = (LPPERSISTFILE)this->lppf;
+  }   
 
   if(*ppvObj)
   { (*(LPSHELLLINKW*)ppvObj)->lpvtbl->fnAddRef(this);      
@@ -319,6 +684,7 @@ static ULONG WINAPI IShellLinkW_Release(LPSHELLLINKW this)
 { TRACE(shell,"(%p)->(count=%lu)\n",this,this->ref);
   if (!--(this->ref)) 
   { TRACE(shell,"-- destroying IShellLinkW(%p)\n",this);
+    this->lppf->lpvtbl->fnRelease(this->lppf);	/* IPersistFile*/
     HeapFree(GetProcessHeap(),0,this);
     return 0;
   }

dlls/shell32/shellole.c

 /*
- *	Shell Folder stuff (...and all the OLE-Objects of SHELL32.DLL)
+ *	handling of SHELL32.DLL OLE-Objects
  *
  *	Copyright 1997	Marcus Meissner
  *	Copyright 1998	Juergen Schmied  <juergen.schmied@metronet.de>
@@ -19,6 +19,7 @@
 #include "winerror.h"
 #include "winnls.h"
 #include "winproc.h"
+#include "winversion.h"
 #include "commctrl.h"
 
 #include "shell32_main.h"
@@ -173,10 +174,16 @@ DWORD WINAPI SHELL32_DllGetClassObject(REFCLSID rclsid,REFIID iid,LPVOID *ppv)
 	{ if(IsEqualCLSID(rclsid, &CLSID_ShellDesktop))      /*debug*/
 	  { TRACE(shell,"-- requested CLSID_ShellDesktop\n");
 	  }
-	  if(IsEqualCLSID(rclsid, &CLSID_ShellLink))         /*debug*/
-	  { TRACE(shell,"-- requested CLSID_ShellLink\n");
+
+	  if (IsEqualCLSID(rclsid, &CLSID_ShellLink))
+	  { if (VERSION_OsIsUnicode ())
+	      lpclf = IShellLinkW_CF_Constructor();
+	    lpclf = IShellLink_CF_Constructor();
+	  }
+	  else
+	  { lpclf = IClassFactory_Constructor();
 	  }
-	  lpclf = IClassFactory_Constructor();
+
 	  if(lpclf)
 	  { hres = lpclf->lpvtbl->fnQueryInterface(lpclf,iid, ppv);
 		lpclf->lpvtbl->fnRelease(lpclf);
@@ -186,7 +193,7 @@ DWORD WINAPI SHELL32_DllGetClassObject(REFCLSID rclsid,REFIID iid,LPVOID *ppv)
 	{ WARN(shell, "-- CLSID not found\n");
 	  hres = CLASS_E_CLASSNOTAVAILABLE;
 	}
-	TRACE(shell,"-- return pointer to interface: %p\n",*ppv);
+	TRACE(shell,"-- pointer to class factory: %p\n",*ppv);
 	return hres;
 }
 
@@ -306,12 +313,6 @@ static HRESULT WINAPI IClassFactory_CreateInstance(
 	else if (IsEqualIID(riid, &IID_IShellView))
 	{ pObj = (IUnknown *)IShellView_Constructor(NULL,NULL);
  	} 
-	else if (IsEqualIID(riid, &IID_IShellLink))
-	{ pObj = (IUnknown *)IShellLink_Constructor();
-	} 
-	else if (IsEqualIID(riid, &IID_IShellLinkW))
-	{ pObj = (IUnknown *)IShellLinkW_Constructor();
-	} 
 	else if (IsEqualIID(riid, &IID_IExtractIcon))
 	{ pObj = (IUnknown *)IExtractIcon_Constructor(NULL);
 	} 

include/shlobj.h

@@ -16,10 +16,6 @@
 #define FAR
 #define THIS_ THIS,
 
-#define __T(x)      x
-#define _T(x)       __T(x)
-#define TEXT        _T
-
 /****************************************************************************
 *  DllGetClassObject
 */
@@ -29,6 +25,7 @@ DWORD WINAPI SHELL32_DllGetClassObject(LPCLSID,REFIID,LPVOID*);
 typedef LPVOID	LPBC; /* *IBindCtx really */
 
 /* foreward declaration of the objects*/
+typedef struct tagPERSISTFILE	*LPPERSISTFILE,	IPersistFile;
 typedef struct tagCONTEXTMENU	*LPCONTEXTMENU,	IContextMenu;
 typedef struct tagSHELLEXTINIT	*LPSHELLEXTINIT,IShellExtInit;
 typedef struct tagENUMIDLIST	*LPENUMIDLIST,	IEnumIDList;
@@ -45,6 +42,9 @@ typedef struct tagENUMFORMATETC	*LPENUMFORMATETC,	IEnumFORMATETC;
 /****************************************************************************
 *  SHELL ID
 */
+/* desktop elements */
+DEFINE_GUID (IID_MyComputer,		0x20D04FE0L, 0x3AEA, 0x1069, 0xA2, 0xD8, 0x08, 0x00, 0x2B, 0x30, 0x30, 0x9D);
+
 /* strange Objects */
 DEFINE_SHLGUID(IID_IEnumUnknown,	0x00000100L, 0, 0);
 DEFINE_SHLGUID(IID_IEnumString,		0x00000101L, 0, 0);
@@ -70,6 +70,7 @@ DEFINE_GUID (IID_IDockingWindowFrame,	0x47D2657AL, 0x7B27, 0x11D0, 0x8C, 0xA9, 0
 
 DEFINE_SHLGUID(CLSID_ShellDesktop,      0x00021400L, 0, 0);
 DEFINE_SHLGUID(CLSID_ShellLink,         0x00021401L, 0, 0);
+
 /* shell32 formatids */
 DEFINE_SHLGUID(FMTID_Intshcut,          0x000214A0L, 0, 0);
 DEFINE_SHLGUID(FMTID_InternetSite,      0x000214A1L, 0, 0);
@@ -125,7 +126,31 @@ typedef struct _STRRET
     WCHAR	cStrW[MAX_PATH];
   }u;
 } STRRET,*LPSTRRET;
+/*****************************************************************************
+ * IPersistFile interface
+ */
+#define THIS LPPERSISTFILE this
+typedef struct IPersistFile_VTable
+{   // *** IUnknown methods ***
+    STDMETHOD(QueryInterface) (THIS_ REFIID riid, LPVOID * ppvObj) PURE;
+    STDMETHOD_(ULONG,AddRef) (THIS)  PURE;
+    STDMETHOD_(ULONG,Release) (THIS) PURE;
 
+    STDMETHOD(GetClassID )(THIS_ CLSID *pClassID) PURE;
+    STDMETHOD(IsDirty )(THIS) PURE;
+    STDMETHOD(Load )(THIS_ LPCOLESTR32 pszFileName, DWORD dwMode) PURE;
+    STDMETHOD(Save )(THIS_ LPCOLESTR32 pszFileName, BOOL32 fRemember) PURE;
+    STDMETHOD(SaveCompleted )(THIS_ LPCOLESTR32 pszFileName) PURE;
+    STDMETHOD(GetCurFile )(THIS_ LPOLESTR32 *ppszFileName) PURE;
+
+} IPersistFile_VTable,*LPPERSISTFILE_VTABLE;
+
+struct tagPERSISTFILE
+{ LPPERSISTFILE_VTABLE	lpvtbl;
+  DWORD			ref;
+};
+
+#undef THIS
 /*****************************************************************************
  * IContextMenu interface
  */
@@ -936,6 +961,8 @@ typedef struct IShellLink_VTable
 struct IShellLink {
 	LPSHELLLINK_VTABLE	lpvtbl;
 	DWORD			ref;
+	/* IPersistfile interface */
+	LPPERSISTFILE		lppf;
 };
 
 #undef THIS
@@ -983,6 +1010,8 @@ typedef struct IShellLinkW_VTable
 struct IShellLinkW {
 	LPSHELLLINKW_VTABLE	lpvtbl;
 	DWORD			ref;
+	/* IPersistfile interface */
+	LPPERSISTFILE		lppf;
 };
 
 #undef THIS
@@ -1099,22 +1128,6 @@ struct tagSERVICEPROVIDER
 	DWORD ref;
 };           
 /****************************************************************************
- * Class constructors
- */
-#ifdef __WINE__
-extern LPDATAOBJECT	IDataObject_Constructor(HWND32 hwndOwner, LPSHELLFOLDER psf, LPITEMIDLIST * apidl, UINT32 cidl);
-extern LPENUMFORMATETC	IEnumFORMATETC_Constructor(UINT32, const FORMATETC32 []);
-
-extern LPCLASSFACTORY	IClassFactory_Constructor(void);
-extern LPCONTEXTMENU	IContextMenu_Constructor(LPSHELLFOLDER, LPCITEMIDLIST *, UINT32);
-extern LPSHELLFOLDER	IShellFolder_Constructor(LPSHELLFOLDER,LPITEMIDLIST);
-extern LPSHELLVIEW	IShellView_Constructor(LPSHELLFOLDER, LPCITEMIDLIST);
-extern LPSHELLLINK	IShellLink_Constructor(void);
-extern LPSHELLLINKW	IShellLinkW_Constructor(void);
-extern LPENUMIDLIST	IEnumIDList_Constructor(LPCSTR,DWORD);
-extern LPEXTRACTICON	IExtractIcon_Constructor(LPITEMIDLIST);
-#endif
-/****************************************************************************
  * Shell Execute API
  */
 #define SE_ERR_FNF              2       // file not found