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

Piotr Caban : msvcrt: Import tan implementation from musl.
by Alexandre Julliard May 24, 2021

May 24, 2021

Module: wine Branch: master Commit: 73c0d36aa4e5434b7b6cfba6d14fe714c791cd46 URL: https://source.winehq.org/git/wine.git/?a=commit;h=73c0d36aa4e5434b7b6cfba6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sun May 23 16:36:47 2021 +0200 msvcrt: Import tan 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 | 87 +++++++++++++++++++++++++++++++++++++++++++++++++-- dlls/msvcrt/unixlib.c | 9 ------ dlls/msvcrt/unixlib.h | 1 - 3 files changed, 84 insertions(+), 13 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 7643f39fde7..9deaf832d15 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -2179,14 +2179,95 @@ double CDECL sqrt( double x ) #endif } +/* Copied from musl: src/math/__tan.c */ +static double __tan(double x, double y, int odd) +{ + static const double T[] = { + 3.33333333333334091986e-01, + 1.33333333333201242699e-01, + 5.39682539762260521377e-02, + 2.18694882948595424599e-02, + 8.86323982359930005737e-03, + 3.59207910759131235356e-03, + 1.45620945432529025516e-03, + 5.88041240820264096874e-04, + 2.46463134818469906812e-04, + 7.81794442939557092300e-05, + 7.14072491382608190305e-05, + -1.85586374855275456654e-05, + 2.59073051863633712884e-05, + }; + static const double pio4 = 7.85398163397448278999e-01; + static const double pio4lo = 3.06161699786838301793e-17; + + double z, r, v, w, s, a, w0, a0; + UINT32 hx; + int big, sign; + + hx = *(ULONGLONG*)&x >> 32; + big = (hx & 0x7fffffff) >= 0x3FE59428; /* |x| >= 0.6744 */ + if (big) { + sign = hx >> 31; + if (sign) { + x = -x; + y = -y; + } + x = (pio4 - x) + (pio4lo - y); + y = 0.0; + } + z = x * x; + w = z * z; + r = T[1] + w * (T[3] + w * (T[5] + w * (T[7] + w * (T[9] + w * T[11])))); + v = z * (T[2] + w * (T[4] + w * (T[6] + w * (T[8] + w * (T[10] + w * T[12]))))); + s = z * x; + r = y + z * (s * (r + v) + y) + s * T[0]; + w = x + r; + if (big) { + s = 1 - 2 * odd; + v = s - 2.0 * (x + (r - w * w / (w + s))); + return sign ? -v : v; + } + if (!odd) + return w; + /* -1.0/(x+r) has up to 2ulp error, so compute it accurately */ + w0 = w; + *(LONGLONG*)&w0 = *(LONGLONG*)&w0 & 0xffffffff00000000ULL; + v = r - (w0 - x); /* w0+v = r+x */ + a0 = a = -1.0 / w; + *(LONGLONG*)&a0 = *(LONGLONG*)&a0 & 0xffffffff00000000ULL; + return a0 + a * (1.0 + a0 * w0 + a0 * v); +} + /********************************************************************* * tan (MSVCRT.@) + * + * Copied from musl: src/math/tan.c */ double CDECL tan( double x ) { - double ret = unix_funcs->tan(x); - if (!isfinite(x)) return math_error(_DOMAIN, "tan", x, 0, ret); - return ret; + double y[2]; + UINT32 ix; + unsigned n; + + ix = *(ULONGLONG*)&x >> 32; + ix &= 0x7fffffff; + + if (ix <= 0x3fe921fb) { /* |x| ~< pi/4 */ + if (ix < 0x3e400000) { /* |x| < 2**-27 */ + /* raise inexact if x!=0 and underflow if subnormal */ + fp_barrier(ix < 0x00100000 ? x / 0x1p120f : x + 0x1p120f); + return x; + } + return __tan(x, 0.0, 0); + } + + if (isinf(x)) + return math_error(_DOMAIN, "tan", x, 0, x - x); + if (ix >= 0x7ff00000) + return x - x; + + n = __rem_pio2(x, y); + return __tan(y[0], y[1], n & 1); } /********************************************************************* diff --git a/dlls/msvcrt/unixlib.c b/dlls/msvcrt/unixlib.c index 5e80f319255..239d6005a04 100644 --- a/dlls/msvcrt/unixlib.c +++ b/dlls/msvcrt/unixlib.c @@ -419,14 +419,6 @@ static float CDECL unix_sinhf( float x ) return sinhf( x ); } -/********************************************************************* - * tan - */ -static double CDECL unix_tan( double x ) -{ - return tan( x ); -} - /********************************************************************* * tanf */ @@ -516,7 +508,6 @@ static const struct unix_funcs funcs = unix_sinf, unix_sinh, unix_sinhf, - unix_tan, unix_tanf, unix_tanh, unix_tanhf, diff --git a/dlls/msvcrt/unixlib.h b/dlls/msvcrt/unixlib.h index 0f9121723f1..7cce30885a9 100644 --- a/dlls/msvcrt/unixlib.h +++ b/dlls/msvcrt/unixlib.h @@ -60,7 +60,6 @@ struct unix_funcs float (CDECL *sinf)(float x); double (CDECL *sinh)(double x); float (CDECL *sinhf)(float x); - double (CDECL *tan)(double x); float (CDECL *tanf)(float x); double (CDECL *tanh)(double x); float (CDECL *tanhf)(float x);

