November 2022 - Wine-Commits

Nikolay Sivov : vbscript: Fix a typo in Right() argument type check.
by Alexandre Julliard Nov. 8, 2022

Nov. 8, 2022

Module: wine Branch: master Commit: 514832393c0e936804bffd3092fce2eeb0e27b82 URL: https://gitlab.winehq.org/wine/wine/-/commit/514832393c0e936804bffd3092fce2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 8 06:22:48 2022 +0300 vbscript: Fix a typo in Right() argument type check. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/vbscript/global.c | 2 +- dlls/vbscript/tests/api.vbs | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 669eae3b5c4..ad5cb484947 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -1348,7 +1348,7 @@ static HRESULT Global_Right(BuiltinDisp *This, VARIANT *args, unsigned args_cnt, TRACE("(%s %s)\n", debugstr_variant(args), debugstr_variant(args+1)); - if(V_VT(args+1) == VT_BSTR) { + if(V_VT(args) == VT_BSTR) { str = V_BSTR(args); }else { hres = to_string(args, &conv_str); diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 21834cb8a03..60ec7f5dc61 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -840,6 +840,8 @@ TestRight "test", 2, "st" TestRight "test", 5, "test" TestRight "test", 0, "" TestRight 123, 2, "23" +TestRight "test", "3", "est" +TestRight 123, "2", "23" if isEnglishLang then TestRight true, 2, "ue" Sub TestTrim(str, exstr)

1 0

Rémi Bernon : winebuild: Put the delay import descriptor in data section.
by Alexandre Julliard Nov. 8, 2022

Nov. 8, 2022

Module: wine Branch: master Commit: 2e5e5ade82b5e3b1d70ebe6b1a824bdfdedfd04e URL: https://gitlab.winehq.org/wine/wine/-/commit/2e5e5ade82b5e3b1d70ebe6b1a824b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Nov 2 14:28:14 2022 +0100 winebuild: Put the delay import descriptor in data section. This fixes incorrect .text section flags for any module using delay imports. The use of a custom .text$2 section as dlltool is doing causes the section to be flagged as DATA, and ends up with the .text section being writable, which triggers the anti tamper used in Forza Horizon. --- tools/winebuild/import.c | 1 - 1 file changed, 1 deletion(-) diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index f5b87d76b05..c934e456cfe 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -1733,7 +1733,6 @@ static void build_windows_import_lib( const char *lib_name, DLLSPEC *spec, struc output( ".L__wine_delay_import_handle:\n" ); output( "\t%s 0\n", get_asm_ptr_keyword() ); - output( "\n\t.section \".text$2\"\n" ); output( "%s\n", asm_globl( import_desc ) ); output( "\t.long 1\n" ); /* DllAttributes */ output_rva( "%s", asm_name( import_name ) ); /* DllNameRVA */

1 0

Rémi Bernon : winebuild: Implement delay import lib generation without dlltool.
by Alexandre Julliard Nov. 8, 2022

Nov. 8, 2022

Module: wine Branch: master Commit: 6b9773529c2619ee9b82de6de996a0845ae518a5 URL: https://gitlab.winehq.org/wine/wine/-/commit/6b9773529c2619ee9b82de6de996a0… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun Nov 6 09:54:48 2022 +0100 winebuild: Implement delay import lib generation without dlltool. --- tools/winebuild/import.c | 176 +++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 156 insertions(+), 20 deletions(-)

1 0

Rémi Bernon : winebuild: Enable unwind tables by default in PE files.
by Alexandre Julliard Nov. 8, 2022

Nov. 8, 2022

