May 2016 - Wine-commits - list.winehq.org

Alexandre Julliard : Import of upstream bugzilla release 4.4.12.
by Alexandre Julliard 17 May '16

17 May '16

Module: bugzilla Branch: master Commit: 1cfc2f9e5b72aef8fb5ee0e840902e8c0fa06de3 URL: http://source.winehq.org/git/bugzilla.git/?a=commit;h=1cfc2f9e5b72aef8fb5ee… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 17 10:46:38 2016 +0900 Import of upstream bugzilla release 4.4.12. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Bugzilla/Constants.pm | 2 +- Bugzilla/Mailer.pm | 18 +----- Bugzilla/Template.pm | 7 +- attachment.cgi | 1 + docs/bugzilla.ent | 62 ------------------ docs/bugzilla.ent.tmpl | 6 +- docs/en/xml/bugzilla.ent | 62 ------------------ showdependencygraph.cgi | 8 ++- taskgraph.json | 78 +++++++++++++++++------ template/en/default/global/tabs.html.tmpl | 2 +- template/en/default/pages/release-notes.html.tmpl | 25 ++++++++ 11 files changed, 105 insertions(+), 166 deletions(-) Diff: http://source.winehq.org/git/bugzilla.git/?a=commitdiff;h=1cfc2f9e5b72aef8f…

1 0

Alexandre Julliard : Merge branch 'upstream'.
by Alexandre Julliard 17 May '16

17 May '16

Module: bugzilla Branch: master Commit: 3ea1442a089010502942c2b63ab549f6e6ed13e8 URL: http://source.winehq.org/git/bugzilla.git/?a=commit;h=3ea1442a089010502942c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 17 10:48:33 2016 +0900 Merge branch 'upstream'. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> ---

1 0

Alexandre Julliard : Import of upstream bugzilla release 4.4.12.
by Alexandre Julliard 17 May '16

17 May '16

Module: bugzilla Branch: upstream Commit: 1cfc2f9e5b72aef8fb5ee0e840902e8c0fa06de3 URL: http://source.winehq.org/git/bugzilla.git/?a=commit;h=1cfc2f9e5b72aef8fb5ee… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 17 10:46:38 2016 +0900 Import of upstream bugzilla release 4.4.12. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Bugzilla/Constants.pm | 2 +- Bugzilla/Mailer.pm | 18 +----- Bugzilla/Template.pm | 7 +- attachment.cgi | 1 + docs/bugzilla.ent | 62 ------------------ docs/bugzilla.ent.tmpl | 6 +- docs/en/xml/bugzilla.ent | 62 ------------------ showdependencygraph.cgi | 8 ++- taskgraph.json | 78 +++++++++++++++++------ template/en/default/global/tabs.html.tmpl | 2 +- template/en/default/pages/release-notes.html.tmpl | 25 ++++++++ 11 files changed, 105 insertions(+), 166 deletions(-) Diff: http://source.winehq.org/git/bugzilla.git/?a=commitdiff;h=1cfc2f9e5b72aef8f…

1 0

Alexandre Julliard : Wine release 1.9.10
by Alexandre Julliard 16 May '16

16 May '16

Module: website Branch: master Commit: 724c5cb0613baca8a090dc7df31b04a79bec9d48 URL: http://source.winehq.org/git/website.git/?a=commit;h=724c5cb0613baca8a090dc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 17 00:36:55 2016 +0900 Wine release 1.9.10 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2016051701.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/en/2016051701.xml b/news/en/2016051701.xml new file mode 100644 index 0000000..a347428 --- /dev/null +++ b/news/en/2016051701.xml @@ -0,0 +1,16 @@ +<news> +<date>May 17, 2016</date> +<title>Wine 1.9.10 Released</title> +<body> + The Wine development release 1.9.10 is now available. + <a href="{$root}/announce/1.9.10">What's new</a> in this release: +<ul> + <li>High resolution ("Retina") rendering option on Mac OS X.</li> + <li>More compatible directory enumeration.</li> + <li>A number of C++ runtime fixes.</li> + <li>Video output improvements.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/1.9/wine-1.9.10.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Nikolay Sivov : msvcrt/tests: Fix a test failure on early XP versions.
by Alexandre Julliard 16 May '16

