April 2021 - Wine-Commits - list.winehq.org

Hans Leidekker : wldap32: Get rid of wldap32.h.
by Alexandre Julliard April 19, 2021

April 19, 2021

Module: wine Branch: master Commit: aa9f3e6e96780af3d6b028cf40fd48617ff803ab URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa9f3e6e96780af3d6b028cf… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Apr 19 10:04:50 2021 +0200 wldap32: Get rid of wldap32.h. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wldap32/winldap_private.h | 2 - dlls/wldap32/wldap32.h | 1010 ---------------------------------------- 2 files changed, 1012 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=aa9f3e6e96780af3d6b0…

1 0

Alexandre Julliard : ntdll: Don't bother setting the preloader range for fake dlls.
by Alexandre Julliard April 19, 2021

April 19, 2021

Module: wine Branch: master Commit: e436a40e80cd046fe2d70ae1e9a4419e35dcd25f URL: https://source.winehq.org/git/wine.git/?a=commit;h=e436a40e80cd046fe2d70ae1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 19 18:28:33 2021 +0200 ntdll: Don't bother setting the preloader range for fake dlls. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/loader.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 9361864e84b..4f6c2d07162 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -412,6 +412,8 @@ NTSTATUS exec_wineloader( char **argv, int socketfd, const pe_image_info_t *pe_i const char *loader_env = getenv( "WINELOADER" ); char preloader_reserve[64], socket_env[64]; + if (pe_info->image_flags & IMAGE_FLAGS_WineFakeDll) res_start = res_end = 0; + if (!is_child_64bit && (is_win64 || is_wow64) && (pe_info->image_flags & IMAGE_FLAGS_ComPlusNativeReady)) { is_child_64bit = TRUE;

1 0

Hans Leidekker : wldap32: Don't depend on libldap for the value functions.
by Alexandre Julliard April 19, 2021

April 19, 2021

Module: wine Branch: master Commit: 5a236e55c30f015055844caa04ddb70fe4193314 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5a236e55c30f015055844caa… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Apr 19 10:04:49 2021 +0200 wldap32: Don't depend on libldap for the value functions. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wldap32/value.c | 174 +++++++++++++++-------------------------- dlls/wldap32/winldap_private.h | 10 +++ 2 files changed, 72 insertions(+), 112 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5a236e55c30f01505584…

1 0

Alexandre Julliard : ntdll: Parse the loadFrom attribute in manifest dll elements.
by Alexandre Julliard April 19, 2021

April 19, 2021

