August 2019 - Wine-commits - list.winehq.org

André Hentschel : kernel32/tests: Don' t test functions directly when reporting GetLastError().
by Alexandre Julliard 02 Aug '19

02 Aug '19

Module: wine Branch: master Commit: 19d96f99c641731a7e6b576b53f91c8937d012dc URL: https://source.winehq.org/git/wine.git/?a=commit;h=19d96f99c641731a7e6b576b… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Aug 1 21:12:30 2019 +0200 kernel32/tests: Don't test functions directly when reporting GetLastError(). Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/actctx.c | 40 ++++++++++++++++++++++++++++++++-------- 1 file changed, 32 insertions(+), 8 deletions(-) diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c index 4dede37..2b8c3d7 100644 --- a/dlls/kernel32/tests/actctx.c +++ b/dlls/kernel32/tests/actctx.c @@ -3271,13 +3271,25 @@ static void clean_sxs_info(sxs_info *info) if (info->handle_context) ReleaseActCtx(info->handle_context); if (*info->path_dll) - ok(DeleteFileA(info->path_dll), "DeleteFileA failed for %s: %d\n", info->path_dll, GetLastError()); + { + BOOL ret = DeleteFileA(info->path_dll); + ok(ret, "DeleteFileA failed for %s: %d\n", info->path_dll, GetLastError()); + } if (*info->path_manifest_exe) - ok(DeleteFileA(info->path_manifest_exe), "DeleteFileA failed for %s: %d\n", info->path_manifest_exe, GetLastError()); + { + BOOL ret = DeleteFileA(info->path_manifest_exe); + ok(ret, "DeleteFileA failed for %s: %d\n", info->path_manifest_exe, GetLastError()); + } if (*info->path_manifest_dll) - ok(DeleteFileA(info->path_manifest_dll), "DeleteFileA failed for %s: %d\n", info->path_manifest_dll, GetLastError()); + { + BOOL ret = DeleteFileA(info->path_manifest_dll); + ok(ret, "DeleteFileA failed for %s: %d\n", info->path_manifest_dll, GetLastError()); + } if (*info->path_tmp) - ok(RemoveDirectoryA(info->path_tmp), "RemoveDirectoryA failed for %s: %d\n", info->path_tmp, GetLastError()); + { + BOOL ret = RemoveDirectoryA(info->path_tmp); + ok(ret, "RemoveDirectoryA failed for %s: %d\n", info->path_tmp, GetLastError()); + } } static void get_application_directory(char *buffer, int buffer_size) @@ -3348,7 +3360,10 @@ cleanup: if (dll.module) FreeLibrary(dll.module); if (*path_dll_local) - ok(DeleteFileA(path_dll_local), "DeleteFileA failed for %s: %d\n", path_dll_local, GetLastError()); + { + BOOL success = DeleteFileA(path_dll_local); + ok(success, "DeleteFileA failed for %s: %d\n", path_dll_local, GetLastError()); + } clean_sxs_info(&dll); } @@ -3385,7 +3400,10 @@ cleanup: if (dll.module) FreeLibrary(dll.module); if (*path_dll_local) - ok(DeleteFileA(path_dll_local), "DeleteFileA failed for %s: %d\n", path_dll_local, GetLastError()); + { + BOOL success = DeleteFileA(path_dll_local); + ok(success, "DeleteFileA failed for %s: %d\n", path_dll_local, GetLastError()); + } clean_sxs_info(&dll); } @@ -3423,7 +3441,10 @@ cleanup: if (dll.module) FreeLibrary(dll.module); if (*path_dll_local) - ok(DeleteFileA(path_dll_local), "DeleteFileA failed for %s: %d\n", path_dll_local, GetLastError()); + { + success = DeleteFileA(path_dll_local); + ok(success, "DeleteFileA failed for %s: %d\n", path_dll_local, GetLastError()); + } clean_sxs_info(&dll); } @@ -3486,7 +3507,10 @@ cleanup: if (module_msvcr) FreeLibrary(module_msvcr); if (*path_manifest) - ok(DeleteFileA(path_manifest), "DeleteFileA failed for %s: %d\n", path_manifest, GetLastError()); + { + success = DeleteFileA(path_manifest); + ok(success, "DeleteFileA failed for %s: %d\n", path_manifest, GetLastError()); + } } static void run_sxs_test(int run)

