Changeset 3243 for trunk/src/shell32/shlfolder.cpp

Timestamp:

Mar 26, 2000, 6:34:57 PM (25 years ago)

Author:

cbratschi

Message:

merged with Corel WINE 20000324

File:

• trunk/src/shell32/shlfolder.cpp (modified) (93 diffs)

trunk/src/shell32/shlfolder.cpp

@@ -1 @@
-/* $Id: shlfolder.cpp,v 1.8 2000-03-24 17:17:27 cbratschi Exp $ */
+/* $Id: shlfolder.cpp,v 1.9 2000-03-26 16:34:52 cbratschi Exp $ */
 /*
  * Shell Folder stuff
@@ -8 +8 @@
  * IShellFolder2 and related interfaces
  *
+ * Corel WINE 20000324 level
  */
 
@@ -36 +37 @@
 DEFAULT_DEBUG_CHANNEL(shell)
 
-#define MEM_DEBUG 1
+/***************************************************************************
+ * debughelper: print out the return adress
+ *  helps especially to track down unbalanced AddRef/Release
+ */
+#define MEM_DEBUG 0
+
+#if MEM_DEBUG
+#define _CALL_TRACE TRACE("called from: 0x%08x\n", *( ((UINT*)&iface)-1 ));
+#else
+#define _CALL_TRACE
+#endif
 
 typedef struct
@@ -96 +107 @@
    HRESULT     hr = E_OUTOFMEMORY;
    LPITEMIDLIST   pidlOut, pidlTemp = NULL;
-   IShellFolder  *psfChild;
+   IShellFolder  *psfChild = NULL;
 
    TRACE("(%p %p %s)\n",psf, pidlInOut? *pidlInOut: NULL, debugstr_w(szNext));
@@ -103 +114 @@
    /* get the shellfolder for the child pidl and let it analyse further */
    hr = IShellFolder_BindToObject(psf, *pidlInOut, NULL, &IID_IShellFolder, (LPVOID*)&psfChild);
-
+dprintf(("C 1"));
    if (psfChild)