Module: wine Branch: master Commit: 8f3383f741732f418493f60dc780bd36de7a02bd URL: https://source.winehq.org/git/wine.git/?a=commit;h=8f3383f741732f418493f60d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 19 14:55:50 2021 +0200 ntdll: Parse the loadFrom attribute in manifest dll elements. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/actctx.c | 32 +++++++++++++++++++------- dlls/ntdll/actctx.c | 55 +++++++++++++++++++++++++++++++------------- dlls/ntdll/ntdll_misc.h | 15 +++++++++++- 3 files changed, 77 insertions(+), 25 deletions(-) diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c index f7830d36b7b..163ea405222 100644 --- a/dlls/kernel32/tests/actctx.c +++ b/dlls/kernel32/tests/actctx.c @@ -1152,13 +1152,27 @@ struct wndclass_redirect_data ULONG module_offset;/* container name offset */ }; +struct dllredirect_data_path +{ + ULONG len; + ULONG offset; +}; + struct dllredirect_data { ULONG size; - ULONG unk; - DWORD res[3]; + ULONG flags; + ULONG total_len; + ULONG paths_count; + ULONG paths_offset; + struct dllredirect_data_path paths[1]; }; +#define DLL_REDIRECT_PATH_INCLUDES_BASE_NAME 1 +#define DLL_REDIRECT_PATH_OMITS_ASSEMBLY_ROOT 2 +#define DLL_REDIRECT_PATH_EXPAND 4 +#define DLL_REDIRECT_PATH_SYSTEM_DEFAULT_REDIRECTED_SYSTEM32_DLL 8 + struct tlibredirect_data { ULONG size; @@ -1195,16 +1209,18 @@ static void test_find_dll_redirection(HANDLE handle, LPCWSTR libname, ULONG exid ok_(__FILE__, line)(data.cbSize == sizeof(data), "data.cbSize=%u\n", data.cbSize); ok_(__FILE__, line)(data.ulDataFormatVersion == 1, "data.ulDataFormatVersion=%u\n", data.ulDataFormatVersion); ok_(__FILE__, line)(data.lpData != NULL, "data.lpData == NULL\n"); - ok_(__FILE__, line)(data.ulLength == 20, "data.ulLength=%u\n", data.ulLength); + ok_(__FILE__, line)(data.ulLength == offsetof( struct dllredirect_data, paths[0]), "data.ulLength=%u\n", data.ulLength); if (data.lpData) { struct dllredirect_data *dlldata = (struct dllredirect_data*)data.lpData; - ok_(__FILE__, line)(dlldata->size == data.ulLength, "got wrong size %d\n", dlldata->size); - ok_(__FILE__, line)(dlldata->unk == 2, "got wrong field value %d\n", dlldata->unk); - ok_(__FILE__, line)(dlldata->res[0] == 0, "got wrong res[0] value %d\n", dlldata->res[0]); - ok_(__FILE__, line)(dlldata->res[1] == 0, "got wrong res[1] value %d\n", dlldata->res[1]); - ok_(__FILE__, line)(dlldata->res[2] == 0, "got wrong res[2] value %d\n", dlldata->res[2]); + ok_(__FILE__, line)(dlldata->size == offsetof( struct dllredirect_data, paths[dlldata->paths_count]), + "got wrong size %d\n", dlldata->size); + ok_(__FILE__, line)(dlldata->flags == DLL_REDIRECT_PATH_OMITS_ASSEMBLY_ROOT, + "got wrong flags value %x\n", dlldata->flags); + ok_(__FILE__, line)(dlldata->total_len == 0, "got wrong total len value %d\n", dlldata->total_len); + ok_(__FILE__, line)(dlldata->paths_count == 0, "got wrong paths count value %d\n", dlldata->paths_count); + ok_(__FILE__, line)(dlldata->paths_offset == 0, "got wrong paths offset value %d\n", dlldata->paths_offset); } ok_(__FILE__, line)(data.lpSectionGlobalData == NULL, "data.lpSectionGlobalData != NULL\n"); diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 9a85085dd6a..f9afb655885 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -198,13 +198,6 @@ struct wndclass_redirect_data ULONG module_offset;/* container name offset */ }; -struct dllredirect_data -{ - ULONG size; - ULONG unk; - DWORD res[3]; -}; - struct tlibredirect_data { ULONG size; @@ -496,6 +489,7 @@ struct entity_array struct dll_redirect { WCHAR *name; + WCHAR *load_from; WCHAR *hash; struct entity_array entities; }; @@ -1074,6 +1068,7 @@ static void actctx_release( ACTIVATION_CONTEXT *actctx ) struct dll_redirect *dll = &assembly->dlls[j]; free_entity_array( &dll->entities ); RtlFreeHeap( GetProcessHeap(), 0, dll->name ); + RtlFreeHeap( GetProcessHeap(), 0, dll->load_from ); RtlFreeHeap( GetProcessHeap(), 0, dll->hash ); } RtlFreeHeap( GetProcessHeap(), 0, assembly->dlls ); @@ -2235,6 +2230,10 @@ static void parse_file_elem( xmlbuf_t* xmlbuf, struct assembly* assembly, if (!(dll->name = xmlstrdupW(&attr.value))) set_error( xmlbuf ); TRACE("name=%s\n", debugstr_xmlstr(&attr.value)); } + else if (xml_attr_cmp(&attr, L"loadFrom")) + { + if (!(dll->load_from = xmlstrdupW(&attr.value))) set_error( xmlbuf ); + } else if (xml_attr_cmp(&attr, L"hash")) { if (!(dll->hash = xmlstrdupW(&attr.value))) set_error( xmlbuf ); @@ -3342,8 +3341,13 @@ static NTSTATUS build_dllredirect_section(ACTIVATION_CONTEXT* actctx, struct str /* each entry needs index, data and string data */ total_len += sizeof(*index); - total_len += sizeof(*data); total_len += aligned_string_len((wcslen(dll->name)+1)*sizeof(WCHAR)); + if (dll->load_from) + { + total_len += offsetof( struct dllredirect_data, paths[1] ); + total_len += aligned_string_len( wcslen(dll->load_from) * sizeof(WCHAR) ); + } + else total_len += offsetof( struct dllredirect_data, paths[0] ); } dll_count += assembly->num_dlls; @@ -3381,21 +3385,40 @@ static NTSTATUS build_dllredirect_section(ACTIVATION_CONTEXT* actctx, struct str index->name_offset = name_offset; index->name_len = str.Length; index->data_offset = index->name_offset + aligned_string_len(str.MaximumLength); - index->data_len = sizeof(*data); + index->data_len = offsetof( struct dllredirect_data, paths[0] ); index->rosterindex = i + 1; - /* setup data */ - data = (struct dllredirect_data*)((BYTE*)header + index->data_offset); - data->size = sizeof(*data); - data->unk = 2; /* FIXME: seems to be constant */ - memset(data->res, 0, sizeof(data->res)); - /* dll name */ ptrW = (WCHAR*)((BYTE*)header + index->name_offset); memcpy(ptrW, dll->name, index->name_len); ptrW[index->name_len/sizeof(WCHAR)] = 0; + name_offset += aligned_string_len(str.MaximumLength); - name_offset += sizeof(*data) + aligned_string_len(str.MaximumLength); + /* setup data */ + data = (struct dllredirect_data*)((BYTE*)header + index->data_offset); + if (dll->load_from) + { + ULONG len = wcslen(dll->load_from) * sizeof(WCHAR); + data->size = offsetof( struct dllredirect_data, paths[1] ); + data->flags = 0; + data->total_len = aligned_string_len( len ); + data->paths_count = 1; + data->paths_offset = index->data_offset + offsetof( struct dllredirect_data, paths[0] ); + data->paths[0].offset = index->data_offset + data->size; + data->paths[0].len = len; + ptrW = (WCHAR *)((BYTE *)header + data->paths[0].offset); + memcpy( ptrW, dll->load_from, len ); + if (wcschr( dll->load_from, '%' )) data->flags |= DLL_REDIRECT_PATH_EXPAND; + } + else + { + data->size = offsetof( struct dllredirect_data, paths[0] ); + data->flags = DLL_REDIRECT_PATH_OMITS_ASSEMBLY_ROOT; + data->total_len = 0; + data->paths_count = 0; + data->paths_offset = 0; + } + name_offset += data->size + data->total_len; index++; } diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index a4a178a462e..1e00dcda2ec 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -85,7 +85,20 @@ extern struct _KUSER_SHARED_DATA *user_shared_data DECLSPEC_HIDDEN; extern int CDECL NTDLL__vsnprintf( char *str, SIZE_T len, const char *format, __ms_va_list args ) DECLSPEC_HIDDEN; extern int CDECL NTDLL__vsnwprintf( WCHAR *str, SIZE_T len, const WCHAR *format, __ms_va_list args ) DECLSPEC_HIDDEN; -/* load order */ +struct dllredirect_data +{ + ULONG size; + ULONG flags; + ULONG total_len; + ULONG paths_count; + ULONG paths_offset; + struct { ULONG len; ULONG offset; } paths[1]; +}; + +#define DLL_REDIRECT_PATH_INCLUDES_BASE_NAME 1 +#define DLL_REDIRECT_PATH_OMITS_ASSEMBLY_ROOT 2 +#define DLL_REDIRECT_PATH_EXPAND 4 +#define DLL_REDIRECT_PATH_SYSTEM_DEFAULT_REDIRECTED_SYSTEM32_DLL 8 #ifdef _WIN64 static inline TEB64 *NtCurrentTeb64(void) { return NULL; }