1 0

Huw Davies : shell32: On macOS don't link against CoreServices.
by Alexandre Julliard 02 Aug '19

02 Aug '19

Module: wine Branch: master Commit: 4da35deaa28c7dfea2c783a98bb94b307e7b0990 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4da35deaa28c7dfea2c783a9… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jul 15 15:04:16 2019 +0100 shell32: On macOS don't link against CoreServices. This has not been required since commit efac5d0672728f1b6d85d28aafced14223aecf16. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/Makefile.in | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/shell32/Makefile.in b/dlls/shell32/Makefile.in index 20365b9..fe49bf0 100644 --- a/dlls/shell32/Makefile.in +++ b/dlls/shell32/Makefile.in @@ -3,7 +3,6 @@ MODULE = shell32.dll IMPORTLIB = shell32 IMPORTS = uuid shlwapi user32 gdi32 advapi32 DELAYIMPORTS = ole32 oleaut32 shdocvw version comctl32 gdiplus -EXTRALIBS = $(CORESERVICES_LIBS) # AUTHORS file is in the top-level directory EXTRAINCL = -I$(top_srcdir)

1 0

Zebediah Figura : mfplat/tests: Link to uuid.
by Alexandre Julliard 02 Aug '19

02 Aug '19

Module: wine Branch: master Commit: 926e94f46635381ebc51702b18ce62349694f61f URL: https://source.winehq.org/git/wine.git/?a=commit;h=926e94f46635381ebc51702b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jul 15 10:28:15 2019 -0500 mfplat/tests: Link to uuid. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/tests/Makefile.in | 2 +- dlls/mfplat/tests/mfplat.c | 19 +++++++------------ 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/dlls/mfplat/tests/Makefile.in b/dlls/mfplat/tests/Makefile.in index 150ca6f..c58a046 100644 --- a/dlls/mfplat/tests/Makefile.in +++ b/dlls/mfplat/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = mfplat.dll -IMPORTS = ole32 mfplat mfuuid propsys +IMPORTS = ole32 mfplat mfuuid propsys uuid C_SRCS = \ mfplat.c diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index e63efc1..cf30995 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -27,19 +27,7 @@ #include "winbase.h" #include "winuser.h" #include "winreg.h" - -#include "initguid.h" #include "ole2.h" - -DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); -DEFINE_GUID(DUMMY_CLSID, 0x12345678,0x1234,0x1234,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19); -DEFINE_GUID(DUMMY_GUID1, 0x12345678,0x1234,0x1234,0x21,0x21,0x21,0x21,0x21,0x21,0x21,0x21); -DEFINE_GUID(DUMMY_GUID2, 0x12345678,0x1234,0x1234,0x22,0x22,0x22,0x22,0x22,0x22,0x22,0x22); -DEFINE_GUID(DUMMY_GUID3, 0x12345678,0x1234,0x1234,0x23,0x23,0x23,0x23,0x23,0x23,0x23,0x23); -DEFINE_GUID(CLSID_FileSchemeHandler, 0x477ec299, 0x1421, 0x4bdd, 0x97, 0x1f, 0x7c, 0xcb, 0x93, 0x3f, 0x21, 0xad); - -#undef INITGUID -#include <guiddef.h> #include "mfapi.h" #include "mfidl.h" #include "mferror.h" @@ -50,6 +38,13 @@ DEFINE_GUID(CLSID_FileSchemeHandler, 0x477ec299, 0x1421, 0x4bdd, 0x97, 0x1f, 0x7 #include "wine/test.h" #include "wine/heap.h" +#include "initguid.h" +DEFINE_GUID(DUMMY_CLSID, 0x12345678,0x1234,0x1234,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19); +DEFINE_GUID(DUMMY_GUID1, 0x12345678,0x1234,0x1234,0x21,0x21,0x21,0x21,0x21,0x21,0x21,0x21); +DEFINE_GUID(DUMMY_GUID2, 0x12345678,0x1234,0x1234,0x22,0x22,0x22,0x22,0x22,0x22,0x22,0x22); +DEFINE_GUID(DUMMY_GUID3, 0x12345678,0x1234,0x1234,0x23,0x23,0x23,0x23,0x23,0x23,0x23,0x23); +DEFINE_GUID(CLSID_FileSchemeHandler, 0x477ec299, 0x1421, 0x4bdd, 0x97, 0x1f, 0x7c, 0xcb, 0x93, 0x3f, 0x21, 0xad); + static BOOL is_win8_plus; #define EXPECT_REF(obj,ref) _expect_ref((IUnknown*)obj, ref, __LINE__)

