August 2022 - Wine-commits - list.winehq.org

Dmitry Timoshkov : ntdll/tests: Fix compilation with PSDK.
by Alexandre Julliard 02 Aug '22

02 Aug '22

Module: wine Branch: master Commit: bfec2a663778aee350a8ea5560b41b346da067b5 URL: https://gitlab.winehq.org/wine/wine/-/commit/bfec2a663778aee350a8ea5560b41b… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jul 28 17:22:23 2022 +0300 ntdll/tests: Fix compilation with PSDK. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/om.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index ddbdce0281c..7fe0fb59f89 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -2078,7 +2078,7 @@ static void test_token(void) status = pNtOpenThreadToken( GetCurrentThread(), TOKEN_ALL_ACCESS, TRUE, (HANDLE *)0xdeadbee0 ); ok( status == STATUS_ACCESS_VIOLATION, "NtOpenProcessToken failed: %lx\n", status); handle = (HANDLE)0xdeadbeef; - status = NtOpenProcessToken( (HANDLE)0xdead, TOKEN_ALL_ACCESS, &handle ); + status = pNtOpenProcessToken( (HANDLE)0xdead, TOKEN_ALL_ACCESS, &handle ); ok( status == STATUS_INVALID_HANDLE, "NtOpenProcessToken failed: %lx\n", status); ok( !handle || broken(handle == (HANDLE)0xdeadbeef) /* vista */, "handle set %p\n", handle ); handle = (HANDLE)0xdeadbeef; @@ -2526,7 +2526,7 @@ static void test_query_directory(void) RtlInitUnicodeString( &string, L"\\BaseNamedObjects\\winetest" ); InitializeObjectAttributes( &attr, &string, 0, 0, NULL ); - status = NtCreateDirectoryObject( &dir, DIRECTORY_QUERY, &attr ); + status = pNtCreateDirectoryObject( &dir, DIRECTORY_QUERY, &attr ); ok( !status, "got %#lx\n", status ); context = 0xdeadbeef; @@ -2717,9 +2717,9 @@ static void test_query_directory(void) ok( !memcmp( &info[1], &empty_info, sizeof(*info) ), "entry was not cleared\n" ); } - NtClose( child1 ); - NtClose( child2 ); - NtClose( dir ); + pNtClose( child1 ); + pNtClose( child2 ); + pNtClose( dir ); } START_TEST(om)

1 0

Dmitry Timoshkov : ntdll/tests: Add a bunch of tests for creating kernel objects with the names containing '\0'.
by Alexandre Julliard 02 Aug '22

02 Aug '22

Module: wine Branch: master Commit: 9d9b564e4b9d533fa700f402e6be8ba91c132bce URL: https://gitlab.winehq.org/wine/wine/-/commit/9d9b564e4b9d533fa700f402e6be8b… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jul 28 17:22:27 2022 +0300 ntdll/tests: Add a bunch of tests for creating kernel objects with the names containing '\0'. As the tests show after creating a kernel object with name "wine_test\0" it's possible to only open it as "wine_test\0", an attempt opening it as "wine_test" fails with STATUS_OBJECT_NAME_NOT_FOUND, and vice versa. Also the tests show that "wine\0test" is a valid kernel object name. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/om.c | 350 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 349 insertions(+), 1 deletion(-)

1 0

Rafał Harabień : include: Allow printing test failure messages in bright red.
by Alexandre Julliard 02 Aug '22

02 Aug '22

