gdiplus/tests: remove redundant assignments (LLVM/Clang) (2/2)

Austin English austinenglish at gmail.com
Wed Feb 9 15:44:54 CST 2011


-- 
-Austin
-------------- next part --------------
diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c
index e07b889..040a714 100644
--- a/dlls/gdiplus/tests/graphics.c
+++ b/dlls/gdiplus/tests/graphics.c
@@ -1418,191 +1418,191 @@ static void test_Get_Release_DC(void)
     /* try all Graphics calls here */
     status = Ok;
     status = GdipDrawArc(graphics, pen, 0.0, 0.0, 1.0, 1.0, 0.0, 0.0);
-    expect(ObjectBusy, status); status = Ok;
+    expect(ObjectBusy, status);
     status = GdipDrawArcI(graphics, pen, 0, 0, 1, 1, 0.0, 0.0);
-    expect(ObjectBusy, status); status = Ok;
+    expect(ObjectBusy, status);
     status = GdipDrawBezier(graphics, pen, 0.0, 10.0, 20.0, 15.0, 35.0, -10.0, 10.0, 10.0);
-    expect(ObjectBusy, status); status = Ok;
+    expect(ObjectBusy, status);
     status = GdipDrawBezierI(graphics, pen, 0, 0, 0, 0, 0, 0, 0, 0);
-    expect(ObjectBusy, status); status = Ok;
+    expect(ObjectBusy, status);
     status = GdipDrawBeziers(graphics, pen, ptf, 5);
-    expect(ObjectBusy, status); status = Ok;
+    expect(ObjectBusy, status);
     status = GdipDrawBeziersI(graphics, pen, pt, 5);
-    expect(ObjectBusy, status); status = Ok;
+    expect(ObjectBusy, status);
     status = GdipDrawClosedCurve(graphics, pen, ptf, 5);
-    expect(ObjectBusy, status); status = Ok;
+    expect(ObjectBusy, status);
     status = GdipDrawClosedCurveI(graphics, pen, pt, 5);
-    expect(ObjectBusy, status); status = Ok;
+    expect(ObjectBusy, status);
     status = GdipDrawClosedCurve2(graphics, pen, ptf, 5, 1.0);
-    expect(ObjectBusy, status); status = Ok;
+    expect(ObjectBusy, status);
     status = GdipDrawClosedCurve2I(graphics, pen, pt, 5, 1.0);
-    expect(ObjectBusy, status); status = Ok;
+    expect(ObjectBusy, status);
     status = GdipDrawCurve(graphics, pen, ptf, 5);
-    expect(ObjectBusy, status); status = Ok;
+    expect(ObjectBusy, status);
     status = GdipDrawCurveI(graphics, pen, pt, 5);
-    expect(ObjectBusy, status); status = Ok;
+    expect(ObjectBusy, status);
     status = GdipDrawCurve2(graphics, pen, ptf, 5, 1.0);
-    expect(ObjectBusy, status); status = Ok;
+    expect(ObjectBusy, status);
     status = GdipDrawCurve2I(graphics, pen, pt, 5, 1.0);
-    expect(ObjectBusy, status); status = Ok;
+    expect(ObjectBusy, status);
     status = GdipDrawEllipse(graphics, pen, 0.0, 0.0, 100.0, 50.0);
-    expect(ObjectBusy, status); status = Ok;
+    expect(ObjectBusy, status);
     status = GdipDrawEllipseI(graphics, pen, 0, 0, 100, 50);
-    expect(ObjectBusy, status); status = Ok;
+    expect(ObjectBusy, status);
     /* GdipDrawImage/GdipDrawImageI */
     /* GdipDrawImagePointsRect/GdipDrawImagePointsRectI */
     /* GdipDrawImageRectRect/GdipDrawImageRectRectI */
     /* GdipDrawImageRect/GdipDrawImageRectI */
     status = GdipDrawLine(graphics, pen, 0.0, 0.0, 100.0, 200.0);
-    expect(ObjectBusy, status); status = Ok;
+    expect(ObjectBusy, status);
     status = GdipDrawLineI(graphics, pen, 0, 0, 100, 200);
-    expect(ObjectBusy, status); status = Ok;
+    expect(ObjectBusy, status);
     status = GdipDrawLines(graphics, pen, ptf, 5);
