February 2016 - Wine-Commits

Henri Verbeet : d3d8: Use wined3d_texture_get_sub_resource_parent() in d3d8_texture_cube_GetCubeMapSurface().
by Alexandre Julliard Feb. 19, 2016

Feb. 19, 2016

Module: wine Branch: master Commit: 301050b8db0fe787dbf2ff8896bfdad561cc1e1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=301050b8db0fe787dbf2ff889… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 18 17:29:58 2016 +0100 d3d8: Use wined3d_texture_get_sub_resource_parent() in d3d8_texture_cube_GetCubeMapSurface(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/texture.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/d3d8/texture.c b/dlls/d3d8/texture.c index 3de197d..cf5827d 100644 --- a/dlls/d3d8/texture.c +++ b/dlls/d3d8/texture.c @@ -631,7 +631,6 @@ static HRESULT WINAPI d3d8_texture_cube_GetCubeMapSurface(IDirect3DCubeTexture8 D3DCUBEMAP_FACES face, UINT level, IDirect3DSurface8 **surface) { struct d3d8_texture *texture = impl_from_IDirect3DCubeTexture8(iface); - struct wined3d_resource *sub_resource; struct d3d8_surface *surface_impl; UINT sub_resource_idx; DWORD level_count; @@ -647,13 +646,12 @@ static HRESULT WINAPI d3d8_texture_cube_GetCubeMapSurface(IDirect3DCubeTexture8 } sub_resource_idx = level_count * face + level; - if (!(sub_resource = wined3d_texture_get_sub_resource(texture->wined3d_texture, sub_resource_idx))) + if (!(surface_impl = wined3d_texture_get_sub_resource_parent(texture->wined3d_texture, sub_resource_idx))) { wined3d_mutex_unlock(); return D3DERR_INVALIDCALL; } - surface_impl = wined3d_resource_get_parent(sub_resource); *surface = &surface_impl->IDirect3DSurface8_iface; IDirect3DSurface8_AddRef(*surface); wined3d_mutex_unlock();

1 0

Henri Verbeet : d3d8: Use wined3d_texture_get_sub_resource_parent() in d3d8_texture_cube_UnlockRect().
by Alexandre Julliard Feb. 19, 2016

Feb. 19, 2016

Module: wine Branch: master Commit: 039c1536f8256b57f9ab5f07079c09a3212a75f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=039c1536f8256b57f9ab5f070… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 18 17:29:57 2016 +0100 d3d8: Use wined3d_texture_get_sub_resource_parent() in d3d8_texture_cube_UnlockRect(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/texture.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/dlls/d3d8/texture.c b/dlls/d3d8/texture.c index 0077a46..3de197d 100644 --- a/dlls/d3d8/texture.c +++ b/dlls/d3d8/texture.c @@ -688,7 +688,6 @@ static HRESULT WINAPI d3d8_texture_cube_UnlockRect(IDirect3DCubeTexture8 *iface, D3DCUBEMAP_FACES face, UINT level) { struct d3d8_texture *texture = impl_from_IDirect3DCubeTexture8(iface); - struct wined3d_resource *sub_resource; struct d3d8_surface *surface_impl; UINT sub_resource_idx; HRESULT hr; @@ -697,13 +696,10 @@ static HRESULT WINAPI d3d8_texture_cube_UnlockRect(IDirect3DCubeTexture8 *iface, wined3d_mutex_lock(); sub_resource_idx = wined3d_texture_get_level_count(texture->wined3d_texture) * face + level; - if (!(sub_resource = wined3d_texture_get_sub_resource(texture->wined3d_texture, sub_resource_idx))) + if (!(surface_impl = wined3d_texture_get_sub_resource_parent(texture->wined3d_texture, sub_resource_idx))) hr = D3DERR_INVALIDCALL; else - { - surface_impl = wined3d_resource_get_parent(sub_resource); hr = IDirect3DSurface8_UnlockRect(&surface_impl->IDirect3DSurface8_iface); - } wined3d_mutex_unlock(); return hr;

1 0

Henri Verbeet : d3d8: Use wined3d_texture_get_sub_resource_parent() in d3d8_texture_cube_LockRect().
by Alexandre Julliard Feb. 19, 2016

Feb. 19, 2016

Module: wine Branch: master Commit: 4c5f4c7e511826067aa176e0145c335820bc56e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c5f4c7e511826067aa176e01… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 18 17:29:56 2016 +0100 d3d8: Use wined3d_texture_get_sub_resource_parent() in d3d8_texture_cube_LockRect(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/texture.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/dlls/d3d8/texture.c b/dlls/d3d8/texture.c index 1636536..0077a46 100644 --- a/dlls/d3d8/texture.c +++ b/dlls/d3d8/texture.c @@ -666,7 +666,6 @@ static HRESULT WINAPI d3d8_texture_cube_LockRect(IDirect3DCubeTexture8 *iface, DWORD flags) { struct d3d8_texture *texture = impl_from_IDirect3DCubeTexture8(iface); - struct wined3d_resource *sub_resource; struct d3d8_surface *surface_impl; UINT sub_resource_idx; HRESULT hr; @@ -676,13 +675,10 @@ static HRESULT WINAPI d3d8_texture_cube_LockRect(IDirect3DCubeTexture8 *iface, wined3d_mutex_lock(); sub_resource_idx = wined3d_texture_get_level_count(texture->wined3d_texture) * face + level; - if (!(sub_resource = wined3d_texture_get_sub_resource(texture->wined3d_texture, sub_resource_idx))) + if (!(surface_impl = wined3d_texture_get_sub_resource_parent(texture->wined3d_texture, sub_resource_idx))) hr = D3DERR_INVALIDCALL; else - { - surface_impl = wined3d_resource_get_parent(sub_resource); hr = IDirect3DSurface8_LockRect(&surface_impl->IDirect3DSurface8_iface, locked_rect, rect, flags); - } wined3d_mutex_unlock(); return hr;

1 0

Piotr Caban : msvcr120: Add wcstof implementation.
by Alexandre Julliard Feb. 19, 2016

Feb. 19, 2016

Module: wine Branch: master Commit: 4ee316a997542459119c054989419066897702f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ee316a997542459119c05498… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Feb 18 16:10:06 2016 +0100 msvcr120: Add wcstof implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-convert-l1-1-0.spec | 4 ++-- dlls/msvcr120/msvcr120.spec | 4 ++-- dlls/msvcr120/tests/msvcr120.c | 25 ++++++++++++++++++++++ dlls/msvcr120_app/msvcr120_app.spec | 4 ++-- dlls/msvcrt/wcs.c | 16 ++++++++++++++ dlls/ucrtbase/ucrtbase.spec | 4 ++-- 6 files changed, 49 insertions(+), 8 deletions(-) diff --git a/dlls/api-ms-win-crt-convert-l1-1-0/api-ms-win-crt-convert-l1-1-0.spec b/dlls/api-ms-win-crt-convert-l1-1-0/api-ms-win-crt-convert-l1-1-0.spec index 6d3e4f6..b38905b 100644 --- a/dlls/api-ms-win-crt-convert-l1-1-0/api-ms-win-crt-convert-l1-1-0.spec +++ b/dlls/api-ms-win-crt-convert-l1-1-0/api-ms-win-crt-convert-l1-1-0.spec @@ -51,7 +51,7 @@ @ cdecl _ultow(long ptr long) ucrtbase._ultow @ cdecl _ultow_s(long ptr long long) ucrtbase._ultow_s @ cdecl _wcstod_l(wstr ptr) ucrtbase._wcstod_l -@ stub _wcstof_l +@ cdecl _wcstof_l(wstr ptr ptr) ucrtbase._wcstof_l @ cdecl -ret64 _wcstoi64(wstr ptr long) ucrtbase._wcstoi64 @ cdecl -ret64 _wcstoi64_l(wstr ptr long ptr) ucrtbase._wcstoi64_l @ stub _wcstoimax_l @@ -106,7 +106,7 @@ @ cdecl wcsrtombs(ptr ptr long ptr) ucrtbase.wcsrtombs @ cdecl wcsrtombs_s(ptr ptr long ptr long ptr) ucrtbase.wcsrtombs_s @ cdecl wcstod(wstr ptr) ucrtbase.wcstod -@ stub wcstof +@ cdecl wcstof(ptr ptr) ucrtbase.wcstof @ stub wcstoimax @ cdecl wcstol(wstr ptr long) ucrtbase.wcstol @ stub wcstold diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 2305026..00efc6c 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1888,7 +1888,7 @@ @ cdecl _wcsset(wstr long) MSVCRT__wcsset @ cdecl _wcsset_s(wstr long long) MSVCRT__wcsset_s @ cdecl _wcstod_l(wstr ptr) MSVCRT__wcstod_l -@ stub _wcstof_l +@ cdecl _wcstof_l(wstr ptr ptr) MSVCRT__wcstof_l @ cdecl -ret64 _wcstoi64(wstr ptr long) MSVCRT__wcstoi64 @ cdecl -ret64 _wcstoi64_l(wstr ptr long ptr) MSVCRT__wcstoi64_l @ stub _wcstoimax_l @@ -2470,7 +2470,7 @@ @ cdecl wcsspn(wstr wstr) ntdll.wcsspn @ cdecl wcsstr(wstr wstr) MSVCRT_wcsstr @ cdecl wcstod(wstr ptr) MSVCRT_wcstod -@ stub wcstof +@ cdecl wcstof(ptr ptr) MSVCRT_wcstof @ stub wcstoimax @ cdecl wcstok(wstr wstr) MSVCRT_wcstok @ cdecl wcstok_s(ptr wstr ptr) MSVCRT_wcstok_s diff --git a/dlls/msvcr120/tests/msvcr120.c b/dlls/msvcr120/tests/msvcr120.c index c37d8f7..341aec4 100644 --- a/dlls/msvcr120/tests/msvcr120.c +++ b/dlls/msvcr120/tests/msvcr120.c @@ -87,6 +87,7 @@ static void* (CDECL *p__W_Gettnames)(void); static void (CDECL *p_free)(void*); static float (CDECL *p_strtof)(const char *, char **); static int (CDECL *p__finite)(double); +static float (CDECL *p_wcstof)(const wchar_t*, wchar_t**); static BOOL init(void) { @@ -111,6 +112,7 @@ static BOOL init(void) p_free = (void*)GetProcAddress(module, "free"); p_strtof = (void*)GetProcAddress(module, "strtof"); p__finite = (void*)GetProcAddress(module, "_finite"); + p_wcstof = (void*)GetProcAddress(module, "wcstof"); return TRUE; } @@ -334,6 +336,9 @@ static void test__strtof(void) const char float3[] = "-3.402823466e+38"; const char float4[] = "1.7976931348623158e+308"; /* DBL_MAX */ + const WCHAR twelve[] = {'1','2','.','0',0}; + const WCHAR arabic23[] = { 0x662, 0x663, 0}; + char *end; float f; @@ -367,11 +372,31 @@ static void test__strtof(void) f = p_strtof("0x12", NULL); ok(f == 0, "f = %lf\n", f); + + f = p_wcstof(twelve, NULL); + ok(f == 12.0, "f = %lf\n", f); + + f = p_wcstof(arabic23, NULL); + ok(f == 0, "f = %lf\n", f); + + if(!p_setlocale(LC_ALL, "Arabic")) { + win_skip("Arabic locale not available\n"); + return; + } + + f = p_wcstof(twelve, NULL); + ok(f == 12.0, "f = %lf\n", f); + + f = p_wcstof(arabic23, NULL); + ok(f == 0, "f = %lf\n", f); + + p_setlocale(LC_ALL, "C"); } START_TEST(msvcr120) { if (!init()) return; + test__strtof(); test_lconv(); test__dsign(); test__dpcomp(); diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 682f2c7..87bf9dc 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1581,7 +1581,7 @@ @ cdecl _wcsset(wstr long) msvcr120._wcsset @ cdecl _wcsset_s(wstr long long) msvcr120._wcsset_s @ cdecl _wcstod_l(wstr ptr) msvcr120._wcstod_l -@ stub _wcstof_l +@ cdecl _wcstof_l(wstr ptr ptr) msvcr120._wcstof_l @ cdecl -ret64 _wcstoi64(wstr ptr long) msvcr120._wcstoi64 @ cdecl -ret64 _wcstoi64_l(wstr ptr long ptr) msvcr120._wcstoi64_l @ stub _wcstoimax_l @@ -2132,7 +2132,7 @@ @ cdecl wcsspn(wstr wstr) msvcr120.wcsspn @ cdecl wcsstr(wstr wstr) msvcr120.wcsstr @ cdecl wcstod(wstr ptr) msvcr120.wcstod -@ stub wcstof +@ cdecl wcstof(ptr ptr) msvcr120.wcstof @ stub wcstoimax @ cdecl wcstok(wstr wstr) msvcr120.wcstok @ cdecl wcstok_s(ptr wstr ptr) msvcr120.wcstok_s diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 0f80d3b..c6091a8 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -647,6 +647,22 @@ double CDECL MSVCRT__wtof_l(const MSVCRT_wchar_t *str, MSVCRT__locale_t locale) } /********************************************************************* + * _wcstof_l (MSVCR120.@) + */ +float CDECL MSVCRT__wcstof_l( const MSVCRT_wchar_t *str, MSVCRT_wchar_t **end, MSVCRT__locale_t locale ) +{ + return MSVCRT__wcstod_l(str, end, locale); +} + +/********************************************************************* + * wcstof (MSVCR120.@) + */ +float CDECL MSVCRT_wcstof( const MSVCRT_wchar_t *str, MSVCRT_wchar_t **end ) +{ + return MSVCRT__wcstof_l(str, end, NULL); +} + +/********************************************************************* * arg_clbk_valist (INTERNAL) */ printf_arg arg_clbk_valist(void *ctx, int arg_pos, int type, __ms_va_list *valist) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 2a6906f..15f3781 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2037,7 +2037,7 @@ @ cdecl _wcsset(wstr long) MSVCRT__wcsset @ cdecl _wcsset_s(wstr long long) MSVCRT__wcsset_s @ cdecl _wcstod_l(wstr ptr) MSVCRT__wcstod_l -@ stub _wcstof_l +@ cdecl _wcstof_l(wstr ptr ptr) MSVCRT__wcstof_l @ cdecl -ret64 _wcstoi64(wstr ptr long) MSVCRT__wcstoi64 @ cdecl -ret64 _wcstoi64_l(wstr ptr long ptr) MSVCRT__wcstoi64_l @ stub _wcstoimax_l @@ -2576,7 +2576,7 @@ @ cdecl wcsspn(wstr wstr) ntdll.wcsspn @ cdecl wcsstr(wstr wstr) MSVCRT_wcsstr @ cdecl wcstod(wstr ptr) MSVCRT_wcstod -@ stub wcstof +@ cdecl wcstof(ptr ptr) MSVCRT_wcstof @ stub wcstoimax @ cdecl wcstok(wstr wstr) MSVCRT_wcstok @ cdecl wcstok_s(ptr wstr ptr) MSVCRT_wcstok_s

1 0

Bernhard Übelacker : msvcr120: Implement strtof and _strtof_l.
by Alexandre Julliard Feb. 19, 2016

Feb. 19, 2016

Module: wine Branch: master Commit: 78716aebf8c3ff1b4657189b3e01ae7452fb414d URL: http://source.winehq.org/git/wine.git/?a=commit;h=78716aebf8c3ff1b4657189b3… Author: Bernhard Übelacker <bernhardu(a)vr-web.de> Date: Thu Feb 18 16:10:00 2016 +0100 msvcr120: Implement strtof and _strtof_l. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-convert-l1-1-0.spec | 4 +- dlls/msvcr120/msvcr120.spec | 4 +- dlls/msvcr120/tests/msvcr120.c | 49 ++++++++++++++++++++++ dlls/msvcr120_app/msvcr120_app.spec | 4 +- dlls/msvcrt/string.c | 16 +++++++ dlls/ucrtbase/ucrtbase.spec | 4 +- 6 files changed, 73 insertions(+), 8 deletions(-) diff --git a/dlls/api-ms-win-crt-convert-l1-1-0/api-ms-win-crt-convert-l1-1-0.spec b/dlls/api-ms-win-crt-convert-l1-1-0/api-ms-win-crt-convert-l1-1-0.spec index 6ac93d3..6d3e4f6 100644 --- a/dlls/api-ms-win-crt-convert-l1-1-0/api-ms-win-crt-convert-l1-1-0.spec +++ b/dlls/api-ms-win-crt-convert-l1-1-0/api-ms-win-crt-convert-l1-1-0.spec @@ -30,7 +30,7 @@ @ cdecl _ltow(long ptr long) ucrtbase._ltow @ cdecl _ltow_s(long ptr long long) ucrtbase._ltow_s @ cdecl _strtod_l(str ptr ptr) ucrtbase._strtod_l -@ stub _strtof_l +@ cdecl _strtof_l(str ptr ptr) ucrtbase._strtof_l @ cdecl -ret64 _strtoi64(str ptr long) ucrtbase._strtoi64 @ cdecl -ret64 _strtoi64_l(str ptr long ptr) ucrtbase._strtoi64_l @ stub _strtoimax_l @@ -93,7 +93,7 @@ @ cdecl mbstowcs_s(ptr ptr long str long) ucrtbase.mbstowcs_s @ cdecl mbtowc(ptr str long) ucrtbase.mbtowc @ cdecl strtod(str ptr) ucrtbase.strtod -@ stub strtof +@ cdecl strtof(str ptr) ucrtbase.strtof @ stub strtoimax @ cdecl strtol(str ptr long) ucrtbase.strtol @ stub strtold diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 5f6533c..2305026 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1731,7 +1731,7 @@ @ cdecl _strtime(ptr) MSVCRT__strtime @ cdecl _strtime_s(ptr long) @ cdecl _strtod_l(str ptr ptr) MSVCRT_strtod_l -@ stub _strtof_l +@ cdecl _strtof_l(str ptr ptr) MSVCRT__strtof_l @ cdecl -ret64 _strtoi64(str ptr long) MSVCRT_strtoi64 @ cdecl -ret64 _strtoi64_l(str ptr long ptr) MSVCRT_strtoi64_l @ stub _strtoimax_l @@ -2386,7 +2386,7 @@ @ cdecl strspn(str str) ntdll.strspn @ cdecl strstr(str str) MSVCRT_strstr @ cdecl strtod(str ptr) MSVCRT_strtod -@ stub strtof +@ cdecl strtof(str ptr) MSVCRT_strtof @ stub strtoimax @ cdecl strtok(str str) MSVCRT_strtok @ cdecl strtok_s(ptr str ptr) MSVCRT_strtok_s diff --git a/dlls/msvcr120/tests/msvcr120.c b/dlls/msvcr120/tests/msvcr120.c index aa78c4f..c37d8f7 100644 --- a/dlls/msvcr120/tests/msvcr120.c +++ b/dlls/msvcr120/tests/msvcr120.c @@ -21,6 +21,8 @@ #include <stdlib.h> #include <wchar.h> #include <stdio.h> +#include <float.h> +#include <limits.h> #include <windef.h> #include <winbase.h> @@ -83,6 +85,8 @@ static wchar_t** (CDECL *p____lc_locale_name_func)(void); static unsigned int (CDECL *p__GetConcurrency)(void); static void* (CDECL *p__W_Gettnames)(void); static void (CDECL *p_free)(void*); +static float (CDECL *p_strtof)(const char *, char **); +static int (CDECL *p__finite)(double); static BOOL init(void) { @@ -105,6 +109,8 @@ static BOOL init(void) p__GetConcurrency = (void*)GetProcAddress(module,"?_GetConcurrency(a)details@Concurrency@@YAIXZ"); p__W_Gettnames = (void*)GetProcAddress(module, "_W_Gettnames"); p_free = (void*)GetProcAddress(module, "free"); + p_strtof = (void*)GetProcAddress(module, "strtof"); + p__finite = (void*)GetProcAddress(module, "_finite"); return TRUE; } @@ -321,6 +327,48 @@ static void test__W_Gettnames(void) p_setlocale(LC_ALL, "C"); } +static void test__strtof(void) +{ + const char float1[] = "12.0"; + const char float2[] = "3.402823466e+38"; /* FLT_MAX */ + const char float3[] = "-3.402823466e+38"; + const char float4[] = "1.7976931348623158e+308"; /* DBL_MAX */ + + char *end; + float f; + + f = p_strtof(float1, &end); + ok(f == 12.0, "f = %lf\n", f); + ok(end == float1+4, "incorrect end (%d)\n", (int)(end-float1)); + + f = p_strtof(float2, &end); + ok(f == FLT_MAX, "f = %lf\n", f); + ok(end == float2+15, "incorrect end (%d)\n", (int)(end-float2)); + + f = p_strtof(float3, &end); + ok(f == -FLT_MAX, "f = %lf\n", f); + ok(end == float3+16, "incorrect end (%d)\n", (int)(end-float3)); + + f = p_strtof(float4, &end); + ok(!p__finite(f), "f = %lf\n", f); + ok(end == float4+23, "incorrect end (%d)\n", (int)(end-float4)); + + f = p_strtof("inf", NULL); + ok(f == 0, "f = %lf\n", f); + + f = p_strtof("INF", NULL); + ok(f == 0, "f = %lf\n", f); + + f = p_strtof("1.#inf", NULL); + ok(f == 1, "f = %lf\n", f); + + f = p_strtof("INFINITY", NULL); + ok(f == 0, "f = %lf\n", f); + + f = p_strtof("0x12", NULL); + ok(f == 0, "f = %lf\n", f); +} + START_TEST(msvcr120) { if (!init()) return; @@ -330,4 +378,5 @@ START_TEST(msvcr120) test____lc_locale_name_func(); test__GetConcurrency(); test__W_Gettnames(); + test__strtof(); } diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index f938eff..682f2c7 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1442,7 +1442,7 @@ @ cdecl _strtime(ptr) msvcr120._strtime @ cdecl _strtime_s(ptr long) msvcr120._strtime_s @ cdecl _strtod_l(str ptr ptr) msvcr120._strtod_l -@ stub _strtof_l +@ cdecl _strtof_l(str ptr ptr) msvcr120._strtof_l @ cdecl -ret64 _strtoi64(str ptr long) msvcr120._strtoi64 @ cdecl -ret64 _strtoi64_l(str ptr long ptr) msvcr120._strtoi64_l @ stub _strtoimax_l @@ -2049,7 +2049,7 @@ @ cdecl strspn(str str) msvcr120.strspn @ cdecl strstr(str str) msvcr120.strstr @ cdecl strtod(str ptr) msvcr120.strtod -@ stub strtof +@ cdecl strtof(str ptr) msvcr120.strtof @ stub strtoimax @ cdecl strtok(str str) msvcr120.strtok @ cdecl strtok_s(ptr str ptr) msvcr120.strtok_s diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 1946b27..85f09ad 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -497,6 +497,22 @@ double CDECL MSVCRT_strtod( const char *str, char **end ) } /********************************************************************* + * strtof_l (MSVCR120.@) + */ +float CDECL MSVCRT__strtof_l( const char *str, char **end, MSVCRT__locale_t locale ) +{ + return MSVCRT_strtod_l(str, end, locale); +} + +/********************************************************************* + * strtof (MSVCR120.@) + */ +float CDECL MSVCRT_strtof( const char *str, char **end ) +{ + return MSVCRT__strtof_l(str, end, NULL); +} + +/********************************************************************* * atof (MSVCRT.@) */ double CDECL MSVCRT_atof( const char *str ) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 801cb99..2a6906f 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -1949,7 +1949,7 @@ @ cdecl _strtime(ptr) MSVCRT__strtime @ cdecl _strtime_s(ptr long) @ cdecl _strtod_l(str ptr ptr) MSVCRT_strtod_l -@ stub _strtof_l +@ cdecl _strtof_l(str ptr ptr) MSVCRT__strtof_l @ cdecl -ret64 _strtoi64(str ptr long) MSVCRT_strtoi64 @ cdecl -ret64 _strtoi64_l(str ptr long ptr) MSVCRT_strtoi64_l @ stub _strtoimax_l @@ -2516,7 +2516,7 @@ @ cdecl strspn(str str) ntdll.strspn @ cdecl strstr(str str) MSVCRT_strstr @ cdecl strtod(str ptr) MSVCRT_strtod -@ stub strtof +@ cdecl strtof(str ptr) MSVCRT_strtof @ stub strtoimax @ cdecl strtok(str str) MSVCRT_strtok @ cdecl strtok_s(ptr str ptr) MSVCRT_strtok_s

1 0

Alexandre Julliard : libwine: Generate the composition tables access code along with the tables.
by Alexandre Julliard Feb. 19, 2016

Feb. 19, 2016

Module: wine Branch: master Commit: faf3871e77f4a3baced64c49aec255c2ea6cb223 URL: http://source.winehq.org/git/wine.git/?a=commit;h=faf3871e77f4a3baced64c49a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 19 11:38:14 2016 +0900 libwine: Generate the composition tables access code along with the tables. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/wine/compose.c | 26 ++++++++++++++++++++++++-- libs/wine/decompose.c | 15 ++++++++++++++- libs/wine/mbtowc.c | 28 ++++++---------------------- libs/wine/sortkey.c | 8 +++----- libs/wine/utf8.c | 6 +++--- libs/wine/wctomb.c | 48 +++++------------------------------------------- tools/make_unicode | 47 +++++++++++++++++++++++++++++++++++++++++++---- 7 files changed, 98 insertions(+), 80 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=faf3871e77f4a3baced64…

1 0

Sebastian Lackner : ntdll/tests: Add separate tests for exception handling of int $0x3.
by Alexandre Julliard Feb. 19, 2016

Feb. 19, 2016

Module: wine Branch: master Commit: 109e847f2ac79a31a4a39eaf854da8ee7c9ac9ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=109e847f2ac79a31a4a39eaf8… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Feb 19 03:08:25 2016 +0100 ntdll/tests: Add separate tests for exception handling of int $0x3. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/exception.c | 75 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 75 insertions(+) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 1871941..0f07404 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -954,6 +954,15 @@ static void test_debugger(void) if (stage == 8) continuestatus = DBG_EXCEPTION_NOT_HANDLED; } + else if (stage == 9 || stage == 10) + { + ok(de.u.Exception.ExceptionRecord.ExceptionCode == EXCEPTION_BREAKPOINT, + "expected EXCEPTION_BREAKPOINT, got %08x\n", de.u.Exception.ExceptionRecord.ExceptionCode); + ok((char *)ctx.Eip == (char *)code_mem_address + 2, + "expected Eip = %p, got 0x%x\n", (char *)code_mem_address + 2, ctx.Eip); + + if (stage == 10) continuestatus = DBG_EXCEPTION_NOT_HANDLED; + } else ok(FALSE, "unexpected stage %x\n", stage); @@ -2056,6 +2065,66 @@ static void test_debug_service(DWORD numexc) pRtlRemoveVectoredExceptionHandler(vectored_handler); } +static DWORD breakpoint_exceptions; + +static LONG CALLBACK breakpoint_handler(EXCEPTION_POINTERS *ExceptionInfo) +{ + EXCEPTION_RECORD *rec = ExceptionInfo->ExceptionRecord; + trace("vect. handler %08x addr:%p\n", rec->ExceptionCode, rec->ExceptionAddress); + + ok(rec->ExceptionCode == EXCEPTION_BREAKPOINT, "ExceptionCode is %08x instead of %08x\n", + rec->ExceptionCode, EXCEPTION_BREAKPOINT); + +#ifdef __i386__ + ok(ExceptionInfo->ContextRecord->Eip == (DWORD)code_mem + 1, + "expected Eip = %x, got %x\n", (DWORD)code_mem + 1, ExceptionInfo->ContextRecord->Eip); + todo_wine + ok(rec->NumberParameters == (is_wow64 ? 1 : 3), + "ExceptionParameters is %d instead of %d\n", rec->NumberParameters, is_wow64 ? 1 : 3); + todo_wine + ok(rec->ExceptionInformation[0] == 0, + "got ExceptionInformation[0] = %lx\n", rec->ExceptionInformation[0]); + ExceptionInfo->ContextRecord->Eip = (DWORD)code_mem + 2; +#else + todo_wine + ok(ExceptionInfo->ContextRecord->Rip == (DWORD_PTR)code_mem + 1, + "expected Rip = %lx, got %lx\n", (DWORD_PTR)code_mem + 1, ExceptionInfo->ContextRecord->Rip); + todo_wine + ok(rec->NumberParameters == 1, + "ExceptionParameters is %d instead of 1\n", rec->NumberParameters); + todo_wine + ok(rec->ExceptionInformation[0] == 0, + "got ExceptionInformation[0] = %lx\n", rec->ExceptionInformation[0]); + ExceptionInfo->ContextRecord->Rip = (DWORD_PTR)code_mem + 2; +#endif + + breakpoint_exceptions++; + return (rec->ExceptionCode == EXCEPTION_BREAKPOINT) ? EXCEPTION_CONTINUE_EXECUTION : EXCEPTION_CONTINUE_SEARCH; +} + +static const BYTE breakpoint_code[] = { + 0xcd, 0x03, /* int $0x3 */ + 0xc3, /* ret */ +}; + +static void test_breakpoint(DWORD numexc) +{ + DWORD (CDECL *func)(void) = code_mem; + void *vectored_handler; + + memcpy(code_mem, breakpoint_code, sizeof(breakpoint_code)); + + vectored_handler = pRtlAddVectoredExceptionHandler(TRUE, &breakpoint_handler); + ok(vectored_handler != 0, "RtlAddVectoredExceptionHandler failed\n"); + + breakpoint_exceptions = 0; + func(); + ok(breakpoint_exceptions == numexc, "int $0x3 generated %u exceptions, expected %u\n", + breakpoint_exceptions, numexc); + + pRtlRemoveVectoredExceptionHandler(vectored_handler); +} + static void test_vectored_continue_handler(void) { PVOID handler1, handler2; @@ -2179,6 +2248,10 @@ START_TEST(exception) test_debug_service(0); test_stage = 8; test_debug_service(1); + test_stage = 9; + test_breakpoint(0); + test_stage = 10; + test_breakpoint(1); } else skip( "RtlRaiseException not found\n" ); @@ -2194,6 +2267,7 @@ START_TEST(exception) test_outputdebugstring(1, FALSE); test_ripevent(1); test_debug_service(1); + test_breakpoint(1); test_vectored_continue_handler(); test_debugger(); test_simd_exceptions(); @@ -2215,6 +2289,7 @@ START_TEST(exception) test_outputdebugstring(1, FALSE); test_ripevent(1); test_debug_service(1); + test_breakpoint(1); test_vectored_continue_handler(); test_virtual_unwind();

1 0

Sebastian Lackner : ntdll/tests: Add additional tests for instruction pointer in debug service tests.
by Alexandre Julliard Feb. 19, 2016

Feb. 19, 2016

Module: wine Branch: master Commit: 4e878e9114e16cef656f92aa61cb026669077751 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e878e9114e16cef656f92aa6… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Feb 19 03:08:10 2016 +0100 ntdll/tests: Add additional tests for instruction pointer in debug service tests. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/exception.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 94ccd7a..1871941 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -949,6 +949,8 @@ static void test_debugger(void) { ok(de.u.Exception.ExceptionRecord.ExceptionCode == EXCEPTION_BREAKPOINT, "expected EXCEPTION_BREAKPOINT, got %08x\n", de.u.Exception.ExceptionRecord.ExceptionCode); + ok((char *)ctx.Eip == (char *)code_mem_address + 0x1d, + "expected Eip = %p, got 0x%x\n", (char *)code_mem_address + 0x1d, ctx.Eip); if (stage == 8) continuestatus = DBG_EXCEPTION_NOT_HANDLED; } @@ -1885,6 +1887,8 @@ static LONG CALLBACK debug_service_handler(EXCEPTION_POINTERS *ExceptionInfo) rec->ExceptionCode, EXCEPTION_BREAKPOINT); #ifdef __i386__ + ok(ExceptionInfo->ContextRecord->Eip == (DWORD)code_mem + 0x1c, + "expected Eip = %x, got %x\n", (DWORD)code_mem + 0x1c, ExceptionInfo->ContextRecord->Eip); ok(rec->NumberParameters == (is_wow64 ? 1 : 3), "ExceptionParameters is %d instead of %d\n", rec->NumberParameters, is_wow64 ? 1 : 3); ok(rec->ExceptionInformation[0] == ExceptionInfo->ContextRecord->Eax, @@ -1898,6 +1902,9 @@ static LONG CALLBACK debug_service_handler(EXCEPTION_POINTERS *ExceptionInfo) "got ExceptionInformation[2] = %lx\n", rec->ExceptionInformation[2]); } #else + todo_wine + ok(ExceptionInfo->ContextRecord->Rip == (DWORD_PTR)code_mem + 0x2f, + "expected Rip = %lx, got %lx\n", (DWORD_PTR)code_mem + 0x2f, ExceptionInfo->ContextRecord->Rip); ok(rec->NumberParameters == 1, "ExceptionParameters is %d instead of 1\n", rec->NumberParameters); ok(rec->ExceptionInformation[0] == ExceptionInfo->ContextRecord->Rax,

1 0

YongHao Hu : msvcp110: Add tr2_sys__Symlink implementation and test.
by Alexandre Julliard Feb. 19, 2016

Feb. 19, 2016

Module: wine Branch: master Commit: d6dcc253bf907e4e92f24821eb960e528c2f5485 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6dcc253bf907e4e92f24821e… Author: YongHao Hu <christopherwuy(a)gmail.com> Date: Fri Feb 19 00:46:51 2016 +0800 msvcp110: Add tr2_sys__Symlink implementation and test. Signed-off-by: YongHao Hu <christopherwuy(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp110/msvcp110.spec | 4 +-- dlls/msvcp120/msvcp120.spec | 4 +-- dlls/msvcp120/tests/msvcp120.c | 65 +++++++++++++++++++++++++++++++++++++ dlls/msvcp120_app/msvcp120_app.spec | 4 +-- dlls/msvcp90/ios.c | 13 ++++++++ 5 files changed, 84 insertions(+), 6 deletions(-) diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index 1df4c55..3d89924 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -1771,8 +1771,8 @@ @ cdecl -arch=arm ?_Swap_all(a)_Container_base12@std@@QAAXAAU12@@Z(ptr ptr) _Container_base12__Swap_all @ thiscall -arch=i386 ?_Swap_all(a)_Container_base12@std@@QAEXAAU12@@Z(ptr ptr) _Container_base12__Swap_all @ cdecl -arch=win64 ?_Swap_all(a)_Container_base12@std@@QEAAXAEAU12@@Z(ptr ptr) _Container_base12__Swap_all -@ stub -arch=win32 ?_Symlink(a)sys@tr2(a)std@@YAHPBD0(a)Z -@ stub -arch=win64 ?_Symlink(a)sys@tr2(a)std@@YAHPEBD0(a)Z +@ cdecl -arch=win32 ?_Symlink(a)sys@tr2(a)std@@YAHPBD0(a)Z(str str) tr2_sys__Symlink +@ cdecl -arch=win64 ?_Symlink(a)sys@tr2(a)std@@YAHPEBD0(a)Z(str str) tr2_sys__Symlink @ stub -arch=win32 ?_Symlink(a)sys@tr2(a)std@@YAHPB_W0(a)Z @ stub -arch=win64 ?_Symlink(a)sys@tr2(a)std@@YAHPEB_W0(a)Z @ extern ?_Sync(a)ios_base@std@@0_NA ios_base_Sync diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec index 626ead8..1bb487e 100644 --- a/dlls/msvcp120/msvcp120.spec +++ b/dlls/msvcp120/msvcp120.spec @@ -1732,8 +1732,8 @@ @ cdecl -arch=arm ?_Swap_all(a)_Container_base12@std@@QAAXAAU12@@Z(ptr ptr) _Container_base12__Swap_all @ thiscall -arch=i386 ?_Swap_all(a)_Container_base12@std@@QAEXAAU12@@Z(ptr ptr) _Container_base12__Swap_all @ cdecl -arch=win64 ?_Swap_all(a)_Container_base12@std@@QEAAXAEAU12@@Z(ptr ptr) _Container_base12__Swap_all -@ stub -arch=win32 ?_Symlink(a)sys@tr2(a)std@@YAHPBD0(a)Z -@ stub -arch=win64 ?_Symlink(a)sys@tr2(a)std@@YAHPEBD0(a)Z +@ cdecl -arch=win32 ?_Symlink(a)sys@tr2(a)std@@YAHPBD0(a)Z(str str) tr2_sys__Symlink +@ cdecl -arch=win64 ?_Symlink(a)sys@tr2(a)std@@YAHPEBD0(a)Z(str str) tr2_sys__Symlink @ stub -arch=win32 ?_Symlink(a)sys@tr2(a)std@@YAHPB_W0(a)Z @ stub -arch=win64 ?_Symlink(a)sys@tr2(a)std@@YAHPEB_W0(a)Z @ extern ?_Sync(a)ios_base@std@@0_NA ios_base_Sync diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index 1aaa251..f884d0c 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -133,6 +133,7 @@ static void* (__cdecl *p_tr2_sys__Open_dir)(char*, char const*, int *, enum file static char* (__cdecl *p_tr2_sys__Read_dir)(char*, void*, enum file_type*); static void (__cdecl *p_tr2_sys__Close_dir)(void*); static int (__cdecl *p_tr2_sys__Link)(char const*, char const*); +static int (__cdecl *p_tr2_sys__Symlink)(char const*, char const*); /* thrd */ typedef struct @@ -268,6 +269,8 @@ static BOOL init(void) "?_Close_dir(a)sys@tr2(a)std@@YAXPEAX(a)Z"); SET(p_tr2_sys__Link, "?_Link(a)sys@tr2(a)std@@YAHPEBD0(a)Z"); + SET(p_tr2_sys__Symlink, + "?_Symlink(a)sys@tr2(a)std@@YAHPEBD0(a)Z"); SET(p__Thrd_current, "_Thrd_current"); } else { @@ -323,6 +326,8 @@ static BOOL init(void) "?_Close_dir(a)sys@tr2(a)std@@YAXPAX(a)Z"); SET(p_tr2_sys__Link, "?_Link(a)sys@tr2(a)std@@YAHPBD0(a)Z"); + SET(p_tr2_sys__Symlink, + "?_Symlink(a)sys@tr2(a)std@@YAHPBD0(a)Z"); #ifdef __i386__ SET(p_i386_Thrd_current, "_Thrd_current"); @@ -1396,6 +1401,65 @@ static void test_tr2_sys__Link(void) ok(SetCurrentDirectoryA(current_path), "SetCurrentDirectoryA failed\n"); } +static void test_tr2_sys__Symlink(void) +{ + int ret, i; + HANDLE file; + LARGE_INTEGER file_size; + struct { + char const *existing_path; + char const *new_path; + int last_error; + MSVCP_bool is_todo; + } tests[] = { + { "f1", "f1_link", ERROR_SUCCESS, FALSE }, + { "f1", "tr2_test_dir\\f1_link", ERROR_SUCCESS, FALSE }, + { "tr2_test_dir\\f1_link", "tr2_test_dir\\f1_link_link", ERROR_SUCCESS, FALSE }, + { "tr2_test_dir", "dir_link", ERROR_SUCCESS, FALSE }, + { NULL, "NULL_link", ERROR_INVALID_PARAMETER, FALSE }, + { "f1", NULL, ERROR_INVALID_PARAMETER, FALSE }, + { "not_exist", "not_exist_link", ERROR_SUCCESS, FALSE }, + { "f1", "not_exist_dir\\f1_link", ERROR_PATH_NOT_FOUND, TRUE } + }; + + ret = p_tr2_sys__Make_dir("tr2_test_dir"); + ok(ret == 1, "test_tr2_sys__Make_dir(): expect 1 got %d\n", ret); + file = CreateFileA("f1", GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL); + ok(file != INVALID_HANDLE_VALUE, "create file failed: INVALID_HANDLE_VALUE\n"); + file_size.QuadPart = 7; + ok(SetFilePointerEx(file, file_size, NULL, FILE_BEGIN), "SetFilePointerEx failed\n"); + ok(SetEndOfFile(file), "SetEndOfFile failed\n"); + CloseHandle(file); + + for(i=0; i<sizeof(tests)/sizeof(tests[0]); i++) { + errno = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = p_tr2_sys__Symlink(tests[i].existing_path, tests[i].new_path); + if(!i && (ret==ERROR_PRIVILEGE_NOT_HELD || ret==ERROR_INVALID_FUNCTION)) { + win_skip("Privilege not held or symbolic link not supported, skipping symbolic link tests.\n"); + ok(DeleteFileA("f1"), "expect f1 to exist\n"); + ret = p_tr2_sys__Remove_dir("tr2_test_dir"); + ok(ret == 1, "tr2_sys__Remove_dir(): expect 1 got %d\n", ret); + return; + } + + ok(errno == 0xdeadbeef, "tr2_sys__Symlink(): test %d errno expect 0xdeadbeef, got %d\n", i+1, errno); + todo_wine_if(tests[i].is_todo) + ok(ret == tests[i].last_error, "tr2_sys__Symlink(): test %d expect: %d, got %d\n", i+1, tests[i].last_error, ret); + if(ret == ERROR_SUCCESS) + ok(p_tr2_sys__File_size(tests[i].new_path) == 0, "tr2_sys__Symlink(): expect 0, got %s\n", debugstr_longlong(p_tr2_sys__File_size(tests[i].new_path))); + } + + ok(DeleteFileA("f1"), "expect f1 to exist\n"); + todo_wine ok(DeleteFileA("f1_link"), "expect f1_link to exist\n"); + todo_wine ok(DeleteFileA("tr2_test_dir/f1_link"), "expect tr2_test_dir/f1_link to exist\n"); + todo_wine ok(DeleteFileA("tr2_test_dir/f1_link_link"), "expect tr2_test_dir/f1_link_link to exist\n"); + todo_wine ok(DeleteFileA("not_exist_link"), "expect not_exist_link to exist\n"); + todo_wine ok(DeleteFileA("dir_link"), "expect dir_link to exist\n"); + ret = p_tr2_sys__Remove_dir("tr2_test_dir"); + ok(ret == 1, "tr2_sys__Remove_dir(): expect 1 got %d\n", ret); +} + static int __cdecl thrd_thread(void *arg) { _Thrd_t *thr = arg; @@ -1686,6 +1750,7 @@ START_TEST(msvcp120) test_tr2_sys__Last_write_time(); test_tr2_sys__dir_operation(); test_tr2_sys__Link(); + test_tr2_sys__Symlink(); test_thrd(); test_cnd(); diff --git a/dlls/msvcp120_app/msvcp120_app.spec b/dlls/msvcp120_app/msvcp120_app.spec index 517e1b0..2d0a95b 100644 --- a/dlls/msvcp120_app/msvcp120_app.spec +++ b/dlls/msvcp120_app/msvcp120_app.spec @@ -1732,8 +1732,8 @@ @ cdecl -arch=arm ?_Swap_all(a)_Container_base12@std@@QAAXAAU12@@Z(ptr ptr) msvcp120.?_Swap_all(a)_Container_base12@std@@QAAXAAU12@@Z @ thiscall -arch=i386 ?_Swap_all(a)_Container_base12@std@@QAEXAAU12@@Z(ptr ptr) msvcp120.?_Swap_all(a)_Container_base12@std@@QAEXAAU12@@Z @ cdecl -arch=win64 ?_Swap_all(a)_Container_base12@std@@QEAAXAEAU12@@Z(ptr ptr) msvcp120.?_Swap_all(a)_Container_base12@std@@QEAAXAEAU12@@Z -@ stub -arch=win32 ?_Symlink(a)sys@tr2(a)std@@YAHPBD0(a)Z -@ stub -arch=win64 ?_Symlink(a)sys@tr2(a)std@@YAHPEBD0(a)Z +@ cdecl -arch=win32 ?_Symlink(a)sys@tr2(a)std@@YAHPBD0(a)Z(str str) msvcp120.?_Symlink(a)sys@tr2(a)std@@YAHPBD0(a)Z +@ cdecl -arch=win64 ?_Symlink(a)sys@tr2(a)std@@YAHPEBD0(a)Z(str str) msvcp120.?_Symlink(a)sys@tr2(a)std@@YAHPEBD0(a)Z @ stub -arch=win32 ?_Symlink(a)sys@tr2(a)std@@YAHPB_W0(a)Z @ stub -arch=win64 ?_Symlink(a)sys@tr2(a)std@@YAHPEB_W0(a)Z @ extern ?_Sync(a)ios_base@std@@0_NA msvcp120.?_Sync(a)ios_base@std@@0_NA diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 12e2984..d9ff610 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -14769,6 +14769,19 @@ int __cdecl tr2_sys__Link(char const* existing_path, char const* new_path) return GetLastError(); } +/* ?_Symlink(a)sys@tr2(a)std@@YAHPBD0(a)Z */ +/* ?_Symlink(a)sys@tr2(a)std@@YAHPEBD0(a)Z */ +int __cdecl tr2_sys__Symlink(char const* existing_file_name, char const* file_name) +{ + TRACE("(%s %s)\n", debugstr_a(existing_file_name), debugstr_a(file_name)); + if(!existing_file_name || !file_name) + return ERROR_INVALID_PARAMETER; + + if(CreateSymbolicLinkA(file_name, existing_file_name, 0)) + return ERROR_SUCCESS; + return GetLastError(); +} + /* ??0strstream(a)std@@QAE(a)PADHH@Z */ /* ??0strstream(a)std@@QEAA(a)PEAD_JH@Z */ #if STREAMSIZE_BITS == 64

1 0

YongHao Hu : msvcp120/tests: Simplify tests by using todo_wine_if.
by Alexandre Julliard Feb. 19, 2016

Feb. 19, 2016

Module: wine Branch: master Commit: 43bcc0d597a4e089d3e211a1a4053521108b8899 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43bcc0d597a4e089d3e211a1a… Author: YongHao Hu <christopherwuy(a)gmail.com> Date: Fri Feb 19 00:44:37 2016 +0800 msvcp120/tests: Simplify tests by using todo_wine_if. Signed-off-by: YongHao Hu <christopherwuy(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp120/tests/msvcp120.c | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index 77a6050..1aaa251 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -966,14 +966,9 @@ static void test_tr2_sys__Copy_file(void) for(i=0; i<sizeof(tests)/sizeof(tests[0]); i++) { errno = 0xdeadbeef; ret = p_tr2_sys__Copy_file(tests[i].source, tests[i].dest, tests[i].fail_if_exists); - if(tests[i].is_todo) - todo_wine ok(ret == tests[i].last_error || ret == tests[i].last_error2, - "test_tr2_sys__Copy_file(): test %d expect: %d, got %d\n", - i+1, tests[i].last_error, ret); - else + todo_wine_if(tests[i].is_todo) ok(ret == tests[i].last_error || ret == tests[i].last_error2, - "test_tr2_sys__Copy_file(): test %d expect: %d, got %d\n", - i+1, tests[i].last_error, ret); + "test_tr2_sys__Copy_file(): test %d expect: %d, got %d\n", i+1, tests[i].last_error, ret); ok(errno == 0xdeadbeef, "test_tr2_sys__Copy_file(): test %d errno expect 0xdeadbeef, got %d\n", i+1, errno); if(ret == ERROR_SUCCESS) ok(p_tr2_sys__File_size(tests[i].source) == p_tr2_sys__File_size(tests[i].dest), @@ -1166,10 +1161,7 @@ static void test_tr2_sys__Stat(void) for(i=0; i<sizeof(tests)/sizeof(tests[0]); i++) { err_code = 0xdeadbeef; val = p_tr2_sys__Stat(tests[i].path, &err_code); - if(tests[i].is_todo) - todo_wine ok(tests[i].ret == val, "tr2_sys__Stat(): test %d expect: %d, got %d\n", - i+1, tests[i].ret, val); - else + todo_wine_if(tests[i].is_todo) ok(tests[i].ret == val, "tr2_sys__Stat(): test %d expect: %d, got %d\n", i+1, tests[i].ret, val); ok(tests[i].err_code == err_code, "tr2_sys__Stat(): test %d err_code expect: %d, got %d\n", i+1, tests[i].err_code, err_code); @@ -1177,12 +1169,8 @@ static void test_tr2_sys__Stat(void) /* test tr2_sys__Lstat */ err_code = 0xdeadbeef; val = p_tr2_sys__Lstat(tests[i].path, &err_code); - if(tests[i].is_todo) - todo_wine ok(tests[i].ret == val, "tr2_sys__Lstat(): test %d expect: %d, got %d\n", - i+1, tests[i].ret, val); - else + todo_wine_if(tests[i].is_todo) ok(tests[i].ret == val, "tr2_sys__Lstat(): test %d expect: %d, got %d\n", i+1, tests[i].ret, val); - ok(tests[i].err_code == err_code, "tr2_sys__Lstat(): test %d err_code expect: %d, got %d\n", i+1, tests[i].err_code, err_code); }

1 0