wine-commits May 2021

wine-commits@winehq.org

2 participants
770 discussions

Rémi Bernon : kernelbase: Don't strip leading dots in relative paths.
by Alexandre Julliard 24 May '21

24 May '21

Module: wine Branch: master Commit: c27b2461a4ae770d3e386f26f832f175f15bd963 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c27b2461a4ae770d3e386f26… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon May 24 08:20:25 2021 +0200 kernelbase: Don't strip leading dots in relative paths. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49315 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/path.c | 2 +- dlls/shlwapi/tests/path.c | 25 +++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index 14e892bcc42..9387705e963 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -1389,7 +1389,7 @@ BOOL WINAPI PathCanonicalizeW(WCHAR *buffer, const WCHAR *path) { src += 2; /* Skip .\ */ } - else if (src[1] == '.' && (dst == buffer || dst[-1] == '\\')) + else if (src[1] == '.' && dst != buffer && dst[-1] == '\\') { /* \.. backs up a directory, over the root if it has no \ following X:. * .. is ignored if it would remove a UNC server name or initial \\ diff --git a/dlls/shlwapi/tests/path.c b/dlls/shlwapi/tests/path.c index e9f08a902b0..dbe1f36fbfd 100644 --- a/dlls/shlwapi/tests/path.c +++ b/dlls/shlwapi/tests/path.c @@ -714,6 +714,15 @@ static void test_PathCombineA(void) ok(!lstrcmpA(str, "C:\\"), "Expected C:\\, got %s\n", str); ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", GetLastError()); + /* try relative paths */ + /* try forward slashes */ + SetLastError(0xdeadbeef); + lstrcpyA(dest, "control"); + str = PathCombineA(dest, "../../../one/two/", "*"); + ok(str == dest, "Expected str == dest, got %p\n", str); + ok(!lstrcmpA(str, "../../../one/two/\\*"), "Expected ../../../one/two/\\*, got %s\n", str); + ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", GetLastError()); + memset(too_long, 'a', LONG_LEN); too_long[LONG_LEN - 1] = '\0'; @@ -1039,6 +1048,22 @@ static void test_PathCanonicalizeA(void) !lstrcmpA(dest, "C:\\one/"), /* Vista */ "Expected \"C:\\one/.\" or \"C:\\one/\", got \"%s\"\n", dest); + /* try relative forward slashes */ + lstrcpyA(dest, "test"); + SetLastError(0xdeadbeef); + res = PathCanonicalizeA(dest, "../../one/two/"); + ok(res, "Expected success\n"); + ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", GetLastError()); + ok(!lstrcmpA(dest, "../../one/two/"), "Expected ../../one/two/, got %s\n", dest); + + /* try relative forward slashes */ + lstrcpyA(dest, "test"); + SetLastError(0xdeadbeef); + res = PathCanonicalizeA(dest, "../../one/two/\\*"); + ok(res, "Expected success\n"); + ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", GetLastError()); + ok(!lstrcmpA(dest, "../../one/two/\\*"), "Expected ../../one/two/\\*, got %s\n", dest); + /* try forward slashes with change dirs * NOTE: if there is a forward slash in between two backslashes, * everything in between the two backslashes is considered on dir

1 0

Zebediah Figura : user32: Implement InternalGetWindowIcon().
by Alexandre Julliard 24 May '21

24 May '21

Module: wine Branch: master Commit: 0da35c26a112318dc0d96947b7f862144489144e URL: https://source.winehq.org/git/wine.git/?a=commit;h=0da35c26a112318dc0d96947… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun May 23 23:47:20 2021 -0500 user32: Implement InternalGetWindowIcon(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47915 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 250 +++++++++++++++++++++++++++++++++++++++++++----- dlls/user32/user32.spec | 1 + dlls/user32/win.c | 47 +++++++++ 3 files changed, 275 insertions(+), 23 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0da35c26a112318dc0d9…

1 0

Zebediah Figura : user32: Reimplement CopyIcon() on top of CopyImage().
by Alexandre Julliard 24 May '21