-   {
+   {  dprintf(("C 1a %d",psfChild/*,(psfChild)->fnParseDisplayName()*/));
      hr = IShellFolder_ParseDisplayName(psfChild, hwndOwner, NULL, szNext, pEaten, &pidlOut, pdwAttributes);
+dprintf(("C 1b"));
      IShellFolder_Release(psfChild);
-
+dprintf(("C 2"));
      pidlTemp = ILCombine(*pidlInOut, pidlOut);
-
+dprintf(("C 3"));
      if (pidlOut)
        ILFree(pidlOut);
    }
-
+dprintf(("C 4"));
    ILFree(*pidlInOut);
    *pidlInOut = pidlTemp;
@@ -207 +219 @@
 typedef struct
 {
-   ICOM_VTABLE(IShellFolder2)*            lpvtbl;
+   ICOM_VTABLE(IUnknown)* lpVtbl;
    DWORD          ref;
 
+   ICOM_VTABLE(IShellFolder2)*           lpvtblShellFolder;
    ICOM_VTABLE(IPersistFolder)*          lpvtblPersistFolder;
    ICOM_VTABLE(IDropTarget)*             lpvtblDropTarget;
+
+   IUnknown                     *pUnkOuter;     /* used for aggregation */
 
    CLSID*                                pclsid;
@@ -222 +237 @@
 } IGenericSFImpl;
 
+extern struct ICOM_VTABLE(IUnknown) unkvt;
 extern struct ICOM_VTABLE(IShellFolder2) sfvt;
 extern struct ICOM_VTABLE(IPersistFolder) psfvt;
-extern struct ICOM_VTABLE(IDropTarget) dt2vt;
+extern struct ICOM_VTABLE(IDropTarget) dtvt;
 
 static IShellFolder * ISF_MyComputer_Constructor(void);
+
+#define _IShellFolder2_Offset ((int)(&(((IGenericSFImpl*)0)->lpvtblShellFolder)))
+#define _ICOM_THIS_From_IShellFolder2(class, name) class* This = (class*)(((char*)name)-_IShellFolder2_Offset);
 
 #define _IPersistFolder_Offset ((int)(&(((IGenericSFImpl*)0)->lpvtblPersistFolder)))
@@ -233 +252 @@
 #define _IDropTarget_Offset ((int)(&(((IGenericSFImpl*)0)->lpvtblDropTarget)))
 #define _ICOM_THIS_From_IDropTarget(class, name) class* This = (class*)(((char*)name)-_IDropTarget_Offset);
+
+/*
+  converts This to a interface pointer
+*/
+#define _IUnknown_(This)        (IUnknown*)&(This->lpVtbl)
+#define _IShellFolder_(This)    (IShellFolder*)&(This->lpvtblShellFolder)
+#define _IShellFolder2_(This)   (IShellFolder2*)&(This->lpvtblShellFolder)
+#define _IPersist_(This)        (IPersist*)&(This->lpvtblPersistFolder)
+#define _IPersistFolder_(This)  (IPersistFolder*)&(This->lpvtblPersistFolder)
+#define _IDropTarget_(This)     (IDropTarget*)&(This->lpvtblDropTarget)
+
+/**************************************************************************
+*       registers clipboardformat once
+*/
+static void SF_RegisterClipFmt (IGenericSFImpl * This)
+{
+        TRACE("(%p)\n", This);
+
+        if (!This->cfShellIDList)
+        {
+          This->cfShellIDList = RegisterClipboardFormatA(CFSTR_SHELLIDLIST);
+        }
+}
+
+/**************************************************************************
+*       we need a seperate IUnknown to handle aggregation
+*       (inner IUnknown)
+*/
+static HRESULT WINAPI IUnknown_fnQueryInterface(
+        IUnknown * iface,
+        REFIID riid,
+        LPVOID *ppvObj)
+{
+        ICOM_THIS(IGenericSFImpl, iface);
+
+        char    xriid[50];
+        WINE_StringFromCLSID((LPCLSID)riid,xriid);
+
+        _CALL_TRACE
+        TRACE("(%p)->(\n\tIID:\t%s,%p)\n",This,xriid,ppvObj);
+
+        *ppvObj = NULL;
+
+        if(IsEqualIID(riid, &IID_IUnknown))             *ppvObj = _IUnknown_(This);
+        else if(IsEqualIID(riid, &IID_IShellFolder))    *ppvObj = _IShellFolder_(This);
+        else if(IsEqualIID(riid, &IID_IShellFolder2))   *ppvObj = _IShellFolder_(This);
+        else if(IsEqualIID(riid, &IID_IPersist))        *ppvObj = _IPersist_(This);
+        else if(IsEqualIID(riid, &IID_IPersistFolder))  *ppvObj = _IPersistFolder_(This);
+        else if(IsEqualIID(riid, &IID_IDropTarget))
+        {
+          *ppvObj = _IDropTarget_(This);
+          SF_RegisterClipFmt(This);
+        }
+
+        if(*ppvObj)
+        {
+          IUnknown_AddRef((IUnknown*)(*ppvObj));
+          TRACE("-- Interface = %p\n", *ppvObj);
+          return S_OK;
+        }
+        TRACE("-- Interface: E_NOINTERFACE\n");
+        return E_NOINTERFACE;
+}
+
+static ULONG WINAPI IUnknown_fnAddRef(IUnknown * iface)
+{
+        ICOM_THIS(IGenericSFImpl, iface);
+
+        _CALL_TRACE
+        TRACE("(%p)->(count=%lu)\n",This,This->ref);
+
+        shell32_ObjCount++;
+        return ++(This->ref);
+}
+
+static ULONG WINAPI IUnknown_fnRelease(IUnknown * iface)
+{
+        ICOM_THIS(IGenericSFImpl, iface);
+
+        _CALL_TRACE
+        TRACE("(%p)->(count=%lu)\n",This,This->ref);
+
+        shell32_ObjCount--;
+        if (!--(This->ref))
+        {
+          TRACE("-- destroying IShellFolder(%p)\n",This);
+
+          if (pdesktopfolder == _IShellFolder_(This))
+          {
+            pdesktopfolder=NULL;
+            TRACE("-- destroyed IShellFolder(%p) was Desktopfolder\n",This);
+          }
+          if(This->absPidl) SHFree(This->absPidl);
+          if(This->sMyPath) SHFree(This->sMyPath);
+          HeapFree(GetProcessHeap(),0,This);
+          return 0;
+        }
+        return This->ref;
+}
+
+struct ICOM_VTABLE(IUnknown) unkvt =
+{
+        ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
+        IUnknown_fnQueryInterface,
+        IUnknown_fnAddRef,
+        IUnknown_fnRelease,
+};
 
 static shvheader GenericSFHeader [] =
@@ -245 +371 @@
 
 /**************************************************************************
-*  registers clipboardformat once
-*/
-static void SF_RegisterClipFmt (IShellFolder2 * iface)
-{
-   ICOM_THIS(IGenericSFImpl, iface);
-
-   TRACE("(%p)\n", This);
-
-   if (!This->cfShellIDList)
-   {
-     This->cfShellIDList = RegisterClipboardFormatA(CFSTR_SHELLIDLIST);
-   }
+*       IShellFolder_Constructor
+*
+* NOTES
+*  creating undocumented ShellFS_Folder as part of an aggregation
+*  {F3364BA0-65B9-11CE-A9BA-00AA004AE837}
+*
+* FIXME
+*       when pUnkOuter = 0 then rrid = IID_IShellFolder is returned
+*/
+HRESULT IFSFolder_Constructor(
+        IUnknown * pUnkOuter,
+        REFIID riid,
+        LPVOID * ppv)
+{
+        IGenericSFImpl *        sf;
+        char    xriid[50];
+        HRESULT hr = S_OK;
+        WINE_StringFromCLSID((LPCLSID)riid,xriid);
+
+        TRACE("unkOut=%p riid=%s\n",pUnkOuter, xriid);
+
+        if(pUnkOuter && ! IsEqualIID(riid, &IID_IUnknown))
+        {
+          hr = CLASS_E_NOAGGREGATION;   /* forbidden by definition */
+        }
+        else
+        {
+          sf=(IGenericSFImpl*)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IGenericSFImpl));
+          if (sf)
+          {
+            sf->ref=1;
+            ICOM_VTBL(sf)=&unkvt;
+            sf->lpvtblShellFolder=&sfvt;
+            sf->lpvtblPersistFolder=&psfvt;
+            sf->lpvtblDropTarget=&dtvt;
+            sf->pclsid = (CLSID*)&CLSID_SFFile;
+            sf->pUnkOuter = pUnkOuter ? pUnkOuter : _IUnknown_(sf);
+            *ppv = _IUnknown_(sf);
+            hr = S_OK;
+            shell32_ObjCount++;
+          }
+          else
+          {
+            hr = E_OUTOFMEMORY;
+          }
+        }
+        return hr;
 }
 
@@ -262 +423 @@
 *    IShellFolder_Constructor
 *
+* NOTES
+*       THIS points to the parent folder
 */
 
 static IShellFolder * IShellFolder_Constructor(
-   IShellFolder * psf,
+   IShellFolder2 * iface,
    LPITEMIDLIST pidl)
 {
    IGenericSFImpl *                      sf;
-   IGenericSFImpl *                      sfParent = (IGenericSFImpl*) psf;
    DWORD       dwSize=0;
+
+   _ICOM_THIS_From_IShellFolder2(IGenericSFImpl, iface)
 
    sf=(IGenericSFImpl*)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IGenericSFImpl));
    sf->ref=1;
 
-   sf->lpvtbl=&sfvt;
+   ICOM_VTBL(sf)=&unkvt;
+   sf->lpvtblShellFolder=&sfvt;
    sf->lpvtblPersistFolder=&psfvt;
-   sf->lpvtblDropTarget=&dt2vt;
+   sf->lpvtblDropTarget=&dtvt;
    sf->pclsid = (CLSID*)&CLSID_SFFile;
-   sf->cfShellIDList=0;
-   sf->fAcceptFmt=FALSE;
-
-   TRACE("(%p)->(parent=%p, pidl=%p)\n",sf,sfParent, pidl);
+   sf->pUnkOuter = _IUnknown_(sf);
+
+   TRACE("(%p)->(parent=%p, pidl=%p)\n",sf,This, pidl);
    pdump(pidl);
 
