wine-commits December 2011

wine-commits@winehq.org

2 participants
810 discussions

Huw Davies : gdi32: Add support for geometric solid pens.
by Alexandre Julliard 22 Dec '11

22 Dec '11

Module: wine Branch: master Commit: 7c2351566ae7558b901e7dfc65840df29f94e756 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c2351566ae7558b901e7dfc6… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Dec 22 13:00:43 2011 +0000 gdi32: Add support for geometric solid pens. --- dlls/gdi32/dibdrv/objects.c | 173 ++++++++++++++++++++++++++++++++++++++----- 1 files changed, 155 insertions(+), 18 deletions(-) diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index f8a9f7d..281642a 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -999,18 +999,27 @@ static BOOL null_pen_lines(dibdrv_physdev *pdev, int num, POINT *pts, BOOL close return TRUE; } +struct face +{ + POINT start, end; + int dx, dy; +}; + static void add_cap( dibdrv_physdev *pdev, HRGN region, const POINT *pt ) { HRGN cap; switch (pdev->pen_endcap) { + default: FIXME( "Unknown end cap %x\n", pdev->pen_endcap ); + /* fall through */ case PS_ENDCAP_ROUND: cap = CreateEllipticRgn( pt->x - pdev->pen_width / 2, pt->y - pdev->pen_width / 2, pt->x + (pdev->pen_width + 1) / 2, pt->y + (pdev->pen_width + 1) / 2 ); break; - default: /* only supporting cosmetic pens so far, so always PS_ENDCAP_ROUND */ + case PS_ENDCAP_SQUARE: /* already been handled */ + case PS_ENDCAP_FLAT: return; } @@ -1019,19 +1028,92 @@ static void add_cap( dibdrv_physdev *pdev, HRGN region, const POINT *pt ) return; } -static void add_join( dibdrv_physdev *pdev, HRGN region, const POINT *pt ) +#define round( f ) (((f) > 0) ? (f) + 0.5 : (f) - 0.5) + +/******************************************************************************* + * create_miter_region + * + * We need to calculate the intersection of two lines. We know a point + * on each line (a face start and the other face end point) and + * the direction vector of each line eg. (dx_1, dy_1). + * + * (x, y) = (x_1, y_1) + u * (dx_1, dy_1) = (x_2, y_2) + v * (dx_2, dy_2) + * solving (eg using Cramer's rule) gives: + * u = ((x_2 - x_1) dy_2 - (y_2 - y_1) dx_2) / det + * with det = dx_1 dy_2 - dx_2 dy_1 + * substituting back in and simplifying gives + * (x, y) = a (dx_1, dy_1) - b (dx_2, dy_2) + * with a = (x_2 dy_2 - y_2 dx_2) / det + * and b = (x_1 dy_1 - y_1 dx_1) / det + */ +static HRGN create_miter_region( dibdrv_physdev *pdev, const POINT *pt, + const struct face *face_1, const struct face *face_2 ) +{ + int det = face_1->dx * face_2->dy - face_1->dy * face_2->dx; + POINT pt_1, pt_2, pts[5]; + double a, b, x, y; + FLOAT limit; + + if (det == 0) return 0; + + if (det < 0) + { + const struct face *tmp = face_1; + face_1 = face_2; + face_2 = tmp; + det = -det; + } + + pt_1 = face_1->start; + pt_2 = face_2->end; + + a = (double)((pt_2.x * face_2->dy - pt_2.y * face_2->dx)) / det; + b = (double)((pt_1.x * face_1->dy - pt_1.y * face_1->dx)) / det; + + x = a * face_1->dx - b * face_2->dx; + y = a * face_1->dy - b * face_2->dy; + + GetMiterLimit( pdev->dev.hdc, &limit ); + + if (((x - pt->x) * (x - pt->x) + (y - pt->y) * (y - pt->y)) * 4 > limit * limit * pdev->pen_width * pdev->pen_width) + return 0; + + pts[0] = face_2->start; + pts[1] = face_1->start; + pts[2].x = round( x ); + pts[2].y = round( y ); + pts[3] = face_2->end; + pts[4] = face_1->end; + + return CreatePolygonRgn( pts, 5, ALTERNATE ); +} + +static void add_join( dibdrv_physdev *pdev, HRGN region, const POINT *pt, + const struct face *face_1, const struct face *face_2 ) { HRGN join; + POINT pts[4]; switch (pdev->pen_join) { + default: FIXME( "Unknown line join %x\n", pdev->pen_join ); + /* fall through */ case PS_JOIN_ROUND: join = CreateEllipticRgn( pt->x - pdev->pen_width / 2, pt->y - pdev->pen_width / 2, pt->x + (pdev->pen_width + 1) / 2, pt->y + (pdev->pen_width + 1) / 2 ); break; - default: /* only supporting cosmetic pens so far, so always PS_JOIN_ROUND */ - return; + case PS_JOIN_MITER: + join = create_miter_region( pdev, pt, face_1, face_2 ); + if (join) break; + /* fall through */ + case PS_JOIN_BEVEL: + pts[0] = face_1->start; + pts[1] = face_2->end; + pts[2] = face_1->end; + pts[3] = face_2->start; + join = CreatePolygonRgn( pts, 4, ALTERNATE ); + break; } CombineRgn( region, region, join, RGN_OR ); @@ -1039,8 +1121,6 @@ static void add_join( dibdrv_physdev *pdev, HRGN region, const POINT *pt ) return; } -#define round( f ) (((f) > 0) ? (f) + 0.5 : (f) - 0.5) - static HRGN get_wide_lines_region( dibdrv_physdev *pdev, int num, POINT *pts, BOOL close ) { int i; @@ -1058,6 +1138,11 @@ static HRGN get_wide_lines_region( dibdrv_physdev *pdev, int num, POINT *pts, BO int dx = pt_2->x - pt_1->x; int dy = pt_2->y - pt_1->y; RECT rect; + struct face face_1, face_2, prev_face, first_face; + BOOL need_cap_1 = !close && (i == 0); + BOOL need_cap_2 = !close && (i == num - 1); + BOOL sq_cap_1 = need_cap_1 && (pdev->pen_endcap == PS_ENDCAP_SQUARE); + BOOL sq_cap_2 = need_cap_2 && (pdev->pen_endcap == PS_ENDCAP_SQUARE); if (dx == 0 && dy == 0) continue; @@ -1067,7 +1152,23 @@ static HRGN get_wide_lines_region( dibdrv_physdev *pdev, int num, POINT *pts, BO rect.right = rect.left + abs( dx ); rect.top = pt_1->y - pdev->pen_width / 2; rect.bottom = rect.top + pdev->pen_width; + if ((sq_cap_1 && dx > 0) || (sq_cap_2 && dx < 0)) rect.left -= pdev->pen_width / 2; + if ((sq_cap_2 && dx > 0) || (sq_cap_1 && dx < 0)) rect.right += pdev->pen_width / 2; segment = CreateRectRgnIndirect( &rect ); + if (dx > 0) + { + face_1.start.x = face_1.end.x = rect.left; + face_1.start.y = face_2.end.y = rect.bottom; + face_1.end.y = face_2.start.y = rect.top; + face_2.start.x = face_2.end.x = rect.right - 1; + } + else + { + face_1.start.x = face_1.end.x = rect.right; + face_1.start.y = face_2.end.y = rect.top; + face_1.end.y = face_2.start.y = rect.bottom; + face_2.start.x = face_2.end.x = rect.left + 1; + } } else if (dx == 0) { @@ -1075,7 +1176,23 @@ static HRGN get_wide_lines_region( dibdrv_physdev *pdev, int num, POINT *pts, BO rect.bottom = rect.top + abs( dy ); rect.left = pt_1->x - pdev->pen_width / 2; rect.right = rect.left + pdev->pen_width; + if ((sq_cap_1 && dy > 0) || (sq_cap_2 && dy < 0)) rect.top -= pdev->pen_width / 2; + if ((sq_cap_2 && dy > 0) || (sq_cap_1 && dy < 0)) rect.bottom += pdev->pen_width / 2; segment = CreateRectRgnIndirect( &rect ); + if (dy > 0) + { + face_1.start.x = face_2.end.x = rect.left; + face_1.start.y = face_1.end.y = rect.top; + face_1.end.x = face_2.start.x = rect.right; + face_2.start.y = face_2.end.y = rect.bottom - 1; + } + else + { + face_1.start.x = face_2.end.x = rect.right; + face_1.start.y = face_1.end.y = rect.bottom; + face_1.end.x = face_2.start.x = rect.left; + face_2.start.y = face_2.end.y = rect.top + 1; + } } else { @@ -1114,25 +1231,46 @@ static HRGN get_wide_lines_region( dibdrv_physdev *pdev, int num, POINT *pts, BO seg_pts[3].x = pt_2->x - narrow_half.x; seg_pts[3].y = pt_2->y + narrow_half.y; + if (sq_cap_1) + { + seg_pts[0].x -= narrow_half.y; + seg_pts[1].x -= narrow_half.y; + seg_pts[0].y -= narrow_half.x; + seg_pts[1].y -= narrow_half.x; + } + + if (sq_cap_2) + { + seg_pts[2].x += wide_half.y; + seg_pts[3].x += wide_half.y; + seg_pts[2].y += wide_half.x; + seg_pts[3].y += wide_half.x; + } + segment = CreatePolygonRgn( seg_pts, 4, ALTERNATE ); + + face_1.start = seg_pts[0]; + face_1.end = seg_pts[1]; + face_2.start = seg_pts[2]; + face_2.end = seg_pts[3]; } CombineRgn( total, total, segment, RGN_OR ); DeleteObject( segment ); - if (i == 0) - { - if (!close) add_cap( pdev, total, pt_1 ); - } - else - add_join( pdev, total, pt_1 ); + if (need_cap_1) add_cap( pdev, total, pt_1 ); + if (need_cap_2) add_cap( pdev, total, pt_2 ); - if (i == num - 1) - { - if (close) add_join( pdev, total, pt_2 ); - else add_cap( pdev, total, pt_2 ); - } + face_1.dx = face_2.dx = dx; + face_1.dy = face_2.dy = dy; + if (i == 0) first_face = face_1; + else add_join( pdev, total, pt_1, &prev_face, &face_1 ); + + if (i == num - 1 && close) + add_join( pdev, total, pt_2, &face_2, &first_face ); + + prev_face = face_2; } return total; } @@ -1235,7 +1373,6 @@ HPEN dibdrv_SelectPen( PHYSDEV dev, HPEN hpen ) switch(style) { case PS_SOLID: - if(logpen.lopnStyle & PS_GEOMETRIC) break; if(pdev->pen_width <= 1) pdev->pen_lines = solid_pen_lines; else