16 May '16

Module: wine Branch: master Commit: 1b072058acae2398e190b8eb90ec4e7c6fe52825 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b072058acae2398e190b8eb9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat May 7 09:51:21 2016 +0300 msvcrt/tests: Fix a test failure on early XP versions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/heap.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/tests/heap.c b/dlls/msvcrt/tests/heap.c index 82a5961..3d75cf1 100644 --- a/dlls/msvcrt/tests/heap.c +++ b/dlls/msvcrt/tests/heap.c @@ -474,8 +474,9 @@ static void test_calloc(void) errno = 0; ptr = calloc(~(size_t)0 / 2, ~(size_t)0 / 2); - ok(ptr == NULL, "got %p\n", ptr); + ok(ptr == NULL || broken(ptr != NULL) /* winxp sp0 */, "got %p\n", ptr); ok(errno == ENOMEM || broken(errno == 0) /* winxp, win2k3 */, "got errno %d\n", errno); + free(ptr); } START_TEST(heap)

1 0

Piotr Caban : msvcrt: Fix mbsrtowcs behavior when no out buffer is passed.
by Alexandre Julliard 16 May '16

16 May '16

Module: wine Branch: master Commit: 4f5a68412b56aa80cb70dcaeea8fb3e8f89c3831 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f5a68412b56aa80cb70dcaee… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon May 16 13:29:34 2016 +0200 msvcrt: Fix mbsrtowcs behavior when no out buffer is passed. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/mbcs.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 2c73de0..47478a3 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -2344,26 +2344,29 @@ MSVCRT_size_t CDECL MSVCRT_mbsrtowcs(MSVCRT_wchar_t *wcstr, MSVCRT_mbstate_t s = (state ? *state : 0); MSVCRT_wchar_t tmpdst; MSVCRT_size_t ret = 0; + const char *p; if(!MSVCRT_CHECK_PMT(pmbstr != NULL)) return -1; + p = *pmbstr; while(!wcstr || count>ret) { - int ch_len = MSVCRT_mbrtowc(&tmpdst, *pmbstr, 2, &s); + int ch_len = MSVCRT_mbrtowc(&tmpdst, p, 2, &s); if(wcstr) wcstr[ret] = tmpdst; if(ch_len < 0) { return -1; }else if(ch_len == 0) { - *pmbstr = NULL; + if(wcstr) *pmbstr = NULL; return ret; } - *pmbstr += ch_len; + p += ch_len; ret++; } + if(wcstr) *pmbstr = p; return ret; }

1 0

Piotr Caban : msvcrt: Add mbsrtowcs_s implementation.
by Alexandre Julliard 16 May '16

16 May '16

