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

André Hentschel : winebuild: Emit relay debugging thunks for ARM64.
by Alexandre Julliard June 13, 2017

June 13, 2017

Module: wine Branch: master Commit: eed3bb6dfd52a4e520bd9e2d86ed186b9f3cc688 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eed3bb6dfd52a4e520bd9e2d8… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jun 12 20:30:43 2017 +0200 winebuild: Emit relay debugging thunks for ARM64. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/spec32.c | 39 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 38 insertions(+), 1 deletion(-) diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index f3feb0f..39733b2 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -84,7 +84,9 @@ static int has_relays( DLLSPEC *spec ) { int i; - if (target_cpu != CPU_x86 && target_cpu != CPU_x86_64 && target_cpu != CPU_ARM) return 0; + if (target_cpu != CPU_x86 && target_cpu != CPU_x86_64 && + target_cpu != CPU_ARM && target_cpu != CPU_ARM64) + return 0; for (i = spec->base; i <= spec->limit; i++) { @@ -242,6 +244,41 @@ static void output_relay_debug( DLLSPEC *spec ) break; } + case CPU_ARM64: + switch (args) + { + default: + case 8: + case 7: output( "\tstp x6, x7, [SP,#-16]!\n" ); + /* fall through */ + case 6: + case 5: output( "\tstp x4, x5, [SP,#-16]!\n" ); + /* fall through */ + case 4: + case 3: output( "\tstp x2, x3, [SP,#-16]!\n" ); + /* fall through */ + case 2: + case 1: output( "\tstp x0, x1, [SP,#-16]!\n" ); + /* fall through */ + case 0: break; + } + output( "\tstp x29, x30, [SP,#-16]!\n" ); + output( "\tstp x8, x9, [SP,#-16]!\n" ); + output( "\tmov x2, SP\n"); + if (odp->flags & FLAG_RET64) flags |= 1; + output( "\tmov w1, #%u\n", (flags << 24) ); + if (args) output( "\tadd w1, w1, #%u\n", (args << 16) ); + if (i - spec->base) output( "\tadd w1, w1, #%u\n", i - spec->base ); + output( "\tldr x0, 1f\n"); + output( "\tldr x3, [x0, #8]\n"); + output( "\tblr x3\n"); + output( "\tadd SP, SP, #16\n" ); + output( "\tldp x29, x30, [SP], #16\n" ); + if (args) output( "\tadd SP, SP, #%u\n", 8 * ((min(args, 8) + 1) & 0xe) ); + output( "\tret\n"); + output( "\t1: .quad .L__wine_spec_relay_descr\n"); + break; + case CPU_x86_64: output( "\tsubq $40,%%rsp\n" ); output_cfi( ".cfi_adjust_cfa_offset 40" );

1 0

Hugh McMaster : regedit/tests: Test case sensitivity when creating and deleting registry keys.
by Alexandre Julliard June 13, 2017

June 13, 2017

Module: wine Branch: master Commit: 955766a13b9668250d83ef9d22cd11786923f393 URL: http://source.winehq.org/git/wine.git/?a=commit;h=955766a13b9668250d83ef9d2… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Jun 13 12:42:48 2017 +0000 regedit/tests: Test case sensitivity when creating and deleting registry keys. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/tests/regedit.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index b2e65a8..b53023e 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -1206,6 +1206,19 @@ static void test_key_creation_and_deletion(void) verify_key_nonexist(hkey, "Subkey2a"); verify_key_nonexist(hkey, "Subkey2b"); + /* Test case sensitivity when creating and deleting registry keys. */ + exec_import_str("REGEDIT4\n\n" + "[hkey_CURRENT_user\\" KEY_BASE "\\Subkey3a]\n\n" + "[HkEy_CuRrEnT_uSeR\\" KEY_BASE "\\SuBkEy3b]\n\n"); + todo_wine verify_key_exist(hkey, "Subkey3a"); + todo_wine verify_key_exist(hkey, "Subkey3b"); + + exec_import_str("REGEDIT4\n\n" + "[-HKEY_current_USER\\" KEY_BASE "\\sUBKEY3A]\n\n" + "[-hKeY_cUrReNt_UsEr\\" KEY_BASE "\\sUbKeY3B]\n\n"); + verify_key_nonexist(hkey, "Subkey3a"); + verify_key_nonexist(hkey, "Subkey3b"); + lr = RegCloseKey(hkey); ok(lr == ERROR_SUCCESS, "RegCloseKey failed: got %d, expected 0\n", lr);

1 0

Hugh McMaster : reg/tests: Test case sensitivity when creating and deleting registry keys.
by Alexandre Julliard June 13, 2017

June 13, 2017

Module: wine Branch: master Commit: 16b1ab0e92f07752e738e657079edd764fc1fa5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=16b1ab0e92f07752e738e6570… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Jun 13 12:42:31 2017 +0000 reg/tests: Test case sensitivity when creating and deleting registry keys. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index cc8dc10..e574a97 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -1687,6 +1687,21 @@ static void test_import(void) todo_wine verify_key_nonexist(hkey, "Subkey2a"); todo_wine verify_key_nonexist(hkey, "Subkey2b"); + /* Test case sensitivity when creating and deleting registry keys. */ + test_import_str("REGEDIT4\n\n" + "[hkey_CURRENT_user\\" KEY_BASE "\\Subkey3a]\n\n" + "[HkEy_CuRrEnT_uSeR\\" KEY_BASE "\\SuBkEy3b]\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_key_exist(hkey, "Subkey3a"); + todo_wine verify_key_exist(hkey, "Subkey3b"); + + test_import_str("REGEDIT4\n\n" + "[-HKEY_current_USER\\" KEY_BASE "\\sUBKEY3A]\n\n" + "[-hKeY_cUrReNt_UsEr\\" KEY_BASE "\\sUbKeY3B]\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_key_nonexist(hkey, "Subkey3a"); + todo_wine verify_key_nonexist(hkey, "Subkey3b"); + /* Test value deletion. We start by creating some registry values. */ test_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" @@ -2575,6 +2590,21 @@ static void test_import(void) todo_wine verify_key_nonexist(hkey, "Subkey2a"); todo_wine verify_key_nonexist(hkey, "Subkey2b"); + /* Test case sensitivity when creating and deleting registry keys. */ + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[hkey_CURRENT_user\\" KEY_BASE "\\Subkey3a]\n\n" + "[HkEy_CuRrEnT_uSeR\\" KEY_BASE "\\SuBkEy3b]\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_key_exist(hkey, "Subkey3a"); + todo_wine verify_key_exist(hkey, "Subkey3b"); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[-HKEY_current_USER\\" KEY_BASE "\\sUBKEY3A]\n\n" + "[-hKeY_cUrReNt_UsEr\\" KEY_BASE "\\sUbKeY3B]\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_key_nonexist(hkey, "Subkey3a"); + todo_wine verify_key_nonexist(hkey, "Subkey3b"); + /* Test value deletion. We start by creating some registry values. */ test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n"

1 0

Matteo Bruni : advapi32/tests: Allow an additional result on newer Win10.
by Alexandre Julliard June 13, 2017

June 13, 2017

Module: wine Branch: master Commit: 282168516428cd7593622550e6bbf6899b0cddb6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=282168516428cd7593622550e… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Jun 12 20:34:36 2017 +0200 advapi32/tests: Allow an additional result on newer Win10. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/security.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 34bde87..fa3211c 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -5858,7 +5858,8 @@ static void test_process_access(void) case GENERIC_WRITE: ok(access == map[i].mapped || access == (map[i].mapped | PROCESS_TERMINATE) /* before Vista */ || - access == (map[i].mapped | PROCESS_SET_LIMITED_INFORMATION) /* win8 */, + access == (map[i].mapped | PROCESS_SET_LIMITED_INFORMATION) /* win8 */ || + access == (map[i].mapped | PROCESS_QUERY_LIMITED_INFORMATION | PROCESS_SET_LIMITED_INFORMATION) /* Win10 Anniversary Update */, "%d: expected %#x, got %#x\n", i, map[i].mapped, access); break; case GENERIC_EXECUTE:

1 0

Hugh McMaster : regedit/tests: Test the accepted range of the hex-based data types.
by Alexandre Julliard June 13, 2017

June 13, 2017

Module: wine Branch: master Commit: 5058fa70a303072ac0ab0bee097e393c70e75cf9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5058fa70a303072ac0ab0bee0… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Jun 13 12:42:58 2017 +0000 regedit/tests: Test the accepted range of the hex-based data types. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/tests/regedit.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index b53023e..b7d6de3 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -445,6 +445,28 @@ static void test_basic_import(void) lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE "\\Subkey/2"); ok(lr == ERROR_SUCCESS, "got %d, expected 0\n", lr); + /* Test the accepted range of the hex-based data types */ + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine13a\"=hex(0):56,61,6c,75,65,00\n" + "\"Wine13b\"=hex(10):56,61,6c,75,65,00\n" + "\"Wine13c\"=hex(100):56,61,6c,75,65,00\n" + "\"Wine13d\"=hex(1000):56,61,6c,75,65,00\n" + "\"Wine13e\"=hex(7fff):56,61,6c,75,65,00\n" + "\"Wine13f\"=hex(ffff):56,61,6c,75,65,00\n" + "\"Wine13g\"=hex(7fffffff):56,61,6c,75,65,00\n" + "\"Wine13h\"=hex(ffffffff):56,61,6c,75,65,00\n" + "\"Wine13i\"=hex(100000000):56,61,6c,75,65,00\n\n"); + verify_reg(hkey, "Wine13a", REG_NONE, "Value", 6, 0); + verify_reg(hkey, "Wine13b", 0x10, "Value", 6, 0); + verify_reg(hkey, "Wine13c", 0x100, "Value", 6, 0); + verify_reg(hkey, "Wine13d", 0x1000, "Value", 6, 0); + verify_reg(hkey, "Wine13e", 0x7fff, "Value", 6, 0); + verify_reg(hkey, "Wine13f", 0xffff, "Value", 6, 0); + verify_reg(hkey, "Wine13g", 0x7fffffff, "Value", 6, 0); + verify_reg(hkey, "Wine13h", 0xffffffff, "Value", 6, 0); + todo_wine verify_reg_nonexist(hkey, "Wine13i"); + RegCloseKey(hkey); lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE);

