January 2017 - Wine-commits

André Hentschel : oleaut32: Fix OleTranslateColor spec file entry.
by Alexandre Julliard 27 Jan '17

27 Jan '17

Module: wine Branch: master Commit: 655af6d3b228b0175593b5cb0a3933ca9fb861c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=655af6d3b228b0175593b5cb0… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Jan 26 23:46:47 2017 +0100 oleaut32: Fix OleTranslateColor spec file entry. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/oleaut32.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/oleaut32/oleaut32.spec b/dlls/oleaut32/oleaut32.spec index 97aec54..680a588 100644 --- a/dlls/oleaut32/oleaut32.spec +++ b/dlls/oleaut32/oleaut32.spec @@ -389,7 +389,7 @@ 418 stdcall OleLoadPicture(ptr long long ptr ptr) 419 stdcall OleCreatePictureIndirect(ptr ptr long ptr) 420 stdcall OleCreateFontIndirect(ptr ptr ptr) -421 stdcall OleTranslateColor(long long long) +421 stdcall OleTranslateColor(long long ptr) 422 stdcall OleLoadPictureFile(int128 ptr) 423 stdcall OleSavePictureFile(ptr wstr) 424 stdcall OleLoadPicturePath(wstr ptr long long ptr ptr)

1 0

Hans Leidekker : include: Add some missing MAPI defines.
by Alexandre Julliard 27 Jan '17

27 Jan '17

Module: wine Branch: master Commit: ebccc3eb6df4121b8b0b2dc74078767e5f041061 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebccc3eb6df4121b8b0b2dc74… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jan 27 10:28:38 2017 +0100 include: Add some missing MAPI defines. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mapix.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/mapix.h b/include/mapix.h index 04e7eb1..8066062 100644 --- a/include/mapix.h +++ b/include/mapix.h @@ -65,6 +65,9 @@ typedef ULONG FLAGS; #define MAPI_SIMPLE_DEFAULT (MAPI_LOGON_UI|MAPI_ALLOW_OTHERS|MAPI_FORCE_DOWNLOAD) #define MAPI_SIMPLE_EXPLICIT (MAPI_NEW_SESSION|MAPI_EXPLICIT_PROFILE|MAPI_FORCE_DOWNLOAD) +#define MAPI_MULTITHREAD_NOTIFICATIONS 0x00000001 +#define MAPI_NO_COINIT 0x00000008 + typedef struct tagMAPIINIT_0 { ULONG ulVersion;

1 0

Hans Leidekker : include: Update SIID_MAX_ICONS.
by Alexandre Julliard 27 Jan '17

27 Jan '17

Module: wine Branch: master Commit: 3715ae1f2db890cfa17682f86ced4704fe3f1d36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3715ae1f2db890cfa17682f86… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jan 27 10:28:39 2017 +0100 include: Update SIID_MAX_ICONS. Fixes test failures on current Windows 10. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/shellapi.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/shellapi.h b/include/shellapi.h index d1aad6b..eb09937 100644 --- a/include/shellapi.h +++ b/include/shellapi.h @@ -606,8 +606,8 @@ typedef enum SHSTOCKICONID SIID_MEDIABDR, SIID_MEDIABDRE, SIID_CLUSTEREDDRIVE, - /* Missing: 141 - 177 */ - SIID_MAX_ICONS = 178 + /* Missing: 141 - 180 */ + SIID_MAX_ICONS = 181 }SHSTOCKICONID; typedef struct _SHSTOCKICONINFO

1 0

Jeremy Newman : moving some of the theme images over to the CDN
by Jeremy Newman 27 Jan '17

27 Jan '17

