LupusNobilis
/
sogo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Monotone-Parent: 8da45ab6716906aaf63acf12643978541601c34c 

Monotone-Revision: a12dbbc9418dd5823b93f9c1246417a6c1fa121a

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2011-11-22T19:31:12
Monotone-Branch: ca.inverse.sogo
maint-2.0.2
Wolfgang Sourdeau 2011-11-22 19:31:12 +00:00
parent e9425a9281
commit 053d871c03
3 changed files with 11 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,5 +1,9 @@
2011-11-22 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* OpenChange/MAPIStoreTypes.m (NSObjectFromValuePointer):
simplified method by using set_SPropValue_proptag and
NSObjectFromSPropValue.
* OpenChange/NSObject+MAPIStore.m (-getValue:forTag:inMemCtx:):
renamed from "getMAPIValue:...".
(-asArrayOfUnicodeStringsInMemCtx:) renamed from "asArrayOfUnicodeStringsInCtx".

2
OpenChange/MAPIStoreTypes.h
View File

@ -40,7 +40,7 @@ double *MAPIDoubleValue (void *memCtx, double value);
id NSObjectFromSPropValue (const struct SPropValue *);
id NSObjectFromMAPISPropValue (const struct mapi_SPropValue *);
id NSObjectFromValuePointer (enum MAPITAGS, void *);
id NSObjectFromValuePointer (enum MAPITAGS, const void *);
static inline NSNumber *
MAPIPropertyKey (enum MAPITAGS propTag)

62
OpenChange/MAPIStoreTypes.m
View File

@ -253,65 +253,15 @@ NSObjectFromSPropValue (const struct SPropValue *value)
}
id
NSObjectFromValuePointer (enum MAPITAGS propTag, void *data)
NSObjectFromValuePointer (enum MAPITAGS propTag, const void *data)
{
struct SPropValue sPropValue;
id result;
switch (propTag & 0xffff)
{
case PT_NULL:
result = [NSNull null];
break;
case PT_SHORT:
result = [NSNumber numberWithShort: *(int16_t *) data];
break;
case PT_LONG:
result = [NSNumber numberWithLong: *(int32_t *) data];
break;
case PT_I8:
result = [NSNumber numberWithUnsignedLongLong: *(uint64_t *) data];
break;
case PT_BOOLEAN:
result = [NSNumber numberWithBool: ((*(uint8_t *) data) ? YES : NO)];
break;
case PT_DOUBLE:
result = [NSNumber numberWithDouble: *(double *) data];
break;
case PT_UNICODE:
result = [NSString stringWithUTF8String: data];
break;
case PT_STRING8:
result = [NSString stringWithUTF8String: data];
break;
case PT_SYSTIME:
result = [NSCalendarDate dateFromFileTime: data];
break;
case PT_BINARY:
case PT_SVREID:
// lpProps->value.bin = *((const struct Binary_r *)data);
result = [NSData dataWithBinary: (const struct Binary_r *) data];
break;
// case PT_CLSID:
// result = [NSData dataWithFlatUID: value->value.lpguid];
// break;
default:
// #define PT_UNSPECIFIED 0x0
// #define PT_I2 0x2
// #define PT_CURRENCY 0x6
// #define PT_APPTIME 0x7
// #define PT_ERROR 0xa
// #define PT_OBJECT 0xd
// #define PT_I8 0x14
// #define PT_SVREID 0xFB
// #define PT_SRESTRICT 0xFD
// #define PT_ACTIONS 0xFE
result = [NSNull null];
abort();
NSLog (@"%s: object type not handled: %d (0x%.8x)", __PRETTY_FUNCTION__,
propTag, propTag);
}
if (set_SPropValue_proptag(&sPropValue, propTag, data))
result = NSObjectFromSPropValue (&sPropValue);
else
result = nil;
return result;
}