January 2024 - Wine-commits

Zebediah Figura : wined3d/spirv: Hook up sm1 interface matching.
by Alexandre Julliard 19 Jan '24

19 Jan '24

Module: wine Branch: master Commit: 504d1a45e08d0fe4ae437a593bf4fc9fcfdbe81e URL: https://gitlab.winehq.org/wine/wine/-/commit/504d1a45e08d0fe4ae437a593bf4fc… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Jul 18 18:11:27 2023 -0500 wined3d/spirv: Hook up sm1 interface matching. --- configure | 8 +++--- configure.ac | 2 +- dlls/wined3d/shader_spirv.c | 59 +++++++++++++++++++++++++++++++++++++++++---- 3 files changed, 59 insertions(+), 10 deletions(-) diff --git a/configure b/configure index e9fc3a8ef5a..a8993e6c5c8 100755 --- a/configure +++ b/configure @@ -13293,8 +13293,8 @@ then : else $as_nop : fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for vkd3d_shader_serialize_dxbc in MinGW -lvkd3d-shader" >&5 -printf %s "checking for vkd3d_shader_serialize_dxbc in MinGW -lvkd3d-shader... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for vkd3d_shader_build_varying_map in MinGW -lvkd3d-shader" >&5 +printf %s "checking for vkd3d_shader_build_varying_map in MinGW -lvkd3d-shader... " >&6; } if test ${ac_cv_mingw_lib_vkd3d_shader+y} then : printf %s "(cached) " >&6 @@ -13311,11 +13311,11 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ -char vkd3d_shader_serialize_dxbc (); +char vkd3d_shader_build_varying_map (); int main (void) { -return vkd3d_shader_serialize_dxbc (); +return vkd3d_shader_build_varying_map (); ; return 0; } diff --git a/configure.ac b/configure.ac index da661323375..9e550559589 100644 --- a/configure.ac +++ b/configure.ac @@ -1161,7 +1161,7 @@ then if test "$ac_cv_mingw_header_vkd3d_h" = "yes" -a "$ac_cv_mingw_header_vkd3d_shader_h" = "yes" then WINE_CHECK_MINGW_LIB(vkd3d,vkd3d_set_log_callback,[:],[:],[$VKD3D_PE_LIBS]) - WINE_CHECK_MINGW_LIB(vkd3d-shader,vkd3d_shader_serialize_dxbc,[:],[:],[$VKD3D_PE_LIBS]) + WINE_CHECK_MINGW_LIB(vkd3d-shader,vkd3d_shader_build_varying_map,[:],[:],[$VKD3D_PE_LIBS]) if test "$ac_cv_mingw_lib_vkd3d" = "no" -o "$ac_cv_mingw_lib_vkd3d_shader" = "no" then VKD3D_PE_CFLAGS="" diff --git a/dlls/wined3d/shader_spirv.c b/dlls/wined3d/shader_spirv.c index f2e220beed2..e1c50a1179c 100644 --- a/dlls/wined3d/shader_spirv.c +++ b/dlls/wined3d/shader_spirv.c @@ -53,10 +53,17 @@ struct shader_spirv_priv struct shader_spirv_resource_bindings bindings; }; +#define MAX_SM1_INTER_STAGE_VARYINGS 12 + struct shader_spirv_compile_arguments { union { + struct + { + struct vkd3d_shader_varying_map varying_map[MAX_SM1_INTER_STAGE_VARYINGS]; + unsigned int varying_count; + } vs; struct { uint32_t alpha_swizzle; @@ -81,6 +88,7 @@ struct shader_spirv_graphics_program_vk SIZE_T variants_size, variant_count; struct vkd3d_shader_scan_descriptor_info descriptor_info; + struct vkd3d_shader_scan_signature_info signature_info; }; struct shader_spirv_compute_program_vk @@ -95,6 +103,7 @@ struct shader_spirv_compute_program_vk struct wined3d_shader_spirv_compile_args { + struct vkd3d_shader_varying_map_info varying_map; struct vkd3d_shader_spirv_target_info spirv_target; struct vkd3d_shader_parameter sample_count; unsigned int ps_alpha_swizzle[WINED3D_MAX_RENDER_TARGETS]; @@ -155,6 +164,24 @@ static void shader_spirv_compile_arguments_init(struct shader_spirv_compile_argu args->u.fs.dual_source_blending = state->blend_state && state->blend_state->dual_source; break; + case WINED3D_SHADER_TYPE_VERTEX: + { + struct wined3d_shader *ps = state->shader[WINED3D_SHADER_TYPE_PIXEL]; + + if (ps) + { + struct shader_spirv_graphics_program_vk *vs_program = shader->backend_data; + struct shader_spirv_graphics_program_vk *ps_program = ps->backend_data; + + if (ps_program->signature_info.input.element_count > ARRAY_SIZE(args->u.vs.varying_map)) + ERR("Unexpected inter-stage varying count %u.\n", ps_program->signature_info.input.element_count); + if (shader->reg_maps.shader_version.major < 4) + vkd3d_shader_build_varying_map(&vs_program->signature_info.output, + &ps_program->signature_info.input, &args->u.vs.varying_count, args->u.vs.varying_map); + } + break; + } + default: break; } @@ -162,7 +189,8 @@ static void shader_spirv_compile_arguments_init(struct shader_spirv_compile_argu static void shader_spirv_init_compile_args(struct wined3d_shader_spirv_compile_args *args, struct vkd3d_shader_interface_info *vkd3d_interface, enum vkd3d_shader_spirv_environment environment, - enum wined3d_shader_type shader_type, const struct shader_spirv_compile_arguments *compile_args) + enum wined3d_shader_type shader_type, enum vkd3d_shader_source_type source_type, + const struct shader_spirv_compile_arguments *compile_args) { unsigned int i; @@ -199,6 +227,18 @@ static void shader_spirv_init_compile_args(struct wined3d_shader_spirv_compile_a args->spirv_target.output_swizzles = args->ps_alpha_swizzle; args->spirv_target.output_swizzle_count = ARRAY_SIZE(args->ps_alpha_swizzle); } + else if (shader_type == WINED3D_SHADER_TYPE_VERTEX) + { + if (source_type == VKD3D_SHADER_SOURCE_D3D_BYTECODE) + { + args->spirv_target.next = &args->varying_map; + + args->varying_map.type = VKD3D_SHADER_STRUCTURE_TYPE_VARYING_MAP_INFO; + args->varying_map.next = vkd3d_interface; + args->varying_map.varying_map = compile_args->u.vs.varying_map; + args->varying_map.varying_count = compile_args->u.vs.varying_count; + } + } } static void shader_spirv_init_shader_interface_vk(struct wined3d_shader_spirv_shader_interface *iface, @@ -246,7 +286,7 @@ static VkShaderModule shader_spirv_compile_shader(struct wined3d_context_vk *con shader_spirv_init_shader_interface_vk(&iface, bindings, so_desc); shader_spirv_init_compile_args(&compile_args, &iface.vkd3d_interface, - VKD3D_SHADER_SPIRV_ENVIRONMENT_VULKAN_1_0, shader_type, args); + VKD3D_SHADER_SPIRV_ENVIRONMENT_VULKAN_1_0, shader_type, source_type, args); info.type = VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_INFO; info.next = &compile_args.spirv_target; @@ -687,7 +727,8 @@ static bool shader_spirv_resource_bindings_init(struct shader_spirv_resource_bin } static void shader_spirv_scan_shader(struct wined3d_shader *shader, - struct vkd3d_shader_scan_descriptor_info *descriptor_info) + struct vkd3d_shader_scan_descriptor_info *descriptor_info, + struct vkd3d_shader_scan_signature_info *signature_info) { struct vkd3d_shader_compile_info info; char *messages; @@ -696,6 +737,13 @@ static void shader_spirv_scan_shader(struct wined3d_shader *shader, memset(descriptor_info, 0, sizeof(*descriptor_info)); descriptor_info->type = VKD3D_SHADER_STRUCTURE_TYPE_SCAN_DESCRIPTOR_INFO; + if (signature_info) + { + memset(signature_info, 0, sizeof(*signature_info)); + signature_info->type = VKD3D_SHADER_STRUCTURE_TYPE_SCAN_SIGNATURE_INFO; + descriptor_info->next = signature_info; + } + info.type = VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_INFO; info.next = descriptor_info; info.source.code = shader->byte_code; @@ -736,7 +784,7 @@ static void shader_spirv_precompile_compute(struct wined3d_shader *shader) shader->backend_data = program_vk; } - shader_spirv_scan_shader(shader, &program_vk->descriptor_info); + shader_spirv_scan_shader(shader, &program_vk->descriptor_info, NULL); } static void shader_spirv_precompile(void *shader_priv, struct wined3d_shader *shader) @@ -758,7 +806,7 @@ static void shader_spirv_precompile(void *shader_priv, struct wined3d_shader *sh shader->backend_data = program_vk; } - shader_spirv_scan_shader(shader, &program_vk->descriptor_info); + shader_spirv_scan_shader(shader, &program_vk->descriptor_info, &program_vk->signature_info); } static void shader_spirv_select(void *shader_priv, struct wined3d_context *context, @@ -967,6 +1015,7 @@ static void shader_spirv_destroy(struct wined3d_shader *shader) } heap_free(program_vk->variants); vkd3d_shader_free_scan_descriptor_info(&program_vk->descriptor_info); + vkd3d_shader_free_scan_signature_info(&program_vk->signature_info); shader->backend_data = NULL; heap_free(program_vk);