1 0

Alexandre Julliard : netapi32: Fix build when libnetapi is missing.
by Alexandre Julliard April 19, 2021

April 19, 2021

Module: wine Branch: master Commit: e8d87a84533ce5fdf1ef47b72c6c8d2d195ef944 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e8d87a84533ce5fdf1ef47b7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Apr 18 11:39:14 2021 +0200 netapi32: Fix build when libnetapi is missing. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/netapi32/unixlib.c | 62 +++++++++++++++++++++++++++---------------------- 1 file changed, 34 insertions(+), 28 deletions(-) diff --git a/dlls/netapi32/unixlib.c b/dlls/netapi32/unixlib.c index 1506e616c06..6a8999a6de4 100644 --- a/dlls/netapi32/unixlib.c +++ b/dlls/netapi32/unixlib.c @@ -929,34 +929,6 @@ static void libnetapi_init(void) libnetapi_ctx = ctx; } -#else - -static NET_API_STATUS WINAPI server_getinfo( LMSTR servername, DWORD level, LPBYTE *bufptr ) -{ - return ERROR_NOT_SUPPORTED; -} - -static NET_API_STATUS WINAPI share_add( LMSTR servername, DWORD level, LPBYTE buf, LPDWORD parm_err ) -{ - return ERROR_NOT_SUPPORTED; -} - -static NET_API_STATUS WINAPI share_del( LMSTR servername, LMSTR netname, DWORD reserved ) -{ - return ERROR_NOT_SUPPORTED; -} - -static NET_API_STATUS WINAPI wksta_getinfo( LMSTR servername, DWORD level, LPBYTE *bufptr ) -{ - return ERROR_NOT_SUPPORTED; -} - -static void libnetapi_init(void) -{ -} - -#endif /* SONAME_LIBNETAPI */ - static NET_API_STATUS WINAPI change_password( const WCHAR *domainname, const WCHAR *username, const WCHAR *oldpassword, const WCHAR *newpassword ) { @@ -1047,6 +1019,40 @@ end: return ret; } +#else + +static NET_API_STATUS WINAPI server_getinfo( const WCHAR *server, DWORD level, BYTE **buffer ) +{ + return ERROR_NOT_SUPPORTED; +} + +static NET_API_STATUS WINAPI share_add( const WCHAR *server, DWORD level, const BYTE *info, DWORD *err ) +{ + return ERROR_NOT_SUPPORTED; +} + +static NET_API_STATUS WINAPI share_del( const WCHAR *server, const WCHAR *share, DWORD reserved ) +{ + return ERROR_NOT_SUPPORTED; +} + +static NET_API_STATUS WINAPI wksta_getinfo( const WCHAR *server, DWORD level, BYTE **buffer ) +{ + return ERROR_NOT_SUPPORTED; +} + +static NET_API_STATUS WINAPI change_password( const WCHAR *domainname, const WCHAR *username, + const WCHAR *oldpassword, const WCHAR *newpassword ) +{ + return ERROR_NOT_SUPPORTED; +} + +static void libnetapi_init(void) +{ +} + +#endif /* SONAME_LIBNETAPI */ + static const struct samba_funcs samba_funcs = { server_getinfo,

