- Fix code generation \n for reintroduced get_property_type function
authorJulien Kerihuel <j.kerihuel@openchange.org>
Thu, 23 Feb 2012 17:04:41 +0000 (17:04 +0000)
committerJulien Kerihuel <j.kerihuel@openchange.org>
Thu, 23 Feb 2012 17:04:41 +0000 (17:04 +0000)
- Turn 0x in openchangedb_property into PidTag tiny names
- update generated code

libmapi/property_tags.c
mapiproxy/libmapiproxy/openchangedb_property.c
script/makepropslist.py

index b173913dee5bcffd1e17bf3d171a1a930eeac0cd..0a6a14d1f1cdba438ca2b14615b6bd6ccacfdb8c 100644 (file)
@@ -1325,7 +1325,6 @@ _PUBLIC_ uint32_t get_proptag_value(const char *propname)
        return 0;
 }
 
-
 _PUBLIC_ uint16_t get_property_type(uint16_t untypedtag)
 {
        uint32_t        idx;
@@ -1343,3 +1342,5 @@ _PUBLIC_ uint16_t get_property_type(uint16_t untypedtag)
        DEBUG(5, ("%s: type for property '%x' could not be deduced\n", __FUNCTION__, untypedtag));
        return 0;
 }
+
+
index 44d40a29ffaa2ce930014d91ec83be2a0de7686b..ffb59e85ddcfc7fa4af84d598499144c9b361d3d 100644 (file)
@@ -11,591 +11,591 @@ struct pidtags {
 };
 
 static struct pidtags pidtags[] = {
-       { PidTag7BitDisplayName,                                               "0x39FF001F" },
-       { PidTagAccess,                                                        "0x0FF40003" },
-       { PidTagAccessLevel,                                                   "0x0FF70003" },
-       { PidTagAccount,                                                       "0x3A00001F" },
-       { PidTagAdditionalRenEntryIds,                                         "0x36D81102" },
-       { PidTagAdditionalRenEntryIdsEx,                                       "0x36D90102" },
-       { PidTagAddressBookAuthorizedSenders,                                  "0x8CD8000D" },
-       { PidTagAddressBookContainerId,                                        "0xFFFD0003" },
-       { PidTagAddressBookDeliveryContentLength,                              "0x806A0003" },
-       { PidTagAddressBookDisplayTypeExtended,                                "0x8C930003" },
-       { PidTagAddressBookDistributionListExternalMemberCount,                "0x8CE30003" },
-       { PidTagAddressBookDistributionListMemberCount,                        "0x8CE20003" },
-       { PidTagAddressBookDistributionListMemberSubmitAccepted,               "0x8073000D" },
-       { PidTagAddressBookDistributionListMemberSubmitRejected,               "0x8CDA000D" },
-       { PidTagAddressBookDistributionListRejectMessagesFromDLMembers,        "0x8CDB000D" },
-       { PidTagAddressBookEntryId,                                            "0x663B0102" },
-       { PidTagAddressBookExtensionAttribute1,                                "0x802D001F" },
-       { PidTagAddressBookExtensionAttribute15,                               "0x8C61001F" },
-       { PidTagAddressBookFolderPathname,                                     "0x8004001F" },
-       { PidTagAddressBookHierarchicalChildDepartments,                       "0x8C9A000D" },
-       { PidTagAddressBookHierarchicalDepartmentMembers,                      "0x8C97000D" },
-       { PidTagAddressBookHierarchicalIsHierarchicalGroup,                    "0x8CDD000B" },
-       { PidTagAddressBookHierarchicalParentDepartment,                       "0x8C99000D" },
-       { PidTagAddressBookHierarchicalRootDepartment,                         "0x8C98001E" },
-       { PidTagAddressBookHierarchicalShowInDepartments,                      "0x8C94000D" },
-       { PidTagAddressBookHomeMessageDatabase,                                "0x8006001E" },
-       { PidTagAddressBookIsMaster,                                           "0xFFFB000B" },
-       { PidTagAddressBookIsMemberOfDistributionList,                         "0x8008101E" },
-       { PidTagAddressBookManageDistributionList,                             "0x6704000D" },
-       { PidTagAddressBookManager,                                            "0x8005000D" },
-       { PidTagAddressBookMember,                                             "0x8009101E" },
-       { PidTagAddressBookMessageId,                                          "0x674F0014" },
-       { PidTagAddressBookModerationEnabled,                                  "0x8CB5000B" },
-       { PidTagAddressBookNetworkAddress,                                     "0x8170101F" },
-       { PidTagAddressBookObjectDistinguishedName,                            "0x803C001F" },
-       { PidTagAddressBookObjectGuid,                                         "0x8C6D0102" },
-       { PidTagAddressBookOrganizationalUnitRootDistinguishedName,            "0x8CA8001F" },
-       { PidTagAddressBookOwner,                                              "0x800C000D" },
-       { PidTagAddressBookOwnerBackLink,                                      "0x8024000D" },
-       { PidTagAddressBookParentEntryId,                                      "0xFFFC0102" },
-       { PidTagAddressBookPhoneticCompanyName,                                "0x8C91001F" },
-       { PidTagAddressBookPhoneticDepartmentName,                             "0x8C90001F" },
-       { PidTagAddressBookPhoneticDisplayName,                                "0x8C92001F" },
-       { PidTagAddressBookPhoneticGivenName,                                  "0x8C8E001F" },
-       { PidTagAddressBookPhoneticSurname,                                    "0x8C8F001F" },
-       { PidTagAddressBookProxyAddresses,                                     "0x800F101F" },
-       { PidTagAddressBookPublicDelegates,                                    "0x8015000D" },
-       { PidTagAddressBookReports,                                            "0x800E000D" },
-       { PidTagAddressBookRoomCapacity,                                       "0x08070003" },
-       { PidTagAddressBookRoomContainers,                                     "0x8C96101F" },
-       { PidTagAddressBookRoomDescription,                                    "0x0809001F" },
-       { PidTagAddressBookSenderHintTranslations,                             "0x8CAC101F" },
-       { PidTagAddressBookSeniorityIndex,                                     "0x8CA00003" },
-       { PidTagAddressBookTargetAddress,                                      "0x8011001F" },
-       { PidTagAddressBookUnauthorizedSenders,                                "0x8CD9000D" },
-       { PidTagAddressBookX509Certificate,                                    "0x8C6A1102" },
-       { PidTagAddressType,                                                   "0x3002001F" },
-       { PidTagAlternateRecipientAllowed,                                     "0x0002000B" },
-       { PidTagAnr,                                                           "0x360C001F" },
-       { PidTagArchiveDate,                                                   "0x301F0040" },
-       { PidTagArchivePeriod,                                                 "0x301E0003" },
-       { PidTagArchiveTag,                                                    "0x30180102" },
-       { PidTagAssistant,                                                     "0x3A30001F" },
-       { PidTagAssistantTelephoneNumber,                                      "0x3A2E001F" },
-       { PidTagAssociated,                                                    "0x67AA000B" },
-       { PidTagAttachAdditionalInformation,                                   "0x370F0102" },
-       { PidTagAttachContentBase,                                             "0x3711001F" },
-       { PidTagAttachContentId,                                               "0x3712001F" },
-       { PidTagAttachContentLocation,                                         "0x3713001F" },
-       { PidTagAttachDataBinary,                                              "0x37010102" },
-       { PidTagAttachEncoding,                                                "0x37020102" },
-       { PidTagAttachExtension,                                               "0x3703001F" },
-       { PidTagAttachFilename,                                                "0x3704001F" },
-       { PidTagAttachFlags,                                                   "0x37140003" },
-       { PidTagAttachLongFilename,                                            "0x3707001F" },
-       { PidTagAttachLongPathname,                                            "0x370D001F" },
-       { PidTagAttachMethod,                                                  "0x37050003" },
-       { PidTagAttachMimeTag,                                                 "0x370E001F" },
-       { PidTagAttachNumber,                                                  "0x0E210003" },
-       { PidTagAttachPathname,                                                "0x3708001F" },
-       { PidTagAttachPayloadClass,                                            "0x371A001F" },
-       { PidTagAttachPayloadProviderGuidString,                               "0x3719001F" },
-       { PidTagAttachRendering,                                               "0x37090102" },
-       { PidTagAttachSize,                                                    "0x0E200003" },
-       { PidTagAttachTag,                                                     "0x370A0102" },
-       { PidTagAttachTransportName,                                           "0x370C001F" },
-       { PidTagAttachmentContactPhoto,                                        "0x7FFF000B" },
-       { PidTagAttachmentFlags,                                               "0x7FFD0003" },
-       { PidTagAttachmentHidden,                                              "0x7FFE000B" },
-       { PidTagAttachmentLinkId,                                              "0x7FFA0003" },
-       { PidTagAttributeHidden,                                               "0x10F4000B" },
-       { PidTagAttributeReadOnly,                                             "0x10F6000B" },
-       { PidTagAttributeSystem,                                               "0x10F5000B" },
-       { PidTagAutoForwardComment,                                            "0x0004001F" },
-       { PidTagAutoForwarded,                                                 "0x0005000B" },
-       { PidTagAutoResponseSuppress,                                          "0x3FDF0003" },
-       { PidTagBirthday,                                                      "0x3A420040" },
-       { PidTagBlockStatus,                                                   "0x10960003" },
-       { PidTagBody,                                                          "0x1000001F" },
-       { PidTagBodyContentId,                                                 "0x1015001F" },
-       { PidTagBodyContentLocation,                                           "0x1014001F" },
-       { PidTagBodyHtml,                                                      "0x1013001F" },
-       { PidTagBusiness2TelephoneNumber,                                      "0x3A1B001F" },
-       { PidTagBusinessFaxNumber,                                             "0x3A24001F" },
-       { PidTagBusinessHomePage,                                              "0x3A51001F" },
-       { PidTagBusinessTelephoneNumber,                                       "0x3A08001F" },
-       { PidTagCallId,                                                        "0x6806001F" },
-       { PidTagCallbackTelephoneNumber,                                       "0x3A02001F" },
-       { PidTagCarTelephoneNumber,                                            "0x3A1E001F" },
-       { PidTagCdoRecurrenceid,                                               "0x10C50040" },
-       { PidTagChangeKey,                                                     "0x65E20102" },
-       { PidTagChangeNotificationGuid,                                        "0x66370048" },
-       { PidTagChangeNumber,                                                  "0x67A40014" },
-       { PidTagChildrensNames,                                                "0x3A58101F" },
-       { PidTagClientActions,                                                 "0x66450102" },
-       { PidTagClientSubmitTime,                                              "0x00390040" },
-       { PidTagCnsetRead,                                                     "0x67D20102" },
-       { PidTagCnsetSeen,                                                     "0x67960102" },
-       { PidTagCnsetSeenFAI,                                                  "0x67DA0102" },
-       { PidTagCodePageId,                                                    "0x66C30003" },
-       { PidTagComment,                                                       "0x3004001F" },
-       { PidTagCompanyMainTelephoneNumber,                                    "0x3A57001F" },
-       { PidTagCompanyName,                                                   "0x3A16001F" },
-       { PidTagComputerNetworkName,                                           "0x3A49001F" },
-       { PidTagConflictEntryId,                                               "0x3FF00102" },
-       { PidTagConflictItems,                                                 "0x10981102" },
-       { PidTagContainerClass,                                                "0x3613001F" },
-       { PidTagContainerContents,                                             "0x360F000D" },
-       { PidTagContainerFlags,                                                "0x36000003" },
-       { PidTagContainerHierarchy,                                            "0x360E000D" },
-       { PidTagContentCount,                                                  "0x36020003" },
-       { PidTagContentFilterPhishingConfidenceLevel,                          "0x40840003" },
-       { PidTagContentFilterSpamConfidenceLevel,                              "0x40760003" },
-       { PidTagContentUnreadCount,                                            "0x36030003" },
-       { PidTagConversationId,                                                "0x30130102" },
-       { PidTagConversationIndex,                                             "0x00710102" },
-       { PidTagConversationIndexTracking,                                     "0x3016000B" },
-       { PidTagConversationTopic,                                             "0x0070001F" },
-       { PidTagCountry,                                                       "0x3A26001F" },
-       { PidTagCreationTime,                                                  "0x30070040" },
-       { PidTagCreatorEntryId,                                                "0x3FF90102" },
-       { PidTagCreatorName,                                                   "0x3FF8001F" },
-       { PidTagCreatorSimpleDisplayName,                                      "0x4038001F" },
-       { PidTagCustomerId,                                                    "0x3A4A001F" },
-       { PidTagDamBackPatched,                                                "0x6647000B" },
-       { PidTagDamOriginalEntryId,                                            "0x66460102" },
-       { PidTagDefaultPostMessageClass,                                       "0x36E5001F" },
-       { PidTagDeferredActionMessageOriginalEntryId,                          "0x674100FB" },
-       { PidTagDeferredDeliveryTime,                                          "0x000F0040" },
-       { PidTagDeferredSendNumber,                                            "0x3FEB0003" },
-       { PidTagDeferredSendTime,                                              "0x3FEF0040" },
-       { PidTagDeferredSendUnits,                                             "0x3FEC0003" },
-       { PidTagDelegateFlags,                                                 "0x686B1003" },
-       { PidTagDelegatedByRule,                                               "0x3FE3000B" },
-       { PidTagDeleteAfterSubmit,                                             "0x0E01000B" },
-       { PidTagDeletedOn,                                                     "0x668F0040" },
-       { PidTagDepartmentName,                                                "0x3A18001F" },
-       { PidTagDepth,                                                         "0x30050003" },
-       { PidTagDisplayBcc,                                                    "0x0E02001F" },
-       { PidTagDisplayCc,                                                     "0x0E03001F" },
-       { PidTagDisplayName,                                                   "0x3001001F" },
-       { PidTagDisplayNamePrefix,                                             "0x3A45001F" },
-       { PidTagDisplayTo,                                                     "0x0E04001F" },
-       { PidTagDisplayType,                                                   "0x39000003" },
-       { PidTagDisplayTypeEx,                                                 "0x39050003" },
-       { PidTagEcWarning,                                                     "0x400F0003" },
-       { PidTagEmailAddress,                                                  "0x3003001F" },
-       { PidTagEndAttach,                                                     "0x400E0003" },
-       { PidTagEndDate,                                                       "0x00610040" },
-       { PidTagEndEmbed,                                                      "0x40020003" },
-       { PidTagEndFolder,                                                     "0x400B0003" },
-       { PidTagEndMessage,                                                    "0x400D0003" },
-       { PidTagEndToRecip,                                                    "0x40040003" },
-       { PidTagEntryId,                                                       "0x0FFF0102" },
-       { PidTagExceptionEndTime,                                              "0x7FFC0040" },
-       { PidTagExceptionReplaceTime,                                          "0x7FF90040" },
-       { PidTagExceptionStartTime,                                            "0x7FFB0040" },
-       { PidTagExchangeNTSecurityDescriptor,                                  "0x0E840102" },
-       { PidTagExpiryNumber,                                                  "0x3FED0003" },
-       { PidTagExpiryTime,                                                    "0x00150040" },
-       { PidTagExpiryUnits,                                                   "0x3FEE0003" },
-       { PidTagExtendedFolderFlags,                                           "0x36DA0102" },
-       { PidTagExtendedRuleMessageActions,                                    "0x0E990102" },
-       { PidTagExtendedRuleMessageCondition,                                  "0x0E9A0102" },
-       { PidTagExtendedRuleSizeLimit,                                         "0x0E9B0003" },
-       { PidTagFXDelProp,                                                     "0x40160003" },
-       { PidTagFXErrorInfo,                                                   "0x40180003" },
-       { PidTagFaxNumberOfPages,                                              "0x68040003" },
-       { PidTagFlagCompleteTime,                                              "0x10910040" },
-       { PidTagFlagStatus,                                                    "0x10900003" },
-       { PidTagFlatUrlName,                                                   "0x670E001F" },
-       { PidTagFolderAssociatedContents,                                      "0x3610000D" },
-       { PidTagFolderId,                                                      "0x67480014" },
-       { PidTagFolderType,                                                    "0x36010003" },
-       { PidTagFollowupIcon,                                                  "0x10950003" },
-       { PidTagFreeBusyCountMonths,                                           "0x68690003" },
-       { PidTagFreeBusyEntryIds,                                              "0x36E41102" },
-       { PidTagFreeBusyMessageEmailAddress,                                   "0x6849001F" },
-       { PidTagFreeBusyPublishEnd,                                            "0x68480003" },
-       { PidTagFreeBusyPublishStart,                                          "0x68470003" },
-       { PidTagFreeBusyRangeTimestamp,                                        "0x68680040" },
-       { PidTagFtpSite,                                                       "0x3A4C001F" },
-       { PidTagGatewayNeedsToRefresh,                                         "0x6846000B" },
-       { PidTagGender,                                                        "0x3A4D0002" },
-       { PidTagGeneration,                                                    "0x3A05001F" },
-       { PidTagGivenName,                                                     "0x3A06001F" },
-       { PidTagGovernmentIdNumber,                                            "0x3A07001F" },
-       { PidTagHasAttachments,                                                "0x0E1B000B" },
-       { PidTagHasDeferredActionMessages,                                     "0x3FEA000B" },
-       { PidTagHasNamedProperties,                                            "0x664A000B" },
-       { PidTagHasRules,                                                      "0x663A000B" },
-       { PidTagHierarchyChangeNumber,                                         "0x663E0003" },
-       { PidTagHobbies,                                                       "0x3A43001F" },
-       { PidTagHome2TelephoneNumber,                                          "0x3A2F001F" },
-       { PidTagHomeAddressCity,                                               "0x3A59001F" },
-       { PidTagHomeAddressCountry,                                            "0x3A5A001F" },
-       { PidTagHomeAddressPostOfficeBox,                                      "0x3A5E001F" },
-       { PidTagHomeAddressPostalCode,                                         "0x3A5B001F" },
-       { PidTagHomeAddressStateOrProvince,                                    "0x3A5C001F" },
-       { PidTagHomeAddressStreet,                                             "0x3A5D001F" },
-       { PidTagHomeFaxNumber,                                                 "0x3A25001F" },
-       { PidTagHomeTelephoneNumber,                                           "0x3A09001F" },
-       { PidTagICalendarEndTime,                                              "0x10C40040" },
-       { PidTagICalendarReminderNextTime,                                     "0x10CA0040" },
-       { PidTagICalendarStartTime,                                            "0x10C30040" },
-       { PidTagIconIndex,                                                     "0x10800003" },
-       { PidTagIdsetDeleted,                                                  "0x67E50102" },
-       { PidTagIdsetExpired,                                                  "0x67930102" },
-       { PidTagIdsetGiven,                                                    "0x40170003" },
-       { PidTagIdsetNoLongerInScope,                                          "0x40210102" },
-       { PidTagIdsetRead,                                                     "0x402D0102" },
-       { PidTagIdsetUnread,                                                   "0x402E0102" },
-       { PidTagImapCachedMsgsize,                                             "0x10F00102" },
-       { PidTagImportance,                                                    "0x00170003" },
-       { PidTagInConflict,                                                    "0x666C000B" },
-       { PidTagInReplyToId,                                                   "0x1042001F" },
-       { PidTagIncrSyncChg,                                                   "0x40120003" },
-       { PidTagIncrSyncChgPartial,                                            "0x407D0003" },
-       { PidTagIncrSyncDel,                                                   "0x40130003" },
-       { PidTagIncrSyncEnd,                                                   "0x40140003" },
-       { PidTagIncrSyncGroupId,                                               "0x407C0003" },
-       { PidTagIncrSyncGroupInfo,                                             "0x407B0102" },
-       { PidTagIncrSyncMessage,                                               "0x40150003" },
-       { PidTagIncrSyncProgressMode,                                          "0x4074000B" },
-       { PidTagIncrSyncProgressPerMsg,                                        "0x4075000B" },
-       { PidTagIncrSyncRead,                                                  "0x402F0003" },
-       { PidTagIncrSyncStateBegin,                                            "0x403A0003" },
-       { PidTagIncrSyncStateEnd,                                              "0x403B0003" },
-       { PidTagIncrementalSyncMessagePartial,                                 "0x407A0003" },
-       { PidTagInitialDetailsPane,                                            "0x3F080003" },
-       { PidTagInitials,                                                      "0x3A0A001F" },
-       { PidTagInstID,                                                        "0x674D0014" },
-       { PidTagInstanceKey,                                                   "0x0FF60102" },
-       { PidTagInstanceNum,                                                   "0x674E0003" },
-       { PidTagInternetArticleNumber,                                         "0x0E230003" },
-       { PidTagInternetCodepage,                                              "0x3FDE0003" },
-       { PidTagInternetMailOverrideFormat,                                    "0x59020003" },
-       { PidTagInternetMessageId,                                             "0x1035001F" },
-       { PidTagInternetReferences,                                            "0x1039001F" },
-       { PidTagIpmAppointmentEntryId,                                         "0x36D00102" },
-       { PidTagIpmContactEntryId,                                             "0x36D10102" },
-       { PidTagIpmDraftsEntryId,                                              "0x36D70102" },
-       { PidTagIpmJournalEntryId,                                             "0x36D20102" },
-       { PidTagIpmNoteEntryId,                                                "0x36D30102" },
-       { PidTagIpmTaskEntryId,                                                "0x36D40102" },
-       { PidTagIsdnNumber,                                                    "0x3A2D001F" },
-       { PidTagJunkAddRecipientsToSafeSendersList,                            "0x61030003" },
-       { PidTagJunkIncludeContacts,                                           "0x61000003" },
-       { PidTagJunkPermanentlyDelete,                                         "0x61020003" },
-       { PidTagJunkPhishingEnableLinks,                                       "0x6107000B" },
-       { PidTagJunkThreshold,                                                 "0x61010003" },
-       { PidTagKeyword,                                                       "0x3A0B001F" },
-       { PidTagLanguage,                                                      "0x3A0C001F" },
-       { PidTagLastModificationTime,                                          "0x30080040" },
-       { PidTagLastModifierEntryId,                                           "0x3FFB0102" },
-       { PidTagLastModifierName,                                              "0x3FFA001F" },
-       { PidTagLastModifierSimpleDisplayName,                                 "0x4039001F" },
-       { PidTagLastVerbExecuted,                                              "0x10810003" },
-       { PidTagLastVerbExecutionTime,                                         "0x10820040" },
-       { PidTagListHelp,                                                      "0x1043001F" },
-       { PidTagListSubscribe,                                                 "0x1044001F" },
-       { PidTagListUnsubscribe,                                               "0x1045001F" },
-       { PidTagLocalCommitTime,                                               "0x67090040" },
-       { PidTagLocaleId,                                                      "0x66A10003" },
-       { PidTagLocality,                                                      "0x3A27001F" },
-       { PidTagLocation,                                                      "0x3A0D001F" },
-       { PidTagMailboxOwnerEntryId,                                           "0x661B0102" },
-       { PidTagMailboxOwnerName,                                              "0x661C001F" },
-       { PidTagManagerName,                                                   "0x3A4E001F" },
-       { PidTagMappingSignature,                                              "0x0FF80102" },
-       { PidTagMaximumSubmitMessageSize,                                      "0x666D0003" },
-       { PidTagMemberId,                                                      "0x66710014" },
-       { PidTagMemberName,                                                    "0x6672001F" },
-       { PidTagMemberRights,                                                  "0x66730003" },
-       { PidTagMessageAttachments,                                            "0x0E13000D" },
-       { PidTagMessageCcMe,                                                   "0x0058000B" },
-       { PidTagMessageClass,                                                  "0x001A001F" },
-       { PidTagMessageCodepage,                                               "0x3FFD0003" },
-       { PidTagMessageDeliveryTime,                                           "0x0E060040" },
-       { PidTagMessageEditorFormat,                                           "0x59090003" },
-       { PidTagMessageFlags,                                                  "0x0E070003" },
-       { PidTagMessageHandlingSystemCommonName,                               "0x3A0F001F" },
-       { PidTagMessageLocaleId,                                               "0x3FF10003" },
-       { PidTagMessageRecipientMe,                                            "0x0059000B" },
-       { PidTagMessageRecipients,                                             "0x0E12000D" },
-       { PidTagMessageSize,                                                   "0x0E080003" },
-       { PidTagMessageStatus,                                                 "0x0E170003" },
-       { PidTagMessageSubmissionId,                                           "0x00470102" },
-       { PidTagMessageToMe,                                                   "0x0057000B" },
-       { PidTagMid,                                                           "0x674A0014" },
-       { PidTagMiddleName,                                                    "0x3A44001F" },
-       { PidTagMimeSkeleton,                                                  "0x04700102" },
-       { PidTagMobileTelephoneNumber,                                         "0x3A1C001F" },
-       { PidTagNativeBody,                                                    "0x10160003" },
-       { PidTagNewAttach,                                                     "0x40000003" },
-       { PidTagNewFXFolder,                                                   "0x40110102" },
-       { PidTagNextSendAcct,                                                  "0x0E29001F" },
-       { PidTagNickname,                                                      "0x3A4F001F" },
-       { PidTagNormalMessageSize,                                             "0x66B30003" },
-       { PidTagNormalizedSubject,                                             "0x0E1D001F" },
-       { PidTagObjectType,                                                    "0x0FFE0003" },
-       { PidTagOfficeLocation,                                                "0x3A19001F" },
-       { PidTagOfflineAddressBookCompressedSize,                              "0x68090003" },
-       { PidTagOfflineAddressBookContainerGuid,                               "0x6802001E" },
-       { PidTagOfflineAddressBookFileSize,                                    "0x680A0003" },
-       { PidTagOfflineAddressBookFileType,                                    "0x68080003" },
-       { PidTagOfflineAddressBookLanguageId,                                  "0x68070003" },
-       { PidTagOfflineAddressBookMessageClass,                                "0x68030003" },
-       { PidTagOfflineAddressBookName,                                        "0x6800001F" },
-       { PidTagOfflineAddressBookSequence,                                    "0x68010003" },
-       { PidTagOfflineAddressBookTruncatedProperties,                         "0x68051003" },
-       { PidTagOrdinalMost,                                                   "0x36E20003" },
-       { PidTagOrganizationalIdNumber,                                        "0x3A10001F" },
-       { PidTagOriginalDeliveryTime,                                          "0x00550040" },
-       { PidTagOriginalDisplayBcc,                                            "0x0072001F" },
-       { PidTagOriginalDisplayCc,                                             "0x0073001F" },
-       { PidTagOriginalDisplayName,                                           "0x3A13001F" },
-       { PidTagOriginalDisplayTo,                                             "0x0074001F" },
-       { PidTagOriginalEntryId,                                               "0x3A120102" },
-       { PidTagOriginalMessageClass,                                          "0x004B001F" },
-       { PidTagOriginalMessageId,                                             "0x1046001F" },
-       { PidTagOriginalSearchKey,                                             "0x3A140102" },
-       { PidTagOriginalSenderAddressType,                                     "0x0066001F" },
-       { PidTagOriginalSenderEmailAddress,                                    "0x0067001F" },
-       { PidTagOriginalSenderEntryId,                                         "0x005B0102" },
-       { PidTagOriginalSenderName,                                            "0x005A001F" },
-       { PidTagOriginalSenderSearchKey,                                       "0x005C0102" },
-       { PidTagOriginalSensitivity,                                           "0x002E0003" },
-       { PidTagOriginalSentRepresentingAddressType,                           "0x0068001F" },
-       { PidTagOriginalSentRepresentingEmailAddress,                          "0x0069001F" },
-       { PidTagOriginalSentRepresentingEntryId,                               "0x005E0102" },
-       { PidTagOriginalSentRepresentingName,                                  "0x005D001F" },
-       { PidTagOriginalSentRepresentingSearchKey,                             "0x005F0102" },
-       { PidTagOriginalSubject,                                               "0x0049001F" },
-       { PidTagOriginalSubmitTime,                                            "0x004E0040" },
-       { PidTagOriginatorDeliveryReportRequested,                             "0x0023000B" },
-       { PidTagOriginatorNonDeliveryReportRequested,                          "0x0C08000B" },
-       { PidTagOtherAddressCity,                                              "0x3A5F001F" },
-       { PidTagOtherAddressCountry,                                           "0x3A60001F" },
-       { PidTagOtherAddressPostOfficeBox,                                     "0x3A64001F" },
-       { PidTagOtherAddressPostalCode,                                        "0x3A61001F" },
-       { PidTagOtherAddressStateOrProvince,                                   "0x3A62001F" },
-       { PidTagOtherAddressStreet,                                            "0x3A63001F" },
-       { PidTagOtherTelephoneNumber,                                          "0x3A1F001F" },
-       { PidTagOutOfOfficeState,                                              "0x661D000B" },
-       { PidTagOwnerAppointmentId,                                            "0x00620003" },
-       { PidTagPagerTelephoneNumber,                                          "0x3A21001F" },
-       { PidTagParentEntryId,                                                 "0x0E090102" },
-       { PidTagParentFolderId,                                                "0x67490014" },
-       { PidTagParentKey,                                                     "0x00250102" },
-       { PidTagParentSourceKey,                                               "0x65E10102" },
-       { PidTagPersonalHomePage,                                              "0x3A50001F" },
-       { PidTagPolicyTag,                                                     "0x30190102" },
-       { PidTagPostOfficeBox,                                                 "0x3A2B001F" },
-       { PidTagPostalAddress,                                                 "0x3A15001F" },
-       { PidTagPostalCode,                                                    "0x3A2A001F" },
-       { PidTagPredecessorChangeList,                                         "0x65E30102" },
-       { PidTagPrimaryFaxNumber,                                              "0x3A23001F" },
-       { PidTagPrimarySendAccount,                                            "0x0E28001F" },
-       { PidTagPrimarySmtpAddress,                                            "0x39FE001F" },
-       { PidTagPrimaryTelephoneNumber,                                        "0x3A1A001F" },
-       { PidTagPriority,                                                      "0x00260003" },
-       { PidTagProcessed,                                                     "0x7D01000B" },
-       { PidTagProfession,                                                    "0x3A46001F" },
-       { PidTagProhibitReceiveQuota,                                          "0x666A0003" },
-       { PidTagProhibitSendQuota,                                             "0x666E0003" },
-       { PidTagProviderSubmitTime,                                            "0x00480040" },
-       { PidTagPublicFolderAdministrativeDescription,                         "0x671C001F" },
-       { PidTagPublicFolderProxy,                                             "0x671D0102" },
-       { PidTagPurportedSenderDomain,                                         "0x4083001F" },
-       { PidTagRadioTelephoneNumber,                                          "0x3A1D001F" },
-       { PidTagRead,                                                          "0x0E69000B" },
-       { PidTagReadReceiptAddressType,                                        "0x4029001F" },
-       { PidTagReadReceiptEmailAddress,                                       "0x402A001F" },
-       { PidTagReadReceiptEntryId,                                            "0x00460102" },
-       { PidTagReadReceiptName,                                               "0x402B001F" },
-       { PidTagReadReceiptRequested,                                          "0x0029000B" },
-       { PidTagReadReceiptSearchKey,                                          "0x00530102" },
-       { PidTagReceivedByAddressType,                                         "0x0075001F" },
-       { PidTagReceivedByEmailAddress,                                        "0x0076001F" },
-       { PidTagReceivedByEntryId,                                             "0x003F0102" },
-       { PidTagReceivedByFlags,                                               "0x401B0003" },
-       { PidTagReceivedByName,                                                "0x0040001F" },
-       { PidTagReceivedBySearchKey,                                           "0x00510102" },
-       { PidTagReceivedRepresentingAddressType,                               "0x0077001F" },
-       { PidTagReceivedRepresentingEmailAddress,                              "0x0078001F" },
-       { PidTagReceivedRepresentingEntryId,                                   "0x00430102" },
-       { PidTagReceivedRepresentingFlags,                                     "0x401C0003" },
-       { PidTagReceivedRepresentingName,                                      "0x0044001F" },
-       { PidTagReceivedRepresentingSearchKey,                                 "0x00520102" },
-       { PidTagReceivedRepresentingSimpleDisplayName,                         "0x4035001F" },
-       { PidTagRecipientDisplayName,                                          "0x5FF6001F" },
-       { PidTagRecipientEntryId,                                              "0x5FF70102" },
-       { PidTagRecipientFlags,                                                "0x5FFD0003" },
-       { PidTagRecipientOrder,                                                "0x5FDF0003" },
-       { PidTagRecipientProposed,                                             "0x5FE1000B" },
-       { PidTagRecipientProposedEndTime,                                      "0x5FE40040" },
-       { PidTagRecipientProposedStartTime,                                    "0x5FE30040" },
-       { PidTagRecipientReassignmentProhibited,                               "0x002B000B" },
-       { PidTagRecipientResourceState,                                        "0x5FDE0003" },
-       { PidTagRecipientTrackStatus,                                          "0x5FFF0003" },
-       { PidTagRecipientTrackStatusTime,                                      "0x5FFB0040" },
-       { PidTagRecipientType,                                                 "0x0C150003" },
-       { PidTagRecordKey,                                                     "0x0FF90102" },
-       { PidTagReferredByName,                                                "0x3A47001F" },
-       { PidTagRemindersOnlineEntryId,                                        "0x36D50102" },
-       { PidTagRemoteMessageTransferAgent,                                    "0x0C21001F" },
-       { PidTagRenderingPosition,                                             "0x370B0003" },
-       { PidTagReplyRecipientEntries,                                         "0x004F0102" },
-       { PidTagReplyRecipientNames,                                           "0x0050001F" },
-       { PidTagReplyRequested,                                                "0x0C17000B" },
-       { PidTagReplyTemplateId,                                               "0x65C20102" },
-       { PidTagReplyTime,                                                     "0x00300040" },
-       { PidTagReportEntryId,                                                 "0x00450102" },
-       { PidTagReportName,                                                    "0x003A001F" },
-       { PidTagReportSearchKey,                                               "0x00540102" },
-       { PidTagReportTag,                                                     "0x00310102" },
-       { PidTagReportText,                                                    "0x1001001F" },
-       { PidTagReportTime,                                                    "0x00320040" },
-       { PidTagReportingMessageTransferAgent,                                 "0x6820001F" },
-       { PidTagResolveMethod,                                                 "0x3FE70003" },
-       { PidTagResponseRequested,                                             "0x0063000B" },
-       { PidTagResponsibility,                                                "0x0E0F000B" },
-       { PidTagRetentionDate,                                                 "0x301C0040" },
-       { PidTagRetentionFlags,                                                "0x301D0003" },
-       { PidTagRetentionPeriod,                                               "0x301A0003" },
-       { PidTagRights,                                                        "0x66390003" },
-       { PidTagRoamingDatatypes,                                              "0x7C060003" },
-       { PidTagRoamingDictionary,                                             "0x7C070102" },
-       { PidTagRoamingXmlStream,                                              "0x7C080102" },
-       { PidTagRowType,                                                       "0x0FF50003" },
-       { PidTagRowid,                                                         "0x30000003" },
-       { PidTagRtfCompressed,                                                 "0x10090102" },
-       { PidTagRtfInSync,                                                     "0x0E1F000B" },
-       { PidTagRtfSyncBodyCount,                                              "0x10070003" },
-       { PidTagRtfSyncBodyCrc,                                                "0x10060003" },
-       { PidTagRtfSyncBodyTag,                                                "0x1008001F" },
-       { PidTagRtfSyncPrefixCount,                                            "0x10100003" },
-       { PidTagRtfSyncTrailingCount,                                          "0x10110003" },
-       { PidTagRuleActionNumber,                                              "0x66500003" },
-       { PidTagRuleActionType,                                                "0x66490003" },
-       { PidTagRuleActions,                                                   "0x668000FE" },
-       { PidTagRuleCondition,                                                 "0x667900FD" },
-       { PidTagRuleError,                                                     "0x66480003" },
-       { PidTagRuleFolderEntryId,                                             "0x66510102" },
-       { PidTagRuleId,                                                        "0x66740014" },
-       { PidTagRuleIds,                                                       "0x66750102" },
-       { PidTagRuleLevel,                                                     "0x66830003" },
-       { PidTagRuleMessageLevel,                                              "0x65ED0003" },
-       { PidTagRuleMessageName,                                               "0x65EC001F" },
-       { PidTagRuleMessageProvider,                                           "0x65EB001F" },
-       { PidTagRuleMessageProviderData,                                       "0x65EE0102" },
-       { PidTagRuleMessageSequence,                                           "0x65F30003" },
-       { PidTagRuleMessageState,                                              "0x65E90003" },
-       { PidTagRuleMessageUserFlags,                                          "0x65EA0003" },
-       { PidTagRuleName,                                                      "0x6682001F" },
-       { PidTagRuleProvider,                                                  "0x6681001F" },
-       { PidTagRuleProviderData,                                              "0x66840102" },
-       { PidTagRuleSequence,                                                  "0x66760003" },
-       { PidTagRuleState,                                                     "0x66770003" },
-       { PidTagRuleUserFlags,                                                 "0x66780003" },
-       { PidTagScheduleInfoAppointmentTombstone,                              "0x686A0102" },
-       { PidTagScheduleInfoAutoAcceptAppointments,                            "0x686D000B" },
-       { PidTagScheduleInfoDelegateEntryIds,                                  "0x68451102" },
-       { PidTagScheduleInfoDelegateNames,                                     "0x6844101F" },
-       { PidTagScheduleInfoDelegateNamesW,                                    "0x684A101F" },
-       { PidTagScheduleInfoDelegatorWantsCopy,                                "0x6842000B" },
-       { PidTagScheduleInfoDelegatorWantsInfo,                                "0x684B000B" },
-       { PidTagScheduleInfoDisallowOverlappingAppts,                          "0x686F000B" },
-       { PidTagScheduleInfoDisallowRecurringAppts,                            "0x686E000B" },
-       { PidTagScheduleInfoDontMailDelegates,                                 "0x6843000B" },
-       { PidTagScheduleInfoFreeBusy,                                          "0x686C0102" },
-       { PidTagScheduleInfoFreeBusyAway,                                      "0x68561102" },
-       { PidTagScheduleInfoFreeBusyBusy,                                      "0x68541102" },
-       { PidTagScheduleInfoFreeBusyMerged,                                    "0x68501102" },
-       { PidTagScheduleInfoFreeBusyTentative,                                 "0x68521102" },
-       { PidTagScheduleInfoMonthsAway,                                        "0x68551003" },
-       { PidTagScheduleInfoMonthsBusy,                                        "0x68531003" },
-       { PidTagScheduleInfoMonthsMerged,                                      "0x684F1003" },
-       { PidTagScheduleInfoMonthsTentative,                                   "0x68511003" },
-       { PidTagScheduleInfoResourceType,                                      "0x68410003" },
-       { PidTagSchedulePlusFreeBusyEntryId,                                   "0x66220102" },
-       { PidTagSearchFolderExpiration,                                        "0x683A0003" },
-       { PidTagSearchFolderLastUsed,                                          "0x68340003" },
-       { PidTagSearchKey,                                                     "0x300B0102" },
-       { PidTagSecureSubmitFlags,                                             "0x65C60003" },
-       { PidTagSecurityDescriptor,                                            "0x0E270102" },
-       { PidTagSecurityDescriptorAsXml,                                       "0x0E6A001F" },
-       { PidTagSelectable,                                                    "0x3609000B" },
-       { PidTagSendInternetEncoding,                                          "0x3A710003" },
-       { PidTagSendRichInfo,                                                  "0x3A40000B" },
-       { PidTagSenderAddressType,                                             "0x0C1E001F" },
-       { PidTagSenderEmailAddress,                                            "0x0C1F001F" },
-       { PidTagSenderEntryId,                                                 "0x0C190102" },
-       { PidTagSenderFlags,                                                   "0x40190003" },
-       { PidTagSenderIdStatus,                                                "0x40790003" },
-       { PidTagSenderName,                                                    "0x0C1A001F" },
-       { PidTagSenderSearchKey,                                               "0x0C1D0102" },
-       { PidTagSenderSimpleDisplayName,                                       "0x4030001F" },
-       { PidTagSenderSmtpAddress,                                             "0x5D01001F" },
-       { PidTagSensitivity,                                                   "0x00360003" },
-       { PidTagSentMailSvrEID,                                                "0x674000FB" },
-       { PidTagSentRepresentingAddressType,                                   "0x0064001F" },
-       { PidTagSentRepresentingEmailAddress,                                  "0x0065001F" },
-       { PidTagSentRepresentingEntryId,                                       "0x00410102" },
-       { PidTagSentRepresentingFlags,                                         "0x401A0003" },
-       { PidTagSentRepresentingName,                                          "0x0042001F" },
-       { PidTagSentRepresentingSearchKey,                                     "0x003B0102" },
-       { PidTagSentRepresentingSimpleDisplayName,                             "0x4031001F" },
-       { PidTagSessionInitiationProtocolUri,                                  "0x5FE5001F" },
-       { PidTagSortLocaleId,                                                  "0x67050003" },
-       { PidTagSourceKey,                                                     "0x65E00102" },
-       { PidTagSpokenName,                                                    "0x8CC20102" },
-       { PidTagSpouseName,                                                    "0x3A48001F" },
-       { PidTagStartDate,                                                     "0x00600040" },
-       { PidTagStartDateEtc,                                                  "0x301B0102" },
-       { PidTagStartEmbed,                                                    "0x40010003" },
-       { PidTagStartFAIMsg,                                                   "0x40100003" },
-       { PidTagStartMessage,                                                  "0x400C0003" },
-       { PidTagStartRecip,                                                    "0x40030003" },
-       { PidTagStartSubFld,                                                   "0x400A0003" },
-       { PidTagStartTopFld,                                                   "0x40090003" },
-       { PidTagStateOrProvince,                                               "0x3A28001F" },
-       { PidTagStoreEntryId,                                                  "0x0FFB0102" },
-       { PidTagStoreState,                                                    "0x340E0003" },
-       { PidTagStoreSupportMask,                                              "0x340D0003" },
-       { PidTagStreetAddress,                                                 "0x3A29001F" },
-       { PidTagSubfolder,                                                     "0x6708000B" },
-       { PidTagSubfolders,                                                    "0x360A000B" },
-       { PidTagSubject,                                                       "0x0037001F" },
-       { PidTagSubjectPrefix,                                                 "0x003D001F" },
-       { PidTagSurname,                                                       "0x3A11001F" },
-       { PidTagSwappedToDoData,                                               "0x0E2D0102" },
-       { PidTagSwappedToDoStore,                                              "0x0E2C0102" },
-       { PidTagTargetEntryId,                                                 "0x30100102" },
-       { PidTagTelecommunicationsDeviceForDeafTelephoneNumber,                "0x3A4B001F" },
-       { PidTagTelexNumber,                                                   "0x3A2C001F" },
-       { PidTagTemplateData,                                                  "0x00010102" },
-       { PidTagTemplateid,                                                    "0x39020102" },
-       { PidTagTemporaryDefaultDocument,                                      "0x3F20001F" },
-       { PidTagTextAttachmentCharset,                                         "0x371B001F" },
-       { PidTagThumbnailPhoto,                                                "0x8C9E0102" },
-       { PidTagTitle,                                                         "0x3A17001F" },
-       { PidTagTnefCorrelationKey,                                            "0x007F0102" },
-       { PidTagToDoItemFlags,                                                 "0x0E2B0003" },
-       { PidTagTransmittableDisplayName,                                      "0x3A20001F" },
-       { PidTagTransportMessageHeaders,                                       "0x007D001F" },
-       { PidTagTrustSender,                                                   "0x0E790003" },
-       { PidTagUrlCompName,                                                   "0x10F3001F" },
-       { PidTagUrlCompNameSet,                                                "0x0E62000B" },
-       { PidTagUrlName,                                                       "0x6707001F" },
-       { PidTagUserCertificate,                                               "0x3A220102" },
-       { PidTagUserEntryId,                                                   "0x66190102" },
-       { PidTagUserX509Certificate,                                           "0x3A701102" },
-       { PidTagViewDescriptorBinary,                                          "0x70010102" },
-       { PidTagViewDescriptorName,                                            "0x7006001F" },
-       { PidTagViewDescriptorStrings,                                         "0x7002001F" },
-       { PidTagViewDescriptorVersion,                                         "0x70070003" },
-       { PidTagWeddingAnniversary,                                            "0x3A410040" },
-       { PidTagWlinkAddressBookStoreEID,                                      "0x68910102" },
-       { PidTagWlinkClientID,                                                 "0x68900048" },
-       { PidTagWlinkEntryId,                                                  "0x684C0102" },
-       { PidTagWlinkROGroupType,                                              "0x68920003" },
-       { PidTagWlinkRecordKey,                                                "0x684D0102" },
-       { PidTagWlinkStoreEntryId,                                             "0x684E0102" },
+       { PidTag7BitDisplayName,                                              "PidTag7BitDisplayName" },
+       { PidTagAccess,                                                       "PidTagAccess" },
+       { PidTagAccessLevel,                                                  "PidTagAccessLevel" },
+       { PidTagAccount,                                                      "PidTagAccount" },
+       { PidTagAdditionalRenEntryIds,                                        "PidTagAdditionalRenEntryIds" },
+       { PidTagAdditionalRenEntryIdsEx,                                      "PidTagAdditionalRenEntryIdsEx" },
+       { PidTagAddressBookAuthorizedSenders,                                 "PidTagAddressBookAuthorizedSenders" },
+       { PidTagAddressBookContainerId,                                       "PidTagAddressBookContainerId" },
+       { PidTagAddressBookDeliveryContentLength,                             "PidTagAddressBookDeliveryContentLength" },
+       { PidTagAddressBookDisplayTypeExtended,                               "PidTagAddressBookDisplayTypeExtended" },
+       { PidTagAddressBookDistributionListExternalMemberCount,               "PidTagAddressBookDistributionListExternalMemberCount" },
+       { PidTagAddressBookDistributionListMemberCount,                       "PidTagAddressBookDistributionListMemberCount" },
+       { PidTagAddressBookDistributionListMemberSubmitAccepted,              "PidTagAddressBookDistributionListMemberSubmitAccepted" },
+       { PidTagAddressBookDistributionListMemberSubmitRejected,              "PidTagAddressBookDistributionListMemberSubmitRejected" },
+       { PidTagAddressBookDistributionListRejectMessagesFromDLMembers,       "PidTagAddressBookDistributionListRejectMessagesFromDLMembers" },
+       { PidTagAddressBookEntryId,                                           "PidTagAddressBookEntryId" },
+       { PidTagAddressBookExtensionAttribute1,                               "PidTagAddressBookExtensionAttribute1" },
+       { PidTagAddressBookExtensionAttribute15,                              "PidTagAddressBookExtensionAttribute15" },
+       { PidTagAddressBookFolderPathname,                                    "PidTagAddressBookFolderPathname" },
+       { PidTagAddressBookHierarchicalChildDepartments,                      "PidTagAddressBookHierarchicalChildDepartments" },
+       { PidTagAddressBookHierarchicalDepartmentMembers,                     "PidTagAddressBookHierarchicalDepartmentMembers" },
+       { PidTagAddressBookHierarchicalIsHierarchicalGroup,                   "PidTagAddressBookHierarchicalIsHierarchicalGroup" },
+       { PidTagAddressBookHierarchicalParentDepartment,                      "PidTagAddressBookHierarchicalParentDepartment" },
+       { PidTagAddressBookHierarchicalRootDepartment,                        "PidTagAddressBookHierarchicalRootDepartment" },
+       { PidTagAddressBookHierarchicalShowInDepartments,                     "PidTagAddressBookHierarchicalShowInDepartments" },
+       { PidTagAddressBookHomeMessageDatabase,                               "PidTagAddressBookHomeMessageDatabase" },
+       { PidTagAddressBookIsMaster,                                          "PidTagAddressBookIsMaster" },
+       { PidTagAddressBookIsMemberOfDistributionList,                        "PidTagAddressBookIsMemberOfDistributionList" },
+       { PidTagAddressBookManageDistributionList,                            "PidTagAddressBookManageDistributionList" },
+       { PidTagAddressBookManager,                                           "PidTagAddressBookManager" },
+       { PidTagAddressBookMember,                                            "PidTagAddressBookMember" },
+       { PidTagAddressBookMessageId,                                         "PidTagAddressBookMessageId" },
+       { PidTagAddressBookModerationEnabled,                                 "PidTagAddressBookModerationEnabled" },
+       { PidTagAddressBookNetworkAddress,                                    "PidTagAddressBookNetworkAddress" },
+       { PidTagAddressBookObjectDistinguishedName,                           "PidTagAddressBookObjectDistinguishedName" },
+       { PidTagAddressBookObjectGuid,                                        "PidTagAddressBookObjectGuid" },
+       { PidTagAddressBookOrganizationalUnitRootDistinguishedName,           "PidTagAddressBookOrganizationalUnitRootDistinguishedName" },
+       { PidTagAddressBookOwner,                                             "PidTagAddressBookOwner" },
+       { PidTagAddressBookOwnerBackLink,                                     "PidTagAddressBookOwnerBackLink" },
+       { PidTagAddressBookParentEntryId,                                     "PidTagAddressBookParentEntryId" },
+       { PidTagAddressBookPhoneticCompanyName,                               "PidTagAddressBookPhoneticCompanyName" },
+       { PidTagAddressBookPhoneticDepartmentName,                            "PidTagAddressBookPhoneticDepartmentName" },
+       { PidTagAddressBookPhoneticDisplayName,                               "PidTagAddressBookPhoneticDisplayName" },
+       { PidTagAddressBookPhoneticGivenName,                                 "PidTagAddressBookPhoneticGivenName" },
+       { PidTagAddressBookPhoneticSurname,                                   "PidTagAddressBookPhoneticSurname" },
+       { PidTagAddressBookProxyAddresses,                                    "PidTagAddressBookProxyAddresses" },
+       { PidTagAddressBookPublicDelegates,                                   "PidTagAddressBookPublicDelegates" },
+       { PidTagAddressBookReports,                                           "PidTagAddressBookReports" },
+       { PidTagAddressBookRoomCapacity,                                      "PidTagAddressBookRoomCapacity" },
+       { PidTagAddressBookRoomContainers,                                    "PidTagAddressBookRoomContainers" },
+       { PidTagAddressBookRoomDescription,                                   "PidTagAddressBookRoomDescription" },
+       { PidTagAddressBookSenderHintTranslations,                            "PidTagAddressBookSenderHintTranslations" },
+       { PidTagAddressBookSeniorityIndex,                                    "PidTagAddressBookSeniorityIndex" },
+       { PidTagAddressBookTargetAddress,                                     "PidTagAddressBookTargetAddress" },
+       { PidTagAddressBookUnauthorizedSenders,                               "PidTagAddressBookUnauthorizedSenders" },
+       { PidTagAddressBookX509Certificate,                                   "PidTagAddressBookX509Certificate" },
+       { PidTagAddressType,                                                  "PidTagAddressType" },
+       { PidTagAlternateRecipientAllowed,                                    "PidTagAlternateRecipientAllowed" },
+       { PidTagAnr,                                                          "PidTagAnr" },
+       { PidTagArchiveDate,                                                  "PidTagArchiveDate" },
+       { PidTagArchivePeriod,                                                "PidTagArchivePeriod" },
+       { PidTagArchiveTag,                                                   "PidTagArchiveTag" },
+       { PidTagAssistant,                                                    "PidTagAssistant" },
+       { PidTagAssistantTelephoneNumber,                                     "PidTagAssistantTelephoneNumber" },
+       { PidTagAssociated,                                                   "PidTagAssociated" },
+       { PidTagAttachAdditionalInformation,                                  "PidTagAttachAdditionalInformation" },
+       { PidTagAttachContentBase,                                            "PidTagAttachContentBase" },
+       { PidTagAttachContentId,                                              "PidTagAttachContentId" },
+       { PidTagAttachContentLocation,                                        "PidTagAttachContentLocation" },
+       { PidTagAttachDataBinary,                                             "PidTagAttachDataBinary" },
+       { PidTagAttachEncoding,                                               "PidTagAttachEncoding" },
+       { PidTagAttachExtension,                                              "PidTagAttachExtension" },
+       { PidTagAttachFilename,                                               "PidTagAttachFilename" },
+       { PidTagAttachFlags,                                                  "PidTagAttachFlags" },
+       { PidTagAttachLongFilename,                                           "PidTagAttachLongFilename" },
+       { PidTagAttachLongPathname,                                           "PidTagAttachLongPathname" },
+       { PidTagAttachMethod,                                                 "PidTagAttachMethod" },
+       { PidTagAttachMimeTag,                                                "PidTagAttachMimeTag" },
+       { PidTagAttachNumber,                                                 "PidTagAttachNumber" },
+       { PidTagAttachPathname,                                               "PidTagAttachPathname" },
+       { PidTagAttachPayloadClass,                                           "PidTagAttachPayloadClass" },
+       { PidTagAttachPayloadProviderGuidString,                              "PidTagAttachPayloadProviderGuidString" },
+       { PidTagAttachRendering,                                              "PidTagAttachRendering" },
+       { PidTagAttachSize,                                                   "PidTagAttachSize" },
+       { PidTagAttachTag,                                                    "PidTagAttachTag" },
+       { PidTagAttachTransportName,                                          "PidTagAttachTransportName" },
+       { PidTagAttachmentContactPhoto,                                       "PidTagAttachmentContactPhoto" },
+       { PidTagAttachmentFlags,                                              "PidTagAttachmentFlags" },
+       { PidTagAttachmentHidden,                                             "PidTagAttachmentHidden" },
+       { PidTagAttachmentLinkId,                                             "PidTagAttachmentLinkId" },
+       { PidTagAttributeHidden,                                              "PidTagAttributeHidden" },
+       { PidTagAttributeReadOnly,                                            "PidTagAttributeReadOnly" },
+       { PidTagAttributeSystem,                                              "PidTagAttributeSystem" },
+       { PidTagAutoForwardComment,                                           "PidTagAutoForwardComment" },
+       { PidTagAutoForwarded,                                                "PidTagAutoForwarded" },
+       { PidTagAutoResponseSuppress,                                         "PidTagAutoResponseSuppress" },
+       { PidTagBirthday,                                                     "PidTagBirthday" },
+       { PidTagBlockStatus,                                                  "PidTagBlockStatus" },
+       { PidTagBody,                                                         "PidTagBody" },
+       { PidTagBodyContentId,                                                "PidTagBodyContentId" },
+       { PidTagBodyContentLocation,                                          "PidTagBodyContentLocation" },
+       { PidTagBodyHtml,                                                     "PidTagBodyHtml" },
+       { PidTagBusiness2TelephoneNumber,                                     "PidTagBusiness2TelephoneNumber" },
+       { PidTagBusinessFaxNumber,                                            "PidTagBusinessFaxNumber" },
+       { PidTagBusinessHomePage,                                             "PidTagBusinessHomePage" },
+       { PidTagBusinessTelephoneNumber,                                      "PidTagBusinessTelephoneNumber" },
+       { PidTagCallId,                                                       "PidTagCallId" },
+       { PidTagCallbackTelephoneNumber,                                      "PidTagCallbackTelephoneNumber" },
+       { PidTagCarTelephoneNumber,                                           "PidTagCarTelephoneNumber" },
+       { PidTagCdoRecurrenceid,                                              "PidTagCdoRecurrenceid" },
+       { PidTagChangeKey,                                                    "PidTagChangeKey" },
+       { PidTagChangeNotificationGuid,                                       "PidTagChangeNotificationGuid" },
+       { PidTagChangeNumber,                                                 "PidTagChangeNumber" },
+       { PidTagChildrensNames,                                               "PidTagChildrensNames" },
+       { PidTagClientActions,                                                "PidTagClientActions" },
+       { PidTagClientSubmitTime,                                             "PidTagClientSubmitTime" },
+       { PidTagCnsetRead,                                                    "PidTagCnsetRead" },
+       { PidTagCnsetSeen,                                                    "PidTagCnsetSeen" },
+       { PidTagCnsetSeenFAI,                                                 "PidTagCnsetSeenFAI" },
+       { PidTagCodePageId,                                                   "PidTagCodePageId" },
+       { PidTagComment,                                                      "PidTagComment" },
+       { PidTagCompanyMainTelephoneNumber,                                   "PidTagCompanyMainTelephoneNumber" },
+       { PidTagCompanyName,                                                  "PidTagCompanyName" },
+       { PidTagComputerNetworkName,                                          "PidTagComputerNetworkName" },
+       { PidTagConflictEntryId,                                              "PidTagConflictEntryId" },
+       { PidTagConflictItems,                                                "PidTagConflictItems" },
+       { PidTagContainerClass,                                               "PidTagContainerClass" },
+       { PidTagContainerContents,                                            "PidTagContainerContents" },
+       { PidTagContainerFlags,                                               "PidTagContainerFlags" },
+       { PidTagContainerHierarchy,                                           "PidTagContainerHierarchy" },
+       { PidTagContentCount,                                                 "PidTagContentCount" },
+       { PidTagContentFilterPhishingConfidenceLevel,                         "PidTagContentFilterPhishingConfidenceLevel" },
+       { PidTagContentFilterSpamConfidenceLevel,                             "PidTagContentFilterSpamConfidenceLevel" },
+       { PidTagContentUnreadCount,                                           "PidTagContentUnreadCount" },
+       { PidTagConversationId,                                               "PidTagConversationId" },
+       { PidTagConversationIndex,                                            "PidTagConversationIndex" },
+       { PidTagConversationIndexTracking,                                    "PidTagConversationIndexTracking" },
+       { PidTagConversationTopic,                                            "PidTagConversationTopic" },
+       { PidTagCountry,                                                      "PidTagCountry" },
+       { PidTagCreationTime,                                                 "PidTagCreationTime" },
+       { PidTagCreatorEntryId,                                               "PidTagCreatorEntryId" },
+       { PidTagCreatorName,                                                  "PidTagCreatorName" },
+       { PidTagCreatorSimpleDisplayName,                                     "PidTagCreatorSimpleDisplayName" },
+       { PidTagCustomerId,                                                   "PidTagCustomerId" },
+       { PidTagDamBackPatched,                                               "PidTagDamBackPatched" },
+       { PidTagDamOriginalEntryId,                                           "PidTagDamOriginalEntryId" },
+       { PidTagDefaultPostMessageClass,                                      "PidTagDefaultPostMessageClass" },
+       { PidTagDeferredActionMessageOriginalEntryId,                         "PidTagDeferredActionMessageOriginalEntryId" },
+       { PidTagDeferredDeliveryTime,                                         "PidTagDeferredDeliveryTime" },
+       { PidTagDeferredSendNumber,                                           "PidTagDeferredSendNumber" },
+       { PidTagDeferredSendTime,                                             "PidTagDeferredSendTime" },
+       { PidTagDeferredSendUnits,                                            "PidTagDeferredSendUnits" },
+       { PidTagDelegateFlags,                                                "PidTagDelegateFlags" },
+       { PidTagDelegatedByRule,                                              "PidTagDelegatedByRule" },
+       { PidTagDeleteAfterSubmit,                                            "PidTagDeleteAfterSubmit" },
+       { PidTagDeletedOn,                                                    "PidTagDeletedOn" },
+       { PidTagDepartmentName,                                               "PidTagDepartmentName" },
+       { PidTagDepth,                                                        "PidTagDepth" },
+       { PidTagDisplayBcc,                                                   "PidTagDisplayBcc" },
+       { PidTagDisplayCc,                                                    "PidTagDisplayCc" },
+       { PidTagDisplayName,                                                  "PidTagDisplayName" },
+       { PidTagDisplayNamePrefix,                                            "PidTagDisplayNamePrefix" },
+       { PidTagDisplayTo,                                                    "PidTagDisplayTo" },
+       { PidTagDisplayType,                                                  "PidTagDisplayType" },
+       { PidTagDisplayTypeEx,                                                "PidTagDisplayTypeEx" },
+       { PidTagEcWarning,                                                    "PidTagEcWarning" },
+       { PidTagEmailAddress,                                                 "PidTagEmailAddress" },
+       { PidTagEndAttach,                                                    "PidTagEndAttach" },
+       { PidTagEndDate,                                                      "PidTagEndDate" },
+       { PidTagEndEmbed,                                                     "PidTagEndEmbed" },
+       { PidTagEndFolder,                                                    "PidTagEndFolder" },
+       { PidTagEndMessage,                                                   "PidTagEndMessage" },
+       { PidTagEndToRecip,                                                   "PidTagEndToRecip" },
+       { PidTagEntryId,                                                      "PidTagEntryId" },
+       { PidTagExceptionEndTime,                                             "PidTagExceptionEndTime" },
+       { PidTagExceptionReplaceTime,                                         "PidTagExceptionReplaceTime" },
+       { PidTagExceptionStartTime,                                           "PidTagExceptionStartTime" },
+       { PidTagExchangeNTSecurityDescriptor,                                 "PidTagExchangeNTSecurityDescriptor" },
+       { PidTagExpiryNumber,                                                 "PidTagExpiryNumber" },
+       { PidTagExpiryTime,                                                   "PidTagExpiryTime" },
+       { PidTagExpiryUnits,                                                  "PidTagExpiryUnits" },
+       { PidTagExtendedFolderFlags,                                          "PidTagExtendedFolderFlags" },
+       { PidTagExtendedRuleMessageActions,                                   "PidTagExtendedRuleMessageActions" },
+       { PidTagExtendedRuleMessageCondition,                                 "PidTagExtendedRuleMessageCondition" },
+       { PidTagExtendedRuleSizeLimit,                                        "PidTagExtendedRuleSizeLimit" },
+       { PidTagFXDelProp,                                                    "PidTagFXDelProp" },
+       { PidTagFXErrorInfo,                                                  "PidTagFXErrorInfo" },
+       { PidTagFaxNumberOfPages,                                             "PidTagFaxNumberOfPages" },
+       { PidTagFlagCompleteTime,                                             "PidTagFlagCompleteTime" },
+       { PidTagFlagStatus,                                                   "PidTagFlagStatus" },
+       { PidTagFlatUrlName,                                                  "PidTagFlatUrlName" },
+       { PidTagFolderAssociatedContents,                                     "PidTagFolderAssociatedContents" },
+       { PidTagFolderId,                                                     "PidTagFolderId" },
+       { PidTagFolderType,                                                   "PidTagFolderType" },
+       { PidTagFollowupIcon,                                                 "PidTagFollowupIcon" },
+       { PidTagFreeBusyCountMonths,                                          "PidTagFreeBusyCountMonths" },
+       { PidTagFreeBusyEntryIds,                                             "PidTagFreeBusyEntryIds" },
+       { PidTagFreeBusyMessageEmailAddress,                                  "PidTagFreeBusyMessageEmailAddress" },
+       { PidTagFreeBusyPublishEnd,                                           "PidTagFreeBusyPublishEnd" },
+       { PidTagFreeBusyPublishStart,                                         "PidTagFreeBusyPublishStart" },
+       { PidTagFreeBusyRangeTimestamp,                                       "PidTagFreeBusyRangeTimestamp" },
+       { PidTagFtpSite,                                                      "PidTagFtpSite" },
+       { PidTagGatewayNeedsToRefresh,                                        "PidTagGatewayNeedsToRefresh" },
+       { PidTagGender,                                                       "PidTagGender" },
+       { PidTagGeneration,                                                   "PidTagGeneration" },
+       { PidTagGivenName,                                                    "PidTagGivenName" },
+       { PidTagGovernmentIdNumber,                                           "PidTagGovernmentIdNumber" },
+       { PidTagHasAttachments,                                               "PidTagHasAttachments" },
+       { PidTagHasDeferredActionMessages,                                    "PidTagHasDeferredActionMessages" },
+       { PidTagHasNamedProperties,                                           "PidTagHasNamedProperties" },
+       { PidTagHasRules,                                                     "PidTagHasRules" },
+       { PidTagHierarchyChangeNumber,                                        "PidTagHierarchyChangeNumber" },
+       { PidTagHobbies,                                                      "PidTagHobbies" },
+       { PidTagHome2TelephoneNumber,                                         "PidTagHome2TelephoneNumber" },
+       { PidTagHomeAddressCity,                                              "PidTagHomeAddressCity" },
+       { PidTagHomeAddressCountry,                                           "PidTagHomeAddressCountry" },
+       { PidTagHomeAddressPostOfficeBox,                                     "PidTagHomeAddressPostOfficeBox" },
+       { PidTagHomeAddressPostalCode,                                        "PidTagHomeAddressPostalCode" },
+       { PidTagHomeAddressStateOrProvince,                                   "PidTagHomeAddressStateOrProvince" },
+       { PidTagHomeAddressStreet,                                            "PidTagHomeAddressStreet" },
+       { PidTagHomeFaxNumber,                                                "PidTagHomeFaxNumber" },
+       { PidTagHomeTelephoneNumber,                                          "PidTagHomeTelephoneNumber" },
+       { PidTagICalendarEndTime,                                             "PidTagICalendarEndTime" },
+       { PidTagICalendarReminderNextTime,                                    "PidTagICalendarReminderNextTime" },
+       { PidTagICalendarStartTime,                                           "PidTagICalendarStartTime" },
+       { PidTagIconIndex,                                                    "PidTagIconIndex" },
+       { PidTagIdsetDeleted,                                                 "PidTagIdsetDeleted" },
+       { PidTagIdsetExpired,                                                 "PidTagIdsetExpired" },
+       { PidTagIdsetGiven,                                                   "PidTagIdsetGiven" },
+       { PidTagIdsetNoLongerInScope,                                         "PidTagIdsetNoLongerInScope" },
+       { PidTagIdsetRead,                                                    "PidTagIdsetRead" },
+       { PidTagIdsetUnread,                                                  "PidTagIdsetUnread" },
+       { PidTagImapCachedMsgsize,                                            "PidTagImapCachedMsgsize" },
+       { PidTagImportance,                                                   "PidTagImportance" },
+       { PidTagInConflict,                                                   "PidTagInConflict" },
+       { PidTagInReplyToId,                                                  "PidTagInReplyToId" },
+       { PidTagIncrSyncChg,                                                  "PidTagIncrSyncChg" },
+       { PidTagIncrSyncChgPartial,                                           "PidTagIncrSyncChgPartial" },
+       { PidTagIncrSyncDel,                                                  "PidTagIncrSyncDel" },
+       { PidTagIncrSyncEnd,                                                  "PidTagIncrSyncEnd" },
+       { PidTagIncrSyncGroupId,                                              "PidTagIncrSyncGroupId" },
+       { PidTagIncrSyncGroupInfo,                                            "PidTagIncrSyncGroupInfo" },
+       { PidTagIncrSyncMessage,                                              "PidTagIncrSyncMessage" },
+       { PidTagIncrSyncProgressMode,                                         "PidTagIncrSyncProgressMode" },
+       { PidTagIncrSyncProgressPerMsg,                                       "PidTagIncrSyncProgressPerMsg" },
+       { PidTagIncrSyncRead,                                                 "PidTagIncrSyncRead" },
+       { PidTagIncrSyncStateBegin,                                           "PidTagIncrSyncStateBegin" },
+       { PidTagIncrSyncStateEnd,                                             "PidTagIncrSyncStateEnd" },
+       { PidTagIncrementalSyncMessagePartial,                                "PidTagIncrementalSyncMessagePartial" },
+       { PidTagInitialDetailsPane,                                           "PidTagInitialDetailsPane" },
+       { PidTagInitials,                                                     "PidTagInitials" },
+       { PidTagInstID,                                                       "PidTagInstID" },
+       { PidTagInstanceKey,                                                  "PidTagInstanceKey" },
+       { PidTagInstanceNum,                                                  "PidTagInstanceNum" },
+       { PidTagInternetArticleNumber,                                        "PidTagInternetArticleNumber" },
+       { PidTagInternetCodepage,                                             "PidTagInternetCodepage" },
+       { PidTagInternetMailOverrideFormat,                                   "PidTagInternetMailOverrideFormat" },
+       { PidTagInternetMessageId,                                            "PidTagInternetMessageId" },
+       { PidTagInternetReferences,                                           "PidTagInternetReferences" },
+       { PidTagIpmAppointmentEntryId,                                        "PidTagIpmAppointmentEntryId" },
+       { PidTagIpmContactEntryId,                                            "PidTagIpmContactEntryId" },
+       { PidTagIpmDraftsEntryId,                                             "PidTagIpmDraftsEntryId" },
+       { PidTagIpmJournalEntryId,                                            "PidTagIpmJournalEntryId" },
+       { PidTagIpmNoteEntryId,                                               "PidTagIpmNoteEntryId" },
+       { PidTagIpmTaskEntryId,                                               "PidTagIpmTaskEntryId" },
+       { PidTagIsdnNumber,                                                   "PidTagIsdnNumber" },
+       { PidTagJunkAddRecipientsToSafeSendersList,                           "PidTagJunkAddRecipientsToSafeSendersList" },
+       { PidTagJunkIncludeContacts,                                          "PidTagJunkIncludeContacts" },
+       { PidTagJunkPermanentlyDelete,                                        "PidTagJunkPermanentlyDelete" },
+       { PidTagJunkPhishingEnableLinks,                                      "PidTagJunkPhishingEnableLinks" },
+       { PidTagJunkThreshold,                                                "PidTagJunkThreshold" },
+       { PidTagKeyword,                                                      "PidTagKeyword" },
+       { PidTagLanguage,                                                     "PidTagLanguage" },
+       { PidTagLastModificationTime,                                         "PidTagLastModificationTime" },
+       { PidTagLastModifierEntryId,                                          "PidTagLastModifierEntryId" },
+       { PidTagLastModifierName,                                             "PidTagLastModifierName" },
+       { PidTagLastModifierSimpleDisplayName,                                "PidTagLastModifierSimpleDisplayName" },
+       { PidTagLastVerbExecuted,                                             "PidTagLastVerbExecuted" },
+       { PidTagLastVerbExecutionTime,                                        "PidTagLastVerbExecutionTime" },
+       { PidTagListHelp,                                                     "PidTagListHelp" },
+       { PidTagListSubscribe,                                                "PidTagListSubscribe" },
+       { PidTagListUnsubscribe,                                              "PidTagListUnsubscribe" },
+       { PidTagLocalCommitTime,                                              "PidTagLocalCommitTime" },
+       { PidTagLocaleId,                                                     "PidTagLocaleId" },
+       { PidTagLocality,                                                     "PidTagLocality" },
+       { PidTagLocation,                                                     "PidTagLocation" },
+       { PidTagMailboxOwnerEntryId,                                          "PidTagMailboxOwnerEntryId" },
+       { PidTagMailboxOwnerName,                                             "PidTagMailboxOwnerName" },
+       { PidTagManagerName,                                                  "PidTagManagerName" },
+       { PidTagMappingSignature,                                             "PidTagMappingSignature" },
+       { PidTagMaximumSubmitMessageSize,                                     "PidTagMaximumSubmitMessageSize" },
+       { PidTagMemberId,                                                     "PidTagMemberId" },
+       { PidTagMemberName,                                                   "PidTagMemberName" },
+       { PidTagMemberRights,                                                 "PidTagMemberRights" },
+       { PidTagMessageAttachments,                                           "PidTagMessageAttachments" },
+       { PidTagMessageCcMe,                                                  "PidTagMessageCcMe" },
+       { PidTagMessageClass,                                                 "PidTagMessageClass" },
+       { PidTagMessageCodepage,                                              "PidTagMessageCodepage" },
+       { PidTagMessageDeliveryTime,                                          "PidTagMessageDeliveryTime" },
+       { PidTagMessageEditorFormat,                                          "PidTagMessageEditorFormat" },
+       { PidTagMessageFlags,                                                 "PidTagMessageFlags" },
+       { PidTagMessageHandlingSystemCommonName,                              "PidTagMessageHandlingSystemCommonName" },
+       { PidTagMessageLocaleId,                                              "PidTagMessageLocaleId" },
+       { PidTagMessageRecipientMe,                                           "PidTagMessageRecipientMe" },
+       { PidTagMessageRecipients,                                            "PidTagMessageRecipients" },
+       { PidTagMessageSize,                                                  "PidTagMessageSize" },
+       { PidTagMessageStatus,                                                "PidTagMessageStatus" },
+       { PidTagMessageSubmissionId,                                          "PidTagMessageSubmissionId" },
+       { PidTagMessageToMe,                                                  "PidTagMessageToMe" },
+       { PidTagMid,                                                          "PidTagMid" },
+       { PidTagMiddleName,                                                   "PidTagMiddleName" },
+       { PidTagMimeSkeleton,                                                 "PidTagMimeSkeleton" },
+       { PidTagMobileTelephoneNumber,                                        "PidTagMobileTelephoneNumber" },
+       { PidTagNativeBody,                                                   "PidTagNativeBody" },
+       { PidTagNewAttach,                                                    "PidTagNewAttach" },
+       { PidTagNewFXFolder,                                                  "PidTagNewFXFolder" },
+       { PidTagNextSendAcct,                                                 "PidTagNextSendAcct" },
+       { PidTagNickname,                                                     "PidTagNickname" },
+       { PidTagNormalMessageSize,                                            "PidTagNormalMessageSize" },
+       { PidTagNormalizedSubject,                                            "PidTagNormalizedSubject" },
+       { PidTagObjectType,                                                   "PidTagObjectType" },
+       { PidTagOfficeLocation,                                               "PidTagOfficeLocation" },
+       { PidTagOfflineAddressBookCompressedSize,                             "PidTagOfflineAddressBookCompressedSize" },
+       { PidTagOfflineAddressBookContainerGuid,                              "PidTagOfflineAddressBookContainerGuid" },
+       { PidTagOfflineAddressBookFileSize,                                   "PidTagOfflineAddressBookFileSize" },
+       { PidTagOfflineAddressBookFileType,                                   "PidTagOfflineAddressBookFileType" },
+       { PidTagOfflineAddressBookLanguageId,                                 "PidTagOfflineAddressBookLanguageId" },
+       { PidTagOfflineAddressBookMessageClass,                               "PidTagOfflineAddressBookMessageClass" },
+       { PidTagOfflineAddressBookName,                                       "PidTagOfflineAddressBookName" },
+       { PidTagOfflineAddressBookSequence,                                   "PidTagOfflineAddressBookSequence" },
+       { PidTagOfflineAddressBookTruncatedProperties,                        "PidTagOfflineAddressBookTruncatedProperties" },
+       { PidTagOrdinalMost,                                                  "PidTagOrdinalMost" },
+       { PidTagOrganizationalIdNumber,                                       "PidTagOrganizationalIdNumber" },
+       { PidTagOriginalDeliveryTime,                                         "PidTagOriginalDeliveryTime" },
+       { PidTagOriginalDisplayBcc,                                           "PidTagOriginalDisplayBcc" },
+       { PidTagOriginalDisplayCc,                                            "PidTagOriginalDisplayCc" },
+       { PidTagOriginalDisplayName,                                          "PidTagOriginalDisplayName" },
+       { PidTagOriginalDisplayTo,                                            "PidTagOriginalDisplayTo" },
+       { PidTagOriginalEntryId,                                              "PidTagOriginalEntryId" },
+       { PidTagOriginalMessageClass,                                         "PidTagOriginalMessageClass" },
+       { PidTagOriginalMessageId,                                            "PidTagOriginalMessageId" },
+       { PidTagOriginalSearchKey,                                            "PidTagOriginalSearchKey" },
+       { PidTagOriginalSenderAddressType,                                    "PidTagOriginalSenderAddressType" },
+       { PidTagOriginalSenderEmailAddress,                                   "PidTagOriginalSenderEmailAddress" },
+       { PidTagOriginalSenderEntryId,                                        "PidTagOriginalSenderEntryId" },
+       { PidTagOriginalSenderName,                                           "PidTagOriginalSenderName" },
+       { PidTagOriginalSenderSearchKey,                                      "PidTagOriginalSenderSearchKey" },
+       { PidTagOriginalSensitivity,                                          "PidTagOriginalSensitivity" },
+       { PidTagOriginalSentRepresentingAddressType,                          "PidTagOriginalSentRepresentingAddressType" },
+       { PidTagOriginalSentRepresentingEmailAddress,                         "PidTagOriginalSentRepresentingEmailAddress" },
+       { PidTagOriginalSentRepresentingEntryId,                              "PidTagOriginalSentRepresentingEntryId" },
+       { PidTagOriginalSentRepresentingName,                                 "PidTagOriginalSentRepresentingName" },
+       { PidTagOriginalSentRepresentingSearchKey,                            "PidTagOriginalSentRepresentingSearchKey" },
+       { PidTagOriginalSubject,                                              "PidTagOriginalSubject" },
+       { PidTagOriginalSubmitTime,                                           "PidTagOriginalSubmitTime" },
+       { PidTagOriginatorDeliveryReportRequested,                            "PidTagOriginatorDeliveryReportRequested" },
+       { PidTagOriginatorNonDeliveryReportRequested,                         "PidTagOriginatorNonDeliveryReportRequested" },
+       { PidTagOtherAddressCity,                                             "PidTagOtherAddressCity" },
+       { PidTagOtherAddressCountry,                                          "PidTagOtherAddressCountry" },
+       { PidTagOtherAddressPostOfficeBox,                                    "PidTagOtherAddressPostOfficeBox" },
+       { PidTagOtherAddressPostalCode,                                       "PidTagOtherAddressPostalCode" },
+       { PidTagOtherAddressStateOrProvince,                                  "PidTagOtherAddressStateOrProvince" },
+       { PidTagOtherAddressStreet,                                           "PidTagOtherAddressStreet" },
+       { PidTagOtherTelephoneNumber,                                         "PidTagOtherTelephoneNumber" },
+       { PidTagOutOfOfficeState,                                             "PidTagOutOfOfficeState" },
+       { PidTagOwnerAppointmentId,                                           "PidTagOwnerAppointmentId" },
+       { PidTagPagerTelephoneNumber,                                         "PidTagPagerTelephoneNumber" },
+       { PidTagParentEntryId,                                                "PidTagParentEntryId" },
+       { PidTagParentFolderId,                                               "PidTagParentFolderId" },
+       { PidTagParentKey,                                                    "PidTagParentKey" },
+       { PidTagParentSourceKey,                                              "PidTagParentSourceKey" },
+       { PidTagPersonalHomePage,                                             "PidTagPersonalHomePage" },
+       { PidTagPolicyTag,                                                    "PidTagPolicyTag" },
+       { PidTagPostOfficeBox,                                                "PidTagPostOfficeBox" },
+       { PidTagPostalAddress,                                                "PidTagPostalAddress" },
+       { PidTagPostalCode,                                                   "PidTagPostalCode" },
+       { PidTagPredecessorChangeList,                                        "PidTagPredecessorChangeList" },
+       { PidTagPrimaryFaxNumber,                                             "PidTagPrimaryFaxNumber" },
+       { PidTagPrimarySendAccount,                                           "PidTagPrimarySendAccount" },
+       { PidTagPrimarySmtpAddress,                                           "PidTagPrimarySmtpAddress" },
+       { PidTagPrimaryTelephoneNumber,                                       "PidTagPrimaryTelephoneNumber" },
+       { PidTagPriority,                                                     "PidTagPriority" },
+       { PidTagProcessed,                                                    "PidTagProcessed" },
+       { PidTagProfession,                                                   "PidTagProfession" },
+       { PidTagProhibitReceiveQuota,                                         "PidTagProhibitReceiveQuota" },
+       { PidTagProhibitSendQuota,                                            "PidTagProhibitSendQuota" },
+       { PidTagProviderSubmitTime,                                           "PidTagProviderSubmitTime" },
+       { PidTagPublicFolderAdministrativeDescription,                        "PidTagPublicFolderAdministrativeDescription" },
+       { PidTagPublicFolderProxy,                                            "PidTagPublicFolderProxy" },
+       { PidTagPurportedSenderDomain,                                        "PidTagPurportedSenderDomain" },
+       { PidTagRadioTelephoneNumber,                                         "PidTagRadioTelephoneNumber" },
+       { PidTagRead,                                                         "PidTagRead" },
+       { PidTagReadReceiptAddressType,                                       "PidTagReadReceiptAddressType" },
+       { PidTagReadReceiptEmailAddress,                                      "PidTagReadReceiptEmailAddress" },
+       { PidTagReadReceiptEntryId,                                           "PidTagReadReceiptEntryId" },
+       { PidTagReadReceiptName,                                              "PidTagReadReceiptName" },
+       { PidTagReadReceiptRequested,                                         "PidTagReadReceiptRequested" },
+       { PidTagReadReceiptSearchKey,                                         "PidTagReadReceiptSearchKey" },
+       { PidTagReceivedByAddressType,                                        "PidTagReceivedByAddressType" },
+       { PidTagReceivedByEmailAddress,                                       "PidTagReceivedByEmailAddress" },
+       { PidTagReceivedByEntryId,                                            "PidTagReceivedByEntryId" },
+       { PidTagReceivedByFlags,                                              "PidTagReceivedByFlags" },
+       { PidTagReceivedByName,                                               "PidTagReceivedByName" },
+       { PidTagReceivedBySearchKey,                                          "PidTagReceivedBySearchKey" },
+       { PidTagReceivedRepresentingAddressType,                              "PidTagReceivedRepresentingAddressType" },
+       { PidTagReceivedRepresentingEmailAddress,                             "PidTagReceivedRepresentingEmailAddress" },
+       { PidTagReceivedRepresentingEntryId,                                  "PidTagReceivedRepresentingEntryId" },
+       { PidTagReceivedRepresentingFlags,                                    "PidTagReceivedRepresentingFlags" },
+       { PidTagReceivedRepresentingName,                                     "PidTagReceivedRepresentingName" },
+       { PidTagReceivedRepresentingSearchKey,                                "PidTagReceivedRepresentingSearchKey" },
+       { PidTagReceivedRepresentingSimpleDisplayName,                        "PidTagReceivedRepresentingSimpleDisplayName" },
+       { PidTagRecipientDisplayName,                                         "PidTagRecipientDisplayName" },
+       { PidTagRecipientEntryId,                                             "PidTagRecipientEntryId" },
+       { PidTagRecipientFlags,                                               "PidTagRecipientFlags" },
+       { PidTagRecipientOrder,                                               "PidTagRecipientOrder" },
+       { PidTagRecipientProposed,                                            "PidTagRecipientProposed" },
+       { PidTagRecipientProposedEndTime,                                     "PidTagRecipientProposedEndTime" },
+       { PidTagRecipientProposedStartTime,                                   "PidTagRecipientProposedStartTime" },
+       { PidTagRecipientReassignmentProhibited,                              "PidTagRecipientReassignmentProhibited" },
+       { PidTagRecipientResourceState,                                       "PidTagRecipientResourceState" },
+       { PidTagRecipientTrackStatus,                                         "PidTagRecipientTrackStatus" },
+       { PidTagRecipientTrackStatusTime,                                     "PidTagRecipientTrackStatusTime" },
+       { PidTagRecipientType,                                                "PidTagRecipientType" },
+       { PidTagRecordKey,                                                    "PidTagRecordKey" },
+       { PidTagReferredByName,                                               "PidTagReferredByName" },
+       { PidTagRemindersOnlineEntryId,                                       "PidTagRemindersOnlineEntryId" },
+       { PidTagRemoteMessageTransferAgent,                                   "PidTagRemoteMessageTransferAgent" },
+       { PidTagRenderingPosition,                                            "PidTagRenderingPosition" },
+       { PidTagReplyRecipientEntries,                                        "PidTagReplyRecipientEntries" },
+       { PidTagReplyRecipientNames,                                          "PidTagReplyRecipientNames" },
+       { PidTagReplyRequested,                                               "PidTagReplyRequested" },
+       { PidTagReplyTemplateId,                                              "PidTagReplyTemplateId" },
+       { PidTagReplyTime,                                                    "PidTagReplyTime" },
+       { PidTagReportEntryId,                                                "PidTagReportEntryId" },
+       { PidTagReportName,                                                   "PidTagReportName" },
+       { PidTagReportSearchKey,                                              "PidTagReportSearchKey" },
+       { PidTagReportTag,                                                    "PidTagReportTag" },
+       { PidTagReportText,                                                   "PidTagReportText" },
+       { PidTagReportTime,                                                   "PidTagReportTime" },
+       { PidTagReportingMessageTransferAgent,                                "PidTagReportingMessageTransferAgent" },
+       { PidTagResolveMethod,                                                "PidTagResolveMethod" },
+       { PidTagResponseRequested,                                            "PidTagResponseRequested" },
+       { PidTagResponsibility,                                               "PidTagResponsibility" },
+       { PidTagRetentionDate,                                                "PidTagRetentionDate" },
+       { PidTagRetentionFlags,                                               "PidTagRetentionFlags" },
+       { PidTagRetentionPeriod,                                              "PidTagRetentionPeriod" },
+       { PidTagRights,                                                       "PidTagRights" },
+       { PidTagRoamingDatatypes,                                             "PidTagRoamingDatatypes" },
+       { PidTagRoamingDictionary,                                            "PidTagRoamingDictionary" },
+       { PidTagRoamingXmlStream,                                             "PidTagRoamingXmlStream" },
+       { PidTagRowType,                                                      "PidTagRowType" },
+       { PidTagRowid,                                                        "PidTagRowid" },
+       { PidTagRtfCompressed,                                                "PidTagRtfCompressed" },
+       { PidTagRtfInSync,                                                    "PidTagRtfInSync" },
+       { PidTagRtfSyncBodyCount,                                             "PidTagRtfSyncBodyCount" },
+       { PidTagRtfSyncBodyCrc,                                               "PidTagRtfSyncBodyCrc" },
+       { PidTagRtfSyncBodyTag,                                               "PidTagRtfSyncBodyTag" },
+       { PidTagRtfSyncPrefixCount,                                           "PidTagRtfSyncPrefixCount" },
+       { PidTagRtfSyncTrailingCount,                                         "PidTagRtfSyncTrailingCount" },
+       { PidTagRuleActionNumber,                                             "PidTagRuleActionNumber" },
+       { PidTagRuleActionType,                                               "PidTagRuleActionType" },
+       { PidTagRuleActions,                                                  "PidTagRuleActions" },
+       { PidTagRuleCondition,                                                "PidTagRuleCondition" },
+       { PidTagRuleError,                                                    "PidTagRuleError" },
+       { PidTagRuleFolderEntryId,                                            "PidTagRuleFolderEntryId" },
+       { PidTagRuleId,                                                       "PidTagRuleId" },
+       { PidTagRuleIds,                                                      "PidTagRuleIds" },
+       { PidTagRuleLevel,                                                    "PidTagRuleLevel" },
+       { PidTagRuleMessageLevel,                                             "PidTagRuleMessageLevel" },
+       { PidTagRuleMessageName,                                              "PidTagRuleMessageName" },
+       { PidTagRuleMessageProvider,                                          "PidTagRuleMessageProvider" },
+       { PidTagRuleMessageProviderData,                                      "PidTagRuleMessageProviderData" },
+       { PidTagRuleMessageSequence,                                          "PidTagRuleMessageSequence" },
+       { PidTagRuleMessageState,                                             "PidTagRuleMessageState" },
+       { PidTagRuleMessageUserFlags,                                         "PidTagRuleMessageUserFlags" },
+       { PidTagRuleName,                                                     "PidTagRuleName" },
+       { PidTagRuleProvider,                                                 "PidTagRuleProvider" },
+       { PidTagRuleProviderData,                                             "PidTagRuleProviderData" },
+       { PidTagRuleSequence,                                                 "PidTagRuleSequence" },
+       { PidTagRuleState,                                                    "PidTagRuleState" },
+       { PidTagRuleUserFlags,                                                "PidTagRuleUserFlags" },
+       { PidTagScheduleInfoAppointmentTombstone,                             "PidTagScheduleInfoAppointmentTombstone" },
+       { PidTagScheduleInfoAutoAcceptAppointments,                           "PidTagScheduleInfoAutoAcceptAppointments" },
+       { PidTagScheduleInfoDelegateEntryIds,                                 "PidTagScheduleInfoDelegateEntryIds" },
+       { PidTagScheduleInfoDelegateNames,                                    "PidTagScheduleInfoDelegateNames" },
+       { PidTagScheduleInfoDelegateNamesW,                                   "PidTagScheduleInfoDelegateNamesW" },
+       { PidTagScheduleInfoDelegatorWantsCopy,                               "PidTagScheduleInfoDelegatorWantsCopy" },
+       { PidTagScheduleInfoDelegatorWantsInfo,                               "PidTagScheduleInfoDelegatorWantsInfo" },
+       { PidTagScheduleInfoDisallowOverlappingAppts,                         "PidTagScheduleInfoDisallowOverlappingAppts" },
+       { PidTagScheduleInfoDisallowRecurringAppts,                           "PidTagScheduleInfoDisallowRecurringAppts" },
+       { PidTagScheduleInfoDontMailDelegates,                                "PidTagScheduleInfoDontMailDelegates" },
+       { PidTagScheduleInfoFreeBusy,                                         "PidTagScheduleInfoFreeBusy" },
+       { PidTagScheduleInfoFreeBusyAway,                                     "PidTagScheduleInfoFreeBusyAway" },
+       { PidTagScheduleInfoFreeBusyBusy,                                     "PidTagScheduleInfoFreeBusyBusy" },
+       { PidTagScheduleInfoFreeBusyMerged,                                   "PidTagScheduleInfoFreeBusyMerged" },
+       { PidTagScheduleInfoFreeBusyTentative,                                "PidTagScheduleInfoFreeBusyTentative" },
+       { PidTagScheduleInfoMonthsAway,                                       "PidTagScheduleInfoMonthsAway" },
+       { PidTagScheduleInfoMonthsBusy,                                       "PidTagScheduleInfoMonthsBusy" },
+       { PidTagScheduleInfoMonthsMerged,                                     "PidTagScheduleInfoMonthsMerged" },
+       { PidTagScheduleInfoMonthsTentative,                                  "PidTagScheduleInfoMonthsTentative" },
+       { PidTagScheduleInfoResourceType,                                     "PidTagScheduleInfoResourceType" },
+       { PidTagSchedulePlusFreeBusyEntryId,                                  "PidTagSchedulePlusFreeBusyEntryId" },
+       { PidTagSearchFolderExpiration,                                       "PidTagSearchFolderExpiration" },
+       { PidTagSearchFolderLastUsed,                                         "PidTagSearchFolderLastUsed" },
+       { PidTagSearchKey,                                                    "PidTagSearchKey" },
+       { PidTagSecureSubmitFlags,                                            "PidTagSecureSubmitFlags" },
+       { PidTagSecurityDescriptor,                                           "PidTagSecurityDescriptor" },
+       { PidTagSecurityDescriptorAsXml,                                      "PidTagSecurityDescriptorAsXml" },
+       { PidTagSelectable,                                                   "PidTagSelectable" },
+       { PidTagSendInternetEncoding,                                         "PidTagSendInternetEncoding" },
+       { PidTagSendRichInfo,                                                 "PidTagSendRichInfo" },
+       { PidTagSenderAddressType,                                            "PidTagSenderAddressType" },
+       { PidTagSenderEmailAddress,                                           "PidTagSenderEmailAddress" },
+       { PidTagSenderEntryId,                                                "PidTagSenderEntryId" },
+       { PidTagSenderFlags,                                                  "PidTagSenderFlags" },
+       { PidTagSenderIdStatus,                                               "PidTagSenderIdStatus" },
+       { PidTagSenderName,                                                   "PidTagSenderName" },
+       { PidTagSenderSearchKey,                                              "PidTagSenderSearchKey" },
+       { PidTagSenderSimpleDisplayName,                                      "PidTagSenderSimpleDisplayName" },
+       { PidTagSenderSmtpAddress,                                            "PidTagSenderSmtpAddress" },
+       { PidTagSensitivity,                                                  "PidTagSensitivity" },
+       { PidTagSentMailSvrEID,                                               "PidTagSentMailSvrEID" },
+       { PidTagSentRepresentingAddressType,                                  "PidTagSentRepresentingAddressType" },
+       { PidTagSentRepresentingEmailAddress,                                 "PidTagSentRepresentingEmailAddress" },
+       { PidTagSentRepresentingEntryId,                                      "PidTagSentRepresentingEntryId" },
+       { PidTagSentRepresentingFlags,                                        "PidTagSentRepresentingFlags" },
+       { PidTagSentRepresentingName,                                         "PidTagSentRepresentingName" },
+       { PidTagSentRepresentingSearchKey,                                    "PidTagSentRepresentingSearchKey" },
+       { PidTagSentRepresentingSimpleDisplayName,                            "PidTagSentRepresentingSimpleDisplayName" },
+       { PidTagSessionInitiationProtocolUri,                                 "PidTagSessionInitiationProtocolUri" },
+       { PidTagSortLocaleId,                                                 "PidTagSortLocaleId" },
+       { PidTagSourceKey,                                                    "PidTagSourceKey" },
+       { PidTagSpokenName,                                                   "PidTagSpokenName" },
+       { PidTagSpouseName,                                                   "PidTagSpouseName" },
+       { PidTagStartDate,                                                    "PidTagStartDate" },
+       { PidTagStartDateEtc,                                                 "PidTagStartDateEtc" },
+       { PidTagStartEmbed,                                                   "PidTagStartEmbed" },
+       { PidTagStartFAIMsg,                                                  "PidTagStartFAIMsg" },
+       { PidTagStartMessage,                                                 "PidTagStartMessage" },
+       { PidTagStartRecip,                                                   "PidTagStartRecip" },
+       { PidTagStartSubFld,                                                  "PidTagStartSubFld" },
+       { PidTagStartTopFld,                                                  "PidTagStartTopFld" },
+       { PidTagStateOrProvince,                                              "PidTagStateOrProvince" },
+       { PidTagStoreEntryId,                                                 "PidTagStoreEntryId" },
+       { PidTagStoreState,                                                   "PidTagStoreState" },
+       { PidTagStoreSupportMask,                                             "PidTagStoreSupportMask" },
+       { PidTagStreetAddress,                                                "PidTagStreetAddress" },
+       { PidTagSubfolder,                                                    "PidTagSubfolder" },
+       { PidTagSubfolders,                                                   "PidTagSubfolders" },
+       { PidTagSubject,                                                      "PidTagSubject" },
+       { PidTagSubjectPrefix,                                                "PidTagSubjectPrefix" },
+       { PidTagSurname,                                                      "PidTagSurname" },
+       { PidTagSwappedToDoData,                                              "PidTagSwappedToDoData" },
+       { PidTagSwappedToDoStore,                                             "PidTagSwappedToDoStore" },
+       { PidTagTargetEntryId,                                                "PidTagTargetEntryId" },
+       { PidTagTelecommunicationsDeviceForDeafTelephoneNumber,               "PidTagTelecommunicationsDeviceForDeafTelephoneNumber" },
+       { PidTagTelexNumber,                                                  "PidTagTelexNumber" },
+       { PidTagTemplateData,                                                 "PidTagTemplateData" },
+       { PidTagTemplateid,                                                   "PidTagTemplateid" },
+       { PidTagTemporaryDefaultDocument,                                     "PidTagTemporaryDefaultDocument" },
+       { PidTagTextAttachmentCharset,                                        "PidTagTextAttachmentCharset" },
+       { PidTagThumbnailPhoto,                                               "PidTagThumbnailPhoto" },
+       { PidTagTitle,                                                        "PidTagTitle" },
+       { PidTagTnefCorrelationKey,                                           "PidTagTnefCorrelationKey" },
+       { PidTagToDoItemFlags,                                                "PidTagToDoItemFlags" },
+       { PidTagTransmittableDisplayName,                                     "PidTagTransmittableDisplayName" },
+       { PidTagTransportMessageHeaders,                                      "PidTagTransportMessageHeaders" },
+       { PidTagTrustSender,                                                  "PidTagTrustSender" },
+       { PidTagUrlCompName,                                                  "PidTagUrlCompName" },
+       { PidTagUrlCompNameSet,                                               "PidTagUrlCompNameSet" },
+       { PidTagUrlName,                                                      "PidTagUrlName" },
+       { PidTagUserCertificate,                                              "PidTagUserCertificate" },
+       { PidTagUserEntryId,                                                  "PidTagUserEntryId" },
+       { PidTagUserX509Certificate,                                          "PidTagUserX509Certificate" },
+       { PidTagViewDescriptorBinary,                                         "PidTagViewDescriptorBinary" },
+       { PidTagViewDescriptorName,                                           "PidTagViewDescriptorName" },
+       { PidTagViewDescriptorStrings,                                        "PidTagViewDescriptorStrings" },
+       { PidTagViewDescriptorVersion,                                        "PidTagViewDescriptorVersion" },
+       { PidTagWeddingAnniversary,                                           "PidTagWeddingAnniversary" },
+       { PidTagWlinkAddressBookStoreEID,                                     "PidTagWlinkAddressBookStoreEID" },
+       { PidTagWlinkClientID,                                                "PidTagWlinkClientID" },
+       { PidTagWlinkEntryId,                                                 "PidTagWlinkEntryId" },
+       { PidTagWlinkROGroupType,                                             "PidTagWlinkROGroupType" },
+       { PidTagWlinkRecordKey,                                               "PidTagWlinkRecordKey" },
+       { PidTagWlinkStoreEntryId,                                            "PidTagWlinkStoreEntryId" },
        { 0,                                                                   NULL         }
 };
 
index 019abc47cb1be9879f28cb3191e6e314803e0d92..7082e22bf561c973ecebd353dffca8d757f0e22b 100755 (executable)
@@ -758,7 +758,7 @@ _PUBLIC_ uint16_t get_property_type(uint16_t untypedtag)
                }
        }
 
-       DEBUG(5, ("%s: type for property '%x' could not be deduced\n", __FUNCTION__, untypedtag));
+       DEBUG(5, ("%s: type for property '%x' could not be deduced\\n", __FUNCTION__, untypedtag));
        return 0;
 }
 
@@ -887,7 +887,7 @@ static struct pidtags pidtags[] = {
                                print "Skipping output of pidtags entry for", entry["CanonicalName"], "(duplicate)"
                                continue
                        propline = "\t{ " + string.ljust(entry["CanonicalName"] + ",", 68)
-                       propline += " \"0x" + format(entry["PropertyId"], "04X") + knowndatatypes[entry["DataTypeName"]][2:] + "\" },\n"
+                       propline += "\"" + entry["CanonicalName"] + "\" },\n"
                        proplines.append(propline)
                        previous_idl_proptags.append(entry["PropertyId"])
        sortedproplines = sorted(proplines)