1 0

Rico Schüller : d3dx9/tests: Add effect parameter value GetVectorArray() test.
by Alexandre Julliard 22 Dec '11

22 Dec '11

Module: wine Branch: master Commit: 0c1574bd5e49b771321dda9ff1a933705f5bacf7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c1574bd5e49b771321dda9ff… Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Dec 22 12:16:19 2011 +0100 d3dx9/tests: Add effect parameter value GetVectorArray() test. --- dlls/d3dx9_36/tests/effect.c | 62 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 62 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index 36ec9ca..8cf01de 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -859,6 +859,67 @@ static void test_effect_parameter_value_GetVector(const struct test_effect_param } } +static void test_effect_parameter_value_GetVectorArray(const struct test_effect_parameter_value_result *res, + ID3DXEffect *effect, const DWORD *res_value, D3DXHANDLE parameter, UINT i) +{ + const D3DXPARAMETER_DESC *res_desc = &res->desc; + LPCSTR res_full_name = res->full_name; + HRESULT hr; + DWORD cmp = 0xabababab; + FLOAT fvalue[EFFECT_PARAMETER_VALUE_ARRAY_SIZE]; + UINT l, k; + + memset(fvalue, 0xab, sizeof(fvalue)); + hr = effect->lpVtbl->GetVectorArray(effect, parameter, (D3DXVECTOR4 *)&fvalue, res_desc->Elements); + if (!res_desc->Elements) + { + ok(hr == D3D_OK, "%u - %s: GetVectorArray failed, got %#x, expected %#x\n", i, res_full_name, hr, D3D_OK); + + for (l = 0; l < EFFECT_PARAMETER_VALUE_ARRAY_SIZE; ++l) + { + ok(fvalue[l] == *(FLOAT *)&cmp, "%u - %s: GetVectorArray fvalue[%u] failed, got %f, expected %f\n", + i, res_full_name, l, fvalue[l], *(FLOAT *)&cmp); + } + } + else if (res_desc->Elements && res_desc->Class == D3DXPC_VECTOR) + { + ok(hr == D3D_OK, "%u - %s: GetVectorArray failed, got %#x, expected %#x\n", i, res_full_name, hr, D3D_OK); + + for (k = 0; k < res_desc->Elements; ++k) + { + for (l = 0; l < res_desc->Columns; ++l) + { + ok(compare_float(fvalue[l + k * 4], get_float(res_desc->Type, &res_value[ l + k * res_desc->Columns]), 512), + "%u - %s: GetVectorArray fvalue[%u] failed, got %f, expected %f\n", + i, res_full_name, l + k * 4, fvalue[ l + k * 4], get_float(res_desc->Type, &res_value[ l + k * res_desc->Columns])); + } + + for (l = res_desc->Columns; l < 4; ++l) + { + ok(fvalue[ l + k * 4] == 0.0f, "%u - %s: GetVectorArray fvalue[%u] failed, got %f, expected %f\n", + i, res_full_name, l + k * 4, fvalue[ l + k * 4], 0.0f); + } + } + + for (l = res_desc->Elements * 4; l < EFFECT_PARAMETER_VALUE_ARRAY_SIZE; ++l) + { + ok(fvalue[l] == *(FLOAT *)&cmp, "%u - %s: GetVectorArray fvalue[%u] failed, got %f, expected %f\n", + i, res_full_name, l, fvalue[l], *(FLOAT *)&cmp); + } + } + else + { + ok(hr == D3DERR_INVALIDCALL, "%u - %s: GetVectorArray failed, got %#x, expected %#x\n", + i, res_full_name, hr, D3DERR_INVALIDCALL); + + for (l = 0; l < EFFECT_PARAMETER_VALUE_ARRAY_SIZE; ++l) + { + ok(fvalue[l] == *(FLOAT *)&cmp, "%u - %s: GetVectorArray fvalue[%u] failed, got %f, expected %f\n", + i, res_full_name, l, fvalue[l], *(FLOAT *)&cmp); + } + } +} + static void test_effect_parameter_value(IDirect3DDevice9 *device) { UINT i; @@ -936,6 +997,7 @@ static void test_effect_parameter_value(IDirect3DDevice9 *device) test_effect_parameter_value_GetFloat(&res[k], effect, &blob[res_value_offset], parameter, i); test_effect_parameter_value_GetFloatArray(&res[k], effect, &blob[res_value_offset], parameter, i); test_effect_parameter_value_GetVector(&res[k], effect, &blob[res_value_offset], parameter, i); + test_effect_parameter_value_GetVectorArray(&res[k], effect, &blob[res_value_offset], parameter, i); } count = effect->lpVtbl->Release(effect);