-   if(pidl)                                    /* do we have a pidl? */
+   if(pidl && iface)                                    /* do we have a pidl? */
    {
      int len;
 
-     sf->absPidl = ILCombine(sfParent->absPidl, pidl);  /* build a absolute pidl */
+     sf->absPidl = ILCombine(This->absPidl, pidl);  /* build a absolute pidl */
 
      if (!_ILIsSpecialFolder(pidl))               /* only file system paths */
      {
-       if(sfParent->sMyPath)                      /* get the size of the parents path */
+       if(This->sMyPath)                      /* get the size of the parents path */
        {
-         dwSize += strlen(sfParent->sMyPath) ;
-         TRACE("-- (%p)->(parent's path=%s)\n",sf, debugstr_a(sfParent->sMyPath));
+         dwSize += strlen(This->sMyPath) ;
+         TRACE("-- (%p)->(parent's path=%s)\n",sf, debugstr_a(This->sMyPath));
        }
 
@@ -305 +469 @@
        *(sf->sMyPath)=0x00;
 
-       if(sfParent->sMyPath)                      /* if the parent has a path, get it*/
+       if(This->sMyPath)                      /* if the parent has a path, get it*/
        {
-         strcpy(sf->sMyPath, sfParent->sMyPath);
+         strcpy(sf->sMyPath, This->sMyPath);
          PathAddBackslashA (sf->sMyPath);
        }
@@ -321 +485 @@
 
    shell32_ObjCount++;
-   return (IShellFolder *)sf;
+   return _IShellFolder_(sf);
 }
 /**************************************************************************
@@ -335 +499 @@
    LPVOID *ppvObj)
 {
-   ICOM_THIS(IGenericSFImpl, iface);
-
-   char  xriid[50];
-   WINE_StringFromCLSID((LPCLSID)riid,xriid);
-   TRACE("(%p)->(\n\tIID:\t%s,%p)\n",This,xriid,ppvObj);
-
-   *ppvObj = NULL;
-
-   if(IsEqualIID(riid, &IID_IUnknown))
-   { *ppvObj = This;
-   }
-   else if(IsEqualIID(riid, &IID_IShellFolder))
-   {
-     *ppvObj = (IShellFolder*)This;
-   }
-   else if(IsEqualIID(riid, &IID_IShellFolder2))
-   {
-     *ppvObj = (IShellFolder2*)This;
-   }
-   else if(IsEqualIID(riid, &IID_IPersist))
-   {
-     *ppvObj = (IPersistFolder*)&(This->lpvtblPersistFolder);
-   }
-   else if(IsEqualIID(riid, &IID_IPersistFolder))
-   {
-     *ppvObj = (IPersistFolder*)&(This->lpvtblPersistFolder);
-   }
-   else if(IsEqualIID(riid, &IID_IDropTarget))
-   {
-     *ppvObj = (IDropTarget*)&(This->lpvtblDropTarget);
-     SF_RegisterClipFmt((IShellFolder2*)This);
-   }
-
-   if(*ppvObj)
-   {
-     IUnknown_AddRef((IUnknown*)(*ppvObj));
-     TRACE("-- Interface = %p\n", *ppvObj);
-     return S_OK;
-   }
-   TRACE("-- Interface: E_NOINTERFACE\n");
-   return E_NOINTERFACE;
+  _ICOM_THIS_From_IShellFolder2(IGenericSFImpl, iface)
+
+  char  xriid[50];
+  WINE_StringFromCLSID((LPCLSID)riid,xriid);
+  _CALL_TRACE
+  TRACE("(%p)->(\n\tIID:\t%s,%p)\n",This,xriid,ppvObj);
+
+  return IUnknown_QueryInterface(This->pUnkOuter, riid, ppvObj);
 }
 
@@ -384 +515 @@
 static ULONG WINAPI IShellFolder_fnAddRef(IShellFolder2 * iface)
 {
-   ICOM_THIS(IGenericSFImpl, iface);
-
-#ifdef MEM_DEBUG
-   TRACE("called from: 0x%08x\n", *( ((UINT*)&iface)-1 ));
-#endif
-   TRACE("(%p)->(count=%lu)\n",This,This->ref);
-
-   shell32_ObjCount++;
-   return ++(This->ref);
+  _ICOM_THIS_From_IShellFolder2(IGenericSFImpl, iface)
+
+  _CALL_TRACE
+  TRACE("(%p)->(count=%lu)\n",This,This->ref);
+
+  return IUnknown_AddRef(This->pUnkOuter);
 }
 
@@ -400 +528 @@
 static ULONG WINAPI IShellFolder_fnRelease(IShellFolder2 * iface)
 {
-   ICOM_THIS(IGenericSFImpl, iface);
-
-#ifdef MEM_DEBUG
-   TRACE("called from: 0x%08x\n", *( ((UINT*)&iface)-1 ));
-#endif
-   TRACE("(%p)->(count=%lu)\n",This,This->ref);
-
-   shell32_ObjCount--;
-   if (!--(This->ref))
-   { TRACE("-- destroying IShellFolder(%p)\n",This);
-
-     if (pdesktopfolder == (IShellFolder*)iface)
-     { pdesktopfolder=NULL;
-       TRACE("-- destroyed IShellFolder(%p) was Desktopfolder\n",This);
-     }
-     if(This->absPidl)
-     { SHFree(This->absPidl);
-     }
-     if(This->sMyPath)
-     { SHFree(This->sMyPath);
-     }
-
-     HeapFree(GetProcessHeap(),0,This);
-
-     return 0;
-   }
-   return This->ref;
+  _ICOM_THIS_From_IShellFolder2(IGenericSFImpl, iface)
+
+  _CALL_TRACE
+  TRACE("(%p)->(count=%lu)\n",This,This->ref);
+
+  return IUnknown_Release(This->pUnkOuter);
 }
 /**************************************************************************
@@ -459 +566 @@
    DWORD *pdwAttributes)
 {
-   ICOM_THIS(IGenericSFImpl, iface);
+   _ICOM_THIS_From_IShellFolder2(IGenericSFImpl, iface)
 
    HRESULT     hr = E_OUTOFMEMORY;
@@ -494 +601 @@
        if (szNext && *szNext)
        {
-         hr = SHELL32_ParseNextElement(hwndOwner, (IShellFolder2*)This, &pidlTemp, (LPOLESTR)szNext, pchEaten, pdwAttributes);
+         hr = SHELL32_ParseNextElement(hwndOwner, iface, &pidlTemp, (LPOLESTR)szNext, pchEaten, pdwAttributes);
        }
        else
@@ -523 +630 @@
    LPENUMIDLIST* ppEnumIDList)
 {
-   ICOM_THIS(IGenericSFImpl, iface);
-
-   TRACE("(%p)->(HWND=0x%08x flags=0x%08lx pplist=%p)\n",This,hwndOwner,dwFlags,ppEnumIDList);
-
-   *ppEnumIDList = NULL;
-   *ppEnumIDList = IEnumIDList_Constructor (This->sMyPath, dwFlags, EIDL_FILE);
-
-   TRACE("-- (%p)->(new ID List: %p)\n",This,*ppEnumIDList);
-
-   if(!*ppEnumIDList) return E_OUTOFMEMORY;
-
-   return S_OK;
+  _ICOM_THIS_From_IShellFolder2(IGenericSFImpl, iface)
+
+  TRACE("(%p)->(HWND=0x%08x flags=0x%08lx pplist=%p)\n",This,hwndOwner,dwFlags,ppEnumIDList);
+
+  *ppEnumIDList = NULL;
+
+  if (This->sMyPath)
+     *ppEnumIDList = IEnumIDList_Constructor (This->sMyPath, dwFlags, EIDL_FILE);
+  else
+  {
+   /* if This->sMyPath is NULL, we will start enumerating objects
+      at MyComputer level */
+    *ppEnumIDList = IEnumIDList_Constructor (NULL, dwFlags, EIDL_MYCOMP);
+  }
+
+
+  TRACE("-- (%p)->(new ID List: %p)\n",This,*ppEnumIDList);
+
+  if(!*ppEnumIDList) return E_OUTOFMEMORY;
+
+  return S_OK;
 }
 
