January 2012 - Wine-Commits

Alexandre Julliard : gdi32: Only create the round cap region once per call.
by Alexandre Julliard Jan. 4, 2012

Jan. 4, 2012

Module: wine Branch: master Commit: 5f2371c229372951eb758476e703cbd3b6ec06a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f2371c229372951eb758476e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 4 14:59:01 2012 +0100 gdi32: Only create the round cap region once per call. --- dlls/gdi32/dibdrv/objects.c | 49 ++++++++++++++++++++++--------------------- 1 files changed, 25 insertions(+), 24 deletions(-) diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index ee58192..879d920 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -1214,27 +1214,22 @@ struct face int dx, dy; }; -static void add_cap( dibdrv_physdev *pdev, HRGN region, const POINT *pt ) +static void add_cap( dibdrv_physdev *pdev, HRGN region, HRGN round_cap, 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; + OffsetRgn( round_cap, pt->x, pt->y ); + CombineRgn( region, region, round_cap, RGN_OR ); + OffsetRgn( round_cap, -pt->x, -pt->y ); + return; case PS_ENDCAP_SQUARE: /* already been handled */ case PS_ENDCAP_FLAT: return; } - - CombineRgn( region, region, cap, RGN_OR ); - DeleteObject( cap ); - return; } #define round( f ) (((f) > 0) ? (f) + 0.5 : (f) - 0.5) @@ -1297,7 +1292,7 @@ static HRGN create_miter_region( dibdrv_physdev *pdev, const POINT *pt, return CreatePolygonRgn( pts, 5, ALTERNATE ); } -static void add_join( dibdrv_physdev *pdev, HRGN region, const POINT *pt, +static void add_join( dibdrv_physdev *pdev, HRGN region, HRGN round_cap, const POINT *pt, const struct face *face_1, const struct face *face_2 ) { HRGN join; @@ -1308,9 +1303,10 @@ static void add_join( dibdrv_physdev *pdev, HRGN region, const POINT *pt, 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; + OffsetRgn( round_cap, pt->x, pt->y ); + CombineRgn( region, region, round_cap, RGN_OR ); + OffsetRgn( round_cap, -pt->x, -pt->y ); + return; case PS_JOIN_MITER: join = create_miter_region( pdev, pt, face_1, face_2 ); @@ -1333,11 +1329,15 @@ static void add_join( dibdrv_physdev *pdev, HRGN region, const POINT *pt, static BOOL wide_pen_lines(dibdrv_physdev *pdev, int num, POINT *pts, BOOL close, HRGN total) { int i; - HRGN segment; + HRGN round_cap = 0; assert( total != 0 ); /* wide pens should always be drawn through a region */ assert( num >= 2 ); + if (pdev->pen_join == PS_JOIN_ROUND || pdev->pen_endcap == PS_ENDCAP_ROUND) + round_cap = CreateEllipticRgn( -(pdev->pen_width / 2), -(pdev->pen_width / 2), + (pdev->pen_width + 1) / 2, (pdev->pen_width + 1) / 2 ); + if (!close) num--; for (i = 0; i < num; i++) { @@ -1362,7 +1362,7 @@ static BOOL wide_pen_lines(dibdrv_physdev *pdev, int num, POINT *pts, BOOL close 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 ); + add_rect_to_region( total, &rect ); if (dx > 0) { face_1.start.x = face_1.end.x = rect.left; @@ -1386,7 +1386,7 @@ static BOOL wide_pen_lines(dibdrv_physdev *pdev, int num, POINT *pts, BOOL close 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 ); + add_rect_to_region( total, &rect ); if (dy > 0) { face_1.start.x = face_2.end.x = rect.left; @@ -1408,6 +1408,7 @@ static BOOL wide_pen_lines(dibdrv_physdev *pdev, int num, POINT *pts, BOOL close double width_x, width_y; POINT seg_pts[4]; POINT wide_half, narrow_half; + HRGN segment; width_x = pdev->pen_width * abs( dy ) / len; width_y = pdev->pen_width * abs( dx ) / len; @@ -1456,6 +1457,8 @@ static BOOL wide_pen_lines(dibdrv_physdev *pdev, int num, POINT *pts, BOOL close } segment = CreatePolygonRgn( seg_pts, 4, ALTERNATE ); + CombineRgn( total, total, segment, RGN_OR ); + DeleteObject( segment ); face_1.start = seg_pts[0]; face_1.end = seg_pts[1]; @@ -1463,23 +1466,21 @@ static BOOL wide_pen_lines(dibdrv_physdev *pdev, int num, POINT *pts, BOOL close face_2.end = seg_pts[3]; } - CombineRgn( total, total, segment, RGN_OR ); - DeleteObject( segment ); - - if (need_cap_1) add_cap( pdev, total, pt_1 ); - if (need_cap_2) add_cap( pdev, total, pt_2 ); + if (need_cap_1) add_cap( pdev, total, round_cap, pt_1 ); + if (need_cap_2) add_cap( pdev, total, round_cap, 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 ); + else add_join( pdev, total, round_cap, pt_1, &prev_face, &face_1 ); if (i == num - 1 && close) - add_join( pdev, total, pt_2, &face_2, &first_face ); + add_join( pdev, total, round_cap, pt_2, &face_2, &first_face ); prev_face = face_2; } + if (round_cap) DeleteObject( round_cap ); return TRUE; }