1 0

Hugh McMaster : reg/tests: Test the accepted range of the hex-based data types.
by Alexandre Julliard June 13, 2017

June 13, 2017

Module: wine Branch: master Commit: 325e672546fc17086c3cbccd3c03f934852bb215 URL: http://source.winehq.org/git/wine.git/?a=commit;h=325e672546fc17086c3cbccd3… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Jun 13 12:42:40 2017 +0000 reg/tests: Test the accepted range of the hex-based data types. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index e574a97..d285910 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -1736,6 +1736,29 @@ static void test_import(void) todo_wine verify_reg_nonexist(hkey, "Wine46e"); todo_wine verify_reg(hkey, "Wine46f", REG_NONE, "V\0a\0l\0u\0e\0\0", 12, 0); + /* Test the accepted range of the hex-based data types */ + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine47a\"=hex(0):56,61,6c,75,65,00\n" + "\"Wine47b\"=hex(10):56,61,6c,75,65,00\n" + "\"Wine47c\"=hex(100):56,61,6c,75,65,00\n" + "\"Wine47d\"=hex(1000):56,61,6c,75,65,00\n" + "\"Wine47e\"=hex(7fff):56,61,6c,75,65,00\n" + "\"Wine47f\"=hex(ffff):56,61,6c,75,65,00\n" + "\"Wine47g\"=hex(7fffffff):56,61,6c,75,65,00\n" + "\"Wine47h\"=hex(ffffffff):56,61,6c,75,65,00\n" + "\"Wine47i\"=hex(100000000):56,61,6c,75,65,00\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg(hkey, "Wine47a", REG_NONE, "Value", 6, 0); + todo_wine verify_reg(hkey, "Wine47b", 0x10, "Value", 6, 0); + todo_wine verify_reg(hkey, "Wine47c", 0x100, "Value", 6, 0); + todo_wine verify_reg(hkey, "Wine47d", 0x1000, "Value", 6, 0); + todo_wine verify_reg(hkey, "Wine47e", 0x7fff, "Value", 6, 0); + todo_wine verify_reg(hkey, "Wine47f", 0xffff, "Value", 6, 0); + todo_wine verify_reg(hkey, "Wine47g", 0x7fffffff, "Value", 6, 0); + todo_wine verify_reg(hkey, "Wine47h", 0xffffffff, "Value", 6, 0); + todo_wine verify_reg_nonexist(hkey, "Wine47i"); + err = RegCloseKey(hkey); todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); @@ -2640,6 +2663,29 @@ static void test_import(void) todo_wine verify_reg_nonexist(hkey, "Wine46e"); todo_wine verify_reg(hkey, "Wine46f", REG_NONE, "V\0a\0l\0u\0e\0\0", 12, 0); + /* Test the accepted range of the hex-based data types */ + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine47a\"=hex(0):56,61,6c,75,65,00\n" + "\"Wine47b\"=hex(10):56,61,6c,75,65,00\n" + "\"Wine47c\"=hex(100):56,61,6c,75,65,00\n" + "\"Wine47d\"=hex(1000):56,61,6c,75,65,00\n" + "\"Wine47e\"=hex(7fff):56,61,6c,75,65,00\n" + "\"Wine47f\"=hex(ffff):56,61,6c,75,65,00\n" + "\"Wine47g\"=hex(7fffffff):56,61,6c,75,65,00\n" + "\"Wine47h\"=hex(ffffffff):56,61,6c,75,65,00\n" + "\"Wine47i\"=hex(100000000):56,61,6c,75,65,00\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg(hkey, "Wine47a", REG_NONE, "Value", 6, 0); + todo_wine verify_reg(hkey, "Wine47b", 0x10, "Value", 6, 0); + todo_wine verify_reg(hkey, "Wine47c", 0x100, "Value", 6, 0); + todo_wine verify_reg(hkey, "Wine47d", 0x1000, "Value", 6, 0); + todo_wine verify_reg(hkey, "Wine47e", 0x7fff, "Value", 6, 0); + todo_wine verify_reg(hkey, "Wine47f", 0xffff, "Value", 6, 0); + todo_wine verify_reg(hkey, "Wine47g", 0x7fffffff, "Value", 6, 0); + todo_wine verify_reg(hkey, "Wine47h", 0xffffffff, "Value", 6, 0); + todo_wine verify_reg_nonexist(hkey, "Wine47i"); + err = RegCloseKey(hkey); todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err);

