October 2012 - Wine-commits

Piotr Caban : msvcp71: Added basic_string functions that work on iterators.
by Alexandre Julliard 08 Oct '12

08 Oct '12

Module: wine Branch: master Commit: 4cb3bcdb2cc4a189a94ab598681c727337b7c33e URL: http://source.winehq.org/git/wine.git/?a=commit;h=4cb3bcdb2cc4a189a94ab5986… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Oct 8 11:41:17 2012 +0200 msvcp71: Added basic_string functions that work on iterators. --- dlls/msvcp71/msvcp71.spec | 60 ++++++------ dlls/msvcp71/string.c | 255 ++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 272 insertions(+), 43 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4cb3bcdb2cc4a189a94ab…

1 0

Dmitry Timoshkov : gdiplus: Add a font transformation test.
by Alexandre Julliard 08 Oct '12

08 Oct '12

Module: wine Branch: master Commit: e664c2bd3ac39da32d6093aa3be272a6fa7f6ce4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e664c2bd3ac39da32d6093aa3… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Oct 8 16:48:59 2012 +0900 gdiplus: Add a font transformation test. --- dlls/gdiplus/tests/font.c | 70 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 70 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c index 66517b1..0ac9558 100644 --- a/dlls/gdiplus/tests/font.c +++ b/dlls/gdiplus/tests/font.c @@ -804,6 +804,75 @@ todo_wine DeleteDC(hdc); } +static void test_font_transform(void) +{ + GpStatus status; + HDC hdc; + LOGFONT lf; + GpFont *font; + GpGraphics *graphics; + GpMatrix *matrix; + + hdc = CreateCompatibleDC(0); + status = GdipCreateFromHDC(hdc, &graphics); + expect(Ok, status); + + memset(&lf, 0, sizeof(lf)); + lstrcpy(lf.lfFaceName, "Tahoma"); + lf.lfHeight = -100; + lf.lfWidth = 100; + status = GdipCreateFontFromLogfontA(hdc, &lf, &font); + expect(Ok, status); + + /* identity matrix */ + status = GdipCreateMatrix(&matrix); + expect(Ok, status); + status = GdipSetWorldTransform(graphics, matrix); + expect(Ok, status); + status = GdipGetLogFontA(font, graphics, &lf); + expect(Ok, status); + expect(-100, lf.lfHeight); + expect(0, lf.lfWidth); + + /* scale matrix */ + status = GdipScaleMatrix(matrix, 2.0, 3.0, MatrixOrderAppend); + expect(Ok, status); + status = GdipSetWorldTransform(graphics, matrix); + expect(Ok, status); + status = GdipGetLogFontA(font, graphics, &lf); + expect(Ok, status); +todo_wine + expect(-300, lf.lfHeight); + expect(0, lf.lfWidth); + + /* scale + ratate matrix */ + status = GdipRotateMatrix(matrix, 45.0, MatrixOrderAppend); + expect(Ok, status); + status = GdipSetWorldTransform(graphics, matrix); + expect(Ok, status); + status = GdipGetLogFontA(font, graphics, &lf); + expect(Ok, status); +todo_wine + expect(-300, lf.lfHeight); + expect(0, lf.lfWidth); + + /* scale + ratate + shear matrix */ + status = GdipShearMatrix(matrix, 4.0, 5.0, MatrixOrderAppend); + expect(Ok, status); + status = GdipSetWorldTransform(graphics, matrix); + expect(Ok, status); + status = GdipGetLogFontA(font, graphics, &lf); + expect(Ok, status); +todo_wine + expect(1032, lf.lfHeight); + expect(0, lf.lfWidth); + + GdipDeleteMatrix(matrix); + GdipDeleteFont(font); + GdipDeleteGraphics(graphics); + DeleteDC(hdc); +} + START_TEST(font) { struct GdiplusStartupInput gdiplusStartupInput; @@ -816,6 +885,7 @@ START_TEST(font) GdiplusStartup(&gdiplusToken, &gdiplusStartupInput, NULL); + test_font_transform(); test_font_substitution(); test_font_metrics(); test_createfont();

1 0

Dmitry Timoshkov : gdiplus: Detect broken GdipMeasureCharacterRanges behaviour before performing the font height scaling test .
by Alexandre Julliard 08 Oct '12

08 Oct '12

Module: wine Branch: master Commit: 2551ce4ea765b949a3db53138003fe62a8e627e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2551ce4ea765b949a3db53138… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Oct 8 16:50:28 2012 +0900 gdiplus: Detect broken GdipMeasureCharacterRanges behaviour before performing the font height scaling test. --- dlls/gdiplus/tests/graphics.c | 61 +++++++++++++++++++++++++++++++++------- 1 files changed, 50 insertions(+), 11 deletions(-) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 13b89be..1b0bff0 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -3725,7 +3725,7 @@ static void test_font_height_scaling(void) GpFont *font; GpStatus status; RectF bounds, rect; - REAL height, dpi; + REAL height, dpi, scale; PointF ptf; GpUnit gfx_unit, font_unit; @@ -3745,6 +3745,51 @@ static void test_font_height_scaling(void) status = GdipGetDpiY(graphics, &dpi); expect(Ok, status); + /* First check if tested functionality works: + * under XP if font and graphics units differ then GdipTransformPoints + * followed by GdipSetPageUnit to change the graphics units breaks region + * scaling in GdipMeasureCharacterRanges called later. + */ + status = GdipSetPageUnit(graphics, UnitDocument); + expect(Ok, status); + + ptf.X = 0.0; + ptf.Y = 0.0; + status = GdipTransformPoints(graphics, CoordinateSpaceWorld, CoordinateSpaceDevice, &ptf, 1); + expect(Ok, status); + + status = GdipSetPageUnit(graphics, UnitInch); + expect(Ok, status); + + status = GdipCreateFont(family, 720.0, FontStyleRegular, UnitPoint, &font); + expect(Ok, status); + + set_rect_empty(&rect); + set_rect_empty(&bounds); + status = GdipMeasureString(graphics, string, -1, font, &rect, format, &bounds, NULL, NULL); + expect(Ok, status); + trace("test bounds: %f,%f,%f,%f\n", bounds.X, bounds.Y, bounds.Width, bounds.Height); + + set_rect_empty(&rect); + rect.Width = 32000.0; + rect.Height = 32000.0; + status = GdipMeasureCharacterRanges(graphics, string, -1, font, &rect, format, 1, &region); + expect(Ok, status); + + set_rect_empty(&rect); + status = GdipGetRegionBounds(region, graphics, &rect); + expect(Ok, status); + trace("test region: %f,%f,%f,%f\n", rect.X, rect.Y, rect.Width, rect.Height); + + GdipDeleteFont(font); + + scale = rect.Height / bounds.Height; + if (fabs(scale - 1.0) > 0.1) + { + win_skip("GdipGetRegionBounds is broken, scale %f (should be near 1.0)\n", scale); + return; + } + /* UnitPixel = 2, UnitPoint = 3, UnitInch = 4, UnitDocument = 5, UnitMillimeter = 6 */ /* UnitPixel as a font base unit is not tested because it drastically differs in behaviour */ @@ -3785,12 +3830,12 @@ static void test_font_height_scaling(void) status = GdipTransformPoints(graphics, CoordinateSpaceDevice, CoordinateSpaceWorld, &ptf, 1); expect(Ok, status); match = fabs(100.0 - ptf.Y) <= 1.0; - ok(match || broken(!match) /* before win7 */, "Expected 100.0, got %f\n", ptf.Y); + ok(match, "Expected 100.0, got %f\n", ptf.Y); /* verify the result */ ptf.Y = units_to_pixels(bounds.Height, gfx_unit, dpi); match = fabs(100.0 - ptf.Y) <= 1.1; - ok(match || broken(!match) /* before win7 */, "Expected 100.0, got %f\n", ptf.Y); + ok(match, "Expected 100.0, got %f\n", ptf.Y); /* bounds.width of 1 glyph: [margin]+[width]+[margin] */ set_rect_empty(&rect); @@ -3826,22 +3871,16 @@ static void test_font_height_scaling(void) else ok(rect.X > 0.0, "wrong rect.X %f\n", rect.X); expectf(0.0, rect.Y); - /* before Win7 GdipMeasureCharacterRanges behaviour is completely broken */ /* FIXME: Wine uses integer gdi32 regions and rounding breaks things */ if (margin < 1.0) { match = fabs(margin - rect.X) < 0.25; - ok(match || broken(!match) /* before win7 */, "Expected %f, got %f\n", margin, rect.X); + ok(match, "Expected %f, got %f\n", margin, rect.X); } else { match = fabs(margin - rect.X) <= 0.5; - ok(match || broken(!match) /* before win7 */, "Expected %f, got %f\n", margin, rect.X); - } - if (!match) - { - win_skip("GdipMeasureCharacterRanges ignores units before Win7\n"); - continue; + ok(match, "Expected %f, got %f\n", margin, rect.X); } /* FIXME: Wine uses integer gdi32 regions and rounding breaks things */ if (height < 1.0)

1 0

Dmitry Timoshkov : gdiplus: Workaround missing support for true floating point regions in Wine gdiplus by using a scaling world transform .
by Alexandre Julliard 08 Oct '12

08 Oct '12

Module: wine Branch: master Commit: ec4cd117b5eec2f544210e9ea7ead72354518ee6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec4cd117b5eec2f544210e9ea… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Oct 8 16:51:20 2012 +0900 gdiplus: Workaround missing support for true floating point regions in Wine gdiplus by using a scaling world transform. This simplifies the test and makes sure that there is no broken workarounds in the tests. --- dlls/gdiplus/tests/graphics.c | 38 +++++++++++++------------------------- 1 files changed, 13 insertions(+), 25 deletions(-) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 1b0bff0..5219823 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -3729,7 +3729,7 @@ static void test_font_height_scaling(void) PointF ptf; GpUnit gfx_unit, font_unit; - status = GdipCreateStringFormat(0, LANG_NEUTRAL, &format); + status = GdipCreateStringFormat(StringFormatFlagsNoWrap, LANG_NEUTRAL, &format); expect(Ok, status); status = GdipSetStringFormatMeasurableCharacterRanges(format, 1, &range); expect(Ok, status); @@ -3790,6 +3790,9 @@ static void test_font_height_scaling(void) return; } + status = GdipScaleWorldTransform(graphics, 0.01, 0.01, MatrixOrderAppend); + expect(Ok, status); + /* UnitPixel = 2, UnitPoint = 3, UnitInch = 4, UnitDocument = 5, UnitMillimeter = 6 */ /* UnitPixel as a font base unit is not tested because it drastically differs in behaviour */ @@ -3834,7 +3837,8 @@ static void test_font_height_scaling(void) /* verify the result */ ptf.Y = units_to_pixels(bounds.Height, gfx_unit, dpi); - match = fabs(100.0 - ptf.Y) <= 1.1; + ptf.Y /= 100.0; + match = fabs(100.0 - ptf.Y) <= 1.0; ok(match, "Expected 100.0, got %f\n", ptf.Y); /* bounds.width of 1 glyph: [margin]+[width]+[margin] */ @@ -3857,38 +3861,22 @@ static void test_font_height_scaling(void) expect(Ok, status); set_rect_empty(&rect); - rect.Width = 32000.0; - rect.Height = 32000.0; + rect.Width = 320000.0; + rect.Height = 320000.0; status = GdipMeasureCharacterRanges(graphics, string, -1, font, &rect, format, 1, &region); expect(Ok, status); set_rect_empty(&rect); status = GdipGetRegionBounds(region, graphics, &rect); expect(Ok, status); /*trace("region: %f,%f,%f,%f\n", rect.X, rect.Y, rect.Width, rect.Height);*/ - /* FIXME: Wine uses integer gdi32 regions and rounding breaks things */ - if (margin < 1.0) - todo_wine ok(rect.X > 0.0, "wrong rect.X %f\n", rect.X); - else ok(rect.X > 0.0, "wrong rect.X %f\n", rect.X); expectf(0.0, rect.Y); - /* FIXME: Wine uses integer gdi32 regions and rounding breaks things */ - if (margin < 1.0) - { - match = fabs(margin - rect.X) < 0.25; + match = fabs(1.0 - margin / rect.X) <= 0.05; ok(match, "Expected %f, got %f\n", margin, rect.X); - } - else - { - match = fabs(margin - rect.X) <= 0.5; - ok(match, "Expected %f, got %f\n", margin, rect.X); - } - /* FIXME: Wine uses integer gdi32 regions and rounding breaks things */ - if (height < 1.0) - expectf_(height, rect.Height, height / 15.0); - else -todo_wine - expectf_(height, rect.Height, height / 15.0); - expectf_(bounds.Width, rect.Width + margin * 2.0, bounds.Width / 15.0); + match = fabs(1.0 - height / rect.Height) <= 0.1; + ok(match, "Expected %f, got %f\n", height, rect.Height); + match = fabs(1.0 - bounds.Width / (rect.Width + margin * 2.0)) <= 0.05; + ok(match, "Expected %f, got %f\n", bounds.Width, rect.Width + margin * 2.0); } GdipDeleteFont(font);