1 0

Alexandre Julliard : secur32/tests: Don' t compare the encrypted results if the session key is different.
by Alexandre Julliard Jan. 4, 2012

Jan. 4, 2012

Module: wine Branch: master Commit: ee1e1f0fdbf7313bfd1ac1c7145be20b8530f882 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee1e1f0fdbf7313bfd1ac1c71… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 3 23:28:13 2012 +0100 secur32/tests: Don't compare the encrypted results if the session key is different. --- dlls/secur32/tests/ntlm.c | 82 ++++++++++++++++++-------------------------- 1 files changed, 34 insertions(+), 48 deletions(-) diff --git a/dlls/secur32/tests/ntlm.c b/dlls/secur32/tests/ntlm.c index d3cd915..7533899 100644 --- a/dlls/secur32/tests/ntlm.c +++ b/dlls/secur32/tests/ntlm.c @@ -1058,47 +1058,43 @@ static void testSignSeal(void) ok(sec_status == SEC_E_OK, "EncryptMessage returned %s, not SEC_E_OK.\n", getSecError(sec_status)); - ok(!memcmp(crypt.pBuffers[0].pvBuffer, crypt_trailer_client, - crypt.pBuffers[0].cbBuffer), "Crypt trailer not as expected.\n"); - if (memcmp(crypt.pBuffers[0].pvBuffer, crypt_trailer_client, - crypt.pBuffers[0].cbBuffer)) - { - int i; - for (i = 0; i < crypt.pBuffers[0].cbBuffer; i++) - { - if (i % 8 == 0) printf(" "); - printf("0x%02x,", ((unsigned char *)crypt.pBuffers[0].pvBuffer)[i]); - if (i % 8 == 7) printf("\n"); - } - printf("\n"); - } - ok(!memcmp(crypt.pBuffers[1].pvBuffer, crypt_message_client, - crypt.pBuffers[1].cbBuffer), "Crypt message not as expected.\n"); - if (memcmp(crypt.pBuffers[1].pvBuffer, crypt_message_client, - crypt.pBuffers[1].cbBuffer)) + /* first 8 bytes must always be the same */ + ok(!memcmp(crypt.pBuffers[0].pvBuffer, crypt_trailer_client, 8), "Crypt trailer not as expected.\n"); + + /* the rest depends on the session key */ + if (!memcmp(crypt.pBuffers[0].pvBuffer, crypt_trailer_client, crypt.pBuffers[0].cbBuffer)) { - int i; - for (i = 0; i < crypt.pBuffers[1].cbBuffer; i++) + ok(!memcmp(crypt.pBuffers[0].pvBuffer, crypt_trailer_client, + crypt.pBuffers[0].cbBuffer), "Crypt trailer not as expected.\n"); + ok(!memcmp(crypt.pBuffers[1].pvBuffer, crypt_message_client, + crypt.pBuffers[1].cbBuffer), "Crypt message not as expected.\n"); + if (memcmp(crypt.pBuffers[1].pvBuffer, crypt_message_client, + crypt.pBuffers[1].cbBuffer)) { - if (i % 8 == 0) printf(" "); - printf("0x%02x,", ((unsigned char *)crypt.pBuffers[1].pvBuffer)[i]); - if (i % 8 == 7) printf("\n"); + int i; + for (i = 0; i < crypt.pBuffers[1].cbBuffer; i++) + { + if (i % 8 == 0) printf(" "); + printf("0x%02x,", ((unsigned char *)crypt.pBuffers[1].pvBuffer)[i]); + if (i % 8 == 7) printf("\n"); + } + printf("\n"); } - printf("\n"); - } - data[0].cbBuffer = sizeof(crypt_trailer_server); - data[1].cbBuffer = sizeof(crypt_message_server); - memcpy(data[0].pvBuffer, crypt_trailer_server, data[0].cbBuffer); - memcpy(data[1].pvBuffer, crypt_message_server, data[1].cbBuffer); + data[0].cbBuffer = sizeof(crypt_trailer_server); + data[1].cbBuffer = sizeof(crypt_message_server); + memcpy(data[0].pvBuffer, crypt_trailer_server, data[0].cbBuffer); + memcpy(data[1].pvBuffer, crypt_message_server, data[1].cbBuffer); - sec_status = pDecryptMessage(&client.ctxt, &crypt, 0, &qop); + sec_status = pDecryptMessage(&client.ctxt, &crypt, 0, &qop); - ok(sec_status == SEC_E_OK, "DecryptMessage returned %s, not SEC_E_OK.\n", - getSecError(sec_status)); - ok(!memcmp(crypt.pBuffers[1].pvBuffer, message_binary, - crypt.pBuffers[1].cbBuffer), - "Failed to decrypt message correctly.\n"); + ok(sec_status == SEC_E_OK, "DecryptMessage returned %s, not SEC_E_OK.\n", + getSecError(sec_status)); + ok(!memcmp(crypt.pBuffers[1].pvBuffer, message_binary, + crypt.pBuffers[1].cbBuffer), + "Failed to decrypt message correctly.\n"); + } + else trace( "A different session key is being used\n" ); trace("Testing with more than one buffer.\n"); @@ -1139,20 +1135,10 @@ static void testSignSeal(void) ok(sec_status == SEC_E_OK, "EncryptMessage returned %s, not SEC_E_OK.\n", getSecError(sec_status)); - ok(!memcmp(crypt.pBuffers[3].pvBuffer, crypt_trailer_client2, - crypt.pBuffers[3].cbBuffer), "Crypt trailer not as expected.\n"); + ok(!memcmp(crypt.pBuffers[3].pvBuffer, crypt_trailer_client2, 8), "Crypt trailer not as expected.\n"); + if (memcmp(crypt.pBuffers[3].pvBuffer, crypt_trailer_client2, - crypt.pBuffers[3].cbBuffer)) - { - int i; - for (i = 0; i < crypt.pBuffers[3].cbBuffer; i++) - { - if (i % 8 == 0) printf(" "); - printf("0x%02x,", ((unsigned char *)crypt.pBuffers[3].pvBuffer)[i]); - if (i % 8 == 7) printf("\n"); - } - printf("\n"); - } + crypt.pBuffers[3].cbBuffer)) goto end; ok(!memcmp(crypt.pBuffers[1].pvBuffer, crypt_message_client2, crypt.pBuffers[1].cbBuffer), "Crypt message not as expected.\n");

