December 2011 - Wine-commits

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 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

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

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

22 Dec '11

Module: wine Branch: master Commit: 8caa0a05bd41abf72c1e175ea563d3292d0414fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=8caa0a05bd41abf72c1e175ea… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Dec 22 13:00:44 2011 +0000 gdi32/tests: Add tests for geometric solid pens. --- dlls/gdi32/tests/dib.c | 60 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 60 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/tests/dib.c b/dlls/gdi32/tests/dib.c index 120c449..5fd3f99 100644 --- a/dlls/gdi32/tests/dib.c +++ b/dlls/gdi32/tests/dib.c @@ -137,6 +137,8 @@ static const char *sha1_graphics_a8r8g8b8[] = "e462052a03dbe4ec3814db7700e166d00d4d686f", "a27917d4db49ce77989fae246015aeb2a28520ee", "657514a4ca1f2b6ca7a125ad58dfed82099a37d1", + "5e0549fdcf0fc7c50054dccc51d37fc734ab8134", + "eca1998a4d79fb81b2a4103f79e3b846a864eaaf", NULL }; @@ -200,6 +202,8 @@ static const char *sha1_graphics_a8r8g8b8_bitfields[] = "0cda6b3297003b3ccd6d5baa17e1ca9bb7c56f08", "b2c8e1ebb9435031fe068442f479d1304096e79f", "657514a4ca1f2b6ca7a125ad58dfed82099a37d1", + "5e0549fdcf0fc7c50054dccc51d37fc734ab8134", + "eca1998a4d79fb81b2a4103f79e3b846a864eaaf", NULL }; @@ -263,6 +267,8 @@ static const char *sha1_graphics_a8b8g8r8[] = "87f57a31253a38dbf3dc3070473328fa04b68a48", "db64cc4d830fc35ed170b53943e722b2342954d4", "9988ceca44dafbee247aece1f027c06c27c01652", + "d80d45a97bc877b50ba2c3f720d5197f2f1c5fc5", + "b76e0724496e471b01ef8b34f8beba69f5bde261", NULL }; @@ -326,6 +332,8 @@ static const char *sha1_graphics_r10g10b10[] = "8ea5d7e4bebc40a1d91b04b12e1c11a42c188095", "317521e576801acaea62c76fe16813cdfe20f4ad", "ce0fc29bb0281d6c955d64e239254ef9e6dbc06d", + "5ab49e7b61eddd3bab4182f362a38e1ab6a5a3b7", + "555b6f04ba8dec9e2a60693dcaac594227052727", NULL }; @@ -389,6 +397,8 @@ static const char *sha1_graphics_r6g6b6[] = "aecb242c31f31a90f071b6455ea7d808d4ea22e3", "77ea86e51a94b11a8081b29696cb4115687843e3", "d67b897cad72d31e75359094007b1346fd8806ea", + "442bcf4d94a649c9406c3b0bf2f00cb7c6a4d1d4", + "3d0853f4f7580d7cd5148c21c34d878ecf39a5f3", NULL }; @@ -452,6 +462,8 @@ static const char *sha1_graphics_24[] = "354b92008a8409c62d0fa1dff1532c5943aa37a2", "8dc9cb7deae5c24d1eae004d53893fa6caf4723c", "cf311a96d41bd98fdbdfb5dfaac4ba1ba9b7d6da", + "bf5ec23456efe00e1e0931c17de9040ab2092858", + "0bbdf0a0489428f96e3c1d3e5305f9a893820852", NULL }; @@ -519,6 +531,8 @@ static const char *sha1_graphics_r5g5b5[] = "295ec16530126046790fb734e99f86f5b3b74ed8", "d98b0561010606b55a1b9b85fbc93640f681d256", "1c1499051860b7caa25173b328ca9c862f01dd1a", + "a655512753bc90e6d4eb3848f69e96db1ad348e5", + "2230f36f12d4becb242e2962fa1b3694db2496ca", NULL }; @@ -581,6 +595,8 @@ static const char *sha1_graphics_r4g4b4[] = "7587a9c87cab1eca827807f351bb67ca184d1ac5", "b53ef0b5c674822e784903a9dbdd3b386d9f2350", "5505d2ed20dc61ffe48832ecf5329162a5ceb734", + "9f72be4467219a345b1164205d1fbfda2d64271e", + "13d1634e03bc49cfe14a32278d9b1f5ddbb9be10", NULL }; @@ -649,6 +665,8 @@ static const char *sha1_graphics_8_color[] = "e58d9c0acf0219d0839e1dbd162e08a765ed7f0f", "34ca0f9660e1889f9f2c0deb80535d3c4f349fa4", "2c07272462c68cf5944b03e2aa049475b99143c5", + "07ca369fb875d37b9cf855045f528af1827edec4", + "5e9e3e71b06c5efe20f93b3838e745b40b878471", NULL }; @@ -722,6 +740,8 @@ static const char *sha1_graphics_8_grayscale[] = "0ca8775d9a61ccc251d1e6f2e3cfd26a24ae24a2", "17ae603c199a5d6695d198a7f36e6d7263990951", "1918a33f59d3500204ffc573318a39e9ff754221", + "5449d1aef0d2d6af9ac3fd7adb32c23ddc9be1e2", + "55d302ece31a9b7fc4be4a07a53767ba210273e7", NULL }; @@ -788,6 +808,8 @@ static const char *sha1_graphics_8[] = "bd28d77cd85b20a2384d6b25082cfd884bba683e", "7e591ec8ae9bb61c3a443c93f071cab2b8978394", "f81c70b6ee2d4690f9f7c797c66582b176f8dcef", + "d3f359cac7318ce09e0531d51c8c2b316cf3a23b", + "293c41a7ed923a4617560481ae8815cebf83701a", NULL }; @@ -850,6 +872,8 @@ static const char *sha1_graphics_4[] = "28a6b9f7927e99e53cf46f0333d29168cb10e920", "029552113292cc110fd6b7888e766628950aaeef", "297f6ad15200bffbf15198324ee8f27a61a6f2d4", + "70cfa427a1a0d6f2232b1fd544905d48af69cb98", + "287ea7db721e641439888cb9f4bac3a5f16124eb", NULL }; @@ -912,6 +936,8 @@ static const char *sha1_graphics_4_grayscale[] = "ada3b7c34946e584dcdf4203e07cfa3dad02bc63", "c2f61571b067a44b30f56b4658c9606f0edfc0f3", "58f400c9bb78e49a879276fb049edfc9c981740a", + "cb3794f676d6e9502f27172ac7d79a12ca2ba32c", + "aa89612798fbc4e11a73b6233c0ac4832e6af2f9", NULL }; @@ -992,6 +1018,8 @@ static const char *sha1_graphics_1[] = "781d8c5cbc28591fd48fce06f984c502fdc6b363", "df510792a7790cc699532b1420d43c6d4da2ae2f", "55c26d22f11d80b73383fa57d0fac552d705b092", + "14443b33a9879bf829ed3b06e1aef0d7dcf662cc", + "53ab1fcccd09fa5cbff77497f36a70a3b3cb8b81", NULL }; @@ -1157,6 +1185,11 @@ static const RECT wide_lines[] = { 61, 200, 61, 100}, }; +static const POINT poly_lines[] = +{ + {100, 100}, {200, 100}, {200, 200}, {100, 200} +}; + static const RECT patblt_clips[] = { {120, 120, 140, 126}, /* unclipped */ @@ -1228,6 +1261,7 @@ static void draw_graphics(HDC hdc, BITMAPINFO *bmi, BYTE *bits, const char ***sh { DWORD dib_size = get_dib_size(bmi); HPEN solid_pen, dashed_pen, wide_pen, orig_pen; + LOGBRUSH log_brush; HBRUSH solid_brush, dib_brush, hatch_brush, orig_brush; HBITMAP bmp; INT i, j, x, y, hatch_style; @@ -2275,6 +2309,32 @@ static void draw_graphics(HDC hdc, BITMAPINFO *bmi, BYTE *bits, const char ***sh compare_hash(bmi, bits, sha1, "wide pen" ); memset(bits, 0xcc, dib_size); + SelectObject( hdc, orig_pen ); + DeleteObject( wide_pen ); + + log_brush.lbStyle = BS_SOLID; + log_brush.lbColor = RGB(0xff, 0, 0); + log_brush.lbHatch = 0; + + wide_pen = ExtCreatePen( PS_GEOMETRIC | PS_ENDCAP_FLAT | PS_JOIN_MITER | PS_SOLID, + 9, &log_brush, 0, NULL ); + SelectObject( hdc, wide_pen ); + + Polyline( hdc, poly_lines, sizeof(poly_lines) / sizeof(poly_lines[0]) ); + compare_hash(bmi, bits, sha1, "wide pen - flat caps, mitred" ); + memset(bits, 0xcc, dib_size); + + SelectObject( hdc, orig_pen ); + DeleteObject( wide_pen ); + + wide_pen = ExtCreatePen( PS_GEOMETRIC | PS_ENDCAP_SQUARE | PS_JOIN_BEVEL | PS_SOLID, + 16, &log_brush, 0, NULL ); + SelectObject( hdc, wide_pen ); + + Polyline( hdc, poly_lines, sizeof(poly_lines) / sizeof(poly_lines[0]) ); + compare_hash(bmi, bits, sha1, "wide pen - square caps, bevelled" ); + memset(bits, 0xcc, dib_size); + SelectObject(hdc, orig_brush); SelectObject(hdc, orig_pen); DeleteObject(hrgn);

1 0

Stefan Leichter : dhcpcsvc: New stub dll.
by Alexandre Julliard 22 Dec '11

22 Dec '11

Module: wine Branch: master Commit: 9aeda0df492133875e9984ac036ab7d9861c2140 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9aeda0df492133875e9984ac0… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Thu Dec 22 00:04:05 2011 +0100 dhcpcsvc: New stub dll. --- configure | 1 + configure.ac | 1 + dlls/dhcpcsvc/Makefile.in | 5 ++++ dlls/dhcpcsvc/dhcpcsvc.c | 41 +++++++++++++++++++++++++++++++++++++++ dlls/dhcpcsvc/dhcpcsvc.spec | 45 +++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 93 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 1000905..804487f 100755 --- a/configure +++ b/configure @@ -14988,6 +14988,7 @@ wine_fn_config_test dlls/ddraw/tests ddraw_test wine_fn_config_dll ddrawex enable_ddrawex wine_fn_config_test dlls/ddrawex/tests ddrawex_test wine_fn_config_dll devenum enable_devenum po +wine_fn_config_dll dhcpcsvc enable_dhcpcsvc wine_fn_config_dll dinput enable_dinput implib,po,staticimplib wine_fn_config_test dlls/dinput/tests dinput_test wine_fn_config_dll dinput8 enable_dinput8 implib diff --git a/configure.ac b/configure.ac index b050b60..1a7b56f 100644 --- a/configure.ac +++ b/configure.ac @@ -2497,6 +2497,7 @@ WINE_CONFIG_TEST(dlls/ddraw/tests) WINE_CONFIG_DLL(ddrawex) WINE_CONFIG_TEST(dlls/ddrawex/tests) WINE_CONFIG_DLL(devenum,,[po]) +WINE_CONFIG_DLL(dhcpcsvc) WINE_CONFIG_DLL(dinput,,[implib,po,staticimplib]) WINE_CONFIG_TEST(dlls/dinput/tests) WINE_CONFIG_DLL(dinput8,,[implib]) diff --git a/dlls/dhcpcsvc/Makefile.in b/dlls/dhcpcsvc/Makefile.in new file mode 100644 index 0000000..c1d86ca --- /dev/null +++ b/dlls/dhcpcsvc/Makefile.in @@ -0,0 +1,5 @@ +MODULE = dhcpcsvc.dll + +C_SRCS = dhcpcsvc.c + +(a)MAKE_DLL_RULES@ diff --git a/dlls/dhcpcsvc/dhcpcsvc.c b/dlls/dhcpcsvc/dhcpcsvc.c new file mode 100644 index 0000000..4927aac --- /dev/null +++ b/dlls/dhcpcsvc/dhcpcsvc.c @@ -0,0 +1,41 @@ +/* + * Copyright 2011 Stefan Leichter + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(dhcpcsvc); + +BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) +{ + TRACE("%p, %u, %p\n", hinst, reason, reserved); + + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls( hinst ); + break; + case DLL_PROCESS_DETACH: + break; + } + return TRUE; +} diff --git a/dlls/dhcpcsvc/dhcpcsvc.spec b/dlls/dhcpcsvc/dhcpcsvc.spec new file mode 100644 index 0000000..97194a6 --- /dev/null +++ b/dlls/dhcpcsvc/dhcpcsvc.spec @@ -0,0 +1,45 @@ +@ stub DhcpAcquireParameters +@ stub DhcpAcquireParametersByBroadcast +@ stub DhcpCApiCleanup +@ stub DhcpCApiInitialize +@ stub DhcpDeRegisterConnectionStateNotification +@ stub DhcpDeRegisterOptions +@ stub DhcpDeRegisterParamChange +@ stub DhcpDelPersistentRequestParams +@ stub DhcpEnumClasses +@ stub DhcpFallbackRefreshParams +@ stub DhcpFreeMem +@ stub DhcpGetDhcpServicedConnctions +@ stub DhcpGetNotificationStatus +@ stub DhcpHandlePnPEvent +@ stub DhcpLeaseIpAddress +@ stub DhcpLeaseIpAddressEx +@ stub DhcpNotifyConfigChange +@ stub DhcpNotifyConfigChangeEx +@ stub DhcpNotifyMediaReconnected +@ stub DhcpOpenGlobalEvent +@ stub DhcpPersistentRequestParams +@ stub DhcpQueryHWInfo +@ stub DhcpRegisterConnectionStateNotification +@ stub DhcpRegisterOptions +@ stub DhcpRegisterParamChange +@ stub DhcpReleaseIpAddressLease +@ stub DhcpReleaseIpAddressLeaseEx +@ stub DhcpReleaseParameters +@ stub DhcpRemoveDNSRegistration +@ stub DhcpRenewIpAddressLease +@ stub DhcpRenewIpAddressLeaseEx +@ stub DhcpRequestCachedParams +@ stub DhcpRequestOptions +@ stub DhcpRequestParams +@ stub DhcpSetMSFTVendorSpecificOptions +@ stub DhcpStaticRefreshParams +@ stub DhcpUndoRequestParams +@ stub McastApiCleanup +@ stub McastApiStartup +@ stub McastEnumerateScopes +@ stub McastGenUID +@ stub McastReleaseAddress +@ stub McastRenewAddress +@ stub McastRequestAddress +@ stub ServiceMain

1 0

André Hentschel : include: Add CM_DRP_* and CM_CRP_* defines to cfgmgr32.h.
by Alexandre Julliard 22 Dec '11

22 Dec '11

Module: wine Branch: master Commit: 821358d05e28ad1d68696d3f48acc6bc7eaecc42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=821358d05e28ad1d68696d3f4… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Dec 21 20:49:57 2011 +0100 include: Add CM_DRP_* and CM_CRP_* defines to cfgmgr32.h. --- include/cfgmgr32.h | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 50 insertions(+), 0 deletions(-) diff --git a/include/cfgmgr32.h b/include/cfgmgr32.h index 64f0881..e3966f9 100644 --- a/include/cfgmgr32.h +++ b/include/cfgmgr32.h @@ -108,6 +108,56 @@ typedef DWORD CONFIGRET; #define MAX_GUID_STRING_LEN 39 #define MAX_PROFILE_LEN 80 +#define CM_DRP_DEVICEDESC 0x01 +#define CM_DRP_HARDWAREID 0x02 +#define CM_DRP_COMPATIBLEIDS 0x03 +#define CM_DRP_UNUSED0 0x04 +#define CM_DRP_SERVICE 0x05 +#define CM_DRP_UNUSED1 0x06 +#define CM_DRP_UNUSED2 0x07 +#define CM_DRP_CLASS 0x08 +#define CM_DRP_CLASSGUID 0x09 +#define CM_DRP_DRIVER 0x0A +#define CM_DRP_CONFIGFLAGS 0x0B +#define CM_DRP_MFG 0x0C +#define CM_DRP_FRIENDLYNAME 0x0D +#define CM_DRP_LOCATION_INFORMATION 0x0E +#define CM_DRP_PHYSICAL_DEVICE_OBJECT_NAME 0x0F +#define CM_DRP_CAPABILITIES 0x10 +#define CM_DRP_UI_NUMBER 0x11 +#define CM_DRP_UPPERFILTERS 0x12 +#define CM_DRP_LOWERFILTERS 0x13 +#define CM_DRP_BUSTYPEGUID 0x14 +#define CM_DRP_LEGACYBUSTYPE 0x15 +#define CM_DRP_BUSNUMBER 0x16 +#define CM_DRP_ENUMERATOR_NAME 0x17 +#define CM_DRP_SECURITY 0x18 +#define CM_DRP_SECURITY_SDS 0x19 +#define CM_DRP_DEVTYPE 0x1A +#define CM_DRP_EXCLUSIVE 0x1B +#define CM_DRP_CHARACTERISTICS 0x1C +#define CM_DRP_ADDRESS 0x1D +#define CM_DRP_UI_NUMBER_DESC_FORMAT 0x1E +#define CM_DRP_DEVICE_POWER_DATA 0x1F +#define CM_DRP_REMOVAL_POLICY 0x20 +#define CM_DRP_REMOVAL_POLICY_HW_DEFAULT 0x21 +#define CM_DRP_REMOVAL_POLICY_OVERRIDE 0x22 +#define CM_DRP_INSTALL_STATE 0x23 +#define CM_DRP_LOCATION_PATHS 0x24 +#define CM_DRP_BASE_CONTAINERID 0x25 +#define CM_DRP_MIN 0x01 +#define CM_DRP_MAX 0x25 + +#define CM_CRP_UPPERFILTERS CM_DRP_UPPERFILTERS +#define CM_CRP_LOWERFILTERS CM_DRP_LOWERFILTERS +#define CM_CRP_SECURITY CM_DRP_SECURITY +#define CM_CRP_SECURITY_SDS CM_DRP_SECURITY_SDS +#define CM_CRP_DEVTYPE CM_DRP_DEVTYPE +#define CM_CRP_EXCLUSIVE CM_DRP_EXCLUSIVE +#define CM_CRP_CHARACTERISTICS CM_DRP_CHARACTERISTICS +#define CM_CRP_MIN CM_DRP_MIN +#define CM_CRP_MAX CM_DRP_MAX + typedef DWORD DEVINST, *PDEVINST; typedef DWORD DEVNODE, *PDEVNODE; typedef HANDLE HMACHINE, *PHMACHINE;

1 0

Jörg Höhle : winealsa: Use an ALSA buffer of 4 periods to limit prefill.
by Alexandre Julliard 22 Dec '11

22 Dec '11

Module: wine Branch: master Commit: 6d17715b01dc09a2091e5d7ed4932da8f2504e02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d17715b01dc09a2091e5d7ed… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Fri Nov 11 06:33:24 2011 +0400 winealsa: Use an ALSA buffer of 4 periods to limit prefill. --- dlls/winealsa.drv/mmdevdrv.c | 22 +++++++++++++++++++--- 1 files changed, 19 insertions(+), 3 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index e79a7b6..2557e6e 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -945,6 +945,24 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, This->hw_params, &alsa_period_us, NULL)) < 0) WARN("Unable to set period time near %u: %d (%s)\n", alsa_period_us, err, snd_strerror(err)); + /* ALSA updates the output variable alsa_period_us */ + + This->mmdev_period_frames = MulDiv(fmt->nSamplesPerSec, + This->mmdev_period_rt, 10000000); + + This->bufsize_frames = MulDiv(duration, fmt->nSamplesPerSec, 10000000); + + /* Buffer 4 ALSA periods if large enough, else 4 mmdevapi periods */ + This->alsa_bufsize_frames = This->mmdev_period_frames * 4; + if(err < 0 || alsa_period_us < period / 10) + err = snd_pcm_hw_params_set_buffer_size_near(This->pcm_handle, + This->hw_params, &This->alsa_bufsize_frames); + else{ + unsigned int periods = 4; + err = snd_pcm_hw_params_set_periods_near(This->pcm_handle, This->hw_params, &periods, NULL); + } + if(err < 0) + WARN("Unable to set buffer size: %d (%s)\n", err, snd_strerror(err)); if((err = snd_pcm_hw_params(This->pcm_handle, This->hw_params)) < 0){ WARN("Unable to set hw params: %d (%s)\n", err, snd_strerror(err)); @@ -1008,12 +1026,10 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, /* Check if the ALSA buffer is so small that it will run out before * the next MMDevAPI period tick occurs. Allow a little wiggle room * with 120% of the period time. */ - This->mmdev_period_frames = (fmt->nSamplesPerSec * This->mmdev_period_rt) / 10000000.; if(This->alsa_bufsize_frames < 1.2 * This->mmdev_period_frames) - FIXME("ALSA buffer time is smaller than our period time. Expect underruns. (%lu < %u)\n", + FIXME("ALSA buffer time is too small. Expect underruns. (%lu < %u * 1.2)\n", This->alsa_bufsize_frames, This->mmdev_period_frames); - This->bufsize_frames = ceil((duration / 10000000.) * fmt->nSamplesPerSec); This->local_buffer = HeapAlloc(GetProcessHeap(), 0, This->bufsize_frames * fmt->nBlockAlign); if(!This->local_buffer){

1 0

Aric Stewart : usp10: Implement ScriptGetFontScriptTags.
by Alexandre Julliard 22 Dec '11

22 Dec '11

Module: wine Branch: master Commit: 525d9d151973b795a364a44d6f6c582d462c8cd2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=525d9d151973b795a364a44d6… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Dec 22 10:46:34 2011 -0600 usp10: Implement ScriptGetFontScriptTags. --- dlls/usp10/shape.c | 60 +++++++++++++++++++++++++++++++++++++++++++ dlls/usp10/tests/usp10.c | 44 +++++++++++++++++++++++++++++++ dlls/usp10/usp10.c | 9 ++++++ dlls/usp10/usp10.spec | 2 +- dlls/usp10/usp10_internal.h | 1 + 5 files changed, 115 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index c238d09..7f23296 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -3775,3 +3775,63 @@ DWORD CMAP_GetGlyphIndex(HDC hdc, ScriptCache *psc, DWORD utf32c, LPWORD pgi, DW } return 0; } + +static HRESULT GSUB_GetFontScriptTags(LPCVOID table, OPENTYPE_TAG searchingFor, int cMaxTags, OPENTYPE_TAG *pScriptTags, int *pcTags, LPCVOID* script_table) +{ + const GSUB_ScriptList *script; + const GSUB_Header* header = (const GSUB_Header*)table; + int i; + HRESULT rc = S_OK; + + script = (const GSUB_ScriptList*)((const BYTE*)header + GET_BE_WORD(header->ScriptList)); + + *pcTags = 0; + TRACE("%i scripts in this font\n",GET_BE_WORD(script->ScriptCount)); + if (!searchingFor && cMaxTags < GET_BE_WORD(script->ScriptCount)) + rc = E_OUTOFMEMORY; + for (i = 0; i < GET_BE_WORD(script->ScriptCount); i++) + { + if (searchingFor) + { + if (strncmp(script->ScriptRecord[i].ScriptTag, (char*)&searchingFor,4)==0) + { + pScriptTags[0] = MS_MAKE_TAG(script->ScriptRecord[i].ScriptTag[0], script->ScriptRecord[i].ScriptTag[1], script->ScriptRecord[i].ScriptTag[2], script->ScriptRecord[i].ScriptTag[3]); + *pcTags = 1; + if (script_table) + { + int offset = GET_BE_WORD(script->ScriptRecord[i].Script); + *script_table = ((const BYTE*)script + offset); + } + break; + } + } + else if (i < cMaxTags) + { + pScriptTags[i] = MS_MAKE_TAG(script->ScriptRecord[i].ScriptTag[0], script->ScriptRecord[i].ScriptTag[1], script->ScriptRecord[i].ScriptTag[2], script->ScriptRecord[i].ScriptTag[3]); + *pcTags = *pcTags + 1; + } + } + return rc; +} + +HRESULT SHAPE_GetFontScriptTags( HDC hdc, ScriptCache *psc, + SCRIPT_ANALYSIS *psa, int cMaxTags, + OPENTYPE_TAG *pScriptTags, int *pcTags) +{ + HRESULT hr; + OPENTYPE_TAG searching = 0x00000000; + + if (!psc->GSUB_Table) + psc->GSUB_Table = load_gsub_table(hdc); + + if (psa) + { + if (ShapingData[psa->eScript].otTag[0] != 0) + searching = MS_MAKE_TAG(ShapingData[psa->eScript].otTag[0], ShapingData[psa->eScript].otTag[1], ShapingData[psa->eScript].otTag[2], ShapingData[psa->eScript].otTag[3]); + } + + hr = GSUB_GetFontScriptTags(psc->GSUB_Table, searching, cMaxTags, pScriptTags, pcTags, NULL); + if (FAILED(hr)) + *pcTags = 0; + return hr; +} diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 2e05f48..cdd1510 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -59,6 +59,8 @@ static HRESULT (WINAPI *pScriptShapeOpenType)( HDC hdc, SCRIPT_CACHE *psc, SCRIP static DWORD (WINAPI *pGetGlyphIndicesW)(HDC hdc, LPCWSTR lpstr, INT count, LPWORD pgi, DWORD flags); +static HRESULT (WINAPI *pScriptGetFontScriptTags)( HDC hdc, SCRIPT_CACHE *psc, SCRIPT_ANALYSIS *psa, int cMaxTags, OPENTYPE_TAG *pScriptTags, int *pcTags); + static inline void _test_items_ok(LPCWSTR string, DWORD cchString, SCRIPT_CONTROL *Control, SCRIPT_STATE *State, DWORD nItems, const itemTest* items, BOOL nItemsToDo, @@ -2865,6 +2867,46 @@ static void test_newlines(void) ok(count == 4, "got %d expected 4\n", count); } +static void test_ScriptGetFontFunctions(HDC hdc) +{ + HRESULT hr; + pScriptGetFontScriptTags = (void*)GetProcAddress(GetModuleHandleA("usp10.dll"), "ScriptGetFontScriptTags"); + if (!pScriptGetFontScriptTags) + { + win_skip("ScriptGetFontScriptTags not available on this platform\n"); + } + else + { + SCRIPT_CACHE sc = NULL; + OPENTYPE_TAG tags[5]; + int count = 0; + + hr = pScriptGetFontScriptTags(hdc, &sc, NULL, 0, NULL, NULL); + ok(hr == E_INVALIDARG,"Incorrect return code\n"); + ok(sc == NULL, "ScriptCache should remain uninitialized\n"); + hr = pScriptGetFontScriptTags(hdc, &sc, NULL, 0, NULL, &count); + ok(hr == E_INVALIDARG,"Incorrect return code\n"); + ok(sc == NULL, "ScriptCache should remain uninitialized\n"); + hr = pScriptGetFontScriptTags(hdc, &sc, NULL, 5, tags, NULL); + ok(hr == E_INVALIDARG,"Incorrect return code\n"); + ok(sc == NULL, "ScriptCache should remain uninitialized\n"); + hr = pScriptGetFontScriptTags(hdc, &sc, NULL, 0, tags, &count); + ok(hr == E_INVALIDARG,"Incorrect return code\n"); + ok(sc == NULL, "ScriptCache should remain uninitialized\n"); + hr = pScriptGetFontScriptTags(NULL, &sc, NULL, 5, tags, &count); + ok(hr == E_PENDING,"Incorrect return code\n"); + ok(sc == NULL, "ScriptCache should remain uninitialized\n"); + hr = pScriptGetFontScriptTags(hdc, &sc, NULL, 5, tags, &count); + ok((hr == S_OK || hr == E_OUTOFMEMORY),"Incorrect return code\n"); + if (hr == S_OK) + ok(count <= 5, "Count should be less or equal to 5 with S_OK return\n"); + else if (hr == E_OUTOFMEMORY) + ok(count == 0, "Count should be 0 with E_OUTOFMEMORY return\n"); + ok(sc != NULL, "ScriptCache should be initialized\n"); + ScriptFreeCache(&sc); + } +} + START_TEST(usp10) { HWND hwnd; @@ -2917,6 +2959,8 @@ START_TEST(usp10) test_ScriptBreak(); test_newlines(); + test_ScriptGetFontFunctions(hdc); + ReleaseDC(hwnd, hdc); DestroyWindow(hwnd); } diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 93d7b0f..14674a7 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -3525,3 +3525,12 @@ HRESULT WINAPI ScriptJustify(const SCRIPT_VISATTR *sva, const int *advance, for (i = 0; i < num_glyphs; i++) justify[i] = advance[i]; return S_OK; } + +HRESULT WINAPI ScriptGetFontScriptTags( HDC hdc, SCRIPT_CACHE *psc, SCRIPT_ANALYSIS *psa, int cMaxTags, OPENTYPE_TAG *pScriptTags, int *pcTags) +{ + HRESULT hr; + if (!pScriptTags || !pcTags || cMaxTags == 0) return E_INVALIDARG; + if ((hr = init_script_cache(hdc, psc)) != S_OK) return hr; + + return SHAPE_GetFontScriptTags(hdc, (ScriptCache *)*psc, psa, cMaxTags, pScriptTags, pcTags); +} diff --git a/dlls/usp10/usp10.spec b/dlls/usp10/usp10.spec index 05269c5..63375a5 100644 --- a/dlls/usp10/usp10.spec +++ b/dlls/usp10/usp10.spec @@ -10,7 +10,7 @@ @ stub ScriptGetFontFeatureTags @ stub ScriptGetFontLanguageTags @ stdcall ScriptGetFontProperties(long ptr ptr) -@ stub ScriptGetFontScriptTags +@ stdcall ScriptGetFontScriptTags(long ptr ptr long ptr ptr) @ stdcall ScriptGetGlyphABCWidth(ptr ptr long ptr) @ stdcall ScriptGetLogicalWidths(ptr long long ptr ptr ptr ptr) @ stdcall ScriptGetProperties(ptr long) diff --git a/dlls/usp10/usp10_internal.h b/dlls/usp10/usp10_internal.h index ea04324..559a0bc 100644 --- a/dlls/usp10/usp10_internal.h +++ b/dlls/usp10/usp10_internal.h @@ -184,6 +184,7 @@ void SHAPE_ApplyDefaultOpentypeFeatures(HDC hdc, ScriptCache *psc, SCRIPT_ANALYS HRESULT SHAPE_CheckFontForRequiredFeatures(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa) DECLSPEC_HIDDEN; void SHAPE_CharGlyphProp(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, const WCHAR* pwcChars, const INT cChars, const WORD* pwGlyphs, const INT cGlyphs, WORD *pwLogClust, SCRIPT_CHARPROP *pCharProp, SCRIPT_GLYPHPROP *pGlyphProp) DECLSPEC_HIDDEN; INT SHAPE_does_GSUB_feature_apply_to_chars(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache* psc, const WCHAR *chars, INT write_dir, INT count, const char* feature) DECLSPEC_HIDDEN; +HRESULT SHAPE_GetFontScriptTags( HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, int cMaxTags, OPENTYPE_TAG *pScriptTags, int *pcTags); void Indic_ReorderCharacters( HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache* psc, LPWSTR input, int cChars, IndicSyllable **syllables, int *syllable_count, lexical_function lexical_f, reorder_function reorder_f, BOOL modern) DECLSPEC_HIDDEN; void Indic_ParseSyllables( HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache* psc, LPCWSTR input, const int cChar, IndicSyllable **syllables, int *syllable_count, lexical_function lex, BOOL modern);

1 0

Henri Verbeet : ddraw: Handle the Direct3D clipspace transformation.
by Alexandre Julliard 22 Dec '11

22 Dec '11

Module: wine Branch: master Commit: 4a30db74b1dbad885941970e7caf9815abd7826d URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a30db74b1dbad885941970e7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 21 21:34:56 2011 +0100 ddraw: Handle the Direct3D clipspace transformation. Direct3D3 and earlier have an extra transformation to scale clipspace. It's controlled by the extra viewport parameters in those versions. --- dlls/ddraw/ddraw_private.h | 2 + dlls/ddraw/device.c | 74 ++++++++++++++++++++++++++++++++++++++----- dlls/ddraw/tests/ddraw4.c | 24 +++++++------- dlls/ddraw/viewport.c | 53 +++++++++++++++++++++++++------ 4 files changed, 122 insertions(+), 31 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4a30db74b1dbad8859419…

1 0

Henri Verbeet : ddraw/tests: Fix a couple of test messages.
by Alexandre Julliard 22 Dec '11

22 Dec '11

Module: wine Branch: master Commit: fe4e2bf60e4a111a4c4b78fa868e30ca33f3a9fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe4e2bf60e4a111a4c4b78fa8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 21 21:34:57 2011 +0100 ddraw/tests: Fix a couple of test messages. --- dlls/ddraw/tests/d3d.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index e24eb30..fd91c77 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -1247,7 +1247,7 @@ static void Direct3D1Test(void) ok(cmp[i].x == out[i].x && cmp[i].y == out[i].y && cmp[i].z == out[i].z && cmp[i].rhw == out[i].rhw, - "Vertex %d differs. Got %f %f %f %f, expexted %f %f %f %f\n", i + 1, + "Vertex %d differs. Got %f %f %f %f, expected %f %f %f %f\n", i + 1, out[i].x, out[i].y, out[i].z, out[i].rhw, cmp[i].x, cmp[i].y, cmp[i].z, cmp[i].rhw); } @@ -1274,7 +1274,7 @@ static void Direct3D1Test(void) }; ok(cmp[i].x == out[i].x && cmp[i].y == out[i].y && cmp[i].z == out[i].z && cmp[i].rhw == out[i].rhw, - "Vertex %d differs. Got %f %f %f %f, expexted %f %f %f %f\n", i + 1, + "Vertex %d differs. Got %f %f %f %f, expected %f %f %f %f\n", i + 1, out[i].x, out[i].y, out[i].z, out[i].rhw, cmp[i].x, cmp[i].y, cmp[i].z, cmp[i].rhw); } @@ -1296,7 +1296,7 @@ static void Direct3D1Test(void) }; ok(cmp[i].x == out[i].x && cmp[i].y == out[i].y && cmp[i].z == out[i].z && cmp[i].rhw == out[i].rhw, - "Vertex %d differs. Got %f %f %f %f, expexted %f %f %f %f\n", i + 1, + "Vertex %d differs. Got %f %f %f %f, expected %f %f %f %f\n", i + 1, out[i].x, out[i].y, out[i].z, out[i].rhw, cmp[i].x, cmp[i].y, cmp[i].z, cmp[i].rhw); } @@ -1315,7 +1315,7 @@ static void Direct3D1Test(void) }; ok(U1(cmpH[i]).hx == U1(outH[i]).hx && U2(cmpH[i]).hy == U2(outH[i]).hy && U3(cmpH[i]).hz == U3(outH[i]).hz && cmpH[i].dwFlags == outH[i].dwFlags, - "HVertex %d differs. Got %08x %f %f %f, expexted %08x %f %f %f\n", i + 1, + "HVertex %d differs. Got %08x %f %f %f, expected %08x %f %f %f\n", i + 1, outH[i].dwFlags, U1(outH[i]).hx, U2(outH[i]).hy, U3(outH[i]).hz, cmpH[i].dwFlags, U1(cmpH[i]).hx, U2(cmpH[i]).hy, U3(cmpH[i]).hz); @@ -1332,7 +1332,7 @@ static void Direct3D1Test(void) }; ok(cmp[i].x == out[i].x && cmp[i].y == out[i].y && cmp[i].z == out[i].z && cmp[i].rhw == out[i].rhw, - "Vertex %d differs. Got %f %f %f %f, expexted %f %f %f %f\n", i + 1, + "Vertex %d differs. Got %f %f %f %f, expected %f %f %f %f\n", i + 1, out[i].x, out[i].y, out[i].z, out[i].rhw, cmp[i].x, cmp[i].y, cmp[i].z, cmp[i].rhw); } @@ -1358,7 +1358,7 @@ static void Direct3D1Test(void) D3DCLIP_LEFT | D3DCLIP_BOTTOM | D3DCLIP_FRONT, }; ok(Flags[i] == outH[i].dwFlags, - "Cliptest %d differs. Got %08x expexted %08x\n", i + 1, + "Cliptest %d differs. Got %08x expected %08x\n", i + 1, outH[i].dwFlags, Flags[i]); } @@ -1382,7 +1382,7 @@ static void Direct3D1Test(void) D3DCLIP_LEFT | D3DCLIP_FRONT, }; ok(Flags[i] == outH[i].dwFlags, - "Cliptest %d differs. Got %08x expexted %08x\n", i + 1, + "Cliptest %d differs. Got %08x expected %08x\n", i + 1, outH[i].dwFlags, Flags[i]); } @@ -1407,7 +1407,7 @@ static void Direct3D1Test(void) D3DCLIP_FRONT, }; ok(Flags[i] == outH[i].dwFlags, - "Cliptest %d differs. Got %08x expexted %08x\n", i + 1, + "Cliptest %d differs. Got %08x expected %08x\n", i + 1, outH[i].dwFlags, Flags[i]); }

1 0