fusion: use HeapAlloc, not strdup, to avoid malloc/HeapFree mismatch; don't test variable if not set
James Hawkins
truiken at gmail.com
Mon May 26 16:40:49 CDT 2008
On Mon, May 26, 2008 at 4:21 PM, Dan Kegel <dank at kegel.com> wrote:
> Can't mix strdup and HeapFree.
>
> Fixes three valgrind errors
> http://kegel.com/wine/valgrind/logs-2008-05-25/vg-fusion_asmcache.txt
>
diff --git a/dlls/fusion/tests/asmcache.c b/dlls/fusion/tests/asmcache.c
index a160b0a..dcf26a0 100644
--- a/dlls/fusion/tests/asmcache.c
+++ b/dlls/fusion/tests/asmcache.c
@@ -922,8 +922,10 @@ static void test_InstallAssembly(void)
todo_wine
{
ok(hr == S_OK, "Expected S_OK, got %d\n", S_OK);
- ok(disp == IASSEMBLYCACHE_UNINSTALL_DISPOSITION_UNINSTALLED,
- "Expected
IASSEMBLYCACHE_UNINSTALL_DISPOSITION_UNINSTALLED, got %d\n", disp);
+ if (hr == S_OK) {
+ ok(disp == IASSEMBLYCACHE_UNINSTALL_DISPOSITION_UNINSTALLED,
+ "Expected
IASSEMBLYCACHE_UNINSTALL_DISPOSITION_UNINSTALLED, got %d\n", disp);
+ }
}
Why did you add this change? The value of disp is independent of the
value of hr. Also, the style of the braces doesn't match the rest of
the file.
--
James Hawkins
More information about the wine-devel
mailing list