ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

msi: Fix and simplify handling of REG_MULTI_SZ strings in the WriteRegistryValues action.

This commit is contained in:
James Hawkins 2008-02-24 20:15:31 -06:00 committed by Alexandre Julliard
parent b532c0c306
commit 21b4af1b46
1 changed files with 2 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
dlls/msi/action.c
View File

@ -2322,7 +2322,6 @@ static LPSTR parse_value(MSIPACKAGE *package, LPCWSTR value, DWORD *type,
{ {
static const WCHAR szMulti[] = {'[','~',']',0}; static const WCHAR szMulti[] = {'[','~',']',0};
LPCWSTR ptr; LPCWSTR ptr;
LPWSTR newdata;
*type=REG_SZ; *type=REG_SZ;
if (value[0]=='#') if (value[0]=='#')
@ -2350,19 +2349,8 @@ static LPSTR parse_value(MSIPACKAGE *package, LPCWSTR value, DWORD *type,
/* add double NULL terminator */ /* add double NULL terminator */
if (*type == REG_MULTI_SZ) if (*type == REG_MULTI_SZ)
{ {
*size += sizeof(WCHAR); *size += 2 * sizeof(WCHAR); /* two NULL terminators */
newdata = msi_alloc(*size); data = msi_realloc_zero(data, *size);
if (!newdata)
{
msi_free(data);
return NULL;
}
memcpy(newdata, data, *size - 1);
newdata[*size] = '\0';
msi_free(data);
data = (LPSTR)newdata;
} }
} }
return data; return data;
@ -2503,10 +2491,6 @@ static UINT ITERATE_WriteRegistryValues(MSIRECORD *row, LPVOID param)
deformat_string(package, name, &deformated); deformat_string(package, name, &deformated);
/* get the double nulls to terminate SZ_MULTI */
if (type == REG_MULTI_SZ)
size +=sizeof(WCHAR);
if (!check_first) if (!check_first)
{ {
TRACE("Setting value %s of %s\n",debugstr_w(deformated), TRACE("Setting value %s of %s\n",debugstr_w(deformated),