Module: wine Branch: master Commit: 244e8fd3574298e43d219ea4bd663067953fdae3 URL: https://gitlab.winehq.org/wine/wine/-/commit/244e8fd3574298e43d219ea4bd6630… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Nov 4 19:17:01 2022 +0100 winebuild: Enable unwind tables by default in PE files. Making sure it also emits .cfi and .seh directives and generates unwind tables for the delay import thunks. --- tools/winebuild/main.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c index 01ceba9e516..77339b2b4e7 100644 --- a/tools/winebuild/main.c +++ b/tools/winebuild/main.c @@ -176,6 +176,7 @@ static void set_target( const char *name ) if (!parse_target( name, &target )) fatal_error( "Unrecognized target '%s'\n", name ); if (target.cpu == CPU_ARM && is_pe()) thumb_mode = 1; + if (is_pe()) unwind_tables = 1; } /* cleanup on program exit */ @@ -623,6 +624,7 @@ int main(int argc, char **argv) target = init_argv0_target( argv[0] ); if (target.platform == PLATFORM_CYGWIN) target.platform = PLATFORM_MINGW; + if (is_pe()) unwind_tables = 1; files = parse_options( argc, argv, short_options, long_options, 0, option_callback );

1 0

Rémi Bernon : winebuild: Fix import hint value for symbols imported by name.
by Alexandre Julliard Nov. 8, 2022

Nov. 8, 2022

Module: wine Branch: master Commit: cfe83e80fc8bec7638c876032c4542cb7e667d10 URL: https://gitlab.winehq.org/wine/wine/-/commit/cfe83e80fc8bec7638c876032c4542… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun Oct 2 22:08:53 2022 +0200 winebuild: Fix import hint value for symbols imported by name. This fixes incorrect hint values generated by dlltool: instead of the index in the name table, it used the ordinal value, which almost always ends up in a hint lookup failure and a fallback to binary search. --- tools/winebuild/import.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index cba88474b57..f5b87d76b05 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -1902,7 +1902,7 @@ static void build_windows_import_lib( const char *lib_name, DLLSPEC *spec, struc { output( "\n\t.section \".idata$6\"\n" ); output( ".L__wine_import_name:\n" ); - output( "\t.short %d\n", odp->ordinal ); + output( "\t.short %d\n", odp->hint ); output( "\t%s \"%s\"\n", get_asm_string_keyword(), name ); }

1 0

Rémi Bernon : opengl32: Move glGetIntegerv extension filtering to unix_wgl.c.
by Alexandre Julliard Nov. 8, 2022

Nov. 8, 2022

