wine-commits January 2021

wine-commits@winehq.org

2 participants
472 discussions

Jactry Zeng : d2d1: Partially implement d2d_device_context_DrawImage().
by Alexandre Julliard 15 Jan '21

15 Jan '21

Module: wine Branch: master Commit: c19fc01d363e06fa9a3a19d6f5f8cbd2d6057f9e URL: https://source.winehq.org/git/wine.git/?a=commit;h=c19fc01d363e06fa9a3a19d6… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Fri Jan 15 22:55:39 2021 +0800 d2d1: Partially implement d2d_device_context_DrawImage(). Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/device.c | 34 +++++++++++++++++++--- dlls/d2d1/tests/d2d1.c | 79 +++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 108 insertions(+), 5 deletions(-) diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index e8bc7207a67..5f04c3aa833 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -1067,7 +1067,8 @@ static void STDMETHODCALLTYPE d2d_device_context_FillOpacityMask(ID2D1DeviceCont static void d2d_device_context_draw_bitmap(struct d2d_device_context *context, ID2D1Bitmap *bitmap, const D2D1_RECT_F *dst_rect, float opacity, D2D1_INTERPOLATION_MODE interpolation_mode, - const D2D1_RECT_F *src_rect, const D2D1_MATRIX_4X4_F *perspective_transform) + const D2D1_RECT_F *src_rect, const D2D1_POINT_2F *offset, + const D2D1_MATRIX_4X4_F *perspective_transform) { D2D1_BITMAP_BRUSH_PROPERTIES1 bitmap_brush_desc; D2D1_BRUSH_PROPERTIES brush_desc; @@ -1102,6 +1103,14 @@ static void d2d_device_context_draw_bitmap(struct d2d_device_context *context, I d.bottom = s.bottom - s.top; } + if (offset) + { + d.left += offset->x; + d.top += offset->y; + d.right += offset->x; + d.bottom += offset->y; + } + bitmap_brush_desc.extendModeX = D2D1_EXTEND_MODE_CLAMP; bitmap_brush_desc.extendModeY = D2D1_EXTEND_MODE_CLAMP; bitmap_brush_desc.interpolationMode = interpolation_mode; @@ -1141,7 +1150,7 @@ static void STDMETHODCALLTYPE d2d_device_context_DrawBitmap(ID2D1DeviceContext * } d2d_device_context_draw_bitmap(context, bitmap, dst_rect, opacity, d2d1_1_interp_mode_from_d2d1(interpolation_mode), - src_rect, NULL); + src_rect, NULL, NULL); } static void STDMETHODCALLTYPE d2d_device_context_DrawText(ID2D1DeviceContext *iface, @@ -2211,9 +2220,26 @@ static void STDMETHODCALLTYPE d2d_device_context_DrawImage(ID2D1DeviceContext *i const D2D1_POINT_2F *target_offset, const D2D1_RECT_F *image_rect, D2D1_INTERPOLATION_MODE interpolation_mode, D2D1_COMPOSITE_MODE composite_mode) { - FIXME("iface %p, image %p, target_offset %s, image_rect %s, interpolation_mode %#x, composite_mode %#x stub!\n", + struct d2d_device_context *context = impl_from_ID2D1DeviceContext(iface); + ID2D1Bitmap *bitmap; + + TRACE("iface %p, image %p, target_offset %s, image_rect %s, interpolation_mode %#x, composite_mode %#x.\n", iface, image, debug_d2d_point_2f(target_offset), debug_d2d_rect_f(image_rect), interpolation_mode, composite_mode); + + if (composite_mode != D2D1_COMPOSITE_MODE_SOURCE_OVER) + FIXME("Unhandled composite mode %#x.\n", composite_mode); + + if (SUCCEEDED(ID2D1Image_QueryInterface(image, &IID_ID2D1Bitmap, (void **)&bitmap))) + { + d2d_device_context_draw_bitmap(context, bitmap, NULL, 1.0f, d2d1_1_interp_mode_from_d2d1(interpolation_mode), + image_rect, target_offset, NULL); + + ID2D1Bitmap_Release(bitmap); + return; + } + + FIXME("Unhandled image %p.\n", image); } static void STDMETHODCALLTYPE d2d_device_context_DrawGdiMetafile(ID2D1DeviceContext *iface, @@ -2235,7 +2261,7 @@ static void STDMETHODCALLTYPE d2d_device_context_ID2D1DeviceContext_DrawBitmap(I debug_d2d_rect_f(src_rect), perspective_transform); d2d_device_context_draw_bitmap(context, bitmap, dst_rect, opacity, interpolation_mode, src_rect, - perspective_transform); + NULL, perspective_transform); } static void STDMETHODCALLTYPE d2d_device_context_ID2D1DeviceContext_PushLayer(ID2D1DeviceContext *iface, diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 19bb94530c2..8627f5ebef6 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -1746,7 +1746,84 @@ static void test_bitmap_brush(void) hr = ID2D1Bitmap_QueryInterface(bitmap, &IID_ID2D1Image, (void **)&image); ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Vista */, "Failed to get ID2D1Image, hr %#x.\n", hr); if (hr == S_OK) - ID2D1Image_Release(image); + { + ID2D1DeviceContext *context; + D2D1_POINT_2F offset; + D2D1_RECT_F src_rect; + + hr = ID2D1RenderTarget_QueryInterface(rt, &IID_ID2D1DeviceContext, (void **)&context); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + ID2D1RenderTarget_BeginDraw(rt); + set_color(&color, 0.0f, 0.0f, 1.0f, 1.0f); + ID2D1RenderTarget_Clear(rt, &color); + + ID2D1RenderTarget_GetTransform(rt, &tmp_matrix); + set_matrix_identity(&matrix); + translate_matrix(&matrix, 20.0f, 12.0f); + scale_matrix(&matrix, 2.0f, 6.0f); + ID2D1RenderTarget_SetTransform(rt, &matrix); + + /* Crash on Windows 7+ */ + if (0) + { + ID2D1DeviceContext_DrawImage(context, NULL, NULL, NULL, D2D1_BITMAP_INTERPOLATION_MODE_NEAREST_NEIGHBOR, + D2D1_COMPOSITE_MODE_SOURCE_OVER); + } + + ID2D1DeviceContext_DrawImage(context, image, NULL, NULL, D2D1_BITMAP_INTERPOLATION_MODE_NEAREST_NEIGHBOR, + D2D1_COMPOSITE_MODE_SOURCE_OVER); + + set_rect(&src_rect, 0.0f, 0.0f, image_size.width, image_size.height); + + ID2D1DeviceContext_DrawImage(context, image, NULL, &src_rect, D2D1_BITMAP_INTERPOLATION_MODE_NEAREST_NEIGHBOR, + D2D1_COMPOSITE_MODE_SOURCE_OVER); + + offset.x = -1; + offset.y = -1; + ID2D1DeviceContext_DrawImage(context, image, &offset, NULL, D2D1_BITMAP_INTERPOLATION_MODE_NEAREST_NEIGHBOR, + D2D1_COMPOSITE_MODE_SOURCE_OVER); + + offset.x = image_size.width * 2; + offset.y = image_size.height; + ID2D1DeviceContext_DrawImage(context, image, &offset, NULL, D2D1_BITMAP_INTERPOLATION_MODE_NEAREST_NEIGHBOR, + D2D1_COMPOSITE_MODE_SOURCE_OVER); + + offset.x = image_size.width * 3; + set_rect(&src_rect, image_size.width / 2, image_size.height / 2, image_size.width, image_size.height); + ID2D1DeviceContext_DrawImage(context, image, &offset, &src_rect, D2D1_BITMAP_INTERPOLATION_MODE_NEAREST_NEIGHBOR, + D2D1_COMPOSITE_MODE_SOURCE_OVER); + + offset.x = image_size.width * 4; + set_rect(&src_rect, 0.0f, 0.0f, image_size.width * 2, image_size.height * 2); + ID2D1DeviceContext_DrawImage(context, image, &offset, &src_rect, D2D1_BITMAP_INTERPOLATION_MODE_NEAREST_NEIGHBOR, + D2D1_COMPOSITE_MODE_SOURCE_OVER); + + offset.x = image_size.width * 5; + set_rect(&src_rect, image_size.width, image_size.height, 0.0f, 0.0f); + ID2D1DeviceContext_DrawImage(context, image, &offset, &src_rect, D2D1_BITMAP_INTERPOLATION_MODE_NEAREST_NEIGHBOR, + D2D1_COMPOSITE_MODE_SOURCE_OVER); + + hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr); + match = compare_surface(surface, "95675fbc4a16404c9568d41b14e8f6be64240998"); + ok(match, "Surface does not match.\n"); + + ID2D1RenderTarget_BeginDraw(rt); + + offset.x = image_size.width * 6; + set_rect(&src_rect, 1.0f, 0.0f, 1.0f, image_size.height); + ID2D1DeviceContext_DrawImage(context, image, &offset, &src_rect, D2D1_BITMAP_INTERPOLATION_MODE_NEAREST_NEIGHBOR, + D2D1_COMPOSITE_MODE_SOURCE_OVER); + + hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr); + match = compare_surface(surface, "95675fbc4a16404c9568d41b14e8f6be64240998"); + ok(match, "Surface does not match.\n"); + + ID2D1RenderTarget_SetTransform(rt, &tmp_matrix); + ID2D1DeviceContext_Release(context); + } /* Creating a brush with a NULL bitmap crashes on Vista, but works fine on * Windows 7+. */