24 May '21

Module: wine Branch: master Commit: 5df5972f9aac66c7306fecea9d094ec1634b31be URL: https://source.winehq.org/git/wine.git/?a=commit;h=5df5972f9aac66c7306fecea… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun May 23 23:47:19 2021 -0500 user32: Reimplement CopyIcon() on top of CopyImage(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/cursoricon.c | 45 ++++++--------------------------------------- 1 file changed, 6 insertions(+), 39 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index fc95fa1c56f..a923f2f8315 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -1667,48 +1667,15 @@ HICON WINAPI CreateIcon( HINSTANCE instance, int width, int height, BYTE planes, /*********************************************************************** * CopyIcon (USER32.@) */ -HICON WINAPI CopyIcon( HICON hIcon ) +HICON WINAPI CopyIcon( HICON icon ) { - struct cursoricon_object *ptrOld, *ptrNew; - HICON hNew; + ICONINFOEXW info; - if (!(ptrOld = get_icon_ptr( hIcon ))) - { - SetLastError( ERROR_INVALID_CURSOR_HANDLE ); - return 0; - } - if ((hNew = alloc_icon_handle( FALSE, 0 ))) - { - struct cursoricon_frame *frameOld, *frameNew; + info.cbSize = sizeof(info); + if (!GetIconInfoExW( icon, &info )) + return NULL; - ptrNew = get_icon_ptr( hNew ); - ptrNew->is_icon = ptrOld->is_icon; - ptrNew->hotspot = ptrOld->hotspot; - if (!(frameOld = get_icon_frame( ptrOld, 0 ))) - { - release_user_handle_ptr( ptrOld ); - SetLastError( ERROR_INVALID_CURSOR_HANDLE ); - return 0; - } - if (!(frameNew = get_icon_frame( ptrNew, 0 ))) - { - release_icon_frame( ptrOld, frameOld ); - release_user_handle_ptr( ptrOld ); - SetLastError( ERROR_INVALID_CURSOR_HANDLE ); - return 0; - } - frameNew->delay = 0; - frameNew->width = frameOld->width; - frameNew->height = frameOld->height; - frameNew->mask = copy_bitmap( frameOld->mask ); - frameNew->color = copy_bitmap( frameOld->color ); - frameNew->alpha = copy_bitmap( frameOld->alpha ); - release_icon_frame( ptrOld, frameOld ); - release_icon_frame( ptrNew, frameNew ); - release_user_handle_ptr( ptrNew ); - } - release_user_handle_ptr( ptrOld ); - return hNew; + return CopyImage( icon, info.fIcon ? IMAGE_ICON : IMAGE_CURSOR, 0, 0, 0 ); }

1 0

Zebediah Figura : user32: Implement stretching of cursor and icon objects in CopyImage().
by Alexandre Julliard 24 May '21

24 May '21

Module: wine Branch: master Commit: beb70a79e1d92ddb10a552dcc6c06a4139365566 URL: https://source.winehq.org/git/wine.git/?a=commit;h=beb70a79e1d92ddb10a552dc… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun May 23 23:47:18 2021 -0500 user32: Implement stretching of cursor and icon objects in CopyImage(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/cursoricon.c | 88 ++++++++++++++++-- dlls/user32/tests/cursoricon.c | 205 +++++++++++++++++++++++++++-------------- 2 files changed, 218 insertions(+), 75 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=beb70a79e1d92ddb10a5…

1 0

Zebediah Figura : user32: Handle monochrome icons in CreateIcon() and CreateCursor() instead of CreateIconIndirect().
by Alexandre Julliard 24 May '21

24 May '21

Module: wine Branch: master Commit: db2b266c57b73e1a16785213ce923b749c84400e URL: https://source.winehq.org/git/wine.git/?a=commit;h=db2b266c57b73e1a16785213… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun May 23 23:47:17 2021 -0500 user32: Handle monochrome icons in CreateIcon() and CreateCursor() instead of CreateIconIndirect(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/cursoricon.c | 102 ++++++++++++++++++++++------------------- dlls/user32/tests/cursoricon.c | 53 +++++++++++++++------ 2 files changed, 96 insertions(+), 59 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=db2b266c57b73e1a1678…