1 0

Jactry Zeng : riched20/tests: Add INSERT_REOBJECT() for simplifying tests of IRichEditOle_InsertObject().
by Alexandre Julliard May 24, 2021

May 24, 2021

Module: wine Branch: master Commit: 919ff18629b398aad56830c179f067dcaca6c69a URL: https://source.winehq.org/git/wine.git/?a=commit;h=919ff18629b398aad56830c1… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Thu May 20 15:56:10 2021 +0800 riched20/tests: Add INSERT_REOBJECT() for simplifying tests of IRichEditOle_InsertObject(). Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/tests/richole.c | 36 +++++++++++++++++------------------- 1 file changed, 17 insertions(+), 19 deletions(-) diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index 0fab1106a29..9f463fd69e0 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -3230,12 +3230,25 @@ static void _check_reobject_struct(IRichEditOle *reole, LONG index, DWORD flags, ok_(__FILE__,line)(reobj.dwUser == user, "got wrong user-defined value.\n"); } +#define INSERT_REOBJECT(reole,reobj,cp,user) \ + _insert_reobject(reole, reobj, cp, user, __LINE__) +static void _insert_reobject(IRichEditOle *reole, REOBJECT *reobj, LONG cp, DWORD user, int line) +{ + IOleClientSite *clientsite; + HRESULT hr; + hr = IRichEditOle_GetClientSite(reole, &clientsite); + ok_(__FILE__,line)(hr == S_OK, "IRichEditOle_GetClientSite got hr %#x.\n", hr); + fill_reobject_struct(reobj, cp, NULL, NULL, clientsite, 10, 10, DVASPECT_CONTENT, 0, user); + hr = IRichEditOle_InsertObject(reole, reobj); + ok_(__FILE__,line)(hr == S_OK, "IRichEditOle_InsertObject got hr %#x.\n", hr); + IOleClientSite_Release(clientsite); +} + static void test_InsertObject(void) { static CHAR test_text1[] = "abcdefg"; IRichEditOle *reole = NULL; ITextDocument *doc = NULL; - IOleClientSite *clientsite; REOBJECT reo1, reo2, reo3, received_reo; HRESULT hr; HWND hwnd; @@ -3249,36 +3262,21 @@ static void test_InsertObject(void) /* insert object1 in (0, 1)*/ SendMessageA(hwnd, EM_SETSEL, 0, 1); - hr = IRichEditOle_GetClientSite(reole, &clientsite); - ok(hr == S_OK, "IRichEditOle_GetClientSite failed: 0x%08x\n", hr); - fill_reobject_struct(&reo1, REO_CP_SELECTION, NULL, NULL, clientsite, 10, 10, DVASPECT_CONTENT, 0, 1); - hr = IRichEditOle_InsertObject(reole, &reo1); - ok(hr == S_OK, "IRichEditOle_InsertObject failed: 0x%08x\n", hr); + INSERT_REOBJECT(reole, &reo1, REO_CP_SELECTION, 1); count = IRichEditOle_GetObjectCount(reole); ok(count == 1, "got wrong object count: %d\n", count); - IOleClientSite_Release(clientsite); /* insert object2 in (2, 3)*/ SendMessageA(hwnd, EM_SETSEL, 2, 3); - hr = IRichEditOle_GetClientSite(reole, &clientsite); - ok(hr == S_OK, "IRichEditOle_GetClientSite failed: 0x%08x\n", hr); - fill_reobject_struct(&reo2, REO_CP_SELECTION, NULL, NULL, clientsite, 10, 10, DVASPECT_CONTENT, 0, 2); - hr = IRichEditOle_InsertObject(reole, &reo2); - ok(hr == S_OK, "IRichEditOle_InsertObject failed: 0x%08x\n", hr); + INSERT_REOBJECT(reole, &reo2, REO_CP_SELECTION, 2); count = IRichEditOle_GetObjectCount(reole); ok(count == 2, "got wrong object count: %d\n", count); - IOleClientSite_Release(clientsite); /* insert object3 in (1, 2)*/ SendMessageA(hwnd, EM_SETSEL, 1, 2); - hr = IRichEditOle_GetClientSite(reole, &clientsite); - ok(hr == S_OK, "IRichEditOle_GetClientSite failed: 0x%08x\n", hr); - fill_reobject_struct(&reo3, REO_CP_SELECTION, NULL, NULL, clientsite, 10, 10, DVASPECT_CONTENT, 0, 3); - hr = IRichEditOle_InsertObject(reole, &reo3); - ok(hr == S_OK, "IRichEditOle_InsertObject failed: 0x%08x\n", hr); + INSERT_REOBJECT(reole, &reo3, REO_CP_SELECTION, 3); count = IRichEditOle_GetObjectCount(reole); ok(count == 3, "got wrong object count: %d\n", count); - IOleClientSite_Release(clientsite); /* tests below show that order of rebject (from 0 to 2) is: reo1,reo3,reo2 */ CHECK_REOBJECT_STRUCT(reole, 0, REO_GETOBJ_ALL_INTERFACES, 0, NULL, NULL, reo1.polesite, 1);

