[PATCH 0/1] MR4368: gdi32/tests: Free what GdiConvertToDevmodeW returns with HeapFree.

[Alex Henrie (＠alexhenrie)]

This partially reverts commit 0b7eed0310a2d1272a97d8a45ec37fa03a9c26c8.

[PATCH 1/1] gdi32/tests: Free what GdiConvertToDevmodeW returns with HeapFree.

[Alex Henrie]

From: Alex Henrie

This partially reverts commit 0b7eed0310a2d1272a97d8a45ec37fa03a9c26c8.
---
 dlls/gdi32/tests/dc.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c
index 69cd44107a0..4d09de78d67 100644
--- a/dlls/gdi32/tests/dc.c
+++ b/dlls/gdi32/tests/dc.c
@@ -285,13 +285,13 @@ static void test_GdiConvertToDevmodeW(void)
     dmW = pGdiConvertToDevmodeW(&dmA);
     ok(dmW->dmSize >= FIELD_OFFSET(DEVMODEW, dmICMMethod), "dmSize is too small: %04x\n", dmW->dmSize);
     ok(dmW->dmSize <= sizeof(DEVMODEW), "dmSize is too large: %04x\n", dmW->dmSize);
-    free(dmW);
+    HeapFree(GetProcessHeap(), 0, dmW);

dmA.dmSize = FIELD_OFFSET(DEVMODEA, dmFields) + sizeof(dmA.dmFields);
     dmW = pGdiConvertToDevmodeW(&dmA);
     ok(dmW->dmSize == FIELD_OFFSET(DEVMODEW, dmFields) + sizeof(dmW->dmFields),
        "wrong size %u\n", dmW->dmSize);
-    free(dmW);
+    HeapFree(GetProcessHeap(), 0, dmW);

dmA.dmICMMethod = DMICMMETHOD_NONE;
     dmA.dmSize = FIELD_OFFSET(DEVMODEA, dmICMMethod) + sizeof(dmA.dmICMMethod);
@@ -300,13 +300,13 @@ static void test_GdiConvertToDevmodeW(void)
        "wrong size %u\n", dmW->dmSize);
     ok(dmW->dmICMMethod == DMICMMETHOD_NONE,
        "expected DMICMMETHOD_NONE, got %lu\n", dmW->dmICMMethod);
-    free(dmW);
+    HeapFree(GetProcessHeap(), 0, dmW);

dmA.dmSize = 1024;
     dmW = pGdiConvertToDevmodeW(&dmA);
     ok(dmW->dmSize == FIELD_OFFSET(DEVMODEW, dmPanningHeight) + sizeof(dmW->dmPanningHeight),
        "wrong size %u\n", dmW->dmSize);
-    free(dmW);
+    HeapFree(GetProcessHeap(), 0, dmW);

SetLastError(0xdeadbeef);
     dmA.dmSize = 0;
@@ -319,7 +319,7 @@ static void test_GdiConvertToDevmodeW(void)
     dmW = pGdiConvertToDevmodeW(&dmA);
     ok(dmW->dmSize == FIELD_OFFSET(DEVMODEW, dmFields),
        "expected %04lx, got %04x\n", FIELD_OFFSET(DEVMODEW, dmFields), dmW->dmSize);
-    free(dmW);
+    HeapFree(GetProcessHeap(), 0, dmW);
 }

static void test_device_caps( HDC hdc, HDC ref_dc, const char *descr, int scale )

[PATCH 0/1] MR4368: gdi32/tests: Free what GdiConvertToDevmodeW returns with HeapFree. - approved

[Huw Davies (＠huw)]

This merge request was approved by Huw Davies.