1 0

Alexandre Julliard : ntdll: Load libwine before the main image.
by Alexandre Julliard April 19, 2021

April 19, 2021

Module: wine Branch: master Commit: 870340ee602e734e4a8a6fc7cc161832c6362d9f URL: https://source.winehq.org/git/wine.git/?a=commit;h=870340ee602e734e4a8a6fc7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 19 20:08:13 2021 +0200 ntdll: Load libwine before the main image. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51018 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/loader.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 4f6c2d07162..16bba12b571 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -115,6 +115,9 @@ static char *argv0; static const char *bin_dir; static const char *dll_dir; 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; @@ -938,11 +941,8 @@ static void load_libwine(void) #define LIBWINE "libwine.so.1" #endif typedef void (*load_dll_callback_t)( void *, const char * ); - static void (*p_wine_dll_set_callback)( load_dll_callback_t load ); - static int *p___wine_main_argc; - static char ***p___wine_main_argv; - static char ***p___wine_main_environ; - static WCHAR ***p___wine_main_wargv; + void (*p_wine_dll_set_callback)( load_dll_callback_t load ); + char ***p___wine_main_environ; char *path; void *handle; @@ -961,9 +961,6 @@ static void load_libwine(void) 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_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; if (p___wine_main_environ) *p___wine_main_environ = main_envp; } @@ -1777,14 +1774,17 @@ static void start_main_thread(void) init_cpu_info(); syscall_dispatcher = signal_init_syscalls(); 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; virtual_alloc_thread_stack( &stack, 0, 0, NULL ); teb->Tib.StackBase = stack.StackBase; teb->Tib.StackLimit = stack.StackLimit; teb->DeallocationStack = stack.DeallocationStack; NtCreateKeyedEvent( &keyed_event, GENERIC_READ | GENERIC_WRITE, NULL, 0 ); load_ntdll(); - load_libwine(); status = p__wine_set_unix_funcs( NTDLL_UNIXLIB_VERSION, &unix_funcs ); if (status == STATUS_REVISION_MISMATCH) {