Module: wine Branch: master Commit: b6f80f9fcc6cf01995ac35f3f8254e4cccef4746 URL: https://gitlab.winehq.org/wine/wine/-/commit/b6f80f9fcc6cf01995ac35f3f8254e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Nov 7 15:18:07 2022 +0100 opengl32: Move glGetIntegerv extension filtering to unix_wgl.c. --- dlls/opengl32/make_opengl | 3 +-- dlls/opengl32/opengl_ext.h | 1 - dlls/opengl32/thunks.c | 8 ++++++++ dlls/opengl32/unix_thunks.c | 9 +-------- dlls/opengl32/unix_wgl.c | 22 ++++++++++++++++++++-- dlls/opengl32/wgl.c | 14 -------------- 6 files changed, 30 insertions(+), 27 deletions(-) diff --git a/dlls/opengl32/make_opengl b/dlls/opengl32/make_opengl index 5e269d89109..a5326d5f40d 100755 --- a/dlls/opengl32/make_opengl +++ b/dlls/opengl32/make_opengl @@ -161,7 +161,6 @@ my %manual_win_functions = ); my %manual_win_thunks = ( - "glGetIntegerv" => 1, "wglGetCurrentReadDCARB" => 1, "wglGetPixelFormat" => 1, "wglGetProcAddress" => 1, @@ -509,7 +508,7 @@ sub needs_wrapper($$) { my ($name, $func) = @_; - return 1 if $name =~ /^glDebugMessageCallback|^glGetString/; + return 1 if $name =~ /^glDebugMessageCallback|^glGetString|^glGetIntegerv/; # check if return value needs special handling (my $type = $func->[0]->textContent()) =~ s/ $//; diff --git a/dlls/opengl32/opengl_ext.h b/dlls/opengl32/opengl_ext.h index 6e069cf5bd5..3638494829c 100644 --- a/dlls/opengl32/opengl_ext.h +++ b/dlls/opengl32/opengl_ext.h @@ -101,7 +101,6 @@ static inline enum wgl_handle_type get_current_context_type(void) extern int WINAPI wglDescribePixelFormat( HDC hdc, int ipfd, UINT cjpfd, PIXELFORMATDESCRIPTOR *ppfd ); -extern const GLuint *disabled_extensions_index(void) DECLSPEC_HIDDEN; extern BOOL check_extension_support( const char *extension, const char *available_extensions ) DECLSPEC_HIDDEN; extern char *build_extension_list(void) DECLSPEC_HIDDEN; diff --git a/dlls/opengl32/thunks.c b/dlls/opengl32/thunks.c index 0a9fb8bb677..a5a117657fc 100644 --- a/dlls/opengl32/thunks.c +++ b/dlls/opengl32/thunks.c @@ -915,6 +915,14 @@ void WINAPI glGetFloatv( GLenum pname, GLfloat *data ) if ((status = UNIX_CALL( glGetFloatv, &args ))) WARN( "glGetFloatv returned %#x\n", status ); } +void WINAPI glGetIntegerv( GLenum pname, GLint *data ) +{ + struct glGetIntegerv_params args = { .pname = pname, .data = data, }; + NTSTATUS status; + TRACE( "pname %d, data %p\n", pname, data ); + if ((status = UNIX_CALL( glGetIntegerv, &args ))) WARN( "glGetIntegerv returned %#x\n", status ); +} + void WINAPI glGetLightfv( GLenum light, GLenum pname, GLfloat *params ) { struct glGetLightfv_params args = { .light = light, .pname = pname, .params = params, }; diff --git a/dlls/opengl32/unix_thunks.c b/dlls/opengl32/unix_thunks.c index 375d1630cf9..41374ed9d74 100644 --- a/dlls/opengl32/unix_thunks.c +++ b/dlls/opengl32/unix_thunks.c @@ -18,6 +18,7 @@ extern NTSTATUS wgl_wglCreateContext( void *args ) DECLSPEC_HIDDEN; extern NTSTATUS wgl_wglDeleteContext( void *args ) DECLSPEC_HIDDEN; extern NTSTATUS wgl_wglMakeCurrent( void *args ) DECLSPEC_HIDDEN; extern NTSTATUS wgl_wglShareLists( void *args ) DECLSPEC_HIDDEN; +extern NTSTATUS gl_glGetIntegerv( void *args ) DECLSPEC_HIDDEN; extern NTSTATUS gl_glGetString( void *args ) DECLSPEC_HIDDEN; extern NTSTATUS ext_glDebugMessageCallback( void *args ) DECLSPEC_HIDDEN; extern NTSTATUS ext_glDebugMessageCallbackAMD( void *args ) DECLSPEC_HIDDEN; @@ -906,14 +907,6 @@ static NTSTATUS gl_glGetFloatv( void *args ) return STATUS_SUCCESS; } -static NTSTATUS gl_glGetIntegerv( void *args ) -{ - struct glGetIntegerv_params *params = args; - const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; - funcs->gl.p_glGetIntegerv( params->pname, params->data ); - return STATUS_SUCCESS; -} - static NTSTATUS gl_glGetLightfv( void *args ) { struct glGetLightfv_params *params = args; diff --git a/dlls/opengl32/unix_wgl.c b/dlls/opengl32/unix_wgl.c index a0207ad533a..3213bfcb6bc 100644 --- a/dlls/opengl32/unix_wgl.c +++ b/dlls/opengl32/unix_wgl.c @@ -229,7 +229,7 @@ static BOOL filter_extensions( const char *extensions, GLubyte **exts_list, GLui return (exts_list && *exts_list) || *disabled_exts; } -const GLuint *disabled_extensions_index(void) +static const GLuint *disabled_extensions_index(void) { struct wgl_handle *ptr = get_current_context_ptr(); GLuint **disabled = &ptr->u.context->disabled_exts; @@ -286,6 +286,17 @@ BOOL check_extension_support( const char *extension, const char *available_exten return FALSE; } +static void WINAPI wrap_glGetIntegerv( GLenum pname, GLint *data ) +{ + const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; + const GLuint *disabled; + + funcs->gl.p_glGetIntegerv( pname, data ); + + if (pname == GL_NUM_EXTENSIONS && (disabled = disabled_extensions_index())) + while (*disabled++ != ~0u) (*data)--; +} + static const GLubyte * WINAPI wrap_glGetString( GLenum name ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; @@ -324,7 +335,7 @@ char *build_extension_list(void) GLint len = 0, capacity, i, extensions_count; char *extension, *tmp, *available_extensions; - glGetIntegerv( GL_NUM_EXTENSIONS, &extensions_count ); + wrap_glGetIntegerv( GL_NUM_EXTENSIONS, &extensions_count ); capacity = 128 * extensions_count; if (!(available_extensions = HeapAlloc( GetProcessHeap(), 0, capacity ))) return NULL; @@ -727,6 +738,13 @@ NTSTATUS wgl_wglShareLists( void *args ) return STATUS_SUCCESS; } +NTSTATUS gl_glGetIntegerv( void *args ) +{ + struct glGetIntegerv_params *params = args; + wrap_glGetIntegerv( params->pname, params->data ); + return STATUS_SUCCESS; +} + NTSTATUS gl_glGetString( void *args ) { struct glGetString_params *params = args; diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index 3aa37bd5cb4..a39bbcdd000 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -334,20 +334,6 @@ int WINAPI wglGetLayerPaletteEntries(HDC hdc, return 0; } -void WINAPI glGetIntegerv(GLenum pname, GLint *data) -{ - struct glGetIntegerv_params args = { .pname = pname, .data = data, }; - const GLuint *disabled; - NTSTATUS status; - - TRACE( "pname %d, data %p\n", pname, data ); - - if ((status = UNIX_CALL( glGetIntegerv, &args ))) WARN( "glGetIntegerv returned %#x\n", status ); - - if (pname == GL_NUM_EXTENSIONS && (disabled = disabled_extensions_index())) - while (*disabled++ != ~0u) (*data)--; -} - static int compar(const void *elt_a, const void *elt_b) { return strcmp(((const OpenGL_extension *) elt_a)->name, ((const OpenGL_extension *) elt_b)->name);