-    expect(ObjectBusy, status); status = Ok;
+    expect(ObjectBusy, status);
     status = GdipDrawLinesI(graphics, pen, pt, 5);
-    expect(ObjectBusy, status); status = Ok;
+    expect(ObjectBusy, status);
     status = GdipDrawPath(graphics, pen, path);
-    expect(ObjectBusy, status); status = Ok;
+    expect(ObjectBusy, status);
     status = GdipDrawPie(graphics, pen, 0.0, 0.0, 100.0, 100.0, 0.0, 90.0);
-    expect(ObjectBusy, status); status = Ok;
+    expect(ObjectBusy, status);
     status = GdipDrawPieI(graphics, pen, 0, 0, 100, 100, 0.0, 90.0);
-    expect(ObjectBusy, status); status = Ok;
+    expect(ObjectBusy, status);
     status = GdipDrawRectangle(graphics, pen, 0.0, 0.0, 100.0, 300.0);
-    expect(ObjectBusy, status); status = Ok;
+    expect(ObjectBusy, status);
     status = GdipDrawRectangleI(graphics, pen, 0, 0, 100, 300);
-    expect(ObjectBusy, status); status = Ok;
+    expect(ObjectBusy, status);
     status = GdipDrawRectangles(graphics, pen, rectf, 2);
-    expect(ObjectBusy, status); status = Ok;
+    expect(ObjectBusy, status);
     status = GdipDrawRectanglesI(graphics, pen, rect, 2);
-    expect(ObjectBusy, status); status = Ok;
+    expect(ObjectBusy, status);
     /* GdipDrawString */
     status = GdipFillClosedCurve2(graphics, (GpBrush*)brush, ptf, 5, 1.0, FillModeAlternate);
-    expect(ObjectBusy, status); status = Ok;
+    expect(ObjectBusy, status);
     status = GdipFillClosedCurve2I(graphics, (GpBrush*)brush, pt, 5, 1.0, FillModeAlternate);
-    expect(ObjectBusy, status); status = Ok;
+    expect(ObjectBusy, status);
     status = GdipFillClosedCurve(graphics, (GpBrush*)brush, ptf, 5);
-    expect(ObjectBusy, status); status = Ok;
+    expect(ObjectBusy, status);
     status = GdipFillClosedCurveI(graphics, (GpBrush*)brush, pt, 5);
-    expect(ObjectBusy, status); status = Ok;
+    expect(ObjectBusy, status);
     status = GdipFillEllipse(graphics, (GpBrush*)brush, 0.0, 0.0, 100.0, 100.0);
-    expect(ObjectBusy, status); status = Ok;
+    expect(ObjectBusy, status);
     status = GdipFillEllipseI(graphics, (GpBrush*)brush, 0, 0, 100, 100);
-    expect(ObjectBusy, status); status = Ok;
+    expect(ObjectBusy, status);
     status = GdipFillPath(graphics, (GpBrush*)brush, path);
-    expect(ObjectBusy, status); status = Ok;
+    expect(ObjectBusy, status);
     status = GdipFillPie(graphics, (GpBrush*)brush, 0.0, 0.0, 100.0, 100.0, 0.0, 15.0);
-    expect(ObjectBusy, status); status = Ok;
+    expect(ObjectBusy, status);
     status = GdipFillPieI(graphics, (GpBrush*)brush, 0, 0, 100, 100, 0.0, 15.0);
-    expect(ObjectBusy, status); status = Ok;
+    expect(ObjectBusy, status);
     status = GdipFillPolygon(graphics, (GpBrush*)brush, ptf, 5, FillModeAlternate);
-    expect(ObjectBusy, status); status = Ok;
+    expect(ObjectBusy, status);
     status = GdipFillPolygonI(graphics, (GpBrush*)brush, pt, 5, FillModeAlternate);
-    expect(ObjectBusy, status); status = Ok;
+    expect(ObjectBusy, status);
     status = GdipFillPolygon2(graphics, (GpBrush*)brush, ptf, 5);
-    expect(ObjectBusy, status); status = Ok;
+    expect(ObjectBusy, status);
     status = GdipFillPolygon2I(graphics, (GpBrush*)brush, pt, 5);
-    expect(ObjectBusy, status); status = Ok;
+    expect(ObjectBusy, status);
     status = GdipFillRectangle(graphics, (GpBrush*)brush, 0.0, 0.0, 100.0, 100.0);
