February 2023 - Wine-commits

Alexandre Julliard : ntdll: Stop loading libwine.so.
by Alexandre Julliard 24 Feb '23

24 Feb '23

Module: wine Branch: master Commit: 69910d38511ed69804fdb327bed4296bc1829276 URL: https://gitlab.winehq.org/wine/wine/-/commit/69910d38511ed69804fdb327bed429… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 24 10:10:21 2023 +0100 ntdll: Stop loading libwine.so. --- dlls/ntdll/unix/loader.c | 93 ++++++++---------------------------------------- 1 file changed, 15 insertions(+), 78 deletions(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 5cbe57c020a..cde37c48b0d 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -380,9 +380,6 @@ static const char *dll_dir; static const char *ntdll_dir; static const char *wineloader; static SIZE_T dll_path_maxlen; -static int *p___wine_main_argc; -static char ***p___wine_main_argv; -static WCHAR ***p___wine_main_wargv; const char *home_dir = NULL; const char *data_dir = NULL; @@ -1185,54 +1182,6 @@ static void relocate_ntdll( void *module ) } -static void *callback_module; - -/*********************************************************************** - * load_builtin_callback - * - * Load a library in memory; callback function for wine_dll_register - */ -static void load_builtin_callback( void *module, const char *filename ) -{ - callback_module = module; -} - - -/*********************************************************************** - * load_libwine - */ -static void load_libwine(void) -{ -#ifdef __APPLE__ -#define LIBWINE "libwine.1.dylib" -#else -#define LIBWINE "libwine.so.1" -#endif - typedef void (*load_dll_callback_t)( void *, const char * ); - void (*p_wine_dll_set_callback)( load_dll_callback_t load ); - char ***p___wine_main_environ; - - char *path; - void *handle; - - if (build_dir) path = build_path( build_dir, "libs/wine/" LIBWINE ); - else path = build_path( ntdll_dir, LIBWINE ); - - handle = dlopen( path, RTLD_NOW ); - free( path ); - if (!handle && !(handle = dlopen( LIBWINE, RTLD_NOW ))) return; - - p_wine_dll_set_callback = dlsym( handle, "wine_dll_set_callback" ); - p___wine_main_argc = dlsym( handle, "__wine_main_argc" ); - p___wine_main_argv = dlsym( handle, "__wine_main_argv" ); - p___wine_main_wargv = dlsym( handle, "__wine_main_wargv" ); - p___wine_main_environ = dlsym( handle, "__wine_main_environ" ); - - if (p_wine_dll_set_callback) p_wine_dll_set_callback( load_builtin_callback ); - if (p___wine_main_environ) *p___wine_main_environ = main_envp; -} - - /*********************************************************************** * fill_builtin_image_info */ @@ -1275,34 +1224,32 @@ static NTSTATUS dlopen_dll( const char *so_name, UNICODE_STRING *nt_name, void * void *module, *handle; const IMAGE_NT_HEADERS *nt; - callback_module = (void *)1; handle = dlopen( so_name, RTLD_NOW ); if (!handle) { WARN( "failed to load .so lib %s: %s\n", debugstr_a(so_name), dlerror() ); return STATUS_INVALID_IMAGE_FORMAT; } - if (callback_module != (void *)1) /* callback was called */ + + if (!(nt = dlsym( handle, "__wine_spec_nt_header" ))) { - if (!callback_module) return STATUS_NO_MEMORY; - WARN( "got old-style builtin library %s, constructors won't work\n", debugstr_a(so_name) ); - module = callback_module; - if (get_builtin_so_handle( module )) goto already_loaded; + ERR( "invalid .so library %s, too old?\n", debugstr_a(so_name)); + return STATUS_INVALID_IMAGE_FORMAT; } - else if ((nt = dlsym( handle, "__wine_spec_nt_header" ))) + + module = (HMODULE)((nt->OptionalHeader.ImageBase + 0xffff) & ~0xffff); + if (get_builtin_so_handle( module )) /* already loaded */ { - module = (HMODULE)((nt->OptionalHeader.ImageBase + 0xffff) & ~0xffff); - if (get_builtin_so_handle( module )) goto already_loaded; - if (map_so_dll( nt, module )) - { - dlclose( handle ); - return STATUS_NO_MEMORY; - } + fill_builtin_image_info( module, image_info ); + *ret_module = module; + dlclose( handle ); + return STATUS_SUCCESS; } - else /* already loaded .so */ + + if (map_so_dll( nt, module )) { - WARN( "%s already loaded?\n", debugstr_a(so_name)); - return STATUS_INVALID_IMAGE_FORMAT; + dlclose( handle ); + return STATUS_NO_MEMORY; } fill_builtin_image_info( module, image_info ); @@ -1320,12 +1267,6 @@ static NTSTATUS dlopen_dll( const char *so_name, UNICODE_STRING *nt_name, void * } *ret_module = module; return STATUS_SUCCESS; - -already_loaded: - fill_builtin_image_info( module, image_info ); - *ret_module = module; - dlclose( handle ); - return STATUS_SUCCESS; } @@ -2102,11 +2043,7 @@ static void start_main_thread(void) virtual_map_user_shared_data(); init_cpu_info(); init_files(); - load_libwine(); init_startup_info(); - if (p___wine_main_argc) *p___wine_main_argc = main_argc; - if (p___wine_main_argv) *p___wine_main_argv = main_argv; - if (p___wine_main_wargv) *p___wine_main_wargv = main_wargv; *(ULONG_PTR *)&peb->CloudFileFlags = get_image_address(); set_load_order_app_name( main_wargv[0] ); init_thread_stack( teb, 0, 0, 0 );

1 0

Alexandre Julliard : libwine: Remove obsolete library.
by Alexandre Julliard 24 Feb '23

24 Feb '23

1 0

Alistair Leslie-Hughes : include: Add DBCOLUMNFLAGS_ enums values.
by Alexandre Julliard 24 Feb '23

24 Feb '23

Module: wine Branch: master Commit: 7582ebcd1ad31a51eeeb3d41d2500b1a951e5dc5 URL: https://gitlab.winehq.org/wine/wine/-/commit/7582ebcd1ad31a51eeeb3d41d2500b… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Feb 24 17:30:27 2023 +1100 include: Add DBCOLUMNFLAGS_ enums values. --- include/dbs.idl | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/include/dbs.idl b/include/dbs.idl index d5b903138d6..d3cc46b4010 100644 --- a/include/dbs.idl +++ b/include/dbs.idl @@ -816,6 +816,33 @@ enum DBCOLUMNFLAGSENUM { DBCOLUMNFLAGS_CACHEDEFERRED = 0x1000 }; +enum DBCOLUMNFLAGS15ENUM { + DBCOLUMNFLAGS_ISCHAPTER = 0x002000 +}; + +enum DBCOLUMNFLAGSENUM20 { + DBCOLUMNFLAGS_SCALEISNEGATIVE = 0x004000, + DBCOLUMNFLAGS_RESERVED = 0x008000 +}; + +enum DBCOLUMNFLAGSENUM21 { + DBCOLUMNFLAGS_ISROWURL = 0x010000, + DBCOLUMNFLAGS_ISDEFAULTSTREAM = 0x020000, + DBCOLUMNFLAGS_ISCOLLECTION = 0x040000 +}; + +enum DBCOLUMNFLAGSENUM26 { + DBCOLUMNFLAGS_ISSTREAM = 0x080000, + DBCOLUMNFLAGS_ISROWSET = 0x100000, + DBCOLUMNFLAGS_ISROW = 0x200000, + DBCOLUMNFLAGS_ROWSPECIFICCOLUMN = 0x400000 +}; + + +enum DBCOLUMNFLAGSDEPRECATED { + DBCOLUMNFLAGS_KEYCOLUMN = 0x008000 +}; + typedef struct tagDBCOLUMNINFO { LPOLESTR pwszName; ITypeInfo *pTypeInfo;

1 0

Rémi Bernon : include: Allow overriding LANGID in module VERSIONINFO.
by Alexandre Julliard 24 Feb '23

24 Feb '23

1 0

Mohamad Al-Jaf : cryptowinrt: Stub IKeyCredentialManagerStatics interface.
by Alexandre Julliard 23 Feb '23

