gdi32/tests: Silence noisy traces.
Signed-off-by: Jacek Caban <jacek@codeweavers.com> Signed-off-by: Huw Davies <huw@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
parent
c4b194f4d9
commit
317fe5bcb0
|
@ -357,10 +357,11 @@ static void test_ExtTextOutScale(void)
|
|||
ret = GetWindowExtEx(hdcDisplay, &wndext);
|
||||
ok(ret, "GetWindowExtEx failed\n");
|
||||
|
||||
trace("gm %d, mm %d, wnd %d,%d, vp %d,%d horz %d,%d vert %d,%d\n",
|
||||
test.graphics_mode, test.map_mode,
|
||||
wndext.cx, wndext.cy, vportext.cx, vportext.cy,
|
||||
horzSize, horzRes, vertSize, vertRes);
|
||||
if (winetest_debug > 1)
|
||||
trace("gm %d, mm %d, wnd %d,%d, vp %d,%d horz %d,%d vert %d,%d\n",
|
||||
test.graphics_mode, test.map_mode,
|
||||
wndext.cx, wndext.cy, vportext.cx, vportext.cy,
|
||||
horzSize, horzRes, vertSize, vertRes);
|
||||
|
||||
if (test.graphics_mode == GM_COMPATIBLE)
|
||||
{
|
||||
|
@ -424,18 +425,20 @@ static void check_dc_state(HDC hdc, int restore_no,
|
|||
ret = GetWorldTransform(hdc, &xform);
|
||||
ok(ret, "GetWorldTransform error %u\n", GetLastError());
|
||||
|
||||
trace("%d: eM11 %f, eM22 %f, eDx %f, eDy %f\n", restore_no, xform.eM11, xform.eM22, xform.eDx, xform.eDy);
|
||||
if (winetest_debug > 1)
|
||||
trace("%d: eM11 %f, eM22 %f, eDx %f, eDy %f\n", restore_no, xform.eM11,
|
||||
xform.eM22, xform.eDx, xform.eDy);
|
||||
|
||||
ok(xform.eM12 == 0.0, "%d: expected eM12 0.0, got %f\n", restore_no, xform.eM12);
|
||||
ok(xform.eM21 == 0.0, "%d: expected eM21 0.0, got %f\n", restore_no, xform.eM21);
|
||||
|
||||
xscale = (FLOAT)vp_ext_x / (FLOAT)wnd_ext_x;
|
||||
trace("x scale %f\n", xscale);
|
||||
if (winetest_debug > 1) trace("x scale %f\n", xscale);
|
||||
ok(fabs(xscale - xform.eM11) < 0.01, "%d: vp_ext_x %d, wnd_ext_cx %d, eM11 %f\n",
|
||||
restore_no, vp_ext_x, wnd_ext_x, xform.eM11);
|
||||
|
||||
yscale = (FLOAT)vp_ext_y / (FLOAT)wnd_ext_y;
|
||||
trace("y scale %f\n", yscale);
|
||||
if (winetest_debug > 1) trace("y scale %f\n", yscale);
|
||||
ok(fabs(yscale - xform.eM22) < 0.01, "%d: vp_ext_y %d, wnd_ext_y %d, eM22 %f\n",
|
||||
restore_no, vp_ext_y, wnd_ext_y, xform.eM22);
|
||||
|
||||
|
@ -456,8 +459,9 @@ static int CALLBACK savedc_emf_enum_proc(HDC hdc, HANDLETABLE *handle_table,
|
|||
static int restore_no;
|
||||
static int select_no;
|
||||
|
||||
trace("hdc %p, emr->iType %d, emr->nSize %d, param %p\n",
|
||||
hdc, emr->iType, emr->nSize, (void *)param);
|
||||
if (winetest_debug > 1)
|
||||
trace("hdc %p, emr->iType %d, emr->nSize %d, param %p\n",
|
||||
hdc, emr->iType, emr->nSize, (void *)param);
|
||||
|
||||
SetLastError(0xdeadbeef);
|
||||
ret = GetWorldTransform(hdc, &xform);
|
||||
|
@ -479,7 +483,8 @@ static int CALLBACK savedc_emf_enum_proc(HDC hdc, HANDLETABLE *handle_table,
|
|||
else
|
||||
{
|
||||
ok(ret, "GetWorldTransform error %u\n", GetLastError());
|
||||
trace("eM11 %f, eM22 %f, eDx %f, eDy %f\n", xform.eM11, xform.eM22, xform.eDx, xform.eDy);
|
||||
if (winetest_debug > 1)
|
||||
trace("eM11 %f, eM22 %f, eDx %f, eDy %f\n", xform.eM11, xform.eM22, xform.eDx, xform.eDy);
|
||||
}
|
||||
|
||||
PlayEnhMetaFileRecord(hdc, handle_table, emr, n_objs);
|
||||
|
@ -492,11 +497,14 @@ static int CALLBACK savedc_emf_enum_proc(HDC hdc, HANDLETABLE *handle_table,
|
|||
RECT bounds;
|
||||
const ENHMETAHEADER *emf = (const ENHMETAHEADER *)emr;
|
||||
|
||||
trace("bounds %d,%d-%d,%d, frame %d,%d-%d,%d\n",
|
||||
emf->rclBounds.left, emf->rclBounds.top, emf->rclBounds.right, emf->rclBounds.bottom,
|
||||
emf->rclFrame.left, emf->rclFrame.top, emf->rclFrame.right, emf->rclFrame.bottom);
|
||||
trace("mm %d x %d, device %d x %d\n", emf->szlMillimeters.cx, emf->szlMillimeters.cy,
|
||||
emf->szlDevice.cx, emf->szlDevice.cy);
|
||||
if (winetest_debug > 1)
|
||||
{
|
||||
trace("bounds %d,%d-%d,%d, frame %d,%d-%d,%d\n",
|
||||
emf->rclBounds.left, emf->rclBounds.top, emf->rclBounds.right, emf->rclBounds.bottom,
|
||||
emf->rclFrame.left, emf->rclFrame.top, emf->rclFrame.right, emf->rclFrame.bottom);
|
||||
trace("mm %d x %d, device %d x %d\n", emf->szlMillimeters.cx, emf->szlMillimeters.cy,
|
||||
emf->szlDevice.cx, emf->szlDevice.cy);
|
||||
}
|
||||
|
||||
SetRect(&bounds, emf->rclBounds.left, emf->rclBounds.top, emf->rclBounds.right, emf->rclBounds.bottom);
|
||||
ok(EqualRect(&bounds, &exp_bounds), "wrong bounds\n");
|
||||
|
@ -511,42 +519,46 @@ static int CALLBACK savedc_emf_enum_proc(HDC hdc, HANDLETABLE *handle_table,
|
|||
case EMR_LINETO:
|
||||
{
|
||||
const EMRLINETO *line = (const EMRLINETO *)emr;
|
||||
trace("EMR_LINETO %d,%d\n", line->ptl.x, line->ptl.x);
|
||||
if (winetest_debug > 1) trace("EMR_LINETO %d,%d\n", line->ptl.x, line->ptl.x);
|
||||
break;
|
||||
}
|
||||
case EMR_SETWINDOWORGEX:
|
||||
{
|
||||
const EMRSETWINDOWORGEX *org = (const EMRSETWINDOWORGEX *)emr;
|
||||
trace("EMR_SETWINDOWORGEX: %d,%d\n", org->ptlOrigin.x, org->ptlOrigin.y);
|
||||
if (winetest_debug > 1)
|
||||
trace("EMR_SETWINDOWORGEX: %d,%d\n", org->ptlOrigin.x, org->ptlOrigin.y);
|
||||
break;
|
||||
}
|
||||
case EMR_SETWINDOWEXTEX:
|
||||
{
|
||||
const EMRSETWINDOWEXTEX *ext = (const EMRSETWINDOWEXTEX *)emr;
|
||||
trace("EMR_SETWINDOWEXTEX: %d,%d\n", ext->szlExtent.cx, ext->szlExtent.cy);
|
||||
if (winetest_debug > 1)
|
||||
trace("EMR_SETWINDOWEXTEX: %d,%d\n", ext->szlExtent.cx, ext->szlExtent.cy);
|
||||
break;
|
||||
}
|
||||
case EMR_SETVIEWPORTORGEX:
|
||||
{
|
||||
const EMRSETVIEWPORTORGEX *org = (const EMRSETVIEWPORTORGEX *)emr;
|
||||
trace("EMR_SETVIEWPORTORGEX: %d,%d\n", org->ptlOrigin.x, org->ptlOrigin.y);
|
||||
if (winetest_debug > 1)
|
||||
trace("EMR_SETVIEWPORTORGEX: %d,%d\n", org->ptlOrigin.x, org->ptlOrigin.y);
|
||||
break;
|
||||
}
|
||||
case EMR_SETVIEWPORTEXTEX:
|
||||
{
|
||||
const EMRSETVIEWPORTEXTEX *ext = (const EMRSETVIEWPORTEXTEX *)emr;
|
||||
trace("EMR_SETVIEWPORTEXTEX: %d,%d\n", ext->szlExtent.cx, ext->szlExtent.cy);
|
||||
if (winetest_debug > 1)
|
||||
trace("EMR_SETVIEWPORTEXTEX: %d,%d\n", ext->szlExtent.cx, ext->szlExtent.cy);
|
||||
break;
|
||||
}
|
||||
case EMR_SAVEDC:
|
||||
save_state++;
|
||||
trace("EMR_SAVEDC\n");
|
||||
if (winetest_debug > 1) trace("EMR_SAVEDC\n");
|
||||
break;
|
||||
|
||||
case EMR_RESTOREDC:
|
||||
{
|
||||
const EMRRESTOREDC *restoredc = (const EMRRESTOREDC *)emr;
|
||||
trace("EMR_RESTOREDC: %d\n", restoredc->iRelative);
|
||||
if (winetest_debug > 1) trace("EMR_RESTOREDC: %d\n", restoredc->iRelative);
|
||||
|
||||
switch(++restore_no)
|
||||
{
|
||||
|
@ -570,7 +582,7 @@ static int CALLBACK savedc_emf_enum_proc(HDC hdc, HANDLETABLE *handle_table,
|
|||
case EMR_SELECTOBJECT:
|
||||
{
|
||||
const EMRSELECTOBJECT *selectobj = (const EMRSELECTOBJECT*)emr;
|
||||
trace("EMR_SELECTOBJECT: %x\n",selectobj->ihObject);
|
||||
if (winetest_debug > 1) trace("EMR_SELECTOBJECT: %x\n",selectobj->ihObject);
|
||||
select_no ++;
|
||||
break;
|
||||
}
|
||||
|
@ -586,21 +598,22 @@ static int CALLBACK savedc_emf_enum_proc(HDC hdc, HANDLETABLE *handle_table,
|
|||
{
|
||||
ret = GetWindowOrgEx(hdc, &pt);
|
||||
ok(ret, "GetWindowOrgEx error %u\n", GetLastError());
|
||||
trace("window org (%d,%d)\n", pt.x, pt.y);
|
||||
if (winetest_debug > 1) trace("window org (%d,%d)\n", pt.x, pt.y);
|
||||
ret = GetViewportOrgEx(hdc, &pt);
|
||||
ok(ret, "GetViewportOrgEx error %u\n", GetLastError());
|
||||
trace("vport org (%d,%d)\n", pt.x, pt.y);
|
||||
if (winetest_debug > 1) trace("vport org (%d,%d)\n", pt.x, pt.y);
|
||||
ret = GetWindowExtEx(hdc, &size);
|
||||
ok(ret, "GetWindowExtEx error %u\n", GetLastError());
|
||||
trace("window ext (%d,%d)\n", size.cx, size.cy);
|
||||
if (winetest_debug > 1) trace("window ext (%d,%d)\n", size.cx, size.cy);
|
||||
ret = GetViewportExtEx(hdc, &size);
|
||||
ok(ret, "GetViewportExtEx error %u\n", GetLastError());
|
||||
trace("vport ext (%d,%d)\n", size.cx, size.cy);
|
||||
if (winetest_debug > 1) trace("vport ext (%d,%d)\n", size.cx, size.cy);
|
||||
}
|
||||
else
|
||||
{
|
||||
ok(ret, "GetWorldTransform error %u\n", GetLastError());
|
||||
trace("eM11 %f, eM22 %f, eDx %f, eDy %f\n", xform.eM11, xform.eM22, xform.eDx, xform.eDy);
|
||||
if (winetest_debug > 1)
|
||||
trace("eM11 %f, eM22 %f, eDx %f, eDy %f\n", xform.eM11, xform.eM22, xform.eDx, xform.eDy);
|
||||
}
|
||||
|
||||
return 1;
|
||||
|
@ -1765,8 +1778,9 @@ static int compare_emf_bits(const HENHMETAFILE mf, const unsigned char *bits,
|
|||
const ENHMETARECORD *emr1 = (const ENHMETARECORD *)(bits + offset1);
|
||||
const ENHMETARECORD *emr2 = (const ENHMETARECORD *)(buf + offset2);
|
||||
|
||||
trace("%s: EMF record %u, size %u/record %u, size %u\n",
|
||||
desc, emr1->iType, emr1->nSize, emr2->iType, emr2->nSize);
|
||||
if (winetest_debug > 1)
|
||||
trace("%s: EMF record %u, size %u/record %u, size %u\n",
|
||||
desc, emr1->iType, emr1->nSize, emr2->iType, emr2->nSize);
|
||||
|
||||
if (!match_emf_record(emr1, emr2, desc, ignore_scaling)) return -1;
|
||||
|
||||
|
@ -3705,8 +3719,8 @@ static int CALLBACK clip_emf_enum_proc(HDC hdc, HANDLETABLE *handle_table,
|
|||
XFORM xform;
|
||||
INT ret;
|
||||
|
||||
trace("EMR_EXTSELECTCLIPRGN: cbRgnData %#x, iMode %u\n",
|
||||
clip->cbRgnData, clip->iMode);
|
||||
if (winetest_debug > 1)
|
||||
trace("EMR_EXTSELECTCLIPRGN: cbRgnData %#x, iMode %u\n", clip->cbRgnData, clip->iMode);
|
||||
|
||||
ok(clip->iMode == RGN_COPY, "expected RGN_COPY, got %u\n", clip->iMode);
|
||||
ok(clip->cbRgnData >= sizeof(RGNDATAHEADER) + sizeof(RECT),
|
||||
|
@ -3716,15 +3730,16 @@ static int CALLBACK clip_emf_enum_proc(HDC hdc, HANDLETABLE *handle_table,
|
|||
|
||||
rgn1 = (const union _rgn *)clip->RgnData;
|
||||
|
||||
trace("size %u, type %u, count %u, rgn size %u, bound %s\n",
|
||||
rgn1->data.rdh.dwSize, rgn1->data.rdh.iType,
|
||||
rgn1->data.rdh.nCount, rgn1->data.rdh.nRgnSize,
|
||||
wine_dbgstr_rect(&rgn1->data.rdh.rcBound));
|
||||
if (winetest_debug > 1)
|
||||
trace("size %u, type %u, count %u, rgn size %u, bound %s\n",
|
||||
rgn1->data.rdh.dwSize, rgn1->data.rdh.iType,
|
||||
rgn1->data.rdh.nCount, rgn1->data.rdh.nRgnSize,
|
||||
wine_dbgstr_rect(&rgn1->data.rdh.rcBound));
|
||||
|
||||
ok(EqualRect(&rgn1->data.rdh.rcBound, rc), "rects don't match\n");
|
||||
|
||||
rect = *(const RECT *)rgn1->data.Buffer;
|
||||
trace("rect %s\n", wine_dbgstr_rect(&rect));
|
||||
if (winetest_debug > 1) trace("rect %s\n", wine_dbgstr_rect(&rect));
|
||||
ok(EqualRect(&rect, rc), "rects don't match\n");
|
||||
|
||||
ok(rgn1->data.rdh.dwSize == sizeof(rgn1->data.rdh), "expected sizeof(rdh), got %u\n", rgn1->data.rdh.dwSize);
|
||||
|
@ -3740,7 +3755,7 @@ static int CALLBACK clip_emf_enum_proc(HDC hdc, HANDLETABLE *handle_table,
|
|||
ret = GetWorldTransform(hdc, &xform);
|
||||
ok(ret, "GetWorldTransform error %u\n", GetLastError());
|
||||
|
||||
trace("xform.eM11 %f, xform.eM22 %f\n", xform.eM11, xform.eM22);
|
||||
if (winetest_debug > 1) trace("xform.eM11 %f, xform.eM22 %f\n", xform.eM11, xform.eM22);
|
||||
|
||||
ret = GetClipRgn(hdc, hrgn);
|
||||
ok(ret == 0, "GetClipRgn returned %d, expected 0\n", ret);
|
||||
|
@ -3756,21 +3771,23 @@ static int CALLBACK clip_emf_enum_proc(HDC hdc, HANDLETABLE *handle_table,
|
|||
ret = GetRegionData(hrgn, sizeof(rgn2), &rgn2.data);
|
||||
ok(ret == sizeof(rgn2), "expected sizeof(rgn2), got %u\n", ret);
|
||||
|
||||
trace("size %u, type %u, count %u, rgn size %u, bound %s\n", rgn2.data.rdh.dwSize,
|
||||
rgn2.data.rdh.iType, rgn2.data.rdh.nCount, rgn2.data.rdh.nRgnSize,
|
||||
wine_dbgstr_rect(&rgn2.data.rdh.rcBound));
|
||||
if (winetest_debug > 1)
|
||||
trace("size %u, type %u, count %u, rgn size %u, bound %s\n", rgn2.data.rdh.dwSize,
|
||||
rgn2.data.rdh.iType, rgn2.data.rdh.nCount, rgn2.data.rdh.nRgnSize,
|
||||
wine_dbgstr_rect(&rgn2.data.rdh.rcBound));
|
||||
|
||||
rect = rgn2.data.rdh.rcBound;
|
||||
rc_transformed = *rc;
|
||||
translate((POINT *)&rc_transformed, 2, &xform);
|
||||
trace("transformed %s\n", wine_dbgstr_rect(&rc_transformed));
|
||||
if (winetest_debug > 1)
|
||||
trace("transformed %s\n", wine_dbgstr_rect(&rc_transformed));
|
||||
ok(is_equal_rect(&rect, &rc_transformed), "rects don't match\n");
|
||||
|
||||
rect = *(const RECT *)rgn2.data.Buffer;
|
||||
trace("rect %s\n", wine_dbgstr_rect(&rect));
|
||||
if (winetest_debug > 1) trace("rect %s\n", wine_dbgstr_rect(&rect));
|
||||
rc_transformed = *rc;
|
||||
translate((POINT *)&rc_transformed, 2, &xform);
|
||||
trace("transformed %s\n", wine_dbgstr_rect(&rc_transformed));
|
||||
if (winetest_debug > 1) trace("transformed %s\n", wine_dbgstr_rect(&rc_transformed));
|
||||
ok(is_equal_rect(&rect, &rc_transformed), "rects don't match\n");
|
||||
|
||||
ok(rgn2.data.rdh.dwSize == sizeof(rgn1->data.rdh), "expected sizeof(rdh), got %u\n", rgn2.data.rdh.dwSize);
|
||||
|
@ -4080,9 +4097,10 @@ static INT CALLBACK EmfEnumProc(HDC hdc, HANDLETABLE *lpHTable, const ENHMETAREC
|
|||
* until a record is played which actually outputs something */
|
||||
PlayEnhMetaFileRecord(hdc, lpHTable, lpEMFR, nObj);
|
||||
LPtoDP(hdc, mapping, 2);
|
||||
trace("EMF record: iType %d, nSize %d, (%d,%d)-(%d,%d)\n",
|
||||
lpEMFR->iType, lpEMFR->nSize,
|
||||
mapping[0].x, mapping[0].y, mapping[1].x, mapping[1].y);
|
||||
if (winetest_debug > 1)
|
||||
trace("EMF record: iType %d, nSize %d, (%d,%d)-(%d,%d)\n",
|
||||
lpEMFR->iType, lpEMFR->nSize,
|
||||
mapping[0].x, mapping[0].y, mapping[1].x, mapping[1].y);
|
||||
|
||||
if (lpEMFR->iType == EMR_LINETO)
|
||||
{
|
||||
|
|
Loading…
Reference in New Issue