1 0

Dmitry Timoshkov : gdiplus: Stop adding 1/ 6 of EM height to the created font height.
by Alexandre Julliard 08 Oct '12

08 Oct '12

Module: wine Branch: master Commit: 1c30b894ec3389551699c4ad88faf527be4ba01c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c30b894ec3389551699c4ad8… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Oct 8 16:52:10 2012 +0900 gdiplus: Stop adding 1/6 of EM height to the created font height. --- dlls/gdiplus/graphics.c | 8 +++----- dlls/gdiplus/tests/graphics.c | 8 ++++++++ 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 7e16460..d975d3c 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2138,15 +2138,13 @@ static void get_font_hfont(GpGraphics *graphics, GDIPCONST GpFont *font, { HDC hdc = CreateCompatibleDC(0); GpPointF pt[3]; - REAL angle, rel_width, rel_height, font_height, font_to_pixel_scale; + REAL angle, rel_width, rel_height, font_height; LOGFONTW lfw; HFONT unscaled_font; TEXTMETRICW textmet; - font_to_pixel_scale = (format && format->generic_typographic) ? 1.0 : units_scale(UnitPoint, UnitPixel, font->family->dpi); - if (font->unit == UnitPixel) - font_height = font->emSize * font_to_pixel_scale; + font_height = font->emSize; else { REAL unit_scale, res; @@ -2154,7 +2152,7 @@ static void get_font_hfont(GpGraphics *graphics, GDIPCONST GpFont *font, res = (graphics->unit == UnitDisplay || graphics->unit == UnitPixel) ? graphics->xres : graphics->yres; unit_scale = units_scale(font->unit, graphics->unit, res); - font_height = font->emSize * font_to_pixel_scale * unit_scale; + font_height = font->emSize * unit_scale; if (graphics->unit != UnitDisplay) font_height /= graphics->scale; } diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 5219823..5ee5002 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -3530,6 +3530,7 @@ static void test_GdipMeasureString(void) expectf(0.0, bounds.X); expectf(0.0, bounds.Y); +todo_wine expectf_(height, bounds.Height, height / 100.0); expectf_(bounds.Height / base_cy, bounds.Width / base_cx, 0.1); expect(7, chars); @@ -3546,6 +3547,7 @@ static void test_GdipMeasureString(void) expect(Ok, status); expectf(50.0, bounds.X); expectf(50.0, bounds.Y); +todo_wine expectf_(height, bounds.Height, height / 100.0); expectf_(bounds.Height / base_cy, bounds.Width / base_cx, 0.1); expect(7, chars); @@ -3613,6 +3615,7 @@ static void test_GdipMeasureString(void) expectf(0.0, bounds.X); expectf(0.0, bounds.Y); +todo_wine expectf_(height, bounds.Height, height / 85.0); expectf_(bounds.Height / base_cy, bounds.Width / base_cx, 0.1); expect(7, chars); @@ -3629,6 +3632,7 @@ static void test_GdipMeasureString(void) expect(Ok, status); expectf(50.0, bounds.X); expectf(50.0, bounds.Y); +todo_wine expectf_(height, bounds.Height, height / 85.0); expectf_(bounds.Height / base_cy, bounds.Width / base_cx, 0.1); expect(7, chars); @@ -3640,6 +3644,7 @@ static void test_GdipMeasureString(void) height *= td[i].page_scale; /*trace("%u: unit %u, %.1fx%.1f dpi, scale %.1f, height %f, pixels %f\n", i, td[i].unit, td[i].res_x, td[i].res_y, td[i].page_scale, bounds.Height, height);*/ +todo_wine expectf_(100.0, height, 1.1); status = GdipDeleteGraphics(graphics); @@ -3833,12 +3838,14 @@ static void test_font_height_scaling(void) status = GdipTransformPoints(graphics, CoordinateSpaceDevice, CoordinateSpaceWorld, &ptf, 1); expect(Ok, status); match = fabs(100.0 - ptf.Y) <= 1.0; +todo_wine ok(match, "Expected 100.0, got %f\n", ptf.Y); /* verify the result */ ptf.Y = units_to_pixels(bounds.Height, gfx_unit, dpi); ptf.Y /= 100.0; match = fabs(100.0 - ptf.Y) <= 1.0; +todo_wine ok(match, "Expected 100.0, got %f\n", ptf.Y); /* bounds.width of 1 glyph: [margin]+[width]+[margin] */ @@ -3874,6 +3881,7 @@ static void test_font_height_scaling(void) match = fabs(1.0 - margin / rect.X) <= 0.05; ok(match, "Expected %f, got %f\n", margin, rect.X); match = fabs(1.0 - height / rect.Height) <= 0.1; +todo_wine ok(match, "Expected %f, got %f\n", height, rect.Height); match = fabs(1.0 - bounds.Width / (rect.Width + margin * 2.0)) <= 0.05; ok(match, "Expected %f, got %f\n", bounds.Width, rect.Width + margin * 2.0);

1 0

Henri Verbeet : d3d10: Handle rasterizer state in d3d10_effect_object_apply ().
by Alexandre Julliard 08 Oct '12

08 Oct '12

Module: wine Branch: master Commit: 16c6e4e332d13a53c2dae0f2cc11922e0c728862 URL: http://source.winehq.org/git/wine.git/?a=commit;h=16c6e4e332d13a53c2dae0f2c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 4 23:42:14 2012 +0200 d3d10: Handle rasterizer state in d3d10_effect_object_apply(). --- dlls/d3d10/d3d10_private.h | 1 + dlls/d3d10/effect.c | 18 +++++++++++++++++- 2 files changed, 18 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index 686ff68..314faf8 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -74,6 +74,7 @@ struct d3d10_effect_object enum d3d10_effect_object_type type; union { + ID3D10RasterizerState *rs; ID3D10VertexShader *vs; ID3D10PixelShader *ps; ID3D10GeometryShader *gs; diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 1dbc634..662bfce 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -1339,6 +1339,14 @@ static HRESULT parse_fx10_object(struct d3d10_effect_object *o, const char **ptr switch (o->type) { + case D3D10_EOT_RASTERIZER_STATE: + { + ID3D10EffectRasterizerVariable *rv = variable->lpVtbl->AsRasterizer(variable); + if (FAILED(hr = rv->lpVtbl->GetRasterizerState(rv, variable_idx, &o->object.rs))) + return hr; + break; + } + case D3D10_EOT_VERTEXSHADER: { ID3D10EffectShaderVariable *sv = variable->lpVtbl->AsShader(variable); @@ -1369,7 +1377,6 @@ static HRESULT parse_fx10_object(struct d3d10_effect_object *o, const char **ptr break; } - case D3D10_EOT_RASTERIZER_STATE: case D3D10_EOT_DEPTH_STENCIL_STATE: case D3D10_EOT_BLEND_STATE: case D3D10_EOT_STENCIL_REF: @@ -2159,6 +2166,10 @@ static HRESULT d3d10_effect_object_apply(struct d3d10_effect_object *o) switch(o->type) { + case D3D10_EOT_RASTERIZER_STATE: + ID3D10Device_RSSetState(device, o->object.rs); + return S_OK; + case D3D10_EOT_VERTEXSHADER: ID3D10Device_VSSetShader(device, o->object.vs); return S_OK; @@ -2258,6 +2269,11 @@ static void d3d10_effect_object_destroy(struct d3d10_effect_object *o) { switch (o->type) { + case D3D10_EOT_RASTERIZER_STATE: + if (o->object.rs) + ID3D10RasterizerState_Release(o->object.rs); + break; + case D3D10_EOT_VERTEXSHADER: if (o->object.vs) ID3D10VertexShader_Release(o->object.vs);

1 0

Henri Verbeet : d3d10: Handle depth stencil state in d3d10_effect_object_apply().
by Alexandre Julliard 08 Oct '12

08 Oct '12

Module: wine Branch: master Commit: b2228834c7b8ddc5a43ed95deb39e0a0ede36ab5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2228834c7b8ddc5a43ed95de… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 4 23:42:15 2012 +0200 d3d10: Handle depth stencil state in d3d10_effect_object_apply(). --- dlls/d3d10/d3d10_private.h | 1 + dlls/d3d10/effect.c | 21 ++++++++++++++++++++- 2 files changed, 21 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index 314faf8..fc9cb41 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -75,6 +75,7 @@ struct d3d10_effect_object union { ID3D10RasterizerState *rs; + ID3D10DepthStencilState *ds; ID3D10VertexShader *vs; ID3D10PixelShader *ps; ID3D10GeometryShader *gs; diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 662bfce..4b26562 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -1347,6 +1347,14 @@ static HRESULT parse_fx10_object(struct d3d10_effect_object *o, const char **ptr break; } + case D3D10_EOT_DEPTH_STENCIL_STATE: + { + ID3D10EffectDepthStencilVariable *dv = variable->lpVtbl->AsDepthStencil(variable); + if (FAILED(hr = dv->lpVtbl->GetDepthStencilState(dv, variable_idx, &o->object.ds))) + return hr; + break; + } + case D3D10_EOT_VERTEXSHADER: { ID3D10EffectShaderVariable *sv = variable->lpVtbl->AsShader(variable); @@ -1377,7 +1385,6 @@ static HRESULT parse_fx10_object(struct d3d10_effect_object *o, const char **ptr break; } - case D3D10_EOT_DEPTH_STENCIL_STATE: case D3D10_EOT_BLEND_STATE: case D3D10_EOT_STENCIL_REF: case D3D10_EOT_BLEND_FACTOR: @@ -2170,6 +2177,10 @@ static HRESULT d3d10_effect_object_apply(struct d3d10_effect_object *o) ID3D10Device_RSSetState(device, o->object.rs); return S_OK; + case D3D10_EOT_DEPTH_STENCIL_STATE: + ID3D10Device_OMSetDepthStencilState(device, o->object.ds, o->pass->stencil_ref); + return S_OK; + case D3D10_EOT_VERTEXSHADER: ID3D10Device_VSSetShader(device, o->object.vs); return S_OK; @@ -2182,6 +2193,9 @@ static HRESULT d3d10_effect_object_apply(struct d3d10_effect_object *o) ID3D10Device_GSSetShader(device, o->object.gs); return S_OK; + case D3D10_EOT_STENCIL_REF: + return S_OK; + default: FIXME("Unhandled effect object type %#x.\n", o->type); return E_FAIL; @@ -2274,6 +2288,11 @@ static void d3d10_effect_object_destroy(struct d3d10_effect_object *o) ID3D10RasterizerState_Release(o->object.rs); break; + case D3D10_EOT_DEPTH_STENCIL_STATE: + if (o->object.ds) + ID3D10DepthStencilState_Release(o->object.ds); + break; + case D3D10_EOT_VERTEXSHADER: if (o->object.vs) ID3D10VertexShader_Release(o->object.vs);

1 0

Henri Verbeet : wined3d: wined3d_stateblock_capture() never fails.
by Alexandre Julliard 08 Oct '12

08 Oct '12

Module: wine Branch: master Commit: b69545c7da86e98ef1191e9a9fdaa5712d13ba8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b69545c7da86e98ef1191e9a9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 4 23:42:16 2012 +0200 wined3d: wined3d_stateblock_capture() never fails. --- dlls/d3d8/device.c | 5 ++--- dlls/d3d9/stateblock.c | 5 ++--- dlls/ddraw/ddraw.c | 9 +-------- dlls/ddraw/device.c | 5 ++--- dlls/wined3d/stateblock.c | 4 +--- include/wine/wined3d.h | 2 +- 6 files changed, 9 insertions(+), 21 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 6b33684..a8af52e 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1557,7 +1557,6 @@ static HRESULT WINAPI d3d8_device_CaptureStateBlock(IDirect3DDevice8 *iface, DWO { struct d3d8_device *device = impl_from_IDirect3DDevice8(iface); struct wined3d_stateblock *stateblock; - HRESULT hr; TRACE("iface %p, token %#x.\n", iface, token); @@ -1569,10 +1568,10 @@ static HRESULT WINAPI d3d8_device_CaptureStateBlock(IDirect3DDevice8 *iface, DWO wined3d_mutex_unlock(); return D3DERR_INVALIDCALL; } - hr = wined3d_stateblock_capture(stateblock); + wined3d_stateblock_capture(stateblock); wined3d_mutex_unlock(); - return hr; + return D3D_OK; } static HRESULT WINAPI d3d8_device_DeleteStateBlock(IDirect3DDevice8 *iface, DWORD token) diff --git a/dlls/d3d9/stateblock.c b/dlls/d3d9/stateblock.c index 8ec8db9..4af2247 100644 --- a/dlls/d3d9/stateblock.c +++ b/dlls/d3d9/stateblock.c @@ -95,15 +95,14 @@ static HRESULT WINAPI d3d9_stateblock_GetDevice(IDirect3DStateBlock9 *iface, IDi static HRESULT WINAPI d3d9_stateblock_Capture(IDirect3DStateBlock9 *iface) { struct d3d9_stateblock *stateblock = impl_from_IDirect3DStateBlock9(iface); - HRESULT hr; TRACE("iface %p.\n", iface); wined3d_mutex_lock(); - hr = wined3d_stateblock_capture(stateblock->wined3d_stateblock); + wined3d_stateblock_capture(stateblock->wined3d_stateblock); wined3d_mutex_unlock(); - return hr; + return D3D_OK; } static HRESULT WINAPI d3d9_stateblock_Apply(IDirect3DStateBlock9 *iface) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index e7d9302..c2a7be1 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -924,14 +924,7 @@ static HRESULT WINAPI ddraw7_SetCooperativeLevel(IDirectDraw7 *iface, HWND hwnd, return hr; } - if (FAILED(hr = wined3d_stateblock_capture(stateblock))) - { - ERR("Failed to capture stateblock, hr %#x.\n", hr); - wined3d_stateblock_decref(stateblock); - wined3d_mutex_unlock(); - return hr; - } - + wined3d_stateblock_capture(stateblock); rt = wined3d_device_get_render_target(This->wined3d_device, 0); if (rt == This->wined3d_frontbuffer) rt = NULL; diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 3e86c35..a0b6781 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -5436,7 +5436,6 @@ static HRESULT d3d_device7_CaptureStateBlock(IDirect3DDevice7 *iface, DWORD stat { struct d3d_device *device = impl_from_IDirect3DDevice7(iface); struct wined3d_stateblock *wined3d_sb; - HRESULT hr; TRACE("iface %p, stateblock %#x.\n", iface, stateblock); @@ -5449,10 +5448,10 @@ static HRESULT d3d_device7_CaptureStateBlock(IDirect3DDevice7 *iface, DWORD stat return D3DERR_INVALIDSTATEBLOCK; } - hr = wined3d_stateblock_capture(wined3d_sb); + wined3d_stateblock_capture(wined3d_sb); wined3d_mutex_unlock(); - return hr_ddraw_from_wined3d(hr); + return D3D_OK; } static HRESULT WINAPI d3d_device7_CaptureStateBlock_FPUSetup(IDirect3DDevice7 *iface, DWORD stateblock) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index e357095..a2524f1 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -611,7 +611,7 @@ static void wined3d_state_record_lights(struct wined3d_state *dst_state, const s } } -HRESULT CDECL wined3d_stateblock_capture(struct wined3d_stateblock *stateblock) +void CDECL wined3d_stateblock_capture(struct wined3d_stateblock *stateblock) { const struct wined3d_state *src_state = &stateblock->device->stateBlock->state; unsigned int i; @@ -897,8 +897,6 @@ HRESULT CDECL wined3d_stateblock_capture(struct wined3d_stateblock *stateblock) wined3d_state_record_lights(&stateblock->state, src_state); TRACE("Capture done.\n"); - - return WINED3D_OK; } static void apply_lights(struct wined3d_device *device, const struct wined3d_state *state) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 521b2b3..bb44969 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2305,7 +2305,7 @@ HRESULT __cdecl wined3d_shader_set_local_constants_float(struct wined3d_shader * UINT start_idx, const float *src_data, UINT vector4f_count); HRESULT __cdecl wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock); -HRESULT __cdecl wined3d_stateblock_capture(struct wined3d_stateblock *stateblock); +void __cdecl wined3d_stateblock_capture(struct wined3d_stateblock *stateblock); HRESULT __cdecl wined3d_stateblock_create(struct wined3d_device *device, enum wined3d_stateblock_type type, struct wined3d_stateblock **stateblock); ULONG __cdecl wined3d_stateblock_decref(struct wined3d_stateblock *stateblock);

1 0

Henri Verbeet : wined3d: wined3d_stateblock_apply() never fails.
by Alexandre Julliard 08 Oct '12

08 Oct '12

Module: wine Branch: master Commit: 8e24dbb60a95b731013044d6e084272b642e9e0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e24dbb60a95b731013044d6e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 4 23:42:17 2012 +0200 wined3d: wined3d_stateblock_apply() never fails. --- dlls/d3d8/device.c | 5 ++--- dlls/d3d9/stateblock.c | 5 ++--- dlls/ddraw/ddraw.c | 8 +------- dlls/ddraw/device.c | 5 ++--- dlls/wined3d/stateblock.c | 4 +--- include/wine/wined3d.h | 2 +- 6 files changed, 9 insertions(+), 20 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index a8af52e..a7d5267 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1532,7 +1532,6 @@ static HRESULT WINAPI d3d8_device_ApplyStateBlock(IDirect3DDevice8 *iface, DWORD { struct d3d8_device *device = impl_from_IDirect3DDevice8(iface); struct wined3d_stateblock *stateblock; - HRESULT hr; TRACE("iface %p, token %#x.\n", iface, token); @@ -1547,10 +1546,10 @@ static HRESULT WINAPI d3d8_device_ApplyStateBlock(IDirect3DDevice8 *iface, DWORD wined3d_mutex_unlock(); return D3DERR_INVALIDCALL; } - hr = wined3d_stateblock_apply(stateblock); + wined3d_stateblock_apply(stateblock); wined3d_mutex_unlock(); - return hr; + return D3D_OK; } static HRESULT WINAPI d3d8_device_CaptureStateBlock(IDirect3DDevice8 *iface, DWORD token) diff --git a/dlls/d3d9/stateblock.c b/dlls/d3d9/stateblock.c index 4af2247..5eea835 100644 --- a/dlls/d3d9/stateblock.c +++ b/dlls/d3d9/stateblock.c @@ -108,15 +108,14 @@ static HRESULT WINAPI d3d9_stateblock_Capture(IDirect3DStateBlock9 *iface) static HRESULT WINAPI d3d9_stateblock_Apply(IDirect3DStateBlock9 *iface) { struct d3d9_stateblock *stateblock = impl_from_IDirect3DStateBlock9(iface); - HRESULT hr; TRACE("iface %p.\n", iface); wined3d_mutex_lock(); - hr = wined3d_stateblock_apply(stateblock->wined3d_stateblock); + wined3d_stateblock_apply(stateblock->wined3d_stateblock); wined3d_mutex_unlock(); - return hr; + return D3D_OK; } diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index c2a7be1..f34888d 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -955,14 +955,8 @@ static HRESULT WINAPI ddraw7_SetCooperativeLevel(IDirectDraw7 *iface, HWND hwnd, wined3d_surface_decref(rt); } - hr = wined3d_stateblock_apply(stateblock); + wined3d_stateblock_apply(stateblock); wined3d_stateblock_decref(stateblock); - if (FAILED(hr)) - { - ERR("Failed to apply stateblock, hr %#x.\n", hr); - wined3d_mutex_unlock(); - return hr; - } } /* Unhandled flags */ diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index a0b6781..ba7d011 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -5380,7 +5380,6 @@ static HRESULT d3d_device7_ApplyStateBlock(IDirect3DDevice7 *iface, DWORD stateb { struct d3d_device *device = impl_from_IDirect3DDevice7(iface); struct wined3d_stateblock *wined3d_sb; - HRESULT hr; TRACE("iface %p, stateblock %#x.\n", iface, stateblock); @@ -5393,10 +5392,10 @@ static HRESULT d3d_device7_ApplyStateBlock(IDirect3DDevice7 *iface, DWORD stateb return D3DERR_INVALIDSTATEBLOCK; } - hr = wined3d_stateblock_apply(wined3d_sb); + wined3d_stateblock_apply(wined3d_sb); wined3d_mutex_unlock(); - return hr_ddraw_from_wined3d(hr); + return D3D_OK; } static HRESULT WINAPI d3d_device7_ApplyStateBlock_FPUSetup(IDirect3DDevice7 *iface, DWORD stateblock) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index a2524f1..c399bad 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -917,7 +917,7 @@ static void apply_lights(struct wined3d_device *device, const struct wined3d_sta } } -HRESULT CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock) +void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock) { struct wined3d_device *device = stateblock->device; unsigned int i; @@ -1072,8 +1072,6 @@ HRESULT CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblo } TRACE("Applied stateblock %p.\n", stateblock); - - return WINED3D_OK; } void stateblock_init_default_state(struct wined3d_stateblock *stateblock) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index bb44969..42b21e6 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2304,7 +2304,7 @@ ULONG __cdecl wined3d_shader_incref(struct wined3d_shader *shader); HRESULT __cdecl wined3d_shader_set_local_constants_float(struct wined3d_shader *shader, UINT start_idx, const float *src_data, UINT vector4f_count); -HRESULT __cdecl wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock); +void __cdecl wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock); void __cdecl wined3d_stateblock_capture(struct wined3d_stateblock *stateblock); HRESULT __cdecl wined3d_stateblock_create(struct wined3d_device *device, enum wined3d_stateblock_type type, struct wined3d_stateblock **stateblock);

1 0

Henri Verbeet : wined3d: Implement WINED3DSIH_AND in the GLSL shader backend.
by Alexandre Julliard 08 Oct '12

08 Oct '12

Module: wine Branch: master Commit: 09315227952f9e1ca56a2c8bd4bab24db37dcb12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09315227952f9e1ca56a2c8bd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 4 23:42:18 2012 +0200 wined3d: Implement WINED3DSIH_AND in the GLSL shader backend. --- dlls/wined3d/glsl_shader.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index bc262ec..e2d2bb9 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2184,8 +2184,7 @@ static void PRINTF_ATTR(8, 9) shader_glsl_gen_sample_code(const struct wined3d_s * Begin processing individual instruction opcodes ****************************************************************************/ -/* Generate GLSL arithmetic functions (dst = src1 + src2) */ -static void shader_glsl_arith(const struct wined3d_shader_instruction *ins) +static void shader_glsl_binop(const struct wined3d_shader_instruction *ins) { struct wined3d_shader_buffer *buffer = ins->ctx->buffer; struct glsl_src_param src0_param; @@ -2196,8 +2195,9 @@ static void shader_glsl_arith(const struct wined3d_shader_instruction *ins) /* Determine the GLSL operator to use based on the opcode */ switch (ins->handler_idx) { - case WINED3DSIH_MUL: op = '*'; break; case WINED3DSIH_ADD: op = '+'; break; + case WINED3DSIH_AND: op = '&'; break; + case WINED3DSIH_MUL: op = '*'; break; case WINED3DSIH_SUB: op = '-'; break; default: op = ' '; @@ -5126,8 +5126,8 @@ static BOOL shader_glsl_color_fixup_supported(struct color_fixup_desc fixup) static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TABLE_SIZE] = { /* WINED3DSIH_ABS */ shader_glsl_map2gl, - /* WINED3DSIH_ADD */ shader_glsl_arith, - /* WINED3DSIH_AND */ NULL, + /* WINED3DSIH_ADD */ shader_glsl_binop, + /* WINED3DSIH_AND */ shader_glsl_binop, /* WINED3DSIH_BEM */ shader_glsl_bem, /* WINED3DSIH_BREAK */ shader_glsl_break, /* WINED3DSIH_BREAKC */ shader_glsl_breakc, @@ -5190,7 +5190,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_MOV */ shader_glsl_mov, /* WINED3DSIH_MOVA */ shader_glsl_mov, /* WINED3DSIH_MOVC */ NULL, - /* WINED3DSIH_MUL */ shader_glsl_arith, + /* WINED3DSIH_MUL */ shader_glsl_binop, /* WINED3DSIH_NOP */ shader_glsl_nop, /* WINED3DSIH_NRM */ shader_glsl_nrm, /* WINED3DSIH_PHASE */ shader_glsl_nop, @@ -5209,7 +5209,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_SINCOS */ shader_glsl_sincos, /* WINED3DSIH_SLT */ shader_glsl_compare, /* WINED3DSIH_SQRT */ NULL, - /* WINED3DSIH_SUB */ shader_glsl_arith, + /* WINED3DSIH_SUB */ shader_glsl_binop, /* WINED3DSIH_TEX */ shader_glsl_tex, /* WINED3DSIH_TEXBEM */ shader_glsl_texbem, /* WINED3DSIH_TEXBEML */ shader_glsl_texbem,

1 0