wine-commits February 2016

wine-commits@winehq.org

2 participants
755 discussions

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

19 Feb '16

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 19 Feb '16

19 Feb '16

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 19 Feb '16

19 Feb '16

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 19 Feb '16

19 Feb '16

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 19 Feb '16

19 Feb '16

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@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

Piotr Caban : msvcrt: Don' t use isdigit in places where only 0-9 digits are handled.
by Alexandre Julliard 19 Feb '16

19 Feb '16

Module: wine Branch: master Commit: aff5d2c1f3d70b94feaaf964b887e4f11727c729 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aff5d2c1f3d70b94feaaf964b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Feb 18 16:09:55 2016 +0100 msvcrt: Don't use isdigit in places where only 0-9 digits are handled. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/string.c | 20 ++++++++++---------- dlls/msvcrt/wcs.c | 16 ++++++++-------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 59da5bd..1946b27 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -364,12 +364,12 @@ static double strtod_helper(const char *str, char **end, MSVCRT__locale_t locale } #endif - while(isdigit(*p) || + while((*p>='0' && *p<='9') || (base == 16 && ((*p >= 'a' && *p <= 'f') || (*p >= 'A' && *p <= 'F')))) { char c = *p++; int val; found_digit = TRUE; - if (isdigit(c)) + if (c>='0' && c<='9') val = c - '0'; else if (c >= 'a' && c <= 'f') val = 10 + c - 'a'; @@ -382,7 +382,7 @@ static double strtod_helper(const char *str, char **end, MSVCRT__locale_t locale } else d = hlp; } - while(isdigit(*p) || + while((*p>='0' && *p<='9') || (base == 16 && ((*p >= 'a' && *p <= 'f') || (*p >= 'A' && *p <= 'F')))) { exp++; p++; @@ -391,12 +391,12 @@ static double strtod_helper(const char *str, char **end, MSVCRT__locale_t locale if(*p == *locinfo->lconv->decimal_point) p++; - while(isdigit(*p) || + while((*p>='0' && *p<='9') || (base == 16 && ((*p >= 'a' && *p <= 'f') || (*p >= 'A' && *p <= 'F')))) { char c = *p++; int val; found_digit = TRUE; - if (isdigit(c)) + if (c>='0' && c<='9') val = c - '0'; else if (c >= 'a' && c <= 'f') val = 10 + c - 'a'; @@ -408,7 +408,7 @@ static double strtod_helper(const char *str, char **end, MSVCRT__locale_t locale d = hlp; exp--; } - while(isdigit(*p) || + while((*p>='0' && *p<='9') || (base == 16 && ((*p >= 'a' && *p <= 'f') || (*p >= 'A' && *p <= 'F')))) p++; @@ -432,8 +432,8 @@ static double strtod_helper(const char *str, char **end, MSVCRT__locale_t locale } else if(*p == '+') p++; - if(isdigit(*p)) { - while(isdigit(*p)) { + if(*p>='0' && *p<='9') { + while(*p>='0' && *p<='9') { if(e>INT_MAX/10 || (e=e*10+*p-'0')<0) e = INT_MAX; p++; @@ -925,7 +925,7 @@ __int64 CDECL MSVCRT_strtoi64_l(const char *nptr, char **endptr, int base, MSVCR char cur = tolower(*nptr); int v; - if(isdigit(cur)) { + if(cur>='0' && cur<='9') { if(cur >= '0'+base) break; v = cur-'0'; @@ -1128,7 +1128,7 @@ unsigned __int64 CDECL MSVCRT_strtoui64_l(const char *nptr, char **endptr, int b char cur = tolower(*nptr); int v; - if(isdigit(cur)) { + if(cur>='0' && cur<='9') { if(cur >= '0'+base) break; v = *nptr-'0'; diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index b6946a3..0f80d3b 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -374,7 +374,7 @@ double CDECL MSVCRT__wcstod_l(const MSVCRT_wchar_t* str, MSVCRT_wchar_t** end, } else if(*p == '+') p++; - while(isdigitW(*p)) { + while(*p>='0' && *p<='9') { found_digit = TRUE; hlp = d*10+*(p++)-'0'; if(d>MSVCRT_UI64_MAX/10 || hlp<d) { @@ -383,14 +383,14 @@ double CDECL MSVCRT__wcstod_l(const MSVCRT_wchar_t* str, MSVCRT_wchar_t** end, } else d = hlp; } - while(isdigitW(*p)) { + while(*p>='0' && *p<='9') { exp++; p++; } if(*p == *locinfo->lconv->decimal_point) p++; - while(isdigitW(*p)) { + while(*p>='0' && *p<='9') { found_digit = TRUE; hlp = d*10+*(p++)-'0'; if(d>MSVCRT_UI64_MAX/10 || hlp<d) @@ -399,7 +399,7 @@ double CDECL MSVCRT__wcstod_l(const MSVCRT_wchar_t* str, MSVCRT_wchar_t** end, d = hlp; exp--; } - while(isdigitW(*p)) + while(*p>='0' && *p<='9') p++; if(!found_digit) { @@ -418,8 +418,8 @@ double CDECL MSVCRT__wcstod_l(const MSVCRT_wchar_t* str, MSVCRT_wchar_t** end, } else if(*p == '+') p++; - if(isdigitW(*p)) { - while(isdigitW(*p)) { + if(*p>='0' && *p<='9') { + while(*p>='0' && *p<='9') { if(e>INT_MAX/10 || (e=e*10+*p-'0')<0) e = INT_MAX; p++; @@ -1974,7 +1974,7 @@ __int64 CDECL MSVCRT__wcstoi64_l(const MSVCRT_wchar_t *nptr, MSVCRT_wchar_t cur = tolowerW(*nptr); int v; - if(isdigitW(cur)) { + if(cur>='0' && cur<='9') { if(cur >= '0'+base) break; v = cur-'0'; @@ -2139,7 +2139,7 @@ unsigned __int64 CDECL MSVCRT__wcstoui64_l(const MSVCRT_wchar_t *nptr, MSVCRT_wchar_t cur = tolowerW(*nptr); int v; - if(isdigitW(cur)) { + if(cur>='0' && cur<='9') { if(cur >= '0'+base) break; v = *nptr-'0';

