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

2004-07-24 Brodie Thiesfield <brofield@users.sourceforge.net>

Browse Source 
* include/shlobj.h (FILEDESCRIPTOR): Unicode it.
	(FILEGROUPDESCRIPTOR): LIkewise.
This commit is contained in:
Danny Smith 2004-07-24 09:00:52 +00:00
parent 32131c5527
commit 61e6420f32
2 changed files with 35 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
winsup/w32api/ChangeLog
View File

@ -1,3 +1,8 @@
2004-07-24 Brodie Thiesfield <brofield@users.sourceforge.net>
* include/shlobj.h (FILEDESCRIPTOR): Unicode it.
(FILEGROUPDESCRIPTOR): LIkewise.
2004-07-06 Corinna Vinschen <corinna@vinschen.de> 2004-07-06 Corinna Vinschen <corinna@vinschen.de>
* winbase.h (IsWow64Process): Add missing WINAPI qualifier. * winbase.h (IsWow64Process): Add missing WINAPI qualifier.

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

@ -416,7 +416,7 @@ typedef enum {
FD_CLSID=1,FD_SIZEPOINT=2,FD_ATTRIBUTES=4,FD_CREATETIME=8,FD_ACCESSTIME=16, FD_CLSID=1,FD_SIZEPOINT=2,FD_ATTRIBUTES=4,FD_CREATETIME=8,FD_ACCESSTIME=16,
FD_WRITESTIME=32,FD_FILESIZE=64,FD_LINKUI=0x8000 FD_WRITESTIME=32,FD_FILESIZE=64,FD_LINKUI=0x8000
} FD_FLAGS; } FD_FLAGS;
typedef struct _FILEDESCRIPTOR { typedef struct _FILEDESCRIPTORA {
DWORD dwFlags; DWORD dwFlags;
CLSID clsid; CLSID clsid;
SIZEL sizel; SIZEL sizel;
@ -428,11 +428,28 @@ typedef struct _FILEDESCRIPTOR {
DWORD nFileSizeHigh; DWORD nFileSizeHigh;
DWORD nFileSizeLow; DWORD nFileSizeLow;
CHAR cFileName[MAX_PATH]; CHAR cFileName[MAX_PATH];
} FILEDESCRIPTOR,*LPFILEDESCRIPTOR; } FILEDESCRIPTORA,*LPFILEDESCRIPTORA;
typedef struct _FILEGROUPDESCRIPTOR { typedef struct _FILEDESCRIPTORW {
DWORD dwFlags;
CLSID clsid;
SIZEL sizel;
POINTL pointl;
DWORD dwFileAttributes;
FILETIME ftCreationTime;
FILETIME ftLastAccessTime;
FILETIME ftLastWriteTime;
DWORD nFileSizeHigh;
DWORD nFileSizeLow;
WCHAR cFileName[MAX_PATH];
} FILEDESCRIPTORW,*LPFILEDESCRIPTORW;
typedef struct _FILEGROUPDESCRIPTORA {
UINT cItems; UINT cItems;
FILEDESCRIPTOR fgd[1]; FILEDESCRIPTORA fgd[1];
} FILEGROUPDESCRIPTOR,*LPFILEGROUPDESCRIPTOR; } FILEGROUPDESCRIPTORA,*LPFILEGROUPDESCRIPTORA;
typedef struct _FILEGROUPDESCRIPTORW {
UINT cItems;
FILEDESCRIPTORW fgd[1];
} FILEGROUPDESCRIPTORW,*LPFILEGROUPDESCRIPTORW;
typedef enum { typedef enum {
SLR_NO_UI=1, SLR_NO_UI=1,
SLR_ANY_MATCH=2, SLR_ANY_MATCH=2,
@ -1411,6 +1428,10 @@ typedef BROWSEINFOW BROWSEINFO,*PBROWSEINFO,*LPBROWSEINFO;
#if (_WIN32_WINNT >= 0x0501) #if (_WIN32_WINNT >= 0x0501)
#define SHGetFolderPathAndSubDir SHGetFolderPathAndSubDirW #define SHGetFolderPathAndSubDir SHGetFolderPathAndSubDirW
#endif #endif
#define FILEDESCRIPTOR FILEDESCRIPTORW
#define LPFILEDESCRIPTOR LPFILEDESCRIPTORW
#define FILEGROUPDESCRIPTOR FILEGROUPDESCRIPTORW
#define LPFILEGROUPDESCRIPTOR LPFILEGROUPDESCRIPTORW
#else #else
typedef IShellExecuteHookA IShellExecuteHook; typedef IShellExecuteHookA IShellExecuteHook;
@ -1429,6 +1450,10 @@ typedef BROWSEINFOA BROWSEINFO,*PBROWSEINFO,*LPBROWSEINFO;
#if (_WIN32_WINNT >= 0x0501) #if (_WIN32_WINNT >= 0x0501)
#define SHGetFolderPathAndSubDir SHGetFolderPathAndSubDirA #define SHGetFolderPathAndSubDir SHGetFolderPathAndSubDirA
#endif #endif
#define FILEDESCRIPTOR FILEDESCRIPTORA
#define LPFILEDESCRIPTOR LPFILEDESCRIPTORA
#define FILEGROUPDESCRIPTOR FILEGROUPDESCRIPTORA
#define LPFILEGROUPDESCRIPTOR LPFILEGROUPDESCRIPTORA
#endif /* UNICODE */ #endif /* UNICODE */
#pragma pack(pop) #pragma pack(pop)