1 0

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

May 24, 2021

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

Jactry Zeng : riched20/tests: Test ITextServices_TxGetText() with OLE obejct.
by Alexandre Julliard May 24, 2021

May 24, 2021

Module: wine Branch: master Commit: 3e08cebeee6e6fd56a47cea62bb1ae58232c6d21 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3e08cebeee6e6fd56a47cea6… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Thu May 20 15:56:12 2021 +0800 riched20/tests: Test ITextServices_TxGetText() with OLE obejct. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/tests/txtsrv.c | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/dlls/riched20/tests/txtsrv.c b/dlls/riched20/tests/txtsrv.c index fe27be26edb..1f789da8a37 100644 --- a/dlls/riched20/tests/txtsrv.c +++ b/dlls/riched20/tests/txtsrv.c @@ -650,9 +650,30 @@ static BOOL init_texthost(ITextServices **txtserv, ITextHost **ret) return TRUE; } +static void fill_reobject_struct(REOBJECT *reobj, LONG cp, LPOLEOBJECT poleobj, + LPSTORAGE pstg, LPOLECLIENTSITE polesite, LONG sizel_cx, + LONG sizel_cy, DWORD aspect, DWORD flags, DWORD user) +{ + reobj->cbStruct = sizeof(*reobj); + reobj->clsid = CLSID_NULL; + reobj->cp = cp; + reobj->poleobj = poleobj; + reobj->pstg = pstg; + reobj->polesite = polesite; + reobj->sizel.cx = sizel_cx; + reobj->sizel.cy = sizel_cy; + reobj->dvaspect = aspect; + reobj->dwFlags = flags; + reobj->dwUser = user; +} + static void test_TxGetText(void) { + const WCHAR *expected_string; + IOleClientSite *clientsite; ITextServices *txtserv; + IRichEditOle *reole; + REOBJECT reobject; ITextHost *host; HRESULT hres; BSTR rettext; @@ -664,6 +685,24 @@ static void test_TxGetText(void) ok(hres == S_OK, "ITextServices_TxGetText failed (result = %x)\n", hres); SysFreeString(rettext); + hres = ITextServices_TxSetText(txtserv, L"abcdefg"); + ok(hres == S_OK, "Got hres: %#x.\n", hres); + hres = ITextServices_QueryInterface(txtserv, &IID_IRichEditOle, (void **)&reole); + ok(hres == S_OK, "Got hres: %#x.\n", hres); + hres = IRichEditOle_GetClientSite(reole, &clientsite); + ok(hres == S_OK, "Got hres: %#x.\n", hres); + expected_string = L"abc\xfffc""defg"; + fill_reobject_struct(&reobject, 3, NULL, NULL, clientsite, 10, 10, DVASPECT_CONTENT, 0, 1); + hres = IRichEditOle_InsertObject(reole, &reobject); + ok(hres == S_OK, "Got hres: %#x.\n", hres); + hres = ITextServices_TxGetText(txtserv, &rettext); + ok(hres == S_OK, "Got hres: %#x.\n", hres); + ok(lstrlenW(rettext) == lstrlenW(expected_string), "Got wrong length: %d.\n", lstrlenW(rettext)); + todo_wine ok(!lstrcmpW(rettext, expected_string), "Got wrong content: %s.\n", debugstr_w(rettext)); + SysFreeString(rettext); + IOleClientSite_Release(clientsite); + IRichEditOle_Release(reole); + ITextServices_Release(txtserv); ITextHost_Release(host); }