1 0

Henri Verbeet : d3d10: Return D3D10_SVT_VOID instead of 0 from d3d10_variable_type().
by Alexandre Julliard Jan. 4, 2012

Jan. 4, 2012

Module: wine Branch: master Commit: 79d1b2733368ff51ec6b1bd0253841c19a609af8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79d1b2733368ff51ec6b1bd02… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 3 23:06:52 2012 +0100 d3d10: Return D3D10_SVT_VOID instead of 0 from d3d10_variable_type(). This is the same value, but makes it more obvious where e.g. an "Unhandled basetype D3D10_SVT_VOID." message would come from. --- dlls/d3d10/effect.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 350f63b..ab04a9e 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -363,7 +363,7 @@ static D3D10_SHADER_VARIABLE_TYPE d3d10_variable_type(DWORD t, BOOL is_object) case 21: return D3D10_SVT_SAMPLER; default: FIXME("Unknown variable type %#x.\n", t); - return 0; + return D3D10_SVT_VOID; } } else @@ -376,7 +376,7 @@ static D3D10_SHADER_VARIABLE_TYPE d3d10_variable_type(DWORD t, BOOL is_object) case 4: return D3D10_SVT_BOOL; default: FIXME("Unknown variable type %#x.\n", t); - return 0; + return D3D10_SVT_VOID; } } }

