gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-05-29 16:01:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

Various patches/fixes (mingw)

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@21898 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-Macdonald 2005-10-28 20:39:17 +00:00
parent 7ab19b7cd9
commit fee1d187a3
7 changed files with 111 additions and 98 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Source/win32/NSUserDefaultsWin32.m
View file

@ -94,8 +94,11 @@ struct NSUserDefaultsWin32_DomainInfo
@"NSUserDefaultsWin32 should only be used if defaults directory is :REGISTRY:");
path = [path substringFromIndex: NSMaxRange(r)];
path = [@"Software\\GNUstep\\" stringByAppendingString: path];
if ([path hasSuffix: @"\\"] == NO)
if ([path length] == 0)
{
path = @"Software\\GNUstep\\";
}
else if ([path hasSuffix: @"\\"] == NO)
{
path = [path stringByAppendingString: @"\\"];
}
@ -474,7 +477,11 @@ struct NSUserDefaultsWin32_DomainInfo
oldDomainDict = [oldData objectForKey: persistantDomain];
dPath = [registryPrefix stringByAppendingString: persistantDomain];
if ([domainDict count] && !dinfo->userKey)
if ([domainDict count] == 0)
{
continue;
}
if (dinfo->userKey == 0)
{
rc = RegCreateKeyEx(HKEY_CURRENT_USER,
[dPath cString],
@ -493,10 +500,6 @@ struct NSUserDefaultsWin32_DomainInfo
return NO;
}
}
else if ([domainDict count] > 0)
{
continue;
}
valIter = [domainDict keyEnumerator];
while ((valName = [valIter nextObject]))
@ -504,7 +507,7 @@ struct NSUserDefaultsWin32_DomainInfo
id value = [domainDict objectForKey: valName];
id oldvalue = [oldDomainDict objectForKey: valName];
if (oldvalue != nil || [value isEqual: oldvalue] == NO)
if (oldvalue == nil || [value isEqual: oldvalue] == NO)
{
NSString *result = 0;