January 2013 - Wine-Commits

Piotr Caban : msvcp90: Added std::tan(complex) tests.
by Alexandre Julliard Jan. 24, 2013

Jan. 24, 2013

Module: wine Branch: master Commit: 66ee663e0c063d5f3f04ca659ac091d7b47d8e7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=66ee663e0c063d5f3f04ca659… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jan 24 12:29:12 2013 +0100 msvcp90: Added std::tan(complex) tests. --- dlls/msvcp90/tests/misc.c | 23 +++++++++++++++++++++++ 1 files changed, 23 insertions(+), 0 deletions(-) diff --git a/dlls/msvcp90/tests/misc.c b/dlls/msvcp90/tests/misc.c index b1e3c0b..0f1b27e 100644 --- a/dlls/msvcp90/tests/misc.c +++ b/dlls/msvcp90/tests/misc.c @@ -112,6 +112,7 @@ static complex_float* (__thiscall *p_complex_float_ctor)(complex_float*, const f static complex_float* (__cdecl *p_complex_float_add)(complex_float*, const complex_float*, const complex_float*); static complex_float* (__cdecl *p_complex_float_div)(complex_float*, const complex_float*, const complex_float*); static float (__cdecl *p_complex_float__Fabs)(const complex_float*, int*); +static complex_float* (__cdecl *p_complex_float_tan)(complex_float*, const complex_float*); static int invalid_parameter = 0; static void __cdecl test_invalid_parameter_handler(const wchar_t *expression, @@ -252,6 +253,8 @@ static BOOL init(void) "??$?KM(a)std@@YA?AV?$complex(a)M@0(a)AEBV10@0(a)Z"); SET(p_complex_float__Fabs, "??$_Fabs(a)M@std@@YAMAEBV?$complex(a)M@0(a)PEAH@Z"); + SET(p_complex_float_tan, + "??$tan(a)M@std@@YA?AV?$complex(a)M@0(a)AEBV10@@Z"); } else { SET(p_char_assign, "?assign@?$char_traits(a)D@std@@SAXAADABD(a)Z"); SET(p_wchar_assign, "?assign@?$char_traits(a)_W@std@@SAXAA_WAB_W(a)Z"); @@ -298,6 +301,8 @@ static BOOL init(void) "??$?KM(a)std@@YA?AV?$complex(a)M@0(a)ABV10@0(a)Z"); SET(p_complex_float__Fabs, "??$_Fabs(a)M@std@@YAMABV?$complex(a)M@0(a)PAH@Z"); + SET(p_complex_float_tan, + "??$tan(a)M@std@@YA?AV?$complex(a)M@0(a)ABV10@@Z"); } init_thiscall_thunk(); @@ -705,6 +710,24 @@ static void test_complex(void) f1 = p_complex_float__Fabs(&c3, &scale); ok(f1 == 0, "abs(0+0i) = %f\n", f1); ok(scale == 0, "scale = %d\n", scale); + + c1.real = 0; + c1.imag = 0; + p_complex_float_tan(&c2, &c1); + ok(c2.real == 0, "c2.real = %f\n", c2.real); + ok(c2.imag == 0, "c2.imag = %f\n", c2.imag); + + c1.real = 3.14159/2; + c1.imag = 0; + p_complex_float_tan(&c2, &c1); + ok(almost_eq(c2.real, 788906.062500), "c2.real = %f\n", c2.real); + ok(c2.imag == 0, "c2.imag = %f\n", c2.imag); + + c1.real = 7.12; + c1.imag = 0.17; + p_complex_float_tan(&c2, &c1); + ok(almost_eq(c2.real, 1.040818), "c2.real = %f\n", c2.real); + ok(almost_eq(c2.imag, 0.362651), "c2.imag = %f\n", c2.imag); } START_TEST(misc)

1 0

Piotr Caban : msvcp90: Added std::abs(complex) implementation.
by Alexandre Julliard Jan. 24, 2013

Jan. 24, 2013

