Commit 0e739204 authored by Francois Gouget's avatar Francois Gouget Committed by Alexandre Julliard

gdi32/tests: Remove unnecessary metafile handle traces.

Tracing the handle values is not useful and increases the test report size. Signed-off-by: 's avatarFrancois Gouget <fgouget@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent d09962a4
...@@ -179,8 +179,6 @@ static void test_ExtTextOut(void) ...@@ -179,8 +179,6 @@ static void test_ExtTextOut(void)
hdcDisplay = GetDC(hwnd); hdcDisplay = GetDC(hwnd);
ok(hdcDisplay != 0, "GetDC error %d\n", GetLastError()); ok(hdcDisplay != 0, "GetDC error %d\n", GetLastError());
trace("hdcDisplay %p\n", hdcDisplay);
SetMapMode(hdcDisplay, MM_TEXT); SetMapMode(hdcDisplay, MM_TEXT);
memset(&orig_lf, 0, sizeof(orig_lf)); memset(&orig_lf, 0, sizeof(orig_lf));
...@@ -207,8 +205,6 @@ static void test_ExtTextOut(void) ...@@ -207,8 +205,6 @@ static void test_ExtTextOut(void)
hdcMetafile = CreateEnhMetaFileA(hdcDisplay, NULL, NULL, NULL); hdcMetafile = CreateEnhMetaFileA(hdcDisplay, NULL, NULL, NULL);
ok(hdcMetafile != 0, "CreateEnhMetaFileA error %d\n", GetLastError()); ok(hdcMetafile != 0, "CreateEnhMetaFileA error %d\n", GetLastError());
trace("hdcMetafile %p\n", hdcMetafile);
ok(GetDeviceCaps(hdcMetafile, TECHNOLOGY) == DT_RASDISPLAY, ok(GetDeviceCaps(hdcMetafile, TECHNOLOGY) == DT_RASDISPLAY,
"GetDeviceCaps(TECHNOLOGY) has to return DT_RASDISPLAY for a display based EMF\n"); "GetDeviceCaps(TECHNOLOGY) has to return DT_RASDISPLAY for a display based EMF\n");
...@@ -2057,7 +2053,6 @@ static void test_mf_Blank(void) ...@@ -2057,7 +2053,6 @@ static void test_mf_Blank(void)
hdcMetafile = CreateMetaFileA(NULL); hdcMetafile = CreateMetaFileA(NULL);
ok(hdcMetafile != 0, "CreateMetaFileA(NULL) error %d\n", GetLastError()); ok(hdcMetafile != 0, "CreateMetaFileA(NULL) error %d\n", GetLastError());
trace("hdcMetafile %p\n", hdcMetafile);
/* Tests on metafile initialization */ /* Tests on metafile initialization */
caps = GetDeviceCaps (hdcMetafile, TECHNOLOGY); caps = GetDeviceCaps (hdcMetafile, TECHNOLOGY);
...@@ -2094,7 +2089,6 @@ static void test_CopyMetaFile(void) ...@@ -2094,7 +2089,6 @@ static void test_CopyMetaFile(void)
hdcMetafile = CreateMetaFileA(NULL); hdcMetafile = CreateMetaFileA(NULL);
ok(hdcMetafile != 0, "CreateMetaFileA(NULL) error %d\n", GetLastError()); ok(hdcMetafile != 0, "CreateMetaFileA(NULL) error %d\n", GetLastError());
trace("hdcMetafile %p\n", hdcMetafile);
hMetafile = CloseMetaFile(hdcMetafile); hMetafile = CloseMetaFile(hdcMetafile);
ok(hMetafile != 0, "CloseMetaFile error %d\n", GetLastError()); ok(hMetafile != 0, "CloseMetaFile error %d\n", GetLastError());
...@@ -2141,7 +2135,6 @@ static void test_SetMetaFileBits(void) ...@@ -2141,7 +2135,6 @@ static void test_SetMetaFileBits(void)
METAHEADER *mh; METAHEADER *mh;
hmf = SetMetaFileBitsEx(sizeof(MF_GRAPHICS_BITS), MF_GRAPHICS_BITS); hmf = SetMetaFileBitsEx(sizeof(MF_GRAPHICS_BITS), MF_GRAPHICS_BITS);
trace("hmf %p\n", hmf);
ok(hmf != 0, "SetMetaFileBitsEx error %d\n", GetLastError()); ok(hmf != 0, "SetMetaFileBitsEx error %d\n", GetLastError());
type = GetObjectType(hmf); type = GetObjectType(hmf);
ok(type == OBJ_METAFILE, "SetMetaFileBitsEx created object with type %d\n", type); ok(type == OBJ_METAFILE, "SetMetaFileBitsEx created object with type %d\n", type);
...@@ -2161,7 +2154,6 @@ static void test_SetMetaFileBits(void) ...@@ -2161,7 +2154,6 @@ static void test_SetMetaFileBits(void)
/* Now with zero size */ /* Now with zero size */
SetLastError(0xdeadbeef); SetLastError(0xdeadbeef);
hmf = SetMetaFileBitsEx(0, MF_GRAPHICS_BITS); hmf = SetMetaFileBitsEx(0, MF_GRAPHICS_BITS);
trace("hmf %p\n", hmf);
ok(!hmf, "SetMetaFileBitsEx should fail\n"); ok(!hmf, "SetMetaFileBitsEx should fail\n");
ok(GetLastError() == ERROR_INVALID_DATA || ok(GetLastError() == ERROR_INVALID_DATA ||
broken(GetLastError() == ERROR_INVALID_PARAMETER), /* Win9x */ broken(GetLastError() == ERROR_INVALID_PARAMETER), /* Win9x */
...@@ -2170,7 +2162,6 @@ static void test_SetMetaFileBits(void) ...@@ -2170,7 +2162,6 @@ static void test_SetMetaFileBits(void)
/* Now with odd size */ /* Now with odd size */
SetLastError(0xdeadbeef); SetLastError(0xdeadbeef);
hmf = SetMetaFileBitsEx(sizeof(MF_GRAPHICS_BITS) - 1, MF_GRAPHICS_BITS); hmf = SetMetaFileBitsEx(sizeof(MF_GRAPHICS_BITS) - 1, MF_GRAPHICS_BITS);
trace("hmf %p\n", hmf);
ok(!hmf, "SetMetaFileBitsEx should fail\n"); ok(!hmf, "SetMetaFileBitsEx should fail\n");
ok(GetLastError() == 0xdeadbeef /* XP SP1 */, "wrong error %d\n", GetLastError()); ok(GetLastError() == 0xdeadbeef /* XP SP1 */, "wrong error %d\n", GetLastError());
...@@ -2184,7 +2175,6 @@ static void test_SetMetaFileBits(void) ...@@ -2184,7 +2175,6 @@ static void test_SetMetaFileBits(void)
mh->mtHeaderSize = 0; mh->mtHeaderSize = 0;
SetLastError(0xdeadbeef); SetLastError(0xdeadbeef);
hmf = SetMetaFileBitsEx(sizeof(MF_GRAPHICS_BITS), buf); hmf = SetMetaFileBitsEx(sizeof(MF_GRAPHICS_BITS), buf);
trace("hmf %p\n", hmf);
ok(!hmf, "SetMetaFileBitsEx should fail\n"); ok(!hmf, "SetMetaFileBitsEx should fail\n");
ok(GetLastError() == ERROR_INVALID_DATA || ok(GetLastError() == ERROR_INVALID_DATA ||
broken(GetLastError() == ERROR_INVALID_PARAMETER), /* Win9x */ broken(GetLastError() == ERROR_INVALID_PARAMETER), /* Win9x */
...@@ -2196,7 +2186,6 @@ static void test_SetMetaFileBits(void) ...@@ -2196,7 +2186,6 @@ static void test_SetMetaFileBits(void)
/* corruption of mtSize doesn't lead to a failure */ /* corruption of mtSize doesn't lead to a failure */
mh->mtSize *= 2; mh->mtSize *= 2;
hmf = SetMetaFileBitsEx(sizeof(MF_GRAPHICS_BITS), buf); hmf = SetMetaFileBitsEx(sizeof(MF_GRAPHICS_BITS), buf);
trace("hmf %p\n", hmf);
ok(hmf != 0, "SetMetaFileBitsEx error %d\n", GetLastError()); ok(hmf != 0, "SetMetaFileBitsEx error %d\n", GetLastError());
if (compare_mf_bits(hmf, MF_GRAPHICS_BITS, sizeof(MF_GRAPHICS_BITS), "mf_Graphics") != 0) if (compare_mf_bits(hmf, MF_GRAPHICS_BITS, sizeof(MF_GRAPHICS_BITS), "mf_Graphics") != 0)
...@@ -2215,7 +2204,6 @@ static void test_SetMetaFileBits(void) ...@@ -2215,7 +2204,6 @@ static void test_SetMetaFileBits(void)
/* zeroing mtSize doesn't lead to a failure */ /* zeroing mtSize doesn't lead to a failure */
mh->mtSize = 0; mh->mtSize = 0;
hmf = SetMetaFileBitsEx(sizeof(MF_GRAPHICS_BITS), buf); hmf = SetMetaFileBitsEx(sizeof(MF_GRAPHICS_BITS), buf);
trace("hmf %p\n", hmf);
ok(hmf != 0, "SetMetaFileBitsEx error %d\n", GetLastError()); ok(hmf != 0, "SetMetaFileBitsEx error %d\n", GetLastError());
if (compare_mf_bits(hmf, MF_GRAPHICS_BITS, sizeof(MF_GRAPHICS_BITS), "mf_Graphics") != 0) if (compare_mf_bits(hmf, MF_GRAPHICS_BITS, sizeof(MF_GRAPHICS_BITS), "mf_Graphics") != 0)
...@@ -2242,7 +2230,6 @@ static void test_mf_Graphics(void) ...@@ -2242,7 +2230,6 @@ static void test_mf_Graphics(void)
hdcMetafile = CreateMetaFileA(NULL); hdcMetafile = CreateMetaFileA(NULL);
ok(hdcMetafile != 0, "CreateMetaFileA(NULL) error %d\n", GetLastError()); ok(hdcMetafile != 0, "CreateMetaFileA(NULL) error %d\n", GetLastError());
trace("hdcMetafile %p\n", hdcMetafile);
ret = MoveToEx(hdcMetafile, 1, 1, NULL); ret = MoveToEx(hdcMetafile, 1, 1, NULL);
ok( ret, "MoveToEx error %d.\n", GetLastError()); ok( ret, "MoveToEx error %d.\n", GetLastError());
...@@ -2301,7 +2288,6 @@ static void test_mf_PatternBrush(void) ...@@ -2301,7 +2288,6 @@ static void test_mf_PatternBrush(void)
hdcMetafile = CreateMetaFileA(NULL); hdcMetafile = CreateMetaFileA(NULL);
ok(hdcMetafile != 0, "CreateMetaFileA error %d\n", GetLastError()); ok(hdcMetafile != 0, "CreateMetaFileA error %d\n", GetLastError());
trace("hdcMetafile %p\n", hdcMetafile);
hBrush = SelectObject(hdcMetafile, hBrush); hBrush = SelectObject(hdcMetafile, hBrush);
ok(hBrush != 0, "SelectObject error %d.\n", GetLastError()); ok(hBrush != 0, "SelectObject error %d.\n", GetLastError());
...@@ -2385,7 +2371,6 @@ static void test_mf_ExtTextOut_on_path(void) ...@@ -2385,7 +2371,6 @@ static void test_mf_ExtTextOut_on_path(void)
hdcMetafile = CreateMetaFileA(NULL); hdcMetafile = CreateMetaFileA(NULL);
ok(hdcMetafile != 0, "CreateMetaFileA(NULL) error %d\n", GetLastError()); ok(hdcMetafile != 0, "CreateMetaFileA(NULL) error %d\n", GetLastError());
trace("hdcMetafile %p\n", hdcMetafile);
ret = BeginPath(hdcMetafile); ret = BeginPath(hdcMetafile);
ok(!ret, "BeginPath on metafile DC should fail\n"); ok(!ret, "BeginPath on metafile DC should fail\n");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment