- Wine-Commits - list.winehq.org

Alexandre Julliard : winebuild: Only allow the stdcall calling convention for system calls.
by Alexandre Julliard Feb. 27, 2023

Feb. 27, 2023

Module: wine Branch: master Commit: 921367fc57ccfe9a6a5d3db38f2fc39e46d74e98 URL: https://gitlab.winehq.org/wine/wine/-/commit/921367fc57ccfe9a6a5d3db38f2fc3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 27 11:02:14 2023 +0100 winebuild: Only allow the stdcall calling convention for system calls. --- tools/winebuild/import.c | 2 +- tools/winebuild/parser.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 0c1cd291d21..fcf93addb50 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -1437,7 +1437,7 @@ void output_syscalls( DLLSPEC *spec ) output( "\tmovl $%s,%%edx\n", asm_name("__wine_syscall") ); } output( "\tcall *%%edx\n" ); - output( "\tret $%u\n", odp->type == TYPE_STDCALL ? get_args_size( odp ) : 0 ); + output( "\tret $%u\n", get_args_size( odp )); break; case CPU_x86_64: /* Chromium depends on syscall thunks having the same form as on diff --git a/tools/winebuild/parser.c b/tools/winebuild/parser.c index 141ed80eb26..5eed7e22ab0 100644 --- a/tools/winebuild/parser.c +++ b/tools/winebuild/parser.c @@ -315,9 +315,9 @@ static int parse_spec_arguments( ORDDEF *odp, DLLSPEC *spec, int optional ) } if (odp->flags & FLAG_SYSCALL) { - if (odp->type != TYPE_STDCALL && odp->type != TYPE_CDECL) + if (odp->type != TYPE_STDCALL) { - error( "A syscall function must use either the stdcall or the cdecl convention\n" ); + error( "A syscall function must use the stdcall convention\n" ); return 0; } }

1 0

Alexandre Julliard : winegcc: Stop using the deprecated prelink tool.
by Alexandre Julliard Feb. 27, 2023

Feb. 27, 2023

Module: wine Branch: master Commit: 4a0f3fbcb5876eb6e91165d3333f2dfaaaaa1cdf URL: https://gitlab.winehq.org/wine/wine/-/commit/4a0f3fbcb5876eb6e91165d3333f2d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 27 11:01:47 2023 +0100 winegcc: Stop using the deprecated prelink tool. --- configure | 52 ----------------------------------------------- configure.ac | 7 +------ tools/winegcc/Makefile.in | 3 +-- tools/winegcc/winegcc.c | 17 ---------------- 4 files changed, 2 insertions(+), 77 deletions(-) diff --git a/configure b/configure index 01df4fa9773..f939d560c26 100755 --- a/configure +++ b/configure @@ -737,7 +737,6 @@ FAUDIO_PE_LIBS FAUDIO_PE_CFLAGS MINGW_PKG_CONFIG PE_ARCHS -PRELINK WINELOADER_DEPENDS ac_ct_OBJC OBJCFLAGS @@ -10266,56 +10265,6 @@ then : *) WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS -Wl,--section-start,.interp=0x7d000400" ;; esac fi - # Extract the first word of "prelink", so it can be a program name with args. -set dummy prelink; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_path_PRELINK+y} -then : - printf %s "(cached) " >&6 -else $as_nop - case $PRELINK in - [\\/]* | ?:[\\/]*) - ac_cv_path_PRELINK="$PRELINK" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in /sbin /usr/sbin $PATH -do - IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_path_PRELINK="$as_dir$ac_word$ac_exec_ext" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - test -z "$ac_cv_path_PRELINK" && ac_cv_path_PRELINK="false" - ;; -esac -fi -PRELINK=$ac_cv_path_PRELINK -if test -n "$PRELINK"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PRELINK" >&5 -printf "%s\n" "$PRELINK" >&6; } -else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } -fi - - - if test "x$PRELINK" = xfalse - then - as_fn_append wine_warnings "|prelink not found and linker does not support relocation, base address of core dlls won't be set correctly." - fi fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wl,-z,max-page-size=0x1000" >&5 printf %s "checking whether the compiler supports -Wl,-z,max-page-size=0x1000... " >&6; } @@ -23065,7 +23014,6 @@ OBJC = $OBJC OBJCFLAGS = $OBJCFLAGS ac_ct_OBJC = $ac_ct_OBJC WINELOADER_DEPENDS = $WINELOADER_DEPENDS -PRELINK = $PRELINK PE_ARCHS = $PE_ARCHS MINGW_PKG_CONFIG = $MINGW_PKG_CONFIG FAUDIO_PE_CFLAGS = $FAUDIO_PE_CFLAGS diff --git a/configure.ac b/configure.ac index 228002fd922..c5732f8ada4 100644 --- a/configure.ac +++ b/configure.ac @@ -779,12 +779,7 @@ case $host_os in [case $host_os in freebsd* | kfreebsd*-gnu) WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS -Wl,--section-start,.interp=0x60000400" ;; *) WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS -Wl,--section-start,.interp=0x7d000400" ;; - esac]) - AC_PATH_PROG(PRELINK, prelink, false, [/sbin /usr/sbin $PATH]) - if test "x$PRELINK" = xfalse - then - WINE_WARNING([prelink not found and linker does not support relocation, base address of core dlls won't be set correctly.]) - fi]) + esac])]) WINE_TRY_CFLAGS([-Wl,-z,max-page-size=0x1000], [WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS -Wl,-z,max-page-size=0x1000"]) ;; diff --git a/tools/winegcc/Makefile.in b/tools/winegcc/Makefile.in index 8328d6f34a2..c4ef77da33c 100644 --- a/tools/winegcc/Makefile.in +++ b/tools/winegcc/Makefile.in @@ -16,7 +16,6 @@ winegcc_EXTRADEFS = \ -DCC="\"$(CC)\"" \ -DCPP="\"$(CPPBIN)\"" \ -DCXX="\"$(CXX)\"" \ - -DLD="\"$(LD)\"" \ - -DPRELINK="\"$(PRELINK)\"" + -DLD="\"$(LD)\"" INSTALL_DEV = $(PROGRAMS) $(winegcc_SYMLINKS) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 0770ccfbe2a..c0f881df0a2 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -188,7 +188,6 @@ struct options const char* lib_suffix; const char* subsystem; const char* entry_point; - const char* prelink; const char* debug_file; const char* out_implib; struct strarray prefix; @@ -480,8 +479,6 @@ static struct strarray get_link_args( struct options *opts, const char *output_n { if (!try_link( opts->prefix, link_args, strmake("-Wl,-Ttext-segment=%s", opts->image_base)) ) strarray_add( &flags, strmake("-Wl,-Ttext-segment=%s", opts->image_base) ); - else - opts->prelink = PRELINK; } if (!try_link( opts->prefix, link_args, "-Wl,-z,max-page-size=0x1000")) strarray_add( &flags, "-Wl,-z,max-page-size=0x1000"); @@ -1385,20 +1382,6 @@ static void build(struct options* opts) spawn(opts->prefix, implib_args, 0); } - /* set the base address with prelink if linker support is not present */ - if (opts->prelink && !opts->target_alias) - { - if (opts->prelink[0] && strcmp(opts->prelink,"false")) - { - struct strarray prelink_args = empty_strarray; - strarray_add(&prelink_args, opts->prelink); - strarray_add(&prelink_args, "--reloc-only"); - strarray_add(&prelink_args, opts->image_base); - strarray_add(&prelink_args, output_path); - spawn(opts->prefix, prelink_args, 1); - } - } - if (!is_pe) fixup_constructors( opts, output_path ); else if (opts->wine_builtin) make_wine_builtin( opts, output_path );

1 0

Rémi Bernon : oleaut32/tests: Test VARIANT_UserUnmarshal allocation sizes.
by Alexandre Julliard Feb. 27, 2023

Feb. 27, 2023

Module: wine Branch: master Commit: 3e82dc30e2244b7ad4942bd368964988d5700ced URL: https://gitlab.winehq.org/wine/wine/-/commit/3e82dc30e2244b7ad4942bd3689649… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Feb 24 11:46:33 2023 +0100 oleaut32/tests: Test VARIANT_UserUnmarshal allocation sizes. --- dlls/oleaut32/tests/usrmarshal.c | 29 +++++++++++++++++++++++++---- 1 file changed, 25 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/tests/usrmarshal.c b/dlls/oleaut32/tests/usrmarshal.c index c4f4381b47f..d4ffdbde82f 100644 --- a/dlls/oleaut32/tests/usrmarshal.c +++ b/dlls/oleaut32/tests/usrmarshal.c @@ -898,7 +898,9 @@ static void test_marshal_VARIANT(void) RPC_MESSAGE rpcMsg = { 0 }; USER_MARSHAL_CB umcb = { 0 }; unsigned char *buffer, *next; + IMalloc *allocator; void *oldbuffer; + SIZE_T size; ULONG ul; short s; double d; @@ -916,6 +918,10 @@ static void test_marshal_VARIANT(void) VARTYPE vt, vt2; IUnknown *unk; + hr = CoGetMalloc(MEMCTX_TASK, &allocator); + ok(hr == S_OK, "got hr %#lx\n", hr); + ok(!!allocator, "got allocator %p\n", allocator); + stubMsg.RpcMsg = &rpcMsg; umcb.Flags = MAKELONG(MSHCTX_DIFFERENTMACHINE, NDR_LOCAL_DATA_REPRESENTATION); @@ -1098,7 +1104,8 @@ static void test_marshal_VARIANT(void) ok(next == buffer + stubMsg.BufferLength, "got %p expect %p\n", next, buffer + stubMsg.BufferLength); ok(V_VT(&v) == V_VT(&v2), "got vt %d expect %d\n", V_VT(&v), V_VT(&v2)); ok(*V_UI4REF(&v) == *V_UI4REF(&v2), "got ui4 ref %lx expect ui4 ref %lx\n", *V_UI4REF(&v), *V_UI4REF(&v2)); - + size = IMalloc_GetSize(allocator, V_BYREF(&v2)); + ok(size == sizeof(V_UI4(&v2)), "got size %#Ix\n", size); VARIANT_UserFree(&umcb.Flags, &v2); HeapFree(GetProcessHeap(), 0, oldbuffer); @@ -1212,7 +1219,8 @@ static void test_marshal_VARIANT(void) ok(next == buffer + stubMsg.BufferLength, "got %p expect %p\n", next, buffer + stubMsg.BufferLength); ok(V_VT(&v) == V_VT(&v2), "got vt %d expect %d\n", V_VT(&v), V_VT(&v2)); ok(*V_R8REF(&v) == *V_R8REF(&v2), "got r8 ref %f expect %f\n", *V_R8REF(&v), *V_R8REF(&v2)); - + size = IMalloc_GetSize(allocator, V_BYREF(&v2)); + ok(size == sizeof(V_R8(&v2)), "got size %#Ix\n", size); VARIANT_UserFree(&umcb.Flags, &v2); HeapFree(GetProcessHeap(), 0, oldbuffer); @@ -1307,7 +1315,8 @@ static void test_marshal_VARIANT(void) ok(next == buffer + stubMsg.BufferLength, "got %p expect %p\n", next, buffer + stubMsg.BufferLength); ok(V_VT(&v) == V_VT(&v2), "got vt %d expect %d\n", V_VT(&v), V_VT(&v2)); ok(!memcmp(V_DECIMALREF(&v), V_DECIMALREF(&v2), sizeof(DECIMAL)), "decimals differ\n"); - + size = IMalloc_GetSize(allocator, V_BYREF(&v2)); + ok(size == sizeof(V_DECIMAL(&v2)), "got size %#Ix\n", size); VARIANT_UserFree(&umcb.Flags, &v2); HeapFree(GetProcessHeap(), 0, oldbuffer); @@ -1418,7 +1427,8 @@ static void test_marshal_VARIANT(void) ok(V_VT(&v) == V_VT(&v2), "got vt %d expect %d\n", V_VT(&v), V_VT(&v2)); ok(SysStringByteLen(*V_BSTRREF(&v)) == SysStringByteLen(*V_BSTRREF(&v2)), "bstr string lens differ\n"); ok(!memcmp(*V_BSTRREF(&v), *V_BSTRREF(&v2), SysStringByteLen(*V_BSTRREF(&v))), "bstrs differ\n"); - + size = IMalloc_GetSize(allocator, V_BYREF(&v2)); + ok(size == sizeof(V_BSTR(&v2)), "got size %#Ix\n", size); SysFreeString(b2); HeapFree(GetProcessHeap(), 0, oldbuffer); SysFreeString(b); @@ -1503,6 +1513,9 @@ static void test_marshal_VARIANT(void) SafeArrayGetVartype(*V_ARRAYREF(&v), &vt); SafeArrayGetVartype(*V_ARRAYREF(&v2), &vt2); ok(vt == vt2, "array vts differ %x %x\n", vt, vt2); + size = IMalloc_GetSize(allocator, V_BYREF(&v2)); + todo_wine_if(sizeof(void *) == 8) + ok(size == sizeof(V_ARRAY(&v2)), "got size %#Ix\n", size); VARIANT_UserFree(&umcb.Flags, &v2); HeapFree(GetProcessHeap(), 0, oldbuffer); @@ -1594,6 +1607,8 @@ static void test_marshal_VARIANT(void) ok(V_VT(V_VARIANTREF(&v)) == V_VT(V_VARIANTREF(&v3)), "vts differ %x %x\n", V_VT(V_VARIANTREF(&v)), V_VT(V_VARIANTREF(&v3))); ok(V_R8(V_VARIANTREF(&v)) == V_R8(V_VARIANTREF(&v3)), "r8s differ\n"); + size = IMalloc_GetSize(allocator, V_BYREF(&v3)); + ok(size == sizeof(*V_VARIANTREF(&v3)), "got size %#Ix\n", size); VARIANT_UserFree(&umcb.Flags, &v3); HeapFree(GetProcessHeap(), 0, oldbuffer); @@ -1704,6 +1719,8 @@ static void test_marshal_VARIANT(void) ok(heap_unknown->refs == 2, "got refcount %ld\n", heap_unknown->refs); ok(V_VT(&v) == V_VT(&v3), "got vt %d expect %d\n", V_VT(&v), V_VT(&v3)); ok(*V_UNKNOWNREF(&v) == *V_UNKNOWNREF(&v3), "got %p expect %p\n", *V_UNKNOWNREF(&v), *V_UNKNOWNREF(&v3)); + size = IMalloc_GetSize(allocator, V_BYREF(&v3)); + ok(size == sizeof(V_BSTR(&v3)), "got size %#Ix\n", size); VARIANT_UserFree(&umcb.Flags, &v3); ok(heap_unknown->refs == 1, "%ld refcounts of IUnknown leaked\n", heap_unknown->refs - 1); IUnknown_Release(&heap_unknown->IUnknown_iface); @@ -1732,8 +1749,12 @@ static void test_marshal_VARIANT(void) ok(next == buffer + stubMsg.BufferLength, "got %p expect %p\n", next, buffer + stubMsg.BufferLength); ok(V_VT(&v) == V_VT(&v2), "got vt %d expect %d\n", V_VT(&v2), V_VT(&v)); ok(!*V_UNKNOWNREF(&v2), "got %p expect NULL\n", *V_UNKNOWNREF(&v2)); + size = IMalloc_GetSize(allocator, V_BYREF(&v2)); + ok(size == sizeof(V_BSTR(&v2)), "got size %#Ix\n", size); VARIANT_UserFree(&umcb.Flags, &v2); HeapFree(GetProcessHeap(), 0, oldbuffer); + + IMalloc_Release(allocator); }

1 0

Rémi Bernon : oleaut32: Allocate a full pointer when unmarshalling byref arrays.
by Alexandre Julliard Feb. 27, 2023

Feb. 27, 2023

Module: wine Branch: master Commit: 76e7f030feb3b26ae409c2f1027f16168bcdd420 URL: https://gitlab.winehq.org/wine/wine/-/commit/76e7f030feb3b26ae409c2f1027f16… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Feb 23 15:01:21 2023 +0100 oleaut32: Allocate a full pointer when unmarshalling byref arrays. Instead of the 4 bytes array wire size returned by get_type_size, which will truncate the pointer on 64-bit. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54562 --- dlls/oleaut32/tests/usrmarshal.c | 1 - dlls/oleaut32/usrmarshal.c | 5 ++++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/tests/usrmarshal.c b/dlls/oleaut32/tests/usrmarshal.c index d4ffdbde82f..6559cdcd865 100644 --- a/dlls/oleaut32/tests/usrmarshal.c +++ b/dlls/oleaut32/tests/usrmarshal.c @@ -1514,7 +1514,6 @@ static void test_marshal_VARIANT(void) SafeArrayGetVartype(*V_ARRAYREF(&v2), &vt2); ok(vt == vt2, "array vts differ %x %x\n", vt, vt2); size = IMalloc_GetSize(allocator, V_BYREF(&v2)); - todo_wine_if(sizeof(void *) == 8) ok(size == sizeof(V_ARRAY(&v2)), "got size %#Ix\n", size); VARIANT_UserFree(&umcb.Flags, &v2); HeapFree(GetProcessHeap(), 0, oldbuffer); diff --git a/dlls/oleaut32/usrmarshal.c b/dlls/oleaut32/usrmarshal.c index aa54a2b092b..4a874a23413 100644 --- a/dlls/oleaut32/usrmarshal.c +++ b/dlls/oleaut32/usrmarshal.c @@ -506,7 +506,10 @@ unsigned char * WINAPI VARIANT_UserUnmarshal(ULONG *pFlags, unsigned char *Buffe ULONG mem_size; Pos += 4; - switch (header->vt & ~VT_BYREF) + /* byref array needs to allocate a SAFEARRAY pointer */ + if (header->vt & VT_ARRAY) + mem_size = sizeof(void *); + else switch (header->vt & ~VT_BYREF) { /* these types have a different memory size compared to wire size */ case VT_UNKNOWN:

1 0

Alexandre Julliard : makedep: Remove support for building shared libraries.
by Alexandre Julliard Feb. 27, 2023

Feb. 27, 2023

Module: wine Branch: master Commit: 5c98858a9b65ff4c83d6c306983158c6f3d1b418 URL: https://gitlab.winehq.org/wine/wine/-/commit/5c98858a9b65ff4c83d6c306983158… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 27 11:01:23 2023 +0100 makedep: Remove support for building shared libraries. --- tools/makedep.c | 80 +-------------------------------------------------------- 1 file changed, 1 insertion(+), 79 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index b94a221854d..d9ca4a1a7b6 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -193,7 +193,6 @@ struct makefile const char *module; const char *testdll; const char *extlib; - const char *sharedlib; const char *staticlib; const char *importlib; const char *unixlib; @@ -2316,39 +2315,6 @@ static const char *get_include_install_path( const char *name ) } -/******************************************************************* - * get_shared_library_name - * - * Determine possible names for a shared library with a version number. - */ -static struct strarray get_shared_lib_names( const char *libname ) -{ - struct strarray ret = empty_strarray; - const char *ext, *p; - char *name, *first, *second; - size_t len = 0; - - strarray_add( &ret, libname ); - - for (p = libname; (p = strchr( p, '.' )); p++) - if ((len = strspn( p + 1, "0123456789." ))) break; - - if (!len) return ret; - ext = p + 1 + len; - if (*ext && ext[-1] == '.') ext--; - - /* keep only the first group of digits */ - name = xstrdup( libname ); - first = name + (p - libname); - if ((second = strchr( first + 1, '.' ))) - { - strcpy( second, ext ); - strarray_add( &ret, xstrdup( name )); - } - return ret; -} - - /******************************************************************* * get_source_defines */ @@ -3169,7 +3135,7 @@ static void output_source_one_arch( struct makefile *make, struct incl_file *sou output_filenames( make->extlib ? extra_cflags_extlib[arch] : extra_cflags[arch] ); if (!arch) { - if (make->sharedlib || (source->file->flags & FLAG_C_UNIX)) + if (source->file->flags & FLAG_C_UNIX) { output_filenames( unix_dllflags ); } @@ -3464,48 +3430,6 @@ static void output_static_lib( struct makefile *make, unsigned int arch ) } -/******************************************************************* - * output_shared_lib - */ -static void output_shared_lib( struct makefile *make ) -{ - unsigned int i; - char *basename, *p; - struct strarray names = get_shared_lib_names( make->sharedlib ); - struct strarray all_libs = empty_strarray; - struct strarray dep_libs = empty_strarray; - unsigned int arch = 0; /* shared libs are always native */ - - basename = xstrdup( make->sharedlib ); - if ((p = strchr( basename, '.' ))) *p = 0; - - strarray_addall( &dep_libs, get_local_dependencies( make, basename, make->in_files )); - strarray_addall( &all_libs, get_expanded_file_local_var( make, basename, "LDFLAGS" )); - strarray_addall( &all_libs, get_expanded_make_var_array( make, "UNIX_LIBS" )); - strarray_addall( &all_libs, libs ); - - output( "%s:", obj_dir_path( make, make->sharedlib )); - output_filenames_obj_dir( make, make->object_files[arch] ); - output_filenames( dep_libs ); - output( "\n" ); - output( "\t%s$(CC) -o $@", cmd_prefix( "CCLD" )); - output_filenames_obj_dir( make, make->object_files[arch] ); - output_filenames( all_libs ); - output_filename( "$(LDFLAGS)" ); - output( "\n" ); - add_install_rule( make, make->sharedlib, arch, make->sharedlib, - strmake( "p%s%s", arch_install_dirs[arch], make->sharedlib )); - for (i = 1; i < names.count; i++) - { - output( "%s: %s\n", obj_dir_path( make, names.str[i] ), obj_dir_path( make, names.str[i-1] )); - output_symlink_rule( names.str[i-1], obj_dir_path( make, names.str[i] ), 0 ); - add_install_rule( make, names.str[i], arch, names.str[i-1], - strmake( "y%s%s", arch_install_dirs[arch], names.str[i] )); - } - strarray_addall( &make->all_targets[arch], names ); -} - - /******************************************************************* * output_test_module */ @@ -3831,7 +3755,6 @@ static void output_sources( struct makefile *make ) for (arch = 0; arch < archs.count; arch++) if (is_multiarch( arch )) output_test_module( make, arch ); } - else if (make->sharedlib) output_shared_lib( make ); else if (make->programs.count) output_programs( make ); for (i = 0; i < make->scripts.count; i++) @@ -4233,7 +4156,6 @@ static void load_sources( struct makefile *make ) make->parent_dir = get_expanded_make_variable( make, "PARENTSRC" ); make->module = get_expanded_make_variable( make, "MODULE" ); make->testdll = get_expanded_make_variable( make, "TESTDLL" ); - make->sharedlib = get_expanded_make_variable( make, "SHAREDLIB" ); make->staticlib = get_expanded_make_variable( make, "STATICLIB" ); make->importlib = get_expanded_make_variable( make, "IMPORTLIB" ); make->extlib = get_expanded_make_variable( make, "EXTLIB" );

1 0

Francois Gouget : kernel32/tests: Fix the French GetNumberFormatEx() test on Windows 11.
by Alexandre Julliard Feb. 27, 2023

Feb. 27, 2023

Module: wine Branch: master Commit: b66f9af10657a0c468cd3858074fb61d3d317095 URL: https://gitlab.winehq.org/wine/wine/-/commit/b66f9af10657a0c468cd3858074fb6… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sat Feb 25 20:27:36 2023 +0100 kernel32/tests: Fix the French GetNumberFormatEx() test on Windows 11. Windows 11 uses a narrow non-breaking space instead of a plain one when formatting numbers. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54583 --- dlls/kernel32/tests/locale.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index f8d4ab14d38..5c99e644f15 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -1816,8 +1816,12 @@ static void test_GetNumberFormatEx(void) /* Test French formatting */ if (pIsValidLocaleName(frW)) { + const WCHAR *expected; ret = pGetNumberFormatEx(frW, NUO, L"-12345", NULL, buffer, ARRAY_SIZE(buffer)); - expect_wstr(ret, buffer, L"-12\xa0\x33\x34\x35,00"); /* Non breaking space */ + expected = (ret && wcschr(buffer, 0x202f)) ? + L"-12\x202f\x33\x34\x35,00" : /* Same but narrow (win11) */ + L"-12\xa0\x33\x34\x35,00"; /* Non breaking space */ + expect_wstr(ret, buffer, expected); } }

1 0

Francois Gouget : kernel32/tests: Fix the NLSVersion test on Windows 10 22H2.
by Alexandre Julliard Feb. 27, 2023

Feb. 27, 2023

Module: wine Branch: master Commit: ad5c8fb6ffacd965312aee36b182ca99d5ccb162 URL: https://gitlab.winehq.org/wine/wine/-/commit/ad5c8fb6ffacd965312aee36b182ca… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sat Feb 25 19:32:11 2023 +0100 kernel32/tests: Fix the NLSVersion test on Windows 10 22H2. Microsoft backported support for the 60403 NLS version from Windows 11 21H2 to Windows 10 22H2 to ensure better compatibility between the two systems. This is similar to when they preserved support for NLS version 6020f when switching Windows 10 2004 to 60305. So use larger version changes to check that IsValidNLSVersion() does reject invalid versions. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54582 --- dlls/kernel32/tests/locale.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index b2c581dc518..a4c97286dc5 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -7865,13 +7865,13 @@ static void test_NLSVersion(void) ok( ret, "IsValidNLSVersion failed err %lu\n", GetLastError() ); ok( GetLastError() == 0xdeadbeef, "wrong error %lu\n", GetLastError() ); - info.dwNLSVersion += 0x100; + info.dwNLSVersion += 0x700; /* much higher ver -> surely invalid */ SetLastError( 0xdeadbeef ); ret = pIsValidNLSVersion( COMPARE_STRING, L"en-US", &info ); ok( !ret, "IsValidNLSVersion succeeded\n" ); ok( GetLastError() == 0, "wrong error %lu\n", GetLastError() ); - info.dwNLSVersion -= 0x800; + info.dwNLSVersion -= 2 * 0x700; /* much lower ver -> surely invalid */ SetLastError( 0xdeadbeef ); ret = pIsValidNLSVersion( COMPARE_STRING, L"en-US", &info ); ok( !ret, "IsValidNLSVersion succeeded\n" );

1 0

Gijs Vermeulen : shell32: Add Shell_GetCachedImageIndexA/W exports.
by Alexandre Julliard Feb. 27, 2023

Feb. 27, 2023

Module: wine Branch: master Commit: a4e51c6beceb60c4d67e90559ce115cb60274432 URL: https://gitlab.winehq.org/wine/wine/-/commit/a4e51c6beceb60c4d67e90559ce115… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Sat Feb 25 18:43:53 2023 +0100 shell32: Add Shell_GetCachedImageIndexA/W exports. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54581 --- dlls/shell32/iconcache.c | 4 ++-- dlls/shell32/shell32.spec | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/iconcache.c b/dlls/shell32/iconcache.c index 3f3741540d0..d75daa3fa8d 100644 --- a/dlls/shell32/iconcache.c +++ b/dlls/shell32/iconcache.c @@ -737,7 +737,7 @@ HRESULT WINAPI SHMapIDListToImageListIndexAsync(IUnknown *pts, IShellFolder *psf * Shell_GetCachedImageIndex [SHELL32.72] * */ -static INT Shell_GetCachedImageIndexA(LPCSTR szPath, INT nIndex, BOOL bSimulateDoc) +INT WINAPI Shell_GetCachedImageIndexA(LPCSTR szPath, INT nIndex, BOOL bSimulateDoc) { INT ret, len; LPWSTR szTemp; @@ -755,7 +755,7 @@ static INT Shell_GetCachedImageIndexA(LPCSTR szPath, INT nIndex, BOOL bSimulateD return ret; } -static INT Shell_GetCachedImageIndexW(LPCWSTR szPath, INT nIndex, BOOL bSimulateDoc) +INT WINAPI Shell_GetCachedImageIndexW(LPCWSTR szPath, INT nIndex, BOOL bSimulateDoc) { WARN("(%s,%08x,%08x) semi-stub.\n",debugstr_w(szPath), nIndex, bSimulateDoc); diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index 59285c89c57..4a64b80ddd9 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -453,6 +453,8 @@ @ stdcall ShellExecuteExW (long) @ stdcall ShellExecuteW (long wstr wstr wstr wstr long) @ stdcall ShellHookProc(long long long) +@ stdcall Shell_GetCachedImageIndexA(str long long) +@ stdcall Shell_GetCachedImageIndexW(wstr long long) @ stdcall Shell_NotifyIcon(long ptr) Shell_NotifyIconA @ stdcall Shell_NotifyIconA(long ptr) @ stdcall Shell_NotifyIconW(long ptr)

1 0

Francois Gouget : kernel32/tests: Fix the NtGetNlsSectionPtr() test on Windows 11.
by Alexandre Julliard Feb. 27, 2023

Feb. 27, 2023

Module: wine Branch: master Commit: 705d35edfa94e2bd9a025045c745a388d8119663 URL: https://gitlab.winehq.org/wine/wine/-/commit/705d35edfa94e2bd9a025045c745a3… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sat Feb 25 20:52:39 2023 +0100 kernel32/tests: Fix the NtGetNlsSectionPtr() test on Windows 11. NtGetNlsSectionPtr() supports an unknown section 14 which presumably takes no id parameter such that the call succeeds. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54584 --- dlls/kernel32/tests/locale.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index a4c97286dc5..f8d4ab14d38 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -4974,6 +4974,11 @@ static void test_GetCPInfo(void) case 12: /* normalization */ ok( status == STATUS_OBJECT_NAME_NOT_FOUND, "%u: failed %lx\n", i, status ); break; + case 14: /* unknown */ + ok( status == STATUS_INVALID_PARAMETER_1 || + status == STATUS_SUCCESS, /* win11 */ + "%u: failed %lx\n", i, status ); + break; default: ok( status == STATUS_INVALID_PARAMETER_1, "%u: failed %lx\n", i, status ); break;

1 0

Sven Baars : bcrypt: Remove unused fields from struct key_asymmetric32.
by Alexandre Julliard Feb. 27, 2023

Feb. 27, 2023

Module: wine Branch: master Commit: 533454111c88bef008cef0296f61da4dcf9e1ebc URL: https://gitlab.winehq.org/wine/wine/-/commit/533454111c88bef008cef0296f61da… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Sat Feb 25 11:17:58 2023 +0100 bcrypt: Remove unused fields from struct key_asymmetric32. --- dlls/bcrypt/gnutls.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c index 3c64a3643ef..c54ebc471a9 100644 --- a/dlls/bcrypt/gnutls.c +++ b/dlls/bcrypt/gnutls.c @@ -2285,8 +2285,6 @@ struct key_asymmetric32 { ULONG bitlen; /* ignored for ECC keys */ ULONG flags; - PTR32 pubkey; - ULONG pubkey_len; DSSSEED dss_seed; };

1 0