1 0

Nikolay Sivov : mfplat/allocator: Apply default bindflags only for RGBA formats.
by Alexandre Julliard May 24, 2021

May 24, 2021

Module: wine Branch: master Commit: 093d0a85a8fee8f56e77aba0fbd1a3c4e3ae5743 URL: https://source.winehq.org/git/wine.git/?a=commit;h=093d0a85a8fee8f56e77aba0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 24 11:04:20 2021 +0300 mfplat/allocator: Apply default bindflags only for RGBA formats. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/sample.c | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/dlls/mfplat/sample.c b/dlls/mfplat/sample.c index 93c5f923cc2..09c65b5fcf1 100644 --- a/dlls/mfplat/sample.c +++ b/dlls/mfplat/sample.c @@ -1379,10 +1379,12 @@ static HRESULT sample_allocator_initialize(struct sample_allocator *allocator, u unsigned int max_sample_count, IMFAttributes *attributes, IMFMediaType *media_type) { struct surface_service service; + DXGI_FORMAT dxgi_format; unsigned int i; GUID major, subtype; UINT64 frame_size; IMFSample *sample; + D3D11_USAGE usage; HRESULT hr; if (FAILED(hr = IMFMediaType_GetMajorType(media_type, &major))) @@ -1400,22 +1402,30 @@ static HRESULT sample_allocator_initialize(struct sample_allocator *allocator, u if (sample_count > max_sample_count) return E_INVALIDARG; - allocator->frame_desc.usage = D3D11_USAGE_DEFAULT; + usage = D3D11_USAGE_DEFAULT; if (attributes) { IMFAttributes_GetUINT32(attributes, &MF_SA_BUFFERS_PER_SAMPLE, &allocator->frame_desc.buffer_count); - IMFAttributes_GetUINT32(attributes, &MF_SA_D3D11_USAGE, &allocator->frame_desc.usage); + IMFAttributes_GetUINT32(attributes, &MF_SA_D3D11_USAGE, &usage); } - if (allocator->frame_desc.usage == D3D11_USAGE_IMMUTABLE || allocator->frame_desc.usage > D3D11_USAGE_STAGING) + if (usage == D3D11_USAGE_IMMUTABLE || usage > D3D11_USAGE_STAGING) return E_INVALIDARG; - if (allocator->frame_desc.usage == D3D11_USAGE_DEFAULT) - allocator->frame_desc.bindflags = D3D11_BIND_SHADER_RESOURCE | D3D11_BIND_RENDER_TARGET; - else if (allocator->frame_desc.usage == D3D11_USAGE_DYNAMIC) - allocator->frame_desc.bindflags = D3D11_BIND_SHADER_RESOURCE; - else - allocator->frame_desc.bindflags = 0; + dxgi_format = MFMapDX9FormatToDXGIFormat(subtype.Data1); + + allocator->frame_desc.bindflags = 0; + allocator->frame_desc.usage = D3D11_USAGE_DEFAULT; + + if (dxgi_format == DXGI_FORMAT_B8G8R8A8_UNORM || + dxgi_format == DXGI_FORMAT_B8G8R8X8_UNORM) + { + allocator->frame_desc.usage = usage; + if (allocator->frame_desc.usage == D3D11_USAGE_DEFAULT) + allocator->frame_desc.bindflags = D3D11_BIND_SHADER_RESOURCE | D3D11_BIND_RENDER_TARGET; + else if (allocator->frame_desc.usage == D3D11_USAGE_DYNAMIC) + allocator->frame_desc.bindflags = D3D11_BIND_SHADER_RESOURCE; + } if (attributes) IMFAttributes_GetUINT32(attributes, &MF_SA_D3D11_BINDFLAGS, &allocator->frame_desc.bindflags); @@ -1427,7 +1437,7 @@ static HRESULT sample_allocator_initialize(struct sample_allocator *allocator, u max_sample_count = max(1, max_sample_count); allocator->frame_desc.d3d9_format = subtype.Data1; - allocator->frame_desc.dxgi_format = MFMapDX9FormatToDXGIFormat(allocator->frame_desc.d3d9_format); + allocator->frame_desc.dxgi_format = dxgi_format; allocator->frame_desc.width = frame_size >> 32; allocator->frame_desc.height = frame_size; allocator->frame_desc.buffer_count = max(1, allocator->frame_desc.buffer_count);

1 0

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

May 24, 2021

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

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

May 24, 2021

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 May 24, 2021

May 24, 2021

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: Handle monochrome icons in CreateIcon() and CreateCursor() instead of CreateIconIndirect().
by Alexandre Julliard May 24, 2021

May 24, 2021

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 May 24, 2021

May 24, 2021

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