1 0

Zebediah Figura : mfplat: Implement CreatePropertyStore().
by Alexandre Julliard 02 Aug '19

02 Aug '19

Module: wine Branch: master Commit: 748565df50578048e77343ce71e222a5a5dd4dc6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=748565df50578048e77343ce… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jul 15 10:28:16 2019 -0500 mfplat: Implement CreatePropertyStore(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 202 +++++++++++++++++++++++++++++++++++++++++++++ dlls/mfplat/mfplat.spec | 2 +- dlls/mfplat/tests/mfplat.c | 102 +++++++++++++++++++++++ include/mfidl.idl | 1 + 4 files changed, 306 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=748565df50578048e773…

1 0

Conor McCarthy : dbghelp: Return NULL instead of IMAGE_NO_MAP when PE file mapping fails.
by Alexandre Julliard 02 Aug '19

02 Aug '19

Module: wine Branch: master Commit: 9d3687ad324f866c835c4b73922f859a30e47aee URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d3687ad324f866c835c4b73… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Jul 16 13:41:08 2019 +1000 dbghelp: Return NULL instead of IMAGE_NO_MAP when PE file mapping fails. A NULL test is always applied to the return value from pe_map_full(), but IMAGE_NO_MAP is not NULL, it is ((void*)-1). Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/pe_module.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dbghelp/pe_module.c b/dlls/dbghelp/pe_module.c index 58530e7..4b7c7ba 100644 --- a/dlls/dbghelp/pe_module.c +++ b/dlls/dbghelp/pe_module.c @@ -53,7 +53,7 @@ static void* pe_map_full(struct image_file_map* fmap, IMAGE_NT_HEADERS** nth) fmap->u.pe.full_count++; return fmap->u.pe.full_map; } - return IMAGE_NO_MAP; + return NULL; } static void pe_unmap_full(struct image_file_map* fmap)

1 0

Alistair Leslie-Hughes : include: Implement InlineIsEqualGUID.
by Alexandre Julliard 02 Aug '19

02 Aug '19

Module: wine Branch: master Commit: af5019f306d279bd9b3f069ffc0d4af50b3fba84 URL: https://source.winehq.org/git/wine.git/?a=commit;h=af5019f306d279bd9b3f069f… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Jul 19 03:44:17 2019 +0000 include: Implement InlineIsEqualGUID. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/guiddef.h | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/include/guiddef.h b/include/guiddef.h index 2adde9c..ba39dd8 100644 --- a/include/guiddef.h +++ b/include/guiddef.h @@ -139,8 +139,20 @@ typedef GUID FMTID,*LPFMTID; #if defined(__cplusplus) && !defined(CINTERFACE) #define IsEqualGUID(rguid1, rguid2) (!memcmp(&(rguid1), &(rguid2), sizeof(GUID))) +inline int InlineIsEqualGUID(REFGUID rguid1, REFGUID rguid2) +{ + return (((ULONG *)&rguid1)[0] == ((ULONG *)&rguid2)[0] && + ((ULONG *)&rguid1)[1] == ((ULONG *)&rguid2)[1] && + ((ULONG *)&rguid1)[2] == ((ULONG *)&rguid2)[2] && + ((ULONG *)&rguid1)[3] == ((ULONG *)&rguid2)[3]); +} #else /* defined(__cplusplus) && !defined(CINTERFACE) */ #define IsEqualGUID(rguid1, rguid2) (!memcmp(rguid1, rguid2, sizeof(GUID))) +#define InlineIsEqualGUID(rguid1, rguid2) \ + (((ULONG *)rguid1)[0] == ((ULONG *)rguid2)[0] && \ + ((ULONG *)rguid1)[1] == ((ULONG *)rguid2)[1] && \ + ((ULONG *)rguid1)[2] == ((ULONG *)rguid2)[2] && \ + ((ULONG *)rguid1)[3] == ((ULONG *)rguid2)[3]) #endif /* defined(__cplusplus) && !defined(CINTERFACE) */ #if defined(__cplusplus) && !defined(CINTERFACE)

