diff options
| author | Danny Smith <dannysmith@users.sourceforge.net> | 2004-01-31 12:08:15 +0300 |
|---|---|---|
| committer | Danny Smith <dannysmith@users.sourceforge.net> | 2004-01-31 12:08:15 +0300 |
| commit | fff0b496a0f84550557457f2614805daf3e8928d (patch) | |
| tree | 0b239aca217f6f52065451d7ed0c0d1376f04fa2 | |
| parent | d2c7ccfc5f3b21b2fce95e0f417320ea419b31b2 (diff) | |
2004-01-31 Jiri Malak <Jiri.Malak@geac.cz>
* include/winuser.h (RT_MANIFEST): Make conditional on
RC_INVOKED.
(CREATEPROCESS_MANIFEST_RESOURCE_ID,
ISOLATIONAWARE_MANIFEST_RESOURCE_ID,
ISOLATIONAWARE_NOSTATICIMPORT_MANIFEST_RESOURCE_ID): Add
defines.
| -rw-r--r-- | winsup/w32api/ChangeLog | 9 | ||||
| -rw-r--r-- | winsup/w32api/include/winuser.h | 10 |
2 files changed, 19 insertions, 0 deletions
diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog index 2c3d1377f..f3c1abb04 100644 --- a/winsup/w32api/ChangeLog +++ b/winsup/w32api/ChangeLog @@ -1,3 +1,12 @@ +2004-01-31 Jiri Malak <Jiri.Malak@geac.cz> + + * include/winuser.h (RT_MANIFEST): Make conditional on + RC_INVOKED. + (CREATEPROCESS_MANIFEST_RESOURCE_ID, + ISOLATIONAWARE_MANIFEST_RESOURCE_ID, + ISOLATIONAWARE_NOSTATICIMPORT_MANIFEST_RESOURCE_ID): Add + defines. + 2004-01-16 Martin Fuchs <martin-fuchs@gmx.net> * include/shlobj.h (SHGDN_INCLUDE_NONFILESYS): Add define. diff --git a/winsup/w32api/include/winuser.h b/winsup/w32api/include/winuser.h index 08a568f15..96f8dab7d 100644 --- a/winsup/w32api/include/winuser.h +++ b/winsup/w32api/include/winuser.h @@ -556,7 +556,17 @@ extern "C" { #define RT_ANICURSOR MAKEINTRESOURCE(21) #define RT_ANIICON MAKEINTRESOURCE(22) #define RT_HTML MAKEINTRESOURCE(23) +#ifndef RC_INVOKED #define RT_MANIFEST MAKEINTRESOURCE(24) +#define CREATEPROCESS_MANIFEST_RESOURCE_ID MAKEINTRESOURCE(1) +#define ISOLATIONAWARE_MANIFEST_RESOURCE_ID MAKEINTRESOURCE(2) +#define ISOLATIONAWARE_NOSTATICIMPORT_MANIFEST_RESOURCE_ID MAKEINTRESOURCE(3) +#else +#define RT_MANIFEST 24 +#define CREATEPROCESS_MANIFEST_RESOURCE_ID 1 +#define ISOLATIONAWARE_MANIFEST_RESOURCE_ID 2 +#define ISOLATIONAWARE_NOSTATICIMPORT_MANIFEST_RESOURCE_ID 3 +#endif #define EWX_FORCE 4 #define EWX_LOGOFF 0 #define EWX_POWEROFF 8 |