October 2015 - Wine-commits

Tag wine-1.7.52 : Alexandre Julliard : Release 1.7.52
by Alexandre Julliard 02 Oct '15

02 Oct '15

Module: wine Branch: refs/tags/wine-1.7.52 Tag: 87e261cc65d403cb7f692ec76baaa7b57a54679b URL: http://source.winehq.org/git/wine.git/?a=tag;h=87e261cc65d403cb7f692ec76baa… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 2 23:20:05 2015 +0900 Release 1.7.52

1 0

Aric Stewart : maintainers: Add HID section.
by Alexandre Julliard 02 Oct '15

02 Oct '15

Module: wine Branch: master Commit: fb6ad0fe2131b8b716147ac4e32ad7fcd5a4d32b URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb6ad0fe2131b8b716147ac4e… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Oct 1 13:30:51 2015 -0500 maintainers: Add HID section. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> --- MAINTAINERS | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index 98622bd..c40bb68 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -56,6 +56,11 @@ DirectInput P: Andrew Eikum <aeikum(a)codeweavers.com> F: dlls/dinput/ +HID support +M: Aric Stewart <aric(a)codeweavers.com> +F: dlls/hid/ +F: dlls/hidclass.sys/ + HTML rendering (Gecko) M: Jacek Caban <jacek(a)codeweavers.com> F: dlls/mshtml/

1 0

Nikolay Sivov : Update data tables to Unicode 8.0.0.
by Alexandre Julliard 02 Oct '15

02 Oct '15

Module: wine Branch: master Commit: e8c1cf44024d7dd2969bd3d46f9e71e8fe308059 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8c1cf44024d7dd2969bd3d46… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 1 21:55:56 2015 +0300 Update data tables to Unicode 8.0.0. --- dlls/dwrite/analyzer.c | 6 + dlls/dwrite/bracket.c | 2 +- dlls/dwrite/linebreak.c | 128 +++-- dlls/dwrite/mirror.c | 2 +- dlls/dwrite/scripts.c | 1334 ++++++++++++++++++++++---------------------- dlls/dwrite/scripts.h | 256 ++++----- dlls/usp10/bracket.c | 2 +- dlls/usp10/indicsyllable.c | 274 +++++---- dlls/usp10/linebreak.c | 128 +++-- dlls/usp10/mirror.c | 2 +- dlls/usp10/shaping.c | 20 +- libs/wine/casemap.c | 134 ++++- libs/wine/wctype.c | 84 +-- loader/l_intl.nls | Bin 6118 -> 6406 bytes tools/make_unicode | 12 +- 15 files changed, 1249 insertions(+), 1135 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e8c1cf44024d7dd2969bd…

1 0

Stefan Dösinger : d3d8: Accept D3DSWAPEFFECT_COPY_VSYNC.
by Alexandre Julliard 02 Oct '15

02 Oct '15