1 0

Gerald Pfeifer : windowscodecs: Move from_sRGB_component into the same section as its sole sole user.
by Alexandre Julliard 02 Aug '19

02 Aug '19

Module: wine Branch: master Commit: ae5a1f44fc353ae04d1c10292a0cae02fb8908ab URL: https://source.winehq.org/git/wine.git/?a=commit;h=ae5a1f44fc353ae04d1c1029… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Mon Jul 22 22:10:50 2019 +0200 windowscodecs: Move from_sRGB_component into the same section as its sole sole user. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/converter.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/windowscodecs/converter.c b/dlls/windowscodecs/converter.c index 0d7a3b7..dcc2f05 100644 --- a/dlls/windowscodecs/converter.c +++ b/dlls/windowscodecs/converter.c @@ -85,12 +85,6 @@ typedef struct FormatConverter { } FormatConverter; /* https://www.w3.org/Graphics/Color/srgb */ -static inline float from_sRGB_component(float f) -{ - if (f <= 0.04045f) return f / 12.92f; - return powf((f + 0.055f) / 1.055f, 2.4f); -} - static inline float to_sRGB_component(float f) { if (f <= 0.0031308f) return 12.92f * f; @@ -98,6 +92,12 @@ static inline float to_sRGB_component(float f) } #if 0 /* FIXME: enable once needed */ +static inline float from_sRGB_component(float f) +{ + if (f <= 0.04045f) return f / 12.92f; + return powf((f + 0.055f) / 1.055f, 2.4f); +} + static void from_sRGB(BYTE *bgr) { float r, g, b;

1 0

Józef Kucia : wined3d: Add support for GL_EXT_texture_shadow_lod.
by Alexandre Julliard 02 Aug '19

02 Aug '19

Module: wine Branch: master Commit: 62f2cd1b475df62798f8ede695119b2cceb3722e URL: https://source.winehq.org/git/wine.git/?a=commit;h=62f2cd1b475df62798f8ede6… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Aug 1 14:51:18 2019 +0200 wined3d: Add support for GL_EXT_texture_shadow_lod. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 1 + dlls/wined3d/glsl_shader.c | 8 ++++++-- dlls/wined3d/wined3d_gl.h | 1 + 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index bf07955..84e5360 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -200,6 +200,7 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_EXT_texture_integer", EXT_TEXTURE_INTEGER }, {"GL_EXT_texture_lod_bias", EXT_TEXTURE_LOD_BIAS }, {"GL_EXT_texture_mirror_clamp", EXT_TEXTURE_MIRROR_CLAMP }, + {"GL_EXT_texture_shadow_lod", EXT_TEXTURE_SHADOW_LOD }, {"GL_EXT_texture_shared_exponent", EXT_TEXTURE_SHARED_EXPONENT }, {"GL_EXT_texture_snorm", EXT_TEXTURE_SNORM }, {"GL_EXT_texture_sRGB", EXT_TEXTURE_SRGB }, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 9b388e6..1acb6c7 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -6007,7 +6007,7 @@ static void shader_glsl_sample(const struct wined3d_shader_instruction *ins) * comparison for array textures and cube textures. We use textureGrad*() * to implement sample_c_lz. */ -static void shader_glsl_gen_sample_c_lz(const struct wined3d_shader_instruction *ins, +static void shader_glsl_gen_sample_c_lz_emulation(const struct wined3d_shader_instruction *ins, unsigned int sampler_bind_idx, const struct glsl_sample_function *sample_function, unsigned int coord_size, const char *coord_param, const char *ref_param) { @@ -6036,6 +6036,7 @@ static void shader_glsl_gen_sample_c_lz(const struct wined3d_shader_instruction static void shader_glsl_sample_c(const struct wined3d_shader_instruction *ins) { + const struct wined3d_gl_info *gl_info = ins->ctx->gl_info; unsigned int resource_idx, sampler_idx, sampler_bind_idx; const struct wined3d_shader_resource_info *resource_info; struct glsl_src_param coord_param, compare_param; @@ -6064,10 +6065,11 @@ static void shader_glsl_sample_c(const struct wined3d_shader_instruction *ins) shader_glsl_add_src_param(ins, &ins->src[3], WINED3DSP_WRITEMASK_0, &compare_param); sampler_bind_idx = shader_glsl_find_sampler(&ins->ctx->reg_maps->sampler_map, resource_idx, sampler_idx); if (ins->handler_idx == WINED3DSIH_SAMPLE_C_LZ + && !gl_info->supported[EXT_TEXTURE_SHADOW_LOD] && (resource_info->type == WINED3D_SHADER_RESOURCE_TEXTURE_2DARRAY || resource_info->type == WINED3D_SHADER_RESOURCE_TEXTURE_CUBE)) { - shader_glsl_gen_sample_c_lz(ins, sampler_bind_idx, &sample_function, + shader_glsl_gen_sample_c_lz_emulation(ins, sampler_bind_idx, &sample_function, coord_size, coord_param.param_str, compare_param.param_str); } else @@ -7453,6 +7455,8 @@ static void shader_glsl_enable_extensions(struct wined3d_string_buffer *buffer, shader_addline(buffer, "#extension GL_EXT_gpu_shader4 : enable\n"); if (gl_info->supported[EXT_TEXTURE_ARRAY]) shader_addline(buffer, "#extension GL_EXT_texture_array : enable\n"); + if (gl_info->supported[EXT_TEXTURE_SHADOW_LOD]) + shader_addline(buffer, "#extension GL_EXT_texture_shadow_lod : enable\n"); } static void shader_glsl_generate_color_output(struct wined3d_string_buffer *buffer, diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 0e5ae5e..678ad1a 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -179,6 +179,7 @@ enum wined3d_gl_extension EXT_TEXTURE_INTEGER, EXT_TEXTURE_LOD_BIAS, EXT_TEXTURE_MIRROR_CLAMP, + EXT_TEXTURE_SHADOW_LOD, EXT_TEXTURE_SHARED_EXPONENT, EXT_TEXTURE_SNORM, EXT_TEXTURE_SRGB,