Module: wine Branch: master Commit: 540d969150e7ff87d731d6f4b9baa9a6f90f2737 URL: http://source.winehq.org/git/wine.git/?a=commit;h=540d969150e7ff87d731d6f4b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon May 16 13:29:41 2016 +0200 msvcrt: Add mbsrtowcs_s 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 | 2 +- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/mbcs.c | 29 ++++++++++++++++++++++ dlls/msvcrt/msvcrt.spec | 2 +- dlls/ucrtbase/ucrtbase.spec | 2 +- 10 files changed, 38 insertions(+), 9 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 b38905b..e2b5ab9 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 @@ -88,7 +88,7 @@ @ stub mbrtoc32 @ cdecl mbrtowc(ptr str long ptr) ucrtbase.mbrtowc @ cdecl mbsrtowcs(ptr ptr long ptr) ucrtbase.mbsrtowcs -@ stub mbsrtowcs_s +@ cdecl mbsrtowcs_s(ptr ptr long ptr long ptr) ucrtbase.mbsrtowcs_s @ cdecl mbstowcs(ptr str long) ucrtbase.mbstowcs @ cdecl mbstowcs_s(ptr ptr long str long) ucrtbase.mbstowcs_s @ cdecl mbtowc(ptr str long) ucrtbase.mbtowc diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 6fde8df..efbd688 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1745,7 +1745,7 @@ @ cdecl mbrlen(ptr long ptr) MSVCRT_mbrlen @ cdecl mbrtowc(ptr str long ptr) MSVCRT_mbrtowc @ cdecl mbsrtowcs(ptr ptr long ptr) MSVCRT_mbsrtowcs -@ stub mbsrtowcs_s +@ cdecl mbsrtowcs_s(ptr ptr long ptr long ptr) MSVCRT_mbsrtowcs_s @ cdecl mbstowcs(ptr str long) MSVCRT_mbstowcs @ cdecl mbstowcs_s(ptr ptr long str long) MSVCRT__mbstowcs_s @ cdecl mbtowc(ptr str long) MSVCRT_mbtowc diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index ddab904..7476995 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -2103,7 +2103,7 @@ @ cdecl mbrlen(ptr long ptr) MSVCRT_mbrlen @ cdecl mbrtowc(ptr str long ptr) MSVCRT_mbrtowc @ cdecl mbsrtowcs(ptr ptr long ptr) MSVCRT_mbsrtowcs -@ stub mbsrtowcs_s +@ cdecl mbsrtowcs_s(ptr ptr long ptr long ptr) MSVCRT_mbsrtowcs_s @ cdecl mbstowcs(ptr str long) MSVCRT_mbstowcs @ cdecl mbstowcs_s(ptr ptr long str long) MSVCRT__mbstowcs_s @ cdecl mbtowc(ptr str long) MSVCRT_mbtowc diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 7efcb20..7aa2d19 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2280,7 +2280,7 @@ @ cdecl mbrlen(ptr long ptr) MSVCRT_mbrlen @ cdecl mbrtowc(ptr str long ptr) MSVCRT_mbrtowc @ cdecl mbsrtowcs(ptr ptr long ptr) MSVCRT_mbsrtowcs -@ stub mbsrtowcs_s +@ cdecl mbsrtowcs_s(ptr ptr long ptr long ptr) MSVCRT_mbsrtowcs_s @ cdecl mbstowcs(ptr str long) MSVCRT_mbstowcs @ cdecl mbstowcs_s(ptr ptr long str long) MSVCRT__mbstowcs_s @ cdecl mbtowc(ptr str long) MSVCRT_mbtowc diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 6bfc0b7..893c099 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1943,7 +1943,7 @@ @ cdecl mbrlen(ptr long ptr) msvcr120.mbrlen @ cdecl mbrtowc(ptr str long ptr) msvcr120.mbrtowc @ cdecl mbsrtowcs(ptr ptr long ptr) msvcr120.mbsrtowcs -@ stub mbsrtowcs_s +@ cdecl mbsrtowcs_s(ptr ptr long ptr long ptr) msvcr120.mbsrtowcs_s @ cdecl mbstowcs(ptr str long) msvcr120.mbstowcs @ cdecl mbstowcs_s(ptr ptr long str long) msvcr120.mbstowcs_s @ cdecl mbtowc(ptr str long) msvcr120.mbtowc diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 97f5097..a6f0a90 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1425,7 +1425,7 @@ @ cdecl mbrlen(ptr long ptr) MSVCRT_mbrlen @ cdecl mbrtowc(ptr str long ptr) MSVCRT_mbrtowc @ cdecl mbsrtowcs(ptr ptr long ptr) MSVCRT_mbsrtowcs -@ stub mbsrtowcs_s +@ cdecl mbsrtowcs_s(ptr ptr long ptr long ptr) MSVCRT_mbsrtowcs_s @ cdecl mbstowcs(ptr str long) MSVCRT_mbstowcs @ cdecl mbstowcs_s(ptr ptr long str long) MSVCRT__mbstowcs_s @ cdecl mbtowc(ptr str long) MSVCRT_mbtowc diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 4a29ded..48aed2c 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1398,7 +1398,7 @@ @ cdecl mbrlen(ptr long ptr) MSVCRT_mbrlen @ cdecl mbrtowc(ptr str long ptr) MSVCRT_mbrtowc @ cdecl mbsrtowcs(ptr ptr long ptr) MSVCRT_mbsrtowcs -@ stub mbsrtowcs_s +@ cdecl mbsrtowcs_s(ptr ptr long ptr long ptr) MSVCRT_mbsrtowcs_s @ cdecl mbstowcs(ptr str long) MSVCRT_mbstowcs @ cdecl mbstowcs_s(ptr ptr long str long) MSVCRT__mbstowcs_s @ cdecl mbtowc(ptr str long) MSVCRT_mbtowc diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 47478a3..3e71c91 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -2371,6 +2371,35 @@ MSVCRT_size_t CDECL MSVCRT_mbsrtowcs(MSVCRT_wchar_t *wcstr, } /********************************************************************* + * mbsrtowcs_s(MSVCRT.@) + */ +int CDECL MSVCRT_mbsrtowcs_s(MSVCRT_size_t *ret, MSVCRT_wchar_t *wcstr, MSVCRT_size_t len, + const char **mbstr, MSVCRT_size_t count, MSVCRT_mbstate_t *state) +{ + MSVCRT_size_t tmp; + + if(!ret) ret = &tmp; + if(!MSVCRT_CHECK_PMT(!!wcstr == !!len)) { + *ret = -1; + return MSVCRT_EINVAL; + } + + *ret = MSVCRT_mbsrtowcs(wcstr, mbstr, count>len ? len : count, state); + if(*ret == -1) { + if(wcstr) *wcstr = 0; + return *MSVCRT__errno(); + } + (*ret)++; + if(*ret > len) { + /* no place for terminating '\0' */ + if(wcstr) *wcstr = 0; + return 0; + } + if(wcstr) wcstr[(*ret)-1] = 0; + return 0; +} + +/********************************************************************* * _mbctohira (MSVCRT.@) * * Converts a sjis katakana character to hiragana. diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index d485a0e..37107d5 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1365,7 +1365,7 @@ @ cdecl mbrtowc(ptr str long ptr) MSVCRT_mbrtowc # stub mbsdup_dbg(wstr long ptr long) @ cdecl mbsrtowcs(ptr ptr long ptr) MSVCRT_mbsrtowcs -# stub mbsrtowcs_s(ptr ptr long ptr long ptr) +@ cdecl mbsrtowcs_s(ptr ptr long ptr long ptr) MSVCRT_mbsrtowcs_s @ cdecl mbstowcs(ptr str long) MSVCRT_mbstowcs @ cdecl mbstowcs_s(ptr ptr long str long) MSVCRT__mbstowcs_s @ cdecl mbtowc(ptr str long) MSVCRT_mbtowc diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index cfb2a0a..bda6d3d 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2415,7 +2415,7 @@ @ stub mbrtoc32 @ cdecl mbrtowc(ptr str long ptr) MSVCRT_mbrtowc @ cdecl mbsrtowcs(ptr ptr long ptr) MSVCRT_mbsrtowcs -@ stub mbsrtowcs_s +@ cdecl mbsrtowcs_s(ptr ptr long ptr long ptr) MSVCRT_mbsrtowcs_s @ cdecl mbstowcs(ptr str long) MSVCRT_mbstowcs @ cdecl mbstowcs_s(ptr ptr long str long) MSVCRT__mbstowcs_s @ cdecl mbtowc(ptr str long) MSVCRT_mbtowc