23 Feb '23

Module: wine Branch: master Commit: 254b6d694f0fadaa4b435cf01a0055d53196145e URL: https://gitlab.winehq.org/wine/wine/-/commit/254b6d694f0fadaa4b435cf01a0055… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Tue Nov 15 22:34:23 2022 -0500 cryptowinrt: Stub IKeyCredentialManagerStatics interface. --- dlls/cryptowinrt/Makefile.in | 1 + dlls/cryptowinrt/classes.idl | 1 + dlls/cryptowinrt/credentials.c | 177 ++++++++++++++++++++++++++++++++++++++++ dlls/cryptowinrt/main.c | 9 +- dlls/cryptowinrt/private.h | 4 + dlls/cryptowinrt/tests/crypto.c | 37 +++++++++ 6 files changed, 225 insertions(+), 4 deletions(-)

1 0

Mohamad Al-Jaf : cryptowinrt: Import IAsyncOperation from windows.gaming.input.
by Alexandre Julliard 23 Feb '23

23 Feb '23

Module: wine Branch: master Commit: 87b1bd5862d9fff91d0c1e67f13614eef8fab562 URL: https://gitlab.winehq.org/wine/wine/-/commit/87b1bd5862d9fff91d0c1e67f13614… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Thu Dec 1 06:23:00 2022 -0500 cryptowinrt: Import IAsyncOperation from windows.gaming.input. --- dlls/cryptowinrt/Makefile.in | 5 +- dlls/cryptowinrt/async.c | 508 ++++++++++++++++++++++++++++++++++++++++++ dlls/cryptowinrt/private.h | 8 + dlls/cryptowinrt/provider.idl | 47 ++++ 4 files changed, 567 insertions(+), 1 deletion(-)

1 0

Mohamad Al-Jaf : cryptowinrt: Implement IKeyCredentialManagerStatics::IsSupportedAsync().
by Alexandre Julliard 23 Feb '23

23 Feb '23

Module: wine Branch: master Commit: bbd7a6ffb91e587cb8249d298c188aa709967016 URL: https://gitlab.winehq.org/wine/wine/-/commit/bbd7a6ffb91e587cb8249d298c188a… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Thu Dec 1 06:26:34 2022 -0500 cryptowinrt: Implement IKeyCredentialManagerStatics::IsSupportedAsync(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53176 --- dlls/cryptowinrt/credentials.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/cryptowinrt/credentials.c b/dlls/cryptowinrt/credentials.c index ba375e77e0c..e23c5d94696 100644 --- a/dlls/cryptowinrt/credentials.c +++ b/dlls/cryptowinrt/credentials.c @@ -118,10 +118,17 @@ static const struct IActivationFactoryVtbl factory_vtbl = DEFINE_IINSPECTABLE( credentials_statics, IKeyCredentialManagerStatics, struct credentials_statics, IActivationFactory_iface ); +static HRESULT WINAPI is_supported_async( IUnknown *invoker, IUnknown *param, PROPVARIANT *result ) +{ + result->vt = VT_BOOL; + result->boolVal = FALSE; + return S_OK; +} + static HRESULT WINAPI credentials_statics_IsSupportedAsync( IKeyCredentialManagerStatics *iface, IAsyncOperation_boolean **value ) { - FIXME( "iface %p, value %p stub!\n", iface, value ); - return E_NOTIMPL; + TRACE( "iface %p, value %p.\n", iface, value ); + return async_operation_boolean_create( (IUnknown *)iface, NULL, is_supported_async, value ); } static HRESULT WINAPI credentials_statics_RenewAttestationAsync( IKeyCredentialManagerStatics *iface, IAsyncAction **operation )

1 0

Mohamad Al-Jaf : cryptowinrt/tests: Add IKeyCredentialManagerStatics::IsSupportedAsync() tests.
by Alexandre Julliard 23 Feb '23

23 Feb '23