1 0

Alexandre Julliard : libwine: Move the wide char to multi-byte conversion functions to libwine_port.
by Alexandre Julliard 19 Feb '16

19 Feb '16

Module: wine Branch: master Commit: 52333e9c5d735c2be40f17991c84956e98eae896 URL: http://source.winehq.org/git/wine.git/?a=commit;h=52333e9c5d735c2be40f17991… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 19 11:43:35 2016 +0900 libwine: Move the wide char to multi-byte conversion functions to libwine_port. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/port/Makefile.in | 5 ++++- libs/{wine => port}/compose.c | 0 libs/{wine => port}/utf8.c | 0 libs/{wine => port}/wctomb.c | 0 libs/wine/Makefile.in | 3 --- libs/wine/port.c | 5 ++++- tools/make_unicode | 2 +- 7 files changed, 9 insertions(+), 6 deletions(-) diff --git a/libs/port/Makefile.in b/libs/port/Makefile.in index 1db8418..9d7e44f 100644 --- a/libs/port/Makefile.in +++ b/libs/port/Makefile.in @@ -73,6 +73,7 @@ C_SRCS = \ c_936.c \ c_949.c \ c_950.c \ + compose.c \ cpsymbol.c \ cptable.c \ decompose.c \ @@ -101,4 +102,6 @@ C_SRCS = \ strerror.c \ strncasecmp.c \ symlink.c \ - usleep.c + usleep.c \ + utf8.c \ + wctomb.c diff --git a/libs/wine/compose.c b/libs/port/compose.c similarity index 100% rename from libs/wine/compose.c rename to libs/port/compose.c diff --git a/libs/wine/utf8.c b/libs/port/utf8.c similarity index 100% rename from libs/wine/utf8.c rename to libs/port/utf8.c diff --git a/libs/wine/wctomb.c b/libs/port/wctomb.c similarity index 100% rename from libs/wine/wctomb.c rename to libs/port/wctomb.c diff --git a/libs/wine/Makefile.in b/libs/wine/Makefile.in index baddb8d..4e96b12 100644 --- a/libs/wine/Makefile.in +++ b/libs/wine/Makefile.in @@ -5,7 +5,6 @@ STATICLIB = libwine_static.a C_SRCS = \ casemap.c \ collation.c \ - compose.c \ config.c \ debug.c \ ldt.c \ @@ -14,8 +13,6 @@ C_SRCS = \ port.c \ sortkey.c \ string.c \ - utf8.c \ - wctomb.c \ wctype.c EXTRA_OBJS = version.o diff --git a/libs/wine/port.c b/libs/wine/port.c index 53fe6df..e05e166 100644 --- a/libs/wine/port.c +++ b/libs/wine/port.c @@ -34,9 +34,12 @@ const void *libwine_port_functions[] = wine_cp_enum_table, wine_cp_get_table, wine_cp_mbstowcs, + wine_cp_wcstombs, wine_cpsymbol_mbstowcs, wine_cpsymbol_wcstombs, - wine_fold_string + wine_fold_string, + wine_utf8_mbstowcs, + wine_utf8_wcstombs }; /* no longer used, for backwards compatibility only */ diff --git a/tools/make_unicode b/tools/make_unicode index 361eb92..60aeb19 100755 --- a/tools/make_unicode +++ b/tools/make_unicode @@ -2465,7 +2465,7 @@ chdir ".." if -f "./make_unicode"; READ_DEFAULTS( $DEFAULTS ); DUMP_CASE_MAPPINGS( "libs/wine/casemap.c" ); DUMP_SORTKEYS( "libs/wine/collation.c", READ_SORTKEYS_FILE() ); -dump_compose_table( "libs/wine/compose.c" ); +dump_compose_table( "libs/port/compose.c" ); dump_decompose_table( "libs/port/decompose.c" ); DUMP_CTYPE_TABLES( "libs/wine/wctype.c" ); dump_digit_folding( "libs/port/digitmap.c" );