1 0

Piotr Caban : msvcrt: Add mbsrtowcs_s tests.
by Alexandre Julliard 16 May '16

16 May '16

Module: wine Branch: master Commit: acba871d53a4c3f89fd3553c3b1736de41d9e4cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=acba871d53a4c3f89fd3553c3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon May 16 13:29:45 2016 +0200 msvcrt: Add mbsrtowcs_s tests. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/string.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 4144d17..8e78695 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -74,6 +74,7 @@ static unsigned __int64 (__cdecl *p_wcstoui64)(const wchar_t *, wchar_t **, int) static int (__cdecl *pwcstombs_s)(size_t*,char*,size_t,const wchar_t*,size_t); static int (__cdecl *pmbstowcs_s)(size_t*,wchar_t*,size_t,const char*,size_t); static size_t (__cdecl *p_mbsrtowcs)(wchar_t*, const char**, size_t, mbstate_t*); +static int (__cdecl *p_mbsrtowcs_s)(size_t*,wchar_t*,size_t,const char**,size_t,mbstate_t*); static size_t (__cdecl *pwcsrtombs)(char*, const wchar_t**, size_t, int*); static errno_t (__cdecl *p_gcvt_s)(char*,size_t,double,int); static errno_t (__cdecl *p_itoa_s)(int,char*,size_t,int); @@ -1947,6 +1948,11 @@ static void test_mbstowcs(void) } pmbstr = mHiragana; + ret = p_mbsrtowcs(NULL, &pmbstr, 6, NULL); + ok(ret == 2, "mbsrtowcs did not return 2\n"); + ok(pmbstr == mHiragana, "pmbstr = %p, expected %p\n", pmbstr, mHiragana); + + pmbstr = mHiragana; ret = p_mbsrtowcs(wOut, &pmbstr, 6, NULL); ok(ret == 2, "mbsrtowcs did not return 2\n"); ok(!memcmp(wOut, wHiragana, sizeof(wHiragana)), "wOut = %s\n", wine_dbgstr_w(wOut)); @@ -1966,6 +1972,54 @@ static void test_mbstowcs(void) ok(ret == -1, "mbsrtowcs did not return -1\n"); ok(errno == EINVAL, "Expected errno to be EINVAL, got %d\n", errno); + if(!p_mbsrtowcs_s) { + setlocale(LC_ALL, "C"); + win_skip("mbsrtowcs_s not available\n"); + return; + } + + pmbstr = mHiragana; + err = p_mbsrtowcs_s(&ret, NULL, 0, NULL, 6, NULL); + ok(ret == -1, "mbsrtowcs_s did not return -1\n"); + ok(err == EINVAL, "err = %d\n", err); + err = p_mbsrtowcs_s(&ret, NULL, 1, &pmbstr, 6, NULL); + ok(ret == -1, "mbsrtowcs_s did not return -1\n"); + ok(err == EINVAL, "err = %d\n", err); + err = p_mbsrtowcs_s(&ret, wOut, 0, &pmbstr, 6, NULL); + ok(ret == -1, "mbsrtowcs_s did not return -1\n"); + ok(err == EINVAL, "err = %d\n", err); + + pmbstr = mHiragana; + errno = 0; + err = p_mbsrtowcs_s(&ret, NULL, 0, &pmbstr, 6, NULL); + ok(ret == 3, "mbsrtowcs_s did not return 3\n"); + ok(err == 0, "err = %d\n", err); + ok(pmbstr == mHiragana, "pmbstr = %p, expected %p\n", pmbstr, mHiragana); + ok(errno == 0, "errno = %d\n", errno); + + pmbstr = mHiragana; + err = p_mbsrtowcs_s(&ret, wOut, 1, &pmbstr, 6, NULL); + ok(ret == 2, "mbsrtowcs_s did not return 2\n"); + ok(err == 0, "err = %d\n", err); + ok(!wOut[0], "wOut[0] = '%c'\n", wOut[0]); + ok(pmbstr == mHiragana+2, "pmbstr = %p, expected %p\n", pmbstr, mHiragana+2); + ok(errno == 0, "errno = %d\n", errno); + + pmbstr = mHiragana; + err = p_mbsrtowcs_s(&ret, wOut, 2, &pmbstr, 6, NULL); + ok(ret == 3, "mbsrtowcs_s did not return 3\n"); + ok(err == 0, "err = %d\n", err); + ok(!wOut[0], "wOut[0] = '%c'\n", wOut[0]); + ok(pmbstr == mHiragana+4, "pmbstr = %p, expected %p\n", pmbstr, mHiragana+4); + ok(errno == 0, "errno = %d\n", errno); + + pmbstr = mHiragana; + err = p_mbsrtowcs_s(&ret, wOut, 3, &pmbstr, 6, NULL); + ok(ret == 3, "mbsrtowcs_s did not return 3\n"); + ok(err == 0, "err = %d\n", err); + ok(!pmbstr, "pmbstr != NULL\n"); + ok(errno == 0, "errno = %d\n", errno); + setlocale(LC_ALL, "C"); } @@ -3106,6 +3160,7 @@ START_TEST(string) p_mbrlen = (void*)GetProcAddress(hMsvcrt, "mbrlen"); p_mbrtowc = (void*)GetProcAddress(hMsvcrt, "mbrtowc"); p_mbsrtowcs = (void*)GetProcAddress(hMsvcrt, "mbsrtowcs"); + p_mbsrtowcs_s = (void*)GetProcAddress(hMsvcrt, "mbsrtowcs_s"); p__atodbl_l = (void*)GetProcAddress(hMsvcrt, "_atodbl_l"); p__atof_l = (void*)GetProcAddress(hMsvcrt, "_atof_l"); p__strtod_l = (void*)GetProcAddress(hMsvcrt, "_strtod_l");