1 0

Zhiyi Zhang : include: Add some ncrypt definitions.
by Alexandre Julliard 19 Jan '24

19 Jan '24

Module: wine Branch: master Commit: 2021959538e9d2eef0eae7f14052c6ba41c8154d URL: https://gitlab.winehq.org/wine/wine/-/commit/2021959538e9d2eef0eae7f14052c6… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Dec 21 18:11:35 2023 +0800 include: Add some ncrypt definitions. --- include/ncrypt.h | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/include/ncrypt.h b/include/ncrypt.h index 9fc2cb5b171..7a1769c8bd9 100644 --- a/include/ncrypt.h +++ b/include/ncrypt.h @@ -58,6 +58,21 @@ typedef struct NCryptKeyName { DWORD dwFlags; } NCryptKeyName; +typedef struct __NCRYPT_SUPPORTED_LENGTHS { + DWORD dwMinLength; + DWORD dwMaxLength; + DWORD dwIncrement; + DWORD dwDefaultLength; +} NCRYPT_SUPPORTED_LENGTHS; + +typedef struct __NCRYPT_UI_POLICY { + DWORD dwVersion; + DWORD dwFlags; + LPCWSTR pszCreationTitle; + LPCWSTR pszFriendlyName; + LPCWSTR pszDescription; +} NCRYPT_UI_POLICY; + typedef ULONG_PTR NCRYPT_HANDLE; typedef ULONG_PTR NCRYPT_PROV_HANDLE; typedef ULONG_PTR NCRYPT_KEY_HANDLE; @@ -76,6 +91,17 @@ typedef ULONG_PTR NCRYPT_SECRET_HANDLE; #define NCRYPT_PAD_OAEP_FLAG 0x00000004 #define NCRYPT_PAD_PSS_FLAG 0x00000008 +#define NCRYPT_ALLOW_DECRYPT_FLAG 0x00000001 +#define NCRYPT_ALLOW_SIGNING_FLAG 0x00000002 +#define NCRYPT_ALLOW_KEY_AGREEMENT_FLAG 0x00000004 +#define NCRYPT_ALLOW_KEY_IMPORT_FLAG 0x00000008 +#define NCRYPT_ALLOW_ALL_USAGES 0x00ffffff + +#define NCRYPT_ALLOW_EXPORT_FLAG 0x00000001 +#define NCRYPT_ALLOW_PLAINTEXT_EXPORT_FLAG 0x00000002 +#define NCRYPT_ALLOW_ARCHIVING_FLAG 0x00000004 +#define NCRYPT_ALLOW_PLAINTEXT_ARCHIVING_FLAG 0x00000008 + #define NCRYPT_NAME_PROPERTY L"Name" #define NCRYPT_UNIQUE_NAME_PROPERTY L"Unique Name" #define NCRYPT_ALGORITHM_PROPERTY L"Algorithm Name"

