[REGEDIT]

Fix the creation of empty REG_MULTI_SZ values (they have to contain only one NULL char, since a multi-string has the form:
str1\0str2\0...strN\0\0
where each strI\0 is a null-terminated string, and a multi-string is terminated by a null string.
And therefore an empty multi-string has only one null char, corresponding to the terminating null string.

svn path=/trunk/; revision=59529
This commit is contained in:
Hermès Bélusca-Maïto 2013-07-20 00:37:47 +00:00
parent 89bc3d9a83
commit 66fa5c8c6f
2 changed files with 13 additions and 4 deletions

View file

@ -853,10 +853,19 @@ static BOOL CreateNewValue(HKEY hRootKey, LPCWSTR pszKeyPath, DWORD dwType)
cbData = sizeof(WCHAR);
break;
case REG_MULTI_SZ:
cbData = sizeof(WCHAR) * 2;
/*
* WARNING: An empty multi-string has only one null char.
* Indeed, multi-strings are built in the following form:
* str1\0str2\0...strN\0\0
* where each strI\0 is a null-terminated string, and it
* ends with a terminating empty string.
* Therefore an empty multi-string contains only the terminating
* empty string, that is, one null char.
*/
cbData = sizeof(WCHAR);
break;
case REG_QWORD:
cbData = sizeof(DWORD) * 2;
case REG_QWORD: /* REG_QWORD_LITTLE_ENDIAN */
cbData = sizeof(DWORDLONG); // == sizeof(DWORD) * 2;
break;
default:
cbData = 0;

View file

@ -439,7 +439,7 @@ static int CALLBACK CompareFunc(LPARAM lParam1, LPARAM lParam2, LPARAM lParamSor
return ((int)dw2 - (int)dw1);
}
case REG_QWORD:
case REG_QWORD: /* REG_QWORD_LITTLE_ENDIAN */
{
qw1 = *(DWORDLONG*)l->val;
qw2 = *(DWORDLONG*)r->val;