1 0

Alexandre Julliard : libwine: Move the multi-byte to wide char conversion functions to libwine_port.
by Alexandre Julliard 19 Feb '16

19 Feb '16

Module: wine Branch: master Commit: f7368aaa97002759676a0f9b8c3806f62a55f6bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7368aaa97002759676a0f9b8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 19 11:41:44 2016 +0900 libwine: Move the multi-byte to wide char conversion functions to libwine_port. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/port/Makefile.in | 2 ++ libs/{wine => port}/decompose.c | 0 libs/{wine => port}/mbtowc.c | 0 libs/wine/Makefile.in | 2 -- libs/wine/port.c | 1 + tools/make_unicode | 2 +- 6 files changed, 4 insertions(+), 3 deletions(-) diff --git a/libs/port/Makefile.in b/libs/port/Makefile.in index 67fb999..1db8418 100644 --- a/libs/port/Makefile.in +++ b/libs/port/Makefile.in @@ -75,6 +75,7 @@ C_SRCS = \ c_950.c \ cpsymbol.c \ cptable.c \ + decompose.c \ digitmap.c \ ffs.c \ fold.c \ @@ -86,6 +87,7 @@ C_SRCS = \ isinf.c \ isnan.c \ lstat.c \ + mbtowc.c \ memcpy_unaligned.c \ memmove.c \ mkstemps.c \ diff --git a/libs/wine/decompose.c b/libs/port/decompose.c similarity index 100% rename from libs/wine/decompose.c rename to libs/port/decompose.c diff --git a/libs/wine/mbtowc.c b/libs/port/mbtowc.c similarity index 100% rename from libs/wine/mbtowc.c rename to libs/port/mbtowc.c diff --git a/libs/wine/Makefile.in b/libs/wine/Makefile.in index b2b250e..baddb8d 100644 --- a/libs/wine/Makefile.in +++ b/libs/wine/Makefile.in @@ -8,10 +8,8 @@ C_SRCS = \ compose.c \ config.c \ debug.c \ - decompose.c \ ldt.c \ loader.c \ - mbtowc.c \ mmap.c \ port.c \ sortkey.c \ diff --git a/libs/wine/port.c b/libs/wine/port.c index 070dfd9..53fe6df 100644 --- a/libs/wine/port.c +++ b/libs/wine/port.c @@ -33,6 +33,7 @@ const void *libwine_port_functions[] = { wine_cp_enum_table, wine_cp_get_table, + wine_cp_mbstowcs, wine_cpsymbol_mbstowcs, wine_cpsymbol_wcstombs, wine_fold_string diff --git a/tools/make_unicode b/tools/make_unicode index de008fc..361eb92 100755 --- a/tools/make_unicode +++ b/tools/make_unicode @@ -2466,7 +2466,7 @@ READ_DEFAULTS( $DEFAULTS ); DUMP_CASE_MAPPINGS( "libs/wine/casemap.c" ); DUMP_SORTKEYS( "libs/wine/collation.c", READ_SORTKEYS_FILE() ); dump_compose_table( "libs/wine/compose.c" ); -dump_decompose_table( "libs/wine/decompose.c" ); +dump_decompose_table( "libs/port/decompose.c" ); DUMP_CTYPE_TABLES( "libs/wine/wctype.c" ); dump_digit_folding( "libs/port/digitmap.c" ); dump_mirroring( "dlls/usp10/mirror.c" );

1 0

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

19 Feb '16

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

Alexandre Julliard : libwine: Move the decomposition table to a separate file.
by Alexandre Julliard 19 Feb '16

19 Feb '16

Module: wine Branch: master Commit: a951d533946b870e6be3912b35fd90f67e6e5a89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a951d533946b870e6be3912b3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 19 11:33:39 2016 +0900 libwine: Move the decomposition table to a separate file. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/wine/Makefile.in | 1 + libs/wine/compose.c | 746 +------------------------------------------------ libs/wine/decompose.c | 748 ++++++++++++++++++++++++++++++++++++++++++++++++++ tools/make_unicode | 40 ++- 4 files changed, 778 insertions(+), 757 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a951d533946b870e6be39…

1 0

← Newer
1
...
18
19
20
21
22
23
24
...
76
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2016