1 0

Etaash Mathamsetty : xinput: Reimplement XInputGetCapabilities.
by Alexandre Julliard 19 Jan '24

19 Jan '24

Module: wine Branch: master Commit: a1129ed23b8c95898132400a20407a5ab43ada1d URL: https://gitlab.winehq.org/wine/wine/-/commit/a1129ed23b8c95898132400a20407a… Author: Etaash Mathamsetty <etaash.mathamsetty(a)gmail.com> Date: Sun Dec 10 15:36:26 2023 -0500 xinput: Reimplement XInputGetCapabilities. --- dlls/xinput1_3/main.c | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/dlls/xinput1_3/main.c b/dlls/xinput1_3/main.c index 3f0cedab5cb..28f57e93bce 100644 --- a/dlls/xinput1_3/main.c +++ b/dlls/xinput1_3/main.c @@ -1086,25 +1086,14 @@ DWORD WINAPI DECLSPEC_HOTPATCH XInputGetKeystroke(DWORD index, DWORD reserved, P DWORD WINAPI DECLSPEC_HOTPATCH XInputGetCapabilities(DWORD index, DWORD flags, XINPUT_CAPABILITIES *capabilities) { - TRACE("index %lu, flags %#lx, capabilities %p.\n", index, flags, capabilities); - - start_update_thread(); - - if (index >= XUSER_MAX_COUNT) return ERROR_BAD_ARGUMENTS; - - if (!controller_lock(&controllers[index])) return ERROR_DEVICE_NOT_CONNECTED; - - if (flags & XINPUT_FLAG_GAMEPAD && controllers[index].caps.SubType != XINPUT_DEVSUBTYPE_GAMEPAD) - { - controller_unlock(&controllers[index]); - return ERROR_DEVICE_NOT_CONNECTED; - } + XINPUT_CAPABILITIES_EX caps_ex; + DWORD ret; - memcpy(capabilities, &controllers[index].caps, sizeof(*capabilities)); + ret = XInputGetCapabilitiesEx(1, index, flags, &caps_ex); - controller_unlock(&controllers[index]); + if (!ret) *capabilities = caps_ex.Capabilities; - return ERROR_SUCCESS; + return ret; } DWORD WINAPI DECLSPEC_HOTPATCH XInputGetDSoundAudioDeviceGuids(DWORD index, GUID *render_guid, GUID *capture_guid)

1 0

Etaash Mathamsetty : xinput: Implement XInputGetCapabilitiesEx.
by Alexandre Julliard 19 Jan '24

19 Jan '24