@@ -548 +664 @@
          LPBC pbcReserved, REFIID riid, LPVOID * ppvOut)
 {
-   ICOM_THIS(IGenericSFImpl, iface);
+   _ICOM_THIS_From_IShellFolder2(IGenericSFImpl, iface)
    GUID     const * iid;
    char     xriid[50];
@@ -559 +675 @@
    TRACE("(%p)->(pidl=%p,%p,\n\tIID:\t%s,%p)\n",This,pidl,pbcReserved,xriid,ppvOut);
 
-   if(!pidl || !ppvOut) return E_INVALIDARG;
+   if(!ppvOut) return E_INVALIDARG;
 
    *ppvOut = NULL;
+
+   if (!pidl) return E_INVALIDARG;
 
    iid = _ILGetGUIDPointer(pidl);
@@ -583 +701 @@
    {
      LPITEMIDLIST pidltemp = ILCloneFirst(pidl);
-     pShellFolder = IShellFolder_Constructor((IShellFolder*)This, pidltemp);
+     pShellFolder = IShellFolder_Constructor(iface, pidltemp);
      ILFree(pidltemp);
    }
@@ -618 +736 @@
    LPVOID *ppvOut)
 {
-   ICOM_THIS(IGenericSFImpl, iface);
+   _ICOM_THIS_From_IShellFolder2(IGenericSFImpl, iface)
 
    char xriid[50];
@@ -651 +769 @@
    LPCITEMIDLIST pidl2)
 {
-   ICOM_THIS(IGenericSFImpl, iface);
+   _ICOM_THIS_From_IShellFolder2(IGenericSFImpl, iface)
 
    CHAR szTemp1[MAX_PATH];
@@ -706 +824 @@
            pidl2 = ILGetNext(pidl2);
 
-           hr = IShellFolder_BindToObject((IShellFolder*)This, pidlTemp, NULL, &IID_IShellFolder, (LPVOID*)&psf);
+           hr = IShellFolder_BindToObject(iface, pidlTemp, NULL, &IID_IShellFolder, (LPVOID*)&psf);
            if (SUCCEEDED(hr))
            {
@@ -737 +855 @@
        HWND hwndOwner, REFIID riid, LPVOID *ppvOut)
 {
-   ICOM_THIS(IGenericSFImpl, iface);
+   _ICOM_THIS_From_IShellFolder2(IGenericSFImpl, iface)
 
    LPSHELLVIEW pShellView;
@@ -752 +870 @@
      if(IsEqualIID(riid, &IID_IDropTarget))
      {
-       hr = IShellFolder_QueryInterface((IShellFolder*)This, &IID_IDropTarget, ppvOut);
+       hr = IShellFolder_QueryInterface(iface, &IID_IDropTarget, ppvOut);
      }
      else if(IsEqualIID(riid, &IID_IContextMenu))
@@ -761 +879 @@
      else if(IsEqualIID(riid, &IID_IShellView))
      {
-       pShellView = IShellView_Constructor((IShellFolder *) This);
+       pShellView = IShellView_Constructor((IShellFolder*)iface);
        if(pShellView)
        {
@@ -784 +902 @@
 static HRESULT WINAPI IShellFolder_fnGetAttributesOf(IShellFolder2 * iface,UINT cidl,LPCITEMIDLIST *apidl,DWORD *rgfInOut)
 {
-   ICOM_THIS(IGenericSFImpl, iface);
+   _ICOM_THIS_From_IShellFolder2(IGenericSFImpl, iface)
 
    HRESULT hr = S_OK;
 
    TRACE("(%p)->(cidl=%d apidl=%p mask=0x%08lx)\n",This,cidl,apidl,*rgfInOut);
+
+   if( !cidl && !apidl && rgfInOut )
+   {    //      return default
+        *rgfInOut = SFGAO_CAPABILITYMASK|SFGAO_FILESYSTEM;
+        return hr;
+   }
+
 
    if ( (!cidl) || (!apidl) || (!rgfInOut))
@@ -846 +971 @@
    LPVOID * ppvOut)
 {
-   ICOM_THIS(IGenericSFImpl, iface);
+   _ICOM_THIS_From_IShellFolder2(IGenericSFImpl, iface)
 
    char     xclsid[50];
@@ -864 +989 @@
      if(IsEqualIID(riid, &IID_IContextMenu) && (cidl >= 1))
      {
-       pObj  = (LPUNKNOWN)IContextMenu_Constructor((IShellFolder *)This, This->absPidl, apidl, cidl);
+       pObj  = (LPUNKNOWN)IContextMenu_Constructor((IShellFolder *)iface, This->absPidl, apidl, cidl);
        hr = S_OK;
      }
@@ -881 +1006 @@
      else if (IsEqualIID(riid, &IID_IDropTarget) && (cidl >= 1))
      {
-       hr = IShellFolder_QueryInterface((IShellFolder*)This, &IID_IDropTarget, (LPVOID*)&pObj);
+       hr = IShellFolder_QueryInterface(iface, &IID_IDropTarget, (LPVOID*)&pObj);
      }
      else
@@ -918 +1043 @@
    LPSTRRET strRet)
 {
-   ICOM_THIS(IGenericSFImpl, iface);
+   _ICOM_THIS_From_IShellFolder2(IGenericSFImpl, iface)
 
    CHAR     szPath[MAX_PATH]= "";
@@ -955 +1080 @@
      len = strlen(szPath);
 
-     if (!SUCCEEDED(SHELL32_GetDisplayNameOfChild((IShellFolder2*)This, pidl, dwFlags, szPath + len, MAX_PATH - len)))
+     if (!SUCCEEDED(SHELL32_GetDisplayNameOfChild(iface, pidl, dwFlags, szPath + len, MAX_PATH - len)))
        return E_OUTOFMEMORY;
    }
@@ -985 +1110 @@
    LPITEMIDLIST *pPidlOut)
 {
-   ICOM_THIS(IGenericSFImpl, iface);
+   _ICOM_THIS_From_IShellFolder2(IGenericSFImpl, iface)
 
    FIXME("(%p)->(%u,pidl=%p,%s,%lu,%p),stub!\n",
@@ -998 +1123 @@
 static HRESULT WINAPI IShellFolder_fnGetFolderPath(IShellFolder2 * iface, LPSTR lpszOut, DWORD dwOutSize)
 {
-   ICOM_THIS(IGenericSFImpl, iface);
+   _ICOM_THIS_From_IShellFolder2(IGenericSFImpl, iface)
 
    TRACE("(%p)->(%p %lu)\n",This, lpszOut, dwOutSize);
@@ -1018 +1143 @@
    GUID *pguid)
 {
-   ICOM_THIS(IGenericSFImpl, iface);
-   TRACE("(%p)\n",This);
+   _ICOM_THIS_From_IShellFolder2(IGenericSFImpl, iface)
+   FIXME("(%p)\n",This);
    return E_NOTIMPL;
 }
@@ -1026 +1151 @@
    IEnumExtraSearch **ppenum)
 {
-   ICOM_THIS(IGenericSFImpl, iface);
-   TRACE("(%p)\n",This);
+   _ICOM_THIS_From_IShellFolder2(IGenericSFImpl, iface)
+   FIXME("(%p)\n",This);
    return E_NOTIMPL;
 }
@@ -1036 +1161 @@
    ULONG *pDisplay)
 {
-   ICOM_THIS(IGenericSFImpl, iface);
+   _ICOM_THIS_From_IShellFolder2(IGenericSFImpl, iface)
 
    TRACE("(%p)\n",This);
@@ -1050 +1175 @@
    DWORD *pcsFlags)
 {
-   ICOM_THIS(IGenericSFImpl, iface);
+   _ICOM_THIS_From_IShellFolder2(IGenericSFImpl, iface)
 
    TRACE("(%p)\n",This);
@@ -1066 +1191 @@
    VARIANT *pv)
 {
-   ICOM_THIS(IGenericSFImpl, iface);
-   TRACE("(%p)\n",This);
+   _ICOM_THIS_From_IShellFolder2(IGenericSFImpl, iface)
+   FIXME("(%p)\n",This);
    return E_NOTIMPL;
 }
@@ -1076 +1201 @@
    SHELLDETAILS *psd)
 {
-   ICOM_THIS(IGenericSFImpl, iface);
+   _ICOM_THIS_From_IShellFolder2(IGenericSFImpl, iface)
    HRESULT hr = E_FAIL;
 
@@ -1110 +1235 @@
          break;
        case 4: /* attributes */
-         _ILGetAttributeStr(pidl, psd->str.u.cStr, MAX_PATH);
+         _ILGetFileAttributes(pidl, psd->str.u.cStr, MAX_PATH);
          break;
      }
@@ -1124 +1249 @@
    SHCOLUMNID *pscid)
 {
-   ICOM_THIS(IGenericSFImpl, iface);
-   TRACE("(%p)\n",This);
+   _ICOM_THIS_From_IShellFolder2(IGenericSFImpl, iface)
+   FIXME("(%p)\n",This);
    return E_NOTIMPL;
 }
@@ -1183 +1308 @@
    sf=(IGenericSFImpl*)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IGenericSFImpl));
    sf->ref=1;