1 0

Alexandre Julliard : gdi32: Skip empty segments at the beginning and end of a line to make sure the caps are correct .
by Alexandre Julliard Jan. 4, 2012

Jan. 4, 2012

Module: wine Branch: master Commit: 8b1bab524b4cfe72a6d7eebbe2698626d456ca7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b1bab524b4cfe72a6d7eebbe… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 4 15:10:10 2012 +0100 gdi32: Skip empty segments at the beginning and end of a line to make sure the caps are correct. --- dlls/gdi32/dibdrv/objects.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index 879d920..9f4f035 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -1334,6 +1334,10 @@ static BOOL wide_pen_lines(dibdrv_physdev *pdev, int num, POINT *pts, BOOL close assert( total != 0 ); /* wide pens should always be drawn through a region */ assert( num >= 2 ); + /* skip empty segments */ + while (num > 2 && pts[0].x == pts[1].x && pts[0].y == pts[1].y) { pts++; num--; } + while (num > 2 && pts[num - 1].x == pts[num - 2].x && pts[num - 1].y == pts[num - 2].y) num--; + if (pdev->pen_join == PS_JOIN_ROUND || pdev->pen_endcap == PS_ENDCAP_ROUND) round_cap = CreateEllipticRgn( -(pdev->pen_width / 2), -(pdev->pen_width / 2), (pdev->pen_width + 1) / 2, (pdev->pen_width + 1) / 2 );

1 0

Alexandre Julliard : gdi32: Add a helper function for drawing multiple line segments.
by Alexandre Julliard Jan. 4, 2012

Jan. 4, 2012

Module: wine Branch: master Commit: bc5428600b97b1d1cf6e7481e9d346a01b07f3e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc5428600b97b1d1cf6e7481e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 4 16:06:01 2012 +0100 gdi32: Add a helper function for drawing multiple line segments. --- dlls/gdi32/dibdrv/objects.c | 75 +++++++++++++++++++++++++++++-------------- 1 files changed, 51 insertions(+), 24 deletions(-) diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index f04147c..6933346 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -1452,9 +1452,55 @@ static void wide_line_segment( dibdrv_physdev *pdev, HRGN total, face_1->dy = face_2->dy = dy; } -static BOOL wide_pen_lines(dibdrv_physdev *pdev, int num, POINT *pts, BOOL close, HRGN total) +static void wide_line_segments( dibdrv_physdev *pdev, int num, const POINT *pts, BOOL close, + int start, int count, const POINT *first_pt, const POINT *last_pt, + HRGN round_cap, HRGN total ) { int i; + struct face face_1, face_2, prev_face, first_face; + const POINT *pt_1, *pt_2; + + if (!close) + { + add_cap( pdev, total, round_cap, first_pt ); + add_cap( pdev, total, round_cap, last_pt ); + } + + if (count == 1) + { + pt_1 = &pts[start]; + pt_2 = &pts[(start + 1) % num]; + wide_line_segment( pdev, total, first_pt, last_pt, pt_2->x - pt_1->x, pt_2->y - pt_1->y, + TRUE, TRUE, &face_1, &face_2 ); + return; + } + + pt_1 = &pts[start]; + pt_2 = &pts[(start + 1) % num]; + wide_line_segment( pdev, total, first_pt, pt_2, pt_2->x - pt_1->x, pt_2->y - pt_1->y, + !close, FALSE, &first_face, &prev_face ); + + + for (i = 1; i < count - 1; i++) + { + pt_1 = &pts[(start + i) % num]; + pt_2 = &pts[(start + i + 1) % num]; + wide_line_segment( pdev, total, pt_1, pt_2, pt_2->x - pt_1->x, pt_2->y - pt_1->y, + FALSE, FALSE, &face_1, &face_2 ); + add_join( pdev, total, round_cap, pt_1, &prev_face, &face_1 ); + prev_face = face_2; + } + + pt_1 = &pts[(start + count - 1) % num]; + pt_2 = &pts[(start + count) % num]; + wide_line_segment( pdev, total, pt_1, last_pt, pt_2->x - pt_1->x, pt_2->y - pt_1->y, + FALSE, !close, &face_1, &face_2 ); + add_join( pdev, total, round_cap, pt_1, &prev_face, &face_1 ); + if (close) add_join( pdev, total, round_cap, last_pt, &face_2, &first_face ); +} + +static BOOL wide_pen_lines(dibdrv_physdev *pdev, int num, POINT *pts, BOOL close, HRGN total) +{ HRGN round_cap = 0; assert( total != 0 ); /* wide pens should always be drawn through a region */ @@ -1468,30 +1514,11 @@ static BOOL wide_pen_lines(dibdrv_physdev *pdev, int num, POINT *pts, BOOL close round_cap = CreateEllipticRgn( -(pdev->pen_width / 2), -(pdev->pen_width / 2), (pdev->pen_width + 1) / 2, (pdev->pen_width + 1) / 2 ); - if (!close) num--; - for (i = 0; i < num; i++) - { - const POINT *pt_1 = pts + i; - const POINT *pt_2 = pts + ((close && i == num - 1) ? 0 : i + 1); - int dx = pt_2->x - pt_1->x; - int dy = pt_2->y - pt_1->y; - 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); - - wide_line_segment( pdev, total, pt_1, pt_2, dx, dy, need_cap_1, need_cap_2, &face_1, &face_2 ); - - if (need_cap_1) add_cap( pdev, total, round_cap, pt_1 ); - if (need_cap_2) add_cap( pdev, total, round_cap, pt_2 ); - - if (i == 0) first_face = face_1; - else add_join( pdev, total, round_cap, pt_1, &prev_face, &face_1 ); - - if (i == num - 1 && close) - add_join( pdev, total, round_cap, pt_2, &face_2, &first_face ); + if (close) + wide_line_segments( pdev, num, pts, TRUE, 0, num, &pts[0], &pts[0], round_cap, total ); + else + wide_line_segments( pdev, num, pts, FALSE, 0, num - 1, &pts[0], &pts[num - 1], round_cap, total ); - prev_face = face_2; - } if (round_cap) DeleteObject( round_cap ); return TRUE; }

1 0

Henri Verbeet : d3d10: Handle D3D10_SVT_BUFFER.
by Alexandre Julliard Jan. 4, 2012

Jan. 4, 2012

Module: wine Branch: master Commit: 863578cc29322803f9e4d678faa87c53d8a09647 URL: http://source.winehq.org/git/wine.git/?a=commit;h=863578cc29322803f9e4d678f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 3 23:06:53 2012 +0100 d3d10: Handle D3D10_SVT_BUFFER. --- dlls/d3d10/effect.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index ab04a9e..b9d5cd9 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -361,6 +361,7 @@ static D3D10_SHADER_VARIABLE_TYPE d3d10_variable_type(DWORD t, BOOL is_object) case 19: return D3D10_SVT_RENDERTARGETVIEW; case 20: return D3D10_SVT_DEPTHSTENCILVIEW; case 21: return D3D10_SVT_SAMPLER; + case 22: return D3D10_SVT_BUFFER; default: FIXME("Unknown variable type %#x.\n", t); return D3D10_SVT_VOID; @@ -648,6 +649,7 @@ static void set_variable_vtbl(struct d3d10_effect_variable *v) case D3D10_SVT_TEXTURE2DMSARRAY: case D3D10_SVT_TEXTURE3D: case D3D10_SVT_TEXTURECUBE: + case D3D10_SVT_BUFFER: /* Either resource or constant buffer. */ v->vtbl = (const ID3D10EffectVariableVtbl *)&d3d10_effect_shader_resource_variable_vtbl; break; @@ -1222,6 +1224,7 @@ static HRESULT parse_fx10_local_variable(struct d3d10_effect_variable *v, const case D3D10_SVT_TEXTURECUBE: case D3D10_SVT_RENDERTARGETVIEW: case D3D10_SVT_DEPTHSTENCILVIEW: + case D3D10_SVT_BUFFER: TRACE("SVT could not have elements.\n"); break;

1 0

Henri Verbeet : d3d10: Add a D3D10CompileEffectFromMemory() stub.
by Alexandre Julliard Jan. 4, 2012

Jan. 4, 2012

Module: wine Branch: master Commit: 110aa65e0d0103a605b43c0037f7664f3dd62dfb URL: http://source.winehq.org/git/wine.git/?a=commit;h=110aa65e0d0103a605b43c003… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 3 23:06:51 2012 +0100 d3d10: Add a D3D10CompileEffectFromMemory() stub. --- dlls/d3d10/d3d10.spec | 2 +- dlls/d3d10/d3d10_main.c | 18 ++++++++++++++++++ include/d3d10effect.h | 3 +++ 3 files changed, 22 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10/d3d10.spec b/dlls/d3d10/d3d10.spec index d1b2b98..9f6210b 100644 --- a/dlls/d3d10/d3d10.spec +++ b/dlls/d3d10/d3d10.spec @@ -1,4 +1,4 @@ -@ stub D3D10CompileEffectFromMemory +@ stdcall D3D10CompileEffectFromMemory(ptr long ptr ptr ptr long long ptr ptr) @ stdcall D3D10CompileShader(ptr long str ptr ptr str str long ptr ptr) @ stdcall D3D10CreateBlob(long ptr) d3dcompiler_43.D3DCreateBlob @ stdcall D3D10CreateDevice(ptr long ptr long long ptr) diff --git a/dlls/d3d10/d3d10_main.c b/dlls/d3d10/d3d10_main.c index af792d4..5c3eec8 100644 --- a/dlls/d3d10/d3d10_main.c +++ b/dlls/d3d10/d3d10_main.c @@ -243,6 +243,24 @@ HRESULT WINAPI D3D10CreateEffectFromMemory(void *data, SIZE_T data_size, UINT fl return S_OK; } +HRESULT WINAPI D3D10CompileEffectFromMemory(void *data, SIZE_T data_size, const char *filename, + const D3D10_SHADER_MACRO *defines, ID3D10Include *include, UINT hlsl_flags, UINT fx_flags, + ID3D10Blob **effect, ID3D10Blob **errors) +{ + FIXME("data %p, data_size %lu, filename %s, defines %p, include %p," + " hlsl_flags %#x, fx_flags %#x, effect %p, errors %p stub!\n", + data, data_size, wine_dbgstr_a(filename), defines, include, + hlsl_flags, fx_flags, effect, errors); + + if (effect) + *effect = NULL; + if (errors) + *errors = NULL; + + return E_NOTIMPL; +} + + LPCSTR WINAPI D3D10GetVertexShaderProfile(ID3D10Device *device) { FIXME("device %p stub!\n", device); diff --git a/include/d3d10effect.h b/include/d3d10effect.h index 5dbf31b..521cd4b 100644 --- a/include/d3d10effect.h +++ b/include/d3d10effect.h @@ -827,6 +827,9 @@ DECLARE_INTERFACE_(ID3D10StateBlock, IUnknown) extern "C" { #endif +HRESULT WINAPI D3D10CompileEffectFromMemory(void *data, SIZE_T data_size, const char *filename, + const D3D10_SHADER_MACRO *defines, ID3D10Include *include, UINT hlsl_flags, UINT fx_flags, + ID3D10Blob **effect, ID3D10Blob **errors); HRESULT WINAPI D3D10CreateEffectFromMemory(void *data, SIZE_T data_size, UINT flags, ID3D10Device *device, ID3D10EffectPool *effect_pool, ID3D10Effect **effect); HRESULT WINAPI D3D10CreateStateBlock(ID3D10Device *device,

1 0

Francois Gouget : winmm: Don't include newlines in standard error messages.
by Alexandre Julliard Jan. 3, 2012

Jan. 3, 2012

1 0

Francois Gouget : notepad: Remove unused resource strings.
by Alexandre Julliard Jan. 3, 2012

Jan. 3, 2012

Module: wine Branch: master Commit: b60ff240d1091c63be13bb5aaad6dae7843f753a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b60ff240d1091c63be13bb5aa… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jan 3 12:26:49 2012 +0100 notepad: Remove unused resource strings. --- po/ar.po | 85 +++++++++++--------------------- po/bg.po | 95 +++++++++++++----------------------- po/ca.po | 84 +++++++++++-------------------- po/cs.po | 85 +++++++++++--------------------- po/da.po | 86 +++++++++++--------------------- po/de.po | 86 +++++++++++--------------------- po/el.po | 78 +++++++++++------------------ po/en.po | 80 +++++++++++------------------- po/en_US.po | 84 +++++++++++-------------------- po/eo.po | 86 +++++++++++--------------------- po/es.po | 96 +++++++++++++----------------------- po/fa.po | 86 +++++++++++--------------------- po/fi.po | 97 +++++++++++++----------------------- po/fr.po | 84 +++++++++++-------------------- po/he.po | 85 +++++++++++--------------------- po/hi.po | 78 +++++++++++------------------ po/hu.po | 85 +++++++++++--------------------- po/it.po | 85 +++++++++++--------------------- po/ja.po | 85 +++++++++++--------------------- po/ko.po | 85 +++++++++++--------------------- po/lt.po | 84 +++++++++++-------------------- po/ml.po | 78 +++++++++++------------------ po/nb_NO.po | 86 +++++++++++--------------------- po/nl.po | 85 +++++++++++--------------------- po/or.po | 78 +++++++++++------------------ po/pa.po | 78 +++++++++++------------------ po/pl.po | 84 +++++++++++-------------------- po/pt_BR.po | 85 +++++++++++--------------------- po/pt_PT.po | 85 +++++++++++--------------------- po/rm.po | 78 +++++++++++------------------ po/ro.po | 105 +++++++++++++++------------------------- po/ru.po | 84 +++++++++++-------------------- po/sk.po | 78 +++++++++++------------------ po/sl.po | 85 +++++++++++--------------------- po/sr_RS(a)cyrillic.po | 85 +++++++++++--------------------- po/sr_RS(a)latin.po | 105 +++++++++++++++------------------------- po/sv.po | 86 +++++++++++--------------------- po/te.po | 78 +++++++++++------------------ po/th.po | 83 +++++++++++-------------------- po/tr.po | 86 +++++++++++--------------------- po/uk.po | 85 +++++++++++--------------------- po/wa.po | 85 +++++++++++--------------------- po/wine.pot | 78 +++++++++++------------------ po/zh_CN.po | 83 +++++++++++-------------------- po/zh_TW.po | 95 +++++++++++++----------------------- programs/notepad/notepad.rc | 8 --- programs/notepad/notepad_res.h | 5 -- 47 files changed, 1390 insertions(+), 2460 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b60ff240d1091c63be13b…

1 0

Jörg Höhle : dsound: Fix the computation of the mixer position in bytes.
by Alexandre Julliard Jan. 3, 2012

Jan. 3, 2012

Module: wine Branch: master Commit: 35cdb8bb22a15e32f4e97151a67a1a0d43949cd1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35cdb8bb22a15e32f4e97151a… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Sun Jan 1 20:39:34 2012 +0100 dsound: Fix the computation of the mixer position in bytes. --- dlls/dsound/mixer.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c index d3b5fd8..23af6ce 100644 --- a/dlls/dsound/mixer.c +++ b/dlls/dsound/mixer.c @@ -820,8 +820,7 @@ static void DSOUND_PerformMix(DirectSoundDevice *device) return; } - pos_bytes = (clock_pos * device->pwfx->nBlockAlign * clock_freq) / - device->pwfx->nSamplesPerSec; + pos_bytes = (clock_pos * device->pwfx->nSamplesPerSec * device->pwfx->nBlockAlign) / clock_freq; delta_frags = (pos_bytes - device->last_pos_bytes) / device->fraglen; if(delta_frags > 0){

1 0