Module: wine Branch: master Commit: 549969a6fb4b3206cda595f688d8b1f166313f20 URL: https://gitlab.winehq.org/wine/wine/-/commit/549969a6fb4b3206cda595f688d8b1… Author: Rafał Harabień <rafalh1992(a)o2.pl> Date: Sun Mar 27 12:26:14 2022 -0500 include: Allow printing test failure messages in bright red. Colours are disabled by default, and can be enabled using WINETEST_COLOR=1. --- include/wine/test.h | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/include/wine/test.h b/include/wine/test.h index 6d18dfa3915..2bfdb56da0c 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -199,6 +199,9 @@ int winetest_report_success = 0; /* silence todos and skips above this threshold */ int winetest_mute_threshold = 42; +/* use ANSI escape codes for output coloring */ +static int winetest_color; + /* passing arguments around */ static int winetest_argc; static char** winetest_argv; @@ -277,6 +280,9 @@ const char *winetest_elapsed(void) return wine_dbg_sprintf( "%.3f", (now - winetest_start_time) / 1000.0); } +static const char color_reset[] = "\e[0m"; +static const char color_bright_red[] = "\e[1;91m"; + static void winetest_printf( const char *msg, ... ) __WINE_PRINTF_ATTR(1,2); static void winetest_printf( const char *msg, ... ) { @@ -374,8 +380,10 @@ int winetest_vok( int condition, const char *msg, va_list args ) { if (!condition) { + if (winetest_color) printf( color_bright_red ); winetest_print_context( "Test failed: " ); vprintf(msg, args); + if (winetest_color) printf( color_reset ); InterlockedIncrement(&failures); return 0; } @@ -656,6 +664,7 @@ int main( int argc, char **argv ) else if (running_under_wine()) winetest_platform = "wine"; + if (GetEnvironmentVariableA( "WINETEST_COLOR", p, sizeof(p) )) winetest_color = atoi(p); if (GetEnvironmentVariableA( "WINETEST_DEBUG", p, sizeof(p) )) winetest_debug = atoi(p); if (GetEnvironmentVariableA( "WINETEST_INTERACTIVE", p, sizeof(p) )) winetest_interactive = atoi(p); if (GetEnvironmentVariableA( "WINETEST_REPORT_SUCCESS", p, sizeof(p) )) winetest_report_success = atoi(p);

1 0

Zebediah Figura : include: Print "succeeded inside todo block" messages in colour.
by Alexandre Julliard 02 Aug '22

02 Aug '22

Module: wine Branch: master Commit: 05386fd0ac29b3e2f3a713965b77cac6b76f3bd4 URL: https://gitlab.winehq.org/wine/wine/-/commit/05386fd0ac29b3e2f3a713965b77ca… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Mar 27 12:27:01 2022 -0500 include: Print "succeeded inside todo block" messages in colour. --- include/wine/test.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/wine/test.h b/include/wine/test.h index 2bfdb56da0c..91b586d24e4 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -281,6 +281,7 @@ const char *winetest_elapsed(void) } static const char color_reset[] = "\e[0m"; +static const char color_dark_red[] = "\e[31m"; static const char color_bright_red[] = "\e[1;91m"; static void winetest_printf( const char *msg, ... ) __WINE_PRINTF_ATTR(1,2); @@ -354,8 +355,10 @@ int winetest_vok( int condition, const char *msg, va_list args ) { if (condition) { + if (winetest_color) printf( color_dark_red ); winetest_print_context( "Test succeeded inside todo block: " ); vprintf(msg, args); + if (winetest_color) printf( color_reset ); InterlockedIncrement(&todo_failures); return 0; }

1 0

Zebediah Figura : include: Print "test marked todo" messages in colour.
by Alexandre Julliard 02 Aug '22

02 Aug '22