1 0

Martin Storsjo : msvcrt: Implement the fdim functions.
by Alexandre Julliard 02 Aug '19

02 Aug '19

Module: wine Branch: master Commit: 83a95b8fcf90a2a9d23bdfebe1a18cb8f729de1b URL: https://source.winehq.org/git/wine.git/?a=commit;h=83a95b8fcf90a2a9d23bdfeb… Author: Martin Storsjo <martin(a)martin.st> Date: Wed Jul 31 00:08:52 2019 +0300 msvcrt: Implement the fdim functions. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-math-l1-1-0.spec | 6 +++--- dlls/msvcr120/msvcr120.spec | 6 +++--- dlls/msvcr120_app/msvcr120_app.spec | 6 +++--- dlls/msvcrt/math.c | 24 ++++++++++++++++++++++ dlls/ucrtbase/ucrtbase.spec | 6 +++--- 5 files changed, 36 insertions(+), 12 deletions(-) diff --git a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec index 9eb3059..73967ea 100644 --- a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec +++ b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec @@ -236,9 +236,9 @@ @ cdecl expm1l(double) ucrtbase.expm1l @ cdecl fabs(double) ucrtbase.fabs @ cdecl -arch=arm,arm64 fabsf(float) ucrtbase.fabsf -@ stub fdim -@ stub fdimf -@ stub fdiml +@ cdecl fdim(double double) ucrtbase.fdim +@ cdecl fdimf(float float) ucrtbase.fdimf +@ cdecl fdiml(double double) ucrtbase.fdiml @ cdecl floor(double) ucrtbase.floor @ cdecl -arch=arm,x86_64,arm64 floorf(float) ucrtbase.floorf @ cdecl fma(double double double) ucrtbase.fma diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 26d6983..d7c5843 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2140,9 +2140,9 @@ @ cdecl fabs(double) MSVCRT_fabs @ cdecl -arch=arm,x86_64,arm64 fabsf(float) MSVCRT_fabsf @ cdecl fclose(ptr) MSVCRT_fclose -@ stub fdim -@ stub fdimf -@ stub fdiml +@ cdecl fdim(double double) MSVCR120_fdim +@ cdecl fdimf(float float) MSVCR120_fdimf +@ cdecl fdiml(double double) MSVCR120_fdim @ stub feclearexcept @ cdecl fegetenv(ptr) MSVCRT_fegetenv @ stub fegetexceptflag diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 3ca90c3..2dcf191 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1806,9 +1806,9 @@ @ cdecl fabs(double) msvcr120.fabs @ cdecl -arch=arm,x86_64,arm64 fabsf(float) msvcr120.fabsf @ cdecl fclose(ptr) msvcr120.fclose -@ stub fdim -@ stub fdimf -@ stub fdiml +@ cdecl fdim(double double) msvcr120.fdim +@ cdecl fdimf(float float) msvcr120.fdimf +@ cdecl fdiml(double double) msvcr120.fdiml @ stub feclearexcept @ cdecl fegetenv(ptr) msvcr120.fegetenv @ stub fegetexceptflag diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index c29539e..841a231 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -3024,6 +3024,30 @@ double CDECL MSVCR120_fmax(double x, double y) } /********************************************************************* + * fdimf (MSVCR120.@) + */ +float CDECL MSVCR120_fdimf(float x, float y) +{ + if(isnan(x)) + return x; + if(isnan(y)) + return y; + return x>y ? x-y : 0; +} + +/********************************************************************* + * fdim (MSVCR120.@) + */ +double CDECL MSVCR120_fdim(double x, double y) +{ + if(isnan(x)) + return x; + if(isnan(y)) + return y; + return x>y ? x-y : 0; +} + +/********************************************************************* * _fdsign (MSVCR120.@) */ int CDECL MSVCR120__fdsign(float x) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 6609683..cde137d 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2283,9 +2283,9 @@ @ cdecl fabs(double) MSVCRT_fabs @ cdecl -arch=arm,arm64 fabsf(float) MSVCRT_fabsf @ cdecl fclose(ptr) MSVCRT_fclose -@ stub fdim -@ stub fdimf -@ stub fdiml +@ cdecl fdim(double double) MSVCR120_fdim +@ cdecl fdimf(float float) MSVCR120_fdimf +@ cdecl fdiml(double double) MSVCR120_fdim @ stub feclearexcept @ cdecl fegetenv(ptr) MSVCRT_fegetenv @ stub fegetexceptflag

