diff options
| author | Mumit Khan <khan@@xraylith.wisc.edu> | 2000-02-29 03:10:04 +0000 |
|---|---|---|
| committer | Mumit Khan <khan@@xraylith.wisc.edu> | 2000-02-29 03:10:04 +0000 |
| commit | 393aa11bce8550c1b4bfc2f00246c8c236892b53 (patch) | |
| tree | 99505ceee500c9919bbb8de4fc48f0a2308c6865 /winsup/w32api | |
| parent | b37e557227945ee54375b412811b021918145d3d (diff) | |
| download | cygnal-393aa11bce8550c1b4bfc2f00246c8c236892b53.tar.gz cygnal-393aa11bce8550c1b4bfc2f00246c8c236892b53.tar.bz2 cygnal-393aa11bce8550c1b4bfc2f00246c8c236892b53.zip | |
2000-02-28 Mumit Khan <khan@xraylith.wisc.edu>
* include/shlobj.h (SHGetDataFromIDList{A,W}): Fix typo.
(SHGetSpecialFolderPath{A,W}): Add prototypes.
Diffstat (limited to 'winsup/w32api')
| -rw-r--r-- | winsup/w32api/ChangeLog | 2 | ||||
| -rw-r--r-- | winsup/w32api/include/shlobj.h | 15 |
2 files changed, 13 insertions, 4 deletions
diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog index dcf08dfdf..2b206ecd0 100644 --- a/winsup/w32api/ChangeLog +++ b/winsup/w32api/ChangeLog @@ -1,5 +1,7 @@ 2000-02-28 Mumit Khan <khan@xraylith.wisc.edu> + * include/shlobj.h (SHGetDataFromIDList{A,W}): Fix typo. + (SHGetSpecialFolderPath{A,W}): Add prototypes. * lib/ole32.def: Add missing exports. * include/winbase.h (TLS_MINIMUM_AVAILABLE): Move macro from here * include/winnt.h (TLS_MINIMUM_AVAILABLE): to here. diff --git a/winsup/w32api/include/shlobj.h b/winsup/w32api/include/shlobj.h index 6ce37ec29..fc77bb9ba 100644 --- a/winsup/w32api/include/shlobj.h +++ b/winsup/w32api/include/shlobj.h @@ -667,23 +667,30 @@ typedef IShellIcon *LPSHELLICON; void WINAPI SHAddToRecentDocs(UINT,PCVOID); LPITEMIDLIST WINAPI SHBrowseForFolder(PBROWSEINFO); void WINAPI SHChangeNotify(LONG,UINT,PCVOID,PCVOID); -HRESULT WINAPI ShGetDataFromIDListA(LPSHELLFOLDER,LPCITEMIDLIST,int,PVOID,int); -HRESULT WINAPI ShGetDataFromIDListW(LPSHELLFOLDER,LPCITEMIDLIST,int,PVOID,int); +HRESULT WINAPI SHGetDataFromIDListA(LPSHELLFOLDER,LPCITEMIDLIST,int,PVOID,int); +HRESULT WINAPI SHGetDataFromIDListW(LPSHELLFOLDER,LPCITEMIDLIST,int,PVOID,int); HRESULT WINAPI SHGetDesktopFolder(LPSHELLFOLDER*); HRESULT WINAPI SHGetInstanceExplorer(LPUNKNOWN); HRESULT WINAPI SHGetMalloc(LPMALLOC*); BOOL WINAPI SHGetPathFromIDList(LPCITEMIDLIST,LPSTR); HRESULT WINAPI SHGetSpecialFolderLocation(HWND,int,LPITEMIDLIST*); HRESULT WINAPI SHLoadInProc(REFCLSID); +/* FIXME/TODO: Only valid for _WIN32_IE >= 400? */ +BOOL WINAPI SHGetSpecialFolderPathA(HWND,LPSTR,int,BOOL); +BOOL WINAPI SHGetSpecialFolderPathW(HWND,LPSTR,int,BOOL); #ifdef UNICODE typedef IShellExecuteHookW IShellExecuteHook; typedef IShellLinkW IShellLink; -#define ShGetDataFromIDList ShGetDataFromIDListW +#define SHGetDataFromIDList SHGetDataFromIDListW +/* FIXME/TODO: Only valid for _WIN32_IE >= 400? */ +#define SHGetSpecialFolderPath SHGetSpecialFolderPathW #else typedef IShellExecuteHookA IShellExecuteHook; typedef IShellLinkA IShellLink; -#define ShGetDataFromIDList ShGetDataFromIDListA +#define SHGetDataFromIDList SHGetDataFromIDListA +/* FIXME/TODO: Only valid for _WIN32_IE >= 400? */ +#define SHGetSpecialFolderPath SHGetSpecialFolderPathA #endif #pragma pack(pop) |