Module: wine Branch: master Commit: 90cdc49d26c824ec48eb519def8dc723e52d4b98 URL: https://gitlab.winehq.org/wine/wine/-/commit/90cdc49d26c824ec48eb519def8dc7… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Mar 27 12:27:39 2022 -0500 include: Print "test marked todo" messages in colour. --- include/wine/test.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/wine/test.h b/include/wine/test.h index 91b586d24e4..107c658dcf9 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -282,6 +282,7 @@ const char *winetest_elapsed(void) static const char color_reset[] = "\e[0m"; static const char color_dark_red[] = "\e[31m"; +static const char color_yellow[] = "\e[33m"; static const char color_bright_red[] = "\e[1;91m"; static void winetest_printf( const char *msg, ... ) __WINE_PRINTF_ATTR(1,2); @@ -369,8 +370,10 @@ int winetest_vok( int condition, const char *msg, va_list args ) { if (winetest_debug > 0) { + if (winetest_color) printf( color_yellow ); winetest_print_context( "Test marked todo: " ); vprintf(msg, args); + if (winetest_color) printf( color_reset ); } InterlockedIncrement(&todo_successes); }

1 0

Zebediah Figura : include: Print "test skipped" messages in colour.
by Alexandre Julliard 02 Aug '22

02 Aug '22

Module: wine Branch: master Commit: 2bf75f91068263ddeb697738e650f16b4fe47384 URL: https://gitlab.winehq.org/wine/wine/-/commit/2bf75f91068263ddeb697738e650f1… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Mar 27 12:27:50 2022 -0500 include: Print "test skipped" messages in colour. --- include/wine/test.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/wine/test.h b/include/wine/test.h index 107c658dcf9..e2f473008ee 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -283,6 +283,7 @@ const char *winetest_elapsed(void) static const char color_reset[] = "\e[0m"; static const char color_dark_red[] = "\e[31m"; static const char color_yellow[] = "\e[33m"; +static const char color_blue[] = "\e[34m"; static const char color_bright_red[] = "\e[1;91m"; static void winetest_printf( const char *msg, ... ) __WINE_PRINTF_ATTR(1,2); @@ -436,8 +437,10 @@ void winetest_vskip( const char *msg, va_list args ) { if (winetest_add_line() < winetest_mute_threshold) { + if (winetest_color) printf( color_blue ); winetest_print_context( "Tests skipped: " ); vprintf(msg, args); + if (winetest_color) printf( color_reset ); InterlockedIncrement(&skipped); } else

1 0

Zebediah Figura : include: Print "test succeeded" messages in colour.
by Alexandre Julliard 02 Aug '22

02 Aug '22

Module: wine Branch: master Commit: 5b1bb09bbd59913ed5b795a980909bb97b33a57f URL: https://gitlab.winehq.org/wine/wine/-/commit/5b1bb09bbd59913ed5b795a980909b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Mar 27 12:27:58 2022 -0500 include: Print "test succeeded" messages in colour. --- include/wine/test.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/wine/test.h b/include/wine/test.h index e2f473008ee..7779e252dd7 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -282,6 +282,7 @@ const char *winetest_elapsed(void) static const char color_reset[] = "\e[0m"; static const char color_dark_red[] = "\e[31m"; +static const char color_green[] = "\e[32m"; static const char color_yellow[] = "\e[33m"; static const char color_blue[] = "\e[34m"; static const char color_bright_red[] = "\e[1;91m"; @@ -399,7 +400,9 @@ int winetest_vok( int condition, const char *msg, va_list args ) if (winetest_report_success || (winetest_time && GetTickCount() >= winetest_last_time + 1000)) { + if (winetest_color) printf( color_green ); winetest_printf("Test succeeded\n"); + if (winetest_color) printf( color_reset ); } InterlockedIncrement(&successes); return 1;

1 0

Shaun Ren : webservices: Handle in/out parameters properly in WsCall.
by Alexandre Julliard 02 Aug '22

02 Aug '22