1 0

Martin Storsjo : msvcrt: Implement the tgamma functions.
by Alexandre Julliard 02 Aug '19

02 Aug '19

Module: wine Branch: master Commit: e38b46e7f7250e4e7c8d7979a845cdc1106677be URL: https://source.winehq.org/git/wine.git/?a=commit;h=e38b46e7f7250e4e7c8d7979… Author: Martin Storsjo <martin(a)martin.st> Date: Thu Aug 1 22:52:26 2019 +0300 msvcrt: Implement the tgamma functions. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 2 ++ .../api-ms-win-crt-math-l1-1-0.spec | 6 ++-- dlls/msvcr120/msvcr120.spec | 6 ++-- dlls/msvcr120_app/msvcr120_app.spec | 6 ++-- dlls/msvcrt/math.c | 38 ++++++++++++++++++++++ dlls/ucrtbase/ucrtbase.spec | 6 ++-- include/config.h.in | 6 ++++ 8 files changed, 60 insertions(+), 12 deletions(-) diff --git a/configure b/configure index ed56167..44e283e 100755 --- a/configure +++ b/configure @@ -19289,6 +19289,8 @@ for ac_func in \ rintf \ round \ roundf \ + tgamma \ + tgammaf \ trunc \ truncf \ y0 \ diff --git a/configure.ac b/configure.ac index 0fe2602..c58d343 100644 --- a/configure.ac +++ b/configure.ac @@ -2676,6 +2676,8 @@ AC_CHECK_FUNCS(\ rintf \ round \ roundf \ + tgamma \ + tgammaf \ trunc \ truncf \ y0 \ diff --git a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec index 73967ea..eb7017f 100644 --- a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec +++ b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec @@ -333,9 +333,9 @@ @ cdecl -arch=arm,x86_64,arm64 tanf(float) ucrtbase.tanf @ cdecl tanh(double) ucrtbase.tanh @ cdecl -arch=arm,x86_64,arm64 tanhf(float) ucrtbase.tanhf -@ stub tgamma -@ stub tgammaf -@ stub tgammal +@ cdecl tgamma(double) ucrtbase.tgamma +@ cdecl tgammaf(float) ucrtbase.tgammaf +@ cdecl tgammal(double) ucrtbase.tgammal @ cdecl trunc(double) ucrtbase.trunc @ cdecl truncf(float) ucrtbase.truncf @ cdecl truncl(double) ucrtbase.truncl diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index d7c5843..469bc01 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2405,9 +2405,9 @@ @ cdecl -arch=arm,x86_64,arm64 tanf(float) MSVCRT_tanf @ cdecl tanh(double) MSVCRT_tanh @ cdecl -arch=arm,x86_64,arm64 tanhf(float) MSVCRT_tanhf -@ stub tgamma -@ stub tgammaf -@ stub tgammal +@ cdecl tgamma(double) MSVCR120_tgamma +@ cdecl tgammaf(float) MSVCR120_tgammaf +@ cdecl tgammal(double) MSVCR120_tgamma @ cdecl tmpfile() MSVCRT_tmpfile @ cdecl tmpfile_s(ptr) MSVCRT_tmpfile_s @ cdecl tmpnam(ptr) MSVCRT_tmpnam diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 2dcf191..f9e3a00 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -2067,9 +2067,9 @@ @ cdecl -arch=arm,x86_64,arm64 tanf(float) msvcr120.tanf @ cdecl tanh(double) msvcr120.tanh @ cdecl -arch=arm,x86_64,arm64 tanhf(float) msvcr120.tanhf -@ stub tgamma -@ stub tgammaf -@ stub tgammal +@ cdecl tgamma(double) msvcr120.tgamma +@ cdecl tgammaf(float) msvcr120.tgammaf +@ cdecl tgammal(double) msvcr120.tgammal @ cdecl tmpfile() msvcr120.tmpfile @ cdecl tmpfile_s(ptr) msvcr120.tmpfile_s @ cdecl tmpnam(ptr) msvcr120.tmpnam diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 841a231..6651df8 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -3405,6 +3405,44 @@ LDOUBLE CDECL MSVCR120_lgammal(LDOUBLE x) } /********************************************************************* + * tgamma (MSVCR120.@) + */ +double CDECL MSVCR120_tgamma(double x) +{ +#ifdef HAVE_TGAMMA + if(x==0.0) *MSVCRT__errno() = MSVCRT_ERANGE; + if(x<0.0f) { + double integral; + if (modf(x, &integral) == 0) + *MSVCRT__errno() = MSVCRT_EDOM; + } + return tgamma(x); +#else + FIXME( "not implemented\n" ); + return 0.0; +#endif +} + +/********************************************************************* + * tgammaf (MSVCR120.@) + */ +float CDECL MSVCR120_tgammaf(float x) +{ +#ifdef HAVE_TGAMMAF + if(x==0.0f) *MSVCRT__errno() = MSVCRT_ERANGE; + if(x<0.0f) { + float integral; + if (modff(x, &integral) == 0) + *MSVCRT__errno() = MSVCRT_EDOM; + } + return tgammaf(x); +#else + FIXME( "not implemented\n" ); + return 0.0f; +#endif +} + +/********************************************************************* * nan (MSVCR120.@) */ double CDECL MSVCR120_nan(const char *tagp) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index cde137d..2a5fdf2 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2534,9 +2534,9 @@ @ cdecl tanh(double) MSVCRT_tanh @ cdecl -arch=arm,x86_64,arm64 tanhf(float) MSVCRT_tanhf @ cdecl terminate() MSVCRT_terminate -@ stub tgamma -@ stub tgammaf -@ stub tgammal +@ cdecl tgamma(double) MSVCR120_tgamma +@ cdecl tgammaf(float) MSVCR120_tgammaf +@ cdecl tgammal(double) MSVCR120_tgamma @ cdecl tmpfile() MSVCRT_tmpfile @ cdecl tmpfile_s(ptr) MSVCRT_tmpfile_s @ cdecl tmpnam(ptr) MSVCRT_tmpnam diff --git a/include/config.h.in b/include/config.h.in index ce5c157..29ea6f0 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -1166,6 +1166,12 @@ /* Define to 1 if you have the <termios.h> header file. */ #undef HAVE_TERMIOS_H +/* Define to 1 if you have the `tgamma' function. */ +#undef HAVE_TGAMMA + +/* Define to 1 if you have the `tgammaf' function. */ +#undef HAVE_TGAMMAF + /* Define to 1 if you have the `thr_kill2' function. */ #undef HAVE_THR_KILL2

1 0