1 0

Zebediah Figura : setupapi: Quiet a noisy warning.
by Alexandre Julliard April 19, 2021

April 19, 2021

Module: wine Branch: master Commit: d9c5b213d660bf388867e3eca6a081ffd2e33649 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d9c5b213d660bf388867e3ec… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Apr 18 11:45:52 2021 -0500 setupapi: Quiet a noisy warning. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/devinst.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index dd1ddaa9d33..91001976edd 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -700,7 +700,7 @@ static void remove_all_device_ifaces(struct device *device) if ((ret = RegOpenKeyExW(HKEY_LOCAL_MACHINE, DeviceClasses, 0, KEY_READ, &classes_key))) { - ERR("Failed to open classes key, error %u.\n", ret); + WARN("Failed to open classes key, error %u.\n", ret); return; }

1 0

Hans Leidekker : wldap32: Move support for rename functions to the Unix library.
by Alexandre Julliard April 19, 2021

April 19, 2021

Module: wine Branch: master Commit: 91355dae9355318f0123fd14b611797315282fce URL: https://source.winehq.org/git/wine.git/?a=commit;h=91355dae9355318f0123fd14… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Apr 19 10:04:48 2021 +0200 wldap32: Move support for rename functions to the Unix library. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wldap32/rename.c | 202 +++++++++++++------------------------------------- 1 file changed, 50 insertions(+), 152 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=91355dae9355318f0123…

1 0

Alexandre Julliard : ntdll: Use the loadFrom directory to load dlls from the activation context.
by Alexandre Julliard April 19, 2021

April 19, 2021