Module: wine Branch: master Commit: 86895f07a0810ca32d15ebbafddb9c8b102ad626 URL: https://gitlab.winehq.org/wine/wine/-/commit/86895f07a0810ca32d15ebbafddb9c… Author: Shaun Ren <sren(a)codeweavers.com> Date: Fri Jul 22 20:52:09 2022 -0400 webservices: Handle in/out parameters properly in WsCall. Signed-off-by: Shaun Ren <sren(a)codeweavers.com> --- dlls/webservices/tests/proxy.c | 104 +++++++++++++++++++++++++++++++++++++++++ dlls/webservices/writer.c | 21 +++++++-- 2 files changed, 121 insertions(+), 4 deletions(-) diff --git a/dlls/webservices/tests/proxy.c b/dlls/webservices/tests/proxy.c index 9d6292be4c9..f03ae7b9844 100644 --- a/dlls/webservices/tests/proxy.c +++ b/dlls/webservices/tests/proxy.c @@ -694,6 +694,108 @@ static void test_empty_response( int port ) WsFreeHeap( heap ); } +static const char req_test4[] = + "<s:Envelope xmlns:s=\"http://schemas.xmlsoap.org/soap/envelope/\"><s:Body>" + "<req_test4 xmlns=\"ns\"><str>test4</str><val>1</val><val>2</val><val>3</val></req_test4>" + "</s:Body></s:Envelope>"; + +static const char resp_test4[] = + "<s:Envelope xmlns:s=\"http://schemas.xmlsoap.org/soap/envelope/\"><s:Body>" + "<resp_test4 xmlns=\"ns\"><str>out4</str><val>4</val><val>5</val></resp_test4>" + "</s:Body></s:Envelope>"; + +static void test_inout_params( int port ) +{ + WS_XML_STRING str = {3, (BYTE *)"str"}; + WS_XML_STRING req = {3, (BYTE *)"req"}; + WS_XML_STRING resp = {4, (BYTE *)"resp"}; + WS_XML_STRING req_elem = {9, (BYTE *)"req_test4"}; + WS_XML_STRING resp_elem = {10, (BYTE *)"resp_test4"}; + WS_XML_STRING req_action = {9, (BYTE *)"req_test4"}; + WS_XML_STRING resp_action = {10, (BYTE *)"resp_test4"}; + WS_XML_STRING val = {3, (BYTE *)"val"}; + WS_XML_STRING ns = {2, (BYTE *)"ns"}; + HRESULT hr; + WS_SERVICE_PROXY *proxy; + WS_OPERATION_DESCRIPTION op; + WS_MESSAGE_DESCRIPTION input_msg, output_msg; + WS_ELEMENT_DESCRIPTION input_elem, output_elem; + WS_STRUCT_DESCRIPTION input_struct, output_struct; + WS_FIELD_DESCRIPTION f, f2, *fields[2]; + WS_PARAMETER_DESCRIPTION param[3]; + const void *args[3]; + WS_HEAP *heap; + INT32 val_array[] = {1, 2, 3}; + WCHAR **str_ptr; + INT32 **val_ptr; + ULONG *count_ptr; + struct data + { + WCHAR *str; + ULONG count; + INT32 *val; + } data; + + hr = WsCreateHeap( 1 << 16, 0, NULL, 0, &heap, NULL ); + ok( hr == S_OK, "got %#lx\n", hr ); + + hr = WsCall( NULL, NULL, NULL, NULL, NULL, 0, NULL, NULL ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); + + hr = create_proxy( port, &proxy ); + ok( hr == S_OK, "got %#lx\n", hr ); + + hr = WsCall( proxy, NULL, NULL, NULL, NULL, 0, NULL, NULL ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); + + set_field_desc( &f, WS_ELEMENT_FIELD_MAPPING, &str, &ns, WS_WSZ_TYPE, NULL, + FIELD_OFFSET(struct data, str), 0, 0, NULL, NULL ); + set_field_desc( &f2, WS_REPEATING_ELEMENT_FIELD_MAPPING, NULL, NULL, WS_INT32_TYPE, NULL, + FIELD_OFFSET(struct data, val), 0, FIELD_OFFSET(struct data, count), &val, &ns ); + + fields[0] = &f; + fields[1] = &f2; + + set_struct_desc( &input_struct, sizeof(struct data), TYPE_ALIGNMENT(struct data), 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 ); + + set_struct_desc( &output_struct, sizeof(struct data), TYPE_ALIGNMENT(struct data), fields, 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 ); + + set_param_desc( &param[0], WS_PARAMETER_TYPE_NORMAL, 0, 0 ); + set_param_desc( &param[1], WS_PARAMETER_TYPE_ARRAY, 1, 1 ); + set_param_desc( &param[2], WS_PARAMETER_TYPE_ARRAY_COUNT, 1, 1 ); + + set_op_desc( &op, &input_msg, &output_msg, 3, param ); + + data.str = (WCHAR *) L"test4"; + data.count = ARRAY_SIZE(val_array); + data.val = val_array; + + str_ptr = &data.str; + val_ptr = &data.val; + count_ptr = &data.count; + + args[0] = &str_ptr; + args[1] = &val_ptr; + args[2] = &count_ptr; + + hr = WsCall( proxy, &op, args, heap, NULL, 0, NULL, NULL ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( !wcscmp( data.str, L"out4" ), "wrong str\n" ); + ok( data.count == 2, "got %lu\n", data.count ); + ok( data.val[0] == 4, "got %u\n", data.val[0] ); + ok( data.val[1] == 5, "got %u\n", data.val[1] ); + + hr = WsCloseServiceProxy( proxy, NULL, NULL ); + ok( hr == S_OK, "got %#lx\n", hr ); + + WsFreeServiceProxy( proxy ); + WsFreeHeap( heap ); +} + static const char status_200[] = "HTTP/1.1 200 OK\r\n"; static const struct @@ -710,6 +812,7 @@ tests[] = { "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 }, + { "req_test4", req_test4, sizeof(req_test4)-1, status_200, resp_test4, sizeof(resp_test4)-1 }, }; static void send_response( int c, const char *status, const char *data, unsigned int len ) @@ -843,6 +946,7 @@ START_TEST(proxy) test_WsReceiveMessage( info.port ); test_WsCall( info.port ); test_empty_response( info.port ); + test_inout_params( info.port ); test_WsSendMessage( info.port, &quit ); WaitForSingleObject( thread, 3000 ); diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index cd40b8ad8f6..a4cfc94f08e 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -4904,7 +4904,10 @@ static ULONG get_array_len( const WS_PARAMETER_DESCRIPTION *params, ULONG count, { if (params[i].inputMessageIndex != index || params[i].parameterType != WS_PARAMETER_TYPE_ARRAY_COUNT) continue; - if (args[i]) ret = *(const ULONG *)args[i]; + if (params[i].outputMessageIndex != INVALID_PARAMETER_INDEX) + ret = **(const ULONG **)args[i]; + else + ret = *(const ULONG *)args[i]; break; } return ret; @@ -4949,12 +4952,22 @@ HRESULT write_input_params( WS_XML_WRITER *handle, const WS_ELEMENT_DESCRIPTION if ((hr = get_param_desc( desc_struct, params[i].inputMessageIndex, &desc_field )) != S_OK) goto done; if (params[i].parameterType == WS_PARAMETER_TYPE_NORMAL) { - if ((hr = write_param( writer, desc_field, args[i] )) != S_OK) goto done; + const void *ptr; + if (params[i].outputMessageIndex != INVALID_PARAMETER_INDEX) + ptr = *(const void **)args[i]; + else + ptr = args[i]; + if ((hr = write_param( writer, desc_field, ptr )) != S_OK) goto done; } else if (params[i].parameterType == WS_PARAMETER_TYPE_ARRAY) { - const void *ptr = *(const void **)args[i]; - ULONG len = get_array_len( params, count, params[i].inputMessageIndex, args ); + const void *ptr; + ULONG len; + if (params[i].outputMessageIndex != INVALID_PARAMETER_INDEX) + ptr = **(const void ***)args[i]; + else + ptr = *(const void **)args[i]; + len = get_array_len( params, count, params[i].inputMessageIndex, args ); if ((hr = write_param_array( writer, desc_field, ptr, len )) != S_OK) goto done; } }

