JehanneOS
/
newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* include/shlobj.h (struct _browseinfo): UNICODE it. 

(SHBrowseForFolder): Ditto.
	(SHGetPathFromIDList): Ditto.
This commit is contained in:
Earnie Boyd 2001-06-11 18:28:19 +00:00
parent f569bfcfb2
commit 05763a593c
2 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
winsup/w32api/ChangeLog
View File

@ -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> 2001.06.11 Earnie Boyd <earnie@users.sourceforge.net>
* include/basetsd.h: RC_INVOKED protection and realignment. * include/basetsd.h: RC_INVOKED protection and realignment.

26
winsup/w32api/include/shlobj.h
View File

@ -233,7 +233,7 @@ typedef struct _ITEMIDLIST {
} ITEMIDLIST,*LPITEMIDLIST; } ITEMIDLIST,*LPITEMIDLIST;
typedef const ITEMIDLIST *LPCITEMIDLIST; typedef const ITEMIDLIST *LPCITEMIDLIST;
typedef int (CALLBACK* BFFCALLBACK)(HWND,UINT,LPARAM,LPARAM); typedef int (CALLBACK* BFFCALLBACK)(HWND,UINT,LPARAM,LPARAM);
typedef struct _browseinfo { typedef struct _browseinfoA {
HWND hwndOwner; HWND hwndOwner;
LPCITEMIDLIST pidlRoot; LPCITEMIDLIST pidlRoot;
LPSTR pszDisplayName; LPSTR pszDisplayName;
@ -242,7 +242,17 @@ typedef struct _browseinfo {
BFFCALLBACK lpfn; BFFCALLBACK lpfn;
LPARAM lParam; LPARAM lParam;
int iImage; 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 { typedef struct _CMInvokeCommandInfo {
DWORD cbSize; DWORD cbSize;
DWORD fMask; DWORD fMask;
@ -676,14 +686,16 @@ DECLARE_INTERFACE_(IShellIcon,IUnknown)
typedef IShellIcon *LPSHELLICON; typedef IShellIcon *LPSHELLICON;
void WINAPI SHAddToRecentDocs(UINT,PCVOID); void WINAPI SHAddToRecentDocs(UINT,PCVOID);
LPITEMIDLIST WINAPI SHBrowseForFolder(PBROWSEINFO); LPITEMIDLIST WINAPI SHBrowseForFolderA(PBROWSEINFOA);
LPITEMIDLIST WINAPI SHBrowseForFolderW(PBROWSEINFOW);
void WINAPI SHChangeNotify(LONG,UINT,PCVOID,PCVOID); void WINAPI SHChangeNotify(LONG,UINT,PCVOID,PCVOID);
HRESULT WINAPI SHGetDataFromIDListA(LPSHELLFOLDER,LPCITEMIDLIST,int,PVOID,int); HRESULT WINAPI SHGetDataFromIDListA(LPSHELLFOLDER,LPCITEMIDLIST,int,PVOID,int);
HRESULT WINAPI SHGetDataFromIDListW(LPSHELLFOLDER,LPCITEMIDLIST,int,PVOID,int); HRESULT WINAPI SHGetDataFromIDListW(LPSHELLFOLDER,LPCITEMIDLIST,int,PVOID,int);
HRESULT WINAPI SHGetDesktopFolder(LPSHELLFOLDER*); HRESULT WINAPI SHGetDesktopFolder(LPSHELLFOLDER*);
HRESULT WINAPI SHGetInstanceExplorer(LPUNKNOWN); HRESULT WINAPI SHGetInstanceExplorer(LPUNKNOWN);
HRESULT WINAPI SHGetMalloc(LPMALLOC*); 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 SHGetSpecialFolderLocation(HWND,int,LPITEMIDLIST*);
HRESULT WINAPI SHLoadInProc(REFCLSID); HRESULT WINAPI SHLoadInProc(REFCLSID);
/* FIXME/TODO: Only valid for _WIN32_IE >= 400? */ /* FIXME/TODO: Only valid for _WIN32_IE >= 400? */
@ -693,13 +705,19 @@ BOOL WINAPI SHGetSpecialFolderPathW(HWND,LPSTR,int,BOOL);
#ifdef UNICODE #ifdef UNICODE
typedef IShellExecuteHookW IShellExecuteHook; typedef IShellExecuteHookW IShellExecuteHook;
typedef IShellLinkW IShellLink; typedef IShellLinkW IShellLink;
typedef BROWSEINFOW BROWSEINFO,*PBROWSEINFO,*LPBROWSEINFO;
#define SHBrowseForFolder SHBrowseForFolderW
#define SHGetDataFromIDList SHGetDataFromIDListW #define SHGetDataFromIDList SHGetDataFromIDListW
#define SHGetPathFromIDList SHGetPathFromIDListW
/* FIXME/TODO: Only valid for _WIN32_IE >= 400? */ /* FIXME/TODO: Only valid for _WIN32_IE >= 400? */
#define SHGetSpecialFolderPath SHGetSpecialFolderPathW #define SHGetSpecialFolderPath SHGetSpecialFolderPathW
#else #else
typedef IShellExecuteHookA IShellExecuteHook; typedef IShellExecuteHookA IShellExecuteHook;
typedef IShellLinkA IShellLink; typedef IShellLinkA IShellLink;
typedef BROWSEINFOA BROWSEINFO,*PBROWSEINFO,*LPBROWSEINFO;
#define SHBrowseForFolder SHBrowseForFolderA
#define SHGetDataFromIDList SHGetDataFromIDListA #define SHGetDataFromIDList SHGetDataFromIDListA
#define SHGetPathFromIDList SHGetPathFromIDListA
/* FIXME/TODO: Only valid for _WIN32_IE >= 400? */ /* FIXME/TODO: Only valid for _WIN32_IE >= 400? */
#define SHGetSpecialFolderPath SHGetSpecialFolderPathA #define SHGetSpecialFolderPath SHGetSpecialFolderPathA
#endif #endif