1 0

Daniel Lehman : ntdll: Silence clang warning.
by Alexandre Julliard 24 May '21

24 May '21

Module: wine Branch: master Commit: 1bfa845a675051afc7d2e985b5c733467bc4fc35 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1bfa845a675051afc7d2e985… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Sun May 23 13:20:55 2021 -0700 ntdll: Silence clang warning. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/thread.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index 624dff0e5f1..b14b441c094 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -1013,7 +1013,7 @@ void abort_process( int status ) /*********************************************************************** * exit_thread */ -static void exit_thread( int status ) +static DECLSPEC_NORETURN void exit_thread( int status ) { static void *prev_teb; TEB *teb;

1 0

Daniel Lehman : ntdll/tests: Clean up temp file.
by Alexandre Julliard 24 May '21

24 May '21

Module: wine Branch: master Commit: cb6a6bb6cf0d01c9e9a157869a303f72426cded4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cb6a6bb6cf0d01c9e9a15786… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Sun May 23 13:20:39 2021 -0700 ntdll/tests: Clean up temp file. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/om.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index fb7d48e7fe1..a7f8eaa84e1 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -1500,9 +1500,9 @@ static void test_query_object(void) GetTempFileNameA(tmp_path, "foo", 0, file1); handle = CreateFileA(file1, GENERIC_WRITE | DELETE, 0, NULL, CREATE_ALWAYS, 0, 0); test_object_type(handle, L"File"); - DeleteFileA( file1 ); test_file_info( handle ); pNtClose( handle ); + DeleteFileA( file1 ); status = pNtCreateIoCompletion( &handle, IO_COMPLETION_ALL_ACCESS, NULL, 0 ); ok( status == STATUS_SUCCESS, "NtCreateIoCompletion failed %x\n", status);

1 0

Piotr Caban : msvcrt: Import tanf implementation from musl.
by Alexandre Julliard 24 May '21

24 May '21

Module: wine Branch: master Commit: 5e34d175307a5732e37e9281fc257bdaf4b10d6a URL: https://source.winehq.org/git/wine.git/?a=commit;h=5e34d175307a5732e37e9281… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sun May 23 16:38:05 2021 +0200 msvcrt: Import tanf implementation from musl. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 72 ++++++++++++++++++++++++++++++++++++++++++++++++--- dlls/msvcrt/unixlib.c | 9 ------- dlls/msvcrt/unixlib.h | 1 - 3 files changed, 69 insertions(+), 13 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index d26aa06e9e7..811fce1531d 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -1285,14 +1285,80 @@ float CDECL sqrtf( float x ) #endif } +/* Copied from musl: src/math/__tandf.c */ +static float __tandf(double x, int odd) +{ + static const double T[] = { + 0x15554d3418c99f.0p-54, + 0x1112fd38999f72.0p-55, + 0x1b54c91d865afe.0p-57, + 0x191df3908c33ce.0p-58, + 0x185dadfcecf44e.0p-61, + 0x1362b9bf971bcd.0p-59, + }; + + double z, r, w, s, t, u; + + z = x * x; + r = T[4] + z * T[5]; + t = T[2] + z * T[3]; + w = z * z; + s = z * x; + u = T[0] + z * T[1]; + r = (x + s * u) + (s * w) * (t + w * r); + return odd ? -1.0 / r : r; +} + /********************************************************************* * tanf (MSVCRT.@) + * + * Copied from musl: src/math/tanf.c */ float CDECL tanf( float x ) { - float ret = unix_funcs->tanf(x); - if (!isfinite(x)) return math_error(_DOMAIN, "tanf", x, 0, ret); - return ret; + static const double t1pio2 = 1*M_PI_2, + t2pio2 = 2*M_PI_2, + t3pio2 = 3*M_PI_2, + t4pio2 = 4*M_PI_2; + + double y; + UINT32 ix; + unsigned n, sign; + + ix = *(UINT32*)&x; + sign = ix >> 31; + ix &= 0x7fffffff; + + if (ix <= 0x3f490fda) { /* |x| ~<= pi/4 */ + if (ix < 0x39800000) { /* |x| < 2**-12 */ + /* raise inexact if x!=0 and underflow if subnormal */ + fp_barrierf(ix < 0x00800000 ? x / 0x1p120f : x + 0x1p120f); + return x; + } + return __tandf(x, 0); + } + if (ix <= 0x407b53d1) { /* |x| ~<= 5*pi/4 */ + if (ix <= 0x4016cbe3) /* |x| ~<= 3pi/4 */ + return __tandf((sign ? x + t1pio2 : x - t1pio2), 1); + else + return __tandf((sign ? x + t2pio2 : x - t2pio2), 0); + } + if (ix <= 0x40e231d5) { /* |x| ~<= 9*pi/4 */ + if (ix <= 0x40afeddf) /* |x| ~<= 7*pi/4 */ + return __tandf((sign ? x + t3pio2 : x - t3pio2), 1); + else + return __tandf((sign ? x + t4pio2 : x - t4pio2), 0); + } + + /* tan(Inf or NaN) is NaN */ + if (isinf(x)) + return math_error(_DOMAIN, "tanf", x, 0, x - x); + if (ix >= 0x7f800000) + return x - x; + + /* argument reduction */ + n = __rem_pio2f(x, &y); + return __tandf(y, n & 1); } /********************************************************************* diff --git a/dlls/msvcrt/unixlib.c b/dlls/msvcrt/unixlib.c index 1fb16f48fcd..c69ca440504 100644 --- a/dlls/msvcrt/unixlib.c +++ b/dlls/msvcrt/unixlib.c @@ -403,14 +403,6 @@ static float CDECL unix_sinhf( float x ) return sinhf( x ); } -/********************************************************************* - * tanf - */ -static float CDECL unix_tanf( float x ) -{ - return tanf( x ); -} - /********************************************************************* * tanh */ @@ -490,7 +482,6 @@ static const struct unix_funcs funcs = unix_powf, unix_sinh, unix_sinhf, - unix_tanf, unix_tanh, unix_tanhf, unix_tgamma, diff --git a/dlls/msvcrt/unixlib.h b/dlls/msvcrt/unixlib.h index 4c2cf5852ea..6fbafe064c1 100644 --- a/dlls/msvcrt/unixlib.h +++ b/dlls/msvcrt/unixlib.h @@ -58,7 +58,6 @@ struct unix_funcs float (CDECL *powf)(float x, float y); double (CDECL *sinh)(double x); float (CDECL *sinhf)(float x); - float (CDECL *tanf)(float x); double (CDECL *tanh)(double x); float (CDECL *tanhf)(float x); double (CDECL *tgamma)(double x);

1 0

Piotr Caban : msvcrt: Import sinf implementation from musl.
by Alexandre Julliard 24 May '21

24 May '21

Module: wine Branch: master Commit: 14a8e16a44ad9b1e9ef7ca0fde45a1c89ab77da6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=14a8e16a44ad9b1e9ef7ca0f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sun May 23 16:37:33 2021 +0200 msvcrt: Import sinf implementation from musl. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++++--- dlls/msvcrt/unixlib.c | 9 -------- dlls/msvcrt/unixlib.h | 1 - 3 files changed, 56 insertions(+), 13 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index e943076c1c7..d26aa06e9e7 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -1121,12 +1121,65 @@ float CDECL powf( float x, float y ) /********************************************************************* * sinf (MSVCRT.@) + * + * Copied from musl: src/math/sinf.c */ float CDECL sinf( float x ) { - float ret = unix_funcs->sinf( x ); - if (!isfinite(x)) return math_error(_DOMAIN, "sinf", x, 0, ret); - return ret; + static const double s1pio2 = 1*M_PI_2, + s2pio2 = 2*M_PI_2, + s3pio2 = 3*M_PI_2, + s4pio2 = 4*M_PI_2; + + double y; + UINT32 ix; + int n, sign; + + ix = *(UINT32*)&x; + sign = ix >> 31; + ix &= 0x7fffffff; + + if (ix <= 0x3f490fda) { /* |x| ~<= pi/4 */ + if (ix < 0x39800000) { /* |x| < 2**-12 */ + /* raise inexact if x!=0 and underflow if subnormal */ + fp_barrierf(ix < 0x00800000 ? x / 0x1p120f : x + 0x1p120f); + return x; + } + return __sindf(x); + } + if (ix <= 0x407b53d1) { /* |x| ~<= 5*pi/4 */ + if (ix <= 0x4016cbe3) { /* |x| ~<= 3pi/4 */ + if (sign) + return -__cosdf(x + s1pio2); + else + return __cosdf(x - s1pio2); + } + return __sindf(sign ? -(x + s2pio2) : -(x - s2pio2)); + } + if (ix <= 0x40e231d5) { /* |x| ~<= 9*pi/4 */ + if (ix <= 0x40afeddf) { /* |x| ~<= 7*pi/4 */ + if (sign) + return __cosdf(x + s3pio2); + else + return -__cosdf(x - s3pio2); + } + return __sindf(sign ? x + s4pio2 : x - s4pio2); + } + + /* sin(Inf or NaN) is NaN */ + if (isinf(x)) + return math_error(_DOMAIN, "sinf", x, 0, x - x); + if (ix >= 0x7f800000) + return x - x; + + /* general argument reduction needed */ + n = __rem_pio2f(x, &y); + switch (n&3) { + case 0: return __sindf(y); + case 1: return __cosdf(y); + case 2: return __sindf(-y); + default: return -__cosdf(y); + } } /********************************************************************* diff --git a/dlls/msvcrt/unixlib.c b/dlls/msvcrt/unixlib.c index 1cec98ae3d4..1fb16f48fcd 100644 --- a/dlls/msvcrt/unixlib.c +++ b/dlls/msvcrt/unixlib.c @@ -387,14 +387,6 @@ static float CDECL unix_powf( float x, float y ) return powf( x, y ); } -/********************************************************************* - * sinf - */ -static float CDECL unix_sinf( float x ) -{ - return sinf( x ); -} - /********************************************************************* * sinh */ @@ -496,7 +488,6 @@ static const struct unix_funcs funcs = unix_log2f, unix_pow, unix_powf, - unix_sinf, unix_sinh, unix_sinhf, unix_tanf, diff --git a/dlls/msvcrt/unixlib.h b/dlls/msvcrt/unixlib.h index d34117eeb32..4c2cf5852ea 100644 --- a/dlls/msvcrt/unixlib.h +++ b/dlls/msvcrt/unixlib.h @@ -56,7 +56,6 @@ struct unix_funcs float (CDECL *log2f)(float x); double (CDECL *pow)(double x, double y); float (CDECL *powf)(float x, float y); - float (CDECL *sinf)(float x); double (CDECL *sinh)(double x); float (CDECL *sinhf)(float x); float (CDECL *tanf)(float x);

1 0

Piotr Caban : msvcrt: Import cosf implementation from musl.
by Alexandre Julliard 24 May '21

24 May '21

Module: wine Branch: master Commit: 8321ce14ad2e34b4e849094f1cdd3f3196dcd79b URL: https://source.winehq.org/git/wine.git/?a=commit;h=8321ce14ad2e34b4e849094f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sun May 23 16:37:16 2021 +0200 msvcrt: Import cosf implementation from musl. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 631 ++++++++++++++++++++++++++++++-------------------- dlls/msvcrt/unixlib.c | 9 - dlls/msvcrt/unixlib.h | 1 - 3 files changed, 384 insertions(+), 257 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8321ce14ad2e34b4e849…

1 0

← Newer
1
...
19
20
21
22
23
24
25
...
77
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2021