1 0

Rico Schüller : d3dx9/tests: Add effect parameter value GetVector() test.
by Alexandre Julliard 22 Dec '11

22 Dec '11

Module: wine Branch: master Commit: fa93df1052839fd3e0424fd15e94e113f2e605a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa93df1052839fd3e0424fd15… Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Dec 22 12:16:15 2011 +0100 d3dx9/tests: Add effect parameter value GetVector() test. --- dlls/d3dx9_36/tests/effect.c | 59 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 59 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index 37e04bd..36ec9ca 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -801,6 +801,64 @@ static void test_effect_parameter_value_GetFloatArray(const struct test_effect_p } } +static void test_effect_parameter_value_GetVector(const struct test_effect_parameter_value_result *res, + ID3DXEffect *effect, const DWORD *res_value, D3DXHANDLE parameter, UINT i) +{ + const D3DXPARAMETER_DESC *res_desc = &res->desc; + LPCSTR res_full_name = res->full_name; + HRESULT hr; + DWORD cmp = 0xabababab; + FLOAT fvalue[4]; + UINT l; + + memset(fvalue, 0xab, sizeof(fvalue)); + hr = effect->lpVtbl->GetVector(effect, parameter, (D3DXVECTOR4 *)&fvalue); + if (!res_desc->Elements && + (res_desc->Class == D3DXPC_SCALAR || res_desc->Class == D3DXPC_VECTOR) && + res_desc->Type == D3DXPT_INT && res_desc->Bytes == 4) + { + DWORD tmp; + + ok(hr == D3D_OK, "%u - %s: GetVector failed, got %#x, expected %#x\n", i, res_full_name, hr, D3D_OK); + + tmp = (DWORD)(*(fvalue + 2) * INT_FLOAT_MULTI); + tmp += ((DWORD)(*(fvalue + 1) * INT_FLOAT_MULTI)) << 8; + tmp += ((DWORD)(*fvalue * INT_FLOAT_MULTI)) << 16; + tmp += ((DWORD)(*(fvalue + 3) * INT_FLOAT_MULTI)) << 24; + + ok(*res_value == tmp, "%u - %s: GetVector ivalue failed, got %i, expected %i\n", + i, res_full_name, tmp, *res_value); + } + else if (!res_desc->Elements && (res_desc->Class == D3DXPC_SCALAR || res_desc->Class == D3DXPC_VECTOR)) + { + ok(hr == D3D_OK, "%u - %s: GetVector failed, got %#x, expected %#x\n", i, res_full_name, hr, D3D_OK); + + for (l = 0; l < res_desc->Columns; ++l) + { + ok(compare_float(fvalue[l], get_float(res_desc->Type, &res_value[l]), 512), + "%u - %s: GetVector fvalue[%u] failed, got %f, expected %f\n", + i, res_full_name, l, fvalue[l], get_float(res_desc->Type, &res_value[l])); + } + + for (l = res_desc->Columns; l < 4; ++l) + { + ok(fvalue[l] == 0.0f, "%u - %s: GetVector fvalue[%u] failed, got %f, expected %f\n", + i, res_full_name, l, fvalue[l], 0.0f); + } + } + else + { + ok(hr == D3DERR_INVALIDCALL, "%u - %s: GetVector failed, got %#x, expected %#x\n", + i, res_full_name, hr, D3DERR_INVALIDCALL); + + for (l = 0; l < 4; ++l) + { + ok(fvalue[l] == *(FLOAT *)&cmp, "%u - %s: GetVector fvalue[%u] failed, got %f, expected %f\n", + i, res_full_name, l, fvalue[l], *(FLOAT *)&cmp); + } + } +} + static void test_effect_parameter_value(IDirect3DDevice9 *device) { UINT i; @@ -877,6 +935,7 @@ static void test_effect_parameter_value(IDirect3DDevice9 *device) test_effect_parameter_value_GetIntArray(&res[k], effect, &blob[res_value_offset], parameter, i); test_effect_parameter_value_GetFloat(&res[k], effect, &blob[res_value_offset], parameter, i); test_effect_parameter_value_GetFloatArray(&res[k], effect, &blob[res_value_offset], parameter, i); + test_effect_parameter_value_GetVector(&res[k], effect, &blob[res_value_offset], parameter, i); } count = effect->lpVtbl->Release(effect);

