darlinghq/darling-cocotron
1
0
Fork 0
mirror of https://github.com/darlinghq/darling-cocotron.git synced 2024-11-23 20:19:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

- (fixed issue 352) convertValue removed from NSPropertyListReader_vintage

Browse Source 
- (fixed issue 360) defaults now stored using the XML property list format which preserves the type of the object
- added checking for registry entry size when retrieving defaults so there is not truncation
This commit is contained in:
Christopher Lloyd 2009-10-12 18:08:44 +00:00
parent 1291736574
commit 7787dcfbae
2 changed files with 30 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
Foundation/NSPropertyList/NSPropertyListReader_vintage.m
View File

@ -1,4 +1,4 @@
/* Copyright (c) 2006-2007 Christopher J. W. Lloyd
/* Copyright (c) 2006-2007 Christopher J. W. Lloyd <cjwl@objc.net>
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
@ -117,28 +117,6 @@ static inline void appendCharacter(NSPropertyListReader_vintage *self,uint8_t c)
self->_buffer[self->_bufferSize++]=c;
}
-(id)convertValue:(id)value
{
if(![value isKindOfClass:_stringClass])
return value;
id scanner=[NSScanner scannerWithString:value];
double d;
long long l;
if([scanner scanLongLong:&l] && [scanner isAtEnd])
{
return [NSNumber numberWithLongLong:l];
}
[scanner setScanLocation:0];
if([scanner scanDouble:&d] && [scanner isAtEnd])
{
return [NSNumber numberWithDouble:d];
}
return value;
}
-(NSObject *)propertyListWithInfo:(NSString *)info {
enum {
STATE_WHITESPACE,
@ -223,7 +201,7 @@ static inline void appendCharacter(NSPropertyListReader_vintage *self,uint8_t c)
[object release];
return [self internalError:_dictionaryClass];
}
[dictionary setObject:[self convertValue:object] forKey:key];
[dictionary setObject:object forKey:key];
[key release];
[object release];
expect=EXPECT_KEY;
@ -259,7 +237,7 @@ static inline void appendCharacter(NSPropertyListReader_vintage *self,uint8_t c)
return [self internalError:_arrayClass];
}
[array addObject:[self convertValue:object]];
[array addObject:object];
[object release];
expect=EXPECT_VAL;
}
@ -282,7 +260,7 @@ static inline void appendCharacter(NSPropertyListReader_vintage *self,uint8_t c)
}
if(object!=nil){
[array addObject:[self convertValue:object]];
[array addObject:object];
[object release];
}
@ -443,7 +421,7 @@ static inline void appendCharacter(NSPropertyListReader_vintage *self,uint8_t c)
if(state==STATE_NAME && _stackSize==0){
NSString *result=[NSString stringWithCharacters:_buffer length:_bufferSize];
return [self convertValue:result];
return result;
}
if(state!=STATE_WHITESPACE)
@ -464,7 +442,7 @@ static inline void appendCharacter(NSPropertyListReader_vintage *self,uint8_t c)
}
// FIX, make sure _stackSize is 1?
return [self convertValue:[popObject(self) autorelease]];
return [popObject(self) autorelease];
}
+(NSObject *)propertyListFromData:(NSData *)data {

39
Foundation/platform_windows/NSPersistantDomain_win32.m
View File

@ -1,4 +1,4 @@
/* Copyright (c) 2006-2007 Christopher J. W. Lloyd
/* Copyright (c) 2006-2007 Christopher J. W. Lloyd <cjwl@objc.net>
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
@ -10,8 +10,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
#import <Foundation/NSArray.h>
#import <Foundation/NSDictionary.h>
#import <Foundation/NSData.h>
#import <Foundation/NSPropertyListReader.h>
#import <Foundation/NSPropertyListWriter_vintage.h>
#import <Foundation/NSPropertyList.h>
#import <Foundation/NSException.h>
#import <windows.h>
@ -26,8 +25,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
LONG error;
for(i=0;i<count;i++){
error=RegCreateKeyEx(previous,[[_path objectAtIndex:i] cString],0,"",
REG_OPTION_NON_VOLATILE,KEY_ALL_ACCESS,NULL,&current,&disposition);
error=RegCreateKeyEx(previous,[[_path objectAtIndex:i] cString],0,"",REG_OPTION_NON_VOLATILE,KEY_ALL_ACCESS,NULL,&current,&disposition);
if(error!=ERROR_SUCCESS)
NSLog(@"RegCreateKeyEx failed %@",_path);
@ -42,8 +40,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
}
-initWithName:(NSString *)name {
_path=[[NSArray arrayWithObjects:
@"Software",@"Cocotron",name,nil] retain];
_path=[[NSArray arrayWithObjects:@"Software",@"Cocotron",name,nil] retain];
_handle=[self rootHandle];
_cache=[NSMutableDictionary new];
return self;
@ -89,23 +86,34 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
id result=[_cache objectForKey:key];
if(result==nil){
const char *keyCString=[key cString];
LONG error;
DWORD type;
char buffer[8192];
DWORD length=8192;
void *buffer=NULL;
DWORD length=0;
//NSLog(@"-[%@ %s] %@ %@",isa,sel_getName(_cmd),_path,key);
error=RegQueryValueEx(_handle,[key cString],NULL,&type,(void *)buffer,&length);
error=RegQueryValueExA(_handle,keyCString,NULL,&type,NULL,&length);
if(error!=ERROR_SUCCESS){
//NSLog(@"RegQueryValueEx failed %@ %@",_path,key);
return nil;
}
if(error!=ERROR_SUCCESS)
buffer=NSZoneMalloc(NULL,length);
error=RegQueryValueExA(_handle,keyCString,NULL,&type,buffer,&length);
if(error!=ERROR_SUCCESS){
return nil;
}
NSData *data=[NSData dataWithBytesNoCopy:buffer length:length freeWhenDone:YES];
NS_DURING
result=[[NSString stringWithCString:buffer] propertyList];
NSPropertyListFormat format;
NSString *errorDescription=nil;
result=[NSPropertyListSerialization propertyListFromData:data mutabilityOption:NSPropertyListImmutable format:&format errorDescription:&errorDescription];
NS_HANDLER
result=nil;
NS_ENDHANDLER
@ -118,11 +126,12 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
-(void)setObject:object forKey:(NSString *)key {
LONG error;
NSData *data=[NSPropertyListWriter_vintage dataWithPropertyList:object];
NSString *errorDescription=nil;
NSData *data=[NSPropertyListSerialization dataFromPropertyList:object format:NSPropertyListXMLFormat_v1_0 errorDescription:&errorDescription];
[_cache removeObjectForKey:key];
error=RegSetValueEx(_handle,[key cString],0,REG_SZ,[data bytes],[data length]);
error=RegSetValueExA(_handle,[key cString],0,REG_SZ,[data bytes],[data length]);
if(error!=ERROR_SUCCESS){
NSLog(@"RegSetValueEx failed %@ %@",_path,key);
}
@ -133,7 +142,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
[_cache removeObjectForKey:key];
error=RegDeleteValue(_handle,[key cString]);
error=RegDeleteValueA(_handle,[key cString]);
if(error!=ERROR_SUCCESS){
NSLog(@"RegDeleteValue failed %@ %@",_path,key);
}