1 0

Hermès Bélusca-Maïto : advapi32/tests: Fix build with MSVC.
by Alexandre Julliard June 13, 2017

June 13, 2017

Module: wine Branch: master Commit: 2cd8eb39896cb7c0a4d82d0252f627761a08bbf1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cd8eb39896cb7c0a4d82d025… Author: Hermès Bélusca-Maïto <hermes.belusca(a)sfr.fr> Date: Tue Jun 13 11:51:15 2017 +0200 advapi32/tests: Fix build with MSVC. Signed-off-by: Thomas Faber <thomas.faber(a)reactos.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/eventlog.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/advapi32/tests/eventlog.c b/dlls/advapi32/tests/eventlog.c index 838454e..8c78dcf 100644 --- a/dlls/advapi32/tests/eventlog.c +++ b/dlls/advapi32/tests/eventlog.c @@ -1209,7 +1209,7 @@ static void test_start_trace(void) ret = StartTraceA(&handle, sessionname, properties); todo_wine ok(ret == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", ret); - properties->Wnode.Guid = (GUID){0}; + memset(&properties->Wnode.Guid, 0, sizeof(properties->Wnode.Guid)); properties->LogFileNameOffset = 0; ret = StartTraceA(&handle, sessionname, properties);

1 0

Józef Kucia : wined3d: Do not declare pixel shader inputs when they are not used.
by Alexandre Julliard June 13, 2017

June 13, 2017

Module: wine Branch: master Commit: 2b77c00b8ffb0eb36c7e179740f360a9be056960 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b77c00b8ffb0eb36c7e17974… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jun 13 00:55:55 2017 +0200 wined3d: Do not declare pixel shader inputs when they are not used. This is a workaround for a bug in Mesa GLSL linker. The bug is triggered by GLSL generated for SM3 shaders when shader inputs are not read and interface blocks are used for shader inputs/outputs (core profile code path). Declarations for unused shader inputs are not generated for pixel shaders. We still declare shader outputs in the previous shader stage, but it's allowed by the GLSL 1.50 spec: "Only output variables that are read by the subsequent pipeline stage need to be written; it is allowed to have superfluous declarations of output variables." The table in section 4.3.4 (Input Variables) of the GLSL 4.20 spec even more explicitly allows shader output variables with no matching input variables declared in the consuming shader. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 81b338c..1bd3a66 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -7250,7 +7250,7 @@ static GLuint shader_glsl_generate_pshader(const struct wined3d_context *context { unsigned int in_count = min(vec4_varyings(version->major, gl_info), shader->limits->packed_input); - if (args->vp_mode == vertexshader) + if (args->vp_mode == vertexshader && reg_maps->input_registers) shader_glsl_declare_shader_inputs(gl_info, buffer, in_count); shader_addline(buffer, "vec4 %s_in[%u];\n", prefix, in_count); }

1 0

Owen Rudge : ws2_32/tests: Test IP address conversion in getaddrinfo.
by Alexandre Julliard June 13, 2017

June 13, 2017

Module: wine Branch: master Commit: 93323bcf6c124b7681fcb88426efde10633972cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=93323bcf6c124b7681fcb8842… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Tue Jun 13 02:07:50 2017 -0300 ws2_32/tests: Test IP address conversion in getaddrinfo. Signed-off-by: Bruno Jesus <bjesus(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 108 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 107 insertions(+), 1 deletion(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 677a750..23464ac 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -7335,11 +7335,35 @@ static void test_GetAddrInfoW(void) ok(result2 == NULL, "got %p\n", result2); } +static void verify_ipv6_addrinfo(ADDRINFOA *result, const char *expectedIp) +{ + SOCKADDR_IN6 *sockaddr6; + char ipBuffer[256]; + const char *ret; + + ok(result->ai_family == AF_INET6, "ai_family == %d\n", result->ai_family); + ok(result->ai_addrlen >= sizeof(struct sockaddr_in6), "ai_addrlen == %d\n", (int)result->ai_addrlen); + ok(result->ai_addr != NULL, "ai_addr == NULL\n"); + + if (result->ai_addr != NULL) + { + sockaddr6 = (SOCKADDR_IN6 *)result->ai_addr; + ok(sockaddr6->sin6_family == AF_INET6, "ai_addr->sin6_family == %d\n", sockaddr6->sin6_family); + ok(sockaddr6->sin6_port == 0, "ai_addr->sin6_port == %d\n", sockaddr6->sin6_port); + + ZeroMemory(ipBuffer, sizeof(ipBuffer)); + ret = pInetNtop(AF_INET6, &sockaddr6->sin6_addr, ipBuffer, sizeof(ipBuffer)); + ok(ret != NULL, "inet_ntop failed (%d)\n", WSAGetLastError()); + ok(strcmp(ipBuffer, expectedIp) == 0, "ai_addr->sin6_addr == '%s' (expected '%s')\n", ipBuffer, expectedIp); + } +} + static void test_getaddrinfo(void) { int i, ret; ADDRINFOA *result, *result2, *p, hint; - CHAR name[256]; + SOCKADDR_IN *sockaddr; + CHAR name[256], *ip; DWORD size = sizeof(name); if (!pgetaddrinfo || !pfreeaddrinfo) @@ -7469,6 +7493,88 @@ static void test_getaddrinfo(void) ok(WSAGetLastError() == WSAHOST_NOT_FOUND, "expected 11001, got %d\n", WSAGetLastError()); ok(result == NULL, "got %p\n", result); + /* Test IPv4 address conversion */ + result = NULL; + ret = pgetaddrinfo("192.168.1.253", NULL, NULL, &result); + ok(!ret, "getaddrinfo failed with %d\n", ret); + ok(result->ai_family == AF_INET, "ai_family == %d\n", result->ai_family); + ok(result->ai_addrlen >= sizeof(struct sockaddr_in), "ai_addrlen == %d\n", (int)result->ai_addrlen); + ok(result->ai_addr != NULL, "ai_addr == NULL\n"); + sockaddr = (SOCKADDR_IN *)result->ai_addr; + ok(sockaddr->sin_family == AF_INET, "ai_addr->sin_family == %d\n", sockaddr->sin_family); + ok(sockaddr->sin_port == 0, "ai_addr->sin_port == %d\n", sockaddr->sin_port); + + ip = inet_ntoa(sockaddr->sin_addr); + ok(strcmp(ip, "192.168.1.253") == 0, "sockaddr->ai_addr == '%s'\n", ip); + pfreeaddrinfo(result); + + /* Test IPv4 address conversion with port */ + result = NULL; + hint.ai_flags = AI_NUMERICHOST; + ret = pgetaddrinfo("192.168.1.253:1024", NULL, &hint, &result); + hint.ai_flags = 0; + ok(ret == WSAHOST_NOT_FOUND, "getaddrinfo returned unexpected result: %d\n", ret); + ok(result == NULL, "expected NULL, got %p\n", result); + + /* Test IPv6 address conversion */ + result = NULL; + SetLastError(0xdeadbeef); + ret = pgetaddrinfo("2a00:2039:dead:beef:cafe::6666", NULL, NULL, &result); + + if (result != NULL) + { + ok(!ret, "getaddrinfo failed with %d\n", ret); + verify_ipv6_addrinfo(result, "2a00:2039:dead:beef:cafe::6666"); + pfreeaddrinfo(result); + + /* Test IPv6 address conversion with brackets */ + result = NULL; + ret = pgetaddrinfo("[beef::cafe]", NULL, NULL, &result); + ok(!ret, "getaddrinfo failed with %d\n", ret); + verify_ipv6_addrinfo(result, "beef::cafe"); + pfreeaddrinfo(result); + + /* Test IPv6 address conversion with brackets and hints */ + memset(&hint, 0, sizeof(ADDRINFOA)); + hint.ai_flags = AI_NUMERICHOST; + hint.ai_family = AF_INET6; + result = NULL; + ret = pgetaddrinfo("[beef::cafe]", NULL, &hint, &result); + ok(!ret, "getaddrinfo failed with %d\n", ret); + verify_ipv6_addrinfo(result, "beef::cafe"); + pfreeaddrinfo(result); + + memset(&hint, 0, sizeof(ADDRINFOA)); + hint.ai_flags = AI_NUMERICHOST; + hint.ai_family = AF_INET; + result = NULL; + ret = pgetaddrinfo("[beef::cafe]", NULL, &hint, &result); + ok(ret == WSAHOST_NOT_FOUND, "getaddrinfo failed with %d\n", ret); + + /* Test IPv6 address conversion with brackets and port */ + result = NULL; + ret = pgetaddrinfo("[beef::cafe]:10239", NULL, NULL, &result); + ok(!ret, "getaddrinfo failed with %d\n", ret); + verify_ipv6_addrinfo(result, "beef::cafe"); + pfreeaddrinfo(result); + + /* Test IPv6 address conversion with unmatched brackets */ + result = NULL; + hint.ai_flags = AI_NUMERICHOST; + ret = pgetaddrinfo("[beef::cafe", NULL, &hint, &result); + ok(ret == WSAHOST_NOT_FOUND, "getaddrinfo failed with %d\n", ret); + + ret = pgetaddrinfo("beef::cafe]", NULL, &hint, &result); + ok(ret == WSAHOST_NOT_FOUND, "getaddrinfo failed with %d\n", ret); + } + else + { + ok(ret == WSAHOST_NOT_FOUND, "getaddrinfo failed with %d\n", ret); + win_skip("getaddrinfo does not support IPV6\n"); + } + + hint.ai_flags = 0; + for (i = 0;i < (sizeof(hinttests) / sizeof(hinttests[0]));i++) { hint.ai_family = hinttests[i].family;

1 0

Bruno Jesus : dinput: Limit axes while remaping broken devices.
by Alexandre Julliard June 13, 2017

June 13, 2017

Module: wine Branch: master Commit: b50d1fa3140b7bc9b4749a6bfb411148d45c1a60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b50d1fa3140b7bc9b4749a6bf… Author: Bruno Jesus <bjesus(a)codeweavers.com> Date: Tue Jun 13 10:53:42 2017 -0300 dinput: Limit axes while remaping broken devices. Signed-off-by: Bruno Jesus <bjesus(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_linux.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index 1032659..963e62f 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -253,10 +253,14 @@ static INT find_joystick_devices(void) /* If no axes were configured but there are axes assume a 1-to-1 (wii controller) */ if (joydev.axis_count && !found_axes) { + int axes_limit = min(joydev.axis_count, 8); /* generic driver limit */ + ERR("Incoherent joystick data, advertised %d axes, detected 0. Assuming 1-to-1.\n", - joydev.axis_count); - for (j = 0; j < joydev.axis_count; j++) + joydev.axis_count); + for (j = 0; j < axes_limit; j++) joydev.dev_axes_map[j] = j; + + joydev.axis_count = axes_limit; } }

1 0