Changeset 4032 for trunk/src/shell32/pidl.cpp

Timestamp:

Aug 18, 2000, 4:01:27 AM (25 years ago)

Author:

phaller

Message:

Synchronized shell32 with wine

File:

• trunk/src/shell32/pidl.cpp (modified) (8 diffs)

trunk/src/shell32/pidl.cpp

@@ -1 @@
-/* $Id: pidl.cpp,v 1.8 2000-05-01 01:33:25 phaller Exp $ */
+/* $Id: pidl.cpp,v 1.9 2000-08-18 02:01:17 phaller Exp $ */
 
 /*
@@ -748 +748 @@
      return FALSE;
 
-   return SHFree(pidl);
+  SHFree(pidl);
+  return TRUE;
 }
 /*************************************************************************
@@ -755 +756 @@
  */
 
-ODINFUNCTION1(DWORD,ILGlobalFree,LPITEMIDLIST, pidl)
+ODINPROCEDURE1(ILGlobalFree,
+               LPITEMIDLIST, pidl)
 {
    TRACE_(pidl)("%p\n",pidl);
 
-   if (!pidl)
-     return FALSE;
-
-   return pCOMCTL32_Free (pidl);
+   if (pidl)
+     pCOMCTL32_Free (pidl);
 }
 /*************************************************************************
@@ -803 +803 @@
  */
 
-ODINFUNCTION1(LPITEMIDLIST,SHSimpleIDListFromPathA,LPSTR, lpszPath)
+ODINFUNCTION1(LPITEMIDLIST,SHSimpleIDListFromPathA,LPCSTR, lpszPath)
 {
    LPITEMIDLIST   pidl=NULL;
@@ -828 +828 @@
 }
 
-ODINFUNCTION1(LPITEMIDLIST,SHSimpleIDListFromPathW,LPWSTR, lpszPath)
+ODINFUNCTION1(LPITEMIDLIST,SHSimpleIDListFromPathW,LPCWSTR, lpszPath)
 {
    char  lpszTemp[MAX_PATH];
 
-   WideCharToLocal(lpszTemp, lpszPath, MAX_PATH);
+   WideCharToLocal(lpszTemp, (LPWSTR)lpszPath, MAX_PATH);
 
    return SHSimpleIDListFromPathA (lpszTemp);
 }
 
-ODINFUNCTION1(LPITEMIDLIST,SHSimpleIDListFromPathAW,LPVOID, lpszPath)
+ODINFUNCTION1(LPITEMIDLIST,SHSimpleIDListFromPathAW,LPCVOID, lpszPath)
 {
    if ( VERSION_OsIsUnicode())
@@ -1878 +1878 @@
     WORD wAttrib = 0;
     int i;
-
+  
+    if (! pData) return 0;
+  
     switch(pData->type)
     {
@@ -1888 +1890 @@
             break;
     }
+  
     if(uOutSize >= 6)
     {
@@ -1916 +1919 @@
 }
 
+
+/*************************************************************************
+* ILFreeaPidl
+*
+* free a aPidl struct
+*/
+ODINPROCEDURE2(_ILFreeaPidl,
+               LPITEMIDLIST *, apidl, 
+               UINT, cidl)
+{
+        int   i;
+
+        if(apidl)
+        {
+          for(i = 0; i < cidl; i++) SHFree(apidl[i]);
+          SHFree(apidl);
+        }
+}
+
+/*************************************************************************
+* ILCopyaPidl
+*
+* copys a aPidl struct
+*/
+ODINFUNCTION2(LPITEMIDLIST *,_ILCopyaPidl,
+              LPITEMIDLIST *,apidlsrc, 
+              UINT,          cidl)
+{
+        int i;
+        LPITEMIDLIST * apidldest = (LPITEMIDLIST*)SHAlloc(cidl * sizeof(LPITEMIDLIST));
+        if(!apidlsrc) return NULL;
+
+        for(i = 0; i < cidl; i++)
+          apidldest[i] = ILClone(apidlsrc[i]);
+
+        return apidldest;
+}
+
+/*************************************************************************
+* _ILCopyCidaToaPidl
+*
+* creates aPidl from CIDA
+*/
+ODINFUNCTION2(LPITEMIDLIST*, _ILCopyCidaToaPidl,
+              LPITEMIDLIST*, pidl, 
+              LPCIDA,        cida)
+{
+        int i;
+        LPITEMIDLIST * dst = (LPITEMIDLIST*)SHAlloc(cida->cidl * sizeof(LPITEMIDLIST));
+
+        if(!dst) return NULL;
+
+        if (pidl)
+          *pidl = ILClone((LPITEMIDLIST)(&((LPBYTE)cida)[cida->aoffset[0]]));
+
+        for(i = 0; i < cida->cidl; i++)
+          dst[i] = ILClone((LPITEMIDLIST)(&((LPBYTE)cida)[cida->aoffset[i + 1]]));
+
+        return dst;
+}