August 2021 - Wine-devel - list.winehq.org

[PATCH vkd3d 1/5] vkd3d-shader: Add a 64-bit immediate constant register type.
by Conor McCarthy 03 Aug '21

03 Aug '21

Based in part on a vkd3d-proton patch by Joshua Ashton. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- libs/vkd3d-shader/dxbc.c | 15 +++++---- libs/vkd3d-shader/trace.c | 41 +++++++++++++++++++++++- libs/vkd3d-shader/vkd3d_shader_private.h | 3 ++ 3 files changed, 52 insertions(+), 7 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 6e7c1746..da102056 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -331,6 +331,7 @@ enum vkd3d_sm4_register_type VKD3D_SM4_RT_OUTPUT = 0x02, VKD3D_SM4_RT_INDEXABLE_TEMP = 0x03, VKD3D_SM4_RT_IMMCONST = 0x04, + VKD3D_SM4_RT_IMMCONST64 = 0x05, VKD3D_SM4_RT_SAMPLER = 0x06, VKD3D_SM4_RT_RESOURCE = 0x07, VKD3D_SM4_RT_CONSTBUFFER = 0x08, @@ -1265,7 +1266,7 @@ static const enum vkd3d_shader_register_type register_type_table[] = /* VKD3D_SM4_RT_OUTPUT */ VKD3DSPR_OUTPUT, /* VKD3D_SM4_RT_INDEXABLE_TEMP */ VKD3DSPR_IDXTEMP, /* VKD3D_SM4_RT_IMMCONST */ VKD3DSPR_IMMCONST, - /* UNKNOWN */ ~0u, + /* VKD3D_SM4_RT_IMMCONST64 */ VKD3DSPR_IMMCONST64, /* VKD3D_SM4_RT_SAMPLER */ VKD3DSPR_SAMPLER, /* VKD3D_SM4_RT_RESOURCE */ VKD3DSPR_RESOURCE, /* VKD3D_SM4_RT_CONSTBUFFER */ VKD3DSPR_CONSTBUFFER, @@ -1656,21 +1657,23 @@ static bool shader_sm4_read_param(struct vkd3d_sm4_data *priv, const DWORD **ptr return false; } - if (register_type == VKD3D_SM4_RT_IMMCONST) + if (register_type == VKD3D_SM4_RT_IMMCONST || register_type == VKD3D_SM4_RT_IMMCONST64) { enum vkd3d_sm4_dimension dimension = (token & VKD3D_SM4_DIMENSION_MASK) >> VKD3D_SM4_DIMENSION_SHIFT; + unsigned int dword_count; switch (dimension) { case VKD3D_SM4_DIMENSION_SCALAR: param->immconst_type = VKD3D_IMMCONST_SCALAR; - if (end - *ptr < 1) + dword_count = 1 + (register_type == VKD3D_SM4_RT_IMMCONST64); + if (end - *ptr < dword_count) { WARN("Invalid ptr %p, end %p.\n", *ptr, end); return false; } - memcpy(param->u.immconst_uint, *ptr, 1 * sizeof(DWORD)); - *ptr += 1; + memcpy(param->u.immconst_uint, *ptr, dword_count * sizeof(DWORD)); + *ptr += dword_count; break; case VKD3D_SM4_DIMENSION_VEC4: @@ -1744,7 +1747,7 @@ static bool shader_sm4_read_src_param(struct vkd3d_sm4_data *priv, const DWORD * return false; } - if (src_param->reg.type == VKD3DSPR_IMMCONST) + if (src_param->reg.type == VKD3DSPR_IMMCONST || src_param->reg.type == VKD3DSPR_IMMCONST64) { src_param->swizzle = VKD3D_SHADER_NO_SWIZZLE; } diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index b80aef67..d66681b9 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -722,6 +722,17 @@ static void shader_print_float_literal(struct vkd3d_d3d_asm_compiler *compiler, prefix, compiler->colours.literal, f, compiler->colours.reset, suffix); } +static void shader_print_double_literal(struct vkd3d_d3d_asm_compiler *compiler, + const char *prefix, double d, const char *suffix) +{ + if (isfinite(d) && signbit(d)) + vkd3d_string_buffer_printf(&compiler->buffer, "%s-%s%.15e%s%s", + prefix, compiler->colours.literal, -d, compiler->colours.reset, suffix); + else + vkd3d_string_buffer_printf(&compiler->buffer, "%s%s%.15e%s%s", + prefix, compiler->colours.literal, d, compiler->colours.reset, suffix); +} + static void shader_print_int_literal(struct vkd3d_d3d_asm_compiler *compiler, const char *prefix, int i, const char *suffix) { @@ -886,6 +897,10 @@ static void shader_dump_register(struct vkd3d_d3d_asm_compiler *compiler, const shader_addline(buffer, "l"); break; + case VKD3DSPR_IMMCONST64: + shader_addline(buffer, "d"); + break; + case VKD3DSPR_CONSTBUFFER: shader_addline(buffer, "cb"); is_descriptor = true; @@ -1058,6 +1073,29 @@ static void shader_dump_register(struct vkd3d_d3d_asm_compiler *compiler, const } shader_addline(buffer, ")"); } + else if (reg->type == VKD3DSPR_IMMCONST64) + { + shader_addline(buffer, "%s(", compiler->colours.reset); + /* A double2 vector is treated as a float4 vector in enum vkd3d_immconst_type. */ + if (reg->immconst_type == VKD3D_IMMCONST_SCALAR || reg->immconst_type == VKD3D_IMMCONST_VEC4) + { + if (reg->data_type == VKD3D_DATA_DOUBLE) + { + shader_print_double_literal(compiler, "", reg->u.immconst_double[0], ""); + if (reg->immconst_type == VKD3D_IMMCONST_VEC4) + shader_print_double_literal(compiler, ", ", reg->u.immconst_double[1], ""); + } + else + { + shader_addline(buffer, "<unhandled data type %#x>", reg->data_type); + } + } + else + { + shader_addline(buffer, "<unhandled immconst_type %#x>", reg->immconst_type); + } + shader_addline(buffer, ")"); + } else if (reg->type != VKD3DSPR_RASTOUT && reg->type != VKD3DSPR_MISCTYPE && reg->type != VKD3DSPR_NULL) @@ -1181,7 +1219,8 @@ static void shader_dump_src_param(struct vkd3d_d3d_asm_compiler *compiler, default: shader_addline(buffer, "_unknown_modifier(%#x)", src_modifier); } - if (param->reg.type != VKD3DSPR_IMMCONST && param->reg.type != VKD3DSPR_SAMPLER) + if (param->reg.type != VKD3DSPR_IMMCONST && param->reg.type != VKD3DSPR_IMMCONST64 + && param->reg.type != VKD3DSPR_SAMPLER) { static const char swizzle_chars[] = "xyzw"; DWORD swizzle_x = (swizzle >> VKD3D_SHADER_SWIZZLE_SHIFT(0)) & VKD3D_SHADER_SWIZZLE_MASK; diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 9e40a3bf..b3cd8cef 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -58,6 +58,7 @@ #include <string.h> #define VKD3D_VEC4_SIZE 4 +#define VKD3D_DVEC2_SIZE 2 enum vkd3d_shader_error { @@ -387,6 +388,7 @@ enum vkd3d_shader_register_type VKD3DSPR_LABEL = 18, VKD3DSPR_PREDICATE = 19, VKD3DSPR_IMMCONST, + VKD3DSPR_IMMCONST64, VKD3DSPR_CONSTBUFFER, VKD3DSPR_IMMCONSTBUFFER, VKD3DSPR_PRIMID, @@ -619,6 +621,7 @@ struct vkd3d_shader_register { DWORD immconst_uint[VKD3D_VEC4_SIZE]; float immconst_float[VKD3D_VEC4_SIZE]; + double immconst_double[VKD3D_DVEC2_SIZE]; unsigned fp_body_idx; } u; }; -- 2.32.0

2 9

[PATCH] wininet: Adjust IsHostInProxyBypassList() prototype.
by Nikolay Sivov 03 Aug '21

03 Aug '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/wininet/http.c | 11 ++++------- include/winineti.h | 1 + 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index eedb210cd23..e9363208471 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -6314,13 +6314,10 @@ static BOOL HTTP_DeleteCustomHeader(http_request_t *request, DWORD index) /*********************************************************************** - * IsHostInProxyBypassList (@) - * - * Undocumented - * + * IsHostInProxyBypassList (WININET.@) */ -BOOL WINAPI IsHostInProxyBypassList(DWORD flags, LPCSTR szHost, DWORD length) +BOOL WINAPI IsHostInProxyBypassList(INTERNET_SCHEME scheme, LPCSTR szHost, DWORD length) { - FIXME("STUB: flags=%d host=%s length=%d\n",flags,szHost,length); - return FALSE; + FIXME("STUB: scheme=%d host=%s length=%d\n", scheme, szHost, length); + return FALSE; } diff --git a/include/winineti.h b/include/winineti.h index 812ff793317..5dc3088a881 100644 --- a/include/winineti.h +++ b/include/winineti.h @@ -128,6 +128,7 @@ BOOL WINAPI GetUrlCacheConfigInfoW(LPINTERNET_CACHE_CONFIG_INFOW,LPDWORD, #define GetUrlCacheConfigInfo WINELIB_NAME_AW(GetUrlCacheConfigInfo) BOOL WINAPI IncrementUrlCacheHeaderData(DWORD,LPDWORD); BOOL WINAPI InternetQueryFortezzaStatus(DWORD*,DWORD_PTR); +BOOL WINAPI IsHostInProxyBypassList(INTERNET_SCHEME,LPCSTR,DWORD); BOOL WINAPI IsUrlCacheEntryExpiredA(LPCSTR,DWORD,FILETIME*); BOOL WINAPI IsUrlCacheEntryExpiredW(LPCWSTR,DWORD,FILETIME*); #define IsUrlCacheEntryExpired WINELIB_NAME_AW(IsUrlCacheEntryExpired) -- 2.30.2

2 1

[PATCH 1/2] ieframe: Remove manual IInternetExplorerManager proxy registration.
by Zebediah Figura 03 Aug '21

03 Aug '21

This is handled automatically when registering ieproxy. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- Ancient bit of code I added in 448ac0e9c43, for some reason I can't imagine. dlls/ieframe/ieframe.rgs | 7 ------- 1 file changed, 7 deletions(-) diff --git a/dlls/ieframe/ieframe.rgs b/dlls/ieframe/ieframe.rgs index 0b48600321e..f99e6b63523 100644 --- a/dlls/ieframe/ieframe.rgs +++ b/dlls/ieframe/ieframe.rgs @@ -42,13 +42,6 @@ HKCR Control } } - NoRemove Interface - { - '{acc84351-04ff-44f9-b23f-655ed168c6d5}' - { - ProxyStubClsid32 = s '{a4a1a128-768f-41e0-bf75-e4fddd701cba}' - } - } 'InternetShortcut' { val 'EditFlags' = s '2' -- 2.30.2

2 3

[PATCH] server: Add missing braces.
by Andrey Gusev 03 Aug '21

03 Aug '21

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- server/window.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/server/window.c b/server/window.c index 3a88b7f34fa..5882d900e08 100644 --- a/server/window.c +++ b/server/window.c @@ -1710,12 +1710,15 @@ static void set_window_pos( struct window *win, struct window *previous, int old_size = old_client_rect.right - old_client_rect.left; int new_size = win->client_rect.right - win->client_rect.left; - if (old_size != new_size) LIST_FOR_EACH_ENTRY( child, &win->children, struct window, entry ) + if (old_size != new_size) { - offset_rect( &child->window_rect, new_size - old_size, 0 ); - offset_rect( &child->visible_rect, new_size - old_size, 0 ); - offset_rect( &child->surface_rect, new_size - old_size, 0 ); - offset_rect( &child->client_rect, new_size - old_size, 0 ); + LIST_FOR_EACH_ENTRY( child, &win->children, struct window, entry ) + { + offset_rect( &child->window_rect, new_size - old_size, 0 ); + offset_rect( &child->visible_rect, new_size - old_size, 0 ); + offset_rect( &child->surface_rect, new_size - old_size, 0 ); + offset_rect( &child->client_rect, new_size - old_size, 0 ); + } } } -- 2.31.1

1 0

[PATCH] winebuild: Fix building for arm with older versions of binutils
by Martin Storsjö 03 Aug '21

03 Aug '21

Use an explicit "movw" instead of a plain "mov", as the immediates might not fit in a narrow thumb mov instruction. Newer versions of binutils deduces this implicitly. Signed-off-by: Martin Storsjö <martin(a)martin.st> --- tools/winebuild/spec32.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index 02029056b30..d944f8179af 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -312,7 +312,7 @@ static void output_relay_debug( DLLSPEC *spec ) if (has_float) output( "\tvpush {s0-s15}\n" ); output( "\tpush {LR}\n" ); output( "\tsub SP, #4\n"); - output( "\tmov r1,#%u\n", i - spec->base ); + output( "\tmovw r1,#%u\n", i - spec->base ); output( "\tmovt r1,#%u\n", odp->u.func.args_str_offset ); if (UsePIC) { -- 2.25.1

1 0

[PATCH] loader: Add support for ARM linux in the preloader
by Martin Storsjo 03 Aug '21

03 Aug '21

As the preloader is linked with -nodefaultlibs, we need to provide builtin helpers for division on arm (that normally are provided by libgcc or compiler-rt). The bundled version is taken from the LLVM 8.0.0 release, which still was dual licensed under the MIT and University of Illinois licenses. (In the 9.0.0 release, all of LLVM was relicensed to a different license.) Since 28fe84da45bea7de56539b50eac8ebcec54342de, the main exe image must be mappable at its desired base address, which essentially requires the preloader. This fixes the original issue that lead to https://bugs.winehq.org/show_bug.cgi?id=51539. Signed-off-by: Martin Storsjo <martin(a)martin.st> --- configure.ac | 2 +- dlls/ntdll/unix/loader.c | 6 +- loader/Makefile.in | 4 +- loader/aeabi_uidivmod.S | 59 +++++++++++ loader/assembly.h | 204 +++++++++++++++++++++++++++++++++++++++ loader/preloader.c | 103 +++++++++++++++++++- loader/udivmodsi4.S | 177 +++++++++++++++++++++++++++++++++ 7 files changed, 547 insertions(+), 8 deletions(-) create mode 100644 loader/aeabi_uidivmod.S create mode 100644 loader/assembly.h create mode 100644 loader/udivmodsi4.S diff --git a/configure.ac b/configure.ac index b5d3217f2a0..ff2caa49869 100644 --- a/configure.ac +++ b/configure.ac @@ -2161,7 +2161,7 @@ esac case $host_os in linux*) case $host_cpu in - *i[[3456789]]86*|x86_64*|*aarch64*) + *i[[3456789]]86*|x86_64*|*aarch64*|arm*) test "$wine_binary" = wine || WINE_IGNORE_FILE("loader/wine-preloader") WINELOADER_PROGRAMS="$WINELOADER_PROGRAMS $wine_binary-preloader" ;; diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 0e580cd7556..14f26cbd520 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -2155,11 +2155,7 @@ static int pre_exec(void) int temp; check_vmsplit( &temp ); -#ifdef __i386__ - return 1; /* we have a preloader on x86 */ -#else - return 0; -#endif + return 1; /* we have a preloader on x86/arm */ } #elif defined(__linux__) && (defined(__x86_64__) || defined(__aarch64__)) diff --git a/loader/Makefile.in b/loader/Makefile.in index 7302c231915..534bf829f3f 100644 --- a/loader/Makefile.in +++ b/loader/Makefile.in @@ -1,7 +1,9 @@ SOURCES = \ + aeabi_uidivmod.S \ main.c \ preloader.c \ preloader_mac.c \ + udivmodsi4.S \ wine.de.UTF-8.man.in \ wine.desktop \ wine.fr.UTF-8.man.in \ @@ -25,7 +27,7 @@ wine64_OBJS = main.o wine64_DEPS = $(WINELOADER_DEPENDS) wine64_LDFLAGS = $(WINELOADER_LDFLAGS) $(LDEXECFLAGS) $(PTHREAD_LIBS) -wine_preloader_OBJS = preloader.o preloader_mac.o +wine_preloader_OBJS = preloader.o preloader_mac.o aeabi_uidivmod.o udivmodsi4.o wine_preloader_DEPS = $(WINELOADER_DEPENDS) wine_preloader_LDFLAGS = $(WINEPRELOADER_LDFLAGS) diff --git a/loader/aeabi_uidivmod.S b/loader/aeabi_uidivmod.S new file mode 100644 index 00000000000..9cef2d17e6c --- /dev/null +++ b/loader/aeabi_uidivmod.S @@ -0,0 +1,59 @@ +//===-- aeabi_uidivmod.S - EABI uidivmod implementation -------------------===// +// +// The LLVM Compiler Infrastructure +// +// This file is dual licensed under the MIT and the University of Illinois Open +// Source Licenses. See LICENSE.TXT for details. +// +//===----------------------------------------------------------------------===// + +#ifdef __arm__ +#include "assembly.h" + +// struct { unsigned quot, unsigned rem} +// __aeabi_uidivmod(unsigned numerator, unsigned denominator) { +// unsigned rem, quot; +// quot = __udivmodsi4(numerator, denominator, &rem); +// return {quot, rem}; +// } + +#if defined(__MINGW32__) +#define __aeabi_uidivmod __rt_udiv +#endif + + .syntax unified + .text + DEFINE_CODE_STATE + .p2align 2 +DEFINE_COMPILERRT_FUNCTION(__aeabi_uidivmod) +#if defined(USE_THUMB_1) + cmp r0, r1 + bcc LOCAL_LABEL(case_denom_larger) + push {r0, r1, lr} + bl SYMBOL_NAME(__aeabi_uidiv) + pop {r1, r2, r3} + muls r2, r0, r2 // r2 = quot * denom + subs r1, r1, r2 + JMP (r3) +LOCAL_LABEL(case_denom_larger): + movs r1, r0 + movs r0, #0 + JMP (lr) +#else // defined(USE_THUMB_1) + push { lr } + sub sp, sp, #4 + mov r2, sp +#if defined(__MINGW32__) + mov r3, r0 + mov r0, r1 + mov r1, r3 +#endif + bl SYMBOL_NAME(__udivmodsi4) + ldr r1, [sp] + add sp, sp, #4 + pop { pc } +#endif +END_COMPILERRT_FUNCTION(__aeabi_uidivmod) + +NO_EXEC_STACK_DIRECTIVE +#endif diff --git a/loader/assembly.h b/loader/assembly.h new file mode 100644 index 00000000000..3f5e59b2544 --- /dev/null +++ b/loader/assembly.h @@ -0,0 +1,204 @@ +/* ===-- assembly.h - compiler-rt assembler support macros -----------------=== + * + * The LLVM Compiler Infrastructure + * + * This file is dual licensed under the MIT and the University of Illinois Open + * Source Licenses. See LICENSE.TXT for details. + * + * ===----------------------------------------------------------------------=== + * + * This file defines macros for use in compiler-rt assembler source. + * This file is not part of the interface of this library. + * + * ===----------------------------------------------------------------------=== + */ + +#ifndef COMPILERRT_ASSEMBLY_H +#define COMPILERRT_ASSEMBLY_H + +#if defined(__POWERPC__) || defined(__powerpc__) || defined(__ppc__) +#define SEPARATOR @ +#else +#define SEPARATOR ; +#endif + +#if defined(__APPLE__) +#define HIDDEN(name) .private_extern name +#define LOCAL_LABEL(name) L_##name +// tell linker it can break up file at label boundaries +#define FILE_LEVEL_DIRECTIVE .subsections_via_symbols +#define SYMBOL_IS_FUNC(name) +#define CONST_SECTION .const + +#define NO_EXEC_STACK_DIRECTIVE + +#elif defined(__ELF__) + +#define HIDDEN(name) .hidden name +#define LOCAL_LABEL(name) .L_##name +#define FILE_LEVEL_DIRECTIVE +#if defined(__arm__) +#define SYMBOL_IS_FUNC(name) .type name,%function +#else +#define SYMBOL_IS_FUNC(name) .type name,@function +#endif +#define CONST_SECTION .section .rodata + +#if defined(__GNU__) || defined(__FreeBSD__) || defined(__Fuchsia__) || \ + defined(__linux__) +#define NO_EXEC_STACK_DIRECTIVE .section .note.GNU-stack,"",%progbits +#else +#define NO_EXEC_STACK_DIRECTIVE +#endif + +#else // !__APPLE__ && !__ELF__ + +#define HIDDEN(name) +#define LOCAL_LABEL(name) .L ## name +#define FILE_LEVEL_DIRECTIVE +#define SYMBOL_IS_FUNC(name) \ + .def name SEPARATOR \ + .scl 2 SEPARATOR \ + .type 32 SEPARATOR \ + .endef +#define CONST_SECTION .section .rdata,"rd" + +#define NO_EXEC_STACK_DIRECTIVE + +#endif + +#if defined(__arm__) + +/* + * Determine actual [ARM][THUMB[1][2]] ISA using compiler predefined macros: + * - for '-mthumb -march=armv6' compiler defines '__thumb__' + * - for '-mthumb -march=armv7' compiler defines '__thumb__' and '__thumb2__' + */ +#if defined(__thumb2__) || defined(__thumb__) +#define DEFINE_CODE_STATE .thumb SEPARATOR +#define DECLARE_FUNC_ENCODING .thumb_func SEPARATOR +#if defined(__thumb2__) +#define USE_THUMB_2 +#define IT(cond) it cond +#define ITT(cond) itt cond +#define ITE(cond) ite cond +#else +#define USE_THUMB_1 +#define IT(cond) +#define ITT(cond) +#define ITE(cond) +#endif // defined(__thumb__2) +#else // !defined(__thumb2__) && !defined(__thumb__) +#define DEFINE_CODE_STATE .arm SEPARATOR +#define DECLARE_FUNC_ENCODING +#define IT(cond) +#define ITT(cond) +#define ITE(cond) +#endif + +#if defined(USE_THUMB_1) && defined(USE_THUMB_2) +#error "USE_THUMB_1 and USE_THUMB_2 can't be defined together." +#endif + +#if defined(__ARM_ARCH_4T__) || __ARM_ARCH >= 5 +#define ARM_HAS_BX +#endif +#if !defined(__ARM_FEATURE_CLZ) && !defined(USE_THUMB_1) && \ + (__ARM_ARCH >= 6 || (__ARM_ARCH == 5 && !defined(__ARM_ARCH_5__))) +#define __ARM_FEATURE_CLZ +#endif + +#ifdef ARM_HAS_BX +#define JMP(r) bx r +#define JMPc(r, c) bx##c r +#else +#define JMP(r) mov pc, r +#define JMPc(r, c) mov##c pc, r +#endif + +// pop {pc} can't switch Thumb mode on ARMv4T +#if __ARM_ARCH >= 5 +#define POP_PC() pop {pc} +#else +#define POP_PC() \ + pop {ip}; \ + JMP(ip) +#endif + +#if defined(USE_THUMB_2) +#define WIDE(op) op.w +#else +#define WIDE(op) op +#endif +#else // !defined(__arm) +#define DECLARE_FUNC_ENCODING +#define DEFINE_CODE_STATE +#endif + +#define GLUE2(a, b) a##b +#define GLUE(a, b) GLUE2(a, b) +#define SYMBOL_NAME(name) GLUE(__USER_LABEL_PREFIX__, name) + +#ifdef VISIBILITY_HIDDEN +#define DECLARE_SYMBOL_VISIBILITY(name) \ + HIDDEN(SYMBOL_NAME(name)) SEPARATOR +#else +#define DECLARE_SYMBOL_VISIBILITY(name) +#endif + +#define DEFINE_COMPILERRT_FUNCTION(name) \ + DEFINE_CODE_STATE \ + FILE_LEVEL_DIRECTIVE SEPARATOR \ + .globl SYMBOL_NAME(name) SEPARATOR \ + SYMBOL_IS_FUNC(SYMBOL_NAME(name)) SEPARATOR \ + DECLARE_SYMBOL_VISIBILITY(name) \ + DECLARE_FUNC_ENCODING \ + SYMBOL_NAME(name): + +#define DEFINE_COMPILERRT_THUMB_FUNCTION(name) \ + DEFINE_CODE_STATE \ + FILE_LEVEL_DIRECTIVE SEPARATOR \ + .globl SYMBOL_NAME(name) SEPARATOR \ + SYMBOL_IS_FUNC(SYMBOL_NAME(name)) SEPARATOR \ + DECLARE_SYMBOL_VISIBILITY(name) SEPARATOR \ + .thumb_func SEPARATOR \ + SYMBOL_NAME(name): + +#define DEFINE_COMPILERRT_PRIVATE_FUNCTION(name) \ + DEFINE_CODE_STATE \ + FILE_LEVEL_DIRECTIVE SEPARATOR \ + .globl SYMBOL_NAME(name) SEPARATOR \ + SYMBOL_IS_FUNC(SYMBOL_NAME(name)) SEPARATOR \ + HIDDEN(SYMBOL_NAME(name)) SEPARATOR \ + DECLARE_FUNC_ENCODING \ + SYMBOL_NAME(name): + +#define DEFINE_COMPILERRT_PRIVATE_FUNCTION_UNMANGLED(name) \ + DEFINE_CODE_STATE \ + .globl name SEPARATOR \ + SYMBOL_IS_FUNC(name) SEPARATOR \ + HIDDEN(name) SEPARATOR \ + DECLARE_FUNC_ENCODING \ + name: + +#define DEFINE_COMPILERRT_FUNCTION_ALIAS(name, target) \ + .globl SYMBOL_NAME(name) SEPARATOR \ + SYMBOL_IS_FUNC(SYMBOL_NAME(name)) SEPARATOR \ + DECLARE_SYMBOL_VISIBILITY(SYMBOL_NAME(name)) SEPARATOR \ + .set SYMBOL_NAME(name), SYMBOL_NAME(target) SEPARATOR + +#if defined(__ARM_EABI__) +#define DEFINE_AEABI_FUNCTION_ALIAS(aeabi_name, name) \ + DEFINE_COMPILERRT_FUNCTION_ALIAS(aeabi_name, name) +#else +#define DEFINE_AEABI_FUNCTION_ALIAS(aeabi_name, name) +#endif + +#ifdef __ELF__ +#define END_COMPILERRT_FUNCTION(name) \ + .size SYMBOL_NAME(name), . - SYMBOL_NAME(name) +#else +#define END_COMPILERRT_FUNCTION(name) +#endif + +#endif /* COMPILERRT_ASSEMBLY_H */ diff --git a/loader/preloader.c b/loader/preloader.c index bb16ecd96a4..4b53791e782 100644 --- a/loader/preloader.c +++ b/loader/preloader.c @@ -111,7 +111,7 @@ static struct wine_preload_info preload_info[] = { -#ifdef __i386__ +#if defined(__i386__) || defined(__arm__) { (void *)0x00000000, 0x00010000 }, /* low 64k */ { (void *)0x00010000, 0x00100000 }, /* DOS area */ { (void *)0x00110000, 0x67ef0000 }, /* low memory area */ @@ -536,6 +536,104 @@ SYSCALL_NOERR( wld_geteuid, 175 /* SYS_geteuid */ ); gid_t wld_getegid(void); SYSCALL_NOERR( wld_getegid, 177 /* SYS_getegid */ ); +#elif defined(__arm__) + +void *thread_data[256]; + +/* + * The _start function is the entry and exit point of this program + * + * It calls wld_start, passing a pointer to the args it receives + * then jumps to the address wld_start returns. + */ +void _start(void); +extern char _end[]; +__ASM_GLOBAL_FUNC(_start, + "mov r0, sp\n\t" + "sub sp, sp, #144\n\t" /* allocate some space for extra aux values */ + "str r0, [sp]\n\t" /* orig stack pointer */ + "ldr r0, =thread_data\n\t" + "movw r7, #0x0005\n\t" /* __ARM_NR_set_tls */ + "movt r7, #0xf\n\t" /* __ARM_NR_set_tls */ + "svc #0\n\t" + "mov r0, sp\n\t" /* ptr to orig stack pointer */ + "bl wld_start\n\t" + "ldr r1, [sp]\n\t" /* new stack pointer */ + "mov sp, r1\n\t" + "mov lr, r0\n\t" + "mov r0, #0\n\t" + "mov r1, #0\n\t" + "mov r2, #0\n\t" + "mov r3, #0\n\t" + "mov r12, #0\n\t" + "bx lr\n\t" + ".ltorg\n\t") + +#define SYSCALL_FUNC( name, nr ) \ + __ASM_GLOBAL_FUNC( name, \ + "push {r4-r5,r7,lr}\n\t" \ + "ldr r4, [sp, #16]\n\t" \ + "ldr r5, [sp, #20]\n\t" \ + "mov r7, #" #nr "\n\t" \ + "svc #0\n\t" \ + "cmn r0, #4096\n\t" \ + "it hi\n\t" \ + "movhi r0, #-1\n\t" \ + "pop {r4-r5,r7,pc}\n\t" ) + +#define SYSCALL_NOERR( name, nr ) \ + __ASM_GLOBAL_FUNC( name, \ + "push {r7,lr}\n\t" \ + "mov r7, #" #nr "\n\t" \ + "svc #0\n\t" \ + "pop {r7,pc}\n\t" ) + +void wld_exit( int code ) __attribute__((noreturn)); +SYSCALL_NOERR( wld_exit, 1 /* SYS_exit */ ); + +ssize_t wld_read( int fd, void *buffer, size_t len ); +SYSCALL_FUNC( wld_read, 3 /* SYS_read */ ); + +ssize_t wld_write( int fd, const void *buffer, size_t len ); +SYSCALL_FUNC( wld_write, 4 /* SYS_write */ ); + +int wld_openat( int dirfd, const char *name, int flags ); +SYSCALL_FUNC( wld_openat, 322 /* SYS_openat */ ); + +int wld_open( const char *name, int flags ) +{ + return wld_openat(-100 /* AT_FDCWD */, name, flags); +} + +int wld_close( int fd ); +SYSCALL_FUNC( wld_close, 6 /* SYS_close */ ); + +void *wld_mmap2( void *start, size_t len, int prot, int flags, int fd, int offset ); +SYSCALL_FUNC( wld_mmap2, 192 /* SYS_mmap2 */ ); + +void *wld_mmap( void *start, size_t len, int prot, int flags, int fd, off_t offset ) +{ + return wld_mmap2(start, len, prot, flags, fd, offset >> 12); +} + +int wld_mprotect( const void *addr, size_t len, int prot ); +SYSCALL_FUNC( wld_mprotect, 125 /* SYS_mprotect */ ); + +int wld_prctl( int code, long arg ); +SYSCALL_FUNC( wld_prctl, 172 /* SYS_prctl */ ); + +uid_t wld_getuid(void); +SYSCALL_NOERR( wld_getuid, 24 /* SYS_getuid */ ); + +gid_t wld_getgid(void); +SYSCALL_NOERR( wld_getgid, 47 /* SYS_getgid */ ); + +uid_t wld_geteuid(void); +SYSCALL_NOERR( wld_geteuid, 49 /* SYS_geteuid */ ); + +gid_t wld_getegid(void); +SYSCALL_NOERR( wld_getegid, 50 /* SYS_getegid */ ); + #else #error preloader not implemented for this CPU #endif @@ -809,6 +907,9 @@ static void map_so_lib( const char *name, struct wld_link_map *l) #elif defined(__aarch64__) if( header->e_machine != EM_AARCH64 ) fatal_error("%s: not an aarch64 ELF binary... don't know how to load it\n", name ); +#elif defined(__arm__) + if( header->e_machine != EM_ARM ) + fatal_error("%s: not an arm ELF binary... don't know how to load it\n", name ); #endif if (header->e_phnum > sizeof(loadcmds)/sizeof(loadcmds[0])) diff --git a/loader/udivmodsi4.S b/loader/udivmodsi4.S new file mode 100644 index 00000000000..2b89a52e3cb --- /dev/null +++ b/loader/udivmodsi4.S @@ -0,0 +1,177 @@ +/*===-- udivmodsi4.S - 32-bit unsigned integer divide and modulus ---------===// + * + * The LLVM Compiler Infrastructure + * + * This file is dual licensed under the MIT and the University of Illinois Open + * Source Licenses. See LICENSE.TXT for details. + * + *===----------------------------------------------------------------------===// + * + * This file implements the __udivmodsi4 (32-bit unsigned integer divide and + * modulus) function for the ARM 32-bit architecture. + * + *===----------------------------------------------------------------------===*/ + +#ifdef __arm__ +#include "assembly.h" + + .syntax unified + .text + DEFINE_CODE_STATE + +@ unsigned int __udivmodsi4(unsigned int divident, unsigned int divisor, +@ unsigned int *remainder) +@ Calculate the quotient and remainder of the (unsigned) division. The return +@ value is the quotient, the remainder is placed in the variable. + + .p2align 2 +DEFINE_COMPILERRT_FUNCTION(__udivmodsi4) +#if __ARM_ARCH_EXT_IDIV__ + tst r1, r1 + beq LOCAL_LABEL(divby0) + mov r3, r0 + udiv r0, r3, r1 + mls r1, r0, r1, r3 + str r1, [r2] + bx lr +#else + cmp r1, #1 + bcc LOCAL_LABEL(divby0) + beq LOCAL_LABEL(divby1) + cmp r0, r1 + bcc LOCAL_LABEL(quotient0) + /* + * Implement division using binary long division algorithm. + * + * r0 is the numerator, r1 the denominator. + * + * The code before JMP computes the correct shift I, so that + * r0 and (r1 << I) have the highest bit set in the same position. + * At the time of JMP, ip := .Ldiv0block - 12 * I. + * This depends on the fixed instruction size of block. + * For ARM mode, this is 12 Bytes, for THUMB mode 14 Bytes. + * + * block(shift) implements the test-and-update-quotient core. + * It assumes (r0 << shift) can be computed without overflow and + * that (r0 << shift) < 2 * r1. The quotient is stored in r3. + */ + +# ifdef __ARM_FEATURE_CLZ + clz ip, r0 + clz r3, r1 + /* r0 >= r1 implies clz(r0) <= clz(r1), so ip <= r3. */ + sub r3, r3, ip +# if defined(USE_THUMB_2) + adr ip, LOCAL_LABEL(div0block) + 1 + sub ip, ip, r3, lsl #1 +# else + adr ip, LOCAL_LABEL(div0block) +# endif + sub ip, ip, r3, lsl #2 + sub ip, ip, r3, lsl #3 + mov r3, #0 + bx ip +# else +# if defined(USE_THUMB_2) +# error THUMB mode requires CLZ or UDIV +# endif + str r4, [sp, #-8]! + + mov r4, r0 + adr ip, LOCAL_LABEL(div0block) + + lsr r3, r4, #16 + cmp r3, r1 + movhs r4, r3 + subhs ip, ip, #(16 * 12) + + lsr r3, r4, #8 + cmp r3, r1 + movhs r4, r3 + subhs ip, ip, #(8 * 12) + + lsr r3, r4, #4 + cmp r3, r1 + movhs r4, r3 + subhs ip, #(4 * 12) + + lsr r3, r4, #2 + cmp r3, r1 + movhs r4, r3 + subhs ip, ip, #(2 * 12) + + /* Last block, no need to update r3 or r4. */ + cmp r1, r4, lsr #1 + subls ip, ip, #(1 * 12) + + ldr r4, [sp], #8 /* restore r4, we are done with it. */ + mov r3, #0 + + JMP(ip) +# endif + +#define IMM # + +#define block(shift) \ + cmp r0, r1, lsl IMM shift; \ + ITT(hs); \ + WIDE(addhs) r3, r3, IMM (1 << shift); \ + WIDE(subhs) r0, r0, r1, lsl IMM shift + + block(31) + block(30) + block(29) + block(28) + block(27) + block(26) + block(25) + block(24) + block(23) + block(22) + block(21) + block(20) + block(19) + block(18) + block(17) + block(16) + block(15) + block(14) + block(13) + block(12) + block(11) + block(10) + block(9) + block(8) + block(7) + block(6) + block(5) + block(4) + block(3) + block(2) + block(1) +LOCAL_LABEL(div0block): + block(0) + + str r0, [r2] + mov r0, r3 + JMP(lr) + +LOCAL_LABEL(quotient0): + str r0, [r2] + mov r0, #0 + JMP(lr) + +LOCAL_LABEL(divby1): + mov r3, #0 + str r3, [r2] + JMP(lr) +#endif /* __ARM_ARCH_EXT_IDIV__ */ + +LOCAL_LABEL(divby0): + mov r0, #0 + JMP(lr) + +END_COMPILERRT_FUNCTION(__udivmodsi4) + +NO_EXEC_STACK_DIRECTIVE +#endif -- 2.25.1

2 2

[PATCH 0/2] Fix array parameter size mismatch warnings
by Alex Henrie 03 Aug '21

03 Aug '21

GCC 11 has a new warning (-Warray-parameter) that complains if an array argument is defined differently than declared in the function prototype. We can avoid that warning by consistently using the same definitions as the Windows SDK. -Alex Alex Henrie (2): msdmo: Fix size of DMOGetName's array argument (GCC) include: Fix size of MsiEnumClientsEx[AW]'s array argument (GCC) dlls/msdmo/dmoreg.c | 2 +- include/msi.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) -- 2.32.0

2 3

[PATCH] gdi32: Update font realization structure definition.
by Nikolay Sivov 03 Aug '21

03 Aug '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- I tested this with with Type 1 pfb/pfm font on Windows 10. Second argument is font file index, that's clearly visible by inspecting returned file paths. PFB path is returned for index 0, and PFM for index 1. For DirectWrite integration purposes we could use CreateFontFace() that takes an array of file objects, but newer API additions like CreateFontFaceReference() do not use such model. More importantly DirectWrite never supported Adobe formats, outside of sfnt container. dlls/dwrite/gdiinterop.c | 12 +++++++----- dlls/dwrite/tests/font.c | 2 +- dlls/gdi32/font.c | 8 ++++---- dlls/gdi32/ntgdi_private.h | 2 +- dlls/gdi32/tests/font.c | 2 +- 5 files changed, 14 insertions(+), 12 deletions(-) diff --git a/dlls/dwrite/gdiinterop.c b/dlls/dwrite/gdiinterop.c index 6a5953a67e9..8df3f9f97ca 100644 --- a/dlls/dwrite/gdiinterop.c +++ b/dlls/dwrite/gdiinterop.c @@ -737,17 +737,19 @@ static HRESULT WINAPI gdiinterop_ConvertFontFaceToLOGFONT(IDWriteGdiInterop1 *if return S_OK; } -struct font_realization_info { +struct font_realization_info +{ DWORD size; DWORD flags; DWORD cache_num; DWORD instance_id; - DWORD unk; + DWORD file_count; WORD face_index; WORD simulations; }; -struct font_fileinfo { +struct font_fileinfo +{ FILETIME writetime; LARGE_INTEGER size; WCHAR path[1]; @@ -755,8 +757,8 @@ struct font_fileinfo { /* Undocumented gdi32 exports, used to access actually selected font information */ extern BOOL WINAPI GetFontRealizationInfo(HDC hdc, struct font_realization_info *info); -extern BOOL WINAPI GetFontFileInfo(DWORD instance_id, DWORD unknown, struct font_fileinfo *info, SIZE_T size, SIZE_T *needed); -extern BOOL WINAPI GetFontFileData(DWORD instance_id, DWORD unknown, UINT64 offset, void *buff, DWORD buff_size); +extern BOOL WINAPI GetFontFileInfo(DWORD instance_id, DWORD file_index, struct font_fileinfo *info, SIZE_T size, SIZE_T *needed); +extern BOOL WINAPI GetFontFileData(DWORD instance_id, DWORD file_index, UINT64 offset, void *buff, DWORD buff_size); static HRESULT WINAPI gdiinterop_CreateFontFaceFromHdc(IDWriteGdiInterop1 *iface, HDC hdc, IDWriteFontFace **fontface) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 9f814504a44..be367463414 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -4276,7 +4276,7 @@ struct font_realization_info DWORD flags; DWORD cache_num; DWORD instance_id; - DWORD unk; + DWORD file_count; WORD face_index; WORD simulations; }; diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 16d3bdf26ba..442c76fb026 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -3177,7 +3177,7 @@ static BOOL CDECL font_GetFontRealizationInfo( PHYSDEV dev, void *ptr ) info->instance_id = physdev->font->handle; if (info->size == sizeof(*info)) { - info->unk = 0; + info->file_count = 1; info->face_index = physdev->font->face_index; info->simulations = 0; if (physdev->font->fake_bold) info->simulations |= 0x1; @@ -8304,7 +8304,7 @@ BOOL WINAPI FontIsLinked(HDC hdc) */ BOOL WINAPI GetFontRealizationInfo(HDC hdc, struct font_realization_info *info) { - BOOL is_v0 = info->size == FIELD_OFFSET(struct font_realization_info, unk); + BOOL is_v0 = info->size == FIELD_OFFSET(struct font_realization_info, file_count); PHYSDEV dev; BOOL ret; DC *dc; @@ -8334,7 +8334,7 @@ BOOL WINAPI GetRasterizerCaps( LPRASTERIZER_STATUS lprs, UINT cbNumBytes) /************************************************************************* * GetFontFileData (GDI32.@) */ -BOOL WINAPI GetFontFileData( DWORD instance_id, DWORD unknown, UINT64 offset, void *buff, DWORD buff_size ) +BOOL WINAPI GetFontFileData( DWORD instance_id, DWORD file_index, UINT64 offset, void *buff, DWORD buff_size ) { struct gdi_font *font; DWORD tag = 0, size; @@ -8366,7 +8366,7 @@ struct font_fileinfo /************************************************************************* * GetFontFileInfo (GDI32.@) */ -BOOL WINAPI GetFontFileInfo( DWORD instance_id, DWORD unknown, struct font_fileinfo *info, +BOOL WINAPI GetFontFileInfo( DWORD instance_id, DWORD file_index, struct font_fileinfo *info, SIZE_T size, SIZE_T *needed ) { SIZE_T required_size = 0; diff --git a/dlls/gdi32/ntgdi_private.h b/dlls/gdi32/ntgdi_private.h index 203ad2181a1..37b86047922 100644 --- a/dlls/gdi32/ntgdi_private.h +++ b/dlls/gdi32/ntgdi_private.h @@ -290,7 +290,7 @@ struct font_realization_info DWORD flags; /* 1 for bitmap fonts, 3 for scalable fonts */ DWORD cache_num; /* keeps incrementing - num of fonts that have been created allowing for caching?? */ DWORD instance_id; /* identifies a realized font instance */ - DWORD unk; /* unknown */ + DWORD file_count; /* number of files that make up this font */ WORD face_index; /* face index in case of font collections */ WORD simulations; /* 0 bit - bold simulation, 1 bit - oblique simulation */ }; diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 7aee0a86d23..ef1dc26595d 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -4334,7 +4334,7 @@ struct font_realization_info DWORD flags; DWORD cache_num; DWORD instance_id; - DWORD unk; + DWORD file_count; WORD face_index; WORD simulations; }; -- 2.30.2

2 1

[PATCH 6/6] dnsapi: Add support for DnsConfigSearchList.
by Huw Davies 03 Aug '21

03 Aug '21

This doesn't appear to be implemented on Windows, however it will be needed by iphlpapi.dll. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/dnsapi/dnsapi.h | 2 + dlls/dnsapi/libresolv.c | 81 +++++++++++++++++++++++++++++++++++++++++ dlls/dnsapi/query.c | 4 +- dlls/nsiproxy.sys/ip.c | 3 +- 4 files changed, 88 insertions(+), 2 deletions(-) diff --git a/dlls/dnsapi/dnsapi.h b/dlls/dnsapi/dnsapi.h index 168c37282bd..5b4fc1019e2 100644 --- a/dlls/dnsapi/dnsapi.h +++ b/dlls/dnsapi/dnsapi.h @@ -121,12 +121,14 @@ static inline char *strdup_ua( const char *src ) extern const char *type_to_str( unsigned short ) DECLSPEC_HIDDEN; +extern DNS_STATUS CDECL resolv_get_searchlist( DNS_TXT_DATAW *, DWORD * ) DECLSPEC_HIDDEN; extern DNS_STATUS CDECL resolv_get_serverlist( USHORT, DNS_ADDR_ARRAY *, DWORD * ) DECLSPEC_HIDDEN; extern DNS_STATUS CDECL resolv_query( const char *, WORD, DWORD, DNS_RECORDA ** ) DECLSPEC_HIDDEN; extern DNS_STATUS CDECL resolv_set_serverlist( const IP4_ARRAY * ) DECLSPEC_HIDDEN; struct resolv_funcs { + DNS_STATUS (CDECL *get_searchlist)( DNS_TXT_DATAW *list, DWORD *len ); DNS_STATUS (CDECL *get_serverlist)( USHORT family, DNS_ADDR_ARRAY *addrs, DWORD *len ); DNS_STATUS (CDECL *query)( const char *name, WORD type, DWORD options, DNS_RECORDA **result ); DNS_STATUS (CDECL *set_serverlist)( const IP4_ARRAY *addrs ); diff --git a/dlls/dnsapi/libresolv.c b/dlls/dnsapi/libresolv.c index b0374927b6d..7e545cf36fb 100644 --- a/dlls/dnsapi/libresolv.c +++ b/dlls/dnsapi/libresolv.c @@ -61,6 +61,54 @@ WINE_DEFAULT_DEBUG_CHANNEL(dnsapi); +static CPTABLEINFO unix_cptable; +static ULONG unix_cp = CP_UTF8; + +static DWORD WINAPI get_unix_codepage_once( RTL_RUN_ONCE *once, void *param, void **context ) +{ + static const WCHAR wineunixcpW[] = { 'W','I','N','E','U','N','I','X','C','P',0 }; + UNICODE_STRING name, value; + WCHAR value_buffer[13]; + SIZE_T size; + void *ptr; + + RtlInitUnicodeString( &name, wineunixcpW ); + value.Buffer = value_buffer; + value.MaximumLength = sizeof(value_buffer); + if (!RtlQueryEnvironmentVariable_U( NULL, &name, &value )) + RtlUnicodeStringToInteger( &value, 10, &unix_cp ); + if (unix_cp != CP_UTF8 && !NtGetNlsSectionPtr( 11, unix_cp, NULL, &ptr, &size )) + RtlInitCodePageTable( ptr, &unix_cptable ); + return TRUE; +} + +static BOOL get_unix_codepage( void ) +{ + static RTL_RUN_ONCE once = RTL_RUN_ONCE_INIT; + + return !RtlRunOnceExecuteOnce( &once, get_unix_codepage_once, NULL, NULL ); +} + +static DWORD dnsapi_umbstowcs( const char *src, WCHAR *dst, DWORD dstlen ) +{ + DWORD srclen = strlen( src ) + 1; + DWORD len; + + get_unix_codepage(); + + if (unix_cp == CP_UTF8) + { + RtlUTF8ToUnicodeN( dst, dstlen, &len, src, srclen ); + return len; + } + else + { + len = srclen * sizeof(WCHAR); + if (dst) RtlCustomCPToUnicodeN( &unix_cptable, dst, dstlen, &len, src, srclen ); + return len; + } +} + static const char *debugstr_type( unsigned short type ) { const char *str; @@ -229,6 +277,38 @@ static DNS_STATUS map_h_errno( int error ) } } +DNS_STATUS CDECL resolv_get_searchlist( DNS_TXT_DATAW *list, DWORD *len ) +{ + DWORD i, needed, str_needed = 0; + char *ptr, *end; + + init_resolver(); + + for (i = 0; i < MAXDNSRCH + 1 && _res.dnsrch[i]; i++) + str_needed += dnsapi_umbstowcs( _res.dnsrch[i], NULL, 0 ); + + needed = FIELD_OFFSET(DNS_TXT_DATAW, pStringArray[i]) + str_needed; + + if (!list || *len < needed) + { + *len = needed; + return !list ? ERROR_SUCCESS : ERROR_MORE_DATA; + } + + *len = needed; + list->dwStringCount = i; + + ptr = (char *)(list->pStringArray + i); + end = ptr + str_needed; + for (i = 0; i < MAXDNSRCH + 1 && _res.dnsrch[i]; i++) + { + list->pStringArray[i] = (WCHAR *)ptr; + ptr += dnsapi_umbstowcs( _res.dnsrch[i], list->pStringArray[i], end - ptr ); + } + return ERROR_SUCCESS; +} + + static inline int filter( unsigned short sin_family, USHORT family ) { if (sin_family != AF_INET && sin_family != AF_INET6) return TRUE; @@ -851,6 +931,7 @@ exit: static const struct resolv_funcs funcs = { + resolv_get_searchlist, resolv_get_serverlist, resolv_query, resolv_set_serverlist diff --git a/dlls/dnsapi/query.c b/dlls/dnsapi/query.c index 9900166aeb8..3155c93b360 100644 --- a/dlls/dnsapi/query.c +++ b/dlls/dnsapi/query.c @@ -343,7 +343,6 @@ DNS_STATUS WINAPI DnsQueryConfig( DNS_CONFIG_TYPE config, DWORD flag, PCWSTR ada case DnsConfigAdapterDomainName_A: case DnsConfigAdapterDomainName_W: case DnsConfigAdapterDomainName_UTF8: - case DnsConfigSearchList: case DnsConfigAdapterInfo: case DnsConfigPrimaryHostNameRegistrationEnabled: case DnsConfigAdapterHostNameRegistrationEnabled: @@ -358,6 +357,9 @@ DNS_STATUS WINAPI DnsQueryConfig( DNS_CONFIG_TYPE config, DWORD flag, PCWSTR ada case DnsConfigDnsServersIpv6: return resolv_funcs->get_serverlist( AF_INET6, buffer, len ); + case DnsConfigSearchList: + return resolv_funcs->get_searchlist( buffer, len ); + default: WARN( "unknown config type: %d\n", config ); break; diff --git a/dlls/nsiproxy.sys/ip.c b/dlls/nsiproxy.sys/ip.c index dbd019c8442..fa88b8e0819 100644 --- a/dlls/nsiproxy.sys/ip.c +++ b/dlls/nsiproxy.sys/ip.c @@ -470,7 +470,8 @@ static NTSTATUS ipv6_forward_enumerate_all( void *key_data, DWORD key_size, void void *static_data, DWORD static_size, DWORD_PTR *count ) { FIXME( "not implemented\n" ); - return STATUS_NOT_IMPLEMENTED; + *count = 0; + return STATUS_SUCCESS; } static struct module_table ipv4_tables[] = -- 2.23.0

1 0

[PATCH 5/6] dnsapi: Add support for returning ipv6 dns server addresses.
by Huw Davies 03 Aug '21

03 Aug '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/dnsapi/libresolv.c | 131 +++++++++++++++++++++++++++++++++++--- dlls/dnsapi/query.c | 4 ++ dlls/dnsapi/tests/query.c | 30 ++++++++- 3 files changed, 154 insertions(+), 11 deletions(-) diff --git a/dlls/dnsapi/libresolv.c b/dlls/dnsapi/libresolv.c index 7e754d73af3..b0374927b6d 100644 --- a/dlls/dnsapi/libresolv.c +++ b/dlls/dnsapi/libresolv.c @@ -28,6 +28,7 @@ #include <stdarg.h> #include <string.h> #include <stdio.h> +#include <stdlib.h> #include <sys/types.h> #ifdef HAVE_NETINET_IN_H @@ -228,35 +229,147 @@ static DNS_STATUS map_h_errno( int error ) } } +static inline int filter( unsigned short sin_family, USHORT family ) +{ + if (sin_family != AF_INET && sin_family != AF_INET6) return TRUE; + if (sin_family == AF_INET6 && family == WS_AF_INET) return TRUE; + if (sin_family == AF_INET && family == WS_AF_INET6) return TRUE; + + return FALSE; +} + +#ifdef HAVE_RES_GETSERVERS + DNS_STATUS CDECL resolv_get_serverlist( USHORT family, DNS_ADDR_ARRAY *addrs, DWORD *len ) { - DWORD needed, i; + struct __res_state *state = &_res; + DWORD i, found, total, needed; + union res_sockaddr_union *buf; init_resolver(); - if (family != WS_AF_INET) return ERROR_NOT_SUPPORTED; + total = res_getservers( state, NULL, 0 ); + if (!total) return DNS_ERROR_NO_DNS_SERVERS; - needed = FIELD_OFFSET(DNS_ADDR_ARRAY, AddrArray[_res.nscount]); + if (!addrs && family != WS_AF_INET && family != WS_AF_INET6) + { + *len = FIELD_OFFSET(DNS_ADDR_ARRAY, AddrArray[total]); + return ERROR_SUCCESS; + } + buf = malloc( total * sizeof(union res_sockaddr_union) ); + if (!buf) return ERROR_NOT_ENOUGH_MEMORY; + + total = res_getservers( state, buf, total ); + + for (i = 0, found = 0; i < total; i++) + { + if (filter( buf[i].sin.sin_family, family )) continue; + found++; + } + if (!found) return DNS_ERROR_NO_DNS_SERVERS; + + needed = FIELD_OFFSET(DNS_ADDR_ARRAY, AddrArray[found]); if (!addrs || *len < needed) { *len = needed; return !addrs ? ERROR_SUCCESS : ERROR_MORE_DATA; } + *len = needed; + memset( addrs, 0, needed ); + addrs->AddrCount = addrs->MaxCount = found; + + for (i = 0, found = 0; i < total; i++) + { + if (filter( buf[i].sin.sin_family, family )) continue; + + if (buf[i].sin6.sin6_family == AF_INET6) + { + SOCKADDR_IN6 *sa = (SOCKADDR_IN6 *)addrs->AddrArray[found].MaxSa; + sa->sin6_family = WS_AF_INET6; + memcpy( &sa->sin6_addr, &buf[i].sin6.sin6_addr, sizeof(sa->sin6_addr) ); + addrs->AddrArray[found].Data.DnsAddrUserDword[0] = sizeof(*sa); + } + else + { + SOCKADDR_IN *sa = (SOCKADDR_IN *)addrs->AddrArray[found].MaxSa; + sa->sin_family = WS_AF_INET; + sa->sin_addr.WS_s_addr = buf[i].sin.sin_addr.s_addr; + addrs->AddrArray[found].Data.DnsAddrUserDword[0] = sizeof(*sa); + } + found++; + } + + free( buf ); + return ERROR_SUCCESS; +} + +#else + +DNS_STATUS CDECL resolv_get_serverlist( USHORT family, DNS_ADDR_ARRAY *addrs, DWORD *len ) +{ + DWORD needed, found, i; + + init_resolver(); + + if (!_res.nscount) return DNS_ERROR_NO_DNS_SERVERS; + if (!addrs && family != WS_AF_INET && family != WS_AF_INET6) + { + *len = FIELD_OFFSET(DNS_ADDR_ARRAY, AddrArray[_res.nscount]); + return ERROR_SUCCESS; + } + + for (i = 0, found = 0; i < _res.nscount; i++) + { + unsigned short sin_family = AF_INET; +#ifdef HAVE_STRUCT___RES_STATE__U__EXT_NSCOUNT6 + if (_res._u._ext.nsaddrs[i]) sin_family = _res._u._ext.nsaddrs[i]->sin6_family; +#endif + if (filter( sin_family, family )) continue; + found++; + } + if (!found) return DNS_ERROR_NO_DNS_SERVERS; + needed = FIELD_OFFSET(DNS_ADDR_ARRAY, AddrArray[found]); + if (!addrs || *len < needed) + { + *len = needed; + return !addrs ? ERROR_SUCCESS : ERROR_INSUFFICIENT_BUFFER; + } *len = needed; memset( addrs, 0, needed ); - addrs->AddrCount = addrs->MaxCount = _res.nscount; + addrs->AddrCount = addrs->MaxCount = found; - for (i = 0; i < _res.nscount; i++) + for (i = 0, found = 0; i < _res.nscount; i++) { - SOCKADDR_INET *inet = (SOCKADDR_INET *)addrs->AddrArray[i].MaxSa; - inet->Ipv4.sin_family = WS_AF_INET; - inet->Ipv4.sin_addr.WS_s_addr = _res.nsaddr_list[i].sin_addr.s_addr; - addrs->AddrArray[i].Data.DnsAddrUserDword[0] = sizeof(SOCKADDR_IN); + unsigned short sin_family = AF_INET; +#ifdef HAVE_STRUCT___RES_STATE__U__EXT_NSCOUNT6 + if (_res._u._ext.nsaddrs[i]) sin_family = _res._u._ext.nsaddrs[i]->sin6_family; +#endif + if (filter( sin_family, family )) continue; + +#ifdef HAVE_STRUCT___RES_STATE__U__EXT_NSCOUNT6 + if (sin_family == AF_INET6) + { + SOCKADDR_IN6 *sa = (SOCKADDR_IN6 *)addrs->AddrArray[found].MaxSa; + sa->sin6_family = WS_AF_INET6; + memcpy( &sa->sin6_addr, &_res._u._ext.nsaddrs[i]->sin6_addr, sizeof(sa->sin6_addr) ); + addrs->AddrArray[found].Data.DnsAddrUserDword[0] = sizeof(*sa); + } + else +#endif + { + SOCKADDR_IN *sa = (SOCKADDR_IN *)addrs->AddrArray[found].MaxSa; + sa->sin_family = WS_AF_INET; + sa->sin_addr.WS_s_addr = _res.nsaddr_list[i].sin_addr.s_addr; + addrs->AddrArray[found].Data.DnsAddrUserDword[0] = sizeof(*sa); + } + found++; } + return ERROR_SUCCESS; } +#endif DNS_STATUS CDECL resolv_set_serverlist( const IP4_ARRAY *addrs ) { diff --git a/dlls/dnsapi/query.c b/dlls/dnsapi/query.c index b836cdaaf48..9900166aeb8 100644 --- a/dlls/dnsapi/query.c +++ b/dlls/dnsapi/query.c @@ -351,8 +351,12 @@ DNS_STATUS WINAPI DnsQueryConfig( DNS_CONFIG_TYPE config, DWORD flag, PCWSTR ada FIXME( "unimplemented config type %d\n", config ); break; + case DnsConfigDnsServersUnspec: + return resolv_funcs->get_serverlist( AF_UNSPEC, buffer, len ); case DnsConfigDnsServersIpv4: return resolv_funcs->get_serverlist( AF_INET, buffer, len ); + case DnsConfigDnsServersIpv6: + return resolv_funcs->get_serverlist( AF_INET6, buffer, len ); default: WARN( "unknown config type: %d\n", config ); diff --git a/dlls/dnsapi/tests/query.c b/dlls/dnsapi/tests/query.c index d11a53b5306..5fb47d89782 100644 --- a/dlls/dnsapi/tests/query.c +++ b/dlls/dnsapi/tests/query.c @@ -138,10 +138,10 @@ static IP_ADAPTER_ADDRESSES *get_adapters(void) static void test_DnsQueryConfig( void ) { - DWORD err, size, i; + DWORD err, size, i, ipv6_count; WCHAR name[MAX_ADAPTER_NAME_LENGTH + 1]; IP_ADAPTER_ADDRESSES *adapters, *ptr; - DNS_ADDR_ARRAY *ipv4; + DNS_ADDR_ARRAY *ipv4, *ipv6, *unspec; IP4_ARRAY *ip4_array; if (!(adapters = get_adapters())) return; @@ -186,7 +186,33 @@ static void test_DnsQueryConfig( void ) ok( ipv4->AddrArray[i].Data.DnsAddrUserDword[0] == sizeof(*sa), "got %d\n", ipv4->AddrArray[i].Data.DnsAddrUserDword[0] ); } + + size = 0; + err = DnsQueryConfig( DnsConfigDnsServersIpv6, 0, name, NULL, NULL, &size ); + ok( !err || err == DNS_ERROR_NO_DNS_SERVERS, "got %d\n", err ); + ipv6_count = 0; + ipv6 = NULL; + if (!err) + { + ipv6 = malloc( size ); + err = DnsQueryConfig( DnsConfigDnsServersIpv6, 0, name, NULL, ipv6, &size ); + ok( !err, "got %d\n", err ); + ipv6_count = ipv6->AddrCount; + } + + size = 0; + err = DnsQueryConfig( DnsConfigDnsServersUnspec, 0, name, NULL, NULL, &size ); + ok( !err, "got %d\n", err ); + unspec = malloc( size ); + err = DnsQueryConfig( DnsConfigDnsServersUnspec, 0, name, NULL, unspec, &size ); + ok( !err, "got %d\n", err ); + + ok( unspec->AddrCount == ipv4->AddrCount + ipv6_count, "got %d vs %d + %d\n", + unspec->AddrCount, ipv4->AddrCount, ipv6_count ); + free( ip4_array ); + free( unspec ); + free( ipv6 ); free( ipv4 ); } -- 2.23.0

1 0