Module: appdb Branch: master Commit: 02c30c6e7d11791f780a588fbe8b3cd35d31da7e URL: http://source.winehq.org/git/appdb.git/?a=commit;h=02c30c6e7d11791f780a588f… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Fri Jan 27 12:57:29 2017 -0600 moving some of the theme images over to the CDN --- include/footer.php | 2 +- include/header.php | 6 +++--- styles.css | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/footer.php b/include/footer.php index 1340d41..a64dcad 100644 --- a/include/footer.php +++ b/include/footer.php @@ -6,7 +6,7 @@ <div id="footer"> <a href="https://wiki.winehq.org/WineHQ_Wiki:Privacy_policy">Privacy Policy</a><br><br> Hosted By - <a href="http://www.codeweavers.com/"><img src="https://www.winehq.org/images/cw_logo_sm.png" alt="CodeWeavers" + <a href="http://www.codeweavers.com/"><img src="https://dl.winehq.org/share/images/cw_logo_sm.png" alt="CodeWeavers" title="CodeWeavers - Run Windows applications and games on Mac and Linux"></a> </div> diff --git a/include/header.php b/include/header.php index 516fba0..61aff7b 100644 --- a/include/header.php +++ b/include/header.php @@ -34,7 +34,7 @@ $iJStime = filemtime(BASE."utils.js"); if (!empty($sHeaderCode)) echo " {$sHeaderCode}\n"; ?> - <link rel="shortcut icon" type="image/png" href="<?php echo BASE; ?>images/winehq_logo_16.png"> + <link rel="shortcut icon" type="image/png" href="https://dl.winehq.org/share/images/winehq_logo_16.png"> <link title="AppDB" type="application/opensearchdescription+xml" rel="search" href="<?php echo BASE; ?>opensearch.xml"> </head> <body> @@ -53,8 +53,8 @@ if (!empty($sHeaderCode)) <div class="clear"></div> </nav> -<div id="whq-logo-glass"><a href="https://www.winehq.org/"><img src="https://www.winehq.org/images/winehq_logo_glass.png" alt=""></a></div> -<div id="whq-logo-text"><a href="https://www.winehq.org/"><img src="https://www.winehq.org/images/winehq_logo_text.png" alt="WineHQ" title="WineHQ"></a></div> +<div id="whq-logo-glass"><a href="https://www.winehq.org/"><img src="https://dl.winehq.org/share/images/winehq_logo_glass.png" alt=""></a></div> +<div id="whq-logo-text"><a href="https://www.winehq.org/"><img src="https://dl.winehq.org/share/images/winehq_logo_text.png" alt="WineHQ" title="WineHQ"></a></div> <div id="whq-search_box"> <form action="https://www.winehq.org/search" id="cse-search-box"> diff --git a/styles.css b/styles.css index 725a99a..ee66a10 100644 --- a/styles.css +++ b/styles.css @@ -17,7 +17,7 @@ HTML { BODY { background-color: #000000 !important; color: #000000; - background-image: url('https://www.winehq.org/images/bg.jpg'); + background-image: url('https://dl.winehq.org/share/images/bg.jpg'); background-repeat: no-repeat; background-attachment: fixed; height: 100%;

1 0

Jeremy Newman : moving some of the theme images over to the CDN
by Jeremy Newman 27 Jan '17

27 Jan '17

