From fbee1de696699b41a4da1df48cbd98b155c2a5dc Mon Sep 17 00:00:00 2001 From: Mike McCormack Date: Wed, 16 Mar 2005 19:50:33 +0000 Subject: [PATCH] Add property IDs for MSI summary information. --- include/msidefs.h | 43 +++++++++++++++++++++++++++++++++++++++++++ include/propidl.idl | 19 +++++++++++++++++++ 2 files changed, 62 insertions(+) diff --git a/include/msidefs.h b/include/msidefs.h index 45d4f20969b..f266b32172c 100644 --- a/include/msidefs.h +++ b/include/msidefs.h @@ -103,6 +103,49 @@ enum msidbComponentAttributes msidbComponentAttributes64bit = 0x00000100 }; +/* + * Windows SDK braindamage alert + * + * PID_DICTIONARY and PID_CODEPAGE are defined by propidl.h too + * PID_SECURITY is defined in propidl.h with a different value! + * So these need to be undefined first. + */ +#ifdef PID_DICTIONARY +#undef PID_DICTIONARY +#endif + +#ifdef PID_CODEPAGE +#undef PID_CODEPAGE +#endif + +#ifdef PID_SECURITY +#undef PID_SECURITY +#endif + +#define PID_DICTIONARY 0 +#define PID_CODEPAGE 1 +#define PID_TITLE 2 +#define PID_SUBJECT 3 +#define PID_AUTHOR 4 +#define PID_KEYWORDS 5 +#define PID_COMMENTS 6 +#define PID_TEMPLATE 7 +#define PID_LASTAUTHOR 8 +#define PID_REVNUMBER 9 +#define PID_EDITTINE 10 +#define PID_LASTPRINTED 11 +#define PID_CREATE_DTM 12 +#define PID_LASTSAVE_DTM 13 +#define PID_PAGECOUNT 14 +#define PID_WORDCOUNT 15 +#define PID_CHARCOUNT 16 +#define PID_THUMBNAIL 17 +#define PID_APPNAME 18 +#define PID_SECURITY 19 +#define PID_MSIVERSION PID_PAGECOUNT +#define PID_MSISOURCE PID_WORDCOUNT +#define PID_MSIRESTRICT PID_CHARCOUNT + #ifdef __cplusplus } #endif diff --git a/include/propidl.idl b/include/propidl.idl index 6864904a4d5..a5d38125810 100644 --- a/include/propidl.idl +++ b/include/propidl.idl @@ -22,6 +22,25 @@ import "objidl.idl"; import "oaidl.idl"; +/* + * Windows SDK braindamage alert + * + * PID_DICTIONARY and PID_CODEPAGE are defined by msidefs.h too + * PID_SECURITY is defined in msidefs.h with a different value! + * So these need to be undefined first. + */ +cpp_quote("#ifdef PID_DICTIONARY"); +cpp_quote("#undef PID_DICTIONARY"); +cpp_quote("#endif"); + +cpp_quote("#ifdef PID_CODEPAGE"); +cpp_quote("#undef PID_CODEPAGE"); +cpp_quote("#endif"); + +cpp_quote("#ifdef PID_SECURITY"); +cpp_quote("#undef PID_SECURITY"); +cpp_quote("#endif"); + /******************** Property Storage ********************/ interface IEnumSTATPROPSTG;