1 0

Rémi Bernon : opengl32: Move wglGetProcAddress extension filtering to unix_wgl.c.
by Alexandre Julliard Nov. 8, 2022

Nov. 8, 2022

Module: wine Branch: master Commit: b892720adb2daf2c1a671a6d7876616fe2ce1576 URL: https://gitlab.winehq.org/wine/wine/-/commit/b892720adb2daf2c1a671a6d787661… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Nov 7 15:41:48 2022 +0100 opengl32: Move wglGetProcAddress extension filtering to unix_wgl.c. --- dlls/opengl32/make_opengl | 2 +- dlls/opengl32/opengl_ext.h | 9 ---- dlls/opengl32/unix_thunks.c | 9 +--- dlls/opengl32/unix_wgl.c | 107 +++++++++++++++++++++++++++++++++++++++++++- dlls/opengl32/wgl.c | 90 +++---------------------------------- 5 files changed, 113 insertions(+), 104 deletions(-)

1 0

Rémi Bernon : winebuild: Introduce a new --without-dlltool winebuild flag.
by Alexandre Julliard Nov. 8, 2022

Nov. 8, 2022

Module: wine Branch: master Commit: b9375920f9317a022b3d351340304bb3b38fb211 URL: https://gitlab.winehq.org/wine/wine/-/commit/b9375920f9317a022b3d351340304b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Nov 2 14:21:14 2022 +0100 winebuild: Introduce a new --without-dlltool winebuild flag. Set it only when -Wl,--delay-load linker flag is not supported to keep using dlltool in LLVM builds, for MSVC-like import libs. --- tools/makedep.c | 1 + tools/winebuild/build.h | 1 + tools/winebuild/import.c | 12 ++++++++++-- tools/winebuild/main.c | 9 ++++++++- tools/winebuild/winebuild.man.in | 3 +++ 5 files changed, 23 insertions(+), 3 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index ca1efed4533..a042621cec7 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -3404,6 +3404,7 @@ static void output_import_lib( struct makefile *make, unsigned int arch ) output_filenames_obj_dir( make, make->implib_files[arch] ); output( "\n" ); output( "\t%s%s -w --implib -o $@", cmd_prefix( "BUILD" ), tools_path( make, "winebuild" ) ); + if (!delay_load_flags[arch]) output_filename( "--without-dlltool" ); output_filenames( target_flags[arch] ); if (make->is_win16) output_filename( "-m16" ); output_filename( "--export" ); diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h index 7ce502143e3..accfa9a47dd 100644 --- a/tools/winebuild/build.h +++ b/tools/winebuild/build.h @@ -357,6 +357,7 @@ extern int verbose; extern int link_ext_symbols; extern int force_pointer_size; extern int unwind_tables; +extern int use_dlltool; extern int use_msvcrt; extern int unix_lib; extern int safe_seh; diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index a2ada71ae36..8d05b91ec9b 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -1581,8 +1581,8 @@ void output_static_lib( const char *output_name, struct strarray files, int crea } } -/* create a Windows-style import library */ -static void build_windows_import_lib( const char *lib_name, DLLSPEC *spec, struct strarray files ) +/* create a Windows-style import library using dlltool */ +static void build_dlltool_import_lib( const char *lib_name, DLLSPEC *spec, struct strarray files ) { struct strarray args; char *def_file; @@ -1627,6 +1627,13 @@ static void build_windows_import_lib( const char *lib_name, DLLSPEC *spec, struc if (files.count) output_static_lib( output_file_name, files, 0 ); } +/* create a Windows-style import library */ +static void build_windows_import_lib( const char *lib_name, DLLSPEC *spec, struct strarray files ) +{ + if (verbose) fprintf( stderr, "Not implemented, falling back to dlltool.\n" ); + build_dlltool_import_lib( output_file_name, spec, files ); +} + /* create a Unix-style import library */ static void build_unix_import_lib( DLLSPEC *spec, struct strarray files ) { @@ -1689,5 +1696,6 @@ static void build_unix_import_lib( DLLSPEC *spec, struct strarray files ) void output_import_lib( DLLSPEC *spec, struct strarray files ) { if (!is_pe()) build_unix_import_lib( spec, files ); + else if (use_dlltool) build_dlltool_import_lib( output_file_name, spec, files ); else build_windows_import_lib( output_file_name, spec, files ); } diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c index cbe1e4669c1..01ceba9e516 100644 --- a/tools/winebuild/main.c +++ b/tools/winebuild/main.c @@ -42,6 +42,7 @@ int verbose = 0; int link_ext_symbols = 0; int force_pointer_size = 0; int unwind_tables = 0; +int use_dlltool = 1; int use_msvcrt = 0; int unix_lib = 0; int safe_seh = 0; @@ -233,6 +234,7 @@ static const char usage_str[] = " -v, --verbose Display the programs invoked\n" " --version Print the version and exit\n" " -w, --warnings Turn on warnings\n" +" --without-dlltool Generate import library without using dlltool\n" "\nMode options:\n" " --dll Build a library from a .spec file and object files\n" " --def Build a .def file from a .spec file\n" @@ -268,7 +270,8 @@ enum long_options_values LONG_OPT_STATICLIB, LONG_OPT_SUBSYSTEM, LONG_OPT_SYSCALL_TABLE, - LONG_OPT_VERSION + LONG_OPT_VERSION, + LONG_OPT_WITHOUT_DLLTOOL, }; static const char short_options[] = "B:C:D:E:F:H:I:K:L:M:N:b:d:e:f:hkl:m:o:r:u:vw"; @@ -300,6 +303,7 @@ static const struct long_option long_options[] = { "subsystem", 1, LONG_OPT_SUBSYSTEM }, { "syscall-table", 1, LONG_OPT_SYSCALL_TABLE }, { "version", 0, LONG_OPT_VERSION }, + { "without-dlltool", 0, LONG_OPT_WITHOUT_DLLTOOL }, /* aliases for short options */ { "target", 1, 'b' }, { "delay-lib", 1, 'd' }, @@ -531,6 +535,9 @@ static void option_callback( int optc, char *optarg ) case LONG_OPT_VERSION: printf( "winebuild version " PACKAGE_VERSION "\n" ); exit(0); + case LONG_OPT_WITHOUT_DLLTOOL: + use_dlltool = 0; + break; case '?': fprintf( stderr, "winebuild: %s\n\n", optarg ); usage(1); diff --git a/tools/winebuild/winebuild.man.in b/tools/winebuild/winebuild.man.in index 2637b5beb5f..7f93a5befdc 100644 --- a/tools/winebuild/winebuild.man.in +++ b/tools/winebuild/winebuild.man.in @@ -279,6 +279,9 @@ Display the program version and exit. .TP .B \-w, --warnings Turn on warnings. +.TP +.B \--without-dlltool +Generate import library without using dlltool. .SH "SPEC FILE SYNTAX" .SS "General syntax" A spec file should contain a list of ordinal declarations. The general