-   sf->lpvtbl=&sfdvt;
+   ICOM_VTBL(sf)=&unkvt;
+   sf->lpvtblShellFolder=&sfdvt;
    sf->absPidl=_ILCreateDesktop();       /* my qualified pidl */
+   sf->pUnkOuter = (IUnknown *) &sf->lpVtbl;
 
    TRACE("(%p)\n",sf);
 
    shell32_ObjCount++;
-   return (IShellFolder *)sf;
+   return _IShellFolder_(sf);
 }
 
@@ -1202 +1329 @@
    LPVOID *ppvObj)
 {
-   ICOM_THIS(IGenericSFImpl, iface);
-
-   char  xriid[50];
-   WINE_StringFromCLSID((LPCLSID)riid,xriid);
-   TRACE("(%p)->(\n\tIID:\t%s,%p)\n",This,xriid,ppvObj);
-
-   *ppvObj = NULL;
-
-   if(IsEqualIID(riid, &IID_IUnknown))          /*IUnknown*/
-   { *ppvObj = This;
-   }
-   else if(IsEqualIID(riid, &IID_IShellFolder))  /*IShellFolder*/
-   {    *ppvObj = (IShellFolder*)This;
-   }
-   else if(IsEqualIID(riid, &IID_IShellFolder2))  /*IShellFolder2*/
-   {    *ppvObj = (IShellFolder2*)This;
-   }
-
-   if(*ppvObj)
-   {
-     IUnknown_AddRef((IUnknown*)(*ppvObj));
-     TRACE("-- Interface: (%p)->(%p)\n",ppvObj,*ppvObj);
-     return S_OK;
-   }
-   TRACE("-- Interface: E_NOINTERFACE\n");
-   return E_NOINTERFACE;
+  _ICOM_THIS_From_IShellFolder2(IGenericSFImpl, iface)
+
+  char  xriid[50];
+  WINE_StringFromCLSID((LPCLSID)riid,xriid);
+  TRACE("(%p)->(\n\tIID:\t%s,%p)\n",This,xriid,ppvObj);
+
+  *ppvObj = NULL;
+
+  if(IsEqualIID(riid, &IID_IUnknown))          /*IUnknown*/
+  {
+    *ppvObj = _IUnknown_(This);
+  }
+  else if(IsEqualIID(riid, &IID_IShellFolder))  /*IShellFolder*/
+  {
+    *ppvObj = _IShellFolder_(This);
+  }
+  else if(IsEqualIID(riid, &IID_IShellFolder2))  /*IShellFolder2*/
+  {
+    *ppvObj = _IShellFolder_(This);
+  }
+
+  if(*ppvObj)
+  {
+    IUnknown_AddRef((IUnknown*)(*ppvObj));
+    TRACE("-- Interface: (%p)->(%p)\n",ppvObj,*ppvObj);
+    return S_OK;
+  }
+  TRACE("-- Interface: E_NOINTERFACE\n");
+  return E_NOINTERFACE;
 }
 