1 0

Jactry Zeng : d2d1: Skip empty source rectangle for ID2D1RenderTarget_DrawBitmap().
by Alexandre Julliard 15 Jan '21

15 Jan '21

Module: wine Branch: master Commit: e2a7ee33d09223c9b70879b4da21c871d04c7921 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e2a7ee33d09223c9b70879b4… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Fri Jan 15 22:55:38 2021 +0800 d2d1: Skip empty source rectangle for ID2D1RenderTarget_DrawBitmap(). Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/device.c | 3 +++ dlls/d2d1/tests/d2d1.c | 5 +++++ 2 files changed, 8 insertions(+) diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index b609a2c1e24..e8bc7207a67 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -1087,6 +1087,9 @@ static void d2d_device_context_draw_bitmap(struct d2d_device_context *context, I d2d_rect_intersect(&s, src_rect); } + if (s.left == s.right || s.top == s.bottom) + return; + if (dst_rect) { d = *dst_rect; diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 6e3bc4a51d2..19bb94530c2 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -1835,6 +1835,11 @@ static void test_bitmap_brush(void) /* Invalid interpolation mode. */ ID2D1RenderTarget_BeginDraw(rt); + set_rect(&dst_rect, 4.0f, 8.0f, 8.0f, 12.0f); + set_rect(&src_rect, 0.0f, 1.0f, image_size.width, 1.0f); + ID2D1RenderTarget_DrawBitmap(rt, bitmap, &dst_rect, 1.0f, + D2D1_BITMAP_INTERPOLATION_MODE_NEAREST_NEIGHBOR, &src_rect); + set_rect(&dst_rect, 1.0f, 8.0f, 4.0f, 12.0f); set_rect(&src_rect, 2.0f, 1.0f, 4.0f, 3.0f); ID2D1RenderTarget_DrawBitmap(rt, bitmap, &dst_rect, 1.0f,

1 0

Jactry Zeng : d2d1: Limit source rectangle to the actual size for ID2D1RenderTarget_DrawBitmap().
by Alexandre Julliard 15 Jan '21

15 Jan '21

Module: wine Branch: master Commit: 757ce04917f1f881c42bfad2c7b4b0d3586c174f URL: https://source.winehq.org/git/wine.git/?a=commit;h=757ce04917f1f881c42bfad2… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Fri Jan 15 22:55:37 2021 +0800 d2d1: Limit source rectangle to the actual size for ID2D1RenderTarget_DrawBitmap(). Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/device.c | 18 ++++++------------ dlls/d2d1/tests/d2d1.c | 30 ++++++++++++++++++++++++++++-- 2 files changed, 34 insertions(+), 14 deletions(-) diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index 3c8431ce8f4..b609a2c1e24 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -1072,25 +1072,19 @@ static void d2d_device_context_draw_bitmap(struct d2d_device_context *context, I D2D1_BITMAP_BRUSH_PROPERTIES1 bitmap_brush_desc; D2D1_BRUSH_PROPERTIES brush_desc; struct d2d_brush *brush; + D2D1_SIZE_F size; D2D1_RECT_F s, d; HRESULT hr; if (perspective_transform) FIXME("Perspective transform is ignored.\n"); - if (src_rect) + size = ID2D1Bitmap_GetSize(bitmap); + d2d_rect_set(&s, 0.0f, 0.0f, size.width, size.height); + if (src_rect && src_rect->left <= src_rect->right + && src_rect->top <= src_rect->bottom) { - s = *src_rect; - } - else - { - D2D1_SIZE_F size; - - size = ID2D1Bitmap_GetSize(bitmap); - s.left = 0.0f; - s.top = 0.0f; - s.right = size.width; - s.bottom = size.height; + d2d_rect_intersect(&s, src_rect); } if (dst_rect) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index d571cfe8d15..6e3bc4a51d2 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -1676,6 +1676,7 @@ static void test_bitmap_brush(void) IDXGISwapChain *swapchain; ID2D1BitmapBrush1 *brush1; ID2D1BitmapBrush *brush; + D2D1_SIZE_F image_size; ID2D1RenderTarget *rt; ID3D10Device1 *device; IDXGISurface *surface; @@ -1740,6 +1741,7 @@ static void test_bitmap_brush(void) bitmap_desc.dpiY = 96.0f; hr = ID2D1RenderTarget_CreateBitmap(rt, size, bitmap_data, 4 * sizeof(*bitmap_data), &bitmap_desc, &bitmap); ok(SUCCEEDED(hr), "Failed to create bitmap, hr %#x.\n", hr); + image_size = ID2D1Bitmap_GetSize(bitmap); hr = ID2D1Bitmap_QueryInterface(bitmap, &IID_ID2D1Image, (void **)&image); ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Vista */, "Failed to get ID2D1Image, hr %#x.\n", hr); @@ -1810,12 +1812,24 @@ static void test_bitmap_brush(void) D2D1_BITMAP_INTERPOLATION_MODE_NEAREST_NEIGHBOR, NULL); set_rect(&dst_rect, 0.0f, 8.0f, 4.0f, 12.0f); set_rect(&src_rect, 2.0f, 1.0f, 4.0f, 3.0f); + ID2D1RenderTarget_DrawBitmap(rt, bitmap, &dst_rect, 1.0f, + D2D1_BITMAP_INTERPOLATION_MODE_NEAREST_NEIGHBOR, &src_rect); + set_rect(&dst_rect, 4.0f, 12.0f, 12.0f, 20.0f); + set_rect(&src_rect, 0.0f, 0.0f, image_size.width * 2, image_size.height * 2); + ID2D1RenderTarget_DrawBitmap(rt, bitmap, &dst_rect, 1.0f, + D2D1_BITMAP_INTERPOLATION_MODE_NEAREST_NEIGHBOR, &src_rect); + set_rect(&dst_rect, 4.0f, 8.0f, 12.0f, 12.0f); + set_rect(&src_rect, image_size.width / 2, image_size.height / 2, image_size.width, image_size.height); + ID2D1RenderTarget_DrawBitmap(rt, bitmap, &dst_rect, 1.0f, + D2D1_BITMAP_INTERPOLATION_MODE_NEAREST_NEIGHBOR, &src_rect); + set_rect(&dst_rect, 0.0f, 4.0f, 4.0f, 8.0f); + set_rect(&src_rect, image_size.width, 0.0f, 0.0f, image_size.height); ID2D1RenderTarget_DrawBitmap(rt, bitmap, &dst_rect, 1.0f, D2D1_BITMAP_INTERPOLATION_MODE_NEAREST_NEIGHBOR, &src_rect); hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL); ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr); - match = compare_surface(surface, "9437f4447d98feaad41a1c4202ee90aadc718ee6"); + match = compare_surface(surface, "f5d039c280fa33ba05496c9883192a34108efbbe"); ok(match, "Surface does not match.\n"); /* Invalid interpolation mode. */ @@ -1828,7 +1842,19 @@ static void test_bitmap_brush(void) hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL); ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); - match = compare_surface(surface, "9437f4447d98feaad41a1c4202ee90aadc718ee6"); + match = compare_surface(surface, "f5d039c280fa33ba05496c9883192a34108efbbe"); + ok(match, "Surface does not match.\n"); + + ID2D1RenderTarget_BeginDraw(rt); + ID2D1RenderTarget_Clear(rt, &color); + + set_rect(&src_rect, image_size.width, 0.0f, 0.0f, image_size.height); + ID2D1RenderTarget_DrawBitmap(rt, bitmap, NULL, 1.0f, + D2D1_BITMAP_INTERPOLATION_MODE_NEAREST_NEIGHBOR, &src_rect); + + hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr); + match = compare_surface(surface, "59043096393570ad800dbcbfdd644394b79493bd"); ok(match, "Surface does not match.\n"); ID2D1RenderTarget_BeginDraw(rt);

1 0

Biswapriyo Nath : propkey.h: Added more PROPERTYKEY declarations.
by Alexandre Julliard 15 Jan '21

15 Jan '21

Module: wine Branch: master Commit: c2d78a43674043595c51269e8c9e3caac76e2b0d URL: https://source.winehq.org/git/wine.git/?a=commit;h=c2d78a43674043595c51269e… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Thu Dec 31 12:42:51 2020 +0530 propkey.h: Added more PROPERTYKEY declarations. Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/propkey.h | 310 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 310 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c2d78a43674043595c51…

1 0

Dmitry Timoshkov : shell32: Return S_OK from IShellLink::SetFlags() stub.
by Alexandre Julliard 15 Jan '21

15 Jan '21

Module: wine Branch: master Commit: 7690a91a736bf84822b24a296da1853ef055c20b URL: https://source.winehq.org/git/wine.git/?a=commit;h=7690a91a736bf84822b24a29… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Dec 22 17:38:00 2020 +0300 shell32: Return S_OK from IShellLink::SetFlags() stub. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shelllink.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/shelllink.c b/dlls/shell32/shelllink.c index 5b044d4be1d..46d9bc994ff 100644 --- a/dlls/shell32/shelllink.c +++ b/dlls/shell32/shelllink.c @@ -2297,7 +2297,7 @@ static HRESULT WINAPI ShellLink_SetFlags( IShellLinkDataList* iface, DWORD dwFlags ) { FIXME("(%p)->(%u): stub\n", iface, dwFlags); - return E_NOTIMPL; + return S_OK; } static const IShellLinkDataListVtbl dlvt =

1 0

Alexandre Julliard : msvcrt: Fix some spec file discrepancies.
by Alexandre Julliard 15 Jan '21

15 Jan '21

Module: wine Branch: master Commit: dda104587bf734f2bbaf6c4b075d32ab6a0bb8c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dda104587bf734f2bbaf6c4b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 15 17:05:55 2021 +0100 msvcrt: Fix some spec file discrepancies. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr100/msvcr100.spec | 6 +++--- dlls/msvcr110/msvcr110.spec | 10 +++++----- dlls/msvcr120/msvcr120.spec | 6 +++--- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcr70/msvcr70.spec | 4 ++-- dlls/msvcr71/msvcr71.spec | 6 +++--- dlls/msvcr80/msvcr80.spec | 6 +++--- dlls/msvcr90/msvcr90.spec | 6 +++--- dlls/msvcrt/msvcrt.spec | 4 ++-- dlls/msvcrtd/msvcrtd.spec | 2 +- dlls/ucrtbase/ucrtbase.spec | 8 ++++---- 11 files changed, 30 insertions(+), 30 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 4e981ca8718..b15a6219c52 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -657,7 +657,7 @@ @ extern __setlc_active MSVCRT___setlc_active @ cdecl __setusermatherr(ptr) @ cdecl __strncnt(str long) -@ varargs __swprintf_l(ptr wstr ptr) +@ varargs __swprintf_l(ptr wstr ptr) @ cdecl __sys_errlist() @ cdecl __sys_nerr() @ cdecl __threadhandle() kernel32.GetCurrentThread @@ -870,7 +870,7 @@ @ varargs _fwscanf_l(ptr wstr ptr) @ varargs _fwscanf_s_l(ptr wstr ptr) @ cdecl _gcvt(double long str) -@ cdecl _gcvt_s(ptr long double long) +@ cdecl _gcvt_s(ptr long double long) @ cdecl _get_current_locale() @ cdecl _get_daylight(ptr) @ cdecl _get_doserrno(ptr) @@ -903,7 +903,7 @@ @ cdecl _getdrives() kernel32.GetLogicalDrives @ cdecl _getmaxstdio() @ cdecl _getmbcp() -@ cdecl _getpid() _getpid +@ cdecl _getpid() @ cdecl _getptd() @ stub _getsystime(ptr) @ cdecl _getw(ptr) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 5aef5e3739f..c4782b5977b 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1005,7 +1005,7 @@ @ extern __setlc_active MSVCRT___setlc_active @ cdecl __setusermatherr(ptr) @ cdecl __strncnt(str long) -@ varargs __swprintf_l(ptr wstr ptr) +@ varargs __swprintf_l(ptr wstr ptr) @ cdecl __sys_errlist() @ cdecl __sys_nerr() @ cdecl __threadhandle() kernel32.GetCurrentThread @@ -1217,7 +1217,7 @@ @ varargs _fwscanf_l(ptr wstr ptr) @ varargs _fwscanf_s_l(ptr wstr ptr) @ cdecl _gcvt(double long str) -@ cdecl _gcvt_s(ptr long double long) +@ cdecl _gcvt_s(ptr long double long) @ cdecl _get_current_locale() @ cdecl _get_daylight(ptr) @ cdecl _get_doserrno(ptr) @@ -1249,7 +1249,7 @@ @ cdecl _getdrives() kernel32.GetLogicalDrives @ cdecl _getmaxstdio() @ cdecl _getmbcp() -@ cdecl _getpid() _getpid +@ cdecl _getpid() @ cdecl _getptd() @ stub _getsystime(ptr) @ cdecl _getw(ptr) @@ -1340,9 +1340,9 @@ @ cdecl _ismbcl2_l(long ptr) @ cdecl _ismbclegal(long) @ cdecl _ismbclegal_l(long ptr) -@ stub _ismbclower(long) +@ cdecl _ismbclower(long) @ cdecl _ismbclower_l(long ptr) -@ stub _ismbcprint(long) +@ cdecl _ismbcprint(long) @ cdecl _ismbcprint_l(long ptr) @ cdecl _ismbcpunct(long) @ cdecl _ismbcpunct_l(long ptr) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 50cb4377fb5..b8ba61a2e8c 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1217,7 +1217,7 @@ @ varargs _fwscanf_l(ptr wstr ptr) @ varargs _fwscanf_s_l(ptr wstr ptr) @ cdecl _gcvt(double long str) -@ cdecl _gcvt_s(ptr long double long) +@ cdecl _gcvt_s(ptr long double long) @ cdecl _get_current_locale() @ cdecl _get_daylight(ptr) @ cdecl _get_doserrno(ptr) @@ -1249,7 +1249,7 @@ @ cdecl _getdrives() kernel32.GetLogicalDrives @ cdecl _getmaxstdio() @ cdecl _getmbcp() -@ cdecl _getpid() _getpid +@ cdecl _getpid() @ cdecl _getptd() @ stub _getsystime(ptr) @ cdecl _getw(ptr) @@ -1345,7 +1345,7 @@ @ cdecl _ismbcl2_l(long ptr) @ cdecl _ismbclegal(long) @ cdecl _ismbclegal_l(long ptr) -@ stub _ismbclower(long) +@ cdecl _ismbclower(long) @ cdecl _ismbclower_l(long ptr) @ cdecl _ismbcprint(long) @ cdecl _ismbcprint_l(long ptr) diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 144eb39ac29..b99bb2ee614 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1145,7 +1145,7 @@ @ varargs _fwscanf_l(ptr wstr ptr) msvcr120._fwscanf_l @ varargs _fwscanf_s_l(ptr wstr ptr) msvcr120._fwscanf_s_l @ cdecl _gcvt(double long str) msvcr120._gcvt -@ cdecl _gcvt_s(ptr long double long) msvcr120._gcvt_s +@ cdecl _gcvt_s(ptr long double long) msvcr120._gcvt_s @ cdecl _get_current_locale() msvcr120._get_current_locale @ cdecl _get_daylight(ptr) msvcr120._get_daylight @ cdecl _get_doserrno(ptr) msvcr120._get_doserrno diff --git a/dlls/msvcr70/msvcr70.spec b/dlls/msvcr70/msvcr70.spec index 07b1bb7298d..bdf94e26226 100644 --- a/dlls/msvcr70/msvcr70.spec +++ b/dlls/msvcr70/msvcr70.spec @@ -342,7 +342,7 @@ @ cdecl _getdrives() kernel32.GetLogicalDrives @ cdecl _getmaxstdio() @ cdecl _getmbcp() -@ cdecl _getpid() _getpid +@ cdecl _getpid() @ stub _getsystime(ptr) @ cdecl _getw(ptr) @ cdecl _getwch() @@ -421,7 +421,7 @@ @ cdecl _mbbtombc(long) @ cdecl _mbbtype(long long) # extern _mbcasemap -@ cdecl _mbccpy(ptr str) +@ cdecl _mbccpy(ptr ptr) @ cdecl _mbcjistojms(long) @ cdecl _mbcjmstojis(long) @ cdecl _mbclen(ptr) diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec index b3231c0be45..98d35a337df 100644 --- a/dlls/msvcr71/msvcr71.spec +++ b/dlls/msvcr71/msvcr71.spec @@ -230,7 +230,7 @@ @ cdecl _amsg_exit(long) @ cdecl _assert(str str long) @ cdecl _atodbl(ptr str) -@ cdecl -ret64 _atoi64(str) ntdll._atoi64 +@ cdecl -ret64 _atoi64(str) @ cdecl _atoldbl(ptr str) @ cdecl _beep(long long) @ cdecl _beginthread(ptr long ptr) @@ -337,7 +337,7 @@ @ cdecl _getdrives() kernel32.GetLogicalDrives @ cdecl _getmaxstdio() @ cdecl _getmbcp() -@ cdecl _getpid() _getpid +@ cdecl _getpid() @ stub _getsystime(ptr) @ cdecl _getw(ptr) @ cdecl _getwch() @@ -416,7 +416,7 @@ @ cdecl _mbbtombc(long) @ cdecl _mbbtype(long long) # extern _mbcasemap -@ cdecl _mbccpy(ptr str) +@ cdecl _mbccpy(ptr ptr) @ cdecl _mbcjistojms(long) @ cdecl _mbcjmstojis(long) @ cdecl _mbclen(ptr) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 187aeabca6d..ddca7ed9ff7 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -306,7 +306,7 @@ @ extern __setlc_active MSVCRT___setlc_active @ cdecl __setusermatherr(ptr) @ cdecl __strncnt(str long) -@ varargs __swprintf_l(ptr wstr ptr) +@ varargs __swprintf_l(ptr wstr ptr) @ cdecl __sys_errlist() @ cdecl __sys_nerr() @ cdecl __threadhandle() kernel32.GetCurrentThread @@ -536,7 +536,7 @@ @ varargs _fwscanf_l(ptr wstr ptr) @ varargs _fwscanf_s_l(ptr wstr ptr) @ cdecl _gcvt(double long str) -@ cdecl _gcvt_s(ptr long double long) +@ cdecl _gcvt_s(ptr long double long) @ stub _get_amblksiz @ cdecl _get_current_locale() @ cdecl _get_daylight(ptr) @@ -576,7 +576,7 @@ @ cdecl _getdrives() kernel32.GetLogicalDrives @ cdecl _getmaxstdio() @ cdecl _getmbcp() -@ cdecl _getpid() _getpid +@ cdecl _getpid() @ cdecl _getptd() @ stub _getsystime(ptr) @ cdecl _getw(ptr) diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 9f8a3ba8877..5e35ded3570 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -290,7 +290,7 @@ @ extern __setlc_active MSVCRT___setlc_active @ cdecl __setusermatherr(ptr) @ cdecl __strncnt(str long) -@ varargs __swprintf_l(ptr wstr ptr) +@ varargs __swprintf_l(ptr wstr ptr) @ cdecl __sys_errlist() @ cdecl __sys_nerr() @ cdecl __threadhandle() kernel32.GetCurrentThread @@ -519,7 +519,7 @@ @ varargs _fwscanf_l(ptr wstr ptr) @ varargs _fwscanf_s_l(ptr wstr ptr) @ cdecl _gcvt(double long str) -@ cdecl _gcvt_s(ptr long double long) +@ cdecl _gcvt_s(ptr long double long) @ stub _get_amblksiz @ cdecl _get_current_locale() @ cdecl _get_daylight(ptr) @@ -554,7 +554,7 @@ @ cdecl _getdrives() kernel32.GetLogicalDrives @ cdecl _getmaxstdio() @ cdecl _getmbcp() -@ cdecl _getpid() _getpid +@ cdecl _getpid() @ cdecl _getptd() @ stub _getsystime(ptr) @ cdecl _getw(ptr) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index c40510a4889..f80c0af6700 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -500,7 +500,7 @@ @ varargs _fwscanf_l(ptr wstr ptr) @ varargs _fwscanf_s_l(ptr wstr ptr) @ cdecl _gcvt(double long str) -@ cdecl _gcvt_s(ptr long double long) +@ cdecl _gcvt_s(ptr long double long) @ cdecl _get_current_locale() @ cdecl _get_doserrno(ptr) @ cdecl _get_environ(ptr) @@ -532,7 +532,7 @@ @ cdecl _getdrives() kernel32.GetLogicalDrives @ cdecl _getmaxstdio() @ cdecl _getmbcp() -@ cdecl _getpid() _getpid +@ cdecl _getpid() @ stub _getsystime(ptr) @ cdecl _getw(ptr) @ cdecl _getwch() diff --git a/dlls/msvcrtd/msvcrtd.spec b/dlls/msvcrtd/msvcrtd.spec index 9c78b3ba389..7162e5168a4 100644 --- a/dlls/msvcrtd/msvcrtd.spec +++ b/dlls/msvcrtd/msvcrtd.spec @@ -552,7 +552,7 @@ @ cdecl _unlock(long) @ cdecl -arch=win32 _utime(str ptr) _utime32 @ cdecl -arch=win64 _utime(str ptr) _utime64 -@ cdecl _vsnprintf(ptr long str ptr) +@ cdecl -norelay _vsnprintf(ptr long str ptr) @ cdecl _vsnwprintf(ptr long wstr ptr) @ cdecl _waccess(wstr long) @ cdecl _wasctime(ptr) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 2a4a77865a8..b1d6cf992b4 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -394,7 +394,7 @@ @ cdecl _getdrives() kernel32.GetLogicalDrives @ cdecl _getmaxstdio() @ cdecl _getmbcp() -@ cdecl _getpid() _getpid +@ cdecl _getpid() @ stub _getsystime(ptr) @ cdecl _getw(ptr) @ cdecl _getwc_nolock(ptr) _fgetwc_nolock @@ -484,7 +484,7 @@ @ cdecl _ismbcl2_l(long ptr) @ cdecl _ismbclegal(long) @ cdecl _ismbclegal_l(long ptr) -@ stub _ismbclower(long) +@ cdecl _ismbclower(long) @ cdecl _ismbclower_l(long ptr) @ cdecl _ismbcprint(long) @ cdecl _ismbcprint_l(long ptr) @@ -623,7 +623,7 @@ @ cdecl _mbscspn_l(str str ptr) @ cdecl _mbsdec(ptr ptr) @ stub _mbsdec_l -@ stub _mbsdup(str) +@ cdecl _mbsdup(str) _strdup @ cdecl _mbsicmp(str str) @ stub _mbsicmp_l @ cdecl _mbsicoll(str str) @@ -2425,7 +2425,7 @@ @ cdecl memcpy(ptr ptr long) @ cdecl memcpy_s(ptr long ptr long) @ cdecl memmove(ptr ptr long) -@ cdecl memmove_s(ptr long ptr long) memmove_s +@ cdecl memmove_s(ptr long ptr long) @ cdecl memset(ptr long long) @ cdecl modf(double ptr) @ cdecl -arch=!i386 modff(float ptr)

1 0

Alexandre Julliard : msvcrt: Implement pwctype() functions.
by Alexandre Julliard 15 Jan '21

15 Jan '21

Module: wine Branch: master Commit: 52a1737fc012554e81b8a931b879c60757029ea4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=52a1737fc012554e81b8a931… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 15 17:04:34 2021 +0100 msvcrt: Implement pwctype() functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-locale-l1-1-0.spec | 2 +- dlls/msvcr100/msvcr100.spec | 4 ++-- dlls/msvcr110/msvcr110.spec | 4 ++-- dlls/msvcr120/msvcr120.spec | 4 ++-- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcr70/msvcr70.spec | 4 ++-- dlls/msvcr71/msvcr71.spec | 4 ++-- dlls/msvcr80/msvcr80.spec | 4 ++-- dlls/msvcr90/msvcr90.spec | 4 ++-- dlls/msvcrt/ctype.c | 16 ++++++++++++++++ dlls/msvcrt/msvcrt.spec | 4 ++-- dlls/msvcrt20/msvcrt20.spec | 2 +- dlls/msvcrt40/msvcrt40.spec | 2 +- dlls/msvcrtd/msvcrtd.spec | 3 ++- dlls/ucrtbase/ucrtbase.spec | 2 +- 15 files changed, 39 insertions(+), 22 deletions(-) diff --git a/dlls/api-ms-win-crt-locale-l1-1-0/api-ms-win-crt-locale-l1-1-0.spec b/dlls/api-ms-win-crt-locale-l1-1-0/api-ms-win-crt-locale-l1-1-0.spec index 12bbbe6133c..dc2ec272202 100644 --- a/dlls/api-ms-win-crt-locale-l1-1-0/api-ms-win-crt-locale-l1-1-0.spec +++ b/dlls/api-ms-win-crt-locale-l1-1-0/api-ms-win-crt-locale-l1-1-0.spec @@ -5,7 +5,7 @@ @ cdecl ___mb_cur_max_l_func(ptr) ucrtbase.___mb_cur_max_l_func @ cdecl __initialize_lconv_for_unsigned_char() ucrtbase.__initialize_lconv_for_unsigned_char @ cdecl __pctype_func() ucrtbase.__pctype_func -@ stub __pwctype_func +@ cdecl __pwctype_func() ucrtbase.__pwctype_func @ cdecl _configthreadlocale(long) ucrtbase._configthreadlocale @ cdecl _create_locale(long str) ucrtbase._create_locale @ cdecl _free_locale(ptr) ucrtbase._free_locale diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 2d2bc0d8db4..4e981ca8718 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -641,7 +641,7 @@ @ cdecl __p__mbctype() @ cdecl __p__pctype() @ cdecl __p__pgmptr() -@ stub __p__pwctype() +@ cdecl __p__pwctype() @ cdecl __p__timezone() @ cdecl __p__tzname() @ cdecl __p__wcmdln() @@ -649,7 +649,7 @@ @ cdecl __p__wpgmptr() @ cdecl __pctype_func() @ extern __pioinfo MSVCRT___pioinfo -@ stub __pwctype_func +@ cdecl __pwctype_func() @ cdecl __pxcptinfoptrs() @ stub __report_gsfailure @ cdecl __set_app_type(long) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index e46208d84c0..5aef5e3739f 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -990,7 +990,7 @@ @ cdecl __p__mbctype() @ cdecl __p__pctype() @ cdecl __p__pgmptr() -@ stub __p__pwctype() +@ cdecl __p__pwctype() @ cdecl __p__timezone() @ cdecl __p__tzname() @ cdecl __p__wcmdln() @@ -998,7 +998,7 @@ @ cdecl __p__wpgmptr() @ cdecl __pctype_func() @ extern __pioinfo MSVCRT___pioinfo -@ stub __pwctype_func +@ cdecl __pwctype_func() @ cdecl __pxcptinfoptrs() @ stub __report_gsfailure @ cdecl __set_app_type(long) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 962ebeb96c8..50cb4377fb5 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -980,7 +980,7 @@ @ cdecl __p__mbctype() @ cdecl __p__pctype() @ cdecl __p__pgmptr() -@ stub __p__pwctype() +@ cdecl __p__pwctype() @ cdecl __p__timezone() @ cdecl __p__tzname() @ cdecl __p__wcmdln() @@ -988,7 +988,7 @@ @ cdecl __p__wpgmptr() @ cdecl __pctype_func() @ extern __pioinfo MSVCRT___pioinfo -@ stub __pwctype_func +@ cdecl __pwctype_func() @ cdecl __pxcptinfoptrs() @ stub __report_gsfailure @ cdecl __set_app_type(long) diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index d8c424100a9..144eb39ac29 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -960,7 +960,7 @@ @ cdecl __p__wpgmptr() msvcr120.__p__wpgmptr @ cdecl __pctype_func() msvcr120.__pctype_func @ extern __pioinfo msvcr120.__pioinfo -@ stub __pwctype_func +@ cdecl __pwctype_func() msvcr120.__pwctype_func @ cdecl __pxcptinfoptrs() msvcr120.__pxcptinfoptrs @ stub __report_gsfailure @ extern __setlc_active msvcr120.__setlc_active diff --git a/dlls/msvcr70/msvcr70.spec b/dlls/msvcr70/msvcr70.spec index 53c6c27cc12..07b1bb7298d 100644 --- a/dlls/msvcr70/msvcr70.spec +++ b/dlls/msvcr70/msvcr70.spec @@ -181,7 +181,7 @@ @ cdecl __p__osver() @ cdecl __p__pctype() @ cdecl __p__pgmptr() -@ stub __p__pwctype() +@ cdecl __p__pwctype() @ cdecl __p__timezone() @ cdecl __p__tzname() @ cdecl __p__wcmdln() @@ -192,7 +192,7 @@ @ cdecl __p__wpgmptr() @ cdecl __pctype_func() @ extern __pioinfo MSVCRT___pioinfo -@ stub __pwctype_func +@ cdecl __pwctype_func() @ cdecl __pxcptinfoptrs() @ cdecl __security_error_handler(long ptr) @ cdecl __set_app_type(long) diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec index 2bfdc16f0ba..b3231c0be45 100644 --- a/dlls/msvcr71/msvcr71.spec +++ b/dlls/msvcr71/msvcr71.spec @@ -176,7 +176,7 @@ @ cdecl __p__osver() @ cdecl __p__pctype() @ cdecl __p__pgmptr() -@ stub __p__pwctype() +@ cdecl __p__pwctype() @ cdecl __p__timezone() @ cdecl __p__tzname() @ cdecl __p__wcmdln() @@ -187,7 +187,7 @@ @ cdecl __p__wpgmptr() @ cdecl __pctype_func() @ extern __pioinfo MSVCRT___pioinfo -@ stub __pwctype_func +@ cdecl __pwctype_func() @ cdecl __pxcptinfoptrs() @ cdecl __security_error_handler(long ptr) @ cdecl __set_app_type(long) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index b14f0c7fee1..187aeabca6d 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -287,7 +287,7 @@ @ cdecl __p__osver() @ cdecl __p__pctype() @ cdecl __p__pgmptr() -@ stub __p__pwctype() +@ cdecl __p__pwctype() @ cdecl __p__timezone() @ cdecl __p__tzname() @ cdecl __p__wcmdln() @@ -298,7 +298,7 @@ @ cdecl __p__wpgmptr() @ cdecl __pctype_func() @ extern __pioinfo MSVCRT___pioinfo -@ stub __pwctype_func +@ cdecl __pwctype_func() @ cdecl __pxcptinfoptrs() @ stub __report_gsfailure @ cdecl __set_app_type(long) diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 9aa743910ce..9f8a3ba8877 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -274,7 +274,7 @@ @ cdecl __p__mbctype() @ cdecl __p__pctype() @ cdecl __p__pgmptr() -@ stub __p__pwctype() +@ cdecl __p__pwctype() @ cdecl __p__timezone() @ cdecl __p__tzname() @ cdecl __p__wcmdln() @@ -282,7 +282,7 @@ @ cdecl __p__wpgmptr() @ cdecl __pctype_func() @ extern __pioinfo MSVCRT___pioinfo -@ stub __pwctype_func +@ cdecl __pwctype_func() @ cdecl __pxcptinfoptrs() @ stub __report_gsfailure @ cdecl __set_app_type(long) diff --git a/dlls/msvcrt/ctype.c b/dlls/msvcrt/ctype.c index 7fc778eca4a..7cfba52c9f4 100644 --- a/dlls/msvcrt/ctype.c +++ b/dlls/msvcrt/ctype.c @@ -143,6 +143,22 @@ const unsigned short* CDECL __pctype_func(void) return get_locinfo()->pctype; } +/********************************************************************* + * __p__pwctype (MSVCRT.@) + */ +unsigned short** CDECL __p__pwctype(void) +{ + return &MSVCRT__pwctype; +} + +/********************************************************************* + * __pwctype_func (MSVCRT.@) + */ +const unsigned short* CDECL __pwctype_func(void) +{ + return MSVCRT__pwctype; +} + /********************************************************************* * _isctype_l (MSVCRT.@) */ diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 51195429088..c40510a4889 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -265,7 +265,7 @@ @ cdecl -arch=i386 __p__osver() @ cdecl -arch=i386 __p__pctype() @ cdecl -arch=i386 __p__pgmptr() -@ stub -arch=i386 __p__pwctype() +@ cdecl -arch=i386 __p__pwctype() @ cdecl -arch=i386 __p__timezone() @ cdecl -arch=i386 __p__tzname() @ cdecl -arch=i386 __p__wcmdln() @@ -276,7 +276,7 @@ @ cdecl -arch=i386 __p__wpgmptr() @ cdecl __pctype_func() @ extern __pioinfo MSVCRT___pioinfo -# stub __pwctype_func() +@ cdecl __pwctype_func() @ cdecl __pxcptinfoptrs() @ cdecl __set_app_type(long) @ extern __setlc_active MSVCRT___setlc_active diff --git a/dlls/msvcrt20/msvcrt20.spec b/dlls/msvcrt20/msvcrt20.spec index 907d3ffed6e..7e2ec304979 100644 --- a/dlls/msvcrt20/msvcrt20.spec +++ b/dlls/msvcrt20/msvcrt20.spec @@ -825,7 +825,7 @@ @ cdecl -arch=i386 __p__osver() msvcrt.__p__osver @ cdecl -arch=i386 __p__pctype() msvcrt.__p__pctype @ cdecl -arch=i386 __p__pgmptr() msvcrt.__p__pgmptr -@ cdecl __p__pwctype() msvcrt.__p__pwctype +@ cdecl -arch=i386 __p__pwctype() msvcrt.__p__pwctype @ cdecl -arch=i386 __p__timezone() msvcrt.__p__timezone @ cdecl -arch=i386 __p__tzname() msvcrt.__p__tzname @ cdecl -arch=i386 __p__wcmdln() msvcrt.__p__wcmdln diff --git a/dlls/msvcrt40/msvcrt40.spec b/dlls/msvcrt40/msvcrt40.spec index 9e25f4f2bc1..ebcf5df4fc3 100644 --- a/dlls/msvcrt40/msvcrt40.spec +++ b/dlls/msvcrt40/msvcrt40.spec @@ -904,7 +904,7 @@ @ cdecl -arch=i386 __p__osver() msvcrt.__p__osver @ cdecl -arch=i386 __p__pctype() msvcrt.__p__pctype @ cdecl -arch=i386 __p__pgmptr() msvcrt.__p__pgmptr -@ cdecl __p__pwctype() msvcrt.__p__pwctype +@ cdecl -arch=i386 __p__pwctype() msvcrt.__p__pwctype @ cdecl -arch=i386 __p__timezone() msvcrt.__p__timezone @ cdecl -arch=i386 __p__tzname() msvcrt.__p__tzname @ cdecl -arch=i386 __p__wcmdln() msvcrt.__p__wcmdln diff --git a/dlls/msvcrtd/msvcrtd.spec b/dlls/msvcrtd/msvcrtd.spec index cb29aedfe46..9c78b3ba389 100644 --- a/dlls/msvcrtd/msvcrtd.spec +++ b/dlls/msvcrtd/msvcrtd.spec @@ -173,7 +173,7 @@ @ cdecl __p__osver() @ cdecl __p__pctype() @ cdecl __p__pgmptr() -@ stub __p__pwctype() +@ cdecl __p__pwctype() @ cdecl __p__timezone() @ cdecl __p__tzname() @ cdecl __p__wcmdln() @@ -184,6 +184,7 @@ @ cdecl __p__wpgmptr() @ cdecl __pctype_func() @ extern __pioinfo MSVCRT___pioinfo +@ cdecl __pwctype_func() @ cdecl __pxcptinfoptrs() @ cdecl __set_app_type(long) @ extern __setlc_active MSVCRT___setlc_active diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 2631299d24c..2a4a77865a8 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -136,7 +136,7 @@ @ cdecl __p__wpgmptr() @ cdecl __pctype_func() @ cdecl __processing_throw() -@ stub __pwctype_func +@ cdecl __pwctype_func() @ cdecl __pxcptinfoptrs() @ stub __report_gsfailure @ cdecl __setusermatherr(ptr)

1 0

Alexandre Julliard : msvcrt: Don't export fabsf on x86_64.
by Alexandre Julliard 15 Jan '21

15 Jan '21

Module: wine Branch: master Commit: 5131905771017784a55d2ca099e6cb34544dc539 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5131905771017784a55d2ca0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 15 17:03:10 2021 +0100 msvcrt: Don't export fabsf on x86_64. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcrt/math.c | 28 ++++++++++++++++------------ dlls/msvcrt/msvcrt.spec | 2 +- include/msvcrt/math.h | 8 ++++++-- 6 files changed, 26 insertions(+), 18 deletions(-) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 62e230a8740..e46208d84c0 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -2015,7 +2015,7 @@ @ cdecl exp(double) @ cdecl -arch=!i386 expf(float) @ cdecl fabs(double) -@ cdecl -arch=!i386 fabsf(float) +@ cdecl -arch=arm,arm64 fabsf(float) @ cdecl fclose(ptr) @ cdecl feof(ptr) @ cdecl ferror(ptr) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 509bb59ba43..962ebeb96c8 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2138,7 +2138,7 @@ @ cdecl expm1f(float) @ cdecl expm1l(double) expm1 @ cdecl fabs(double) -@ cdecl -arch=!i386 fabsf(float) +@ cdecl -arch=arm,arm64 fabsf(float) @ cdecl fclose(ptr) @ cdecl fdim(double double) @ cdecl fdimf(float float) diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index f74140c2311..d8c424100a9 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1804,7 +1804,7 @@ @ cdecl expm1f(float) msvcr120.expm1f @ cdecl expm1l(double) msvcr120.expm1l @ cdecl fabs(double) msvcr120.fabs -@ cdecl -arch=!i386 fabsf(float) msvcr120.fabsf +@ cdecl -arch=arm,arm64 fabsf(float) msvcr120.fabsf @ cdecl fclose(ptr) msvcr120.fclose @ cdecl fdim(double double) msvcr120.fdim @ cdecl fdimf(float float) msvcr120.fdimf diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index e6e837e52c6..3aba13d1478 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -713,18 +713,6 @@ float CDECL ceilf( float x ) return unix_funcs->ceilf(x); } -/********************************************************************* - * fabsf (MSVCRT.@) - * - * Copied from musl: src/math/fabsf.c - */ -float CDECL fabsf( float x ) -{ - union { float f; UINT32 i; } u = { x }; - u.i &= 0x7fffffff; - return u.f; -} - /********************************************************************* * floorf (MSVCRT.@) */ @@ -751,6 +739,22 @@ float CDECL modff( float x, float *iptr ) #endif +#if !defined(__i386__) && !defined(__x86_64__) && (_MSVCR_VER == 0 || _MSVCR_VER >= 110) + +/********************************************************************* + * fabsf (MSVCRT.@) + * + * Copied from musl: src/math/fabsf.c + */ +float CDECL fabsf( float x ) +{ + union { float f; UINT32 i; } u = { x }; + u.i &= 0x7fffffff; + return u.f; +} + +#endif + /********************************************************************* * acos (MSVCRT.@) * diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 63fb33ae300..51195429088 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1284,7 +1284,7 @@ @ cdecl exp(double) @ cdecl -arch=!i386 expf(float) @ cdecl fabs(double) -@ cdecl -arch=!i386 fabsf(float) +@ cdecl -arch=arm,arm64 fabsf(float) @ cdecl fclose(ptr) @ cdecl feof(ptr) @ cdecl ferror(ptr) diff --git a/include/msvcrt/math.h b/include/msvcrt/math.h index d4bc140f228..43e82fc3bea 100644 --- a/include/msvcrt/math.h +++ b/include/msvcrt/math.h @@ -133,7 +133,6 @@ _ACRTIMP float __cdecl powf(float, float); _ACRTIMP float __cdecl sqrtf(float); _ACRTIMP float __cdecl ceilf(float); _ACRTIMP float __cdecl floorf(float); -_ACRTIMP float __cdecl fabsf(float); _ACRTIMP float __cdecl frexpf(float, int*); _ACRTIMP float __cdecl modff(float, float*); _ACRTIMP float __cdecl fmodf(float, float); @@ -161,7 +160,6 @@ static inline float powf(float x, float y) { return pow(x, y); } static inline float sqrtf(float x) { return sqrt(x); } static inline float ceilf(float x) { return ceil(x); } static inline float floorf(float x) { return floor(x); } -static inline float fabsf(float x) { return fabs(x); } static inline float frexpf(float x, int *y) { return frexp(x, y); } static inline float modff(float x, float *y) { double yd, ret = modf(x, &yd); *y = yd; return ret; } static inline float fmodf(float x, float y) { return fmod(x, y); } @@ -172,6 +170,12 @@ static inline int _fpclassf(float x) { return _fpclass(x); } #endif +#if !defined(__i386__) && !defined(__x86_64__) && (_MSVCR_VER == 0 || _MSVCR_VER >= 110) +_ACRTIMP float __cdecl fabsf(float); +#else +static inline float fabsf(float x) { return fabs(x); } +#endif + #if !defined(__i386__) || _MSVCR_VER>=120 _ACRTIMP float __cdecl _chgsignf(float);

1 0

Georg Lehmann : winevulkan: Update to VK spec version 1.2.166.
by Alexandre Julliard 15 Jan '21

15 Jan '21

Module: wine Branch: master Commit: 6b2199c3da5609ff0be17384f86f5e191ab81f73 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b2199c3da5609ff0be17384… Author: Georg Lehmann <dadschoorse(a)gmail.com> Date: Fri Jan 15 11:50:05 2021 +0100 winevulkan: Update to VK spec version 1.2.166. Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 2 +- dlls/winevulkan/vulkan_thunks.c | 17 + dlls/winevulkan/winevulkan.json | 2 +- include/wine/vulkan.h | 849 +++++++++++++++++++++------------------- 4 files changed, 458 insertions(+), 412 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6b2199c3da5609ff0be1…

1 0

Georg Lehmann : winevulkan: Skip extensions that require a skipped extension.
by Alexandre Julliard 15 Jan '21

15 Jan '21

Module: wine Branch: master Commit: eb9f3dd3ad07aae3c9588bcff376ed2a7a8ef8d2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eb9f3dd3ad07aae3c9588bcf… Author: Georg Lehmann <dadschoorse(a)gmail.com> Date: Fri Jan 15 11:50:04 2021 +0100 winevulkan: Skip extensions that require a skipped extension. Needed to skip VK_NV_acquire_winrt_display in the next version bump. Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 0ad169d5e78..ce603691d6e 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -91,7 +91,6 @@ UNSUPPORTED_EXTENSIONS = [ # Device extensions "VK_AMD_display_native_hdr", - "VK_EXT_display_control", # Requires VK_EXT_display_surface_counter "VK_EXT_full_screen_exclusive", "VK_EXT_hdr_metadata", # Needs WSI work. "VK_EXT_pipeline_creation_feedback", @@ -2893,6 +2892,7 @@ class VkRegistry(object): extensions = [] exts = root.findall("./extensions/extension") deferred_exts = [] + skipped_exts = UNSUPPORTED_EXTENSIONS.copy() def process_ext(ext, deferred=False): ext_name = ext.attrib["name"] @@ -2907,6 +2907,7 @@ class VkRegistry(object): # Some extensions are not ready or have numbers reserved as a place holder. if ext.attrib["supported"] == "disabled": LOGGER.debug("Skipping disabled extension: {0}".format(ext_name)) + skipped_exts.append(ext_name) return # Defer extensions with 'sortorder' as they are order-dependent for spec-parsing. @@ -2919,6 +2920,7 @@ class VkRegistry(object): # or NV. if "KHX" in ext_name or "NVX" in ext_name: LOGGER.debug("Skipping experimental extension: {0}".format(ext_name)) + skipped_exts.append(ext_name) return # Extensions can define VkEnumValues which alias to provisional extensions. Pre-process @@ -2931,15 +2933,18 @@ class VkRegistry(object): platform = ext.attrib.get("platform") if platform and platform != "win32": LOGGER.debug("Skipping extensions {0} for platform {1}".format(ext_name, platform)) + skipped_exts.append(ext_name) return if not self._is_extension_supported(ext_name): LOGGER.debug("Skipping unsupported extension: {0}".format(ext_name)) + skipped_exts.append(ext_name) return elif "requires" in ext.attrib: # Check if this extension builds on top of another unsupported extension. requires = ext.attrib["requires"].split(",") - if len(set(requires).intersection(UNSUPPORTED_EXTENSIONS)) > 0: + if len(set(requires).intersection(skipped_exts)) > 0: + skipped_exts.append(ext_name) return LOGGER.debug("Loading extension: {0}".format(ext_name))

1 0

← Newer
1
...
34
35
36
37
38
39
40
...
48
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 January 2021