May 2017 - Wine-Commits - list.winehq.org

Alexandre Julliard : server: Implement IOCTL_SERIAL_SET_WAIT_MASK as an ioctl on the server side.
by Alexandre Julliard May 5, 2017

May 5, 2017

Module: wine Branch: master Commit: b7b9c4eaa649840bd1619d952197990fbe4ae27d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7b9c4eaa649840bd1619d952… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 5 12:28:19 2017 +0200 server: Implement IOCTL_SERIAL_SET_WAIT_MASK as an ioctl on the server side. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/serial.c | 23 +---------------------- include/wine/server_protocol.h | 5 ++--- server/protocol.def | 2 -- server/request.h | 1 - server/serial.c | 18 ++++++++++-------- server/trace.c | 2 +- 6 files changed, 14 insertions(+), 37 deletions(-) diff --git a/dlls/ntdll/serial.c b/dlls/ntdll/serial.c index 1279837..66facee 100644 --- a/dlls/ntdll/serial.c +++ b/dlls/ntdll/serial.c @@ -771,21 +771,6 @@ static NTSTATUS set_special_chars(int fd, const SERIAL_CHARS* sc) return STATUS_SUCCESS; } -static NTSTATUS set_wait_mask(HANDLE hDevice, DWORD mask) -{ - NTSTATUS status; - - SERVER_START_REQ( set_serial_info ) - { - req->handle = wine_server_obj_handle( hDevice ); - req->flags = SERIALINFO_SET_MASK; - req->eventmask = mask; - status = wine_server_call( req ); - } - SERVER_END_REQ; - return status; -} - /* * does not change IXOFF but simulates that IXOFF has been received: */ @@ -1126,6 +1111,7 @@ static inline NTSTATUS io_control(HANDLE hDevice, { case IOCTL_SERIAL_GET_TIMEOUTS: case IOCTL_SERIAL_SET_TIMEOUTS: + case IOCTL_SERIAL_SET_WAIT_MASK: /* these are handled on the server side */ return STATUS_NOT_SUPPORTED; } @@ -1301,13 +1287,6 @@ static inline NTSTATUS io_control(HANDLE hDevice, status = STATUS_NOT_SUPPORTED; #endif break; - case IOCTL_SERIAL_SET_WAIT_MASK: - if (lpInBuffer && nInBufferSize == sizeof(DWORD)) - { - status = set_wait_mask(hDevice, *(DWORD*)lpInBuffer); - } - else status = STATUS_INVALID_PARAMETER; - break; case IOCTL_SERIAL_SET_XOFF: status = set_XOff(fd); break; diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 7f92ecd..af792c6 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -3164,13 +3164,12 @@ struct set_serial_info_request struct request_header __header; obj_handle_t handle; int flags; - unsigned int eventmask; + char __pad_20[4]; }; struct set_serial_info_reply { struct reply_header __header; }; -#define SERIALINFO_SET_MASK 0x02 #define SERIALINFO_PENDING_WRITE 0x04 #define SERIALINFO_PENDING_WAIT 0x08 @@ -6396,6 +6395,6 @@ union generic_reply struct terminate_job_reply terminate_job_reply; }; -#define SERVER_PROTOCOL_VERSION 529 +#define SERVER_PROTOCOL_VERSION 530 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/protocol.def b/server/protocol.def index 7004bde..e9de522 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -2309,9 +2309,7 @@ enum message_type @REQ(set_serial_info) obj_handle_t handle; /* handle to comm port */ int flags; /* bitmask to set values (see below) */ - unsigned int eventmask; @END -#define SERIALINFO_SET_MASK 0x02 #define SERIALINFO_PENDING_WRITE 0x04 #define SERIALINFO_PENDING_WAIT 0x08 diff --git a/server/request.h b/server/request.h index e9fcbce..d9e27b8 100644 --- a/server/request.h +++ b/server/request.h @@ -1559,7 +1559,6 @@ C_ASSERT( FIELD_OFFSET(struct get_serial_info_reply, pending_write) == 16 ); C_ASSERT( sizeof(struct get_serial_info_reply) == 24 ); C_ASSERT( FIELD_OFFSET(struct set_serial_info_request, handle) == 12 ); C_ASSERT( FIELD_OFFSET(struct set_serial_info_request, flags) == 16 ); -C_ASSERT( FIELD_OFFSET(struct set_serial_info_request, eventmask) == 20 ); C_ASSERT( sizeof(struct set_serial_info_request) == 24 ); C_ASSERT( FIELD_OFFSET(struct register_async_request, type) == 12 ); C_ASSERT( FIELD_OFFSET(struct register_async_request, async) == 16 ); diff --git a/server/serial.c b/server/serial.c index a2424aa..8755543 100644 --- a/server/serial.c +++ b/server/serial.c @@ -220,6 +220,16 @@ static obj_handle_t serial_ioctl( struct fd *fd, ioctl_code_t code, struct async else set_error( STATUS_BUFFER_TOO_SMALL ); return 0; + case IOCTL_SERIAL_SET_WAIT_MASK: + if (get_req_data_size() >= sizeof(serial->eventmask)) + { + serial->eventmask = *(unsigned int *)get_req_data(); + serial->generation++; + fd_async_wake_up( serial->fd, ASYNC_TYPE_WAIT, STATUS_SUCCESS ); + } + else set_error( STATUS_BUFFER_TOO_SMALL ); + return 0; + default: set_error( STATUS_NOT_SUPPORTED ); return 0; @@ -329,14 +339,6 @@ DECL_HANDLER(set_serial_info) if (req->flags & SERIALINFO_PENDING_WRITE) serial->pending_write = 1; - /* event mask */ - if (req->flags & SERIALINFO_SET_MASK) - { - serial->eventmask = req->eventmask; - serial->generation++; - fd_async_wake_up( serial->fd, ASYNC_TYPE_WAIT, STATUS_SUCCESS ); - } - release_object( serial ); } } diff --git a/server/trace.c b/server/trace.c index e370f96..4f62ee5 100644 --- a/server/trace.c +++ b/server/trace.c @@ -121,6 +121,7 @@ static void dump_ioctl_code( const char *prefix, const ioctl_code_t *code ) CASE(FSCTL_PIPE_WAIT); CASE(IOCTL_SERIAL_GET_TIMEOUTS); CASE(IOCTL_SERIAL_SET_TIMEOUTS); + CASE(IOCTL_SERIAL_SET_WAIT_MASK); CASE(WS_SIO_ADDRESS_LIST_CHANGE); default: fprintf( stderr, "%s%08x", prefix, *code ); break; #undef CASE @@ -2843,7 +2844,6 @@ static void dump_set_serial_info_request( const struct set_serial_info_request * { fprintf( stderr, " handle=%04x", req->handle ); fprintf( stderr, ", flags=%d", req->flags ); - fprintf( stderr, ", eventmask=%08x", req->eventmask ); } static void dump_register_async_request( const struct register_async_request *req )

1 0

Alexandre Julliard : server: Implement IOCTL_SERIAL_SET_TIMEOUTS as an ioctl on the server side.
by Alexandre Julliard May 5, 2017

May 5, 2017

Module: wine Branch: master Commit: 84e97cf60433ae6d86cd5d92154fc7696db84eea URL: http://source.winehq.org/git/wine.git/?a=commit;h=84e97cf60433ae6d86cd5d921… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 5 12:21:09 2017 +0200 server: Implement IOCTL_SERIAL_SET_TIMEOUTS as an ioctl on the server side. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/serial.c | 53 ++++++++++++------------------------------ include/wine/server_protocol.h | 9 +------ server/protocol.def | 6 ----- server/request.h | 9 ++----- server/serial.c | 24 +++++++++++-------- server/trace.c | 6 +---- 6 files changed, 33 insertions(+), 74 deletions(-) diff --git a/dlls/ntdll/serial.c b/dlls/ntdll/serial.c index f0a574a..1279837 100644 --- a/dlls/ntdll/serial.c +++ b/dlls/ntdll/serial.c @@ -771,25 +771,6 @@ static NTSTATUS set_special_chars(int fd, const SERIAL_CHARS* sc) return STATUS_SUCCESS; } -static NTSTATUS set_timeouts(HANDLE handle, const SERIAL_TIMEOUTS* st) -{ - NTSTATUS status; - - SERVER_START_REQ( set_serial_info ) - { - req->handle = wine_server_obj_handle( handle ); - req->flags = SERIALINFO_SET_TIMEOUTS; - req->readinterval = st->ReadIntervalTimeout ; - req->readmult = st->ReadTotalTimeoutMultiplier ; - req->readconst = st->ReadTotalTimeoutConstant ; - req->writemult = st->WriteTotalTimeoutMultiplier ; - req->writeconst = st->WriteTotalTimeoutConstant ; - status = wine_server_call( req ); - } - SERVER_END_REQ; - return status; -} - static NTSTATUS set_wait_mask(HANDLE hDevice, DWORD mask) { NTSTATUS status; @@ -1135,25 +1116,29 @@ static inline NTSTATUS io_control(HANDLE hDevice, DWORD sz = 0, access = FILE_READ_DATA; NTSTATUS status = STATUS_SUCCESS; int fd = -1, needs_close = 0; + enum server_fd_type type; TRACE("%p %s %p %d %p %d %p\n", hDevice, iocode2str(dwIoControlCode), lpInBuffer, nInBufferSize, lpOutBuffer, nOutBufferSize, piosb); + switch (dwIoControlCode) + { + case IOCTL_SERIAL_GET_TIMEOUTS: + case IOCTL_SERIAL_SET_TIMEOUTS: + /* these are handled on the server side */ + return STATUS_NOT_SUPPORTED; + } + piosb->Information = 0; - if (dwIoControlCode != IOCTL_SERIAL_GET_TIMEOUTS && - dwIoControlCode != IOCTL_SERIAL_SET_TIMEOUTS) + if ((status = server_get_unix_fd( hDevice, access, &fd, &needs_close, &type, NULL ))) + goto error; + if (type != FD_TYPE_SERIAL) { - enum server_fd_type type; - if ((status = server_get_unix_fd( hDevice, access, &fd, &needs_close, &type, NULL ))) - goto error; - if (type != FD_TYPE_SERIAL) - { - if (needs_close) close( fd ); - status = STATUS_OBJECT_TYPE_MISMATCH; - goto error; - } + if (needs_close) close( fd ); + status = STATUS_OBJECT_TYPE_MISMATCH; + goto error; } switch (dwIoControlCode) @@ -1224,8 +1209,6 @@ static inline NTSTATUS io_control(HANDLE hDevice, } else status = STATUS_INVALID_PARAMETER; break; - case IOCTL_SERIAL_GET_TIMEOUTS: - return STATUS_NOT_SUPPORTED; case IOCTL_SERIAL_GET_WAIT_MASK: if (lpOutBuffer && nOutBufferSize == sizeof(DWORD)) { @@ -1318,12 +1301,6 @@ static inline NTSTATUS io_control(HANDLE hDevice, status = STATUS_NOT_SUPPORTED; #endif break; - case IOCTL_SERIAL_SET_TIMEOUTS: - if (lpInBuffer && nInBufferSize == sizeof(SERIAL_TIMEOUTS)) - status = set_timeouts(hDevice, lpInBuffer); - else - status = STATUS_INVALID_PARAMETER; - break; case IOCTL_SERIAL_SET_WAIT_MASK: if (lpInBuffer && nInBufferSize == sizeof(DWORD)) { diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 10c0504..7f92ecd 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -3164,19 +3164,12 @@ struct set_serial_info_request struct request_header __header; obj_handle_t handle; int flags; - unsigned int readinterval; - unsigned int readconst; - unsigned int readmult; - unsigned int writeconst; - unsigned int writemult; unsigned int eventmask; - char __pad_44[4]; }; struct set_serial_info_reply { struct reply_header __header; }; -#define SERIALINFO_SET_TIMEOUTS 0x01 #define SERIALINFO_SET_MASK 0x02 #define SERIALINFO_PENDING_WRITE 0x04 #define SERIALINFO_PENDING_WAIT 0x08 @@ -6403,6 +6396,6 @@ union generic_reply struct terminate_job_reply terminate_job_reply; }; -#define SERVER_PROTOCOL_VERSION 528 +#define SERVER_PROTOCOL_VERSION 529 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/protocol.def b/server/protocol.def index b1e4234..7004bde 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -2309,14 +2309,8 @@ enum message_type @REQ(set_serial_info) obj_handle_t handle; /* handle to comm port */ int flags; /* bitmask to set values (see below) */ - unsigned int readinterval; - unsigned int readconst; - unsigned int readmult; - unsigned int writeconst; - unsigned int writemult; unsigned int eventmask; @END -#define SERIALINFO_SET_TIMEOUTS 0x01 #define SERIALINFO_SET_MASK 0x02 #define SERIALINFO_PENDING_WRITE 0x04 #define SERIALINFO_PENDING_WAIT 0x08 diff --git a/server/request.h b/server/request.h index 7600c31..e9fcbce 100644 --- a/server/request.h +++ b/server/request.h @@ -1559,13 +1559,8 @@ C_ASSERT( FIELD_OFFSET(struct get_serial_info_reply, pending_write) == 16 ); C_ASSERT( sizeof(struct get_serial_info_reply) == 24 ); C_ASSERT( FIELD_OFFSET(struct set_serial_info_request, handle) == 12 ); C_ASSERT( FIELD_OFFSET(struct set_serial_info_request, flags) == 16 ); -C_ASSERT( FIELD_OFFSET(struct set_serial_info_request, readinterval) == 20 ); -C_ASSERT( FIELD_OFFSET(struct set_serial_info_request, readconst) == 24 ); -C_ASSERT( FIELD_OFFSET(struct set_serial_info_request, readmult) == 28 ); -C_ASSERT( FIELD_OFFSET(struct set_serial_info_request, writeconst) == 32 ); -C_ASSERT( FIELD_OFFSET(struct set_serial_info_request, writemult) == 36 ); -C_ASSERT( FIELD_OFFSET(struct set_serial_info_request, eventmask) == 40 ); -C_ASSERT( sizeof(struct set_serial_info_request) == 48 ); +C_ASSERT( FIELD_OFFSET(struct set_serial_info_request, eventmask) == 20 ); +C_ASSERT( sizeof(struct set_serial_info_request) == 24 ); C_ASSERT( FIELD_OFFSET(struct register_async_request, type) == 12 ); C_ASSERT( FIELD_OFFSET(struct register_async_request, async) == 16 ); C_ASSERT( FIELD_OFFSET(struct register_async_request, count) == 56 ); diff --git a/server/serial.c b/server/serial.c index b398cc1..a2424aa 100644 --- a/server/serial.c +++ b/server/serial.c @@ -206,6 +206,20 @@ static obj_handle_t serial_ioctl( struct fd *fd, ioctl_code_t code, struct async else set_error( STATUS_BUFFER_TOO_SMALL ); return 0; + case IOCTL_SERIAL_SET_TIMEOUTS: + if (get_req_data_size() >= sizeof(SERIAL_TIMEOUTS)) + { + const SERIAL_TIMEOUTS *timeouts = get_req_data(); + + serial->readinterval = timeouts->ReadIntervalTimeout; + serial->readconst = timeouts->ReadTotalTimeoutConstant; + serial->readmult = timeouts->ReadTotalTimeoutMultiplier; + serial->writeconst = timeouts->WriteTotalTimeoutConstant; + serial->writemult = timeouts->WriteTotalTimeoutMultiplier; + } + else set_error( STATUS_BUFFER_TOO_SMALL ); + return 0; + default: set_error( STATUS_NOT_SUPPORTED ); return 0; @@ -311,16 +325,6 @@ DECL_HANDLER(set_serial_info) serial->pending_wait = 0; } - /* timeouts */ - if (req->flags & SERIALINFO_SET_TIMEOUTS) - { - serial->readinterval = req->readinterval; - serial->readconst = req->readconst; - serial->readmult = req->readmult; - serial->writeconst = req->writeconst; - serial->writemult = req->writemult; - } - /* pending write */ if (req->flags & SERIALINFO_PENDING_WRITE) serial->pending_write = 1; diff --git a/server/trace.c b/server/trace.c index 5e13dad..e370f96 100644 --- a/server/trace.c +++ b/server/trace.c @@ -120,6 +120,7 @@ static void dump_ioctl_code( const char *prefix, const ioctl_code_t *code ) CASE(FSCTL_PIPE_PEEK); CASE(FSCTL_PIPE_WAIT); CASE(IOCTL_SERIAL_GET_TIMEOUTS); + CASE(IOCTL_SERIAL_SET_TIMEOUTS); CASE(WS_SIO_ADDRESS_LIST_CHANGE); default: fprintf( stderr, "%s%08x", prefix, *code ); break; #undef CASE @@ -2842,11 +2843,6 @@ static void dump_set_serial_info_request( const struct set_serial_info_request * { fprintf( stderr, " handle=%04x", req->handle ); fprintf( stderr, ", flags=%d", req->flags ); - fprintf( stderr, ", readinterval=%08x", req->readinterval ); - fprintf( stderr, ", readconst=%08x", req->readconst ); - fprintf( stderr, ", readmult=%08x", req->readmult ); - fprintf( stderr, ", writeconst=%08x", req->writeconst ); - fprintf( stderr, ", writemult=%08x", req->writemult ); fprintf( stderr, ", eventmask=%08x", req->eventmask ); }

1 0

Henri Verbeet : d3dx9/tests: Use compare_float() in test_D3DXSHRotate().
by Alexandre Julliard May 4, 2017

May 4, 2017

Module: wine Branch: master Commit: c48dd628c5c159bcff54dd9747e6222a0410b9b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c48dd628c5c159bcff54dd974… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 4 12:06:02 2017 +0200 d3dx9/tests: Use compare_float() in test_D3DXSHRotate(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/math.c | 96 +++++++++++++++++++++++++--------------------- 1 file changed, 52 insertions(+), 44 deletions(-) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 1e10b1f..0014ee2 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -3358,48 +3358,54 @@ static void test_D3DXSHMultiply4(void) static void test_D3DXSHRotate(void) { - D3DXMATRIX m[4]; - FLOAT expected, in[49], out[49], *out_temp, *received_ptr; - static const FLOAT table[]= - { /* Rotation around X-axis Pi/2 */ - 1.01f, -3.01f, 2.01f, 4.01f, -8.01f, -6.01f, - -11.307890f, 5.01f, -1.565839f, 1.093598f, -11.01f, 19.833414f, - -15.268191f, -19.004118f, -3.364889f, -9.562627f, 12.099654f, -0.272131f, - 30.241013f, 26.919991f, 39.236877f, -22.632446f, 6.707388f, -11.768282f, - 3.443672f, -6.07445f, 11.61839f, 1.527561f, 37.89633f, -56.9012f, - 47.42289f, 50.39153f, 10.61819f, 25.50101f, 0.049241f, 16.98330f, - - 1.01f, -3.01f, -3.01f, 4.01f, -8.01f, -6.01f, -11.307889f, -8.01f, 14.297919f, - /* Rotation around X-axis -Pi/2 */ - 1.01f, 3.01f, -2.01f, 4.01f, 8.01f, -6.01f, - -11.307890f, -5.01f, -1.565839f, -1.093598f, -11.01f, -19.833414f, - 15.268191f, -19.004118f, 3.364889f, -9.562627f, -12.099654f, -0.272131f, - -30.241013f, 26.919991f, 39.236877f, 22.632446f, 6.707388f, 11.768282f, - 3.443672f, 6.07445f, 11.61839f, -1.527561f, 37.89633f, 56.9012f, - -47.42289f, 50.39153f, -10.61819f, 25.50101f, -0.049248f, 16.98330f, - - 1.01f, 3.01f, -3.01f, 4.01f, 8.01f, -6.01f, -11.307890f, -8.01f, 14.297919f, - /* Yaw Pi/3, Pitch Pi/4, Roll Pi/5 */ - 1.01f, 4.944899f, 1.442301f, 1.627281f, 0.219220f, 10.540824f, - -9.136903f, 2.763750f, -7.30904f, -5.875721f, 5.303124f, -8.682154f, - -25.683384f, 1.680279f, -18.808388f, 7.653656f, 16.939133f, -17.328018f, - 14.629795f, -54.467102f, -12.231035f, -4.089857f, -9.444222f, 3.056035f, - 0.179257f, -10.041875f, 23.090092f, -23.188709f, 11.727098f, -65.183090f, - 48.671577f, -15.073209f, 38.793171f, -26.039536f, 6.192769f, -17.672247f, - - 1.01f, 4.944899f, -0.891142f, 4.607695f, 0.219218f, 10.773325f, - -8.204769f, 13.563829f, -12.007767f, - /* Rotation around Z-axis Pi/6 */ - 1.01f, 3.745711f, 3.01f, 2.467762f, 10.307889f, 9.209813f, - 7.01f, 3.931864f, 0.166212f, 16.01f, 18.504042f, 17.405966f, - 13.01f, 6.128016f, -2.029941f, -10.01f, 13.154292f, 24.01f, - 29.432245f, 28.334167f, 21.01f, 9.056221f, -4.958143f, -18.01f, - -27.236094f, -4.520332f, 16.814543f, 34.01f, 43.092495f, 41.994423f, - 31.01f, 12.716471f, -8.618400f, -28.01f, -40.896347f, -44.190571, - - 1.01f, 3.745711f, 3.01f, 1.599906f, 10.307889f, 9.209813f, - 7.01f, 2.331957f, -4.421894f, }; + float expected, in[49], out[49], *out_temp, *received_ptr; unsigned int i, j, l, order; + D3DXMATRIX m[4]; + BOOL equal; + + static const float table[]= + { + /* Rotation around the x-axis, π/2. */ + 1.00999999e+00f, -3.00999999e+00f, 2.00999975e+00f, 4.01000023e+00f, -8.01000023e+00f, -6.00999928e+00f, + -1.13078899e+01f, 5.00999975e+00f, -1.56583869e+00f, 1.09359801e+00f, -1.10099983e+01f, 1.98334141e+01f, + -1.52681913e+01f, -1.90041180e+01f, -3.36488891e+00f, -9.56262684e+00f, 1.20996542e+01f, -2.72131383e-01f, + 3.02410126e+01f, 2.69199905e+01f, 3.92368774e+01f, -2.26324463e+01f, 6.70738792e+00f, -1.17682819e+01f, + 3.44367194e+00f, -6.07445812e+00f, 1.16183939e+01f, 1.52756083e+00f, 3.78963356e+01f, -5.69012184e+01f, + 4.74228935e+01f, 5.03915329e+01f, 1.06181908e+01f, 2.55010109e+01f, 4.92456071e-02f, 1.69833069e+01f, + + 1.00999999e+00f, -3.00999999e+00f, -3.01000023e+00f, 4.01000023e+00f, -8.01000023e+00f, -6.00999928e+00f, + -1.13078890e+01f, -8.01000023e+00f, 1.42979193e+01f, + /* Rotation around the x-axis, -π/2. */ + 1.00999999e+00f, 3.00999999e+00f, -2.01000023e+00f, 4.01000023e+00f, 8.01000023e+00f, -6.01000118e+00f, + -1.13078880e+01f, -5.01000071e+00f, -1.56583774e+00f, -1.09359753e+00f, -1.10100021e+01f, -1.98334103e+01f, + 1.52681961e+01f, -1.90041142e+01f, 3.36489248e+00f, -9.56262398e+00f, -1.20996523e+01f, -2.72129118e-01f, + -3.02410049e+01f, 2.69200020e+01f, 3.92368736e+01f, 2.26324520e+01f, 6.70738268e+00f, 1.17682877e+01f, + 3.44367099e+00f, 6.07445717e+00f, 1.16183996e+01f, -1.52756333e+00f, 3.78963509e+01f, 5.69011993e+01f, + -4.74229126e+01f, 5.03915253e+01f, -1.06182041e+01f, 2.55009995e+01f, -4.92481887e-02f, 1.69833050e+01f, + + 1.00999999e+00f, 3.00999999e+00f, -3.01000023e+00f, 4.01000023e+00f, 8.01000023e+00f, -6.01000118e+00f, + -1.13078899e+01f, -8.01000023e+00f, 1.42979193e+01f, + /* Yaw π/3, pitch π/4, roll π/5. */ + 1.00999999e+00f, 4.94489908e+00f, 1.44230127e+00f, 1.62728095e+00f, 2.19220325e-01f, 1.05408239e+01f, + -9.13690281e+00f, 2.76374960e+00f, -7.30904531e+00f, -5.87572050e+00f, 5.30312395e+00f, -8.68215370e+00f, + -2.56833839e+01f, 1.68027866e+00f, -1.88083878e+01f, 7.65365601e+00f, 1.69391327e+01f, -1.73280182e+01f, + 1.46297951e+01f, -5.44671021e+01f, -1.22310352e+01f, -4.08985710e+00f, -9.44422245e+00f, 3.05603528e+00f, + 1.79257303e-01f, -1.00418749e+01f, 2.30900917e+01f, -2.31887093e+01f, 1.17270985e+01f, -6.51830902e+01f, + 4.86715775e+01f, -1.50732088e+01f, 3.87931709e+01f, -2.60395355e+01f, 6.19276857e+00f, -1.76722469e+01f, + + 1.00999999e+00f, 4.94489908e+00f, -8.91142070e-01f, 4.60769463e+00f, 2.19218358e-01f, 1.07733250e+01f, + -8.20476913e+00f, 1.35638294e+01f, -1.20077667e+01f, + /* Rotation around the z-axis, π/6. */ + 1.00999999e+00f, 3.74571109e+00f, 3.00999999e+00f, 2.46776199e+00f, 1.03078890e+01f, 9.20981312e+00f, + 7.01000023e+00f, 3.93186355e+00f, 1.66212186e-01f, 1.60099983e+01f, 1.85040417e+01f, 1.74059658e+01f, + 1.30100002e+01f, 6.12801647e+00f, -2.02994061e+00f, -1.00100012e+01f, 1.31542921e+01f, 2.40099964e+01f, + 2.94322453e+01f, 2.83341675e+01f, 2.10100021e+01f, 9.05622101e+00f, -4.95814323e+00f, -1.80100002e+01f, + -2.72360935e+01f, -4.52033186e+00f, 1.68145428e+01f, 3.40099945e+01f, 4.30924950e+01f, 4.19944229e+01f, + 3.10100002e+01f, 1.27164707e+01f, -8.61839962e+00f, -2.80100021e+01f, -4.08963470e+01f, -4.41905708e+01f, + + 1.00999999e+00f, 3.74571109e+00f, 3.00999999e+00f, 1.59990644e+00f, 1.03078890e+01f, 9.20981312e+00f, + 7.01000023e+00f, 2.33195710e+00f, -4.42189360e+00f, + }; D3DXMatrixRotationX(&m[0], -D3DX_PI / 2.0f); D3DXMatrixRotationX(&m[1], D3DX_PI / 2.0f); @@ -3424,7 +3430,8 @@ static void test_D3DXSHRotate(void) } received_ptr = D3DXSHRotate(out_temp, order, &m[j], in); - ok(received_ptr == out_temp, "Order %u, expected %p, received %p\n", order, out, received_ptr); + ok(received_ptr == out_temp, "Order %u, expected %p, received %p.\n", + order, out, received_ptr); for (i = 0; i < 49; i++) { @@ -3439,8 +3446,9 @@ static void test_D3DXSHRotate(void) expected = table[45 * j + i]; else expected = table[45 * j + 36 +i]; - ok(relative_error(out_temp[i], expected) < admitted_error, - "Order %u index %u, expected %f, received %f\n", order, i, expected, out_temp[i]); + equal = compare_float(out_temp[i], expected, 4096); + ok(equal, "Order %u index %u, expected %.8e, received %.8e.\n", + order, i, expected, out_temp[i]); } } }

1 0

Henri Verbeet : d3dx9/tests: Use compare_float() in test_D3DXSHRotateZ().
by Alexandre Julliard May 4, 2017

May 4, 2017

Module: wine Branch: master Commit: 10db51d5c26f0a71956989ecff83da90f4d94fda URL: http://source.winehq.org/git/wine.git/?a=commit;h=10db51d5c26f0a71956989ecf… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 4 12:06:03 2017 +0200 d3dx9/tests: Use compare_float() in test_D3DXSHRotateZ(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/math.c | 140 ++++++++++++++++++++++++--------------------- 1 file changed, 74 insertions(+), 66 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=10db51d5c26f0a7195698…

1 0

Henri Verbeet : d3dx9/tests: Use compare_float() in test_D3DXSHMultiply4() .
by Alexandre Julliard May 4, 2017

May 4, 2017

Module: wine Branch: master Commit: 201090bef8d913e6d6f8828451ea6e9be737e688 URL: http://source.winehq.org/git/wine.git/?a=commit;h=201090bef8d913e6d6f882845… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri May 5 00:03:57 2017 +0200 d3dx9/tests: Use compare_float() in test_D3DXSHMultiply4(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/math.c | 53 +++++++++++++++++++++++++++++----------------- 1 file changed, 34 insertions(+), 19 deletions(-) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 5675476..1e10b1f 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -3294,23 +3294,29 @@ static void test_D3DXSHMultiply3(void) static void test_D3DXSHMultiply4(void) { + float a[20], b[20], c[20]; unsigned int i; - FLOAT a[20], b[20], c[20]; - /* D3DXSHMultiply4 only modifies the first 16 elements of the array */ - const FLOAT expected[] = - { /* c, a, b */ - 14.182599f, 2.615703f, 12.828601f, 9.820596f, 3.039696f, 4.530442f, - 5.820584f, 12.249846f, 2.194346f, 3.900152f, 5.416609f, 5.601813f, - 0.959982f, 7.037550f, 3.625230f, 0.463601f, 16.0f, 17.0f, 18.0f, 19.0f, - /* c, c, b */ - -211441.265625f, -2529.157715f, -10023.393555f, -441.277191f, -163.994385f, - -526.305115f, 29636.187500f, -3931.830811f, -13577.111328f, -3978.973877f, - -10330.341797f, -13779.787109f, -16685.109375f, -44981.375000f, -73269.742188f, - -95237.335938f, 16.0f, 17.0f, 18.0f, 19.0f, - /* c, c, c */ - 0.236682f, -0.717649f, -0.180500f, -0.077124f, 0.144831f, 0.573286f, - -0.337959f, 0.055694f, -0.442100f, 0.147702f, -0.055157f, 0.084337f, - 0.179877f, 0.009099f, 0.232200f, 0.074142f, 1.6f, 1.7f, 1.8f, 1.9f, }; + BOOL equal; + + /* D3DXSHMultiply4() only modifies the first 16 elements of the array. */ + static const float expected[] = + { + /* c, a, b */ + 1.41825991e+01f, 2.61570334e+00f, 1.28286009e+01f, 9.82059574e+00f, 3.03969646e+00f, 4.53044176e+00f, + 5.82058382e+00f, 1.22498465e+01f, 2.19434643e+00f, 3.90015244e+00f, 5.41660881e+00f, 5.60181284e+00f, + 9.59981740e-01f, 7.03754997e+00f, 3.62523031e+00f, 4.63601470e-01f, 1.60000000e+01f, 1.70000000e+01f, + 1.80000000e+01f, 1.90000000e+01f, + /* c, c, b */ + -2.11441266e+05f, -2.52915771e+03f, -1.00233936e+04f, -4.41277191e+02f, -1.63994385e+02f, -5.26305115e+02f, + 2.96361875e+04f, -3.93183081e+03f, -1.35771113e+04f, -3.97897388e+03f, -1.03303418e+04f, -1.37797871e+04f, + -1.66851094e+04f, -4.49813750e+04f, -7.32697422e+04f, -9.52373359e+04f, 1.60000000e+01f, 1.70000000e+01f, + 1.80000000e+01f, 1.90000000e+01f, + /* c, c, c */ + 2.36682415e-01f, -7.17648506e-01f, -1.80499524e-01f, -7.71235973e-02f, 1.44830629e-01f, 5.73285699e-01f, + -3.37959230e-01f, 5.56938872e-02f, -4.42100227e-01f, 1.47701755e-01f, -5.51566519e-02f, 8.43374059e-02f, + 1.79876596e-01f, 9.09878965e-03f, 2.32199892e-01f, 7.41420984e-02f, 1.60000002e+00f, 1.70000005e+00f, + 1.80000007e+00f, 1.89999998e+00f, + }; for (i = 0; i < 20; i++) { @@ -3321,7 +3327,10 @@ static void test_D3DXSHMultiply4(void) D3DXSHMultiply4(c, a, b); for (i = 0; i < 20; i++) - ok(relative_error(c[i], expected[i]) < admitted_error, "Expected[%d] = %f, received = %f\n", i, expected[i], c[i]); + { + equal = compare_float(c[i], expected[i], 16); + ok(equal, "Expected[%u] = %.8e, received = %.8e.\n", i, expected[i], c[i]); + } for (i = 0; i < 20; i++) { @@ -3331,14 +3340,20 @@ static void test_D3DXSHMultiply4(void) D3DXSHMultiply4(c, c, b); for (i = 0; i < 20; i++) - ok(relative_error(c[i], expected[20 + i]) < admitted_error, "Expected[%d] = %f, received = %f\n", i, expected[20 + i], c[i]); + { + equal = compare_float(c[i], expected[20 + i], 32); + ok(equal, "Expected[%u] = %.8e, received = %.8e.\n", i, expected[20 + i], c[i]); + } for (i = 0; i < 20; i++) c[i] = 0.1f * i; D3DXSHMultiply4(c, c, c); for (i = 0; i < 20; i++) - ok(relative_error(c[i], expected[40 + i]) < admitted_error, "Expected[%d] = %f, received = %f\n", i, expected[40 + i], c[i]); + { + equal = compare_float(c[i], expected[40 + i], 8); + ok(equal, "Expected[%u] = %.8e, received = %.8e.\n", i, expected[40 + i], c[i]); + } } static void test_D3DXSHRotate(void)

1 0

Daniel Lehman : include: Remove references to SPARC.
by Alexandre Julliard May 4, 2017

May 4, 2017

Module: wine Branch: master Commit: 1fdebb77ecb8dcd1d1565457b6f86de36dea39cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fdebb77ecb8dcd1d1565457b… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Wed May 3 23:16:17 2017 -0700 include: Remove references to SPARC. SPARC support removed in 2013. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/basetsd.h | 6 +----- include/msvcrt/crtdefs.h | 2 +- include/windef.h | 2 +- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/include/basetsd.h b/include/basetsd.h index f855352..96ea3f0 100644 --- a/include/basetsd.h +++ b/include/basetsd.h @@ -36,7 +36,7 @@ extern "C" { * 64-bit. */ -#if (defined(__x86_64__) || defined(__powerpc64__) || defined(__sparc64__) || defined(__aarch64__)) && !defined(_WIN64) +#if (defined(__x86_64__) || defined(__powerpc64__) || defined(__aarch64__)) && !defined(_WIN64) #define _WIN64 #endif @@ -277,10 +277,6 @@ typedef ULONG_PTR KAFFINITY, *PKAFFINITY; # undef WORDS_BIGENDIAN # undef BITFIELDS_BIGENDIAN # define ALLOW_UNALIGNED_ACCESS -#elif defined(__sparc__) -# define WORDS_BIGENDIAN -# define BITFIELDS_BIGENDIAN -# undef ALLOW_UNALIGNED_ACCESS #elif defined(__powerpc__) # define WORDS_BIGENDIAN # define BITFIELDS_BIGENDIAN diff --git a/include/msvcrt/crtdefs.h b/include/msvcrt/crtdefs.h index dde5ea1..8aed64c 100644 --- a/include/msvcrt/crtdefs.h +++ b/include/msvcrt/crtdefs.h @@ -29,7 +29,7 @@ # error You cannot use both wine/port.h and msvcrt headers #endif -#if (defined(__x86_64__) || defined(__powerpc64__) || defined(__sparc64__) || defined(__aarch64__)) && !defined(_WIN64) +#if (defined(__x86_64__) || defined(__powerpc64__) || defined(__aarch64__)) && !defined(_WIN64) #define _WIN64 #endif diff --git a/include/windef.h b/include/windef.h index 1e54fcb..e77b1ca 100644 --- a/include/windef.h +++ b/include/windef.h @@ -37,7 +37,7 @@ extern "C" { /* Calling conventions definitions */ -#if (defined(__x86_64__) || defined(__powerpc64__) || defined(__sparc64__) || defined(__aarch64__)) && !defined(_WIN64) +#if (defined(__x86_64__) || defined(__powerpc64__) || defined(__aarch64__)) && !defined(_WIN64) #define _WIN64 #endif

1 0

Henri Verbeet : d3dx9/tests: Use compare_float() in test_D3DXSHEvalDirection().
by Alexandre Julliard May 4, 2017

May 4, 2017

Module: wine Branch: master Commit: 1d165b559f10d0212b2b77e5e433053d54aca958 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d165b559f10d0212b2b77e5e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 4 12:05:55 2017 +0200 d3dx9/tests: Use compare_float() in test_D3DXSHEvalDirection(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/math.c | 34 +++++++++++++++++++++------------- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 93d31a7..6daad35 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -2785,16 +2785,20 @@ static void test_D3DXSHEvalConeLight(void) static void test_D3DXSHEvalDirection(void) { + float a[49], expected, *received_ptr; unsigned int i, order; D3DXVECTOR3 d; - FLOAT a[49], expected[49], *received_ptr; - const FLOAT table[36] = - { 0.282095f, -0.977205f, 1.465808f, -0.488603f, 2.185097f, -6.555291f, - 8.200181f, -3.277646f, -1.638823f, 1.180087f, 17.343668f, -40.220032f, - 47.020218f, -20.110016f, -13.007751f, 6.490479f, -15.020058f, 10.620785f, - 117.325661f, -240.856750f, 271.657288f, -120.428375f, -87.994247f, 58.414314f, - -4.380850f, 24.942520f, -149.447693f, 78.278130f, 747.791748f, -1427.687866f, - 1574.619141, -713.843933f, -560.843811f, 430.529724, -43.588909, -26.911665, }; + BOOL equal; + + static const float table[36] = + { + 2.82094806e-01f, -9.77205038e-01f, 1.46580756e+00f, -4.88602519e-01f, 2.18509698e+00f, -6.55529118e+00f, + 8.20018101e+00f, -3.27764559e-00f, -1.63882279e+00f, 1.18008721e+00f, 1.73436680e+01f, -4.02200317e+01f, + 4.70202179e+01f, -2.01100159e+01f, -1.30077515e+01f, 6.49047947e+00f, -1.50200577e+01f, 1.06207848e+01f, + 1.17325661e+02f, -2.40856750e+02f, 2.71657288e+02f, -1.20428375e+02f, -8.79942474e+01f, 5.84143143e+01f, + -4.38084984e+00f, 2.49425201e+01f, -1.49447693e+02f, 7.82781296e+01f, 7.47791748e+02f, -1.42768787e+03f, + 1.57461914e+03f, -7.13843933e+02f, -5.60843811e+02f, 4.30529724e+02f, -4.35889091e+01f, -2.69116650e+01f, + }; d.x = 1.0; d.y = 2.0f; d.z = 3.0f; @@ -2808,13 +2812,17 @@ static void test_D3DXSHEvalDirection(void) for (i = 0; i < 49; i++) { - /* if the order is < D3DXSH_MINORDER or order > D3DXSH_MAXORDER or the index of the element is greater than order * order - 1, D3DXSHEvalDirection does not modify the output */ - if ( (order < D3DXSH_MINORDER) || (order > D3DXSH_MAXORDER) || (i >= order * order) ) - expected[i] = 1.5f + i; + /* if the order is < D3DXSH_MINORDER or order > D3DXSH_MAXORDER or + * the index of the element is greater than order * order - 1, + * D3DXSHEvalDirection() does not modify the output. */ + if ((order < D3DXSH_MINORDER) || (order > D3DXSH_MAXORDER) || (i >= order * order)) + expected = 1.5f + i; else - expected[i] = table[i]; + expected = table[i]; - ok(relative_error(a[i], expected[i]) < admitted_error, "order %u, index %u: expected %f, received %f\n", order, i, expected[i], a[i]); + equal = compare_float(a[i], expected, 2); + ok(equal, "order %u, index %u: Got unexpected result %.8e, expected %.8e.\n", + order, i, a[i], expected); } } }

1 0

Huw Davies : comdlg32: Scale the control size limits with dpi.
by Alexandre Julliard May 4, 2017

May 4, 2017

Module: wine Branch: master Commit: 6df0198a2b069eee907d551b109f06f8a29ffc25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6df0198a2b069eee907d551b1… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu May 4 19:31:34 2017 +0100 comdlg32: Scale the control size limits with dpi. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comdlg32/itemdlg.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/comdlg32/itemdlg.c b/dlls/comdlg32/itemdlg.c index ccc9eb6..5d0c6e9 100644 --- a/dlls/comdlg32/itemdlg.c +++ b/dlls/comdlg32/itemdlg.c @@ -856,7 +856,7 @@ static inline customctrl *get_cctrl(FileDialogImpl *This, DWORD ctlid) static void ctrl_resize(HWND hctrl, UINT min_width, UINT max_width, BOOL multiline) { LPWSTR text; - UINT len, final_width; + UINT len, final_width, dpi; UINT lines, final_height; SIZE size; RECT rc; @@ -872,8 +872,12 @@ static void ctrl_resize(HWND hctrl, UINT min_width, UINT max_width, BOOL multili hdc = GetDC(hctrl); GetTextExtentPoint32W(hdc, text, lstrlenW(text), &size); + dpi = GetDeviceCaps(hdc, LOGPIXELSX); ReleaseDC(hctrl, hdc); + min_width = MulDiv(min_width, dpi, USER_DEFAULT_SCREEN_DPI); + max_width = MulDiv(max_width, dpi, USER_DEFAULT_SCREEN_DPI); + if(len && multiline) { /* FIXME: line-wrap */

1 0

Paul Gofman : d3dx9: Return shader functions in d3dx9_base_effect_get_pass_desc().
by Alexandre Julliard May 4, 2017

May 4, 2017

Module: wine Branch: master Commit: b7198efd42ad56ce587c8d608ea32068ea43fb72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7198efd42ad56ce587c8d608… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Fri May 5 00:03:50 2017 +0200 d3dx9: Return shader functions in d3dx9_base_effect_get_pass_desc(). Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 210 +++++++++++++++++++++++++------------------ dlls/d3dx9_36/tests/effect.c | 9 +- 2 files changed, 125 insertions(+), 94 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b7198efd42ad56ce587c8…

1 0

Michael Stefaniuc : dmime/tests: Add more InitAudio() tests.
by Alexandre Julliard May 4, 2017

May 4, 2017

Module: wine Branch: master Commit: f221298e610b334f02a30bcc86517c6e3dfb7dc4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f221298e610b334f02a30bcc8… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu May 4 17:17:03 2017 +0200 dmime/tests: Add more InitAudio() tests. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/tests/Makefile.in | 2 +- dlls/dmime/tests/performance.c | 124 ++++++++++++++++++++++++++++++++++++++--- 2 files changed, 118 insertions(+), 8 deletions(-) diff --git a/dlls/dmime/tests/Makefile.in b/dlls/dmime/tests/Makefile.in index 4d4e718..f4c4703 100644 --- a/dlls/dmime/tests/Makefile.in +++ b/dlls/dmime/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = dmime.dll -IMPORTS = user32 ole32 +IMPORTS = user32 ole32 dsound C_SRCS = \ dmime.c \ diff --git a/dlls/dmime/tests/performance.c b/dlls/dmime/tests/performance.c index 8531e38..0932cd9 100644 --- a/dlls/dmime/tests/performance.c +++ b/dlls/dmime/tests/performance.c @@ -31,13 +31,59 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); DEFINE_GUID(GUID_Bunk,0xFFFFFFFF,0xFFFF,0xFFFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF); +static void create_performance(IDirectMusicPerformance8 **performance, IDirectMusic **dmusic, + IDirectSound **dsound, BOOL set_cooplevel) +{ + HRESULT hr; + + hr = CoCreateInstance(&CLSID_DirectMusicPerformance, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicPerformance8, (void **)performance); + ok(hr == S_OK, "DirectMusicPerformance create failed: %08x\n", hr); + if (dmusic) { + hr = CoCreateInstance(&CLSID_DirectMusic, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusic8, + (void **)dmusic); + ok(hr == S_OK, "DirectMusic create failed: %08x\n", hr); + } + if (dsound) { + hr = DirectSoundCreate8(NULL, (IDirectSound8 **)dsound, NULL); + ok(hr == S_OK, "DirectSoundCreate failed: %08x\n", hr); + if (set_cooplevel) { + hr = IDirectSound_SetCooperativeLevel(*dsound, GetForegroundWindow(), DSSCL_PRIORITY); + ok(hr == S_OK, "SetCooperativeLevel failed: %08x\n", hr); + } + } +} + +static void destroy_performance(IDirectMusicPerformance8 *performance, IDirectMusic *dmusic, + IDirectSound *dsound) +{ + HRESULT hr; + + hr = IDirectMusicPerformance8_CloseDown(performance); + ok(hr == S_OK, "CloseDown failed: %08x\n", hr); + IDirectMusicPerformance8_Release(performance); + if (dmusic) + IDirectMusic_Release(dmusic); + if (dsound) + IDirectSound_Release(dsound); +} + +static ULONG get_refcount(void *iface) +{ + IUnknown *unknown = iface; + IUnknown_AddRef(unknown); + return IUnknown_Release(unknown); +} + static HRESULT test_InitAudio(void) { IDirectMusicPerformance8 *performance; + IDirectMusic *dmusic; IDirectSound *dsound; IDirectMusicPort *port; IDirectMusicAudioPath *path; HRESULT hr; + ULONG ref; hr = CoCreateInstance(&CLSID_DirectMusicPerformance, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicPerformance8, (void **)&performance); @@ -70,17 +116,81 @@ static HRESULT test_InitAudio(void) IDirectMusicPerformance8_Release(performance); - hr = CoCreateInstance(&CLSID_DirectMusicPerformance, NULL, CLSCTX_INPROC_SERVER, - &IID_IDirectMusicPerformance8, (void**)&performance); - ok(hr == S_OK, "CoCreateInstance failed: %08x\n", hr); - + /* Auto generated dmusic and dsound */ + create_performance(&performance, NULL, NULL, FALSE); hr = IDirectMusicPerformance8_InitAudio(performance, NULL, NULL, NULL, 0, 64, 0, NULL); ok(hr == S_OK, "InitAudio failed: %08x\n", hr); + destroy_performance(performance, NULL, NULL); + + /* dsound without SetCooperativeLevel() */ + create_performance(&performance, NULL, &dsound, FALSE); + hr = IDirectMusicPerformance8_InitAudio(performance, NULL, &dsound, NULL, 0, 0, 0, NULL); + todo_wine ok(hr == DSERR_PRIOLEVELNEEDED, "InitAudio failed: %08x\n", hr); + destroy_performance(performance, NULL, dsound); + + /* Using the wrong CLSID_DirectSound */ + create_performance(&performance, NULL, NULL, FALSE); + hr = DirectSoundCreate(NULL, &dsound, NULL); + ok(hr == S_OK, "DirectSoundCreate failed: %08x\n", hr); + hr = IDirectMusicPerformance8_InitAudio(performance, NULL, &dsound, NULL, 0, 0, 0, NULL); + todo_wine ok(hr == E_NOINTERFACE, "InitAudio failed: %08x\n", hr); + destroy_performance(performance, NULL, dsound); + + /* Init() works with just a CLSID_DirectSound */ + create_performance(&performance, NULL, NULL, FALSE); + hr = DirectSoundCreate(NULL, &dsound, NULL); + ok(hr == S_OK, "DirectSoundCreate failed: %08x\n", hr); + hr = IDirectSound_SetCooperativeLevel(dsound, GetForegroundWindow(), DSSCL_PRIORITY); + ok(hr == S_OK, "SetCooperativeLevel failed: %08x\n", hr); + hr = IDirectMusicPerformance8_Init(performance, NULL, dsound, NULL); + ok(hr == S_OK, "Init failed: %08x\n", hr); + destroy_performance(performance, NULL, dsound); - hr = IDirectMusicPerformance8_CloseDown(performance); - ok(hr == S_OK, "CloseDown failed: %08x\n", hr); + /* Init() followed by InitAudio() */ + create_performance(&performance, NULL, &dsound, TRUE); + hr = IDirectMusicPerformance8_Init(performance, NULL, dsound, NULL); + ok(hr == S_OK, "Init failed: %08x\n", hr); + hr = IDirectMusicPerformance8_InitAudio(performance, NULL, &dsound, NULL, 0, 0, 0, NULL); + ok(hr == DMUS_E_ALREADY_INITED, "InitAudio failed: %08x\n", hr); + destroy_performance(performance, NULL, dsound); - IDirectMusicPerformance8_Release(performance); + /* Provided dmusic and dsound */ + create_performance(&performance, &dmusic, &dsound, TRUE); + hr = IDirectMusicPerformance8_InitAudio(performance, &dmusic, &dsound, NULL, 0, 64, 0, NULL); + ok(hr == S_OK, "InitAudio failed: %08x\n", hr); + ref = get_refcount(dsound); + ok(ref == 2, "dsound ref count got %d expected 2\n", ref); + ref = get_refcount(dmusic); + ok(ref == 2, "dmusic ref count got %d expected 2\n", ref); + destroy_performance(performance, dmusic, dsound); + + /* Provided dmusic initialized with SetDirectSound */ + create_performance(&performance, &dmusic, &dsound, TRUE); + IDirectMusic_SetDirectSound(dmusic, dsound, NULL); + ok(hr == S_OK, "SetDirectSound failed: %08x\n", hr); + ref = get_refcount(dsound); + todo_wine ok(ref == 2, "dsound ref count got %d expected 2\n", ref); + hr = IDirectMusicPerformance8_InitAudio(performance, &dmusic, NULL, NULL, 0, 64, 0, NULL); + ok(hr == S_OK, "InitAudio failed: %08x\n", hr); + ref = get_refcount(dsound); + todo_wine ok(ref == 2, "dsound ref count got %d expected 2\n", ref); + ref = get_refcount(dmusic); + ok(ref == 2, "dmusic ref count got %d expected 2\n", ref); + destroy_performance(performance, dmusic, dsound); + + /* Provided dmusic and dsound, dmusic initialized with SetDirectSound */ + create_performance(&performance, &dmusic, &dsound, TRUE); + IDirectMusic_SetDirectSound(dmusic, dsound, NULL); + ok(hr == S_OK, "SetDirectSound failed: %08x\n", hr); + ref = get_refcount(dsound); + todo_wine ok(ref == 2, "dsound ref count got %d expected 2\n", ref); + hr = IDirectMusicPerformance8_InitAudio(performance, &dmusic, &dsound, NULL, 0, 64, 0, NULL); + ok(hr == S_OK, "InitAudio failed: %08x\n", hr); + ref = get_refcount(dsound); + todo_wine ok(ref == 3, "dsound ref count got %d expected 3\n", ref); + ref = get_refcount(dmusic); + ok(ref == 2, "dmusic ref count got %d expected 2\n", ref); + destroy_performance(performance, dmusic, dsound); return S_OK; }

1 0