The MinGW.org Windows System Libraries
| リビジョン | a2f134a1bd0e112b026b4994f8518c013cfcfefb (tree) |
|---|---|
| 日時 | 2011-03-29 17:43:17 |
| 作者 | Corinna Vinschen <corinna@vins...> |
| コミッター | Corinna Vinschen |
Win2K and Vista userenv updates.
w32api/ChangeLog (diff)
w32api/include/userenv.h (diff)| @@ -1,3 +1,19 @@ | ||
| 1 | +2011-03-29 Corinna Vinschen <corinna@vinschen.de> | |
| 2 | + | |
| 3 | + Win2K and Vista userenv updates. | |
| 4 | + | |
| 5 | + * include/userenv.h [_WIN32_WINNT >= 0x0500] (DeleteProfile) | |
| 6 | + (GetAllUsersProfileDirectory, GetDefaultUserProfileDirectory) | |
| 7 | + (ExpandEnvironmentStringsForUser): Define function aliases. | |
| 8 | + [_WIN32_WINNT >= 0x0500] (DeleteProfileA, DeleteProfileW) | |
| 9 | + (GetAllUsersProfileDirectoryA, GetAllUsersProfileDirectoryW) | |
| 10 | + (GetDefaultUserProfileDirectoryA, GetDefaultUserProfileDirectoryW | |
| 11 | + (ExpandEnvironmentStringsForUserA, ExpandEnvironmentStringsForUserW) | |
| 12 | + (GetProfileType): Declare function prototypes. | |
| 13 | + [_WIN32_WINNT >= 0x0600] (CreateProfile): Declare function prototype. | |
| 14 | + [_WIN32_WINNT >= 0x0500] (PT_TEMPORARY, PT_ROAMING, PT_MANDATORY): | |
| 15 | + New manifest constants; define them. | |
| 16 | + | |
| 1 | 17 | 2011-03-25 Chris Sutcliffe <ir0nh34d@users.sf.net> |
| 2 | 18 | |
| 3 | 19 | * Makefile.in: Increment CYGRELEASE to 2. |
| @@ -7,8 +7,13 @@ | ||
| 7 | 7 | #ifdef __cplusplus |
| 8 | 8 | extern "C" { |
| 9 | 9 | #endif |
| 10 | -#define PI_NOUI (1) | |
| 11 | -#define PI_APPLYPOLICY (2) | |
| 10 | +#define PI_NOUI (1) | |
| 11 | +#define PI_APPLYPOLICY (2) | |
| 12 | +#if (_WIN32_WINNT >= 0x0500) | |
| 13 | +#define PT_TEMPORARY (1) | |
| 14 | +#define PT_ROAMING (2) | |
| 15 | +#define PT_MANDATORY (4) | |
| 16 | +#endif | |
| 12 | 17 | typedef struct _PROFILEINFOA { |
| 13 | 18 | DWORD dwSize; |
| 14 | 19 | DWORD dwFlags; |
| @@ -38,18 +43,44 @@ BOOL WINAPI GetUserProfileDirectoryA(HANDLE,LPSTR,LPDWORD); | ||
| 38 | 43 | BOOL WINAPI GetUserProfileDirectoryW(HANDLE,LPWSTR,LPDWORD); |
| 39 | 44 | BOOL WINAPI CreateEnvironmentBlock(LPVOID*,HANDLE,BOOL); |
| 40 | 45 | BOOL WINAPI DestroyEnvironmentBlock(LPVOID); |
| 46 | +#if (_WIN32_WINNT >= 0x0500) | |
| 47 | +BOOL WINAPI DeleteProfileA(LPCSTR,LPCSTR,LPCSTR); | |
| 48 | +BOOL WINAPI DeleteProfileW(LPCWSTR,LPCWSTR,LPCWSTR); | |
| 49 | +BOOL WINAPI GetProfileType(DWORD *); | |
| 50 | +BOOL WINAPI GetAllUsersProfileDirectoryA(LPSTR,LPDWORD); | |
| 51 | +BOOL WINAPI GetAllUsersProfileDirectoryW(LPWSTR,LPDWORD); | |
| 52 | +BOOL WINAPI GetDefaultUserProfileDirectoryA(LPSTR,LPDWORD); | |
| 53 | +BOOL WINAPI GetDefaultUserProfileDirectoryW(LPWSTR,LPDWORD); | |
| 54 | +BOOL WINAPI ExpandEnvironmentStringsForUserA(HANDLE,LPCSTR,LPSTR,DWORD); | |
| 55 | +BOOL WINAPI ExpandEnvironmentStringsForUserW(HANDLE,LPCWSTR,LPWSTR,DWORD); | |
| 56 | +#endif | |
| 57 | +#if (_WIN32_WINNT >= 0x0600) | |
| 58 | +HRESULT WINAPI CreateProfile(LPCWSTR,LPCWSTR,LPWSTR,DWORD); | |
| 59 | +#endif | |
| 41 | 60 | #ifdef UNICODE |
| 42 | 61 | typedef PROFILEINFOW PROFILEINFO; |
| 43 | 62 | typedef LPPROFILEINFOW LPPROFILEINFO; |
| 44 | 63 | #define LoadUserProfile LoadUserProfileW |
| 45 | 64 | #define GetProfilesDirectory GetProfilesDirectoryW |
| 46 | 65 | #define GetUserProfileDirectory GetUserProfileDirectoryW |
| 66 | +#if (_WIN32_WINNT >= 0x0500) | |
| 67 | +#define DeleteProfile DeleteProfileW | |
| 68 | +#define GetAllUsersProfileDirectory GetAllUsersProfileDirectoryW | |
| 69 | +#define GetDefaultUserProfileDirectory GetDefaultUserProfileDirectoryW | |
| 70 | +#define ExpandEnvironmentStringsForUser ExpandEnvironmentStringsForUserW | |
| 71 | +#endif | |
| 47 | 72 | #else |
| 48 | 73 | typedef PROFILEINFOA PROFILEINFO; |
| 49 | 74 | typedef LPPROFILEINFOA LPPROFILEINFO; |
| 50 | 75 | #define LoadUserProfile LoadUserProfileA |
| 51 | 76 | #define GetProfilesDirectory GetProfilesDirectoryA |
| 52 | 77 | #define GetUserProfileDirectory GetUserProfileDirectoryA |
| 78 | +#if (_WIN32_WINNT >= 0x0500) | |
| 79 | +#define DeleteProfile DeleteProfileA | |
| 80 | +#define GetAllUsersProfileDirectory GetAllUsersProfileDirectoryA | |
| 81 | +#define GetDefaultUserProfileDirectory GetDefaultUserProfileDirectoryA | |
| 82 | +#define ExpandEnvironmentStringsForUser ExpandEnvironmentStringsForUserA | |
| 83 | +#endif | |
| 53 | 84 | #endif |
| 54 | 85 | #ifdef __cplusplus |
| 55 | 86 | } |
Fork