Module: wine Branch: master Commit: 3e9db55b09174db2b601c1bb19f5abb7f5cadcdd URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e9db55b09174db2b601c1bb1… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jan 24 12:27:57 2013 +0100 msvcp90: Added std::abs(complex) implementation. --- dlls/msvcp90/math.c | 58 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.spec | 24 +++++++++--------- 2 files changed, 70 insertions(+), 12 deletions(-) diff --git a/dlls/msvcp90/math.c b/dlls/msvcp90/math.c index 8d25e76..37dc3f7 100644 --- a/dlls/msvcp90/math.c +++ b/dlls/msvcp90/math.c @@ -1276,6 +1276,33 @@ float __thiscall complex_float_real_get(const complex_float *this) return this->real; } +/* ??$_Fabs(a)M@std@@YAMABV?$complex(a)M@0(a)PAH@Z */ +/* ??$_Fabs(a)M@std@@YAMAEBV?$complex(a)M@0(a)PEAH@Z */ +float __cdecl complex_float__Fabs(const complex_float *c, int *scale) +{ + float ret; + + ret = hypotf(c->real, c->imag); + if(_isnan(ret) || ret==0) { + *scale = 0; + }else if(ret >= 1) { + *scale = 2; + ret /= 4; + }else { + *scale = -2; + ret *= 4; + } + + return ret; +} + +/* ??$abs(a)M@std@@YAMABV?$complex(a)M@0@@Z */ +/* ??$abs(a)M@std@@YAMAEBV?$complex(a)M@0@@Z */ +float __cdecl complex_float_abs(const complex_float *c) +{ + return hypotf(c->real, c->imag); +} + /* ??0?$_Complex_base(a)NU_C_double_complex@@@std@@QAE(a)ABN0@Z */ /* ??0?$_Complex_base(a)NU_C_double_complex@@@std@@QEAA(a)AEBN0@Z */ /* ??0?$_Complex_base(a)OU_C_ldouble_complex@@@std@@QAE(a)ABO0@Z */ @@ -1742,3 +1769,34 @@ double __thiscall complex_double_real_get(const complex_double *this) { return this->real; } + +/* ??$_Fabs(a)N@std@@YANABV?$complex(a)N@0(a)PAH@Z */ +/* ??$_Fabs(a)N@std@@YANAEBV?$complex(a)N@0(a)PEAH@Z */ +/* ??$_Fabs(a)O@std@@YAOABV?$complex(a)O@0(a)PAH@Z */ +/* ??$_Fabs(a)O@std@@YAOAEBV?$complex(a)O@0(a)PEAH@Z */ +double __cdecl complex_double__Fabs(const complex_double *c, int *scale) +{ + double ret; + + ret = hypot(c->real, c->imag); + if(_isnan(ret) || ret==0) { + *scale = 0; + }else if(ret >= 1) { + *scale = 2; + ret /= 4; + }else { + *scale = -2; + ret *= 4; + } + + return ret; +} + +/* ??$abs(a)N@std@@YANABV?$complex(a)N@0@@Z */ +/* ??$abs(a)N@std@@YANAEBV?$complex(a)N@0@@Z */ +/* ??$abs(a)O@std@@YAOABV?$complex(a)O@0@@Z */ +/* ??$abs(a)O@std@@YAOAEBV?$complex(a)O@0@@Z */ +double __cdecl complex_double_abs(const complex_double *c) +{ + return hypot(c->real, c->imag); +} diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 14540b4..ef4726d 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -344,18 +344,18 @@ @ cdecl -arch=win64 ??$?P_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@1@@std@@YA_NAEBV?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@0(a)PEB_W@Z(ptr wstr) MSVCP_basic_string_wchar_geq_bstr_cstr @ cdecl -arch=win32 ??$?P_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@1@@std@@YA_NPB_WABV?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@0@@Z(wstr ptr) MSVCP_basic_string_wchar_geq_cstr_bstr @ cdecl -arch=win64 ??$?P_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@1@@std@@YA_NPEB_WAEBV?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@0@@Z(wstr ptr) MSVCP_basic_string_wchar_geq_cstr_bstr -@ stub -arch=win32 ??$_Fabs(a)M@std@@YAMABV?$complex(a)M@0(a)PAH@Z -@ stub -arch=win64 ??$_Fabs(a)M@std@@YAMAEBV?$complex(a)M@0(a)PEAH@Z -@ stub -arch=win32 ??$_Fabs(a)N@std@@YANABV?$complex(a)N@0(a)PAH@Z -@ stub -arch=win64 ??$_Fabs(a)N@std@@YANAEBV?$complex(a)N@0(a)PEAH@Z -@ stub -arch=win32 ??$_Fabs(a)O@std@@YAOABV?$complex(a)O@0(a)PAH@Z -@ stub -arch=win64 ??$_Fabs(a)O@std@@YAOAEBV?$complex(a)O@0(a)PEAH@Z -@ stub -arch=win32 ??$abs(a)M@std@@YAMABV?$complex(a)M@0@@Z -@ stub -arch=win64 ??$abs(a)M@std@@YAMAEBV?$complex(a)M@0@@Z -@ stub -arch=win32 ??$abs(a)N@std@@YANABV?$complex(a)N@0@@Z -@ stub -arch=win64 ??$abs(a)N@std@@YANAEBV?$complex(a)N@0@@Z -@ stub -arch=win32 ??$abs(a)O@std@@YAOABV?$complex(a)O@0@@Z -@ stub -arch=win64 ??$abs(a)O@std@@YAOAEBV?$complex(a)O@0@@Z +@ cdecl -arch=win32 ??$_Fabs(a)M@std@@YAMABV?$complex(a)M@0(a)PAH@Z(ptr ptr) complex_float__Fabs +@ cdecl -arch=win64 ??$_Fabs(a)M@std@@YAMAEBV?$complex(a)M@0(a)PEAH@Z(ptr ptr) complex_float__Fabs +@ cdecl -arch=win32 ??$_Fabs(a)N@std@@YANABV?$complex(a)N@0(a)PAH@Z(ptr ptr) complex_double__Fabs +@ cdecl -arch=win64 ??$_Fabs(a)N@std@@YANAEBV?$complex(a)N@0(a)PEAH@Z(ptr ptr) complex_double__Fabs +@ cdecl -arch=win32 ??$_Fabs(a)O@std@@YAOABV?$complex(a)O@0(a)PAH@Z(ptr ptr) complex_double__Fabs +@ cdecl -arch=win64 ??$_Fabs(a)O@std@@YAOAEBV?$complex(a)O@0(a)PEAH@Z(ptr ptr) complex_double__Fabs +@ cdecl -arch=win32 ??$abs(a)M@std@@YAMABV?$complex(a)M@0@@Z(ptr) complex_float_abs +@ cdecl -arch=win64 ??$abs(a)M@std@@YAMAEBV?$complex(a)M@0@@Z(ptr) complex_float_abs +@ cdecl -arch=win32 ??$abs(a)N@std@@YANABV?$complex(a)N@0@@Z(ptr) complex_double_abs +@ cdecl -arch=win64 ??$abs(a)N@std@@YANAEBV?$complex(a)N@0@@Z(ptr) complex_double_abs +@ cdecl -arch=win32 ??$abs(a)O@std@@YAOABV?$complex(a)O@0@@Z(ptr) complex_double_abs +@ cdecl -arch=win64 ??$abs(a)O@std@@YAOAEBV?$complex(a)O@0@@Z(ptr) complex_double_abs @ cdecl -arch=win32 ??$arg(a)M@std@@YAMABV?$complex(a)M@0@@Z(ptr) complex_float_arg @ cdecl -arch=win64 ??$arg(a)M@std@@YAMAEBV?$complex(a)M@0@@Z(ptr) complex_float_arg @ cdecl -arch=win32 ??$arg(a)N@std@@YANABV?$complex(a)N@0@@Z(ptr) complex_double_arg

1 0

Henri Verbeet : wined3d: Properly set WINED3DFMT_FLAG_VTF in init_format_texture_info().
by Alexandre Julliard Jan. 24, 2013

Jan. 24, 2013