Module: wine Branch: master Commit: aea7918433b2797bd311c30dd548f59f34820eef URL: https://gitlab.winehq.org/wine/wine/-/commit/aea7918433b2797bd311c30dd548f5… Author: Etaash Mathamsetty <etaash.mathamsetty(a)gmail.com> Date: Sun Dec 10 15:29:32 2023 -0500 xinput: Implement XInputGetCapabilitiesEx. --- dlls/xinput1_3/main.c | 30 ++++++++++++++++++++++++++++++ dlls/xinput1_4/xinput1_4.spec | 1 + include/xinput.h | 11 +++++++++++ 3 files changed, 42 insertions(+) diff --git a/dlls/xinput1_3/main.c b/dlls/xinput1_3/main.c index e69553fba16..3f0cedab5cb 100644 --- a/dlls/xinput1_3/main.c +++ b/dlls/xinput1_3/main.c @@ -1129,3 +1129,33 @@ DWORD WINAPI DECLSPEC_HOTPATCH XInputGetBatteryInformation(DWORD index, BYTE typ return ERROR_NOT_SUPPORTED; } + +DWORD WINAPI DECLSPEC_HOTPATCH XInputGetCapabilitiesEx(DWORD unk, DWORD index, DWORD flags, XINPUT_CAPABILITIES_EX *caps) +{ + HIDD_ATTRIBUTES attr; + DWORD ret = ERROR_SUCCESS; + + TRACE("unk %lu, index %lu, flags %#lx, capabilities %p.\n", unk, index, flags, caps); + + start_update_thread(); + + if (index >= XUSER_MAX_COUNT) return ERROR_BAD_ARGUMENTS; + + if (!controller_lock(&controllers[index])) return ERROR_DEVICE_NOT_CONNECTED; + + if (flags & XINPUT_FLAG_GAMEPAD && controllers[index].caps.SubType != XINPUT_DEVSUBTYPE_GAMEPAD) + ret = ERROR_DEVICE_NOT_CONNECTED; + else if (!HidD_GetAttributes(controllers[index].device, &attr)) + ret = ERROR_DEVICE_NOT_CONNECTED; + else + { + caps->Capabilities = controllers[index].caps; + caps->VendorId = attr.VendorID; + caps->ProductId = attr.ProductID; + caps->VersionNumber = attr.VersionNumber; + } + + controller_unlock(&controllers[index]); + + return ret; +} diff --git a/dlls/xinput1_4/xinput1_4.spec b/dlls/xinput1_4/xinput1_4.spec index 8c3f4c0cd73..22c511237dd 100644 --- a/dlls/xinput1_4/xinput1_4.spec +++ b/dlls/xinput1_4/xinput1_4.spec @@ -7,3 +7,4 @@ 8 stdcall XInputGetKeystroke(long long ptr) 10 stub XInputGetAudioDeviceIds(long ptr ptr ptr ptr) 100 stdcall XInputGetStateEx(long ptr) +108 stdcall XInputGetCapabilitiesEx(long long long ptr) diff --git a/include/xinput.h b/include/xinput.h index f7c291630cb..c1e1ab3d39c 100644 --- a/include/xinput.h +++ b/include/xinput.h @@ -210,6 +210,16 @@ typedef struct _XINPUT_CAPABILITIES { XINPUT_VIBRATION Vibration; } XINPUT_CAPABILITIES, *PXINPUT_CAPABILITIES; +typedef struct _XINPUT_CAPABILITIES_EX +{ + XINPUT_CAPABILITIES Capabilities; + WORD VendorId; + WORD ProductId; + WORD VersionNumber; + WORD unk1; + DWORD unk2; +} XINPUT_CAPABILITIES_EX, *PXINPUT_CAPABILITIES_EX; + /* * Defines the structure for a joystick input event which is * retrieved using the function XInputGetKeystroke @@ -237,6 +247,7 @@ DWORD WINAPI XInputSetState(DWORD, XINPUT_VIBRATION*); DWORD WINAPI XInputGetState(DWORD, XINPUT_STATE*); DWORD WINAPI XInputGetKeystroke(DWORD, DWORD, PXINPUT_KEYSTROKE); DWORD WINAPI XInputGetCapabilities(DWORD, DWORD, XINPUT_CAPABILITIES*); +DWORD WINAPI XInputGetCapabilitiesEx(DWORD, DWORD, DWORD, XINPUT_CAPABILITIES_EX*); DWORD WINAPI XInputGetDSoundAudioDeviceGuids(DWORD, GUID*, GUID*); DWORD WINAPI XInputGetBatteryInformation(DWORD, BYTE, XINPUT_BATTERY_INFORMATION*);

1 0

Piotr Caban : msvcp140_2: Fix i386 export names.
by Alexandre Julliard 18 Jan '24

18 Jan '24

