April 2015 - Wine-commits - list.winehq.org

Henri Verbeet : wined3d: Properly handle WINED3DSIH_DP2 in the GLSL shader backend.
by Alexandre Julliard 15 Apr '15

15 Apr '15

Module: wine Branch: master Commit: aad0ab8101a1a0596916114919e585a190313b3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=aad0ab8101a1a059691611491… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 15 11:07:12 2015 +0200 wined3d: Properly handle WINED3DSIH_DP2 in the GLSL shader backend. --- dlls/wined3d/glsl_shader.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index e1867bf..b1a0f85 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2665,13 +2665,13 @@ static void shader_glsl_dot(const struct wined3d_shader_instruction *ins) dst_write_mask = shader_glsl_append_dst(buffer, ins); dst_size = shader_glsl_get_write_mask_size(dst_write_mask); - /* dp3 works on vec3, dp4 on vec4 */ + /* dp4 works on vec4, dp3 on vec3, etc. */ if (ins->handler_idx == WINED3DSIH_DP4) - { src_write_mask = WINED3DSP_WRITEMASK_ALL; - } else { + else if (ins->handler_idx == WINED3DSIH_DP3) src_write_mask = WINED3DSP_WRITEMASK_0 | WINED3DSP_WRITEMASK_1 | WINED3DSP_WRITEMASK_2; - } + else + src_write_mask = WINED3DSP_WRITEMASK_0 | WINED3DSP_WRITEMASK_1; shader_glsl_add_src_param(ins, &ins->src[0], src_write_mask, &src0_param); shader_glsl_add_src_param(ins, &ins->src[1], src_write_mask, &src1_param);

1 0

Henri Verbeet : d2d1: Take the world transform into account when calculating the bitmap brush texcoord transform.
by Alexandre Julliard 15 Apr '15

15 Apr '15