1 0

Rico Schüller : d3dx9/tests: Add effect parameter value GetFloatArray() test.
by Alexandre Julliard 22 Dec '11

22 Dec '11

Module: wine Branch: master Commit: 828b82780d382d6f053576d1cd9bddebbf4ea33c URL: http://source.winehq.org/git/wine.git/?a=commit;h=828b82780d382d6f053576d1c… Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Dec 22 12:16:11 2011 +0100 d3dx9/tests: Add effect parameter value GetFloatArray() test. --- dlls/d3dx9_36/tests/effect.c | 45 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 45 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index c3153a0..37e04bd 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -757,6 +757,50 @@ static void test_effect_parameter_value_GetFloat(const struct test_effect_parame } } +static void test_effect_parameter_value_GetFloatArray(const struct test_effect_parameter_value_result *res, + ID3DXEffect *effect, const DWORD *res_value, D3DXHANDLE parameter, UINT i) +{ + const D3DXPARAMETER_DESC *res_desc = &res->desc; + LPCSTR res_full_name = res->full_name; + FLOAT favalue[EFFECT_PARAMETER_VALUE_ARRAY_SIZE]; + HRESULT hr; + UINT l; + DWORD cmp = 0xabababab; + + memset(favalue, 0xab, sizeof(favalue)); + hr = effect->lpVtbl->GetFloatArray(effect, parameter, favalue, res_desc->Bytes / sizeof(*favalue)); + if (res_desc->Class == D3DXPC_SCALAR + || res_desc->Class == D3DXPC_VECTOR + || res_desc->Class == D3DXPC_MATRIX_ROWS) + { + ok(hr == D3D_OK, "%u - %s: GetFloatArray failed, got %#x, expected %#x\n", i, res_full_name, hr, D3D_OK); + + for (l = 0; l < res_desc->Bytes / sizeof(*favalue); ++l) + { + ok(compare_float(favalue[l], get_float(res_desc->Type, &res_value[l]), 512), + "%u - %s: GetFloatArray favalue[%u] failed, got %f, expected %f\n", + i, res_full_name, l, favalue[l], get_float(res_desc->Type, &res_value[l])); + } + + for (l = res_desc->Bytes / sizeof(*favalue); l < EFFECT_PARAMETER_VALUE_ARRAY_SIZE; ++l) + { + ok(favalue[l] == *(FLOAT *)&cmp, "%u - %s: GetFloatArray favalue[%u] failed, got %f, expected %f\n", + i, res_full_name, l, favalue[l], *(FLOAT *)&cmp); + } + } + else + { + ok(hr == D3DERR_INVALIDCALL, "%u - %s: GetFloatArray failed, got %#x, expected %#x\n", + i, res_full_name, hr, D3DERR_INVALIDCALL); + + for (l = 0; l < EFFECT_PARAMETER_VALUE_ARRAY_SIZE; ++l) + { + ok(favalue[l] == *(FLOAT *)&cmp, "%u - %s: GetFloatArray favalue[%u] failed, got %f, expected %f\n", + i, res_full_name, l, favalue[l], *(FLOAT *)&cmp); + } + } +} + static void test_effect_parameter_value(IDirect3DDevice9 *device) { UINT i; @@ -832,6 +876,7 @@ static void test_effect_parameter_value(IDirect3DDevice9 *device) test_effect_parameter_value_GetInt(&res[k], effect, &blob[res_value_offset], parameter, i); test_effect_parameter_value_GetIntArray(&res[k], effect, &blob[res_value_offset], parameter, i); test_effect_parameter_value_GetFloat(&res[k], effect, &blob[res_value_offset], parameter, i); + test_effect_parameter_value_GetFloatArray(&res[k], effect, &blob[res_value_offset], parameter, i); } count = effect->lpVtbl->Release(effect);