Module: website Branch: master Commit: 8bec4b5030c7a9ca090013e4ca71fcdef61ade39 URL: http://source.winehq.org/git/website.git/?a=commit;h=8bec4b5030c7a9ca090013… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Fri Jan 27 12:54:48 2017 -0600 moving some of the theme images over to the CDN --- css/styles.css | 2 +- templates/en/global/layout/content.template | 8 ++++---- templates/fr/global/layout/content.template | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/css/styles.css b/css/styles.css index 87017f9..ae2481b 100644 --- a/css/styles.css +++ b/css/styles.css @@ -27,7 +27,7 @@ PRE { BODY { background-color: #000000; color: #000000; - background-image: url('../images/bg.jpg'); + background-image: url('https://dl.winehq.org/share/images/bg.jpg'); background-repeat: no-repeat; background-attachment: fixed; } diff --git a/templates/en/global/layout/content.template b/templates/en/global/layout/content.template index 226edc8..dc54550 100644 --- a/templates/en/global/layout/content.template +++ b/templates/en/global/layout/content.template @@ -29,7 +29,7 @@  - <link rel="shortcut icon" type="image/png" href="{$root}/images/winehq_logo_16.png"> + <link rel="shortcut icon" type="image/png" href="https://dl.winehq.org/share/images/winehq_logo_16.png"> {$rss_link} </head> <body class="page-{$page_name}{$page_body_class}"> @@ -46,8 +46,8 @@ </div> <div class="clear"></div> -<div id="whq-logo-glass"><a href="{$root}/"><img src="{$root}/images/winehq_logo_glass.png" alt=""></a></div> -<div id="whq-logo-text"><a href="{$root}/"><img src="{$root}/images/winehq_logo_text.png" alt="WineHQ" title="WineHQ"></a></div> +<div id="whq-logo-glass"><a href="{$root}/"><img src="https://dl.winehq.org/share/images/winehq_logo_glass.png" alt=""></a></div> +<div id="whq-logo-text"><a href="{$root}/"><img src="https://dl.winehq.org/share/images/winehq_logo_text.png" alt="WineHQ" title="WineHQ"></a></div> <div id="whq-search-box"> <form action="{$root}/search" id="cse-search-box"> @@ -70,7 +70,7 @@ <div class="col-xs-6 text-right"> <a href="https://wiki.winehq.org/WineHQ_Wiki:Privacy_policy">Privacy Policy</a><br><br> {trans($hosted_by)} - <a href="https://www.codeweavers.com/"><img src="{$root}/images/cw_logo_sm.png" alt="CodeWeavers" + <a href="https://www.codeweavers.com/"><img src="https://dl.winehq.org/share/images/cw_logo_sm.png" alt="CodeWeavers" title="{trans($hosted_by_alt)}"></a> </div> </div> diff --git a/templates/fr/global/layout/content.template b/templates/fr/global/layout/content.template index fa3ccfd..969dcb6 100644 --- a/templates/fr/global/layout/content.template +++ b/templates/fr/global/layout/content.template @@ -29,7 +29,7 @@  - <link rel="shortcut icon" type="image/png" href="{$root}/images/winehq_logo_16.png"> + <link rel="shortcut icon" type="image/png" href="https://dl.winehq.org/share/images/winehq_logo_16.png"> {$rss_link} </head> <body class="page-{$page_name}{$page_body_class}"> @@ -46,8 +46,8 @@ </div> <div class="clear"></div> -<div id="whq-logo-glass"><a href="{$root}/"><img src="{$root}/images/winehq_logo_glass.png" alt=""></a></div> -<div id="whq-logo-text"><a href="{$root}/"><img src="{$root}/images/winehq_logo_text.png" alt="WineHQ" title="WineHQ"></a></div> +<div id="whq-logo-glass"><a href="{$root}/"><img src="https://dl.winehq.org/share/images/winehq_logo_glass.png" alt=""></a></div> +<div id="whq-logo-text"><a href="{$root}/"><img src="https://dl.winehq.org/share/images/winehq_logo_text.png" alt="WineHQ" title="WineHQ"></a></div> <div id="whq-search-box"> <form action="{$root}/search" id="cse-search-box"> @@ -69,7 +69,7 @@ </div> <div class="col-xs-6 text-right"> {trans($hosted_by)} - <a href="https://www.codeweavers.com/"><img src="{$root}/images/cw_logo_sm.png" alt="CodeWeavers" + <a href="https://www.codeweavers.com/"><img src="https://dl.winehq.org/share/images/cw_logo_sm.png" alt="CodeWeavers" title="{trans($hosted_by_alt)}"></a> </div> </div>

1 0

Lauri Kenttä : msvcrt: Move WCHAR-to-int conversion to a function.
by Alexandre Julliard 26 Jan '17

26 Jan '17