1 0

Shaun Ren : webservices: Write the correct headers when a request message is addressed.
by Alexandre Julliard 02 Aug '22

02 Aug '22

Module: wine Branch: master Commit: a8d7d1e06fa10c745fac9b47c3294cf2e304dbe5 URL: https://gitlab.winehq.org/wine/wine/-/commit/a8d7d1e06fa10c745fac9b47c3294c… Author: Shaun Ren <sren(a)codeweavers.com> Date: Sat Jul 23 02:05:07 2022 -0400 webservices: Write the correct headers when a request message is addressed. Signed-off-by: Shaun Ren <sren(a)codeweavers.com> --- dlls/webservices/msg.c | 22 ++++++++++++---------- dlls/webservices/tests/msg.c | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+), 10 deletions(-) diff --git a/dlls/webservices/msg.c b/dlls/webservices/msg.c index 092e9aabc5d..98d43660957 100644 --- a/dlls/webservices/msg.c +++ b/dlls/webservices/msg.c @@ -625,23 +625,25 @@ static HRESULT write_headers( struct msg *msg, WS_MESSAGE_INITIALIZATION init, W if ((hr = write_action_header( writer, prefix_env, ns_env, prefix_addr, ns_addr, msg->action )) != S_OK) return hr; - if (init == WS_REPLY_MESSAGE) + if (init == WS_REPLY_MESSAGE || init == WS_FAULT_MESSAGE) { if ((hr = write_relatesto_header( writer, prefix_env, ns_env, prefix_addr, ns_addr, &msg->id_req )) != S_OK) return hr; } - else if (msg->addr.length) - { - if ((hr = write_to_header( writer, prefix_env, ns_env, prefix_addr, ns_addr, &msg->addr )) != S_OK) - return hr; - } else { - if (init == WS_REQUEST_MESSAGE && - (hr = write_msgid_header( writer, prefix_env, ns_env, prefix_addr, ns_addr, &msg->id )) != S_OK) return hr; + if (init == WS_REQUEST_MESSAGE) + { + if ((hr = write_msgid_header(writer, prefix_env, ns_env, prefix_addr, ns_addr, &msg->id)) != S_OK) + return hr; + if (msg->version_addr == WS_ADDRESSING_VERSION_0_9 && + (hr = write_replyto_header(writer, prefix_env, ns_env, prefix_addr, ns_addr)) != S_OK) + return hr; + } - if (msg->version_addr == WS_ADDRESSING_VERSION_0_9 && - (hr = write_replyto_header( writer, prefix_env, ns_env, prefix_addr, ns_addr )) != S_OK) return hr; + if (msg->addr.length && + (hr = write_to_header(writer, prefix_env, ns_env, prefix_addr, ns_addr, &msg->addr)) != S_OK) + return hr; } for (i = 0; i < msg->header_count; i++) diff --git a/dlls/webservices/tests/msg.c b/dlls/webservices/tests/msg.c index 3c741c48ce3..2af2dd334e7 100644 --- a/dlls/webservices/tests/msg.c +++ b/dlls/webservices/tests/msg.c @@ -408,10 +408,26 @@ static void test_WsWriteEnvelopeStart(void) static const char expected8[] = "<s:Envelope xmlns:a=\"http://www.w3.org/2005/08/addressing\" " "xmlns:s=\"http://schemas.xmlsoap.org/soap/envelope/\"><s:Header/><s:Body/></s:Envelope>"; + static const char expected9[] = + "<s:Envelope xmlns:a=\"http://schemas.xmlsoap.org/ws/2004/08/addressing\" " + "xmlns:s=\"http://schemas.xmlsoap.org/soap/envelope/\"><s:Header>" + "<a:MessageID>urn:uuid:00000000-0000-0000-0000-000000000000</a:MessageID>" + "<a:ReplyTo><a:Address>http://schemas.xmlsoap.org/ws/2004/08/addressing/role/anonymous</a:Address>" + "</a:ReplyTo><a:To s:mustUnderstand=\"1\">http://localhost/</a:To></s:Header><s:Body/></s:Envelope>"; + static const char expected10[] = + "<s:Envelope xmlns:a=\"http://www.w3.org/2005/08/addressing\" " + "xmlns:s=\"http://schemas.xmlsoap.org/soap/envelope/\"><s:Header>" + "<a:MessageID>urn:uuid:00000000-0000-0000-0000-000000000000</a:MessageID>" + "<a:To s:mustUnderstand=\"1\">http://localhost/</a:To></s:Header><s:Body/></s:Envelope>"; HRESULT hr; WS_MESSAGE *msg; WS_XML_WRITER *writer; WS_MESSAGE_STATE state; + WS_ENDPOINT_ADDRESS addr; + + memset( &addr, 0, sizeof(addr) ); + addr.url.chars = (WCHAR *) L"http://localhost/"; + addr.url.length = 17; hr = WsWriteEnvelopeStart( NULL, NULL, NULL, NULL, NULL ); ok( hr == E_INVALIDARG, "got %#lx\n", hr ); @@ -509,6 +525,30 @@ static void test_WsWriteEnvelopeStart(void) check_output_header( msg, expected8, -1, 0, 0, __LINE__ ); WsFreeMessage( msg ); + hr = WsCreateMessage( WS_ENVELOPE_VERSION_SOAP_1_1, WS_ADDRESSING_VERSION_0_9, NULL, 0, &msg, NULL ); + ok( hr == S_OK, "got %#lx\n", hr ); + hr = WsInitializeMessage( msg, WS_REQUEST_MESSAGE, NULL, NULL ); + ok( hr == S_OK, "got %#lx\n", hr ); + hr = WsAddressMessage( msg, &addr, NULL ); + hr = set_output( writer ); + ok( hr == S_OK, "got %#lx\n", hr ); + hr = WsWriteEnvelopeStart( msg, writer, NULL, NULL, NULL ); + ok( hr == S_OK, "got %#lx\n", hr ); + check_output_header( msg, expected9, -1, strstr(expected9, "urn:uuid:") - expected9, 46, __LINE__ ); + WsFreeMessage( msg ); + + hr = WsCreateMessage( WS_ENVELOPE_VERSION_SOAP_1_1, WS_ADDRESSING_VERSION_1_0, NULL, 0, &msg, NULL ); + ok( hr == S_OK, "got %#lx\n", hr ); + hr = WsInitializeMessage( msg, WS_REQUEST_MESSAGE, NULL, NULL ); + ok( hr == S_OK, "got %#lx\n", hr ); + hr = WsAddressMessage( msg, &addr, NULL ); + hr = set_output( writer ); + ok( hr == S_OK, "got %#lx\n", hr ); + hr = WsWriteEnvelopeStart( msg, writer, NULL, NULL, NULL ); + ok( hr == S_OK, "got %#lx\n", hr ); + check_output_header( msg, expected10, -1, strstr(expected10, "urn:uuid:") - expected10, 46, __LINE__ ); + WsFreeMessage( msg ); + hr = WsCreateMessage( WS_ENVELOPE_VERSION_SOAP_1_2, WS_ADDRESSING_VERSION_1_0, NULL, 0, &msg, NULL ); ok( hr == S_OK, "got %#lx\n", hr ); hr = WsInitializeMessage( msg, WS_REQUEST_MESSAGE, NULL, NULL );