1 0

Rico Schüller : d3dx9/tests: Add effect parameter value GetFloat() test.
by Alexandre Julliard 22 Dec '11

22 Dec '11

Module: wine Branch: master Commit: 47ae7db16af7d9772a129eb095dddf62b199f2f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47ae7db16af7d9772a129eb09… Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Dec 22 12:16:08 2011 +0100 d3dx9/tests: Add effect parameter value GetFloat() test. --- dlls/d3dx9_36/tests/effect.c | 70 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 70 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index 54d6a25..c3153a0 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -18,10 +18,27 @@ #define COBJMACROS #include "initguid.h" +#include <limits.h> #include "wine/test.h" #include "d3dx9.h" /* helper functions */ +static BOOL compare_float(FLOAT f, FLOAT g, UINT ulps) +{ + INT x = *(INT *)&f; + INT y = *(INT *)&g; + + if (x < 0) + x = INT_MIN - x; + if (y < 0) + y = INT_MIN - y; + + if (abs(x - y) > ulps) + return FALSE; + + return TRUE; +} + static inline INT get_int(D3DXPARAMETER_TYPE type, LPCVOID data) { INT i; @@ -49,6 +66,33 @@ static inline INT get_int(D3DXPARAMETER_TYPE type, LPCVOID data) return i; } +static inline FLOAT get_float(D3DXPARAMETER_TYPE type, LPCVOID data) +{ + FLOAT f; + + switch (type) + { + case D3DXPT_FLOAT: + f = *(FLOAT *)data; + break; + + case D3DXPT_INT: + f = *(INT *)data; + break; + + case D3DXPT_BOOL: + f = *(BOOL *)data; + break; + + default: + f = 0.0f; + ok(0, "Unhandled type %x.\n", type); + break; + } + + return f; +} + static inline BOOL get_bool(LPCVOID data) { return (*(BOOL *)data) ? TRUE : FALSE; @@ -688,6 +732,31 @@ static void test_effect_parameter_value_GetIntArray(const struct test_effect_par } } +static void test_effect_parameter_value_GetFloat(const struct test_effect_parameter_value_result *res, + ID3DXEffect *effect, const DWORD *res_value, D3DXHANDLE parameter, UINT i) +{ + const D3DXPARAMETER_DESC *res_desc = &res->desc; + LPCSTR res_full_name = res->full_name; + HRESULT hr; + DWORD cmp = 0xabababab; + FLOAT fvalue = *(FLOAT *)&cmp; + + hr = effect->lpVtbl->GetFloat(effect, parameter, &fvalue); + if (!res_desc->Elements && res_desc->Columns == 1 && res_desc->Rows == 1) + { + ok(hr == D3D_OK, "%u - %s: GetFloat failed, got %#x, expected %#x\n", i, res_full_name, hr, D3D_OK); + ok(compare_float(fvalue, get_float(res_desc->Type, res_value), 512), "%u - %s: GetFloat fvalue failed, got %f, expected %f\n", + i, res_full_name, fvalue, get_float(res_desc->Type, res_value)); + } + else + { + ok(hr == D3DERR_INVALIDCALL, "%u - %s: GetFloat failed, got %#x, expected %#x\n", + i, res_full_name, hr, D3DERR_INVALIDCALL); + ok(fvalue == *(FLOAT *)&cmp, "%u - %s: GetFloat fvalue failed, got %f, expected %f\n", + i, res_full_name, fvalue, *(FLOAT *)&cmp); + } +} + static void test_effect_parameter_value(IDirect3DDevice9 *device) { UINT i; @@ -762,6 +831,7 @@ static void test_effect_parameter_value(IDirect3DDevice9 *device) test_effect_parameter_value_GetBoolArray(&res[k], effect, &blob[res_value_offset], parameter, i); test_effect_parameter_value_GetInt(&res[k], effect, &blob[res_value_offset], parameter, i); test_effect_parameter_value_GetIntArray(&res[k], effect, &blob[res_value_offset], parameter, i); + test_effect_parameter_value_GetFloat(&res[k], effect, &blob[res_value_offset], parameter, i); } count = effect->lpVtbl->Release(effect);