Module: wine Branch: master Commit: 6b8564d629551e2f5cfd5aeb013a271d76fd2c1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b8564d629551e2f5cfd5aeb0… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Sep 28 21:02:10 2015 +0200 d3d8: Accept D3DSWAPEFFECT_COPY_VSYNC. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> --- dlls/d3d8/device.c | 5 +++-- dlls/d3d8/tests/device.c | 48 ++++++++++++++++++++++++++++-------------------- 2 files changed, 31 insertions(+), 22 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index e899b34..c6e34ef 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -191,13 +191,14 @@ static void present_parameters_from_wined3d_swapchain_desc(D3DPRESENT_PARAMETERS static BOOL wined3d_swapchain_desc_from_present_parameters(struct wined3d_swapchain_desc *swapchain_desc, const D3DPRESENT_PARAMETERS *present_parameters) { - if (!present_parameters->SwapEffect || present_parameters->SwapEffect > D3DSWAPEFFECT_COPY) + if (!present_parameters->SwapEffect || present_parameters->SwapEffect > D3DSWAPEFFECT_COPY_VSYNC) { WARN("Invalid swap effect %u passed.\n", present_parameters->SwapEffect); return FALSE; } if (present_parameters->BackBufferCount > 3 - || (present_parameters->SwapEffect == D3DSWAPEFFECT_COPY + || ((present_parameters->SwapEffect == D3DSWAPEFFECT_COPY + || present_parameters->SwapEffect == D3DSWAPEFFECT_COPY_VSYNC) && present_parameters->BackBufferCount > 1)) { WARN("Invalid backbuffer count %u.\n", present_parameters->BackBufferCount); diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index cb7f5e1..ccc16c6 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -7309,36 +7309,44 @@ static void test_swapchain_parameters(void) tests[] = { /* Swap effect 0 is not allowed. */ - {TRUE, 1, 0, D3DERR_INVALIDCALL}, - {FALSE, 1, 0, D3DERR_INVALIDCALL}, + {TRUE, 1, 0, D3DERR_INVALIDCALL}, + {FALSE, 1, 0, D3DERR_INVALIDCALL}, /* All (non-ex) swap effects are allowed in * windowed and fullscreen mode. */ - {TRUE, 1, D3DSWAPEFFECT_DISCARD, D3D_OK}, - {TRUE, 1, D3DSWAPEFFECT_FLIP, D3D_OK}, - {FALSE, 1, D3DSWAPEFFECT_DISCARD, D3D_OK}, - {FALSE, 1, D3DSWAPEFFECT_FLIP, D3D_OK}, - {FALSE, 1, D3DSWAPEFFECT_COPY, D3D_OK}, + {TRUE, 1, D3DSWAPEFFECT_DISCARD, D3D_OK}, + {TRUE, 1, D3DSWAPEFFECT_FLIP, D3D_OK}, + {FALSE, 1, D3DSWAPEFFECT_DISCARD, D3D_OK}, + {FALSE, 1, D3DSWAPEFFECT_FLIP, D3D_OK}, + {FALSE, 1, D3DSWAPEFFECT_COPY, D3D_OK}, /* Only one backbuffer in copy mode. Reset allows it for * some reason. */ - {TRUE, 0, D3DSWAPEFFECT_COPY, D3D_OK}, - {TRUE, 1, D3DSWAPEFFECT_COPY, D3D_OK}, - {TRUE, 2, D3DSWAPEFFECT_COPY, D3DERR_INVALIDCALL}, - {FALSE, 2, D3DSWAPEFFECT_COPY, D3DERR_INVALIDCALL}, + {TRUE, 0, D3DSWAPEFFECT_COPY, D3D_OK}, + {TRUE, 1, D3DSWAPEFFECT_COPY, D3D_OK}, + {TRUE, 2, D3DSWAPEFFECT_COPY, D3DERR_INVALIDCALL}, + {FALSE, 2, D3DSWAPEFFECT_COPY, D3DERR_INVALIDCALL}, + {TRUE, 0, D3DSWAPEFFECT_COPY_VSYNC, D3D_OK}, + {TRUE, 1, D3DSWAPEFFECT_COPY_VSYNC, D3D_OK}, + {TRUE, 2, D3DSWAPEFFECT_COPY_VSYNC, D3DERR_INVALIDCALL}, + {FALSE, 2, D3DSWAPEFFECT_COPY_VSYNC, D3DERR_INVALIDCALL}, /* Ok with the others, in fullscreen and windowed mode. */ - {TRUE, 2, D3DSWAPEFFECT_DISCARD, D3D_OK}, - {TRUE, 2, D3DSWAPEFFECT_FLIP, D3D_OK}, - {FALSE, 2, D3DSWAPEFFECT_DISCARD, D3D_OK}, - {FALSE, 2, D3DSWAPEFFECT_FLIP, D3D_OK}, + {TRUE, 2, D3DSWAPEFFECT_DISCARD, D3D_OK}, + {TRUE, 2, D3DSWAPEFFECT_FLIP, D3D_OK}, + {FALSE, 2, D3DSWAPEFFECT_DISCARD, D3D_OK}, + {FALSE, 2, D3DSWAPEFFECT_FLIP, D3D_OK}, + + /* Invalid swapeffects. */ + {TRUE, 1, D3DSWAPEFFECT_COPY_VSYNC + 1, D3DERR_INVALIDCALL}, + {FALSE, 1, D3DSWAPEFFECT_COPY_VSYNC + 1, D3DERR_INVALIDCALL}, /* 3 is the highest allowed backbuffer count. */ - {TRUE, 3, D3DSWAPEFFECT_DISCARD, D3D_OK}, - {TRUE, 4, D3DSWAPEFFECT_DISCARD, D3DERR_INVALIDCALL}, - {TRUE, 4, D3DSWAPEFFECT_FLIP, D3DERR_INVALIDCALL}, - {FALSE, 4, D3DSWAPEFFECT_DISCARD, D3DERR_INVALIDCALL}, - {FALSE, 4, D3DSWAPEFFECT_FLIP, D3DERR_INVALIDCALL}, + {TRUE, 3, D3DSWAPEFFECT_DISCARD, D3D_OK}, + {TRUE, 4, D3DSWAPEFFECT_DISCARD, D3DERR_INVALIDCALL}, + {TRUE, 4, D3DSWAPEFFECT_FLIP, D3DERR_INVALIDCALL}, + {FALSE, 4, D3DSWAPEFFECT_DISCARD, D3DERR_INVALIDCALL}, + {FALSE, 4, D3DSWAPEFFECT_FLIP, D3DERR_INVALIDCALL}, }; window = CreateWindowA("static", "d3d8_test", WS_OVERLAPPEDWINDOW,

1 0

Stefan Dösinger : include: Fix two IDirect3DSwapChain9Ex COM Macro names.
by Alexandre Julliard 02 Oct '15

02 Oct '15

Module: wine Branch: master Commit: 20b552b9084ac727817e4073d9adc3f156549f1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=20b552b9084ac727817e4073d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Sep 28 21:02:11 2015 +0200 include: Fix two IDirect3DSwapChain9Ex COM Macro names. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> --- include/d3d9.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/d3d9.h b/include/d3d9.h index 712104b..24d2968 100644 --- a/include/d3d9.h +++ b/include/d3d9.h @@ -494,8 +494,8 @@ __CRT_UUID_DECL(IDirect3DSwapChain9Ex, 0x91886caf, 0x1c3d, 0x4d2e, 0xa0, /*** IDirect3DSwapChain9 methods ***/ #define IDirect3DSwapChain9Ex_Present(p,a,b,c,d,e) (p)->lpVtbl->Present(p,a,b,c,d,e) #define IDirect3DSwapChain9Ex_GetFrontBufferData(p,a) (p)->lpVtbl->GetFrontBufferData(p,a) -#define IDirect3DSwapChain9EX_GetBackBuffer(p,a,b,c) (p)->lpVtbl->GetBackBuffer(p,a,b,c) -#define IDirect3DSwapChain9EX_GetRasterStatus(p,a) (p)->lpVtbl->GetRasterStatus(p,a) +#define IDirect3DSwapChain9Ex_GetBackBuffer(p,a,b,c) (p)->lpVtbl->GetBackBuffer(p,a,b,c) +#define IDirect3DSwapChain9Ex_GetRasterStatus(p,a) (p)->lpVtbl->GetRasterStatus(p,a) #define IDirect3DSwapChain9Ex_GetDisplayMode(p,a) (p)->lpVtbl->GetDisplayMode(p,a) #define IDirect3DSwapChain9Ex_GetDevice(p,a) (p)->lpVtbl->GetDevice(p,a) #define IDirect3DSwapChain9Ex_GetPresentParameters(p,a) (p)->lpVtbl->GetPresentParameters(p,a)

1 0

Stefan Dösinger : wined3d: WINED3DFMT_B5G5R5X1_UNORM doesn't have an alpha channel.
by Alexandre Julliard 02 Oct '15

02 Oct '15

Module: wine Branch: master Commit: a887a87a90cefcd3390e96b9f2d569cdd5def23a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a887a87a90cefcd3390e96b9f… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Sep 30 15:31:14 2015 +0200 wined3d: WINED3DFMT_B5G5R5X1_UNORM doesn't have an alpha channel. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> --- dlls/wined3d/utils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index d31c285..aa6eb62 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1024,7 +1024,7 @@ static const struct wined3d_format_texture_info format_texture_info[] = WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_RENDERTARGET, ARB_ES2_COMPATIBILITY, NULL}, - {WINED3DFMT_B5G5R5X1_UNORM, GL_RGB5, GL_RGB5_A1, 0, + {WINED3DFMT_B5G5R5X1_UNORM, GL_RGB5, GL_RGB5, 0, GL_BGRA, GL_UNSIGNED_SHORT_1_5_5_5_REV, 0, WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING, WINED3D_GL_EXT_NONE, NULL},

1 0

Piotr Caban : msvcr60: Fix _mbscoll implementation.
by Alexandre Julliard 02 Oct '15

02 Oct '15

Module: wine Branch: master Commit: aa612612b759e9041b9c7059a640b02c1cb57de6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa612612b759e9041b9c7059a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Oct 1 18:29:10 2015 +0200 msvcr60: Fix _mbscoll implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/mbcs.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index ea650f4..e7adaad 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -829,7 +829,12 @@ int CDECL _mbsnbicoll(const unsigned char *str1, const unsigned char *str2, MSVC */ int CDECL _mbsicoll(const unsigned char* str, const unsigned char* cmp) { +#if _MSVCR_VER>=60 && _MSVCR_VER<=71 + return CompareStringA(get_mbcinfo()->mblcid, NORM_IGNORECASE, + (const char*)str, -1, (const char*)cmp, -1)-CSTR_EQUAL; +#else return _mbsnbicoll_l(str, cmp, -1, NULL); +#endif } /********************************************************************* @@ -870,7 +875,12 @@ int CDECL _mbsnbcoll(const unsigned char *str1, const unsigned char *str2, MSVCR */ int CDECL _mbscoll(const unsigned char* str, const unsigned char* cmp) { +#if _MSVCR_VER>=60 && _MSVCR_VER<=71 + return CompareStringA(get_mbcinfo()->mblcid, 0, + (const char*)str, -1, (const char*)cmp, -1)-CSTR_EQUAL; +#else return _mbsnbcoll_l(str, cmp, -1, NULL); +#endif } /*********************************************************************

1 0

Piotr Caban : msvcp: Add _Dscale implementation.
by Alexandre Julliard 02 Oct '15

02 Oct '15

Module: wine Branch: master Commit: 643ff988c43e4cb40387a71086f6ad81953491bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=643ff988c43e4cb40387a7108… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Oct 1 18:42:29 2015 +0200 msvcp: Add _Dscale implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp100/msvcp100.spec | 6 ++--- dlls/msvcp110/msvcp110.spec | 6 ++--- dlls/msvcp120/msvcp120.spec | 6 ++--- dlls/msvcp120/tests/msvcp120.c | 54 +++++++++++++++++++++++++++++++++++++ dlls/msvcp120_app/msvcp120_app.spec | 6 ++--- dlls/msvcp60/msvcp60.spec | 6 ++--- dlls/msvcp70/msvcp70.spec | 6 ++--- dlls/msvcp71/msvcp71.spec | 6 ++--- dlls/msvcp80/msvcp80.spec | 6 ++--- dlls/msvcp90/math.c | 14 ++++++++++ dlls/msvcp90/msvcp90.spec | 6 ++--- 11 files changed, 95 insertions(+), 27 deletions(-) diff --git a/dlls/msvcp100/msvcp100.spec b/dlls/msvcp100/msvcp100.spec index 6738979..c5d8fcc 100644 --- a/dlls/msvcp100/msvcp100.spec +++ b/dlls/msvcp100/msvcp100.spec @@ -2891,14 +2891,14 @@ @ stub _Cosh @ extern _Denorm @ stub _Dnorm -@ stub _Dscale +@ cdecl _Dscale(ptr long) @ cdecl _Dtest(ptr) @ extern _Eps @ stub _Exp @ stub _FCosh @ extern _FDenorm @ stub _FDnorm -@ stub _FDscale +@ cdecl _FDscale(ptr long) @ cdecl _FDtest(ptr) @ extern _FEps @ stub _FExp @@ -2919,7 +2919,7 @@ @ extern _Inf @ stub _LCosh @ extern _LDenorm -@ stub _LDscale +@ cdecl _LDscale(ptr long) _Dscale @ cdecl _LDtest(ptr) _Dtest @ extern _LEps @ stub _LExp diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index f571a55..a3776cf 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -3743,7 +3743,7 @@ @ stub _Dint @ stub _Dnorm @ cdecl _Do_call(ptr) -@ stub _Dscale +@ cdecl _Dscale(ptr long) @ stub _Dtento @ cdecl _Dtest(ptr) @ stub _Dunscale @@ -3753,7 +3753,7 @@ @ extern _FDenorm @ stub _FDint @ stub _FDnorm -@ stub _FDscale +@ cdecl _FDscale(ptr long) @ stub _FDtento @ cdecl _FDtest(ptr) @ stub _FDunscale @@ -3789,7 +3789,7 @@ @ stub _LCosh @ extern _LDenorm @ stub _LDint -@ stub _LDscale +@ cdecl _LDscale(ptr long) _Dscale @ stub _LDtento @ cdecl _LDtest(ptr) _Dtest @ stub _LDunscale diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec index 8da3cc7..2b07f13 100644 --- a/dlls/msvcp120/msvcp120.spec +++ b/dlls/msvcp120/msvcp120.spec @@ -3684,7 +3684,7 @@ @ stub _Dint @ stub _Dnorm @ cdecl _Do_call(ptr) -@ stub _Dscale +@ cdecl _Dscale(ptr long) @ stub _Dtento @ cdecl _Dtest(ptr) @ stub _Dunscale @@ -3694,7 +3694,7 @@ @ extern _FDenorm @ stub _FDint @ stub _FDnorm -@ stub _FDscale +@ cdecl _FDscale(ptr long) @ stub _FDtento @ cdecl _FDtest(ptr) @ stub _FDunscale @@ -3732,7 +3732,7 @@ @ stub _LCosh @ extern _LDenorm @ stub _LDint -@ stub _LDscale +@ cdecl _LDscale(ptr long) _Dscale @ stub _LDtento @ cdecl _LDtest(ptr) _Dtest @ stub _LDunscale diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index bf7ed8f..358c408 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -86,6 +86,7 @@ static void (CDECL *p__Call_once)(int *once, void (CDECL *func)(void)); static void (CDECL *p__Call_onceEx)(int *once, void (CDECL *func)(void*), void *argv); static void (CDECL *p__Do_call)(void *this); static short (__cdecl *p__Dtest)(double *d); +static short (__cdecl *p__Dscale)(double *d, int exp); /* filesystem */ static ULONGLONG(__cdecl *p_tr2_sys__File_size)(char const*); @@ -139,6 +140,8 @@ static BOOL init(void) "_Do_call"); SET(p__Dtest, "_Dtest"); + SET(p__Dscale, + "_Dscale"); if(sizeof(void*) == 8) { /* 64-bit initialization */ SET(p_tr2_sys__File_size, "?_File_size(a)sys@tr2(a)std@@YA_KPEBD(a)Z"); @@ -461,6 +464,56 @@ static void test__Dtest(void) ok(ret == FP_NAN, "_Dtest(NAN) returned %x\n", ret); } +static void test__Dscale(void) +{ + double d; + short ret; + + d = 0; + ret = p__Dscale(&d, 0); + ok(d == 0, "d = %f\n", d); + ok(ret == FP_ZERO, "ret = %x\n", ret); + + d = 0; + ret = p__Dscale(&d, 1); + ok(d == 0, "d = %f\n", d); + ok(ret == FP_ZERO, "ret = %x\n", ret); + + d = 0; + ret = p__Dscale(&d, -1); + ok(d == 0, "d = %f\n", d); + ok(ret == FP_ZERO, "ret = %x\n", ret); + + d = 1; + ret = p__Dscale(&d, 0); + ok(d == 1, "d = %f\n", d); + ok(ret == FP_NORMAL, "ret = %x\n", ret); + + d = 1; + ret = p__Dscale(&d, 1); + ok(d == 2, "d = %f\n", d); + ok(ret == FP_NORMAL, "ret = %x\n", ret); + + d = 1; + ret = p__Dscale(&d, -1); + ok(d == 0.5, "d = %f\n", d); + ok(ret == FP_NORMAL, "ret = %x\n", ret); + + d = 1; + ret = p__Dscale(&d, -99999); + ok(d == 0, "d = %f\n", d); + ok(ret == FP_ZERO, "ret = %x\n", ret); + + d = 1; + ret = p__Dscale(&d, 999999); + ok(d == INFINITY, "d = %f\n", d); + ok(ret == FP_INFINITE, "ret = %x\n", ret); + + d = NAN; + ret = p__Dscale(&d, 1); + ok(ret == FP_NAN, "ret = %x\n", ret); +} + static void test_tr2_sys__File_size(void) { ULONGLONG val; @@ -1001,6 +1054,7 @@ START_TEST(msvcp120) test__Call_once(); test__Do_call(); test__Dtest(); + test__Dscale(); test_tr2_sys__File_size(); test_tr2_sys__Equivalent(); diff --git a/dlls/msvcp120_app/msvcp120_app.spec b/dlls/msvcp120_app/msvcp120_app.spec index bf7b542..1470b3c 100644 --- a/dlls/msvcp120_app/msvcp120_app.spec +++ b/dlls/msvcp120_app/msvcp120_app.spec @@ -3684,7 +3684,7 @@ @ stub _Dint @ stub _Dnorm @ cdecl _Do_call(ptr) msvcp120._Do_call -@ stub _Dscale +@ cdecl _Dscale(ptr long) msvcp120._Dscale @ stub _Dtento @ cdecl _Dtest(ptr) msvcp120._Dtest @ stub _Dunscale @@ -3694,7 +3694,7 @@ @ extern _FDenorm msvcp120._FDenorm @ stub _FDint @ stub _FDnorm -@ stub _FDscale +@ cdecl _FDscale(ptr long) msvcp120._FDscale @ stub _FDtento @ cdecl _FDtest(ptr) msvcp120._FDtest @ stub _FDunscale @@ -3732,7 +3732,7 @@ @ stub _LCosh @ extern _LDenorm msvcp120._LDenorm @ stub _LDint -@ stub _LDscale +@ cdecl _LDscale(ptr long) msvcp120._LDscale @ stub _LDtento @ cdecl _LDtest(ptr) msvcp120._LDtest @ stub _LDunscale diff --git a/dlls/msvcp60/msvcp60.spec b/dlls/msvcp60/msvcp60.spec index 10d04e5..05d0435 100644 --- a/dlls/msvcp60/msvcp60.spec +++ b/dlls/msvcp60/msvcp60.spec @@ -4257,14 +4257,14 @@ @ stub _Cosh @ extern _Denorm _Denorm @ stub _Dnorm -@ stub _Dscale +@ cdecl _Dscale(ptr long) @ cdecl _Dtest(ptr) @ extern _Eps _Eps @ stub _Exp @ stub _FCosh @ extern _FDenorm _FDenorm @ stub _FDnorm -@ stub _FDscale +@ cdecl _FDscale(ptr long) @ cdecl _FDtest(ptr) @ extern _FEps _FEps @ stub _FExp @@ -4281,7 +4281,7 @@ @ extern _Inf _Inf @ stub _LCosh @ extern _LDenorm _LDenorm -@ stub _LDscale +@ cdecl _LDscale(ptr long) _Dscale @ cdecl _LDtest(ptr) _Dtest @ extern _LEps _LEps @ stub _LExp diff --git a/dlls/msvcp70/msvcp70.spec b/dlls/msvcp70/msvcp70.spec index f390d8a..a6f5ef3 100644 --- a/dlls/msvcp70/msvcp70.spec +++ b/dlls/msvcp70/msvcp70.spec @@ -5043,14 +5043,14 @@ @ stub _Cosh @ extern _Denorm @ stub _Dnorm -@ stub _Dscale +@ cdecl _Dscale(ptr long) @ cdecl _Dtest(ptr) @ extern _Eps @ stub _Exp @ stub _FCosh @ extern _FDenorm @ stub _FDnorm -@ stub _FDscale +@ cdecl _FDscale(ptr long) @ cdecl _FDtest(ptr) @ extern _FEps @ stub _FExp @@ -5068,7 +5068,7 @@ @ extern _Inf @ stub _LCosh @ extern _LDenorm -@ stub _LDscale +@ cdecl _LDscale(ptr long) _Dscale @ cdecl _LDtest(ptr) _Dtest @ extern _LEps @ stub _LExp diff --git a/dlls/msvcp71/msvcp71.spec b/dlls/msvcp71/msvcp71.spec index 2675c9a..ba2fcaf 100644 --- a/dlls/msvcp71/msvcp71.spec +++ b/dlls/msvcp71/msvcp71.spec @@ -5097,14 +5097,14 @@ @ stub _Cosh @ extern _Denorm @ stub _Dnorm -@ stub _Dscale +@ cdecl _Dscale(ptr long) @ cdecl _Dtest(ptr) @ extern _Eps @ stub _Exp @ stub _FCosh @ extern _FDenorm @ stub _FDnorm -@ stub _FDscale +@ cdecl _FDscale(ptr long) @ cdecl _FDtest(ptr) @ extern _FEps @ stub _FExp @@ -5124,7 +5124,7 @@ @ extern _Inf @ stub _LCosh @ extern _LDenorm -@ stub _LDscale +@ cdecl _LDscale(ptr long) _Dscale @ cdecl _LDtest(ptr) _Dtest @ extern _LEps @ stub _LExp diff --git a/dlls/msvcp80/msvcp80.spec b/dlls/msvcp80/msvcp80.spec index ed04def..d801608 100644 --- a/dlls/msvcp80/msvcp80.spec +++ b/dlls/msvcp80/msvcp80.spec @@ -5703,7 +5703,7 @@ @ stub _Cosh @ extern _Denorm @ stub _Dnorm -@ stub _Dscale +@ cdecl _Dscale(ptr long) @ stub _Dtentox @ cdecl _Dtest(ptr) @ stub _Dunscale @@ -5712,7 +5712,7 @@ @ stub _FCosh @ extern _FDenorm @ stub _FDnorm -@ stub _FDscale +@ cdecl _FDscale(ptr long) @ stub _FDtentox @ cdecl _FDtest(ptr) @ stub _FDunscale @@ -5734,7 +5734,7 @@ @ extern _Inf @ stub _LCosh @ extern _LDenorm -@ stub _LDscale +@ cdecl _LDscale(ptr long) _Dscale @ stub _LDtentox @ cdecl _LDtest(ptr) _Dtest @ stub _LDunscale diff --git a/dlls/msvcp90/math.c b/dlls/msvcp90/math.c index 9b827f3..2d9996db 100644 --- a/dlls/msvcp90/math.c +++ b/dlls/msvcp90/math.c @@ -2260,3 +2260,17 @@ short __cdecl _FDtest(float *x) { return dclass(*x); } + +/* _Dscale */ +short __cdecl _Dscale(double *x, int exp) +{ + *x *= pow(2, exp); + return dclass(*x); +} + +/* _FDscale */ +short __cdecl _FDscale(float *x, int exp) +{ + *x *= pow(2, exp); + return dclass(*x); +} diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index d3a314b..f2e3a5b 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -6479,14 +6479,14 @@ @ stub _Cosh @ extern _Denorm @ stub _Dnorm -@ stub _Dscale +@ cdecl _Dscale(ptr long) @ cdecl _Dtest(ptr) @ extern _Eps @ stub _Exp @ stub _FCosh @ extern _FDenorm @ stub _FDnorm -@ stub _FDscale +@ cdecl _FDscale(ptr long) @ cdecl _FDtest(ptr) @ extern _FEps @ stub _FExp @@ -6506,7 +6506,7 @@ @ extern _Inf @ stub _LCosh @ extern _LDenorm -@ stub _LDscale +@ cdecl _LDscale(ptr long) _Dscale @ cdecl _LDtest(ptr) _Dtest @ extern _LEps @ stub _LExp

1 0

Piotr Caban : msvcp: Add _Exp implementation.
by Alexandre Julliard 02 Oct '15

02 Oct '15

Module: wine Branch: master Commit: ce24b284eeabba8c7b0c8e9b6163f770e9207da9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce24b284eeabba8c7b0c8e9b6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Oct 1 18:43:18 2015 +0200 msvcp: Add _Exp implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp100/msvcp100.spec | 4 +- dlls/msvcp110/msvcp110.spec | 4 +- dlls/msvcp120/msvcp120.spec | 4 +- dlls/msvcp120/tests/msvcp120.c | 76 +++++++++++++++++++++++++++++++++++++ dlls/msvcp120_app/msvcp120_app.spec | 4 +- dlls/msvcp60/msvcp60.spec | 4 +- dlls/msvcp70/msvcp70.spec | 4 +- dlls/msvcp71/msvcp71.spec | 4 +- dlls/msvcp80/msvcp80.spec | 4 +- dlls/msvcp90/math.c | 42 ++++++++++++++++++++ dlls/msvcp90/msvcp90.spec | 4 +- 11 files changed, 136 insertions(+), 18 deletions(-) diff --git a/dlls/msvcp100/msvcp100.spec b/dlls/msvcp100/msvcp100.spec index c5d8fcc..d2b75f4 100644 --- a/dlls/msvcp100/msvcp100.spec +++ b/dlls/msvcp100/msvcp100.spec @@ -2894,14 +2894,14 @@ @ cdecl _Dscale(ptr long) @ cdecl _Dtest(ptr) @ extern _Eps -@ stub _Exp +@ cdecl _Exp(ptr double long) @ stub _FCosh @ extern _FDenorm @ stub _FDnorm @ cdecl _FDscale(ptr long) @ cdecl _FDtest(ptr) @ extern _FEps -@ stub _FExp +@ cdecl _FExp(ptr float long) @ extern _FInf @ extern _FNan # extern _FRteps diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index a3776cf..b8d21eb 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -3748,7 +3748,7 @@ @ cdecl _Dtest(ptr) @ stub _Dunscale @ extern _Eps -@ stub _Exp +@ cdecl _Exp(ptr double long) @ stub _FCosh @ extern _FDenorm @ stub _FDint @@ -3758,7 +3758,7 @@ @ cdecl _FDtest(ptr) @ stub _FDunscale @ extern _FEps -@ stub _FExp +@ cdecl _FExp(ptr float long) @ extern _FInf @ extern _FNan # extern _FRteps diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec index 2b07f13..0458b01 100644 --- a/dlls/msvcp120/msvcp120.spec +++ b/dlls/msvcp120/msvcp120.spec @@ -3689,7 +3689,7 @@ @ cdecl _Dtest(ptr) @ stub _Dunscale @ extern _Eps -@ stub _Exp +@ cdecl _Exp(ptr double long) @ stub _FCosh @ extern _FDenorm @ stub _FDint @@ -3699,7 +3699,7 @@ @ cdecl _FDtest(ptr) @ stub _FDunscale @ extern _FEps -@ stub _FExp +@ cdecl _FExp(ptr float long) @ extern _FInf @ extern _FNan @ stub _FPlsw diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index 358c408..d754191 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -19,6 +19,7 @@ #include <locale.h> #include <stdio.h> #include <math.h> +#include <limits.h> #include "wine/test.h" #include "winbase.h" @@ -65,6 +66,22 @@ enum file_type { type_unknown }; +static BOOL compare_float(float f, float g, unsigned int ulps) +{ + int x = *(int *)&f; + int y = *(int *)&g; + + if (x < 0) + x = INT_MIN - x; + if (y < 0) + y = INT_MIN - y; + + if (abs(x - y) > ulps) + return FALSE; + + return TRUE; +} + static inline const char* debugstr_longlong(ULONGLONG ll) { static char string[17]; @@ -87,6 +104,7 @@ static void (CDECL *p__Call_onceEx)(int *once, void (CDECL *func)(void*), void * static void (CDECL *p__Do_call)(void *this); static short (__cdecl *p__Dtest)(double *d); static short (__cdecl *p__Dscale)(double *d, int exp); +static short (__cdecl *p__FExp)(float *x, float y, int exp); /* filesystem */ static ULONGLONG(__cdecl *p_tr2_sys__File_size)(char const*); @@ -142,6 +160,8 @@ static BOOL init(void) "_Dtest"); SET(p__Dscale, "_Dscale"); + SET(p__FExp, + "_FExp"); if(sizeof(void*) == 8) { /* 64-bit initialization */ SET(p_tr2_sys__File_size, "?_File_size(a)sys@tr2(a)std@@YA_KPEBD(a)Z"); @@ -514,6 +534,61 @@ static void test__Dscale(void) ok(ret == FP_NAN, "ret = %x\n", ret); } +static void test__FExp(void) +{ + float d; + short ret; + + d = 0; + ret = p__FExp(&d, 0, 0); + ok(d == 0, "d = %f\n", d); + ok(ret == FP_ZERO, "ret = %x\n", ret); + + d = 0; + ret = p__FExp(&d, 1, 0); + ok(d == 1.0, "d = %f\n", d); + ok(ret == FP_NORMAL, "ret = %x\n", ret); + + d = 0; + ret = p__FExp(&d, 1, 1); + ok(d == 2.0, "d = %f\n", d); + ok(ret == FP_NORMAL, "ret = %x\n", ret); + + d = 0; + ret = p__FExp(&d, 1, 2); + ok(d == 4.0, "d = %f\n", d); + ok(ret == FP_NORMAL, "ret = %x\n", ret); + + d = 0; + ret = p__FExp(&d, 10, 0); + ok(d == 10.0, "d = %f\n", d); + ok(ret == FP_NORMAL, "ret = %x\n", ret); + + d = 1; + ret = p__FExp(&d, 0, 0); + ok(d == 0, "d = %f\n", d); + ok(ret == FP_ZERO, "ret = %x\n", ret); + + d = 1; + ret = p__FExp(&d, 1, 0); + ok(compare_float(d, 2.7182817, 4), "d = %f\n", d); + ok(ret == FP_NORMAL, "ret = %x\n", ret); + + d = 9e20; + ret = p__FExp(&d, 0, 0); + ok(d == 0, "d = %f\n", d); + ok(ret == FP_ZERO, "ret = %x\n", ret); + + d = 90; + ret = p__FExp(&d, 1, 0); + ok(ret == FP_INFINITE, "ret = %x\n", ret); + + d = 90; + ret = p__FExp(&d, 1, -50); + ok(compare_float(d, 1.0839359e+024, 4), "d = %g\n", d); + ok(ret == FP_NORMAL, "ret = %x\n", ret); +} + static void test_tr2_sys__File_size(void) { ULONGLONG val; @@ -1055,6 +1130,7 @@ START_TEST(msvcp120) test__Do_call(); test__Dtest(); test__Dscale(); + test__FExp(); test_tr2_sys__File_size(); test_tr2_sys__Equivalent(); diff --git a/dlls/msvcp120_app/msvcp120_app.spec b/dlls/msvcp120_app/msvcp120_app.spec index 1470b3c..2598904 100644 --- a/dlls/msvcp120_app/msvcp120_app.spec +++ b/dlls/msvcp120_app/msvcp120_app.spec @@ -3689,7 +3689,7 @@ @ cdecl _Dtest(ptr) msvcp120._Dtest @ stub _Dunscale @ extern _Eps msvcp120._Eps -@ stub _Exp +@ cdecl _Exp(ptr double long) msvcp120._Exp @ stub _FCosh @ extern _FDenorm msvcp120._FDenorm @ stub _FDint @@ -3699,7 +3699,7 @@ @ cdecl _FDtest(ptr) msvcp120._FDtest @ stub _FDunscale @ extern _FEps msvcp120._FEps -@ stub _FExp +@ cdecl _FExp(ptr float long) msvcp120._FExp @ extern _FInf msvcp120._FInf @ extern _FNan msvcp120._FNan @ stub _FPlsw diff --git a/dlls/msvcp60/msvcp60.spec b/dlls/msvcp60/msvcp60.spec index 05d0435..48f1add 100644 --- a/dlls/msvcp60/msvcp60.spec +++ b/dlls/msvcp60/msvcp60.spec @@ -4260,14 +4260,14 @@ @ cdecl _Dscale(ptr long) @ cdecl _Dtest(ptr) @ extern _Eps _Eps -@ stub _Exp +@ cdecl _Exp(ptr double long) @ stub _FCosh @ extern _FDenorm _FDenorm @ stub _FDnorm @ cdecl _FDscale(ptr long) @ cdecl _FDtest(ptr) @ extern _FEps _FEps -@ stub _FExp +@ cdecl _FExp(ptr float long) @ extern _FInf _FInf @ extern _FNan _FNan # extern _FRteps diff --git a/dlls/msvcp70/msvcp70.spec b/dlls/msvcp70/msvcp70.spec index a6f5ef3..f97c87c 100644 --- a/dlls/msvcp70/msvcp70.spec +++ b/dlls/msvcp70/msvcp70.spec @@ -5046,14 +5046,14 @@ @ cdecl _Dscale(ptr long) @ cdecl _Dtest(ptr) @ extern _Eps -@ stub _Exp +@ cdecl _Exp(ptr double long) @ stub _FCosh @ extern _FDenorm @ stub _FDnorm @ cdecl _FDscale(ptr long) @ cdecl _FDtest(ptr) @ extern _FEps -@ stub _FExp +@ cdecl _FExp(ptr float long) @ extern _FInf @ extern _FNan # extern _FRteps diff --git a/dlls/msvcp71/msvcp71.spec b/dlls/msvcp71/msvcp71.spec index ba2fcaf..46e5213 100644 --- a/dlls/msvcp71/msvcp71.spec +++ b/dlls/msvcp71/msvcp71.spec @@ -5100,14 +5100,14 @@ @ cdecl _Dscale(ptr long) @ cdecl _Dtest(ptr) @ extern _Eps -@ stub _Exp +@ cdecl _Exp(ptr double long) @ stub _FCosh @ extern _FDenorm @ stub _FDnorm @ cdecl _FDscale(ptr long) @ cdecl _FDtest(ptr) @ extern _FEps -@ stub _FExp +@ cdecl _FExp(ptr float long) @ extern _FInf @ extern _FNan # extern _FRteps diff --git a/dlls/msvcp80/msvcp80.spec b/dlls/msvcp80/msvcp80.spec index d801608..f6bec69 100644 --- a/dlls/msvcp80/msvcp80.spec +++ b/dlls/msvcp80/msvcp80.spec @@ -5708,7 +5708,7 @@ @ cdecl _Dtest(ptr) @ stub _Dunscale @ extern _Eps -@ stub _Exp +@ cdecl _Exp(ptr double long) @ stub _FCosh @ extern _FDenorm @ stub _FDnorm @@ -5717,7 +5717,7 @@ @ cdecl _FDtest(ptr) @ stub _FDunscale @ extern _FEps -@ stub _FExp +@ cdecl _FExp(ptr float long) @ extern _FInf @ extern _FNan # extern _FRteps diff --git a/dlls/msvcp90/math.c b/dlls/msvcp90/math.c index 2d9996db..6c3a33a 100644 --- a/dlls/msvcp90/math.c +++ b/dlls/msvcp90/math.c @@ -2274,3 +2274,45 @@ short __cdecl _FDscale(float *x, int exp) *x *= pow(2, exp); return dclass(*x); } + +/* _Exp */ +/* computes y * e^(*x) * 2^scale */ +short __cdecl _Exp(double *x, double y, int scale) +{ + double ed; + int e; + + if(y == 0) { + *x = 0; + return FP_ZERO; + } + + *x /= M_LN2; + ed = floor(*x); + *x -= ed; + e = ed; + + if(ed!=e && ed>0) + scale = INT_MAX; + else if(ed!=e && ed<0) + scale = INT_MIN; + else if(scale>0 && e>0 && scale+e<=0) + scale = INT_MAX; + else if(scale<0 && e<0 && scale+e>=0) + scale = INT_MIN; + else + scale += e; + + *x = y * pow(2.0, *x); + return _Dscale(x, scale); +} + +/* _FExp */ +short __cdecl _FExp(float *x, float y, short scale) +{ + double d = *x; + _Exp(&d, y, scale); + *x = d; + + return dclass(*x); +} diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index f2e3a5b..a0ba849 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -6482,14 +6482,14 @@ @ cdecl _Dscale(ptr long) @ cdecl _Dtest(ptr) @ extern _Eps -@ stub _Exp +@ cdecl _Exp(ptr double long) @ stub _FCosh @ extern _FDenorm @ stub _FDnorm @ cdecl _FDscale(ptr long) @ cdecl _FDtest(ptr) @ extern _FEps -@ stub _FExp +@ cdecl _FExp(ptr float long) @ extern _FInf @ extern _FNan # extern _FRteps

1 0

Dmitry Timoshkov : winhttp/tests: Add another test for IWinHttpRequest_Invoke.
by Alexandre Julliard 02 Oct '15

02 Oct '15

Module: wine Branch: master Commit: 6f97e1a30ce18fe874a3369b852e648118e9916e URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f97e1a30ce18fe874a3369b8… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Oct 2 10:24:58 2015 +0800 winhttp/tests: Add another test for IWinHttpRequest_Invoke. This test intentionally uses fallback path of IWinHttpRequest_Invoke implementation that passes the call to typelib marshaller. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/winhttp/tests/winhttp.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 381a9c4..e221809 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -3773,6 +3773,16 @@ todo_wine ok(hr == DISP_E_PARAMNOTFOUND, "error %#x\n", hr); SysFreeString(utf8); + + params.cArgs = 1; + V_VT(&arg[0]) = VT_I4; + V_I4(&arg[0]) = AutoLogonPolicy_Never; + VariantInit(&ret); + hr = IWinHttpRequest_Invoke(request, DISPID_HTTPREQUEST_SETAUTOLOGONPOLICY, &IID_NULL, 0, + DISPATCH_METHOD, &params, &ret, NULL, NULL); +todo_wine + ok(hr == S_OK, "error %#x\n", hr); + IWinHttpRequest_Release(request); CoUninitialize();

1 0