Beginning of cleanup of shlobj.h
Vincent Béron
vberon at mecano.gme.usherb.ca
Sat Jun 1 20:48:24 CDT 2002
This is not meant to be applied yet, only for review.
I was making a bit of verifications in include/shlobj.h, and I saw an
LPCsomething which wasn't declared as constant (via typedef). So I began
to investigate...
This patch is the first results. There are some warnings which appeared
as a side-effect of the cleanup, and they haven't all been resolved yet.
It seems some APIs take an LPCsomething as argument, but then the
current implementation passes the pointer to some other function which
then can modify the memory pointed to (because the const keyword is
absent from the prototype of those functions).
Somebody wants to help me a bit on this?
For new developpers willing to help: to see which are the new warnings,
first build Wine without this patch, then apply it and rebuild while
redirecting the output of make.
This current patch is known to break at least ILAppendID, and probably
some other APIs.
Vincent
-------------- next part --------------
diff -urN wine-orig/dlls/shell32/pidl.c wine-pas-compil?/dlls/shell32/pidl.c
--- wine-orig/dlls/shell32/pidl.c Fri May 31 19:32:17 2002
+++ wine-pas-compil?/dlls/shell32/pidl.c Sat Jun 1 21:16:22 2002
@@ -46,10 +46,10 @@
/*************************************************************************
* ILGetDisplayName [SHELL32.15]
*/
-BOOL WINAPI ILGetDisplayName(LPCITEMIDLIST pidl,LPSTR path)
+BOOL WINAPI ILGetDisplayName(LPCITEMIDLIST pidl,LPSTR lpszName)
{
- TRACE_(shell)("pidl=%p %p semi-stub\n",pidl,path);
- return SHGetPathFromIDListA(pidl, path);
+ TRACE_(shell)("pidl=%p %p semi-stub\n",pidl,lpszName);
+ return SHGetPathFromIDListA(pidl, lpszName);
}
/*************************************************************************
* ILFindLastID [SHELL32.16]
@@ -57,7 +57,7 @@
* NOTES
* observed: pidl=Desktop return=pidl
*/
-LPITEMIDLIST WINAPI ILFindLastID(LPITEMIDLIST pidl)
+LPITEMIDLIST WINAPI ILFindLastID(LPCITEMIDLIST pidl)
{ LPITEMIDLIST pidlLast = pidl;
TRACE("(pidl=%p)\n",pidl);
@@ -75,7 +75,7 @@
* NOTES
* when pidl=Desktop return=FALSE
*/
-BOOL WINAPI ILRemoveLastID(LPCITEMIDLIST pidl)
+BOOL WINAPI ILRemoveLastID(LPITEMIDLIST pidl)
{
TRACE_(shell)("pidl=%p\n",pidl);
@@ -144,40 +144,40 @@
* NOTES
* the first two bytes are the len, the pidl is following then
*/
-HRESULT WINAPI ILLoadFromStream (IStream * pStream, LPITEMIDLIST * ppPidl)
+HRESULT WINAPI ILLoadFromStream (LPSTREAM pstrm, LPITEMIDLIST *ppidl)
{ WORD wLen = 0;
DWORD dwBytesRead;
HRESULT ret = E_FAIL;
- TRACE_(shell)("%p %p\n", pStream , ppPidl);
+ TRACE_(shell)("%p %p\n", pstrm , ppidl);
- if (*ppPidl)
- { SHFree(*ppPidl);
- *ppPidl = NULL;
+ if (*ppidl)
+ { SHFree(*ppidl);
+ *ppidl = NULL;
}
- IStream_AddRef (pStream);
+ IStream_AddRef (pstrm);
- if (SUCCEEDED(IStream_Read(pStream, (LPVOID)&wLen, 2, &dwBytesRead)))
- { *ppPidl = SHAlloc (wLen);
- if (SUCCEEDED(IStream_Read(pStream, *ppPidl , wLen, &dwBytesRead)))
+ if (SUCCEEDED(IStream_Read(pstrm, (LPVOID)&wLen, 2, &dwBytesRead)))
+ { *ppidl = SHAlloc (wLen);
+ if (SUCCEEDED(IStream_Read(pstrm, *ppidl , wLen, &dwBytesRead)))
{ ret = S_OK;
}
else
- { SHFree(*ppPidl);
- *ppPidl = NULL;
+ { SHFree(*ppidl);
+ *ppidl = NULL;
}
}
/* we are not yet fully compatible */
- if (!pcheck(*ppPidl))
- { SHFree(*ppPidl);
- *ppPidl = NULL;
+ if (!pcheck(*ppidl))
+ { SHFree(*ppidl);
+ *ppidl = NULL;
}
- IStream_Release (pStream);
+ IStream_Release (pstrm);
return ret;
}
@@ -188,32 +188,32 @@
* NOTES
* the first two bytes are the len, the pidl is following then
*/
-HRESULT WINAPI ILSaveToStream (IStream * pStream, LPCITEMIDLIST pPidl)
+HRESULT WINAPI ILSaveToStream (LPSTREAM pstrm, LPCITEMIDLIST pidl)
{
- LPITEMIDLIST pidl;
+ LPITEMIDLIST pidltemp;
WORD wLen = 0;
HRESULT ret = E_FAIL;
- TRACE_(shell)("%p %p\n", pStream, pPidl);
+ TRACE_(shell)("%p %p\n", pstrm, pidl);
- IStream_AddRef (pStream);
+ IStream_AddRef (pstrm);
- pidl = pPidl;
- while (pidl->mkid.cb)
+ pidltemp = pidl;
+ while (pidltemp->mkid.cb)
{
- wLen += sizeof(WORD) + pidl->mkid.cb;
- pidl = ILGetNext(pidl);
+ wLen += sizeof(WORD) + pidltemp->mkid.cb;
+ pidltemp = ILGetNext(pidltemp);
}
- if (SUCCEEDED(IStream_Write(pStream, (LPVOID)&wLen, 2, NULL)))
+ if (SUCCEEDED(IStream_Write(pstrm, (LPVOID)&wLen, 2, NULL)))
{
- if (SUCCEEDED(IStream_Write(pStream, pPidl, wLen, NULL)))
+ if (SUCCEEDED(IStream_Write(pstrm, pidl, wLen, NULL)))
{ ret = S_OK;
}
}
- IStream_Release (pStream);
+ IStream_Release (pstrm);
return ret;
}
@@ -224,43 +224,43 @@
* NOTES
* wraper for IShellFolder::ParseDisplayName()
*/
-HRESULT WINAPI SHILCreateFromPathA (LPCSTR path, LPITEMIDLIST * ppidl, DWORD * attributes)
+HRESULT WINAPI SHILCreateFromPathA (LPCSTR lpszPath, LPITEMIDLIST * ppidl, ULONG * pdwAttributes)
{ LPSHELLFOLDER sf;
WCHAR lpszDisplayName[MAX_PATH];
DWORD pchEaten;
HRESULT ret = E_FAIL;
- TRACE_(shell)("%s %p 0x%08lx\n",path,ppidl,attributes?*attributes:0);
+ TRACE_(shell)("%s %p 0x%08lx\n",lpszPath,ppidl,pdwAttributes?*pdwAttributes:0);
- if (!MultiByteToWideChar( CP_ACP, 0, path, -1, lpszDisplayName, MAX_PATH ))
+ if (!MultiByteToWideChar( CP_ACP, 0, lpszPath, -1, lpszDisplayName, MAX_PATH ))
lpszDisplayName[MAX_PATH-1] = 0;
if (SUCCEEDED (SHGetDesktopFolder(&sf)))
{
- ret = IShellFolder_ParseDisplayName(sf,0, NULL,lpszDisplayName,&pchEaten,ppidl,attributes);
+ ret = IShellFolder_ParseDisplayName(sf,0, NULL,lpszDisplayName,&pchEaten,ppidl,pdwAttributes);
IShellFolder_Release(sf);
}
return ret;
}
-HRESULT WINAPI SHILCreateFromPathW (LPCWSTR path, LPITEMIDLIST * ppidl, DWORD * attributes)
+HRESULT WINAPI SHILCreateFromPathW (LPCWSTR lpszPath, LPITEMIDLIST * ppidl, ULONG * pdwAttributes)
{ LPSHELLFOLDER sf;
DWORD pchEaten;
HRESULT ret = E_FAIL;
- TRACE_(shell)("%s %p 0x%08lx\n",debugstr_w(path),ppidl,attributes?*attributes:0);
+ TRACE_(shell)("%s %p 0x%08lx\n",debugstr_w(lpszPath),ppidl,pdwAttributes?*pdwAttributes:0);
if (SUCCEEDED (SHGetDesktopFolder(&sf)))
{
- ret = IShellFolder_ParseDisplayName(sf,0, NULL, (LPWSTR) path, &pchEaten, ppidl, attributes);
+ ret = IShellFolder_ParseDisplayName(sf,0, NULL, (LPWSTR) lpszPath, &pchEaten, ppidl, pdwAttributes);
IShellFolder_Release(sf);
}
return ret;
}
-HRESULT WINAPI SHILCreateFromPathAW (LPCVOID path, LPITEMIDLIST * ppidl, DWORD * attributes)
+HRESULT WINAPI SHILCreateFromPathAW (LPCVOID lpszPath, LPITEMIDLIST * ppidl, ULONG * pdwAttributes)
{
if ( SHELL_OsIsUnicode())
- return SHILCreateFromPathW (path, ppidl, attributes);
- return SHILCreateFromPathA (path, ppidl, attributes);
+ return SHILCreateFromPathW (lpszPath, ppidl, pdwAttributes);
+ return SHILCreateFromPathA (lpszPath, ppidl, pdwAttributes);
}
/*************************************************************************
@@ -391,59 +391,59 @@
* ILFindChild [SHELL32.24]
*
* NOTES
- * Compares elements from pidl1 and pidl2.
+ * Compares elements from pidlParent and pidlChild.
*
- * pidl1 is desktop pidl2
- * pidl1 shorter pidl2 pointer to first different element of pidl2
- * if there was at least one equal element
- * pidl2 shorter pidl1 0
- * pidl2 equal pidl1 pointer to last 0x00-element of pidl2
+ * pidlParent is desktop pidlChild
+ * pidlParent shorter pidlChild pointer to first different element of pidlChild
+ * if there was at least one equal element
+ * pidlChild shorter pidlParent 0
+ * pidlChild equal pidlParent pointer to last 0x00-element of pidlChild
*/
-LPITEMIDLIST WINAPI ILFindChild(LPCITEMIDLIST pidl1,LPCITEMIDLIST pidl2)
+LPITEMIDLIST WINAPI ILFindChild(LPCITEMIDLIST pidlParent,LPCITEMIDLIST pidlChild)
{
- char szData1[MAX_PATH];
- char szData2[MAX_PATH];
+ char szDataParent[MAX_PATH];
+ char szDataChild[MAX_PATH];
- LPITEMIDLIST pidltemp1 = pidl1;
- LPITEMIDLIST pidltemp2 = pidl2;
+ LPITEMIDLIST pidltempParent = pidlParent;
+ LPITEMIDLIST pidltempChild = pidlChild;
LPITEMIDLIST ret=NULL;
- TRACE("pidl1=%p pidl2=%p\n",pidl1, pidl2);
+ TRACE("pidl1=%p pidl2=%p\n",pidlParent, pidlChild);
/* explorer reads from registry directly (StreamMRU),
so we can only check here */
- if ((!pcheck (pidl1)) || (!pcheck (pidl2)))
+ if ((!pcheck (pidlParent)) || (!pcheck (pidlChild)))
return FALSE;
- pdump (pidl1);
- pdump (pidl2);
+ pdump (pidlParent);
+ pdump (pidlChild);
- if ( _ILIsDesktop(pidl1) )
+ if ( _ILIsDesktop(pidlParent) )
{
- ret = pidl2;
+ ret = pidlChild;
}
else
{
- while (pidltemp1->mkid.cb && pidltemp2->mkid.cb)
+ while (pidltempParent->mkid.cb && pidltempChild->mkid.cb)
{
- _ILSimpleGetText(pidltemp1, szData1, MAX_PATH);
- _ILSimpleGetText(pidltemp2, szData2, MAX_PATH);
+ _ILSimpleGetText(pidltempParent, szDataParent, MAX_PATH);
+ _ILSimpleGetText(pidltempChild, szDataChild, MAX_PATH);
- if (strcasecmp(szData1,szData2))
+ if (strcasecmp(szDataParent,szDataChild))
break;
- pidltemp1 = ILGetNext(pidltemp1);
- pidltemp2 = ILGetNext(pidltemp2);
- ret = pidltemp2;
+ pidltempParent = ILGetNext(pidltempParent);
+ pidltempChild = ILGetNext(pidltempChild);
+ ret = pidltempChild;
}
- if (pidltemp1->mkid.cb)
+ if (pidltempParent->mkid.cb)
{
- ret = NULL; /* elements of pidl1 left*/
+ ret = NULL; /* elements of pidlParent left*/
}
}
TRACE_(shell)("--- %p\n", ret);
- return ret; /* pidl 1 is shorter */
+ return ret; /* pidlParent is shorter */
}
/*************************************************************************
@@ -533,10 +533,10 @@
* NOTES
* exported by ordinal
*/
-DWORD WINAPI ILGetSize(LPITEMIDLIST pidl)
+UINT WINAPI ILGetSize(LPCITEMIDLIST pidl)
{
LPSHITEMID si = &(pidl->mkid);
- DWORD len=0;
+ UINT len=0;
if (pidl)
{ while (si->cb)
@@ -559,7 +559,7 @@
* simple pidl -> pointer to 0x0000 element
*
*/
-LPITEMIDLIST WINAPI ILGetNext(LPITEMIDLIST pidl)
+LPITEMIDLIST WINAPI ILGetNext(LPCITEMIDLIST pidl)
{
WORD len;
@@ -575,38 +575,38 @@
return NULL;
}
/*************************************************************************
- * ILAppend [SHELL32.154]
+ * ILAppendID [SHELL32.154]
*
* NOTES
* Adds the single item to the idlist indicated by pidl.
- * if bEnd is 0, adds the item to the front of the list,
+ * if bAttToEnd is 0, adds the item to the front of the list,
* otherwise adds the item to the end. (???)
* Destroys the passed in idlist! (???)
*/
-LPITEMIDLIST WINAPI ILAppend(LPITEMIDLIST pidl,LPCITEMIDLIST item,BOOL bEnd)
+LPITEMIDLIST WINAPI ILAppendID(LPITEMIDLIST pidl,LPCSHITEMID lpItemID,BOOL bAddToEnd)
{
LPITEMIDLIST idlRet;
- WARN("(pidl=%p,pidl=%p,%08u)semi-stub\n",pidl,item,bEnd);
+ WARN("(pidl=%p,lpItemID=%p,%08u)semi-stub\n",pidl,lpItemID,bAddToEnd);
pdump (pidl);
- pdump (item);
+ pdump (lpItemID);
if (_ILIsDesktop(pidl))
{
- idlRet = ILClone(item);
+ idlRet = ILClone(lpItemID);
if (pidl)
SHFree (pidl);
return idlRet;
}
- if (bEnd)
+ if (bAddToEnd)
{
- idlRet=ILCombine(pidl,item);
+ idlRet=ILCombine(pidl,lpItemID);
}
else
{
- idlRet=ILCombine(item,pidl);
+ idlRet=ILCombine(lpItemID,pidl);
}
SHFree(pidl);
@@ -620,7 +620,7 @@
* allocated by SHMalloc allocator
* exported by ordinal
*/
-DWORD WINAPI ILFree(LPITEMIDLIST pidl)
+DWORD WINAPI ILFree(LPCITEMIDLIST pidl)
{
TRACE("(pidl=0x%08lx)\n",(DWORD)pidl);
@@ -643,33 +643,33 @@
* ILCreateFromPath [SHELL32.157]
*
*/
-LPITEMIDLIST WINAPI ILCreateFromPathA (LPCSTR path)
+LPITEMIDLIST WINAPI ILCreateFromPathA (LPCSTR lpszPath)
{
LPITEMIDLIST pidlnew;
DWORD attributes = 0;
- TRACE_(shell)("%s\n",path);
+ TRACE_(shell)("%s\n",lpszPath);
- if (SUCCEEDED (SHILCreateFromPathA (path, &pidlnew, &attributes)))
+ if (SUCCEEDED (SHILCreateFromPathA (lpszPath, &pidlnew, &attributes)))
return pidlnew;
return FALSE;
}
-LPITEMIDLIST WINAPI ILCreateFromPathW (LPCWSTR path)
+LPITEMIDLIST WINAPI ILCreateFromPathW (LPCWSTR lpszPath)
{
LPITEMIDLIST pidlnew;
DWORD attributes = 0;
- TRACE_(shell)("%s\n",debugstr_w(path));
+ TRACE_(shell)("%s\n",debugstr_w(lpszPath));
- if (SUCCEEDED (SHILCreateFromPathW (path, &pidlnew, &attributes)))
+ if (SUCCEEDED (SHILCreateFromPathW (lpszPath, &pidlnew, &attributes)))
return pidlnew;
return FALSE;
}
-LPITEMIDLIST WINAPI ILCreateFromPathAW (LPCVOID path)
+LPITEMIDLIST WINAPI ILCreateFromPathAW (LPCVOID lpszPath)
{
if ( SHELL_OsIsUnicode())
- return ILCreateFromPathW (path);
- return ILCreateFromPathA (path);
+ return ILCreateFromPathW (lpszPath);
+ return ILCreateFromPathA (lpszPath);
}
/*************************************************************************
* SHSimpleIDListFromPath [SHELL32.162]
@@ -1418,7 +1418,7 @@
**************************************************************************
* _ILGetDataPointer()
*/
-LPPIDLDATA _ILGetDataPointer(LPITEMIDLIST pidl)
+LPPIDLDATA _ILGetDataPointer(LPCITEMIDLIST pidl)
{
if(pidl && pidl->mkid.cb != 0x00)
return (LPPIDLDATA) &(pidl->mkid.abID);
diff -urN wine-orig/dlls/shell32/shell32.spec wine-pas-compil?/dlls/shell32/shell32.spec
--- wine-orig/dlls/shell32/shell32.spec Thu May 23 10:49:53 2002
+++ wine-pas-compil?/dlls/shell32/shell32.spec Sat Jun 1 21:16:22 2002
@@ -144,7 +144,7 @@
151 stdcall SHLoadOLE (long) SHLoadOLE
152 stdcall ILGetSize(ptr) ILGetSize
153 stdcall ILGetNext(ptr) ILGetNext
- 154 stdcall ILAppend (long long long) ILAppend
+ 154 stdcall ILAppendID (long long long) ILAppendID
155 stdcall ILFree (ptr) ILFree
156 stdcall ILGlobalFree (ptr) ILGlobalFree
157 stdcall ILCreateFromPath (ptr) ILCreateFromPathAW
diff -urN wine-orig/dlls/shell32/shell32_main.h wine-pas-compil?/dlls/shell32/shell32_main.h
--- wine-orig/dlls/shell32/shell32_main.h Fri May 31 19:32:17 2002
+++ wine-pas-compil?/dlls/shell32/shell32_main.h Sat Jun 1 21:16:22 2002
@@ -112,7 +112,7 @@
LPENUMIDLIST IEnumIDList_Constructor(LPCSTR,DWORD,DWORD);
-LPEXTRACTICONA IExtractIconA_Constructor(LPITEMIDLIST);
+LPEXTRACTICONA IExtractIconA_Constructor(LPCITEMIDLIST);
HRESULT CreateStreamOnFile (LPCSTR pszFilename, IStream ** ppstm);
/* FIXME: rename the functions when the shell32.dll has it's own exports namespace */
diff -urN wine-orig/dlls/shell32/shellord.c wine-pas-compil?/dlls/shell32/shellord.c
--- wine-orig/dlls/shell32/shellord.c Fri May 31 19:32:17 2002
+++ wine-pas-compil?/dlls/shell32/shellord.c Sat Jun 1 21:16:22 2002
@@ -352,26 +352,26 @@
* exported by ordinal
*/
#define MEM_DEBUG 0
-void WINAPI SHFree(LPVOID x)
+void WINAPI SHFree(LPVOID pv)
{
#if MEM_DEBUG
- WORD len = *(LPWORD)((LPBYTE)x-2);
+ WORD len = *(LPWORD)((LPBYTE)pv-2);
- if ( *(LPWORD)((LPBYTE)x+len) != 0x7384)
+ if ( *(LPWORD)((LPBYTE)pv+len) != 0x7384)
ERR("MAGIC2!\n");
- if ( (*(LPWORD)((LPBYTE)x-4)) != 0x8271)
+ if ( (*(LPWORD)((LPBYTE)pv-4)) != 0x8271)
ERR("MAGIC1!\n");
else
- memset((LPBYTE)x-4, 0xde, len+6);
+ memset((LPBYTE)pv-4, 0xde, len+6);
- TRACE("%p len=%u\n",x, len);
+ TRACE("%p len=%u\n",pv, len);
- x = (LPBYTE) x - 4;
+ pv = (LPBYTE) pv - 4;
#else
- TRACE("%p\n",x);
+ TRACE("%p\n",pv);
#endif
- HeapFree(GetProcessHeap(), 0, x);
+ HeapFree(GetProcessHeap(), 0, pv);
}
/*************************************************************************
@@ -381,24 +381,24 @@
* void *task_alloc(DWORD len), uses SHMalloc allocator
* exported by ordinal
*/
-LPVOID WINAPI SHAlloc(DWORD len)
+LPVOID WINAPI SHAlloc(ULONG cb)
{
LPBYTE ret;
#if MEM_DEBUG
- ret = (LPVOID) HeapAlloc(GetProcessHeap(),0,len+6);
+ ret = (LPVOID) HeapAlloc(GetProcessHeap(),0,cb+6);
#else
- ret = (LPVOID) HeapAlloc(GetProcessHeap(),0,len);
+ ret = (LPVOID) HeapAlloc(GetProcessHeap(),0,cb);
#endif
#if MEM_DEBUG
*(LPWORD)(ret) = 0x8271;
- *(LPWORD)(ret+2) = (WORD)len;
- *(LPWORD)(ret+4+len) = 0x7384;
+ *(LPWORD)(ret+2) = (WORD)cb;
+ *(LPWORD)(ret+4+cb) = 0x7384;
ret += 4;
- memset(ret, 0xdf, len);
+ memset(ret, 0xdf, cb);
#endif
- TRACE("%lu bytes at %p\n",len, ret);
+ TRACE("%lu bytes at %p\n",cb, ret);
return (LPVOID)ret;
}
diff -urN wine-orig/dlls/shell32/shlmenu.c wine-pas-compil?/dlls/shell32/shlmenu.c
--- wine-orig/dlls/shell32/shlmenu.c Fri May 31 19:32:17 2002
+++ wine-pas-compil?/dlls/shell32/shlmenu.c Sat Jun 1 21:27:23 2002
@@ -530,10 +530,10 @@
*/
BOOL WINAPI FileMenu_GetLastSelectedItemPidls(
UINT uReserved,
- LPCITEMIDLIST *ppidlFolder,
- LPCITEMIDLIST *ppidlItem)
+ LPITEMIDLIST *ppidlFolder,
+ LPITEMIDLIST *ppidlItem)
{
- FIXME("0x%08x %p %p\n",uReserved, ppidlFolder, ppidlItem);
+ FIXME("(0x%08x %p %p): stub\n",uReserved, ppidlFolder, ppidlItem);
return 0;
}
diff -urN wine-orig/dlls/shell32/undocshell.h wine-pas-compil?/dlls/shell32/undocshell.h
--- wine-orig/dlls/shell32/undocshell.h Fri May 31 19:32:17 2002
+++ wine-pas-compil?/dlls/shell32/undocshell.h Sat Jun 1 21:24:07 2002
@@ -34,18 +34,18 @@
LPITEMIDLIST WINAPI ILCloneFirst(LPCITEMIDLIST pidl);
LPITEMIDLIST WINAPI ILCombine(
- LPCITEMIDLIST iil1,
- LPCITEMIDLIST iil2);
+ LPCITEMIDLIST pidl1,
+ LPCITEMIDLIST pidl2);
-DWORD WINAPI ILGetSize(LPITEMIDLIST pidl);
+UINT WINAPI ILGetSize(LPCITEMIDLIST pidl);
-LPITEMIDLIST WINAPI ILGetNext(LPITEMIDLIST pidl);
-LPITEMIDLIST WINAPI ILFindLastID(LPITEMIDLIST pidl);
-BOOL WINAPI ILRemoveLastID(LPCITEMIDLIST pidl);
+LPITEMIDLIST WINAPI ILGetNext(LPCITEMIDLIST pidl);
+LPITEMIDLIST WINAPI ILFindLastID(LPCITEMIDLIST pidl);
+BOOL WINAPI ILRemoveLastID(LPITEMIDLIST pidl);
LPITEMIDLIST WINAPI ILFindChild(
- LPCITEMIDLIST pidl1,
- LPCITEMIDLIST pidl2);
+ LPCITEMIDLIST pidlParent,
+ LPCITEMIDLIST pidlChild);
LPITEMIDLIST WINAPI ILAppendID(
LPITEMIDLIST pidl,
@@ -63,9 +63,9 @@
BOOL WINAPI ILGetDisplayName(
LPCITEMIDLIST pidl,
- LPSTR path);
+ LPSTR lpszName);
-DWORD WINAPI ILFree(LPITEMIDLIST pidl);
+DWORD WINAPI ILFree(LPCITEMIDLIST pidl);
HRESULT WINAPI ILSaveToStream(
LPSTREAM pstrm,
@@ -83,23 +83,23 @@
LPITEMIDLIST WINAPI SHSimpleIDListFromPathAW (LPCVOID lpszPath);
HRESULT WINAPI SHILCreateFromPathA (
- LPCSTR path,
+ LPCSTR lpszPath,
LPITEMIDLIST * ppidl,
- DWORD *attributes);
+ ULONG *pdwAttributes);
HRESULT WINAPI SHILCreateFromPathW (
- LPCWSTR path,
+ LPCWSTR lpszPath,
LPITEMIDLIST * ppidl,
- DWORD *attributes);
+ ULONG *pdwAttributes);
HRESULT WINAPI SHILCreateFromPathAW (
- LPCVOID path,
+ LPCVOID lpszPath,
LPITEMIDLIST * ppidl,
- DWORD *attributes);
+ ULONG *pdwAttributes);
-LPITEMIDLIST WINAPI ILCreateFromPathA(LPCSTR path);
-LPITEMIDLIST WINAPI ILCreateFromPathW(LPCWSTR path);
-LPITEMIDLIST WINAPI ILCreateFromPathAW(LPCVOID path);
+LPITEMIDLIST WINAPI ILCreateFromPathA(LPCSTR lpszPath);
+LPITEMIDLIST WINAPI ILCreateFromPathW(LPCWSTR lpszPath);
+LPITEMIDLIST WINAPI ILCreateFromPathAW(LPCVOID lpszPath);
HRESULT WINAPI SHBindToParent(
LPCITEMIDLIST pidl,
diff -urN wine-orig/include/shlobj.h wine-pas-compil?/include/shlobj.h
--- wine-orig/include/shlobj.h Fri May 31 19:28:57 2002
+++ wine-pas-compil?/include/shlobj.h Sat Jun 1 21:16:22 2002
@@ -38,12 +38,13 @@
WORD cb; /* nr of bytes in this item */
BYTE abID[1]; /* first byte in this item */
} SHITEMID, *LPSHITEMID;
-typedef LPSHITEMID const LPCSHITEMID;
+typedef const SHITEMID *LPCSHITEMID;
typedef struct _ITEMIDLIST
{
SHITEMID mkid; /* first itemid in list */
-} ITEMIDLIST,*LPITEMIDLIST,*LPCITEMIDLIST;
+} ITEMIDLIST, *LPITEMIDLIST;
+typedef const ITEMIDLIST *LPCITEMIDLIST;
#include "poppack.h"
BOOL WINAPI SHGetPathFromIDListA (LPCITEMIDLIST pidl,LPSTR pszPath);
More information about the wine-patches
mailing list