Module: wine Branch: master Commit: 4240c8180e4955d5c445c6909e5bba71ddea7420 URL: https://gitlab.winehq.org/wine/wine/-/commit/4240c8180e4955d5c445c6909e5bba… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jan 18 18:44:26 2024 +0100 msvcp140_2: Fix i386 export names. --- dlls/msvcp140_2/msvcp140_2.spec | 132 ++++++++++++++++++++++++++-------------- 1 file changed, 88 insertions(+), 44 deletions(-) diff --git a/dlls/msvcp140_2/msvcp140_2.spec b/dlls/msvcp140_2/msvcp140_2.spec index c59da9aba9c..0c10d213c4b 100644 --- a/dlls/msvcp140_2/msvcp140_2.spec +++ b/dlls/msvcp140_2/msvcp140_2.spec @@ -1,44 +1,88 @@ -@ stub __std_smf_assoc_laguerre -@ stub __std_smf_assoc_laguerref -@ stub __std_smf_assoc_legendre -@ stub __std_smf_assoc_legendref -@ stub __std_smf_beta -@ stub __std_smf_betaf -@ stub __std_smf_comp_ellint_1 -@ stub __std_smf_comp_ellint_1f -@ stub __std_smf_comp_ellint_2 -@ stub __std_smf_comp_ellint_2f -@ stub __std_smf_comp_ellint_3 -@ stub __std_smf_comp_ellint_3f -@ stub __std_smf_cyl_bessel_i -@ stub __std_smf_cyl_bessel_if -@ stub __std_smf_cyl_bessel_j -@ stub __std_smf_cyl_bessel_jf -@ stub __std_smf_cyl_bessel_k -@ stub __std_smf_cyl_bessel_kf -@ stub __std_smf_cyl_neumann -@ stub __std_smf_cyl_neumannf -@ stub __std_smf_ellint_1 -@ stub __std_smf_ellint_1f -@ stub __std_smf_ellint_2 -@ stub __std_smf_ellint_2f -@ stub __std_smf_ellint_3 -@ stub __std_smf_ellint_3f -@ stub __std_smf_expint -@ stub __std_smf_expintf -@ stub __std_smf_hermite -@ stub __std_smf_hermitef -@ stub __std_smf_hypot3 -@ stub __std_smf_hypot3f -@ stub __std_smf_laguerre -@ stub __std_smf_laguerref -@ stub __std_smf_legendre -@ stub __std_smf_legendref -@ stub __std_smf_riemann_zeta -@ stub __std_smf_riemann_zetaf -@ stub __std_smf_sph_bessel -@ stub __std_smf_sph_besself -@ stub __std_smf_sph_legendre -@ stub __std_smf_sph_legendref -@ stub __std_smf_sph_neumann -@ stub __std_smf_sph_neumannf +@ stub -arch=i386 ___std_smf_assoc_laguerre(a)16 +@ stub -arch=!i386 __std_smf_assoc_laguerre +@ stub -arch=i386 ___std_smf_assoc_laguerref(a)12 +@ stub -arch=!i386 __std_smf_assoc_laguerref +@ stub -arch=i386 ___std_smf_assoc_legendre(a)16 +@ stub -arch=!i386 __std_smf_assoc_legendre +@ stub -arch=i386 ___std_smf_assoc_legendref(a)12 +@ stub -arch=!i386 __std_smf_assoc_legendref +@ stub -arch=i386 ___std_smf_beta(a)16 +@ stub -arch=!i386 __std_smf_beta +@ stub -arch=i386 ___std_smf_betaf(a)8 +@ stub -arch=!i386 __std_smf_betaf +@ stub -arch=i386 ___std_smf_comp_ellint_1(a)8 +@ stub -arch=!i386 __std_smf_comp_ellint_1 +@ stub -arch=i386 ___std_smf_comp_ellint_1f(a)4 +@ stub -arch=!i386 __std_smf_comp_ellint_1f +@ stub -arch=i386 ___std_smf_comp_ellint_2(a)8 +@ stub -arch=!i386 __std_smf_comp_ellint_2 +@ stub -arch=i386 ___std_smf_comp_ellint_2f(a)4 +@ stub -arch=!i386 __std_smf_comp_ellint_2f +@ stub -arch=i386 ___std_smf_comp_ellint_3(a)16 +@ stub -arch=!i386 __std_smf_comp_ellint_3 +@ stub -arch=i386 ___std_smf_comp_ellint_3f(a)8 +@ stub -arch=!i386 __std_smf_comp_ellint_3f +@ stub -arch=i386 ___std_smf_cyl_bessel_i(a)16 +@ stub -arch=!i386 __std_smf_cyl_bessel_i +@ stub -arch=i386 ___std_smf_cyl_bessel_if(a)8 +@ stub -arch=!i386 __std_smf_cyl_bessel_if +@ stub -arch=i386 ___std_smf_cyl_bessel_j(a)16 +@ stub -arch=!i386 __std_smf_cyl_bessel_j +@ stub -arch=i386 ___std_smf_cyl_bessel_jf(a)8 +@ stub -arch=!i386 __std_smf_cyl_bessel_jf +@ stub -arch=i386 ___std_smf_cyl_bessel_k(a)16 +@ stub -arch=!i386 __std_smf_cyl_bessel_k +@ stub -arch=i386 ___std_smf_cyl_bessel_kf(a)8 +@ stub -arch=!i386 __std_smf_cyl_bessel_kf +@ stub -arch=i386 ___std_smf_cyl_neumann(a)16 +@ stub -arch=!i386 __std_smf_cyl_neumann +@ stub -arch=i386 ___std_smf_cyl_neumannf(a)8 +@ stub -arch=!i386 __std_smf_cyl_neumannf +@ stub -arch=i386 ___std_smf_ellint_1(a)16 +@ stub -arch=!i386 __std_smf_ellint_1 +@ stub -arch=i386 ___std_smf_ellint_1f(a)8 +@ stub -arch=!i386 __std_smf_ellint_1f +@ stub -arch=i386 ___std_smf_ellint_2(a)16 +@ stub -arch=!i386 __std_smf_ellint_2 +@ stub -arch=i386 ___std_smf_ellint_2f(a)8 +@ stub -arch=!i386 __std_smf_ellint_2f +@ stub -arch=i386 ___std_smf_ellint_3(a)24 +@ stub -arch=!i386 __std_smf_ellint_3 +@ stub -arch=i386 ___std_smf_ellint_3f(a)12 +@ stub -arch=!i386 __std_smf_ellint_3f +@ stub -arch=i386 ___std_smf_expint(a)8 +@ stub -arch=!i386 __std_smf_expint +@ stub -arch=i386 ___std_smf_expintf(a)4 +@ stub -arch=!i386 __std_smf_expintf +@ stub -arch=i386 ___std_smf_hermite(a)12 +@ stub -arch=!i386 __std_smf_hermite +@ stub -arch=i386 ___std_smf_hermitef(a)8 +@ stub -arch=!i386 __std_smf_hermitef +@ stub -arch=i386 ___std_smf_hypot3(a)24 +@ stub -arch=!i386 __std_smf_hypot3 +@ stub -arch=i386 ___std_smf_hypot3f(a)12 +@ stub -arch=!i386 __std_smf_hypot3f +@ stub -arch=i386 ___std_smf_laguerre(a)12 +@ stub -arch=!i386 __std_smf_laguerre +@ stub -arch=i386 ___std_smf_laguerref(a)8 +@ stub -arch=!i386 __std_smf_laguerref +@ stub -arch=i386 ___std_smf_legendre(a)12 +@ stub -arch=!i386 __std_smf_legendre +@ stub -arch=i386 ___std_smf_legendref(a)8 +@ stub -arch=!i386 __std_smf_legendref +@ stub -arch=i386 ___std_smf_riemann_zeta(a)8 +@ stub -arch=!i386 __std_smf_riemann_zeta +@ stub -arch=i386 ___std_smf_riemann_zetaf(a)4 +@ stub -arch=!i386 __std_smf_riemann_zetaf +@ stub -arch=i386 ___std_smf_sph_bessel(a)12 +@ stub -arch=!i386 __std_smf_sph_bessel +@ stub -arch=i386 ___std_smf_sph_besself(a)8 +@ stub -arch=!i386 __std_smf_sph_besself +@ stub -arch=i386 ___std_smf_sph_legendre(a)16 +@ stub -arch=!i386 __std_smf_sph_legendre +@ stub -arch=i386 ___std_smf_sph_legendref(a)12 +@ stub -arch=!i386 __std_smf_sph_legendref +@ stub -arch=i386 ___std_smf_sph_neumann(a)12 +@ stub -arch=!i386 __std_smf_sph_neumann +@ stub -arch=i386 ___std_smf_sph_neumannf(a)8 +@ stub -arch=!i386 __std_smf_sph_neumannf