Module: wine Branch: master Commit: bdd771dfa7ca3b8c7742c1800e1b00dbcb04fa7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdd771dfa7ca3b8c7742c1800… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Wed Jan 25 17:02:24 2017 +0200 msvcrt: Move WCHAR-to-int conversion to a function. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/wcs.c | 53 +++++++++++++++++++++++++---------------------------- 1 file changed, 25 insertions(+), 28 deletions(-) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index c497a10..b9603f5 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -2016,6 +2016,21 @@ INT CDECL MSVCRT_wcsncat_s(MSVCRT_wchar_t *dst, MSVCRT_size_t elem, } /********************************************************************* + * wctoint (INTERNAL) + */ +static int wctoint(WCHAR c, int base) +{ + int v = -1; + if ('0' <= c && c <= '9') + v = c - '0'; + else if ('A' <= c && c <= 'Z') + v = c - 'A' + 10; + else if ('a' <= c && c <= 'z') + v = c - 'a' + 10; + return v < base ? v : -1; +} + +/********************************************************************* * _wcstoi64_l (MSVCRT.@) * * FIXME: locale parameter is ignored @@ -2040,31 +2055,22 @@ __int64 CDECL MSVCRT__wcstoi64_l(const MSVCRT_wchar_t *nptr, } else if(*nptr == '+') nptr++; - if((base==0 || base==16) && *nptr=='0' && tolowerW(*(nptr+1))=='x') { + if((base==0 || base==16) && wctoint(*nptr, 1)==0 && tolowerW(*(nptr+1))=='x') { base = 16; nptr += 2; } if(base == 0) { - if(*nptr=='0') + if(wctoint(*nptr, 1)==0) base = 8; else base = 10; } while(*nptr) { - MSVCRT_wchar_t cur = tolowerW(*nptr); - int v; - - if(cur>='0' && cur<='9') { - if(cur >= '0'+base) - break; - v = cur-'0'; - } else { - if(cur<'a' || cur>='a'+base-10) - break; - v = cur-'a'+10; - } + int v = wctoint(*nptr, base); + if(v<0) + break; if(negative) v = -v; @@ -2205,31 +2211,22 @@ unsigned __int64 CDECL MSVCRT__wcstoui64_l(const MSVCRT_wchar_t *nptr, } else if(*nptr == '+') nptr++; - if((base==0 || base==16) && *nptr=='0' && tolowerW(*(nptr+1))=='x') { + if((base==0 || base==16) && wctoint(*nptr, 1)==0 && tolowerW(*(nptr+1))=='x') { base = 16; nptr += 2; } if(base == 0) { - if(*nptr=='0') + if(wctoint(*nptr, 1)==0) base = 8; else base = 10; } while(*nptr) { - MSVCRT_wchar_t cur = tolowerW(*nptr); - int v; - - if(cur>='0' && cur<='9') { - if(cur >= '0'+base) - break; - v = *nptr-'0'; - } else { - if(cur<'a' || cur>='a'+base-10) - break; - v = cur-'a'+10; - } + int v = wctoint(*nptr, base); + if(v<0) + break; nptr++;

1 0

Lauri Kenttä : msvcrt: Make wcstoi64 support various Unicode digits.
by Alexandre Julliard 26 Jan '17

26 Jan '17

Module: wine Branch: master Commit: 5b6e1cf2de41542a6170f300a2ce24b5d14ee07c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b6e1cf2de41542a6170f300a… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Wed Jan 25 17:02:25 2017 +0200 msvcrt: Make wcstoi64 support various Unicode digits. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/string.c | 22 +++++++++++----------- dlls/msvcrt/wcs.c | 15 +++++++++++++++ 2 files changed, 26 insertions(+), 11 deletions(-) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index c377abf..027df18 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -2862,17 +2862,17 @@ static void test__wcstoi64(void) ok(res == 0, "res != 0\n"); ok(endpos == tamil, "Incorrect endpos (%p-%p)\n", tamil, endpos); res = p_wcstoi64(thai, NULL, 10); - todo_wine ok(res == 9, "res != 9\n"); + ok(res == 9, "res != 9\n"); res = p_wcstoi64(fullwidth, NULL, 10); - todo_wine ok(res == 9, "res != 9\n"); + ok(res == 9, "res != 9\n"); res = p_wcstoi64(superscript1, NULL, 10); ok(res == 0, "res != 0\n"); res = p_wcstoi64(hex, NULL, 16); - todo_wine ok(res == 0x9f9, "res != 0x9f9\n"); + ok(res == 0x9f9, "res != 0x9f9\n"); res = p_wcstoi64(minus_0x91, NULL, 0); - todo_wine ok(res == -0x91, "res != -0x91\n"); + ok(res == -0x91, "res != -0x91\n"); res = p_wcstoi64(plus_071, NULL, 0); - todo_wine ok(res == 071, "res != 071\n"); + ok(res == 071, "res != 071\n"); ures = p_wcstoui64(digit, NULL, 10); ok(ures == 9, "ures != 9\n"); @@ -2883,24 +2883,24 @@ static void test__wcstoi64(void) ok(ures == 0, "ures != 0\n"); ok(endpos == tamil, "Incorrect endpos (%p-%p)\n", tamil, endpos); ures = p_wcstoui64(thai, NULL, 10); - todo_wine ok(ures == 9, "ures != 9\n"); + ok(ures == 9, "ures != 9\n"); ures = p_wcstoui64(fullwidth, NULL, 10); - todo_wine ok(ures == 9, "ures != 9\n"); + ok(ures == 9, "ures != 9\n"); ures = p_wcstoui64(superscript1, NULL, 10); ok(ures == 0, "ures != 0\n"); ures = p_wcstoui64(hex, NULL, 16); - todo_wine ok(ures == 0x9f9, "ures != 0x9f9\n"); + ok(ures == 0x9f9, "ures != 0x9f9\n"); ures = p_wcstoui64(plus_071, NULL, 0); - todo_wine ok(ures == 071, "ures != 071\n"); + ok(ures == 071, "ures != 071\n"); /* Test various unicode digits */ for (i = 0; i < sizeof(zeros) / sizeof(zeros[0]); ++i) { WCHAR tmp[] = {zeros[i] + 4, zeros[i], zeros[i] + 5, 0}; res = p_wcstoi64(tmp, NULL, 0); - todo_wine ok(res == 405, "with zero = U+%04X: got %d, expected 405\n", zeros[i], (int)res); + ok(res == 405, "with zero = U+%04X: got %d, expected 405\n", zeros[i], (int)res); tmp[1] = zeros[i] + 10; res = p_wcstoi64(tmp, NULL, 16); - todo_wine ok(res == 4, "with zero = U+%04X: got %d, expected 4\n", zeros[i], (int)res); + ok(res == 4, "with zero = U+%04X: got %d, expected 4\n", zeros[i], (int)res); } return; diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index b9603f5..551fb9a 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -2027,6 +2027,21 @@ static int wctoint(WCHAR c, int base) v = c - 'A' + 10; else if ('a' <= c && c <= 'z') v = c - 'a' + 10; + else { + /* NOTE: wine_fold_string(MAP_FOLDDIGITS) supports too many things. */ + /* Unicode points that contain digits 0-9; keep this sorted! */ + static const WCHAR zeros[] = { + 0x660, 0x6f0, 0x966, 0x9e6, 0xa66, 0xae6, 0xb66, 0xc66, 0xce6, + 0xd66, 0xe50, 0xed0, 0xf20, 0x1040, 0x17e0, 0x1810, 0xff10 + }; + int i; + for (i = 0; i < sizeof(zeros)/sizeof(zeros[0]) && c >= zeros[i]; ++i) { + if (zeros[i] <= c && c <= zeros[i] + 9) { + v = c - zeros[i]; + break; + } + } + } return v < base ? v : -1; }