1 0

Rémi Bernon : opengl32: Move function / extension registry mapping to unix_thunks.c.
by Alexandre Julliard Nov. 8, 2022

Nov. 8, 2022

Module: wine Branch: master Commit: 8a6987af121b79df818b7fcf278f512f8cf1eb60 URL: https://gitlab.winehq.org/wine/wine/-/commit/8a6987af121b79df818b7fcf278f51… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Nov 7 15:26:36 2022 +0100 opengl32: Move function / extension registry mapping to unix_thunks.c. Keeping the extension function pointers array on the PE side. --- dlls/opengl32/make_opengl | 20 +- dlls/opengl32/opengl_ext.h | 13 +- dlls/opengl32/thunks.c | 5394 +++++++++++++++++++++---------------------- dlls/opengl32/unix_thunks.c | 2699 ++++++++++++++++++++++ dlls/opengl32/wgl.c | 32 +- 5 files changed, 5432 insertions(+), 2726 deletions(-)

1 0

Paul Gofman : ws2_32/tests: Don't test protocol name in test_WSASocket().
by Alexandre Julliard Nov. 8, 2022

Nov. 8, 2022

Module: wine Branch: master Commit: 2d5de1d911bb847ec8d5dfad4569454e152ae834 URL: https://gitlab.winehq.org/wine/wine/-/commit/2d5de1d911bb847ec8d5dfad456945… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Nov 7 21:01:26 2022 -0600 ws2_32/tests: Don't test protocol name in test_WSASocket(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53893 --- dlls/ws2_32/tests/sock.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 9b39ecff3c5..d4d92b58c41 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -3270,9 +3270,8 @@ static void test_WSASocket(void) size = sizeof(info); err = getsockopt(sock, SOL_SOCKET, SO_PROTOCOL_INFOW, (char *) &info, &size); ok(!err,"got error %d\n", WSAGetLastError()); - ok(!wcscmp(info.szProtocol, L"MSAFD Tcpip [RAW/IP]") - || broken(!wcscmp(info.szProtocol, L"MSAFD-Tcpip [RAW/IP]")) /* Some Win7 machines. */, - "got szProtocol %s.\n", debugstr_w(info.szProtocol)); + /* Protocol name in info.szProtocol is not entirely consistent across Windows versions and + * locales, so not testing it. */ ok(info.iAddressFamily == AF_INET, "got iAddressFamily %d.\n", info.iAddressFamily); ok(info.iSocketType == SOCK_RAW, "got iSocketType %d.\n", info.iSocketType); ok(info.iMaxSockAddr == 0x10, "got iMaxSockAddr %d.\n", info.iMaxSockAddr);

1 0