1 0

Rico Schüller : d3dx9: Use a loop in get_vector().
by Alexandre Julliard 22 Dec '11

22 Dec '11

Module: wine Branch: master Commit: 9273ac028647494f206cf013ef5e08f3b99842ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=9273ac028647494f206cf013e… Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Dec 22 12:16:04 2011 +0100 d3dx9: Use a loop in get_vector(). --- dlls/d3dx9_36/effect.c | 26 ++++++++++++++------------ 1 files changed, 14 insertions(+), 12 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 01a407c..fa28ae0 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -887,14 +887,6 @@ static inline BOOL get_bool(LPCVOID data) return (*(DWORD *)data) ? TRUE : FALSE; } -static void get_vector(struct d3dx_parameter *param, D3DXVECTOR4 *vector) -{ - vector->x = get_float(param->type, (float *)param->data); - vector->y = param->columns > 1 ? get_float(param->type, (float *)param->data + 1) : 0.0f; - vector->z = param->columns > 2 ? get_float(param->type, (float *)param->data + 2) : 0.0f; - vector->w = param->columns > 3 ? get_float(param->type, (float *)param->data + 3) : 0.0f; -} - static void set_number(LPVOID outdata, D3DXPARAMETER_TYPE outtype, LPCVOID indata, D3DXPARAMETER_TYPE intype) { TRACE("Changing from type %i to type %i\n", intype, outtype); @@ -920,6 +912,16 @@ static void set_number(LPVOID outdata, D3DXPARAMETER_TYPE outtype, LPCVOID indat } } +static void get_vector(struct d3dx_parameter *param, D3DXVECTOR4 *vector) +{ + UINT i; + + for (i = 0; i < 4; ++i) + { + ((FLOAT *)vector)[i] = i < param->columns ? get_float(param->type, (DWORD *)param->data + i) : 0.0f; + } +} + static void set_vector(struct d3dx_parameter *param, CONST D3DXVECTOR4 *vector) { UINT i; @@ -932,14 +934,14 @@ static void set_vector(struct d3dx_parameter *param, CONST D3DXVECTOR4 *vector) static void get_matrix(struct d3dx_parameter *param, D3DXMATRIX *matrix) { - unsigned int i, k; + UINT i, k; for (i = 0; i < 4; ++i) { for (k = 0; k < 4; ++k) { if ((i < param->rows) && (k < param->columns)) - matrix->u.m[i][k] = get_float(param->type, (float *)param->data + i * param->columns + k); + matrix->u.m[i][k] = get_float(param->type, (FLOAT *)param->data + i * param->columns + k); else matrix->u.m[i][k] = 0.0f; } @@ -948,14 +950,14 @@ static void get_matrix(struct d3dx_parameter *param, D3DXMATRIX *matrix) static void set_matrix(struct d3dx_parameter *param, CONST D3DXMATRIX *matrix) { - unsigned int i, k; + UINT i, k; for (i = 0; i < 4; ++i) { for (k = 0; k < 4; ++k) { if ((i < param->rows) && (k < param->columns)) - set_number((float *)param->data + i * param->columns + k, param->type, &matrix->u.m[i][k], D3DXPT_FLOAT); + set_number((FLOAT *)param->data + i * param->columns + k, param->type, &matrix->u.m[i][k], D3DXPT_FLOAT); } } }

1 0

Rico Schüller : d3dx9: Simplify ID3DXBaseEffect:: SetInt().
by Alexandre Julliard 22 Dec '11

22 Dec '11

Module: wine Branch: master Commit: ed700553e03b9d4618e8d7be5719d46b6aeac4b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed700553e03b9d4618e8d7be5… Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Dec 22 12:15:53 2011 +0100 d3dx9: Simplify ID3DXBaseEffect::SetInt(). --- dlls/d3dx9_36/effect.c | 18 ++++++++---------- 1 files changed, 8 insertions(+), 10 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 75680d3..01a407c 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1,5 +1,6 @@ /* * Copyright 2010 Christian Costa + * Copyright 2011 Rico Schüller * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -1839,19 +1840,14 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_SetInt(ID3DXBaseEffect *iface, D3DXHAN ((param->class == D3DXPC_VECTOR && param->columns != 2) || (param->class == D3DXPC_MATRIX_ROWS && param->rows != 2 && param->columns == 1))) { - FLOAT tmp = ((n & 0xff0000) >> 16) * INT_FLOAT_MULTI_INVERSE; - set_number((DWORD *)param->data, param->type, &tmp, D3DXPT_FLOAT); - - tmp = ((n & 0xff00) >> 8) * INT_FLOAT_MULTI_INVERSE; - set_number((DWORD *)param->data + 1, param->type, &tmp, D3DXPT_FLOAT); - - tmp = (n & 0xff) * INT_FLOAT_MULTI_INVERSE; - set_number((DWORD *)param->data + 2, param->type, &tmp, D3DXPT_FLOAT); + TRACE("Vector fixup\n"); + *(FLOAT *)param->data = ((n & 0xff0000) >> 16) * INT_FLOAT_MULTI_INVERSE; + ((FLOAT *)param->data)[1] = ((n & 0xff00) >> 8) * INT_FLOAT_MULTI_INVERSE; + ((FLOAT *)param->data)[2] = (n & 0xff) * INT_FLOAT_MULTI_INVERSE; if (param->rows * param->columns > 3) { - tmp = ((n & 0xff000000) >> 24) * INT_FLOAT_MULTI_INVERSE; - set_number((DWORD *)param->data + 3, param->type, &tmp, D3DXPT_FLOAT); + ((FLOAT *)param->data)[3] = ((n & 0xff000000) >> 24) * INT_FLOAT_MULTI_INVERSE; } return D3D_OK; } @@ -1882,6 +1878,8 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_GetInt(ID3DXBaseEffect *iface, D3DXHAN ((param->class == D3DXPC_VECTOR && param->columns != 2) || (param->class == D3DXPC_MATRIX_ROWS && param->rows != 2 && param->columns == 1))) { + TRACE("Vector fixup\n"); + /* all components (3,4) are clamped (0,255) and put in the INT */ *n = (INT)(min(max(0.0f, *((FLOAT *)param->data + 2)), 1.0f) * INT_FLOAT_MULTI); *n += ((INT)(min(max(0.0f, *((FLOAT *)param->data + 1)), 1.0f) * INT_FLOAT_MULTI)) << 8;

1 0

Alexandre Julliard : gdi32: Fix handling of COLORREFs with illegal values for the high byte.
by Alexandre Julliard 22 Dec '11

22 Dec '11

Module: wine Branch: master Commit: 7f3a7ae5852ac73fea0e4a4cd73d5141b8f844a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f3a7ae5852ac73fea0e4a4cd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 22 11:31:46 2011 +0100 gdi32: Fix handling of COLORREFs with illegal values for the high byte. --- dlls/gdi32/dibdrv/objects.c | 50 ++++++++++--------------------- dlls/gdi32/tests/dib.c | 70 +++++++++++++++++++++++++------------------ 2 files changed, 57 insertions(+), 63 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7f3a7ae5852ac73fea0e4…

1 0

Luca Bennati : po: Update Italian translation.
by Alexandre Julliard 22 Dec '11

22 Dec '11

Module: wine Branch: master Commit: a9148f43a53cbde510ba348ddc93a26e0c9b5bad URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9148f43a53cbde510ba348dd… Author: Luca Bennati <lucak3(a)gmail.com> Date: Wed Dec 21 22:05:58 2011 +0100 po: Update Italian translation. --- po/it.po | 14 +++++--------- 1 files changed, 5 insertions(+), 9 deletions(-) diff --git a/po/it.po b/po/it.po index 6b58491..886b3cd 100644 --- a/po/it.po +++ b/po/it.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2011-12-17 08:45+0100\n" +"PO-Revision-Date: 2011-12-21 22:04+0100\n" "Last-Translator: Luca Bennati <lucak3(a)gmail.com>\n" "Language-Team: none\n" "Language: Italian\n" @@ -3327,24 +3327,20 @@ msgid "Address" msgstr "Indirizzo" #: ieframe.rc:78 -#, fuzzy msgid "Searching for %s" -msgstr "Impostazioni di %s" +msgstr "Cercando %s" #: ieframe.rc:79 -#, fuzzy msgid "Start downloading %s" -msgstr "Scaricando da %s..." +msgstr "Cominciando a scaricare %s" #: ieframe.rc:80 -#, fuzzy msgid "Downloading %s" -msgstr "Scaricamento..." +msgstr "Scaricando %s" #: ieframe.rc:81 -#, fuzzy msgid "Asking for %s" -msgstr "Impostazioni di %s" +msgstr "Richiedendo %s" #: inetcpl.rc:46 msgid " Home page "

1 0

Frédéric Delanoy : po: Update French translation.
by Alexandre Julliard 22 Dec '11

22 Dec '11

Module: wine Branch: master Commit: 4d04887da2d9561130a1c227e4e0d44bdc6cfd0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d04887da2d9561130a1c227e… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Dec 21 21:01:04 2011 +0100 po: Update French translation. --- po/fr.po | 14 +++++--------- 1 files changed, 5 insertions(+), 9 deletions(-) diff --git a/po/fr.po b/po/fr.po index 77ccb2d..f68a464 100644 --- a/po/fr.po +++ b/po/fr.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2011-12-15 21:33+0100\n" +"PO-Revision-Date: 2011-12-21 21:00+0100\n" "Last-Translator: Frédéric Delanoy <frederic.delanoy(a)gmail.com>\n" "Language-Team: none\n" "Language: French\n" @@ -3334,24 +3334,20 @@ msgid "Address" msgstr "Adresse" #: ieframe.rc:78 -#, fuzzy msgid "Searching for %s" -msgstr "Propriétés de %s" +msgstr "Recherche de %s" #: ieframe.rc:79 -#, fuzzy msgid "Start downloading %s" -msgstr "Téléchargement depuis %s..." +msgstr "Début du téléchargement de %s" #: ieframe.rc:80 -#, fuzzy msgid "Downloading %s" -msgstr "Téléchargement..." +msgstr "Téléchargement de %s" #: ieframe.rc:81 -#, fuzzy msgid "Asking for %s" -msgstr "Propriétés de %s" +msgstr "Demande de %s" #: inetcpl.rc:46 msgid " Home page "

1 0

← Newer
1
...
17
18
19
20
21
22
23
...
81
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2011