Module: wine Branch: master Commit: b7cccbce92d6eb55251527982672dcd1065aaeca URL: https://gitlab.winehq.org/wine/wine/-/commit/b7cccbce92d6eb55251527982672dc… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Thu Dec 1 06:25:36 2022 -0500 cryptowinrt/tests: Add IKeyCredentialManagerStatics::IsSupportedAsync() tests. --- dlls/cryptowinrt/tests/crypto.c | 206 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 206 insertions(+)

1 0

Torge Matthies : kernelbase: Break out of inner for-loop early in find_substring.
by Alexandre Julliard 23 Feb '23

23 Feb '23

Module: wine Branch: master Commit: 01146582cc56e399a3313e4bad6f367c7d33c503 URL: https://gitlab.winehq.org/wine/wine/-/commit/01146582cc56e399a3313e4bad6f36… Author: Torge Matthies <tmatthies(a)codeweavers.com> Date: Mon Feb 6 05:51:33 2023 +0100 kernelbase: Break out of inner for-loop early in find_substring. If I'm interpreting this code correctly, once either of these two if-conditions are true once, they will also be true at some point during all of the remaining iterations of the for-loop. Thus, we can just stop the for-loop here. Signed-off-by: Torge Matthies <tmatthies(a)codeweavers.com> --- dlls/kernelbase/locale.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 13ec1ebeb3a..edab78317da 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -3924,8 +3924,12 @@ static int find_substring( const struct sortguid *sortid, DWORD flags, const WCH pos += append_weights( sortid, flags, src, srclen, pos, case_mask, except, compr_tables, &s, TRUE ); - if (s.primary_pos + s.key_primary.len > val.key_primary.len) goto next; - if (memcmp( primary, val.key_primary.buf + s.primary_pos, s.key_primary.len )) goto next; + if (s.primary_pos + s.key_primary.len > val.key_primary.len || + memcmp( primary, val.key_primary.buf + s.primary_pos, s.key_primary.len )) + { + len = srclen + 1; + goto next; + } s.primary_pos += s.key_primary.len; s.key_primary.len = 0; }

1 0

Torge Matthies : kernelbase: Reuse the previous iteration's pos and sortkey state if possible in find_substring.
by Alexandre Julliard 23 Feb '23

23 Feb '23

Module: wine Branch: master Commit: 4d0d7e49b9b33bba023ba67add84486ba4cc8efd URL: https://gitlab.winehq.org/wine/wine/-/commit/4d0d7e49b9b33bba023ba67add8448… Author: Torge Matthies <tmatthies(a)codeweavers.com> Date: Mon Feb 6 05:51:54 2023 +0100 kernelbase: Reuse the previous iteration's pos and sortkey state if possible in find_substring. We don't have to reset pos and the sortkey state for every iteration of the for-loop. In most cases the previous iteration's values are still valid, and can be re-used, skipping a lot of duplicate work. Signed-off-by: Torge Matthies <tmatthies(a)codeweavers.com> --- dlls/kernelbase/locale.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index edab78317da..632f5b6d88a 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -3915,9 +3915,9 @@ static int find_substring( const struct sortguid *sortid, DWORD flags, const WCH for (start = 0; start < srclen; start++) { + pos = start; for (len = start + 1; len <= srclen; len++) { - pos = start; while (pos < len && s.primary_pos <= val.key_primary.len) { while (pos < len && !s.key_primary.len) @@ -3933,7 +3933,7 @@ static int find_substring( const struct sortguid *sortid, DWORD flags, const WCH s.primary_pos += s.key_primary.len; s.key_primary.len = 0; } - if (s.primary_pos < val.key_primary.len) goto next; + if (s.primary_pos < val.key_primary.len) continue; have_extra = remove_unneeded_weights( sortid, &s ); if (compare_sortkeys( &s.key_diacritic, &val.key_diacritic, FALSE )) goto next; @@ -3957,6 +3957,7 @@ static int find_substring( const struct sortguid *sortid, DWORD flags, const WCH s.key_primary.len = s.key_diacritic.len = s.key_case.len = s.key_special.len = 0; s.key_extra[0].len = s.key_extra[1].len = s.key_extra[2].len = s.key_extra[3].len = 0; s.primary_pos = 0; + pos = start; } if (flags & FIND_STARTSWITH) break; if (flags & FIND_FROMSTART && found != -1) break;

1 0