From 91155624dcc274eb5c9580051bac7bc166e37220 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Thu, 8 Dec 2011 20:42:44 +0000 Subject: [PATCH] Monotone-Parent: 120ae771577fbc85a9d527667354ae451deab5eb Monotone-Revision: 070ab5bab7996350566f161af861542e882b6ac8 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2011-12-08T20:42:44 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 6 ++++++ OpenChange/MAPIStoreObject.m | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index f8c133f33..1378519ae 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2011-12-08 Wolfgang Sourdeau + + * OpenChange/MAPIStoreObject.m (-addPropertiesFromRow:): perform + test on PT_STRING8 alone after "masking" the ulPropTag with 0xfff, + since PT_XX values are not bitmasks. + 2011-12-06 Francis Lachapelle * UI/WebServerResources/ContactsUI.js (contactsListCallback): diff --git a/OpenChange/MAPIStoreObject.m b/OpenChange/MAPIStoreObject.m index d836eb2a2..6652940f1 100644 --- a/OpenChange/MAPIStoreObject.m +++ b/OpenChange/MAPIStoreObject.m @@ -452,7 +452,7 @@ static Class NSExceptionK, MAPIStoreFolderK; for (counter = 0; counter < aRow->cValues; counter++) { cValue = aRow->lpProps + counter; - if ((cValue->ulPropTag & PT_STRING8) == PT_STRING8) + if ((cValue->ulPropTag & 0xfff) == PT_STRING8) [self warnWithFormat: @"attempting to set string property as PR_STRING8: %.8x", cValue->ulPropTag];