1 0

Lauri Kenttä : msvcrt: Fix space-only inputs in wcstoi64.
by Alexandre Julliard 26 Jan '17

26 Jan '17

Module: wine Branch: master Commit: 96a48efeeade7359c8c84a8c3a0a9768fb2a6194 URL: http://source.winehq.org/git/wine.git/?a=commit;h=96a48efeeade7359c8c84a8c3… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Wed Jan 25 17:02:26 2017 +0200 msvcrt: Fix space-only inputs in wcstoi64. wcstoi64 sets endpos past the beginning only if some digits are found. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/string.c | 5 +++++ dlls/msvcrt/wcs.c | 16 ++++++++++++---- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 027df18..a59ed91 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -2827,6 +2827,7 @@ static void test__stricmp(void) static void test__wcstoi64(void) { static const WCHAR digit[] = { '9', 0 }; + static const WCHAR space[] = { ' ', 0 }; static const WCHAR stock[] = { 0x3231, 0 }; /* PARENTHESIZED IDEOGRAPH STOCK */ static const WCHAR cjk_1[] = { 0x4e00, 0 }; /* CJK Ideograph, First */ static const WCHAR tamil[] = { 0x0bef, 0 }; /* TAMIL DIGIT NINE */ @@ -2853,6 +2854,8 @@ static void test__wcstoi64(void) res = p_wcstoi64(digit, NULL, 10); ok(res == 9, "res != 9\n"); + res = p_wcstoi64(space, &endpos, 0); + ok(endpos == space, "endpos != space\n"); res = p_wcstoi64(stock, &endpos, 10); ok(res == 0, "res != 0\n"); ok(endpos == stock, "Incorrect endpos (%p-%p)\n", stock, endpos); @@ -2876,6 +2879,8 @@ static void test__wcstoi64(void) ures = p_wcstoui64(digit, NULL, 10); ok(ures == 9, "ures != 9\n"); + ures = p_wcstoui64(space, &endpos, 0); + ok(endpos == space, "endpos != space\n"); ures = p_wcstoui64(stock, &endpos, 10); ok(ures == 0, "ures != 0\n"); ok(endpos == stock, "Incorrect endpos (%p-%p)\n", stock, endpos); diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 551fb9a..bd7cc20 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -2053,7 +2053,7 @@ static int wctoint(WCHAR c, int base) __int64 CDECL MSVCRT__wcstoi64_l(const MSVCRT_wchar_t *nptr, MSVCRT_wchar_t **endptr, int base, MSVCRT__locale_t locale) { - BOOL negative = FALSE; + BOOL negative = FALSE, empty = TRUE; __int64 ret = 0; TRACE("(%s %p %d %p)\n", debugstr_w(nptr), endptr, base, locale); @@ -2062,6 +2062,9 @@ __int64 CDECL MSVCRT__wcstoi64_l(const MSVCRT_wchar_t *nptr, if (!MSVCRT_CHECK_PMT(base == 0 || base >= 2)) return 0; if (!MSVCRT_CHECK_PMT(base <= 36)) return 0; + if(endptr) + *endptr = (MSVCRT_wchar_t*)nptr; + while(isspaceW(*nptr)) nptr++; if(*nptr == '-') { @@ -2091,6 +2094,7 @@ __int64 CDECL MSVCRT__wcstoi64_l(const MSVCRT_wchar_t *nptr, v = -v; nptr++; + empty = FALSE; if(!negative && (ret>MSVCRT_I64_MAX/base || ret*base>MSVCRT_I64_MAX-v)) { ret = MSVCRT_I64_MAX; @@ -2102,7 +2106,7 @@ __int64 CDECL MSVCRT__wcstoi64_l(const MSVCRT_wchar_t *nptr, ret = ret*base + v; } - if(endptr) + if(endptr && !empty) *endptr = (MSVCRT_wchar_t*)nptr; return ret; @@ -2209,7 +2213,7 @@ MSVCRT_longlong __cdecl MSVCRT__wtoll(const MSVCRT_wchar_t *str) unsigned __int64 CDECL MSVCRT__wcstoui64_l(const MSVCRT_wchar_t *nptr, MSVCRT_wchar_t **endptr, int base, MSVCRT__locale_t locale) { - BOOL negative = FALSE; + BOOL negative = FALSE, empty = TRUE; unsigned __int64 ret = 0; TRACE("(%s %p %d %p)\n", debugstr_w(nptr), endptr, base, locale); @@ -2218,6 +2222,9 @@ unsigned __int64 CDECL MSVCRT__wcstoui64_l(const MSVCRT_wchar_t *nptr, if (!MSVCRT_CHECK_PMT(base == 0 || base >= 2)) return 0; if (!MSVCRT_CHECK_PMT(base <= 36)) return 0; + if(endptr) + *endptr = (MSVCRT_wchar_t*)nptr; + while(isspaceW(*nptr)) nptr++; if(*nptr == '-') { @@ -2244,6 +2251,7 @@ unsigned __int64 CDECL MSVCRT__wcstoui64_l(const MSVCRT_wchar_t *nptr, break; nptr++; + empty = FALSE; if(ret>MSVCRT_UI64_MAX/base || ret*base>MSVCRT_UI64_MAX-v) { ret = MSVCRT_UI64_MAX; @@ -2252,7 +2260,7 @@ unsigned __int64 CDECL MSVCRT__wcstoui64_l(const MSVCRT_wchar_t *nptr, ret = ret*base + v; } - if(endptr) + if(endptr && !empty) *endptr = (MSVCRT_wchar_t*)nptr; return negative ? -ret : ret;