1 0

Alex Henrie : msvcp140_2: Implement __std_smf_hypot3.
by Alexandre Julliard 18 Jan '24

18 Jan '24

Module: wine Branch: master Commit: fca71b6ef84e2f52afe369e1a1d1f5908f138881 URL: https://gitlab.winehq.org/wine/wine/-/commit/fca71b6ef84e2f52afe369e1a1d1f5… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sat Jan 6 12:53:30 2024 -0700 msvcp140_2: Implement __std_smf_hypot3. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56078 --- dlls/msvcp140_2/Makefile.in | 3 +++ dlls/msvcp140_2/math.c | 26 ++++++++++++++++++++++++++ dlls/msvcp140_2/msvcp140_2.spec | 4 ++-- 3 files changed, 31 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp140_2/Makefile.in b/dlls/msvcp140_2/Makefile.in index 5b4865db844..0f75819198f 100644 --- a/dlls/msvcp140_2/Makefile.in +++ b/dlls/msvcp140_2/Makefile.in @@ -1 +1,4 @@ MODULE = msvcp140_2.dll + +SOURCES = \ + math.c diff --git a/dlls/msvcp140_2/math.c b/dlls/msvcp140_2/math.c new file mode 100644 index 00000000000..d2909745a9d --- /dev/null +++ b/dlls/msvcp140_2/math.c @@ -0,0 +1,26 @@ +/* + * Special math functions + * + * Copyright 2024 Alex Henrie + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <math.h> + +double __stdcall __std_smf_hypot3(double x, double y, double z) +{ + return hypot(hypot(x, y), z); +} diff --git a/dlls/msvcp140_2/msvcp140_2.spec b/dlls/msvcp140_2/msvcp140_2.spec index 0c10d213c4b..fbc63fa5e28 100644 --- a/dlls/msvcp140_2/msvcp140_2.spec +++ b/dlls/msvcp140_2/msvcp140_2.spec @@ -58,8 +58,8 @@ @ stub -arch=!i386 __std_smf_hermite @ stub -arch=i386 ___std_smf_hermitef(a)8 @ stub -arch=!i386 __std_smf_hermitef -@ stub -arch=i386 ___std_smf_hypot3(a)24 -@ stub -arch=!i386 __std_smf_hypot3 +@ stdcall -arch=i386 ___std_smf_hypot3(a)24(double double double) __std_smf_hypot3 +@ stdcall -arch=!i386 __std_smf_hypot3(double double double) @ stub -arch=i386 ___std_smf_hypot3f(a)12 @ stub -arch=!i386 __std_smf_hypot3f @ stub -arch=i386 ___std_smf_laguerre(a)12

1 0

Piotr Caban : msvcp140_2: Implement __std_smf_hypot3f.
by Alexandre Julliard 18 Jan '24

18 Jan '24

Module: wine Branch: master Commit: ff88ec624c32e07c4dd05488b1d86cf0fd42235d URL: https://gitlab.winehq.org/wine/wine/-/commit/ff88ec624c32e07c4dd05488b1d86c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jan 18 17:40:48 2024 +0100 msvcp140_2: Implement __std_smf_hypot3f. --- dlls/msvcp140_2/math.c | 5 +++++ dlls/msvcp140_2/msvcp140_2.spec | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp140_2/math.c b/dlls/msvcp140_2/math.c index d2909745a9d..aa8726d6b3e 100644 --- a/dlls/msvcp140_2/math.c +++ b/dlls/msvcp140_2/math.c @@ -24,3 +24,8 @@ double __stdcall __std_smf_hypot3(double x, double y, double z) { return hypot(hypot(x, y), z); } + +float __stdcall __std_smf_hypot3f(float x, float y, float z) +{ + return hypotf(hypotf(x, y), z); +} diff --git a/dlls/msvcp140_2/msvcp140_2.spec b/dlls/msvcp140_2/msvcp140_2.spec index fbc63fa5e28..bcc3ecfa7fd 100644 --- a/dlls/msvcp140_2/msvcp140_2.spec +++ b/dlls/msvcp140_2/msvcp140_2.spec @@ -60,8 +60,8 @@ @ stub -arch=!i386 __std_smf_hermitef @ stdcall -arch=i386 ___std_smf_hypot3(a)24(double double double) __std_smf_hypot3 @ stdcall -arch=!i386 __std_smf_hypot3(double double double) -@ stub -arch=i386 ___std_smf_hypot3f(a)12 -@ stub -arch=!i386 __std_smf_hypot3f +@ stdcall -arch=i386 ___std_smf_hypot3f(a)12(float float float) __std_smf_hypot3f +@ stdcall -arch=!i386 __std_smf_hypot3f(float float float) @ stub -arch=i386 ___std_smf_laguerre(a)12 @ stub -arch=!i386 __std_smf_laguerre @ stub -arch=i386 ___std_smf_laguerref(a)8