@@ -1246 +1376 @@
    DWORD *pdwAttributes)
 {
-   ICOM_THIS(IGenericSFImpl, iface);
+   _ICOM_THIS_From_IShellFolder2(IGenericSFImpl, iface)
 
    LPCWSTR     szNext=NULL;
@@ -1265 +1395 @@
    if (szNext && *szNext)
    {
-     hr = SHELL32_ParseNextElement(hwndOwner, (IShellFolder2*)This, &pidlTemp, (LPOLESTR)szNext, pchEaten, pdwAttributes);
+     hr = SHELL32_ParseNextElement(hwndOwner,iface, &pidlTemp, (LPOLESTR)szNext, pchEaten, pdwAttributes);
    }
    else
@@ -1288 +1418 @@
    LPENUMIDLIST* ppEnumIDList)
 {
-   ICOM_THIS(IGenericSFImpl, iface);
+   _ICOM_THIS_From_IShellFolder2(IGenericSFImpl, iface)
 
    TRACE("(%p)->(HWND=0x%08x flags=0x%08lx pplist=%p)\n",This,hwndOwner,dwFlags,ppEnumIDList);
@@ -1308 +1438 @@
          LPBC pbcReserved, REFIID riid, LPVOID * ppvOut)
 {
-   ICOM_THIS(IGenericSFImpl, iface);
+   _ICOM_THIS_From_IShellFolder2(IGenericSFImpl, iface)
    GUID     const * clsid;
    char     xriid[50];
@@ -1322 +1452 @@
    if (clsid)
    {
-     if ( IsEqualIID(clsid, &IID_MyComputer))
+     if ( IsEqualIID(clsid, &CLSID_MyComputer))
      {
        pShellFolder = ISF_MyComputer_Constructor();
@@ -1338 +1468 @@
    {
      /* file system folder on the desktop */
-     LPITEMIDLIST pidltemp = ILCloneFirst(pidl);
-     pShellFolder = IShellFolder_Constructor((IShellFolder*)This, pidltemp);
-     ILFree(pidltemp);
+     LPITEMIDLIST deskpidl, firstpidl, completepidl;
+     IPersistFolder * ppf;
+
+     /* combine pidls */
+     SHGetSpecialFolderLocation(0, CSIDL_DESKTOPDIRECTORY, &deskpidl);
+     firstpidl = ILCloneFirst(pidl);
+     completepidl = ILCombine(deskpidl, firstpidl);
+
+     pShellFolder = IShellFolder_Constructor(NULL, NULL);
+     if (SUCCEEDED(IShellFolder_QueryInterface(pShellFolder, &IID_IPersistFolder, (LPVOID*)&ppf)))
+     {
+       IPersistFolder_Initialize(ppf, completepidl);
+       IPersistFolder_Release(ppf);
+     }
+     ILFree(completepidl);
+     ILFree(deskpidl);
+     ILFree(firstpidl);
    }
 
@@ -1365 +1509 @@
        HWND hwndOwner, REFIID riid, LPVOID *ppvOut)
 {
-   ICOM_THIS(IGenericSFImpl, iface);
+   _ICOM_THIS_From_IShellFolder2(IGenericSFImpl, iface)
 
    LPSHELLVIEW pShellView;
@@ -1390 +1534 @@
      else if(IsEqualIID(riid, &IID_IShellView))
      {
-       pShellView = IShellView_Constructor((IShellFolder *) This);
+       pShellView = IShellView_Constructor((IShellFolder*)iface);
        if(pShellView)
        {
@@ -1407 +1551 @@
 static HRESULT WINAPI ISF_Desktop_fnGetAttributesOf(IShellFolder2 * iface,UINT cidl,LPCITEMIDLIST *apidl,DWORD *rgfInOut)
 {
-   ICOM_THIS(IGenericSFImpl, iface);
+   _ICOM_THIS_From_IShellFolder2(IGenericSFImpl, iface)
 
    GUID     const * clsid;
@@ -1425 +1569 @@
      if (clsid)
      {
-       if (IsEqualIID(clsid, &IID_MyComputer))
+       if (IsEqualIID(clsid, &CLSID_MyComputer))
        {
          *rgfInOut &= 0xb0000154;
@@ -1473 +1617 @@
    LPSTRRET strRet)
 {
-   ICOM_THIS(IGenericSFImpl, iface);
+   _ICOM_THIS_From_IShellFolder2(IGenericSFImpl, iface)
 
    CHAR     szPath[MAX_PATH]= "";
@@ -1492 +1636 @@
    else
    {
-     if (!SUCCEEDED(SHELL32_GetDisplayNameOfChild((IShellFolder2*)This, pidl, dwFlags, szPath, MAX_PATH)))
+     if (!SUCCEEDED(SHELL32_GetDisplayNameOfChild(iface, pidl, dwFlags, szPath, MAX_PATH)))
        return E_OUTOFMEMORY;
    }
@@ -1507 +1651 @@
    GUID *pguid)
 {
-   ICOM_THIS(IGenericSFImpl, iface);
+   _ICOM_THIS_From_IShellFolder2(IGenericSFImpl, iface)
    FIXME("(%p)\n",This);
    return E_NOTIMPL;
@@ -1515 +1659 @@
    IEnumExtraSearch **ppenum)
 {
-   ICOM_THIS(IGenericSFImpl, iface);
+   _ICOM_THIS_From_IShellFolder2(IGenericSFImpl, iface)
    FIXME("(%p)\n",This);
    return E_NOTIMPL;
@@ -1525 +1669 @@
    ULONG *pDisplay)
 {
-   ICOM_THIS(IGenericSFImpl, iface);
+   _ICOM_THIS_From_IShellFolder2(IGenericSFImpl, iface)
 
    TRACE("(%p)\n",This);
@@ -1539 +1683 @@
    DWORD *pcsFlags)
 {
-   ICOM_THIS(IGenericSFImpl, iface);
+   _ICOM_THIS_From_IShellFolder2(IGenericSFImpl, iface)
 
    TRACE("(%p)\n",This);
@@ -1555 +1699 @@
    VARIANT *pv)
 {
-   ICOM_THIS(IGenericSFImpl, iface);
+   _ICOM_THIS_From_IShellFolder2(IGenericSFImpl, iface)
    FIXME("(%p)\n",This);
 
@@ -1566 +1710 @@
    SHELLDETAILS *psd)
 {
-   ICOM_THIS(IGenericSFImpl, iface);
+   _ICOM_THIS_From_IShellFolder2(IGenericSFImpl, iface)
    HRESULT hr = E_FAIL;;
 
@@ -1599 +1743 @@
          break;
        case 4: /* attributes */
-         _ILGetAttributeStr(pidl, psd->str.u.cStr, MAX_PATH);
+         _ILGetFileAttributes(pidl, psd->str.u.cStr, MAX_PATH);
          break;
      }
@@ -1613 +1757 @@
    SHCOLUMNID *pscid)
 {
-   ICOM_THIS(IGenericSFImpl, iface);
+   _ICOM_THIS_From_IShellFolder2(IGenericSFImpl, iface)
    FIXME("(%p)\n",This);
    return E_NOTIMPL;
@@ -1671 +1815 @@
    sf->ref=1;
 
-   sf->lpvtbl = &sfmcvt;
+   ICOM_VTBL(sf)=&unkvt;
+   sf->lpvtblShellFolder=&sfmcvt;
    sf->lpvtblPersistFolder = &psfvt;
    sf->pclsid = (CLSID*)&CLSID_SFMyComp;
    sf->absPidl=_ILCreateMyComputer();    /* my qualified pidl */
+   sf->pUnkOuter = (IUnknown *) &sf->lpVtbl;
 
    TRACE("(%p)\n",sf);
 
    shell32_ObjCount++;
-   return (IShellFolder *)sf;
+   return _IShellFolder_(sf);
 }
 
@@ -1694 +1840 @@
    DWORD *pdwAttributes)
 {
-   ICOM_THIS(IGenericSFImpl, iface);
+   _ICOM_THIS_From_IShellFolder2(IGenericSFImpl, iface)
 
    HRESULT     hr = E_OUTOFMEMORY;
@@ -1717 +1863 @@
      if (szNext && *szNext)
      {
-       hr = SHELL32_ParseNextElement(hwndOwner, (IShellFolder2*)This, &pidlTemp, (LPOLESTR)szNext, pchEaten, pdwAttributes);
+       hr = SHELL32_ParseNextElement(hwndOwner,iface, &pidlTemp, (LPOLESTR)szNext, pchEaten, pdwAttributes);
      }
      else
@@ -1740 +1886 @@
    LPENUMIDLIST* ppEnumIDList)
 {
-   ICOM_THIS(IGenericSFImpl, iface);
+   _ICOM_THIS_From_IShellFolder2(IGenericSFImpl, iface)
 
    TRACE("(%p)->(HWND=0x%08x flags=0x%08lx pplist=%p)\n",This,hwndOwner,dwFlags,ppEnumIDList);
@@ -1760 +1906 @@
          LPBC pbcReserved, REFIID riid, LPVOID * ppvOut)
 {
-   ICOM_THIS(IGenericSFImpl, iface);
+   _ICOM_THIS_From_IShellFolder2(IGenericSFImpl, iface)
    GUID     const * clsid;
    char     xriid[50];
@@ -1770 +1916 @@
    TRACE("(%p)->(pidl=%p,%p,\n\tIID:\t%s,%p)\n",This,pidl,pbcReserved,xriid,ppvOut);
 
-   if(!pidl || !ppvOut) return E_INVALIDARG;
+   if(!ppvOut) return E_INVALIDARG;
 
    *ppvOut = NULL;
 
-   if ((clsid=_ILGetGUIDPointer(pidl)) && !IsEqualIID(clsid, &IID_MyComputer))
+   if (!pidl) return E_INVALIDARG;
+
+   if ((clsid=_ILGetGUIDPointer(pidl)) && !IsEqualIID(clsid, &CLSID_MyComputer))
    {
       if (!SUCCEEDED(SHELL32_CoCreateInitSF (This->absPidl, pidl, clsid, riid, (LPVOID*)&pShellFolder)))
@@ -1786 +1934 @@
 
      pidltemp = ILCloneFirst(pidl);
-     pShellFolder = IShellFolder_Constructor((IShellFolder*)This, pidltemp);
+     pShellFolder = IShellFolder_Constructor(iface, pidltemp);
      ILFree(pidltemp);
    }
@@ -1812 +1960 @@
        HWND hwndOwner, REFIID riid, LPVOID *ppvOut)
 {
-   ICOM_THIS(IGenericSFImpl, iface);
+   _ICOM_THIS_From_IShellFolder2(IGenericSFImpl, iface)
 
    LPSHELLVIEW pShellView;
@@ -1837 +1985 @@
      else if(IsEqualIID(riid, &IID_IShellView))
      {
-       pShellView = IShellView_Constructor((IShellFolder *) This);
+       pShellView = IShellView_Constructor((IShellFolder*)iface);
        if(pShellView)
        {
@@ -1854 +2002 @@
 static HRESULT WINAPI ISF_MyComputer_fnGetAttributesOf(IShellFolder2 * iface,UINT cidl,LPCITEMIDLIST *apidl,DWORD *rgfInOut)
 {
-   ICOM_THIS(IGenericSFImpl, iface);
+   _ICOM_THIS_From_IShellFolder2(IGenericSFImpl, iface)
 
    GUID     const * clsid;
@@ -1910 +2058 @@
    LPSTRRET strRet)
 {
-   ICOM_THIS(IGenericSFImpl, iface);
+   _ICOM_THIS_From_IShellFolder2(IGenericSFImpl, iface)
 
    char     szPath[MAX_PATH], szDrive[18];
@@ -1962 +2110 @@
      len = strlen(szPath);
 
-     if (!SUCCEEDED(SHELL32_GetDisplayNameOfChild((IShellFolder2*)This, pidl, dwFlags | SHGDN_FORPARSING, szPath + len, MAX_PATH - len)))
+     if (!SUCCEEDED(SHELL32_GetDisplayNameOfChild(iface, pidl, dwFlags | SHGDN_FORPARSING, szPath + len, MAX_PATH - len)))
        return E_OUTOFMEMORY;
    }
@@ -1977 +2125 @@
    GUID *pguid)
 {
-   ICOM_THIS(IGenericSFImpl, iface);
+   _ICOM_THIS_From_IShellFolder2(IGenericSFImpl, iface)
    FIXME("(%p)\n",This);
    return E_NOTIMPL;
@@ -1985 +2133 @@
    IEnumExtraSearch **ppenum)
 {
-   ICOM_THIS(IGenericSFImpl, iface);
+   _ICOM_THIS_From_IShellFolder2(IGenericSFImpl, iface)
    FIXME("(%p)\n",This);
    return E_NOTIMPL;
@@ -1995 +2143 @@
    ULONG *pDisplay)
 {
-   ICOM_THIS(IGenericSFImpl, iface);
+   _ICOM_THIS_From_IShellFolder2(IGenericSFImpl, iface)
 
    TRACE("(%p)\n",This);
@@ -2009 +2157 @@
    DWORD *pcsFlags)
 {
-   ICOM_THIS(IGenericSFImpl, iface);
+   _ICOM_THIS_From_IShellFolder2(IGenericSFImpl, iface)
 
    TRACE("(%p)\n",This);
@@ -2025 +2173 @@
    VARIANT *pv)
 {
-   ICOM_THIS(IGenericSFImpl, iface);
+   _ICOM_THIS_From_IShellFolder2(IGenericSFImpl, iface)
    FIXME("(%p)\n",This);
 
@@ -2038 +2186 @@
    SHELLDETAILS *psd)
 {
-   ICOM_THIS(IGenericSFImpl, iface);
+   _ICOM_THIS_From_IShellFolder2(IGenericSFImpl, iface)
    HRESULT hr;
 
@@ -2073 +2221 @@
            _ILSimpleGetText(pidl, szPath, MAX_PATH);
            GetDiskFreeSpaceExA(szPath, NULL, &ulBytes, NULL);
+           //CB: WINE uses ulBytes.s.LowPart
            StrFormatByteSizeA(ulBytes.LowPart, psd->str.u.cStr, MAX_PATH);
          }
@@ -2081 +2230 @@
            _ILSimpleGetText(pidl, szPath, MAX_PATH);
            GetDiskFreeSpaceExA(szPath, &ulBytes, NULL, NULL);
+           //CB: WINE uses ulBytes.s.LowPart
            StrFormatByteSizeA(ulBytes.LowPart, psd->str.u.cStr, MAX_PATH);
          }
@@ -2095 +2245 @@
    SHCOLUMNID *pscid)
 {
-   ICOM_THIS(IGenericSFImpl, iface);
+   _ICOM_THIS_From_IShellFolder2(IGenericSFImpl, iface)
    FIXME("(%p)\n",This);
    return E_NOTIMPL;
@@ -2141 +2291 @@
    TRACE("(%p)\n", This);
 
-   return IShellFolder_QueryInterface((IShellFolder*)This, iid, ppvObj);
+   return IUnknown_QueryInterface(This->pUnkOuter, iid, ppvObj);
 }
 
@@ -2151 +2301 @@
    IPersistFolder *                      iface)
 {
-   _ICOM_THIS_From_IPersistFolder(IShellFolder, iface);
-
-   TRACE("(%p)\n", This);
-
-   return IShellFolder_AddRef((IShellFolder*)This);
+  _ICOM_THIS_From_IPersistFolder(IGenericSFImpl, iface);
+
+  TRACE("(%p)\n", This);
+
+  return IUnknown_AddRef(This->pUnkOuter);
 }
 
@@ -2169 +2319 @@
    TRACE("(%p)\n", This);
 
-   return IShellFolder_Release((IShellFolder*)This);
+   return IUnknown_Release(This->pUnkOuter);
 }
 
@@ -2199 +2349 @@
    LPCITEMIDLIST                         pidl)
 {
+   char sTemp[MAX_PATH];
    _ICOM_THIS_From_IPersistFolder(IGenericSFImpl, iface);
 
-   TRACE("(%p)\n", This);
-
-   if(This->absPidl)
-   {
-     SHFree(This->absPidl);
-     This->absPidl = NULL;
-   }
-   This->absPidl = ILClone(pidl);
-   return S_OK;
+  TRACE("(%p)->(%p)\n", This, pidl);
+
+  /* free the old stuff */
+  if(This->absPidl)
+  {
+    SHFree(This->absPidl);
+    This->absPidl = NULL;
+  }
+  if(This->sMyPath)
+  {
+    SHFree(This->sMyPath);
+    This->sMyPath = NULL;
+  }
+
+  /* set my pidl */
+  This->absPidl = ILClone(pidl);
+
+  /* set my path */
+  if (SHGetPathFromIDListA(pidl, sTemp))
+  {
+    This->sMyPath = (CHAR*)SHAlloc(strlen(sTemp+1));
+    strcpy(This->sMyPath, sTemp);
+  }
+
+  TRACE("--(%p)->(%s)\n", This, This->sMyPath);
+
+  return S_OK;
 }
 
@@ -2258 +2427 @@
    TRACE("(%p)\n", This);
 
-   return IShellFolder_QueryInterface((IShellFolder*)This, riid, ppvObj);
+   return IUnknown_QueryInterface(This->pUnkOuter, riid, ppvObj);
 }
 
@@ -2267 +2436 @@
    TRACE("(%p)\n", This);
 
-   return IShellFolder_AddRef((IShellFolder*)This);
+   return IUnknown_AddRef(This->pUnkOuter);
 }
 
@@ -2276 +2445 @@
    TRACE("(%p)\n", This);
 
-   return IShellFolder_Release((IShellFolder*)This);
+   return IUnknown_Release(This->pUnkOuter);
 }