-    expect(ObjectBusy, status); status = Ok;
+    expect(ObjectBusy, status);
     status = GdipFillRectangleI(graphics, (GpBrush*)brush, 0, 0, 100, 100);
-    expect(ObjectBusy, status); status = Ok;
+    expect(ObjectBusy, status);
     status = GdipFillRectangles(graphics, (GpBrush*)brush, rectf, 2);
-    expect(ObjectBusy, status); status = Ok;
+    expect(ObjectBusy, status);
     status = GdipFillRectanglesI(graphics, (GpBrush*)brush, rect, 2);
-    expect(ObjectBusy, status); status = Ok;
+    expect(ObjectBusy, status);
     status = GdipFillRegion(graphics, (GpBrush*)brush, region);
-    expect(ObjectBusy, status); status = Ok;
+    expect(ObjectBusy, status);
     status = GdipFlush(graphics, FlushIntentionFlush);
-    expect(ObjectBusy, status); status = Ok;
+    expect(ObjectBusy, status);
     status = GdipGetClipBounds(graphics, rectf);
-    expect(ObjectBusy, status); status = Ok;
+    expect(ObjectBusy, status);
     status = GdipGetClipBoundsI(graphics, rect);
-    expect(ObjectBusy, status); status = Ok;
+    expect(ObjectBusy, status);
     status = GdipGetCompositingMode(graphics, &compmode);
-    expect(ObjectBusy, status); status = Ok;
+    expect(ObjectBusy, status);
     status = GdipGetCompositingQuality(graphics, &quality);
-    expect(ObjectBusy, status); status = Ok;
+    expect(ObjectBusy, status);
     status = GdipGetInterpolationMode(graphics, &intmode);
-    expect(ObjectBusy, status); status = Ok;
+    expect(ObjectBusy, status);
     status = GdipGetNearestColor(graphics, &color);
-    expect(ObjectBusy, status); status = Ok;
+    expect(ObjectBusy, status);
     status = GdipGetPageScale(graphics, &r);
-    expect(ObjectBusy, status); status = Ok;
+    expect(ObjectBusy, status);
     status = GdipGetPageUnit(graphics, &unit);
-    expect(ObjectBusy, status); status = Ok;
+    expect(ObjectBusy, status);
     status = GdipGetPixelOffsetMode(graphics, &offsetmode);
-    expect(ObjectBusy, status); status = Ok;
+    expect(ObjectBusy, status);
     status = GdipGetSmoothingMode(graphics, &smoothmode);
-    expect(ObjectBusy, status); status = Ok;
+    expect(ObjectBusy, status);
     status = GdipGetTextRenderingHint(graphics, &texthint);
-    expect(ObjectBusy, status); status = Ok;
+    expect(ObjectBusy, status);
     status = GdipGetWorldTransform(graphics, m);
-    expect(ObjectBusy, status); status = Ok;
+    expect(ObjectBusy, status);
     status = GdipGraphicsClear(graphics, 0xdeadbeef);
-    expect(ObjectBusy, status); status = Ok;
+    expect(ObjectBusy, status);
     status = GdipIsVisiblePoint(graphics, 0.0, 0.0, &res);
-    expect(ObjectBusy, status); status = Ok;
+    expect(ObjectBusy, status);
     status = GdipIsVisiblePointI(graphics, 0, 0, &res);
-    expect(ObjectBusy, status); status = Ok;
+    expect(ObjectBusy, status);
     /* GdipMeasureCharacterRanges */
     /* GdipMeasureString */
     status = GdipResetClip(graphics);
-    expect(ObjectBusy, status); status = Ok;
+    expect(ObjectBusy, status);
     status = GdipResetWorldTransform(graphics);
-    expect(ObjectBusy, status); status = Ok;
+    expect(ObjectBusy, status);
     /* GdipRestoreGraphics */
     status = GdipRotateWorldTransform(graphics, 15.0, MatrixOrderPrepend);
-    expect(ObjectBusy, status); status = Ok;
+    expect(ObjectBusy, status);
     /*  GdipSaveGraphics */
     status = GdipScaleWorldTransform(graphics, 1.0, 1.0, MatrixOrderPrepend);
