February 2017 - Wine-commits

Henri Verbeet : wined3d: Pass a texture and sub-resource index to context_acquire().
by Alexandre Julliard 15 Feb '17

15 Feb '17

Module: wine Branch: master Commit: 2641c5c28f407fb157028c8e7dda5e306b6b313c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2641c5c28f407fb157028c8e7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 15 14:17:15 2017 +0100 wined3d: Pass a texture and sub-resource index to context_acquire(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 6 +++--- dlls/wined3d/buffer.c | 14 +++++++------- dlls/wined3d/context.c | 35 +++++++++++++++-------------------- dlls/wined3d/device.c | 21 ++++++++++++--------- dlls/wined3d/drawprim.c | 4 ++-- dlls/wined3d/glsl_shader.c | 2 +- dlls/wined3d/query.c | 31 +++++++++++++++++++------------ dlls/wined3d/sampler.c | 4 ++-- dlls/wined3d/surface.c | 37 +++++++++++++++++++++---------------- dlls/wined3d/swapchain.c | 8 ++++---- dlls/wined3d/texture.c | 20 ++++++++++---------- dlls/wined3d/view.c | 6 +++--- dlls/wined3d/wined3d_private.h | 2 +- 13 files changed, 100 insertions(+), 90 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2641c5c28f407fb157028…

1 0

Henri Verbeet : wined3d: Use context_acquire() in create_primary_opengl_context().
by Alexandre Julliard 15 Feb '17

15 Feb '17

Module: wine Branch: master Commit: ef6e838298338b87ee384d6d3b9f8871509ffd25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef6e838298338b87ee384d6d3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 15 14:17:16 2017 +0100 wined3d: Use context_acquire() in create_primary_opengl_context(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 487c870..37cb819 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -998,27 +998,8 @@ static HRESULT create_primary_opengl_context(struct wined3d_device *device, stru return hr; } - /* Recreate the primary swapchain's context. */ - if (!(swapchain->context = HeapAlloc(GetProcessHeap(), 0, sizeof(*swapchain->context)))) - { - ERR("Failed to allocate memory for swapchain context array.\n"); - device->blitter->free_private(device); - device->shader_backend->shader_free_private(device); - return E_OUTOFMEMORY; - } - target = swapchain->back_buffers ? swapchain->back_buffers[0] : swapchain->front_buffer; - if (!(context = context_create(swapchain, target, swapchain->ds_format))) - { - WARN("Failed to create context.\n"); - HeapFree(GetProcessHeap(), 0, swapchain->context); - device->blitter->free_private(device); - device->shader_backend->shader_free_private(device); - return E_FAIL; - } - - swapchain->context[0] = context; - swapchain->num_contexts = 1; + context = context_acquire(device, target, 0); create_dummy_textures(device, context); create_default_samplers(device, context); context_release(context);

1 0

Hans Leidekker : webservices: Fix use of month as array index.
by Alexandre Julliard 15 Feb '17

15 Feb '17

Module: wine Branch: master Commit: aaab5410a1b76de6f8aeb1e2fa4d8ca27e717c61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aaab5410a1b76de6f8aeb1e2f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Feb 15 14:17:09 2017 +0100 webservices: Fix use of month as array index. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/writer.c | 4 ++++ dlls/webservices/writer.c | 5 ++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/webservices/tests/writer.c b/dlls/webservices/tests/writer.c index 039de55..be6504d 100644 --- a/dlls/webservices/tests/writer.c +++ b/dlls/webservices/tests/writer.c @@ -2716,6 +2716,10 @@ static void test_datetime(void) { 0x701ce51ced5d800, WS_DATETIME_FORMAT_LOCAL, S_OK, "<t>1601-01-01T07:00:00+00:00</t>", "<t>1601-01-01T01:00:00-06:00</t>" /* win7 */ }, { 0, WS_DATETIME_FORMAT_NONE + 1, WS_E_INVALID_FORMAT }, + { 0x38a080649c000, WS_DATETIME_FORMAT_UTC, S_OK, "<t>0004-02-28T00:00:00Z</t>" }, + { 0x38ad130b38000, WS_DATETIME_FORMAT_UTC, S_OK, "<t>0004-02-29T00:00:00Z</t>" }, + { 0x8c1505f0e438000, WS_DATETIME_FORMAT_UTC, S_OK, "<t>2000-02-29T00:00:00Z</t>" }, + { 0x8d46035e7870000, WS_DATETIME_FORMAT_UTC, S_OK, "<t>2017-03-01T00:00:00Z</t>" }, }; HRESULT hr; WS_XML_WRITER *writer; diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index f01a5a0..4415a24 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -1203,7 +1203,7 @@ static inline int year_size( int year ) static ULONG format_datetime( const WS_DATETIME *ptr, unsigned char *buf ) { static const char fmt[] = "%04u-%02u-%02uT%02u:%02u:%02u"; - int day, hour, min, sec, sec_frac, month = 1, year = 1, tz_hour; + int day, hour, min, sec, sec_frac, month = 0, year = 1, tz_hour; unsigned __int64 ticks, day_ticks; ULONG len; @@ -1235,9 +1235,8 @@ static ULONG format_datetime( const WS_DATETIME *ptr, unsigned char *buf ) day -= month_days[leap_year( year )][month]; month++; } - day++; - len = sprintf( (char *)buf, fmt, year, month, day, hour, min, sec ); + len = sprintf( (char *)buf, fmt, year, month + 1, day + 1, hour, min, sec ); if (sec_frac) { static const char fmt_frac[] = ".%07u";

1 0

Hans Leidekker : webservices/tests: Add helpers to set various description structures.
by Alexandre Julliard 15 Feb '17

15 Feb '17

Module: wine Branch: master Commit: a0ea3bd74130920b5086e23ced878d4bb9cf30a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0ea3bd74130920b5086e23ce… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Feb 15 14:17:10 2017 +0100 webservices/tests: Add helpers to set various description structures. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/proxy.c | 201 ++++++++++++++++++++--------------------- 1 file changed, 96 insertions(+), 105 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a0ea3bd74130920b5086e…

1 0

Hans Leidekker : webservices/tests: Add more tests for WsReadEnvelopeStart.
by Alexandre Julliard 15 Feb '17

15 Feb '17

Module: wine Branch: master Commit: 2c1ce1a02532bc896936ffdcd68675426e200491 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c1ce1a02532bc896936ffdcd… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Feb 15 14:17:11 2017 +0100 webservices/tests: Add more tests for WsReadEnvelopeStart. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/msg.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/dlls/webservices/tests/msg.c b/dlls/webservices/tests/msg.c index f481948..b13a97e 100644 --- a/dlls/webservices/tests/msg.c +++ b/dlls/webservices/tests/msg.c @@ -912,6 +912,7 @@ static void test_WsReadEnvelopeStart(void) WS_MESSAGE *msg, *msg2; WS_XML_READER *reader; WS_MESSAGE_STATE state; + const WS_XML_NODE *node; HRESULT hr; hr = WsReadEnvelopeStart( NULL, NULL, NULL, NULL, NULL ); @@ -946,6 +947,24 @@ static void test_WsReadEnvelopeStart(void) ok( hr == S_OK, "got %08x\n", hr ); ok( state == WS_MESSAGE_STATE_READING, "got %u\n", state ); + hr = WsGetReaderNode( reader, &node, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( node->nodeType == WS_XML_NODE_TYPE_END_ELEMENT, "got %u\n", node->nodeType ); + + hr = WsReadEndElement( reader, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsGetReaderNode( reader, &node, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( node->nodeType == WS_XML_NODE_TYPE_END_ELEMENT, "got %u\n", node->nodeType ); + + hr = WsReadEndElement( reader, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsGetReaderNode( reader, &node, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( node->nodeType == WS_XML_NODE_TYPE_EOF, "got %u\n", node->nodeType ); + WsFreeMessage( msg ); WsFreeMessage( msg2 ); WsFreeReader( reader );

1 0

Hans Leidekker : webservices/tests: Add an empty response message test.
by Alexandre Julliard 15 Feb '17

15 Feb '17

Module: wine Branch: master Commit: e231ee53b49f510717e2b58b7c9a08d6d213b77c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e231ee53b49f510717e2b58b7… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Feb 15 14:17:12 2017 +0100 webservices/tests: Add an empty response message test. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/proxy.c | 100 ++++++++++++++++++++++++++++++++++++----- 1 file changed, 88 insertions(+), 12 deletions(-) diff --git a/dlls/webservices/tests/proxy.c b/dlls/webservices/tests/proxy.c index 80ac40b..79f6444 100644 --- a/dlls/webservices/tests/proxy.c +++ b/dlls/webservices/tests/proxy.c @@ -42,7 +42,7 @@ static inline void set_field_desc( WS_FIELD_DESCRIPTION *desc, WS_FIELD_MAPPING static inline void set_struct_desc( WS_STRUCT_DESCRIPTION *desc, ULONG size, ULONG alignment, WS_FIELD_DESCRIPTION **fields, ULONG count, WS_XML_STRING *localname, - WS_XML_STRING *ns ) + WS_XML_STRING *ns, ULONG options ) { memset( desc, 0, sizeof(*desc) ); desc->size = size; @@ -51,6 +51,7 @@ static inline void set_struct_desc( WS_STRUCT_DESCRIPTION *desc, ULONG size, ULO desc->fieldCount = count; desc->typeLocalName = localname; desc->typeNs = ns; + desc->structOptions = options; } static inline void set_elem_desc( WS_ELEMENT_DESCRIPTION *desc, WS_XML_STRING *localname, WS_XML_STRING *ns, @@ -412,7 +413,7 @@ static void test_WsCall( int port ) fields[0] = &f; fields[1] = &f4; - set_struct_desc( &input_struct, sizeof(struct input), TYPE_ALIGNMENT(struct input), fields, 2, &req, &ns ); + set_struct_desc( &input_struct, sizeof(struct input), TYPE_ALIGNMENT(struct input), fields, 2, &req, &ns, 0 ); set_elem_desc( &input_elem, &req_elem, &ns, WS_STRUCT_TYPE, &input_struct ); set_msg_desc( &input_msg, &req_action, &input_elem ); @@ -423,7 +424,7 @@ static void test_WsCall( int port ) fields2[0] = &f2; fields2[1] = &f3; - set_struct_desc( &output_struct, sizeof(struct output), TYPE_ALIGNMENT(struct output), fields2, 2, &resp, &ns ); + set_struct_desc( &output_struct, sizeof(struct output), TYPE_ALIGNMENT(struct output), fields2, 2, &resp, &ns, 0 ); set_elem_desc( &output_elem, &resp_elem, &ns, WS_STRUCT_TYPE, &output_struct ); set_msg_desc( &output_msg, &resp_action, &output_elem ); @@ -473,31 +474,105 @@ static void test_WsCall( int port ) WsFreeHeap( heap ); } +static const char req_test3[] = + "<s:Envelope xmlns:s=\"http://schemas.xmlsoap.org/soap/envelope/\"><s:Body>" + "<req_test3 xmlns=\"ns\"><val>1</val></req_test3>" + "</s:Body></s:Envelope>"; + +static const char resp_test3[] = + "<s:Envelope xmlns:s=\"http://schemas.xmlsoap.org/soap/envelope/\"><s:Body/></s:Envelope>"; + +static void test_empty_response( int port ) +{ + WS_XML_STRING req = {3, (BYTE *)"req"}; + WS_XML_STRING resp = {4, (BYTE *)"resp"}; + WS_XML_STRING req_action = {9, (BYTE *)"req_test3"}; + WS_XML_STRING resp_action = {10, (BYTE *)"resp_test3"}; + WS_XML_STRING req_elem = {9, (BYTE *)"req_test3"}; + WS_XML_STRING resp_elem = {10, (BYTE *)"resp_test3"}; + WS_XML_STRING ns = {2, (BYTE *)"ns"}; + WS_XML_STRING ns2 = {0, (BYTE *)""}; + WS_XML_STRING val = {3, (BYTE *)"val"}; + HRESULT hr; + WS_SERVICE_PROXY *proxy; + WS_FIELD_DESCRIPTION f, *fields[1]; + WS_STRUCT_DESCRIPTION input_struct, output_struct; + WS_ELEMENT_DESCRIPTION input_elem, output_elem; + WS_MESSAGE_DESCRIPTION input_msg, output_msg; + WS_PARAMETER_DESCRIPTION param[1]; + WS_OPERATION_DESCRIPTION op; + const void *args[1]; + WS_HEAP *heap; + struct input + { + INT32 val; + } in; + + hr = WsCreateHeap( 1 << 16, 0, NULL, 0, &heap, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = create_proxy( port, &proxy ); + ok( hr == S_OK, "got %08x\n", hr ); + + set_field_desc( &f, WS_ELEMENT_FIELD_MAPPING, &val, &ns, WS_INT32_TYPE, NULL, 0, 0, 0, NULL, NULL ); + fields[0] = &f; + + set_struct_desc( &input_struct, sizeof(struct input), TYPE_ALIGNMENT(struct input), fields, 1, &req, &ns, 0 ); + set_elem_desc( &input_elem, &req_elem, &ns, WS_STRUCT_TYPE, &input_struct ); + set_msg_desc( &input_msg, &req_action, &input_elem ); + + set_struct_desc( &output_struct, 0, 1, NULL, 0, &resp, &ns2, 0x6 ); + set_elem_desc( &output_elem, &resp_elem, &ns, WS_STRUCT_TYPE, NULL ); + set_msg_desc( &output_msg, &resp_action, &output_elem ); + + set_param_desc( param, WS_PARAMETER_TYPE_NORMAL, 0, 0xffff ); + set_op_desc( &op, &input_msg, &output_msg, 1, param ); + + in.val = 1; + args[0] = &in.val; + hr = WsCall( proxy, &op, args, heap, NULL, 0, NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + set_elem_desc( &output_elem, &resp_elem, &ns, WS_STRUCT_TYPE, &output_struct ); + hr = WsCall( proxy, &op, args, heap, NULL, 0, NULL, NULL ); + ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + + hr = WsCloseServiceProxy( proxy, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + WsFreeServiceProxy( proxy ); + WsFreeHeap( heap ); +} + +static const char status_200[] = "HTTP/1.1 200 OK\r\n"; + static const struct { const char *req_action; const char *req_data; unsigned int req_len; - const char *resp_action; + const char *resp_status; const char *resp_data; unsigned int resp_len; } tests[] = { - { "req_test1", req_test1, sizeof(req_test1)-1, "resp_test1", resp_test1, sizeof(resp_test1)-1 }, - { "req_test2", req_test2, sizeof(req_test2)-1, "resp_test2", resp_test2, sizeof(resp_test2)-1 }, + { "req_test1", req_test1, sizeof(req_test1)-1, status_200, resp_test1, sizeof(resp_test1)-1 }, + { "req_test2", req_test2, sizeof(req_test2)-1, status_200, resp_test2, sizeof(resp_test2)-1 }, + { "req_test3", req_test3, sizeof(req_test3)-1, status_200, resp_test3, sizeof(resp_test3)-1 }, }; -static void send_response( int c, const char *action, const char *data, unsigned int len ) +static void send_response( int c, const char *status, const char *data, unsigned int len ) { static const char headers[] = - "HTTP/1.1 200 OK\r\nContent-Type: text/xml; charset=utf-8\r\nConnection: close\r\n"; + "Content-Type: text/xml; charset=utf-8\r\nConnection: close\r\n"; static const char fmt[] = - "SOAPAction: \"%s\"\r\nContent-Length: %u\r\n\r\n"; + "Content-Length: %u\r\n\r\n"; char buf[128]; + send( c, status, strlen(status), 0 ); send( c, headers, sizeof(headers) - 1, 0 ); - sprintf( buf, fmt, action, len ); + sprintf( buf, fmt, len ); send( c, buf, strlen(buf), 0 ); send( c, data, len, 0 ); } @@ -571,9 +646,9 @@ static DWORD CALLBACK server_proc( void *arg ) ok( tests[j].req_len == data_len, "%u: unexpected data length %u %u\n", j, data_len, tests[j].req_len ); if (tests[j].req_len == data_len) - ok( !memcmp( tests[j].req_data, buf, tests[j].req_len ), "%u: unexpected data\n", j ); + ok( !memcmp( tests[j].req_data, buf, tests[j].req_len ), "%u: unexpected data %s\n", j, buf ); } - send_response( c, tests[j].resp_action, tests[j].resp_data, tests[j].resp_len ); + send_response( c, tests[j].resp_status, tests[j].resp_data, tests[j].resp_len ); break; } } @@ -610,6 +685,7 @@ START_TEST(proxy) test_WsSendMessage( info.port, &test1 ); test_WsReceiveMessage( info.port ); test_WsCall( info.port ); + test_empty_response( info.port ); test_WsSendMessage( info.port, &quit ); WaitForSingleObject( thread, 3000 );

1 0

Francois Gouget : winhttp: Add __WINE_ALLOC_SIZE attributes to heap_xxx() functions.
by Alexandre Julliard 15 Feb '17

15 Feb '17

Module: wine Branch: master Commit: c43dd195de0ca0016ed248aace6ac55056541592 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c43dd195de0ca0016ed248aac… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Feb 8 17:53:47 2017 +0100 winhttp: Add __WINE_ALLOC_SIZE attributes to heap_xxx() functions. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/winhttp_private.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index 388fc33..46c2aaa 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -306,22 +306,22 @@ void destroy_authinfo( struct authinfo * ) DECLSPEC_HIDDEN; extern HRESULT WinHttpRequest_create( void ** ) DECLSPEC_HIDDEN; void release_typelib( void ) DECLSPEC_HIDDEN; -static inline void *heap_alloc( SIZE_T size ) +static inline void* __WINE_ALLOC_SIZE(1) heap_alloc( SIZE_T size ) { return HeapAlloc( GetProcessHeap(), 0, size ); } -static inline void *heap_alloc_zero( SIZE_T size ) +static inline void* __WINE_ALLOC_SIZE(1) heap_alloc_zero( SIZE_T size ) { return HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, size ); } -static inline void *heap_realloc( LPVOID mem, SIZE_T size ) +static inline void* __WINE_ALLOC_SIZE(2) heap_realloc( LPVOID mem, SIZE_T size ) { return HeapReAlloc( GetProcessHeap(), 0, mem, size ); } -static inline void *heap_realloc_zero( LPVOID mem, SIZE_T size ) +static inline void* __WINE_ALLOC_SIZE(2) heap_realloc_zero( LPVOID mem, SIZE_T size ) { return HeapReAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, mem, size ); }

1 0

Sebastian Lackner : wined3d: Add a missing call to context_release.
by Alexandre Julliard 15 Feb '17

15 Feb '17

Module: wine Branch: master Commit: f9c6488394a53fbac160c613a61215d15068542d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9c6488394a53fbac160c613a… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Feb 14 23:15:30 2017 +0100 wined3d: Add a missing call to context_release. Spotted by Michael Müller. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 37cb819..a7ee5bc 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4138,6 +4138,7 @@ void CDECL wined3d_device_update_sub_resource(struct wined3d_device *device, str if (!wined3d_buffer_load_location(buffer, context, WINED3D_LOCATION_BUFFER)) { ERR("Failed to load buffer location.\n"); + context_release(context); return; }

1 0

Michael Stefaniuc : ddraw/tests: Fix double assigment to the same lvalue ( coccinellery).
by Alexandre Julliard 15 Feb '17

15 Feb '17

Module: wine Branch: master Commit: 427c607a6c976a09ffcb7d28171d54e14d032a92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=427c607a6c976a09ffcb7d281… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Feb 15 10:50:28 2017 +0100 ddraw/tests: Fix double assigment to the same lvalue (coccinellery). Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 2 +- dlls/ddraw/tests/ddraw2.c | 2 +- dlls/ddraw/tests/ddraw4.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 278b9c6..c682466 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -9579,7 +9579,7 @@ static void test_transform_vertices(void) * y as ((y + 0) * 2 + 1) * 5. The 5 comes from dvScaleX/Y, 2 from * the view matrix and the +1's from the world and projection matrix. */ vp_data.dwX = 0; - vp_data.dwX = 0; + vp_data.dwY = 0; vp_data.dwWidth = 256; vp_data.dwHeight = 256; vp_data.dvScaleX = 5.0f; diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index db09e5d..d6491ea 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -10954,7 +10954,7 @@ static void test_transform_vertices(void) * y as ((y + 0) * 2 + 1) * 5. The 5 comes from dvScaleX/Y, 2 from * the view matrix and the +1's from the world and projection matrix. */ vp_data.dwX = 0; - vp_data.dwX = 0; + vp_data.dwY = 0; vp_data.dwWidth = 256; vp_data.dwHeight = 256; vp_data.dvScaleX = 5.0f; diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 830da89..bda2ebf 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -12252,7 +12252,7 @@ static void test_transform_vertices(void) * y as ((y + 0) * 2 + 1) * 5. The 5 comes from dvScaleX/Y, 2 from * the view matrix and the +1's from the world and projection matrix. */ vp_data.dwX = 0; - vp_data.dwX = 0; + vp_data.dwY = 0; vp_data.dwWidth = 256; vp_data.dwHeight = 256; vp_data.dvScaleX = 5.0f;

1 0

Michael Stefaniuc : dplayx: Fix multiple assigments to the same lvalue ( coccinellery).
by Alexandre Julliard 15 Feb '17

15 Feb '17

Module: wine Branch: master Commit: 7ae50b230d0b49693470ee06244970c4393eb119 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ae50b230d0b49693470ee062… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Feb 15 10:53:01 2017 +0100 dplayx: Fix multiple assigments to the same lvalue (coccinellery). Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dplayx/dplayx_messages.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/dplayx/dplayx_messages.c b/dlls/dplayx/dplayx_messages.c index 95cc15f..6f6636c 100644 --- a/dlls/dplayx/dplayx_messages.c +++ b/dlls/dplayx/dplayx_messages.c @@ -301,10 +301,10 @@ HRESULT DP_MSG_ForwardPlayerCreation( IDirectPlayImpl *This, DPID dpidServer ) lpMsgBody->dpidAppServer2 = dpidServer; lpMsgBody->unknown3[0] = 0x0; - lpMsgBody->unknown3[0] = 0x0; - lpMsgBody->unknown3[0] = 0x20; - lpMsgBody->unknown3[0] = 0x0; - lpMsgBody->unknown3[0] = 0x0; + lpMsgBody->unknown3[1] = 0x0; + lpMsgBody->unknown3[2] = 0x20; + lpMsgBody->unknown3[3] = 0x0; + lpMsgBody->unknown3[4] = 0x0; lpMsgBody->dpidAppServer3 = dpidServer; lpMsgBody->unknown4[0] = 0x30;

1 0