system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-11-02 03:08:42 +00:00
Code Issues Projects Releases Packages Wiki Activity

msi/tests: Avoid corrupting the pending file renames key on failure.

Browse source
This commit is contained in:
Alexandre Julliard 2010-09-30 13:42:37 +02:00
parent 132158cbf5
commit 9fe16f8ae9
1 changed files with 7 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
dlls/msi/tests/install.c
View file

@ -8995,17 +8995,18 @@ static char rename_ops[] = "PendingFileRenameOperations";
static void process_pending_renames(HKEY hkey) static void process_pending_renames(HKEY hkey)
{ {
char *buf, *src, *dst, *buf2, *buf2ptr; char *buf, *src, *dst, *buf2, *buf2ptr;
DWORD size, buf2len = 0; DWORD size;
LONG ret; LONG ret;
BOOL found = FALSE; BOOL found = FALSE;
ret = RegQueryValueExA(hkey, rename_ops, NULL, NULL, NULL, &size); ret = RegQueryValueExA(hkey, rename_ops, NULL, NULL, NULL, &size);
buf = HeapAlloc(GetProcessHeap(), 0, size); buf = HeapAlloc(GetProcessHeap(), 0, size + 1);
buf2ptr = buf2 = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); buf2ptr = buf2 = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size + 1);
buf[0] = 0;
ret = RegQueryValueExA(hkey, rename_ops, NULL, NULL, (LPBYTE)buf, &size); ret = RegQueryValueExA(hkey, rename_ops, NULL, NULL, (LPBYTE)buf, &size);
ok(!ret, "RegQueryValueExA failed %d (%u)\n", ret, GetLastError()); buf[size] = 0;
ok(!ret, "RegQueryValueExA failed %d\n", ret);
if (ret) return;
for (src = buf; *src; src = dst + strlen(dst) + 1) for (src = buf; *src; src = dst + strlen(dst) + 1)
{ {
@ -9016,16 +9017,13 @@ static void process_pending_renames(HKEY hkey)
if (!strstr(src, "msitest")) if (!strstr(src, "msitest"))
{ {
lstrcpyA(buf2ptr, src); lstrcpyA(buf2ptr, src);
buf2len += strlen(src) + 1;
buf2ptr += strlen(src) + 1; buf2ptr += strlen(src) + 1;
if (*dst) if (*dst)
{ {
lstrcpyA(buf2ptr, dst); lstrcpyA(buf2ptr, dst);
buf2ptr += strlen(dst) + 1; buf2ptr += strlen(dst) + 1;
buf2len += strlen(dst) + 1;
} }
buf2ptr++; buf2ptr++;
buf2len++;
continue; continue;
} }
@ -9049,10 +9047,7 @@ static void process_pending_renames(HKEY hkey)
ok(found, "Expected a 'msitest' entry\n"); ok(found, "Expected a 'msitest' entry\n");
if (*buf2) if (*buf2)
{ RegSetValueExA(hkey, rename_ops, 0, REG_MULTI_SZ, (LPBYTE)buf2, buf2ptr + 1 - buf2);
buf2len++;
RegSetValueExA(hkey, rename_ops, 0, REG_MULTI_SZ, (LPBYTE)buf2, buf2len);
}
else else
RegDeleteValueA(hkey, rename_ops); RegDeleteValueA(hkey, rename_ops);