Module: wine Branch: master Commit: a7b2f5e88983ee89bbfcd94a017a7f8df51457d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7b2f5e88983ee89bbfcd94a0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 15 11:07:13 2015 +0200 d2d1: Take the world transform into account when calculating the bitmap brush texcoord transform. --- dlls/d2d1/render_target.c | 65 ++++++++++++++++++++++++++++++++--------------- 1 file changed, 44 insertions(+), 21 deletions(-) diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index fe7b947..269e764 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -32,6 +32,18 @@ struct d2d_draw_text_layout_ctx D2D1_DRAW_TEXT_OPTIONS options; }; +static void d2d_matrix_multiply(D2D_MATRIX_3X2_F *a, const D2D_MATRIX_3X2_F *b) +{ + D2D_MATRIX_3X2_F tmp = *a; + + a->_11 = tmp._11 * b->_11 + tmp._12 * b->_21; + a->_12 = tmp._11 * b->_12 + tmp._12 * b->_22; + a->_21 = tmp._21 * b->_11 + tmp._22 * b->_21; + a->_22 = tmp._21 * b->_12 + tmp._22 * b->_22; + a->_31 = tmp._31 * b->_11 + tmp._32 * b->_21 + b->_31; + a->_32 = tmp._31 * b->_12 + tmp._32 * b->_22 + b->_32; +} + static void d2d_point_transform(D2D1_POINT_2F *dst, const D2D1_MATRIX_3X2_F *matrix, float x, float y) { dst->x = x * matrix->_11 + y * matrix->_21 + matrix->_31; @@ -543,7 +555,7 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_FillRectangle(ID2D1RenderTar { float _11, _21, _31, pad0; float _12, _22, _32, pad1; - } transform, transform_inverse; + } transform; TRACE("iface %p, rect %p, brush %p.\n", iface, rect, brush); @@ -598,38 +610,49 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_FillRectangle(ID2D1RenderTar if (brush_impl->type == D2D_BRUSH_TYPE_BITMAP) { struct d2d_bitmap *bitmap = brush_impl->u.bitmap.bitmap; - float rt_scale, rt_bitmap_scale, d; + D2D_MATRIX_3X2_F w, b; + float dpi_scale, d; ps = render_target->rect_bitmap_ps; + /* Scale for dpi. */ + w = render_target->drawing_state.transform; + dpi_scale = render_target->dpi_x / 96.0f; + w._11 *= dpi_scale; + w._21 *= dpi_scale; + w._31 *= dpi_scale; + dpi_scale = render_target->dpi_y / 96.0f; + w._12 *= dpi_scale; + w._22 *= dpi_scale; + w._32 *= dpi_scale; + /* Scale for bitmap size and dpi. */ - rt_scale = render_target->dpi_x / 96.0f; - rt_bitmap_scale = bitmap->pixel_size.width * (bitmap->dpi_x / 96.0f) * rt_scale; - transform._11 = brush_impl->transform._11 * rt_bitmap_scale; - transform._21 = brush_impl->transform._21 * rt_bitmap_scale; - transform._31 = brush_impl->transform._31 * rt_scale; - rt_scale = render_target->dpi_y / 96.0f; - rt_bitmap_scale = bitmap->pixel_size.height * (bitmap->dpi_y / 96.0f) * rt_scale; - transform._12 = brush_impl->transform._12 * rt_bitmap_scale; - transform._22 = brush_impl->transform._22 * rt_bitmap_scale; - transform._32 = brush_impl->transform._32 * rt_scale; + b = brush_impl->transform; + dpi_scale = bitmap->pixel_size.width * (bitmap->dpi_x / 96.0f); + b._11 *= dpi_scale; + b._21 *= dpi_scale; + dpi_scale = bitmap->pixel_size.height * (bitmap->dpi_y / 96.0f); + b._12 *= dpi_scale; + b._22 *= dpi_scale; + + d2d_matrix_multiply(&b, &w); /* Invert the matrix. (Because the matrix is applied to the sampling * coordinates. I.e., to scale the bitmap by 2 we need to divide the * coordinates by 2.) */ - d = transform._11 * transform._22 - transform._21 * transform._12; + d = b._11 * b._22 - b._21 * b._12; if (d != 0.0f) { - transform_inverse._11 = transform._22 / d; - transform_inverse._21 = -transform._21 / d; - transform_inverse._31 = (transform._21 * transform._32 - transform._31 * transform._22) / d; - transform_inverse._12 = -transform._12 / d; - transform_inverse._22 = transform._11 / d; - transform_inverse._32 = -(transform._11 * transform._32 - transform._31 * transform._12) / d; + transform._11 = b._22 / d; + transform._21 = -b._21 / d; + transform._31 = (b._21 * b._32 - b._31 * b._22) / d; + transform._12 = -b._12 / d; + transform._22 = b._11 / d; + transform._32 = -(b._11 * b._32 - b._31 * b._12) / d; } - buffer_desc.ByteWidth = sizeof(transform_inverse); - buffer_data.pSysMem = &transform_inverse; + buffer_desc.ByteWidth = sizeof(transform); + buffer_data.pSysMem = &transform; } else {

1 0

Henri Verbeet : d2d1: Add opacity support to bitmap brushes.
by Alexandre Julliard 15 Apr '15

15 Apr '15

Module: wine Branch: master Commit: 2af8e243ac7e6358cf836718dee47267896e1bcc URL: http://source.winehq.org/git/wine.git/?a=commit;h=2af8e243ac7e6358cf836718d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 15 11:07:14 2015 +0200 d2d1: Add opacity support to bitmap brushes. --- dlls/d2d1/render_target.c | 33 +++++++++++++++++++++++---------- 1 file changed, 23 insertions(+), 10 deletions(-) diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index 269e764..cdf82bf 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -650,6 +650,7 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_FillRectangle(ID2D1RenderTar transform._22 = b._11 / d; transform._32 = -(b._11 * b._32 - b._31 * b._12) / d; } + transform.pad1 = brush_impl->opacity; buffer_desc.ByteWidth = sizeof(transform); buffer_data.pSysMem = &transform; @@ -1396,27 +1397,39 @@ HRESULT d2d_d3d_render_target_init(struct d2d_d3d_render_target *render_target, { #if 0 float3x2 transform; + float opacity; + SamplerState s; Texture2D t; float4 main(float4 position : SV_POSITION) : SV_Target { - return t.Sample(s, mul(float3(position.xy, 1.0), transform)); + float2 texcoord; + float4 ret; + + texcoord.x = position.x * transform._11 + position.y * transform._21 + transform._31; + texcoord.y = position.x * transform._12 + position.y * transform._22 + transform._32; + ret = t.Sample(s, texcoord); + ret.a *= opacity; + + return ret; } #endif - 0x43425844, 0x20fce5be, 0x138fa37f, 0x9554f03f, 0x3dbe9c02, 0x00000001, 0x00000184, 0x00000003, + 0x43425844, 0x9a5f9280, 0xa5351c23, 0x15d6e760, 0xce35bcc3, 0x00000001, 0x000001d0, 0x00000003, 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000030f, 0x505f5653, 0x5449534f, 0x004e4f49, 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, - 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x000000e8, 0x00000040, - 0x0000003a, 0x04000059, 0x00208e46, 0x00000000, 0x00000002, 0x0300005a, 0x00106000, 0x00000000, + 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x00000134, 0x00000040, + 0x0000004d, 0x04000059, 0x00208e46, 0x00000000, 0x00000002, 0x0300005a, 0x00106000, 0x00000000, 0x04001858, 0x00107000, 0x00000000, 0x00005555, 0x04002064, 0x00101032, 0x00000000, 0x00000001, - 0x03000065, 0x001020f2, 0x00000000, 0x02000068, 0x00000002, 0x05000036, 0x00100032, 0x00000000, - 0x00101046, 0x00000000, 0x05000036, 0x00100042, 0x00000000, 0x00004001, 0x3f800000, 0x08000010, - 0x00100012, 0x00000001, 0x00100246, 0x00000000, 0x00208246, 0x00000000, 0x00000000, 0x08000010, - 0x00100022, 0x00000001, 0x00100246, 0x00000000, 0x00208246, 0x00000000, 0x00000001, 0x09000045, - 0x001020f2, 0x00000000, 0x00100046, 0x00000001, 0x00107e46, 0x00000000, 0x00106000, 0x00000000, - 0x0100003e, + 0x03000065, 0x001020f2, 0x00000000, 0x02000068, 0x00000001, 0x0800000f, 0x00100012, 0x00000000, + 0x00101046, 0x00000000, 0x00208046, 0x00000000, 0x00000000, 0x08000000, 0x00100012, 0x00000000, + 0x0010000a, 0x00000000, 0x0020802a, 0x00000000, 0x00000000, 0x0800000f, 0x00100042, 0x00000000, + 0x00101046, 0x00000000, 0x00208046, 0x00000000, 0x00000001, 0x08000000, 0x00100022, 0x00000000, + 0x0010002a, 0x00000000, 0x0020802a, 0x00000000, 0x00000001, 0x09000045, 0x001000f2, 0x00000000, + 0x00100046, 0x00000000, 0x00107e46, 0x00000000, 0x00106000, 0x00000000, 0x08000038, 0x00102082, + 0x00000000, 0x0010003a, 0x00000000, 0x0020803a, 0x00000000, 0x00000001, 0x05000036, 0x00102072, + 0x00000000, 0x00100246, 0x00000000, 0x0100003e, }; static const struct {

1 0

Andrew Eikum : shell32: Add more knownfolders.
by Alexandre Julliard 14 Apr '15

14 Apr '15

Module: wine Branch: master Commit: 80428310610a667fe8c106fd199251015b1548d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80428310610a667fe8c106fd1… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Apr 13 08:21:17 2015 -0500 shell32: Add more knownfolders. --- dlls/shell32/shellpath.c | 411 ++++++++++++++++++++++++++++++++++++++--- dlls/shell32/tests/shellpath.c | 61 +++--- 2 files changed, 415 insertions(+), 57 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=80428310610a667fe8c10…

1 0

Andrew Eikum : dsound: Stricter validation for formats in secondary buffers.
by Alexandre Julliard 14 Apr '15

14 Apr '15

Module: wine Branch: master Commit: a9a80b56b1ab3001fe844aa3a4017c787d6464b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9a80b56b1ab3001fe844aa3a… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Apr 13 11:25:23 2015 -0500 dsound: Stricter validation for formats in secondary buffers. --- dlls/dsound/dsound.c | 24 ++- dlls/dsound/tests/dsound.c | 478 ++++++++++++++++++++++++--------------------- 2 files changed, 277 insertions(+), 225 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a9a80b56b1ab3001fe844…

1 0

Bruno Jesus : ws2_32/tests: Add one more SO_ERROR test.
by Alexandre Julliard 14 Apr '15

14 Apr '15

Module: wine Branch: master Commit: 383ed3ce9a98ff8fbd520dc418dbad68698fae23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=383ed3ce9a98ff8fbd520dc41… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Apr 14 02:02:08 2015 -0300 ws2_32/tests: Add one more SO_ERROR test. --- dlls/ws2_32/tests/sock.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index c7b3ea7..aa06a08 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1387,6 +1387,16 @@ todo_wine err, WSAGetLastError()); closesocket(s); + /* Test with the closed socket */ + SetLastError(0xdeadbeef); + size = sizeof(i); + i = 1234; + err = getsockopt(s, SOL_SOCKET, SO_ERROR, (char *) &i, &size); +todo_wine + ok( (err == SOCKET_ERROR) && (WSAGetLastError() == WSAENOTSOCK), + "got %d with %d (expected SOCKET_ERROR with WSAENOTSOCK)\n", + err, WSAGetLastError()); + ok (i == 1234, "expected 1234, got %d\n", i); /* Test WS_IP_MULTICAST_TTL with 8, 16, 24 and 32 bits values */ s = socket(AF_INET, SOCK_DGRAM, 0);

1 0

Bruno Jesus : ws2_32: Convert EBADF errno to ENOTSOCK.
by Alexandre Julliard 14 Apr '15

14 Apr '15

Module: wine Branch: master Commit: b69eb168161fcb4397cfa8c10b99a0b00279c354 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b69eb168161fcb4397cfa8c10… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Apr 14 02:02:51 2015 -0300 ws2_32: Convert EBADF errno to ENOTSOCK. --- dlls/ws2_32/socket.c | 29 +++++++++++++---------------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index bfcc755..2fd2ce1 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -863,7 +863,6 @@ static UINT sock_get_error( int err ) switch(err) { case EINTR: return WSAEINTR; - case EBADF: return WSAEBADF; case EPERM: case EACCES: return WSAEACCES; case EFAULT: return WSAEFAULT; @@ -872,6 +871,7 @@ static UINT sock_get_error( int err ) case EWOULDBLOCK: return WSAEWOULDBLOCK; case EINPROGRESS: return WSAEINPROGRESS; case EALREADY: return WSAEALREADY; + case EBADF: case ENOTSOCK: return WSAENOTSOCK; case EDESTADDRREQ: return WSAEDESTADDRREQ; case EMSGSIZE: return WSAEMSGSIZE; @@ -2901,9 +2901,6 @@ int WINAPI WS_bind(SOCKET s, const struct WS_sockaddr* name, int namelen) errno = loc_errno; switch (errno) { - case EBADF: - SetLastError(WSAENOTSOCK); - break; case EADDRNOTAVAIL: SetLastError(WSAEINVAL); break; @@ -3360,7 +3357,7 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, convert_sockopt(&level, &optname); if (getsockopt(fd, level, optname, optval, (socklen_t *)optlen) != 0 ) { - SetLastError((errno == EBADF) ? WSAENOTSOCK : wsaErrno()); + SetLastError(wsaErrno()); ret = SOCKET_ERROR; } release_sock_fd( s, fd ); @@ -3370,7 +3367,7 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, return SOCKET_ERROR; if (getsockopt(fd, SOL_SOCKET, SO_ACCEPTCONN, optval, (socklen_t *)optlen) != 0 ) { - SetLastError((errno == EBADF) ? WSAENOTSOCK : wsaErrno()); + SetLastError(wsaErrno()); ret = SOCKET_ERROR; } else @@ -3467,7 +3464,7 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, if (getsockopt(fd, SOL_SOCKET, SO_LINGER, &lingval, &len) != 0 ) { - SetLastError((errno == EBADF) ? WSAENOTSOCK : wsaErrno()); + SetLastError(wsaErrno()); ret = SOCKET_ERROR; } else @@ -3519,7 +3516,7 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, return SOCKET_ERROR; if (getsockopt(fd, SOL_SOCKET, SO_ERROR, optval, (socklen_t *)optlen) != 0 ) { - SetLastError((errno == EBADF) ? WSAENOTSOCK : wsaErrno()); + SetLastError(wsaErrno()); ret = SOCKET_ERROR; } release_sock_fd( s, fd ); @@ -3565,7 +3562,7 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, } else if (getsockopt(fd, SOL_SOCKET, SO_LINGER, &lingval, &len) != 0) { - SetLastError((errno == EBADF) ? WSAENOTSOCK : wsaErrno()); + SetLastError(wsaErrno()); ret = SOCKET_ERROR; } else @@ -3643,7 +3640,7 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, convert_sockopt(&level, &optname); if (getsockopt(fd, level, optname, &tv, &len) != 0 ) { - SetLastError((errno == EBADF) ? WSAENOTSOCK : wsaErrno()); + SetLastError(wsaErrno()); ret = SOCKET_ERROR; } else @@ -3668,7 +3665,7 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, if (getsockopt(fd, SOL_SOCKET, SO_TYPE, optval, (socklen_t *)optlen) != 0 ) { - SetLastError((errno == EBADF) ? WSAENOTSOCK : wsaErrno()); + SetLastError(wsaErrno()); ret = SOCKET_ERROR; } else @@ -3829,7 +3826,7 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, convert_sockopt(&level, &optname); if (getsockopt(fd, level, optname, optval, (socklen_t *)optlen) != 0 ) { - SetLastError((errno == EBADF) ? WSAENOTSOCK : wsaErrno()); + SetLastError(wsaErrno()); ret = SOCKET_ERROR; } release_sock_fd( s, fd ); @@ -3863,7 +3860,7 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, convert_sockopt(&level, &optname); if (getsockopt(fd, level, optname, optval, (socklen_t *)optlen) != 0 ) { - SetLastError((errno == EBADF) ? WSAENOTSOCK : wsaErrno()); + SetLastError(wsaErrno()); ret = SOCKET_ERROR; } release_sock_fd( s, fd ); @@ -3898,7 +3895,7 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, convert_sockopt(&level, &optname); if (getsockopt(fd, level, optname, optval, (socklen_t *)optlen) != 0 ) { - SetLastError((errno == EBADF) ? WSAENOTSOCK : wsaErrno()); + SetLastError(wsaErrno()); ret = SOCKET_ERROR; } release_sock_fd( s, fd ); @@ -4164,7 +4161,7 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID } if ((fd = get_sock_fd( s, 0, NULL )) == -1) return SOCKET_ERROR; if (ioctl(fd, FIONREAD, out_buff ) == -1) - status = (errno == EBADF) ? WSAENOTSOCK : wsaErrno(); + status = wsaErrno(); release_sock_fd( s, fd ); break; } @@ -4182,7 +4179,7 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID /* SO_OOBINLINE sockets must always return TRUE to SIOCATMARK */ if ((getsockopt(fd, SOL_SOCKET, SO_OOBINLINE, &oob, &oobsize ) == -1) || (!oob && ioctl(fd, SIOCATMARK, &atmark ) == -1)) - status = (errno == EBADF) ? WSAENOTSOCK : wsaErrno(); + status = wsaErrno(); else { /* The SIOCATMARK value read from ioctl() is reversed

1 0

Sebastian Lackner : ws2_32: Add a missing call to release_sock_fd.
by Alexandre Julliard 14 Apr '15

14 Apr '15

Module: wine Branch: master Commit: ea371a2446eb6befa2954fe5a6428da0e562aa6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea371a2446eb6befa2954fe5a… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Apr 14 07:37:50 2015 +0200 ws2_32: Add a missing call to release_sock_fd. --- dlls/ws2_32/socket.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 2fd2ce1..95ea83c 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3091,6 +3091,7 @@ static BOOL WINAPI WS2_ConnectEx(SOCKET s, const struct WS_sockaddr* name, int n if (ret <= 0) { SetLastError(ret == -1 ? wsaErrno() : WSAEINVAL); + release_sock_fd( s, fd ); return FALSE; }

1 0

Igor Kotrasinski : dsound: Fix conning formula to correctly interpolate volume.
by Alexandre Julliard 14 Apr '15

14 Apr '15

Module: wine Branch: master Commit: 65e19a096d911a0a7ee2329d2c8f110fb0008f5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=65e19a096d911a0a7ee2329d2… Author: Igor Kotrasinski <ikk_pl(a)yahoo.co.uk> Date: Sat Apr 11 15:44:14 2015 +0000 dsound: Fix conning formula to correctly interpolate volume. --- dlls/dsound/sound3d.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dsound/sound3d.c b/dlls/dsound/sound3d.c index ffd4d45..5eb02a6 100644 --- a/dlls/dsound/sound3d.c +++ b/dlls/dsound/sound3d.c @@ -242,7 +242,7 @@ void DSOUND_Calc3DBuffer(IDirectSoundBufferImpl *dsb) if (flAngle > dwOutsideConeAngle) flAngle = dwOutsideConeAngle; /* this probably isn't the right thing, but it's ok for the time being */ - lVolume += ((dsb->ds3db_ds3db.lConeOutsideVolume)/((dwOutsideConeAngle) - (dwInsideConeAngle))) * flAngle; + lVolume += ((flAngle - dwInsideConeAngle)/(dwOutsideConeAngle - dwInsideConeAngle)) * dsb->ds3db_ds3db.lConeOutsideVolume; } TRACE("conning: Angle = %f deg; InsideConeAngle(/2) = %d deg; OutsideConeAngle(/2) = %d deg; ConeOutsideVolume = %d => adjusting volume to %f\n", flAngle, dsb->ds3db_ds3db.dwInsideConeAngle/2, dsb->ds3db_ds3db.dwOutsideConeAngle/2, dsb->ds3db_ds3db.lConeOutsideVolume, lVolume);

1 0

Henri Verbeet : d3d9/tests: Test D3DPRESENT_PARAMETERS after a successful reset.
by Alexandre Julliard 14 Apr '15

14 Apr '15

Module: wine Branch: master Commit: af438d451c1f529779acbce22107e6db40d93600 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af438d451c1f529779acbce22… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 14 10:15:59 2015 +0200 d3d9/tests: Test D3DPRESENT_PARAMETERS after a successful reset. --- dlls/d3d9/tests/d3d9ex.c | 33 +++++++++++++ dlls/d3d9/tests/device.c | 125 +++++++++++++++++++++++++---------------------- 2 files changed, 100 insertions(+), 58 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=af438d451c1f529779acb…

1 0