Module: wine Branch: master Commit: 55d98c572cdaa9a6554012b9820ba7ff8ccda251 URL: https://source.winehq.org/git/wine.git/?a=commit;h=55d98c572cdaa9a6554012b9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 19 15:15:26 2021 +0200 ntdll: Use the loadFrom directory to load dlls from the activation context. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50978 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 52 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 153b4a02769..4a5422b52ac 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2431,6 +2431,44 @@ failed: } +/*********************************************************************** + * build_dlldata_path + * + * Helper for find_actctx_dll. + */ +static NTSTATUS build_dlldata_path( LPCWSTR libname, ACTCTX_SECTION_KEYED_DATA *data, LPWSTR *fullname ) +{ + struct dllredirect_data *dlldata = data->lpData; + char *base = data->lpSectionBase; + SIZE_T total = dlldata->total_len + (wcslen(libname) + 1) * sizeof(WCHAR); + WCHAR *p, *buffer; + NTSTATUS status = STATUS_SUCCESS; + ULONG i; + + if (!(p = buffer = RtlAllocateHeap( GetProcessHeap(), 0, total ))) return STATUS_NO_MEMORY; + for (i = 0; i < dlldata->paths_count; i++) + { + memcpy( p, base + dlldata->paths[i].offset, dlldata->paths[i].len ); + p += dlldata->paths[i].len / sizeof(WCHAR); + } + wcscpy( p, libname ); + + if (dlldata->flags & DLL_REDIRECT_PATH_EXPAND) + { + RtlExpandEnvironmentStrings( NULL, buffer, wcslen(buffer), NULL, 0, &total ); + if ((*fullname = RtlAllocateHeap( GetProcessHeap(), 0, total * sizeof(WCHAR) ))) + RtlExpandEnvironmentStrings( NULL, buffer, wcslen(buffer), *fullname, total, NULL ); + else + status = STATUS_NO_MEMORY; + + RtlFreeHeap( GetProcessHeap(), 0, buffer ); + } + else *fullname = buffer; + + return status; +} + + /*********************************************************************** * find_actctx_dll * @@ -2440,8 +2478,9 @@ static NTSTATUS find_actctx_dll( LPCWSTR libname, LPWSTR *fullname ) { static const WCHAR winsxsW[] = {'\\','w','i','n','s','x','s','\\'}; - ACTIVATION_CONTEXT_ASSEMBLY_DETAILED_INFORMATION *info; + ACTIVATION_CONTEXT_ASSEMBLY_DETAILED_INFORMATION *info = NULL; ACTCTX_SECTION_KEYED_DATA data; + struct dllredirect_data *dlldata; UNICODE_STRING nameW; NTSTATUS status; SIZE_T needed, size = 1024; @@ -2454,6 +2493,18 @@ static NTSTATUS find_actctx_dll( LPCWSTR libname, LPWSTR *fullname ) &nameW, &data ); if (status != STATUS_SUCCESS) return status; + if (data.ulLength < offsetof( struct dllredirect_data, paths[0] )) + { + status = STATUS_SXS_KEY_NOT_FOUND; + goto done; + } + dlldata = data.lpData; + if (!(dlldata->flags & DLL_REDIRECT_PATH_OMITS_ASSEMBLY_ROOT)) + { + status = build_dlldata_path( libname, &data, fullname ); + goto done; + } + for (;;) { if (!(info = RtlAllocateHeap( GetProcessHeap(), 0, size )))

1 0

Francois Gouget : winetest/dissect: Make the load errors more explicit on the dll versions page.
by Alexandre Julliard April 19, 2021

April 19, 2021

Module: tools Branch: master Commit: 12ff7caa0cef3288708d1a06fe5a468d8b39e8ec URL: https://source.winehq.org/git/tools.git/?a=commit;h=12ff7caa0cef3288708d1a0… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Apr 19 16:54:08 2021 +0200 winetest/dissect: Make the load errors more explicit on the dll versions page. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/dissect | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/winetest/dissect b/winetest/dissect index 80fd6e2..2d0e9c2 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -879,11 +879,16 @@ foreach my $dll (sort keys %dllinfo) # There should be no native dll in the Wine tests $box->{data} .= sprintf "<td>%s</td><td class=\"failed\">native</td></tr>\n", escapeHTML($dll); } - elsif ($dllinfo{$dll}->{version} =~ /^load error/) + elsif ($dllinfo{$dll}->{version} eq "load error 258") + { + $box->{data} .= sprintf "<td>%s</td><td class=\"failed\">timed out getting the test list</td></tr>\n", + escapeHTML($dll); + } + elsif ($dllinfo{$dll}->{version} =~ /^load error (\d+)$/) { # Flag unknown errors - $box->{data} .= sprintf "<td>%s</td><td class=\"failed\">%s</td></tr>\n", - escapeHTML($dll), escapeHTML($dllinfo{$dll}->{version}); + $box->{data} .= sprintf "<td>%s</td><td class=\"failed\">got error %s while getting the test list</td></tr>\n", + escapeHTML($dll), escapeHTML($1); } elsif (defined($dllinfo{$dll}->{first})) {

1 0