diff options
| author | Earnie Boyd <earnie@users.sf.net> | 2001-06-11 22:28:19 +0400 |
|---|---|---|
| committer | Earnie Boyd <earnie@users.sf.net> | 2001-06-11 22:28:19 +0400 |
| commit | 05763a593cc6c7772aad9fe5576f706d1aa940f2 (patch) | |
| tree | 86e74000973478fdea647bb1801919267f72af36 | |
| parent | f569bfcfb20e4abd398d26aa6079ddae975cb42f (diff) | |
* include/shlobj.h (struct _browseinfo): UNICODE it.
(SHBrowseForFolder): Ditto.
(SHGetPathFromIDList): Ditto.
| -rw-r--r-- | winsup/w32api/ChangeLog | 6 | ||||
| -rw-r--r-- | winsup/w32api/include/shlobj.h | 26 |
2 files changed, 28 insertions, 4 deletions
diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog index 2429402a4..1931fc4a4 100644 --- a/winsup/w32api/ChangeLog +++ b/winsup/w32api/ChangeLog @@ -1,4 +1,10 @@ +2001-06-11 Mattia Barbon <mbarbon@dsi.unive.it> + + * include/shlobj.h (struct _browseinfo): UNICODE it. + (SHBrowseForFolder): Ditto. + (SHGetPathFromIDList): Ditto. + 2001.06.11 Earnie Boyd <earnie@users.sourceforge.net> * include/basetsd.h: RC_INVOKED protection and realignment. diff --git a/winsup/w32api/include/shlobj.h b/winsup/w32api/include/shlobj.h index 6f6eb8774..165883df6 100644 --- a/winsup/w32api/include/shlobj.h +++ b/winsup/w32api/include/shlobj.h @@ -233,7 +233,7 @@ typedef struct _ITEMIDLIST { } ITEMIDLIST,*LPITEMIDLIST; typedef const ITEMIDLIST *LPCITEMIDLIST; typedef int (CALLBACK* BFFCALLBACK)(HWND,UINT,LPARAM,LPARAM); -typedef struct _browseinfo { +typedef struct _browseinfoA { HWND hwndOwner; LPCITEMIDLIST pidlRoot; LPSTR pszDisplayName; @@ -242,7 +242,17 @@ typedef struct _browseinfo { BFFCALLBACK lpfn; LPARAM lParam; int iImage; -} BROWSEINFO,*PBROWSEINFO,*LPBROWSEINFO; +} BROWSEINFOA,*PBROWSEINFOA,*LPBROWSEINFOA; +typedef struct _browseinfoW { + HWND hwndOwner; + LPCITEMIDLIST pidlRoot; + LPWSTR pszDisplayName; + LPCWSTR lpszTitle; + UINT ulFlags; + BFFCALLBACK lpfn; + LPARAM lParam; + int iImage; +} BROWSEINFOW,*PBROWSEINFOW,*LPBROWSEINFOW; typedef struct _CMInvokeCommandInfo { DWORD cbSize; DWORD fMask; @@ -676,14 +686,16 @@ DECLARE_INTERFACE_(IShellIcon,IUnknown) typedef IShellIcon *LPSHELLICON; void WINAPI SHAddToRecentDocs(UINT,PCVOID); -LPITEMIDLIST WINAPI SHBrowseForFolder(PBROWSEINFO); +LPITEMIDLIST WINAPI SHBrowseForFolderA(PBROWSEINFOA); +LPITEMIDLIST WINAPI SHBrowseForFolderW(PBROWSEINFOW); 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 SHGetDesktopFolder(LPSHELLFOLDER*); HRESULT WINAPI SHGetInstanceExplorer(LPUNKNOWN); HRESULT WINAPI SHGetMalloc(LPMALLOC*); -BOOL WINAPI SHGetPathFromIDList(LPCITEMIDLIST,LPSTR); +BOOL WINAPI SHGetPathFromIDListA(LPCITEMIDLIST,LPSTR); +BOOL WINAPI SHGetPathFromIDListW(LPCITEMIDLIST,LPWSTR); HRESULT WINAPI SHGetSpecialFolderLocation(HWND,int,LPITEMIDLIST*); HRESULT WINAPI SHLoadInProc(REFCLSID); /* FIXME/TODO: Only valid for _WIN32_IE >= 400? */ @@ -693,13 +705,19 @@ BOOL WINAPI SHGetSpecialFolderPathW(HWND,LPSTR,int,BOOL); #ifdef UNICODE typedef IShellExecuteHookW IShellExecuteHook; typedef IShellLinkW IShellLink; +typedef BROWSEINFOW BROWSEINFO,*PBROWSEINFO,*LPBROWSEINFO; +#define SHBrowseForFolder SHBrowseForFolderW #define SHGetDataFromIDList SHGetDataFromIDListW +#define SHGetPathFromIDList SHGetPathFromIDListW /* FIXME/TODO: Only valid for _WIN32_IE >= 400? */ #define SHGetSpecialFolderPath SHGetSpecialFolderPathW #else typedef IShellExecuteHookA IShellExecuteHook; typedef IShellLinkA IShellLink; +typedef BROWSEINFOA BROWSEINFO,*PBROWSEINFO,*LPBROWSEINFO; +#define SHBrowseForFolder SHBrowseForFolderA #define SHGetDataFromIDList SHGetDataFromIDListA +#define SHGetPathFromIDList SHGetPathFromIDListA /* FIXME/TODO: Only valid for _WIN32_IE >= 400? */ #define SHGetSpecialFolderPath SHGetSpecialFolderPathA #endif |