Module: wine Branch: master Commit: b882a70282a766dd51ac68d5c88d5198c0d942a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b882a70282a766dd51ac68d5c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 24 11:37:39 2013 +0100 wined3d: Properly set WINED3DFMT_FLAG_VTF in init_format_texture_info(). --- dlls/wined3d/directx.c | 24 +++--------------------- dlls/wined3d/utils.c | 5 +++++ 2 files changed, 8 insertions(+), 21 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 5b3de2e..33871c6 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3877,24 +3877,6 @@ static BOOL CheckSurfaceCapability(const struct wined3d_adapter *adapter, return FALSE; } -static BOOL CheckVertexTextureCapability(const struct wined3d_adapter *adapter, - const struct wined3d_format *format) -{ - const struct wined3d_gl_info *gl_info = &adapter->gl_info; - - if (!gl_info->limits.vertex_samplers || !(format->flags & WINED3DFMT_FLAG_VTF)) - return FALSE; - - switch (format->id) - { - case WINED3DFMT_R32G32B32A32_FLOAT: - case WINED3DFMT_R32_FLOAT: - return TRUE; - default: - return !(gl_info->quirks & WINED3D_QUIRK_LIMITED_TEX_FILTERING); - } -} - HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT adapter_idx, enum wined3d_device_type device_type, enum wined3d_format_id adapter_format_id, DWORD usage, enum wined3d_resource_type resource_type, enum wined3d_format_id check_format_id) @@ -4014,7 +3996,7 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad if (usage & WINED3DUSAGE_QUERY_VERTEXTEXTURE) { - if (!CheckVertexTextureCapability(adapter, format)) + if (!(format->flags & WINED3DFMT_FLAG_VTF)) { TRACE("[FAILED] - No vertex texture support.\n"); return WINED3DERR_NOTAVAILABLE; @@ -4180,7 +4162,7 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad if (usage & WINED3DUSAGE_QUERY_VERTEXTEXTURE) { - if (!CheckVertexTextureCapability(adapter, format)) + if (!(format->flags & WINED3DFMT_FLAG_VTF)) { TRACE("[FAILED] - No vertex texture support.\n"); return WINED3DERR_NOTAVAILABLE; @@ -4348,7 +4330,7 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad if (usage & WINED3DUSAGE_QUERY_VERTEXTEXTURE) { - if (!CheckVertexTextureCapability(adapter, format)) + if (!(format->flags & WINED3DFMT_FLAG_VTF)) { TRACE("[FAILED] - No vertex texture support.\n"); return WINED3DERR_NOTAVAILABLE; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 39309ae..c1f6125 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1287,8 +1287,13 @@ static BOOL init_format_texture_info(struct wined3d_adapter *adapter, struct win format->height_scale.numerator = 1; format->height_scale.denominator = 1; + if (!gl_info->limits.vertex_samplers) + format->flags &= ~WINED3DFMT_FLAG_VTF; + if (!(gl_info->quirks & WINED3D_QUIRK_LIMITED_TEX_FILTERING)) format->flags |= WINED3DFMT_FLAG_FILTERING; + else if (format->id != WINED3DFMT_R32G32B32A32_FLOAT && format->id != WINED3DFMT_R32_FLOAT) + format->flags &= ~WINED3DFMT_FLAG_VTF; if (format->glGammaInternal != format->glInternal) {

1 0

Alexandre Julliard : netapi32: Fix wrap-around bug in tick count comparison .
by Alexandre Julliard Jan. 24, 2013

Jan. 24, 2013

Module: wine Branch: master Commit: 2c70e08cf8d920bfcf5427ba1ee468f4fa5a8f14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c70e08cf8d920bfcf5427ba1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 24 15:15:35 2013 +0100 netapi32: Fix wrap-around bug in tick count comparison. --- dlls/netapi32/nbt.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/netapi32/nbt.c b/dlls/netapi32/nbt.c index 1bbcaf0..2a871de 100644 --- a/dlls/netapi32/nbt.c +++ b/dlls/netapi32/nbt.c @@ -297,7 +297,7 @@ static UCHAR NetBTWaitForNameResponse(const NetBTAdapter *adapter, SOCKET fd, if (fd == INVALID_SOCKET) return NRC_BADDR; if (!answerCallback) return NRC_BADDR; - while (!found && ret == NRC_GOODRET && (now = GetTickCount()) < waitUntil) + while (!found && ret == NRC_GOODRET && (int)((now = GetTickCount()) - waitUntil) < 0) { DWORD msToWait = waitUntil - now; struct fd_set fds;

1 0

Henri Verbeet : wined3d: Get rid of CheckWrapAndMipCapability().
by Alexandre Julliard Jan. 24, 2013

Jan. 24, 2013

Module: wine Branch: master Commit: 8347c67c69639ebc5ba21471fdcd22a9f53a7fa8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8347c67c69639ebc5ba21471f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 24 11:37:41 2013 +0100 wined3d: Get rid of CheckWrapAndMipCapability(). --- dlls/wined3d/directx.c | 46 +++++++++++----------------------------------- 1 files changed, 11 insertions(+), 35 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 0af31ad..d5d1025 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3528,20 +3528,6 @@ static BOOL CheckRenderTargetCapability(const struct wined3d_adapter *adapter, return FALSE; } -static BOOL CheckWrapAndMipCapability(const struct wined3d_adapter *adapter, const struct wined3d_format *format) -{ - /* OpenGL supports mipmapping on all formats basically. Wrapping is unsupported, - * but we have to report mipmapping so we cannot reject this flag. Tests show that - * windows reports WRAPANDMIP on unfilterable surfaces as well, apparently to show - * that wrapping is supported. The lack of filtering will sort out the mipmapping - * capability anyway. - * - * For now lets report this on all formats, but in the future we may want to - * restrict it to some should games need that - */ - return TRUE; -} - /* Check if a texture format is supported on the given adapter */ static BOOL CheckTextureCapability(const struct wined3d_adapter *adapter, const struct wined3d_format *format) { @@ -3994,15 +3980,18 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad usage_caps |= WINED3DUSAGE_QUERY_VERTEXTEXTURE; } + /* OpenGL supports mipmapping on all formats. Wrapping is + * unsupported, but we have to report mipmapping so we cannot + * reject this flag. Tests show that Windows reports WRAPANDMIP on + * unfilterable surfaces as well, apparently to show that wrapping + * is supported. The lack of filtering will sort out the + * mipmapping capability anyway. + * + * For now lets report this on all formats, but in the future we + * may want to restrict it to some should applications need that. */ if (usage & WINED3DUSAGE_QUERY_WRAPANDMIP) - { - if (!CheckWrapAndMipCapability(adapter, format)) - { - TRACE("[FAILED] - No wrapping and mipmapping support.\n"); - return WINED3DERR_NOTAVAILABLE; - } usage_caps |= WINED3DUSAGE_QUERY_WRAPANDMIP; - } + break; case WINED3D_RTYPE_SURFACE: @@ -4161,14 +4150,7 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad } if (usage & WINED3DUSAGE_QUERY_WRAPANDMIP) - { - if (!CheckWrapAndMipCapability(adapter, format)) - { - TRACE("[FAILED] - No wrapping and mipmapping support.\n"); - return WINED3DERR_NOTAVAILABLE; - } usage_caps |= WINED3DUSAGE_QUERY_WRAPANDMIP; - } if (usage & WINED3DUSAGE_DEPTHSTENCIL) { @@ -4329,14 +4311,8 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad } if (usage & WINED3DUSAGE_QUERY_WRAPANDMIP) - { - if (!CheckWrapAndMipCapability(adapter, format)) - { - TRACE("[FAILED] - No wrapping and mipmapping support.\n"); - return WINED3DERR_NOTAVAILABLE; - } usage_caps |= WINED3DUSAGE_QUERY_WRAPANDMIP; - } + break; default:

1 0

Michael Stefaniuc : ws2_32: Use assignment instead of memcpy to copy structs.
by Alexandre Julliard Jan. 24, 2013

Jan. 24, 2013

Module: wine Branch: master Commit: f21d45417f99f113549945be1e4f474375f89e14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f21d45417f99f113549945be1… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 24 14:21:53 2013 +0100 ws2_32: Use assignment instead of memcpy to copy structs. --- dlls/ws2_32/socket.c | 2 +- dlls/ws2_32/tests/sock.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index c390828..6fd1e34 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2183,7 +2183,7 @@ static BOOL interface_bind( SOCKET s, int fd, struct sockaddr *addr ) if (setsockopt(fd, IPPROTO_IP, IP_UNICAST_IF, &ifindex, sizeof(ifindex)) != 0) goto cleanup; /* Failed to suggest egress interface */ - memcpy(&specific_interface_filter, &generic_interface_filter, sizeof(generic_interface_filter)); + specific_interface_filter = generic_interface_filter; specific_interface_filter.iface_rule.k = adapter->Index; filter_prog.len = sizeof(generic_interface_filter)/sizeof(struct sock_filter); filter_prog.filter = (struct sock_filter *) &specific_interface_filter; diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 56a64bc..4b4b99a 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -2725,7 +2725,7 @@ static void test_getsockname(void) return; } - memcpy(&sa_get, &sa_set, sizeof(sa_set)); + sa_get = sa_set; if (getsockname(sock, (struct sockaddr*) &sa_get, &sa_get_len) == 0) ok(0, "getsockname on unbound socket should fail\n"); else {

1 0

Piotr Caban : msvcp90: std::_Fabs(complex) tests.
by Alexandre Julliard Jan. 24, 2013

Jan. 24, 2013

Module: wine Branch: master Commit: 2e4eb12219b3154ab3ca9a012090229cc500c88f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e4eb12219b3154ab3ca9a012… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jan 24 12:28:08 2013 +0100 msvcp90: std::_Fabs(complex) tests. --- dlls/msvcp90/tests/misc.c | 63 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 63 insertions(+), 0 deletions(-) diff --git a/dlls/msvcp90/tests/misc.c b/dlls/msvcp90/tests/misc.c index d0a41c5..b1e3c0b 100644 --- a/dlls/msvcp90/tests/misc.c +++ b/dlls/msvcp90/tests/misc.c @@ -111,6 +111,7 @@ static void (__thiscall *p_basic_ios_char_dtor)(/*basic_ios_char*/void*); static complex_float* (__thiscall *p_complex_float_ctor)(complex_float*, const float*, const float*); static complex_float* (__cdecl *p_complex_float_add)(complex_float*, const complex_float*, const complex_float*); static complex_float* (__cdecl *p_complex_float_div)(complex_float*, const complex_float*, const complex_float*); +static float (__cdecl *p_complex_float__Fabs)(const complex_float*, int*); static int invalid_parameter = 0; static void __cdecl test_invalid_parameter_handler(const wchar_t *expression, @@ -249,6 +250,8 @@ static BOOL init(void) "??$?HM(a)std@@YA?AV?$complex(a)M@0(a)AEBV10@0(a)Z"); SET(p_complex_float_div, "??$?KM(a)std@@YA?AV?$complex(a)M@0(a)AEBV10@0(a)Z"); + SET(p_complex_float__Fabs, + "??$_Fabs(a)M@std@@YAMAEBV?$complex(a)M@0(a)PEAH@Z"); } else { SET(p_char_assign, "?assign@?$char_traits(a)D@std@@SAXAADABD(a)Z"); SET(p_wchar_assign, "?assign@?$char_traits(a)_W@std@@SAXAA_WAB_W(a)Z"); @@ -293,6 +296,8 @@ static BOOL init(void) "??$?HM(a)std@@YA?AV?$complex(a)M@0(a)ABV10@0(a)Z"); SET(p_complex_float_div, "??$?KM(a)std@@YA?AV?$complex(a)M@0(a)ABV10@0(a)Z"); + SET(p_complex_float__Fabs, + "??$_Fabs(a)M@std@@YAMABV?$complex(a)M@0(a)PAH@Z"); } init_thiscall_thunk(); @@ -587,6 +592,7 @@ static void test_complex(void) { complex_float c1, c2, c3; float f1, f2; + int scale; f1 = 1; f2 = 2; @@ -594,20 +600,36 @@ static void test_complex(void) ok(c1.real == 1, "c1.real = %f\n", c1.real); ok(c1.imag == 2, "c1.imag = %f\n", c1.imag); + f1 = p_complex_float__Fabs(&c1, &scale); + ok(almost_eq(f1, 0.559017), "abs(1+2i) = %f\n", f1); + ok(scale == 2, "scale = %d\n", scale); + f1 = -1; f2 = 1; call_func3(p_complex_float_ctor, &c2, &f1, &f2); ok(c2.real == -1, "c2.real = %f\n", c1.real); ok(c2.imag == 1, "c2.imag = %f\n", c1.imag); + f1 = p_complex_float__Fabs(&c2, &scale); + ok(almost_eq(f1, 0.353553), "abs(1-1i) = %f\n", f1); + ok(scale == 2, "scale = %d\n", scale); + p_complex_float_add(&c3, &c1, &c2); ok(c3.real == 0, "c3.real = %f\n", c3.real); ok(c3.imag == 3, "c3.imag = %f\n", c3.imag); + f1 = p_complex_float__Fabs(&c3, &scale); + ok(almost_eq(f1, 0.75), "abs(0+3i) = %f\n", f1); + ok(scale == 2, "scale = %d\n", scale); + p_complex_float_add(&c2, &c1, &c3); ok(c2.real == 1, "c2.real = %f\n", c1.real); ok(c2.imag == 5, "c2.imag = %f\n", c1.imag); + f1 = p_complex_float__Fabs(&c3, &scale); + ok(almost_eq(f1, 0.75), "abs(1+5i) = %f\n", f1); + ok(scale == 2, "scale = %d\n", scale); + /* (1+5i) / (0+3i) */ p_complex_float_div(&c1, &c2, &c3); ok(almost_eq(c1.real, 1.666667), "c1.real = %f\n", c1.real); @@ -620,12 +642,20 @@ static void test_complex(void) ok(almost_eq(c1.real, 0.5), "c1.real = %f\n", c1.real); ok(almost_eq(c1.imag, 2.5), "c1.imag = %f\n", c1.imag); + f1 = p_complex_float__Fabs(&c1, &scale); + ok(almost_eq(f1, 0.637377), "abs(0.5+2.5i) = %f\n", f1); + ok(scale == 2, "scale = %d\n", scale); + /* (1+5i) / 0 */ c3.real = 0; p_complex_float_div(&c1, &c2, &c3); ok(_isnan(c1.real), "c1.real = %f\n", c1.real); ok(_isnan(c1.imag), "c1.imag = %f\n", c1.imag); + f1 = p_complex_float__Fabs(&c1, &scale); + ok(_isnan(f1), "abs(NaN+NaNi) = %f\n", f1); + ok(scale == 0, "scale = %d\n", scale); + /* (1+5i) / (NaN-2i) */ c1.imag = -2; p_complex_float_div(&c3, &c2, &c1); @@ -642,6 +672,39 @@ static void test_complex(void) p_complex_float_add(&c3, &c2, &c1); ok(_isnan(c3.real), "c3.real = %f\n", c3.real); ok(c3.imag == -2, "c3.imag = %f\n", c3.imag); + + f1 = p_complex_float__Fabs(&c3, &scale); + ok(_isnan(f1), "abs(NaN-2i) = %f\n", f1); + ok(scale == 0, "scale = %d\n", scale); + + c3.real = 1000; + f1 = p_complex_float__Fabs(&c3, &scale); + ok(almost_eq(f1, 250.000504), "abs(1000-2i) = %f\n", f1); + ok(scale == 2, "scale = %d\n", scale); + + c3.real = 0.1; + c3.imag = 0.1; + f1 = p_complex_float__Fabs(&c3, &scale); + ok(almost_eq(f1, 0.565685), "abs(0.1+0.1i) = %f\n", f1); + ok(scale == -2, "scale = %d\n", scale); + + c3.real = 1; + c3.imag = 0; + f1 = p_complex_float__Fabs(&c3, &scale); + ok(almost_eq(f1, 0.25), "abs(1+0i) = %f\n", f1); + ok(scale == 2, "scale = %d\n", scale); + + c3.real = 0.99; + c3.imag = 0; + f1 = p_complex_float__Fabs(&c3, &scale); + ok(almost_eq(f1, 3.96), "abs(0.99+0i) = %f\n", f1); + ok(scale == -2, "scale = %d\n", scale); + + c3.real = 0; + c3.imag = 0; + f1 = p_complex_float__Fabs(&c3, &scale); + ok(f1 == 0, "abs(0+0i) = %f\n", f1); + ok(scale == 0, "scale = %d\n", scale); } START_TEST(misc)

1 0

Piotr Caban : msvcp90: Added std::conj(complex) implementation.
by Alexandre Julliard Jan. 24, 2013

Jan. 24, 2013

Module: wine Branch: master Commit: 94da034364630ffd7814269d9df27088379aac27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94da034364630ffd7814269d9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jan 24 12:28:19 2013 +0100 msvcp90: Added std::conj(complex) implementation. --- dlls/msvcp90/math.c | 20 ++++++++++++++++++++ dlls/msvcp90/msvcp90.spec | 12 ++++++------ 2 files changed, 26 insertions(+), 6 deletions(-) diff --git a/dlls/msvcp90/math.c b/dlls/msvcp90/math.c index 37dc3f7..9f75cd4 100644 --- a/dlls/msvcp90/math.c +++ b/dlls/msvcp90/math.c @@ -1303,6 +1303,15 @@ float __cdecl complex_float_abs(const complex_float *c) return hypotf(c->real, c->imag); } +/* ??$conj(a)M@std@@YA?AV?$complex(a)M@0(a)ABV10@@Z */ +/* ??$conj(a)M@std@@YA?AV?$complex(a)M@0(a)AEBV10@@Z */ +complex_float* __cdecl complex_float_conj(complex_float *ret, const complex_float *c) +{ + ret->real = c->real; + ret->imag = -c->imag; + return ret; +} + /* ??0?$_Complex_base(a)NU_C_double_complex@@@std@@QAE(a)ABN0@Z */ /* ??0?$_Complex_base(a)NU_C_double_complex@@@std@@QEAA(a)AEBN0@Z */ /* ??0?$_Complex_base(a)OU_C_ldouble_complex@@@std@@QAE(a)ABO0@Z */ @@ -1800,3 +1809,14 @@ double __cdecl complex_double_abs(const complex_double *c) { return hypot(c->real, c->imag); } + +/* ??$conj(a)N@std@@YA?AV?$complex(a)N@0(a)ABV10@@Z */ +/* ??$conj(a)N@std@@YA?AV?$complex(a)N@0(a)AEBV10@@Z */ +/* ??$conj(a)O@std@@YA?AV?$complex(a)O@0(a)ABV10@@Z */ +/* ??$conj(a)O@std@@YA?AV?$complex(a)O@0(a)AEBV10@@Z */ +complex_double* __cdecl complex_double_conj(complex_double *ret, const complex_double *c) +{ + ret->real = c->real; + ret->imag = -c->imag; + return ret; +} diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index ef4726d..5e53c6d 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -362,12 +362,12 @@ @ cdecl -arch=win64 ??$arg(a)N@std@@YANAEBV?$complex(a)N@0@@Z(ptr) complex_double_arg @ cdecl -arch=win32 ??$arg(a)O@std@@YAOABV?$complex(a)O@0@@Z(ptr) complex_double_arg @ cdecl -arch=win64 ??$arg(a)O@std@@YAOAEBV?$complex(a)O@0@@Z(ptr) complex_double_arg -@ stub -arch=win32 ??$conj(a)M@std@@YA?AV?$complex(a)M@0(a)ABV10@@Z -@ stub -arch=win64 ??$conj(a)M@std@@YA?AV?$complex(a)M@0(a)AEBV10@@Z -@ stub -arch=win32 ??$conj(a)N@std@@YA?AV?$complex(a)N@0(a)ABV10@@Z -@ stub -arch=win64 ??$conj(a)N@std@@YA?AV?$complex(a)N@0(a)AEBV10@@Z -@ stub -arch=win32 ??$conj(a)O@std@@YA?AV?$complex(a)O@0(a)ABV10@@Z -@ stub -arch=win64 ??$conj(a)O@std@@YA?AV?$complex(a)O@0(a)AEBV10@@Z +@ cdecl -arch=win32 ??$conj(a)M@std@@YA?AV?$complex(a)M@0(a)ABV10@@Z(ptr ptr) complex_float_conj +@ cdecl -arch=win64 ??$conj(a)M@std@@YA?AV?$complex(a)M@0(a)AEBV10@@Z(ptr ptr) complex_float_conj +@ cdecl -arch=win32 ??$conj(a)N@std@@YA?AV?$complex(a)N@0(a)ABV10@@Z(ptr ptr) complex_double_conj +@ cdecl -arch=win64 ??$conj(a)N@std@@YA?AV?$complex(a)N@0(a)AEBV10@@Z(ptr ptr) complex_double_conj +@ cdecl -arch=win32 ??$conj(a)O@std@@YA?AV?$complex(a)O@0(a)ABV10@@Z(ptr ptr) complex_double_conj +@ cdecl -arch=win64 ??$conj(a)O@std@@YA?AV?$complex(a)O@0(a)AEBV10@@Z(ptr ptr) complex_double_conj @ stub -arch=win32 ??$cos(a)M@std@@YA?AV?$complex(a)M@0(a)ABV10@@Z @ stub -arch=win64 ??$cos(a)M@std@@YA?AV?$complex(a)M@0(a)AEBV10@@Z @ stub -arch=win32 ??$cos(a)N@std@@YA?AV?$complex(a)N@0(a)ABV10@@Z

1 0

Piotr Caban : msvcp90: Added complex hyperbolic functions implementation.
by Alexandre Julliard Jan. 24, 2013

Jan. 24, 2013

Module: wine Branch: master Commit: b0cb2ead335dc024057f605f2297ce673e56420b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0cb2ead335dc024057f605f2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jan 24 12:29:21 2013 +0100 msvcp90: Added complex hyperbolic functions implementation. --- dlls/msvcp90/math.c | 70 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.spec | 36 +++++++++++----------- 2 files changed, 88 insertions(+), 18 deletions(-) diff --git a/dlls/msvcp90/math.c b/dlls/msvcp90/math.c index c13fd3c..72a8922 100644 --- a/dlls/msvcp90/math.c +++ b/dlls/msvcp90/math.c @@ -1340,6 +1340,38 @@ complex_float* __cdecl complex_float_tan(complex_float *ret, const complex_float return ret; } +/* ??$cosh(a)M@std@@YA?AV?$complex(a)M@0(a)ABV10@@Z */ +/* ??$cosh(a)M@std@@YA?AV?$complex(a)M@0(a)AEBV10@@Z */ +complex_float* __cdecl complex_float_cosh(complex_float *ret, const complex_float *c) +{ + ret->real = cosh(c->real)*cos(c->imag); + ret->imag = sinh(c->real)*sin(c->imag); + return ret; +} + +/* ??$sinh(a)M@std@@YA?AV?$complex(a)M@0(a)ABV10@@Z */ +/* ??$sinh(a)M@std@@YA?AV?$complex(a)M@0(a)AEBV10@@Z */ +complex_float* __cdecl complex_float_sinh(complex_float *ret, const complex_float *c) +{ + ret->real = sinh(c->real)*cos(c->imag); + ret->imag = cosh(c->real)*sin(c->imag); + return ret; +} + +/* ??$tanh(a)M@std@@YA?AV?$complex(a)M@0(a)ABV10@@Z */ +/* ??$tanh(a)M@std@@YA?AV?$complex(a)M@0(a)AEBV10@@Z */ +complex_float* __cdecl complex_float_tanh(complex_float *ret, const complex_float *c) +{ + complex_float tmp; + + ret->real = -c->imag; + ret->imag = c->real; + complex_float_tan(&tmp, ret); + ret->real = tmp.imag; + ret->imag = -tmp.real; + return ret; +} + /* ??0?$_Complex_base(a)NU_C_double_complex@@@std@@QAE(a)ABN0@Z */ /* ??0?$_Complex_base(a)NU_C_double_complex@@@std@@QEAA(a)AEBN0@Z */ /* ??0?$_Complex_base(a)OU_C_ldouble_complex@@@std@@QAE(a)ABO0@Z */ @@ -1882,3 +1914,41 @@ complex_double* __cdecl complex_double_tan(complex_double *ret, const complex_do ret->imag = sinh(2*c->imag) / denom; return ret; } + +/* ??$cosh(a)N@std@@YA?AV?$complex(a)N@0(a)ABV10@@Z */ +/* ??$cosh(a)N@std@@YA?AV?$complex(a)N@0(a)AEBV10@@Z */ +/* ??$cosh(a)O@std@@YA?AV?$complex(a)O@0(a)ABV10@@Z */ +/* ??$cosh(a)O@std@@YA?AV?$complex(a)O@0(a)AEBV10@@Z */ +complex_double* __cdecl complex_double_cosh(complex_double *ret, const complex_double *c) +{ + ret->real = cosh(c->real)*cos(c->imag); + ret->imag = sinh(c->real)*sin(c->imag); + return ret; +} + +/* ??$sinh(a)N@std@@YA?AV?$complex(a)N@0(a)ABV10@@Z */ +/* ??$sinh(a)N@std@@YA?AV?$complex(a)N@0(a)AEBV10@@Z */ +/* ??$sinh(a)O@std@@YA?AV?$complex(a)O@0(a)ABV10@@Z */ +/* ??$sinh(a)O@std@@YA?AV?$complex(a)O@0(a)AEBV10@@Z */ +complex_double* __cdecl complex_double_sinh(complex_double *ret, const complex_double *c) +{ + ret->real = sinh(c->real)*cos(c->imag); + ret->imag = cosh(c->real)*sin(c->imag); + return ret; +} + +/* ??$tanh(a)N@std@@YA?AV?$complex(a)N@0(a)ABV10@@Z */ +/* ??$tanh(a)N@std@@YA?AV?$complex(a)N@0(a)AEBV10@@Z */ +/* ??$tanh(a)O@std@@YA?AV?$complex(a)O@0(a)ABV10@@Z */ +/* ??$tanh(a)O@std@@YA?AV?$complex(a)O@0(a)AEBV10@@Z */ +complex_double* __cdecl complex_double_tanh(complex_double *ret, const complex_double *c) +{ + complex_double tmp; + + ret->real = -c->imag; + ret->imag = c->real; + complex_double_tan(&tmp, ret); + ret->real = tmp.imag; + ret->imag = -tmp.real; + return ret; +} diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 3022505..b77fcf5 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -374,12 +374,12 @@ @ cdecl -arch=win64 ??$cos(a)N@std@@YA?AV?$complex(a)N@0(a)AEBV10@@Z(ptr ptr) complex_double_cos @ cdecl -arch=win32 ??$cos(a)O@std@@YA?AV?$complex(a)O@0(a)ABV10@@Z(ptr ptr) complex_double_cos @ cdecl -arch=win64 ??$cos(a)O@std@@YA?AV?$complex(a)O@0(a)AEBV10@@Z(ptr ptr) complex_double_cos -@ stub -arch=win32 ??$cosh(a)M@std@@YA?AV?$complex(a)M@0(a)ABV10@@Z -@ stub -arch=win64 ??$cosh(a)M@std@@YA?AV?$complex(a)M@0(a)AEBV10@@Z -@ stub -arch=win32 ??$cosh(a)N@std@@YA?AV?$complex(a)N@0(a)ABV10@@Z -@ stub -arch=win64 ??$cosh(a)N@std@@YA?AV?$complex(a)N@0(a)AEBV10@@Z -@ stub -arch=win32 ??$cosh(a)O@std@@YA?AV?$complex(a)O@0(a)ABV10@@Z -@ stub -arch=win64 ??$cosh(a)O@std@@YA?AV?$complex(a)O@0(a)AEBV10@@Z +@ cdecl -arch=win32 ??$cosh(a)M@std@@YA?AV?$complex(a)M@0(a)ABV10@@Z(ptr ptr) complex_float_cosh +@ cdecl -arch=win64 ??$cosh(a)M@std@@YA?AV?$complex(a)M@0(a)AEBV10@@Z(ptr ptr) complex_float_cosh +@ cdecl -arch=win32 ??$cosh(a)N@std@@YA?AV?$complex(a)N@0(a)ABV10@@Z(ptr ptr) complex_double_cosh +@ cdecl -arch=win64 ??$cosh(a)N@std@@YA?AV?$complex(a)N@0(a)AEBV10@@Z(ptr ptr) complex_double_cosh +@ cdecl -arch=win32 ??$cosh(a)O@std@@YA?AV?$complex(a)O@0(a)ABV10@@Z(ptr ptr) complex_double_cosh +@ cdecl -arch=win64 ??$cosh(a)O@std@@YA?AV?$complex(a)O@0(a)AEBV10@@Z(ptr ptr) complex_double_cosh @ stub -arch=win32 ??$exp(a)M@std@@YA?AV?$complex(a)M@0(a)ABV10@@Z @ stub -arch=win64 ??$exp(a)M@std@@YA?AV?$complex(a)M@0(a)AEBV10@@Z @ stub -arch=win32 ??$exp(a)N@std@@YA?AV?$complex(a)N@0(a)ABV10@@Z @@ -470,12 +470,12 @@ @ cdecl -arch=win64 ??$sin(a)N@std@@YA?AV?$complex(a)N@0(a)AEBV10@@Z(ptr ptr) complex_double_sin @ cdecl -arch=win32 ??$sin(a)O@std@@YA?AV?$complex(a)O@0(a)ABV10@@Z(ptr ptr) complex_double_sin @ cdecl -arch=win64 ??$sin(a)O@std@@YA?AV?$complex(a)O@0(a)AEBV10@@Z(ptr ptr) complex_double_sin -@ stub -arch=win32 ??$sinh(a)M@std@@YA?AV?$complex(a)M@0(a)ABV10@@Z -@ stub -arch=win64 ??$sinh(a)M@std@@YA?AV?$complex(a)M@0(a)AEBV10@@Z -@ stub -arch=win32 ??$sinh(a)N@std@@YA?AV?$complex(a)N@0(a)ABV10@@Z -@ stub -arch=win64 ??$sinh(a)N@std@@YA?AV?$complex(a)N@0(a)AEBV10@@Z -@ stub -arch=win32 ??$sinh(a)O@std@@YA?AV?$complex(a)O@0(a)ABV10@@Z -@ stub -arch=win64 ??$sinh(a)O@std@@YA?AV?$complex(a)O@0(a)AEBV10@@Z +@ cdecl -arch=win32 ??$sinh(a)M@std@@YA?AV?$complex(a)M@0(a)ABV10@@Z(ptr ptr) complex_float_sinh +@ cdecl -arch=win64 ??$sinh(a)M@std@@YA?AV?$complex(a)M@0(a)AEBV10@@Z(ptr ptr) complex_float_sinh +@ cdecl -arch=win32 ??$sinh(a)N@std@@YA?AV?$complex(a)N@0(a)ABV10@@Z(ptr ptr) complex_double_sinh +@ cdecl -arch=win64 ??$sinh(a)N@std@@YA?AV?$complex(a)N@0(a)AEBV10@@Z(ptr ptr) complex_double_sinh +@ cdecl -arch=win32 ??$sinh(a)O@std@@YA?AV?$complex(a)O@0(a)ABV10@@Z(ptr ptr) complex_double_sinh +@ cdecl -arch=win64 ??$sinh(a)O@std@@YA?AV?$complex(a)O@0(a)AEBV10@@Z(ptr ptr) complex_double_sinh @ stub -arch=win32 ??$sqrt(a)M@std@@YA?AV?$complex(a)M@0(a)ABV10@@Z @ stub -arch=win64 ??$sqrt(a)M@std@@YA?AV?$complex(a)M@0(a)AEBV10@@Z @ stub -arch=win32 ??$sqrt(a)N@std@@YA?AV?$complex(a)N@0(a)ABV10@@Z @@ -488,12 +488,12 @@ @ cdecl -arch=win64 ??$tan(a)N@std@@YA?AV?$complex(a)N@0(a)AEBV10@@Z(ptr ptr) complex_double_tan @ cdecl -arch=win32 ??$tan(a)O@std@@YA?AV?$complex(a)O@0(a)ABV10@@Z(ptr ptr) complex_double_tan @ cdecl -arch=win64 ??$tan(a)O@std@@YA?AV?$complex(a)O@0(a)AEBV10@@Z(ptr ptr) complex_double_tan -@ stub -arch=win32 ??$tanh(a)M@std@@YA?AV?$complex(a)M@0(a)ABV10@@Z -@ stub -arch=win64 ??$tanh(a)M@std@@YA?AV?$complex(a)M@0(a)AEBV10@@Z -@ stub -arch=win32 ??$tanh(a)N@std@@YA?AV?$complex(a)N@0(a)ABV10@@Z -@ stub -arch=win64 ??$tanh(a)N@std@@YA?AV?$complex(a)N@0(a)AEBV10@@Z -@ stub -arch=win32 ??$tanh(a)O@std@@YA?AV?$complex(a)O@0(a)ABV10@@Z -@ stub -arch=win64 ??$tanh(a)O@std@@YA?AV?$complex(a)O@0(a)AEBV10@@Z +@ cdecl -arch=win32 ??$tanh(a)M@std@@YA?AV?$complex(a)M@0(a)ABV10@@Z(ptr ptr) complex_float_tanh +@ cdecl -arch=win64 ??$tanh(a)M@std@@YA?AV?$complex(a)M@0(a)AEBV10@@Z(ptr ptr) complex_float_tanh +@ cdecl -arch=win32 ??$tanh(a)N@std@@YA?AV?$complex(a)N@0(a)ABV10@@Z(ptr ptr) complex_double_tanh +@ cdecl -arch=win64 ??$tanh(a)N@std@@YA?AV?$complex(a)N@0(a)AEBV10@@Z(ptr ptr) complex_double_tanh +@ cdecl -arch=win32 ??$tanh(a)O@std@@YA?AV?$complex(a)O@0(a)ABV10@@Z(ptr ptr) complex_double_tanh +@ cdecl -arch=win64 ??$tanh(a)O@std@@YA?AV?$complex(a)O@0(a)AEBV10@@Z(ptr ptr) complex_double_tanh @ thiscall -arch=win32 ??0?$_Complex_base(a)MU_C_float_complex@@@std@@QAE(a)ABM0@Z(ptr ptr ptr) complex_float_ctor @ cdecl -arch=win64 ??0?$_Complex_base(a)MU_C_float_complex@@@std@@QEAA(a)AEBM0@Z(ptr ptr ptr) complex_float_ctor @ thiscall -arch=win32 ??0?$_Complex_base(a)NU_C_double_complex@@@std@@QAE(a)ABN0@Z(ptr ptr ptr) complex_double_ctor

1 0

Jörg Höhle : winealsa: Have the MIDI recorder wait in poll(), not snd_seq_event_input().
by Alexandre Julliard Jan. 24, 2013

Jan. 24, 2013

Module: wine Branch: master Commit: d7c716c4705dbd81b3a3d69fbf1bf79de022440c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7c716c4705dbd81b3a3d69fb… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Sat Jan 19 20:32:02 2013 +0100 winealsa: Have the MIDI recorder wait in poll(), not snd_seq_event_input(). --- dlls/winealsa.drv/midi.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index 25a722e..2798109 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -296,7 +296,7 @@ static DWORD WINAPI midRecThread(LPVOID arg) snd_seq_poll_descriptors(midiSeq, pfd, npfd, POLLIN); /* Check if an event is present */ - if (poll(pfd, npfd, 250) < 0) { + if (poll(pfd, npfd, 250) <= 0) { HeapFree(GetProcessHeap(), 0, pfd); continue; }

1 0