1 0

Alex Henrie : shell32: Correct dialog title in error message from " Run File" to "Run".
by Alexandre Julliard 26 Jan '17

26 Jan '17

1 0

Lauri Kenttä : msvcrt/tests: Test wcstoi64 with various Unicode digits.
by Alexandre Julliard 26 Jan '17

26 Jan '17

Module: wine Branch: master Commit: b0ccba4b3390a9319854038b1f5c5da795f9a335 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0ccba4b3390a9319854038b1… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Wed Jan 25 17:02:23 2017 +0200 msvcrt/tests: Test wcstoi64 with various Unicode digits. Test all Unicode digits which Windows seems to support. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/string.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 8e78695..c377abf 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -2828,10 +2828,19 @@ static void test__wcstoi64(void) { static const WCHAR digit[] = { '9', 0 }; static const WCHAR stock[] = { 0x3231, 0 }; /* PARENTHESIZED IDEOGRAPH STOCK */ + static const WCHAR cjk_1[] = { 0x4e00, 0 }; /* CJK Ideograph, First */ static const WCHAR tamil[] = { 0x0bef, 0 }; /* TAMIL DIGIT NINE */ static const WCHAR thai[] = { 0x0e59, 0 }; /* THAI DIGIT NINE */ static const WCHAR fullwidth[] = { 0xff19, 0 }; /* FULLWIDTH DIGIT NINE */ + static const WCHAR superscript1[] = { 0xb9, 0 }; /* SUPERSCRIPT ONE */ + static const WCHAR minus_0x91[] = { '-', 0x0e50, 'x', 0xff19, '1', 0 }; + static const WCHAR plus_071[] = { '+', 0x0e50, 0xff17, '1', 0 }; static const WCHAR hex[] = { 0xff19, 'f', 0x0e59, 0xff46, 0 }; + static const WCHAR zeros[] = { + 0x660, 0x6f0, 0x966, 0x9e6, 0xa66, 0xae6, 0xb66, 0xc66, 0xce6, + 0xd66, 0xe50, 0xed0, 0xf20, 0x1040, 0x17e0, 0x1810, 0xff10 + }; + int i; __int64 res; unsigned __int64 ures; @@ -2847,6 +2856,8 @@ static void test__wcstoi64(void) res = p_wcstoi64(stock, &endpos, 10); ok(res == 0, "res != 0\n"); ok(endpos == stock, "Incorrect endpos (%p-%p)\n", stock, endpos); + res = p_wcstoi64(cjk_1, NULL, 0); + ok(res == 0, "res != 0\n"); res = p_wcstoi64(tamil, &endpos, 10); ok(res == 0, "res != 0\n"); ok(endpos == tamil, "Incorrect endpos (%p-%p)\n", tamil, endpos); @@ -2854,8 +2865,14 @@ static void test__wcstoi64(void) todo_wine ok(res == 9, "res != 9\n"); res = p_wcstoi64(fullwidth, NULL, 10); todo_wine ok(res == 9, "res != 9\n"); + res = p_wcstoi64(superscript1, NULL, 10); + ok(res == 0, "res != 0\n"); res = p_wcstoi64(hex, NULL, 16); todo_wine ok(res == 0x9f9, "res != 0x9f9\n"); + res = p_wcstoi64(minus_0x91, NULL, 0); + todo_wine ok(res == -0x91, "res != -0x91\n"); + res = p_wcstoi64(plus_071, NULL, 0); + todo_wine ok(res == 071, "res != 071\n"); ures = p_wcstoui64(digit, NULL, 10); ok(ures == 9, "ures != 9\n"); @@ -2869,8 +2886,22 @@ static void test__wcstoi64(void) todo_wine ok(ures == 9, "ures != 9\n"); ures = p_wcstoui64(fullwidth, NULL, 10); todo_wine ok(ures == 9, "ures != 9\n"); + ures = p_wcstoui64(superscript1, NULL, 10); + ok(ures == 0, "ures != 0\n"); ures = p_wcstoui64(hex, NULL, 16); todo_wine ok(ures == 0x9f9, "ures != 0x9f9\n"); + ures = p_wcstoui64(plus_071, NULL, 0); + todo_wine ok(ures == 071, "ures != 071\n"); + + /* Test various unicode digits */ + for (i = 0; i < sizeof(zeros) / sizeof(zeros[0]); ++i) { + WCHAR tmp[] = {zeros[i] + 4, zeros[i], zeros[i] + 5, 0}; + res = p_wcstoi64(tmp, NULL, 0); + todo_wine ok(res == 405, "with zero = U+%04X: got %d, expected 405\n", zeros[i], (int)res); + tmp[1] = zeros[i] + 10; + res = p_wcstoi64(tmp, NULL, 16); + todo_wine ok(res == 4, "with zero = U+%04X: got %d, expected 4\n", zeros[i], (int)res); + } return; }

1 0