1 0

Piotr Caban : msvcp140_t/tests: Add __std_smf_hypot3 tests.
by Alexandre Julliard 18 Jan '24

18 Jan '24

Module: wine Branch: master Commit: 816c35e0ee57354d25d6115f64346da87550d922 URL: https://gitlab.winehq.org/wine/wine/-/commit/816c35e0ee57354d25d6115f64346d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jan 18 18:18:26 2024 +0100 msvcp140_t/tests: Add __std_smf_hypot3 tests. --- configure | 1 + configure.ac | 1 + dlls/msvcp140_2/tests/Makefile.in | 4 ++ dlls/msvcp140_2/tests/math.c | 81 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 87 insertions(+) diff --git a/configure b/configure index 3939f1873a4..e9fc3a8ef5a 100755 --- a/configure +++ b/configure @@ -22059,6 +22059,7 @@ wine_fn_config_makefile dlls/msvcp140/tests enable_tests wine_fn_config_makefile dlls/msvcp140_1 enable_msvcp140_1 wine_fn_config_makefile dlls/msvcp140_1/tests enable_tests wine_fn_config_makefile dlls/msvcp140_2 enable_msvcp140_2 +wine_fn_config_makefile dlls/msvcp140_2/tests enable_tests wine_fn_config_makefile dlls/msvcp140_atomic_wait enable_msvcp140_atomic_wait wine_fn_config_makefile dlls/msvcp140_atomic_wait/tests enable_tests wine_fn_config_makefile dlls/msvcp140_codecvt_ids enable_msvcp140_codecvt_ids diff --git a/configure.ac b/configure.ac index 9488b3263cc..da661323375 100644 --- a/configure.ac +++ b/configure.ac @@ -2876,6 +2876,7 @@ WINE_CONFIG_MAKEFILE(dlls/msvcp140/tests) WINE_CONFIG_MAKEFILE(dlls/msvcp140_1) WINE_CONFIG_MAKEFILE(dlls/msvcp140_1/tests) WINE_CONFIG_MAKEFILE(dlls/msvcp140_2) +WINE_CONFIG_MAKEFILE(dlls/msvcp140_2/tests) WINE_CONFIG_MAKEFILE(dlls/msvcp140_atomic_wait) WINE_CONFIG_MAKEFILE(dlls/msvcp140_atomic_wait/tests) WINE_CONFIG_MAKEFILE(dlls/msvcp140_codecvt_ids) diff --git a/dlls/msvcp140_2/tests/Makefile.in b/dlls/msvcp140_2/tests/Makefile.in new file mode 100644 index 00000000000..3024ebdd358 --- /dev/null +++ b/dlls/msvcp140_2/tests/Makefile.in @@ -0,0 +1,4 @@ +TESTDLL = msvcp140_2.dll + +SOURCES = \ + math.c diff --git a/dlls/msvcp140_2/tests/math.c b/dlls/msvcp140_2/tests/math.c new file mode 100644 index 00000000000..dc61d9b6db2 --- /dev/null +++ b/dlls/msvcp140_2/tests/math.c @@ -0,0 +1,81 @@ +/* + * Special math functions + * + * Copyright 2024 Piotr Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "wine/test.h" +#include <math.h> + +static double (__stdcall *p___std_smf_hypot3)(double x, double y, double z); + +#define SETNOFAIL(x,y) x = (void*)GetProcAddress(msvcp, y) +#define SET(x,y) do { SETNOFAIL(x, y); ok(x != NULL, "Export '%s' not found\n", y); } while(0) +static BOOL init(void) +{ + HMODULE msvcp = LoadLibraryA("msvcp140_2.dll"); + + if (!msvcp) + { + win_skip("msvcp140_2.dll not installed\n"); + return FALSE; + } + +#ifdef __i386__ + SET(p___std_smf_hypot3, "___std_smf_hypot3(a)24"); +#else + SET(p___std_smf_hypot3, "__std_smf_hypot3"); +#endif + + return TRUE; +} + +static inline BOOL compare_double(double f, double g, unsigned int ulps) +{ + ULONGLONG x = *(ULONGLONG *)&f; + ULONGLONG y = *(ULONGLONG *)&g; + + if (f < 0) + x = ~x + 1; + else + x |= ((ULONGLONG)1) << 63; + if (g < 0) + y = ~y + 1; + else + y |= ((ULONGLONG)1) << 63; + + return (x > y ? x - y : y - x) <= ulps; +} + +static void test_hypot3(void) +{ + double r; + + r = p___std_smf_hypot3(0, 0, 0); + ok(compare_double(r, 0.0, 1), "r = %.23e\n", r); + + r = p___std_smf_hypot3(9, 12, 20); + ok(compare_double(r, 25.0, 1), "r = %.23e\n", r); +} + +START_TEST(math) +{ + if (!init()) + return; + + test_hypot3(); +}

1 0

Gabriel Ivăncescu : msvcirt: Use proper operator_new and operator_delete types.
by Alexandre Julliard 18 Jan '24

