Ignore:
Timestamp:
Feb 14, 2002, 1:10:12 PM (24 years ago)
Author:
sandervl
Message:

extended logging added

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/shell32/pidl.c

    r7502 r7904  
    166166 */
    167167
    168 ODINFUNCTION2(BOOL, ILGetDisplayName,
    169               LPCITEMIDLIST, pidl,
    170               LPSTR, path)
     168BOOL WIN32API ILGetDisplayName(LPCITEMIDLIST pidl, LPSTR path)
    171169{
    172170        TRACE_(shell)("pidl=%p %p semi-stub\n",pidl,path);
    … …  
    179177 *   observed: pidl=Desktop return=pidl
    180178 */
    181 ODINFUNCTION1(LPITEMIDLIST, ILFindLastID,
    182               LPITEMIDLIST, pidl)
     179LPITEMIDLIST WIN32API ILFindLastID(LPITEMIDLIST  pidl)
    183180{       LPITEMIDLIST   pidlLast = pidl;
    184181
    … …  
    198195 *   when pidl=Desktop return=FALSE
    199196 */
    200 ODINFUNCTION1(BOOL, ILRemoveLastID,
    201               LPCITEMIDLIST, pidl)
     197BOOL WIN32API ILRemoveLastID(LPCITEMIDLIST pidl)
    202198{
    203199        TRACE_(shell)("pidl=%p\n",pidl);
    … …  
    215211 *    dupicate an idlist
    216212 */
    217 ODINFUNCTION1(LPITEMIDLIST, ILClone,
    218               LPCITEMIDLIST, pidl)
     213LPITEMIDLIST WIN32API ILClone(LPCITEMIDLIST pidl)
    219214{ DWORD    len;
    220215  LPITEMIDLIST  newpidl;
    … …  
    239234 *  duplicates the first idlist of a complex pidl
    240235 */
    241 ODINFUNCTION1(LPITEMIDLIST, ILCloneFirst,
    242               LPCITEMIDLIST, pidl)
     236LPITEMIDLIST WIN32API  ILCloneFirst(LPCITEMIDLIST pidl)
    243237{       DWORD len;
    244238        LPITEMIDLIST pidlNew = NULL;
    … …  
    270264 *   the first two bytes are the len, the pidl is following then
    271265 */
    272 ODINFUNCTION2(HRESULT, ILLoadFromStream,
    273               IStream *, pStream,
    274               LPITEMIDLIST *, ppPidl)
     266HRESULT WIN32API ILLoadFromStream(IStream *pStream, LPITEMIDLIST *ppPidl)
    275267{       WORD            wLen = 0;
    276268        DWORD           dwBytesRead;
    … …  
    316308 *   the first two bytes are the len, the pidl is following then
    317309 */
    318 ODINFUNCTION2(HRESULT, ILSaveToStream,
    319               IStream *, pStream,
    320               LPCITEMIDLIST, pPidl)
     310HRESULT WIN32API ILSaveToStream(IStream * pStream, LPCITEMIDLIST pPidl)
    321311{
    322312        LPITEMIDLIST    pidl;
    … …  
    354344 *   wraper for IShellFolder::ParseDisplayName()
    355345 */
    356 ODINFUNCTION3(HRESULT, SHILCreateFromPathA,
    357               LPCSTR, path,
    358               LPITEMIDLIST *, ppidl,
    359               DWORD *, attributes)
     346HRESULT WIN32API SHILCreateFromPathA(LPCSTR path, LPITEMIDLIST *ppidl,
     347                                     DWORD *attributes)
    360348{       LPSHELLFOLDER sf;
    361349        WCHAR lpszDisplayName[MAX_PATH];
    … …  
    377365
    378366
    379 ODINFUNCTION3(HRESULT, SHILCreateFromPathW,
    380               LPCWSTR, path,
    381               LPITEMIDLIST *, ppidl,
    382               DWORD *, attributes)
     367HRESULT WIN32API SHILCreateFromPathW(LPCWSTR path,
     368              LPITEMIDLIST * ppidl,
     369              DWORD * attributes)
    383370{       LPSHELLFOLDER sf;
    384371        DWORD pchEaten;
    … …  
    413400 *     exported by ordinal
    414401 */
    415 ODINFUNCTION3(LPITEMIDLIST, SHCloneSpecialIDList,
    416               HWND, hwndOwner,
    417               DWORD, nFolder,
    418               DWORD, x3)
     402LPITEMIDLIST WIN32API SHCloneSpecialIDList(HWND hwndOwner,
     403              DWORD nFolder,
     404              DWORD x3)
    419405{       LPITEMIDLIST ppidl;
    420406        WARN_(shell)("(hwnd=0x%x,csidl=0x%lx,0x%lx):semi-stub.\n",
    … …  
    430416 *
    431417 */
    432 ODINFUNCTION1(LPITEMIDLIST, ILGlobalClone,
    433               LPCITEMIDLIST, pidl)
     418LPITEMIDLIST WIN32API  ILGlobalClone(
     419              LPCITEMIDLIST pidl)
    434420{       DWORD    len;
    435421        LPITEMIDLIST  newpidl;
    … …  
    453439 *
    454440 */
    455 ODINFUNCTION2(BOOL, ILIsEqual,
    456               LPCITEMIDLIST, pidl1,
    457               LPCITEMIDLIST, pidl2)
     441BOOL WIN32API ILIsEqual(LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2)
    458442{
    459443//      char    szData1[MAX_PATH];
    … …  
    505489 *              child=a/b/c/d -> true if bImmediate is false, d is in a subfolder of a/b
    506490 */
    507 ODINFUNCTION3(BOOL, ILIsParent,
    508               LPCITEMIDLIST, pidlParent,
    509               LPCITEMIDLIST, pidlChild,
    510               BOOL, bImmediate)
     491BOOL WIN32API ILIsParent(LPCITEMIDLIST pidlParent, LPCITEMIDLIST pidlChild,
     492                         BOOL bImmediate)
    511493{
    512494        char    szData1[MAX_PATH];
    … …  
    552534 *  pidl2 equal pidl1           pointer to last 0x00-element of pidl2
    553535 */
    554 ODINFUNCTION2(LPITEMIDLIST, ILFindChild,
    555               LPCITEMIDLIST, pidl1,
    556               LPCITEMIDLIST, pidl2)
     536LPITEMIDLIST ILFindChild(LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2)
    557537{
    558538        char    szData1[MAX_PATH];
    … …  
    610590 *  Does not destroy the passed in idlists!
    611591 */
    612 ODINFUNCTION2(LPITEMIDLIST, ILCombine,
    613               LPCITEMIDLIST, pidl1,
    614               LPCITEMIDLIST, pidl2)
     592LPITEMIDLIST WIN32API ILCombine(LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2)
    615593{
    616594        DWORD    len1,len2;
    … …  
    653631 * NOTES
    654632 */
    655 ODINFUNCTION3(LPITEMIDLIST, SHGetRealIDL,
    656               LPSHELLFOLDER, lpsf,
    657               LPITEMIDLIST, pidl,
    658               DWORD, z)
     633LPITEMIDLIST WIN32API SHGetRealIDL(LPSHELLFOLDER lpsf, LPITEMIDLIST  pidl,
     634                                   DWORD z)
    659635{
    660636  dprintf(("not yet implemented"));
    … …  
    673649 *  pild = CSIDL_DRIVES         ret = 0
    674650 */
    675 ODINFUNCTION1(LPITEMIDLIST, SHLogILFromFSIL,
    676               LPITEMIDLIST, pidl)
     651LPITEMIDLIST WIN32API  SHLogILFromFSIL(LPITEMIDLIST pidl)
    677652{
    678653  dprintf(("not yet implemented"));
    … …  
    698673 *  exported by ordinal
    699674 */
    700 ODINFUNCTION1(DWORD, ILGetSize,
    701               LPITEMIDLIST, pidl)
     675DWORD WIN32API ILGetSize(LPITEMIDLIST pidl)
    702676{
    703677  LPSHITEMID si = &(pidl->mkid);
    … …  
    728702 *
    729703 */
    730 ODINFUNCTION1(LPITEMIDLIST, ILGetNext,
    731               LPITEMIDLIST, pidl)
     704LPITEMIDLIST WIN32API ILGetNext(LPITEMIDLIST pidl)
    732705{
    733706#ifdef __WIN32OS2__
    … …  
    754727 *  Destroys the passed in idlist! (???)
    755728 */
    756 ODINFUNCTION3(LPITEMIDLIST, ILAppend,
    757               LPITEMIDLIST, pidl,
    758               LPCITEMIDLIST, item,
    759               BOOL, bEnd)
     729LPITEMIDLIST WIN32API ILAppend(
     730              LPITEMIDLIST  pidl,
     731              LPCITEMIDLIST item,
     732              BOOL bEnd)
    760733{
    761734        LPITEMIDLIST idlRet;
    … …  
    794767 *     exported by ordinal
    795768 */
    796 ODINFUNCTION1(DWORD, ILFree,
    797               LPITEMIDLIST, pidl)
    798 {
    799 #ifdef __WIN32OS2__
    800   return HEAP_free(pidl);
    801 #else
     769DWORD ILFree(LPITEMIDLIST pidl)
     770{
    802771  if(!pidl)
    803772    return FALSE;
    804773  SHFree(pidl);
    805774  return TRUE;
    806 #endif
    807775}
    808776/*************************************************************************
    … …  
    810778 *
    811779 */
    812 ODINPROCEDURE1(ILGlobalFree,
    813                LPCITEMIDLIST, pidl)
     780void WIN32API ILGlobalFree(LPCITEMIDLIST pidl)
    814781{
    815782        TRACE("%p\n",pidl);
    … …  
    822789 *
    823790 */
    824 ODINFUNCTION1(LPITEMIDLIST, ILCreateFromPathA,
    825               LPCSTR, path)
     791LPITEMIDLIST WIN32API ILCreateFromPathA(LPCSTR path)
    826792{
    827793        LPITEMIDLIST pidlnew;
    … …  
    836802
    837803
    838 ODINFUNCTION1(LPITEMIDLIST, ILCreateFromPathW,
    839               LPCWSTR, path)
     804LPITEMIDLIST WIN32API  ILCreateFromPathW(LPCWSTR path)
    840805{
    841806        LPITEMIDLIST pidlnew;
    … …  
    857822 *  SHSimpleIDListFromPath [SHELL32.162]
    858823 */
    859 ODINFUNCTION1(LPITEMIDLIST, SHSimpleIDListFromPathA,
    860               LPCSTR, lpszPath)
     824LPITEMIDLIST WIN32API  SHSimpleIDListFromPathA(LPCSTR lpszPath)
    861825{
    862826        LPITEMIDLIST    pidl=NULL;
    … …  
    886850
    887851
    888 ODINFUNCTION1(LPITEMIDLIST, SHSimpleIDListFromPathW,
    889               LPCWSTR, lpszPath)
     852LPITEMIDLIST WIN32API  SHSimpleIDListFromPathW(LPCWSTR lpszPath)
    890853{
    891854        char    lpszTemp[MAX_PATH];
    … …  
    917880 *
    918881 */
    919 ODINFUNCTION3(HRESULT, SHGetSpecialFolderLocation,
    920         HWND, hwndOwner,
    921         INT, nFolder,
    922         LPITEMIDLIST *, ppidl)
     882HRESULT WIN32API SHGetSpecialFolderLocation(HWND hwndOwner,
     883        INT nFolder,
     884        LPITEMIDLIST * ppidl)
    923885{
    924886        CHAR            szPath[MAX_PATH];
    … …  
    978940 *  we have to take all data from the pidl
    979941 */
    980 ODINFUNCTION5(HRESULT, SHGetFolderLocation,
    981               HWND, hwnd,
    982               int, csidl,
    983               HANDLE, hToken,
    984               DWORD, dwFlags,
    985               LPITEMIDLIST *, ppidl)
     942HRESULT WIN32API SHGetFolderLocation(HWND hwnd, int csidl,
     943              HANDLE hToken,
     944              DWORD dwFlags,
     945              LPITEMIDLIST * ppidl)
    986946{
    987947        FIXME("0x%04x 0x%08x 0x%08x 0x%08lx %p\n",
    … …  
    997957 *  we have to take all data from the pidl
    998958 */
    999 ODINFUNCTION5(HRESULT, SHGetDataFromIDListA,
    1000               LPSHELLFOLDER, psf,
    1001               LPCITEMIDLIST, pidl,
    1002               int, nFormat,
    1003               LPVOID, dest,
    1004               int, len)
     959HRESULT WIN32API SHGetDataFromIDListA(LPSHELLFOLDER psf,
     960              LPCITEMIDLIST pidl,
     961              int nFormat,
     962              LPVOID dest,
     963              int len)
    1005964{
    1006965        TRACE_(shell)("sf=%p pidl=%p 0x%04x %p 0x%04x stub\n",psf,pidl,nFormat,dest,len);
    … …  
    10411000 *
    10421001 */
    1043 ODINFUNCTION5(HRESULT, SHGetDataFromIDListW,
    1044               LPSHELLFOLDER, psf,
    1045               LPCITEMIDLIST, pidl,
    1046               int, nFormat,
    1047               LPVOID, dest,
    1048               int, len)
     1002HRESULT WIN32API SHGetDataFromIDListW(
     1003              LPSHELLFOLDER psf,
     1004              LPCITEMIDLIST pidl,
     1005              int nFormat,
     1006              LPVOID dest,
     1007              int len)
    10491008{
    10501009        TRACE_(shell)("sf=%p pidl=%p 0x%04x %p 0x%04x stub\n",psf,pidl,nFormat,dest,len);
    … …  
    11041063 *  fnGetDisplayNameOf can return different types of OLEString
    11051064 */
    1106 ODINFUNCTION2(BOOL, SHGetPathFromIDListA,
    1107               LPCITEMIDLIST, pidl,
    1108               LPSTR, pszPath)
     1065BOOL WIN32API SHGetPathFromIDListA(
     1066              LPCITEMIDLIST pidl,
     1067              LPSTR  pszPath)
    11091068{       STRRET str;
    11101069        LPSHELLFOLDER shellfolder;
    … …  
    11411100 * SHGetPathFromIDListW                         [SHELL32.262]
    11421101 */
    1143 ODINFUNCTION2(BOOL, SHGetPathFromIDListW,
    1144               LPCITEMIDLIST, pidl,
    1145               LPWSTR, pszPath)
     1102BOOL WIN32API SHGetPathFromIDListW(
     1103              LPCITEMIDLIST pidl,
     1104              LPWSTR pszPath)
    11461105{       char sTemp[MAX_PATH];
    11471106
    … …  
    11591118 *      SHBindToParent          [shell version 5.0]
    11601119 */
    1161 ODINFUNCTION4(HRESULT, SHBindToParent,
    1162               LPCITEMIDLIST, pidl,
    1163               REFIID, riid,
    1164               LPVOID *,ppv,
    1165               LPCITEMIDLIST *,ppidlLast)
     1120HRESULT WIN32API SHBindToParent(
     1121              LPCITEMIDLIST pidl,
     1122              REFIID riid,
     1123              LPVOID * ppv,
     1124              LPCITEMIDLIST *ppidlLast)
    11661125{
    11671126        IShellFolder    * psf;
    … …  
    12101169 * SHGetPathFromIDListAW                [SHELL32.221][NT 4.0: SHELL32.219]
    12111170 */
    1212 ODINFUNCTION2(BOOL, SHGetPathFromIDListAW,
    1213               LPCITEMIDLIST, pidl,
    1214               LPVOID, pszPath)
     1171BOOL WIN32API SHGetPathFromIDListAW(LPCITEMIDLIST pidl,
     1172              LPVOID pszPath)
    12151173{
    12161174        TRACE_(shell)("(pidl=%p,%p)\n",pidl,pszPath);
Note: See TracChangeset for help on using the changeset viewer.