1 0

Rémi Bernon : winex11.drv: Constify set_current_mode DEVMODEW parameter.
by Alexandre Julliard 02 Aug '22

02 Aug '22

Module: wine Branch: master Commit: d7457fd32e17cbadbccee2faf2c0738765389094 URL: https://gitlab.winehq.org/wine/wine/-/commit/d7457fd32e17cbadbccee2faf2c073… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jul 29 14:02:42 2022 +0200 winex11.drv: Constify set_current_mode DEVMODEW parameter. --- dlls/winex11.drv/desktop.c | 2 +- dlls/winex11.drv/display.c | 2 +- dlls/winex11.drv/x11drv.h | 2 +- dlls/winex11.drv/xrandr.c | 4 ++-- dlls/winex11.drv/xvidmode.c | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index 3e589f9d940..84457582a7c 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -218,7 +218,7 @@ static BOOL X11DRV_desktop_get_current_mode( ULONG_PTR id, DEVMODEW *mode ) return TRUE; } -static LONG X11DRV_desktop_set_current_mode( ULONG_PTR id, DEVMODEW *mode ) +static LONG X11DRV_desktop_set_current_mode( ULONG_PTR id, const DEVMODEW *mode ) { if (mode->dmFields & DM_BITSPERPEL && mode->dmBitsPerPel != screen_bpp) WARN("Cannot change screen color depth from %dbits to %dbits!\n", screen_bpp, mode->dmBitsPerPel); diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index ef379e1ea9f..0af9ceeac08 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -144,7 +144,7 @@ static BOOL nores_get_current_mode(ULONG_PTR id, DEVMODEW *mode) return TRUE; } -static LONG nores_set_current_mode(ULONG_PTR id, DEVMODEW *mode) +static LONG nores_set_current_mode(ULONG_PTR id, const DEVMODEW *mode) { WARN("NoRes settings handler, ignoring mode change request.\n"); return DISP_CHANGE_SUCCESSFUL; diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 0fe29d8e322..b8997455324 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -741,7 +741,7 @@ struct x11drv_settings_handler * mode must be a valid mode from get_modes() with optional fields, such as dmPosition set. * * Return DISP_CHANGE_*, same as ChangeDisplaySettingsExW() return values */ - LONG (*set_current_mode)(ULONG_PTR id, DEVMODEW *mode); + LONG (*set_current_mode)(ULONG_PTR id, const DEVMODEW *mode); }; extern void X11DRV_Settings_SetHandler(const struct x11drv_settings_handler *handler) DECLSPEC_HIDDEN; diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index d3b96e3170b..5b81fb07709 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -282,7 +282,7 @@ static BOOL xrandr10_get_current_mode( ULONG_PTR id, DEVMODEW *mode ) return TRUE; } -static LONG xrandr10_set_current_mode( ULONG_PTR id, DEVMODEW *mode ) +static LONG xrandr10_set_current_mode( ULONG_PTR id, const DEVMODEW *mode ) { XRRScreenConfiguration *screen_config; Rotation rotation; @@ -1544,7 +1544,7 @@ done: return ret; } -static LONG xrandr14_set_current_mode( ULONG_PTR id, DEVMODEW *mode ) +static LONG xrandr14_set_current_mode( ULONG_PTR id, const DEVMODEW *mode ) { unsigned int screen_width, screen_height; RROutput output = (RROutput)id, *outputs; diff --git a/dlls/winex11.drv/xvidmode.c b/dlls/winex11.drv/xvidmode.c index 4ca7bc1ac59..27831cabd3b 100644 --- a/dlls/winex11.drv/xvidmode.c +++ b/dlls/winex11.drv/xvidmode.c @@ -215,7 +215,7 @@ static BOOL xf86vm_get_current_mode(ULONG_PTR id, DEVMODEW *mode) return TRUE; } -static LONG xf86vm_set_current_mode(ULONG_PTR id, DEVMODEW *mode) +static LONG xf86vm_set_current_mode(ULONG_PTR id, const DEVMODEW *mode) { XF86VidModeModeInfo *xf86vm_mode; Bool ret;

1 0