18 Jan '24

Module: wine Branch: master Commit: c086a7eb3125d0a05b4dc21a8824e5d40dfb66a5 URL: https://gitlab.winehq.org/wine/wine/-/commit/c086a7eb3125d0a05b4dc21a8824e5… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Jan 18 21:03:06 2024 +0200 msvcirt: Use proper operator_new and operator_delete types. msvcirt's PARENTSRC imports exception.c from msvcp90, but it uses a function pointer for these functions, resulting in a type mismatch. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/msvcirt/msvcirt.c | 24 +++++++++++++++++------- dlls/msvcirt/msvcirt.h | 4 ++-- 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 8d83fca7c94..0fcdc52c203 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -38,9 +38,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcirt); #define RESERVE_SIZE 512 #define STATEBUF_SIZE 8 -void* (__cdecl *operator_new)(SIZE_T); -void (__cdecl *operator_delete)(void*); - /* ?sh_none(a)filebuf@@2HB */ const int filebuf_sh_none = 0x800; /* ?sh_read(a)filebuf@@2HB */ @@ -5132,19 +5129,32 @@ void __cdecl _mtunlock(CRITICAL_SECTION *crit) LeaveCriticalSection(crit); } +static void* (__cdecl *MSVCRT_operator_new)(SIZE_T); +static void (__cdecl *MSVCRT_operator_delete)(void*); + +void* __cdecl operator_new(SIZE_T size) +{ + return MSVCRT_operator_new(size); +} + +void __cdecl operator_delete(void *mem) +{ + MSVCRT_operator_delete(mem); +} + static void init_cxx_funcs(void) { HMODULE hmod = GetModuleHandleA("msvcrt.dll"); if (sizeof(void *) > sizeof(int)) /* 64-bit has different names */ { - operator_new = (void*)GetProcAddress(hmod, "??2(a)YAPEAX_K@Z"); - operator_delete = (void*)GetProcAddress(hmod, "??3(a)YAXPEAX@Z"); + MSVCRT_operator_new = (void*)GetProcAddress(hmod, "??2(a)YAPEAX_K@Z"); + MSVCRT_operator_delete = (void*)GetProcAddress(hmod, "??3(a)YAXPEAX@Z"); } else { - operator_new = (void*)GetProcAddress(hmod, "??2(a)YAPAXI@Z"); - operator_delete = (void*)GetProcAddress(hmod, "??3(a)YAXPAX@Z"); + MSVCRT_operator_new = (void*)GetProcAddress(hmod, "??2(a)YAPAXI@Z"); + MSVCRT_operator_delete = (void*)GetProcAddress(hmod, "??3(a)YAXPAX@Z"); } } diff --git a/dlls/msvcirt/msvcirt.h b/dlls/msvcirt/msvcirt.h index 5b59b7862a3..ccbc7027146 100644 --- a/dlls/msvcirt/msvcirt.h +++ b/dlls/msvcirt/msvcirt.h @@ -68,7 +68,7 @@ typedef enum { FLAGS_stdio = 0x4000 } ios_flags; -extern void* (__cdecl *MSVCRT_operator_new)(SIZE_T); -extern void (__cdecl *MSVCRT_operator_delete)(void*); +void* __cdecl operator_new(SIZE_T); +void __cdecl operator_delete(void*); void init_exception(void*);

1 0

Paul Gofman : ntdll: Fix exception list offset in call_user_mode_callback / user_mode_callback_return.
by Alexandre Julliard 18 Jan '24

18 Jan '24

Module: wine Branch: master Commit: 39304daf4d7bdf9d3e617108e4ae4bd6bd7c7d25 URL: https://gitlab.winehq.org/wine/wine/-/commit/39304daf4d7bdf9d3e617108e4ae4b… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Jan 18 15:17:39 2024 -0600 ntdll: Fix exception list offset in call_user_mode_callback / user_mode_callback_return. --- dlls/ntdll/unix/signal_x86_64.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index ab544908883..53827629af4 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -1591,7 +1591,7 @@ __ASM_GLOBAL_FUNC( call_user_mode_callback, "movq %rax,0xa8(%rsp)\n\t" /* frame->syscall_cfa */ "movq 0x328(%r8),%r10\n\t" /* amd64_thread_data()->syscall_frame */ "movq (%r8),%rax\n\t" /* NtCurrentTeb()->Tib.ExceptionList */ - "movq %rax,0x408(%rsp)\n\t" + "movq %rax,0x400(%rsp)\n\t" "movl 0xb0(%r10),%r14d\n\t" /* prev_frame->syscall_flags */ "movl %r14d,0xb0(%rsp)\n\t" /* frame->syscall_flags */ "movq %r10,0xa0(%rsp)\n\t" /* frame->prev_frame */ @@ -1624,7 +1624,7 @@ __ASM_GLOBAL_FUNC( user_mode_callback_return, __ASM_CFI(".cfi_rel_offset %r13,-0x18\n\t") __ASM_CFI(".cfi_rel_offset %r14,-0x20\n\t") __ASM_CFI(".cfi_rel_offset %r15,-0x28\n\t") - "movq 0x408(%r10),%rax\n\t" /* exception list */ + "movq 0x400(%r10),%rax\n\t" /* exception list */ "movq %rax,0(%rcx)\n\t" /* teb->Tib.ExceptionList */ "movq -0x38(%rbp),%r10\n\t" /* ret_ptr */ "movq -0x40(%rbp),%r11\n\t" /* ret_len */

1 0