1 0

Andrey Gusev : msvfw32: Fix a typo in TRACE() message.
by Alexandre Julliard 16 May '16

16 May '16

Module: wine Branch: master Commit: 01e722a4fc5481fb2fdc37324f728892fd05af30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=01e722a4fc5481fb2fdc37324… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon May 16 14:22:45 2016 +0300 msvfw32: Fix a typo in TRACE() message. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvfw32/msvideo_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvfw32/msvideo_main.c b/dlls/msvfw32/msvideo_main.c index 4f1a2bf..0ae33ed 100644 --- a/dlls/msvfw32/msvideo_main.c +++ b/dlls/msvfw32/msvideo_main.c @@ -450,7 +450,7 @@ HIC VFWAPI ICOpen(DWORD fccType, DWORD fccHandler, UINT wMode) local = ICOpen(fccType, info.fccHandler, wMode); if (local != 0) { - TRACE("Returning %s as defult handler for %s\n", + TRACE("Returning %s as default handler for %s\n", wine_dbgstr_fcc(info.fccHandler), wine_dbgstr_fcc(fccType)); return local; }

1 0

Sebastian Lackner : dsound: Get rid of no longer needed mix_buffer_len field.
by Alexandre Julliard 16 May '16

16 May '16

Module: wine Branch: master Commit: 65bab6a5fe6cab4d810b2c23b62a6a5b320e169b URL: http://source.winehq.org/git/wine.git/?a=commit;h=65bab6a5fe6cab4d810b2c23b… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sun May 15 02:15:52 2016 +0200 dsound: Get rid of no longer needed mix_buffer_len field. This was missing in 09890d7142a2c612b025ab9ff60358d036f9999b. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsound/dsound_private.h | 2 +- dlls/dsound/primary.c | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index b980453..8bf9c9d 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -88,7 +88,7 @@ struct DirectSoundDevice int num_speakers; int lfe_channel; float *tmp_buffer; - DWORD tmp_buffer_len, mix_buffer_len; + DWORD tmp_buffer_len; DSVOLUMEPAN volpan; diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index 1925d0c..a5fe039 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -338,8 +338,6 @@ HRESULT DSOUND_PrimaryOpen(DirectSoundDevice *device) device->buflen = ds_hel_buflen; device->buflen -= device->buflen % device->pwfx->nBlockAlign; - device->mix_buffer_len = (device->buflen / (device->pwfx->wBitsPerSample / 8)) * sizeof(float); - if (device->state == STATE_PLAYING) device->state = STATE_STARTING; else if (device->state == STATE_STOPPING) device->state = STATE_STOPPED; @@ -359,8 +357,7 @@ HRESULT DSOUND_PrimaryOpen(DirectSoundDevice *device) device->buffer = newbuf; - TRACE("buflen: %u, fraglen: %u, mix_buffer_len: %u\n", - device->buflen, device->fraglen, device->mix_buffer_len); + TRACE("buflen: %u, fraglen: %u\n", device->buflen, device->fraglen); if(device->pwfx->wFormatTag == WAVE_FORMAT_IEEE_FLOAT || (device->pwfx->wFormatTag == WAVE_FORMAT_EXTENSIBLE &&

1 0