-    expect(ObjectBusy, status); status = Ok;
+    expect(ObjectBusy, status);
     status = GdipSetCompositingMode(graphics, CompositingModeSourceOver);
-    expect(ObjectBusy, status); status = Ok;
+    expect(ObjectBusy, status);
     status = GdipSetCompositingQuality(graphics, CompositingQualityDefault);
-    expect(ObjectBusy, status); status = Ok;
+    expect(ObjectBusy, status);
     status = GdipSetInterpolationMode(graphics, InterpolationModeDefault);
-    expect(ObjectBusy, status); status = Ok;
+    expect(ObjectBusy, status);
     status = GdipSetPageScale(graphics, 1.0);
-    expect(ObjectBusy, status); status = Ok;
+    expect(ObjectBusy, status);
     status = GdipSetPageUnit(graphics, UnitWorld);
-    expect(ObjectBusy, status); status = Ok;
+    expect(ObjectBusy, status);
     status = GdipSetPixelOffsetMode(graphics, PixelOffsetModeDefault);
-    expect(ObjectBusy, status); status = Ok;
+    expect(ObjectBusy, status);
     status = GdipSetSmoothingMode(graphics, SmoothingModeDefault);
-    expect(ObjectBusy, status); status = Ok;
+    expect(ObjectBusy, status);
     status = GdipSetTextRenderingHint(graphics, TextRenderingHintSystemDefault);
-    expect(ObjectBusy, status); status = Ok;
+    expect(ObjectBusy, status);
     status = GdipSetWorldTransform(graphics, m);
-    expect(ObjectBusy, status); status = Ok;
+    expect(ObjectBusy, status);
     status = GdipTranslateWorldTransform(graphics, 0.0, 0.0, MatrixOrderPrepend);
-    expect(ObjectBusy, status); status = Ok;
+    expect(ObjectBusy, status);
     status = GdipSetClipHrgn(graphics, hrgn, CombineModeReplace);
-    expect(ObjectBusy, status); status = Ok;
+    expect(ObjectBusy, status);
     status = GdipSetClipPath(graphics, path, CombineModeReplace);
-    expect(ObjectBusy, status); status = Ok;
+    expect(ObjectBusy, status);
     status = GdipSetClipRect(graphics, 0.0, 0.0, 10.0, 10.0, CombineModeReplace);
-    expect(ObjectBusy, status); status = Ok;
+    expect(ObjectBusy, status);
     status = GdipSetClipRectI(graphics, 0, 0, 10, 10, CombineModeReplace);
-    expect(ObjectBusy, status); status = Ok;
+    expect(ObjectBusy, status);
     status = GdipSetClipRegion(graphics, clip, CombineModeReplace);
-    expect(ObjectBusy, status); status = Ok;
+    expect(ObjectBusy, status);
     status = GdipTranslateClip(graphics, 0.0, 0.0);
-    expect(ObjectBusy, status); status = Ok;
+    expect(ObjectBusy, status);
     status = GdipTranslateClipI(graphics, 0, 0);
-    expect(ObjectBusy, status); status = Ok;
+    expect(ObjectBusy, status);
     status = GdipDrawPolygon(graphics, pen, ptf, 5);
-    expect(ObjectBusy, status); status = Ok;
+    expect(ObjectBusy, status);
     status = GdipDrawPolygonI(graphics, pen, pt, 5);
-    expect(ObjectBusy, status); status = Ok;
+    expect(ObjectBusy, status);
     status = GdipGetDpiX(graphics, &r);
-    expect(ObjectBusy, status); status = Ok;
+    expect(ObjectBusy, status);
     status = GdipGetDpiY(graphics, &r);
-    expect(ObjectBusy, status); status = Ok;
+    expect(ObjectBusy, status);
     status = GdipMultiplyWorldTransform(graphics, m, MatrixOrderPrepend);
     status = GdipGetClip(graphics, region);
-    expect(ObjectBusy, status); status = Ok;
+    expect(ObjectBusy, status);
     status = GdipTransformPoints(graphics, CoordinateSpacePage, CoordinateSpaceWorld, ptf, 5);
-    expect(ObjectBusy, status); status = Ok;
+    expect(ObjectBusy, status);
     /* try to delete before release */
     status = GdipDeleteGraphics(graphics);
     expect(ObjectBusy, status);
-- 
1.7.3.4


More information about the wine-patches mailing list