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

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

May 16, 2016

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

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

May 16, 2016

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 May 16, 2016

May 16, 2016

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

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

May 16, 2016

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

Nikolay Sivov : kernel32/nls: Added SSHORTESTDAYNAME* entries.
by Alexandre Julliard May 16, 2016

May 16, 2016

1 0

Francois Gouget : dwrite: Notify_factory_fallback_removed() is unused so remove it.
by Alexandre Julliard May 16, 2016

May 16, 2016

Module: wine Branch: master Commit: b62c76207fae4af63271d19dc74a65e8f7a97072 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b62c76207fae4af63271d19dc… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun May 15 15:38:42 2016 +0200 dwrite: Notify_factory_fallback_removed() is unused so remove it. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/main.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index 7c9f085..9b1c50f 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -540,12 +540,6 @@ static inline struct dwritefactory *impl_from_IDWriteFactory3(IDWriteFactory3 *i return CONTAINING_RECORD(iface, struct dwritefactory, IDWriteFactory3_iface); } -void notify_factory_fallback_removed(IDWriteFactory3 *iface) -{ - struct dwritefactory *factory = impl_from_IDWriteFactory3(iface); - factory->fallback = NULL; -} - static void release_fontface_cache(struct list *fontfaces) { struct fontfacecached *fontface, *fontface2;

1 0

Francois Gouget : qmgr: Fix a spelling error in a TRACE().
by Alexandre Julliard May 16, 2016

May 16, 2016

Module: wine Branch: master Commit: 4d6cba1bda556cf7d328c74e3fd88d2566227809 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d6cba1bda556cf7d328c74e3… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun May 15 15:32:42 2016 +0200 qmgr: Fix a spelling error in a TRACE(). Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qmgr/service.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/qmgr/service.c b/dlls/qmgr/service.c index 8563597..e856408 100644 --- a/dlls/qmgr/service.c +++ b/dlls/qmgr/service.c @@ -148,7 +148,7 @@ ServiceMain(DWORD dwArgc, LPWSTR *lpszArgv) WaitForSingleObject(fileTxThread, INFINITE); UpdateStatus(SERVICE_STOPPED, NO_ERROR, 0); CloseHandle(stop_event); - TRACE("service stoped\n"); + TRACE("service stopped\n"); CoUninitialize(); }

1 0

Alexandre Julliard : kernel32/nls: Convert remaining files to UTF-8.
by Alexandre Julliard May 16, 2016

May 16, 2016

Module: wine Branch: master Commit: d2fb19d6f7bdf39cd5685bb2a467acd1b1c6089f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2fb19d6f7bdf39cd5685bb2a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 16 15:40:44 2016 +0900 kernel32/nls: Convert remaining files to UTF-8. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/nls/tha.nls | 104 +++++++++++++++++++++++----------------------- dlls/kernel32/nls/vit.nls | 64 ++++++++++++++-------------- 2 files changed, 84 insertions(+), 84 deletions(-) diff --git a/dlls/kernel32/nls/tha.nls b/dlls/kernel32/nls/tha.nls index 8602b0f..7e2e6ad 100644 --- a/dlls/kernel32/nls/tha.nls +++ b/dlls/kernel32/nls/tha.nls @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#pragma code_page(874) +#pragma code_page(65001) /* UTF-8 */ STRINGTABLE LANGUAGE LANG_THAI, SUBLANG_DEFAULT { @@ -65,37 +65,37 @@ STRINGTABLE LANGUAGE LANG_THAI, SUBLANG_DEFAULT LOCALE_S1159 "AM" LOCALE_S2359 "PM" LOCALE_SABBREVCTRYNAME "THA" - LOCALE_SABBREVDAYNAME1 "�." - LOCALE_SABBREVDAYNAME2 "�." - LOCALE_SABBREVDAYNAME3 "�." - LOCALE_SABBREVDAYNAME4 "��." - LOCALE_SABBREVDAYNAME5 "�." - LOCALE_SABBREVDAYNAME6 "�." - LOCALE_SABBREVDAYNAME7 "��." + LOCALE_SABBREVDAYNAME1 "จ." + LOCALE_SABBREVDAYNAME2 "อ." + LOCALE_SABBREVDAYNAME3 "พ." + LOCALE_SABBREVDAYNAME4 "พฤ." + LOCALE_SABBREVDAYNAME5 "ศ." + LOCALE_SABBREVDAYNAME6 "ส." + LOCALE_SABBREVDAYNAME7 "อา." LOCALE_SABBREVLANGNAME "THA" - LOCALE_SABBREVMONTHNAME1 "�.�." - LOCALE_SABBREVMONTHNAME2 "�.�." - LOCALE_SABBREVMONTHNAME3 "��.�." - LOCALE_SABBREVMONTHNAME4 "��.�." - LOCALE_SABBREVMONTHNAME5 "�.�." - LOCALE_SABBREVMONTHNAME6 "��.�." - LOCALE_SABBREVMONTHNAME7 "�.�." - LOCALE_SABBREVMONTHNAME8 "�.�." - LOCALE_SABBREVMONTHNAME9 "�.�." - LOCALE_SABBREVMONTHNAME10 "�.�." - LOCALE_SABBREVMONTHNAME11 "�.�." - LOCALE_SABBREVMONTHNAME12 "�.�." + LOCALE_SABBREVMONTHNAME1 "ม.ค." + LOCALE_SABBREVMONTHNAME2 "ก.พ." + LOCALE_SABBREVMONTHNAME3 "มี.ค." + LOCALE_SABBREVMONTHNAME4 "เม.ย." + LOCALE_SABBREVMONTHNAME5 "พ.ค." + LOCALE_SABBREVMONTHNAME6 "มิ.ย." + LOCALE_SABBREVMONTHNAME7 "ก.ค." + LOCALE_SABBREVMONTHNAME8 "ส.ค." + LOCALE_SABBREVMONTHNAME9 "ก.ย." + LOCALE_SABBREVMONTHNAME10 "ต.ค." + LOCALE_SABBREVMONTHNAME11 "พ.ย." + LOCALE_SABBREVMONTHNAME12 "ธ.ค." LOCALE_SABBREVMONTHNAME13 "" LOCALE_SCOUNTRY "Thailand" - LOCALE_SCURRENCY "�" + LOCALE_SCURRENCY "฿" LOCALE_SDATE "/" - LOCALE_SDAYNAME1 "�ѹ��" - LOCALE_SDAYNAME2 "�ѧ��" - LOCALE_SDAYNAME3 "�ظ" - LOCALE_SDAYNAME4 "��ʺ��" - LOCALE_SDAYNAME5 "�ء��" - LOCALE_SDAYNAME6 "��" - LOCALE_SDAYNAME7 "�ҷԵ��" + LOCALE_SDAYNAME1 "จันทร์" + LOCALE_SDAYNAME2 "อังคาร" + LOCALE_SDAYNAME3 "พุธ" + LOCALE_SDAYNAME4 "พฤหัสบดี" + LOCALE_SDAYNAME5 "ศุกร์" + LOCALE_SDAYNAME6 "เสาร์" + LOCALE_SDAYNAME7 "อาทิตย์" LOCALE_SDECIMAL "." LOCALE_SENGCOUNTRY "Thailand" LOCALE_SENGCURRNAME "Thai Baht" @@ -109,38 +109,38 @@ STRINGTABLE LANGUAGE LANG_THAI, SUBLANG_DEFAULT LOCALE_SLONGDATE "d MMMM yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" - LOCALE_SMONTHNAME1 "��Ҥ�" - LOCALE_SMONTHNAME2 "��Ҿѹ��" - LOCALE_SMONTHNAME3 "�չҤ�" - LOCALE_SMONTHNAME4 "��¹" - LOCALE_SMONTHNAME5 "��Ҥ�" - LOCALE_SMONTHNAME6 "�Զع�¹" - LOCALE_SMONTHNAME7 "�á�Ҥ�" - LOCALE_SMONTHNAME8 "�ԧ�Ҥ�" - LOCALE_SMONTHNAME9 "�ѹ��¹" - LOCALE_SMONTHNAME10 "��Ҥ�" - LOCALE_SMONTHNAME11 "��Ȩԡ�¹" - LOCALE_SMONTHNAME12 "�ѹ�Ҥ�" + LOCALE_SMONTHNAME1 "มกราคม" + LOCALE_SMONTHNAME2 "กุมภาพันธ์" + LOCALE_SMONTHNAME3 "มีนาคม" + LOCALE_SMONTHNAME4 "เมษายน" + LOCALE_SMONTHNAME5 "พฤษภาคม" + LOCALE_SMONTHNAME6 "มิถุนายน" + LOCALE_SMONTHNAME7 "กรกฎาคม" + LOCALE_SMONTHNAME8 "สิงหาคม" + LOCALE_SMONTHNAME9 "กันยายน" + LOCALE_SMONTHNAME10 "ตุลาคม" + LOCALE_SMONTHNAME11 "พฤศจิกายน" + LOCALE_SMONTHNAME12 "ธันวาคม" LOCALE_SMONTHNAME13 "" LOCALE_SMONTHOUSANDSEP "," LOCALE_SNAME "th-TH" - LOCALE_SNATIVECTRYNAME "��" - LOCALE_SNATIVECURRNAME "�ҷ" - LOCALE_SNATIVEDIGITS "��" - LOCALE_SNATIVEDISPLAYNAME "�� (��)" - LOCALE_SNATIVELANGNAME "��" + LOCALE_SNATIVECTRYNAME "ไทย" + LOCALE_SNATIVECURRNAME "บาท" + LOCALE_SNATIVEDIGITS "๐๑๒๓๔๕๖๗๘๙" + LOCALE_SNATIVEDISPLAYNAME "ไทย (ไทย)" + LOCALE_SNATIVELANGNAME "ไทย" LOCALE_SNEGATIVESIGN "-" LOCALE_SOPENTYPELANGUAGETAG "THA " LOCALE_SPOSITIVESIGN "" LOCALE_SSCRIPTS "Thai;" LOCALE_SSHORTDATE "d/M/yyyy" - LOCALE_SSHORTESTDAYNAME1 "�." - LOCALE_SSHORTESTDAYNAME2 "�." - LOCALE_SSHORTESTDAYNAME3 "�." - LOCALE_SSHORTESTDAYNAME4 "��." - LOCALE_SSHORTESTDAYNAME5 "�." - LOCALE_SSHORTESTDAYNAME6 "�." - LOCALE_SSHORTESTDAYNAME7 "��." + LOCALE_SSHORTESTDAYNAME1 "จ." + LOCALE_SSHORTESTDAYNAME2 "อ." + LOCALE_SSHORTESTDAYNAME3 "พ." + LOCALE_SSHORTESTDAYNAME4 "พฤ." + LOCALE_SSHORTESTDAYNAME5 "ศ." + LOCALE_SSHORTESTDAYNAME6 "ส." + LOCALE_SSHORTESTDAYNAME7 "อา." LOCALE_SSHORTTIME "H:mm" LOCALE_SSORTNAME "Default" LOCALE_STHOUSAND "," diff --git a/dlls/kernel32/nls/vit.nls b/dlls/kernel32/nls/vit.nls index 182b230..89b030c 100644 --- a/dlls/kernel32/nls/vit.nls +++ b/dlls/kernel32/nls/vit.nls @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#pragma code_page(1258) +#pragma code_page(65001) /* UTF-8 */ STRINGTABLE LANGUAGE LANG_VIETNAMESE, SUBLANG_DEFAULT { @@ -67,10 +67,10 @@ STRINGTABLE LANGUAGE LANG_VIETNAMESE, SUBLANG_DEFAULT LOCALE_SABBREVCTRYNAME "VNM" LOCALE_SABBREVDAYNAME1 "hai" LOCALE_SABBREVDAYNAME2 "ba" - LOCALE_SABBREVDAYNAME3 "t�" - LOCALE_SABBREVDAYNAME4 "n�m" - LOCALE_SABBREVDAYNAME5 "sa�u" - LOCALE_SABBREVDAYNAME6 "ba�y" + LOCALE_SABBREVDAYNAME3 "tư" + LOCALE_SABBREVDAYNAME4 "năm" + LOCALE_SABBREVDAYNAME5 "sáu" + LOCALE_SABBREVDAYNAME6 "bảy" LOCALE_SABBREVDAYNAME7 "cn" LOCALE_SABBREVLANGNAME "VIT" LOCALE_SABBREVMONTHNAME1 "th1" @@ -87,15 +87,15 @@ STRINGTABLE LANGUAGE LANG_VIETNAMESE, SUBLANG_DEFAULT LOCALE_SABBREVMONTHNAME12 "th12" LOCALE_SABBREVMONTHNAME13 "" LOCALE_SCOUNTRY "Viet Nam" - LOCALE_SCURRENCY "�" + LOCALE_SCURRENCY "₫" LOCALE_SDATE "/" - LOCALE_SDAYNAME1 "th�� hai" - LOCALE_SDAYNAME2 "th�� ba" - LOCALE_SDAYNAME3 "th�� t�" - LOCALE_SDAYNAME4 "th�� n�m" - LOCALE_SDAYNAME5 "th�� sa�u" - LOCALE_SDAYNAME6 "th�� ba�y" - LOCALE_SDAYNAME7 "chu� nh��t" + LOCALE_SDAYNAME1 "thứ hai" + LOCALE_SDAYNAME2 "thứ ba" + LOCALE_SDAYNAME3 "thứ tư" + LOCALE_SDAYNAME4 "thứ năm" + LOCALE_SDAYNAME5 "thứ sáu" + LOCALE_SDAYNAME6 "thứ bảy" + LOCALE_SDAYNAME7 "chủ nhật" LOCALE_SDECIMAL "," LOCALE_SENGCOUNTRY "Viet Nam" LOCALE_SENGCURRNAME "Vietnamese Dong" @@ -109,26 +109,26 @@ STRINGTABLE LANGUAGE LANG_VIETNAMESE, SUBLANG_DEFAULT LOCALE_SLONGDATE "dd MMMM yyyy" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" - LOCALE_SMONTHNAME1 "tha�ng m��t" - LOCALE_SMONTHNAME2 "tha�ng hai" - LOCALE_SMONTHNAME3 "tha�ng ba" - LOCALE_SMONTHNAME4 "tha�ng t�" - LOCALE_SMONTHNAME5 "tha�ng n�m" - LOCALE_SMONTHNAME6 "tha�ng sa�u" - LOCALE_SMONTHNAME7 "tha�ng ba�y" - LOCALE_SMONTHNAME8 "tha�ng ta�m" - LOCALE_SMONTHNAME9 "tha�ng chi�n" - LOCALE_SMONTHNAME10 "tha�ng m��i" - LOCALE_SMONTHNAME11 "tha�ng m��i m��t" - LOCALE_SMONTHNAME12 "tha�ng m��i hai" + LOCALE_SMONTHNAME1 "tháng một" + LOCALE_SMONTHNAME2 "tháng hai" + LOCALE_SMONTHNAME3 "tháng ba" + LOCALE_SMONTHNAME4 "tháng tư" + LOCALE_SMONTHNAME5 "tháng năm" + LOCALE_SMONTHNAME6 "tháng sáu" + LOCALE_SMONTHNAME7 "tháng bảy" + LOCALE_SMONTHNAME8 "tháng tám" + LOCALE_SMONTHNAME9 "tháng chín" + LOCALE_SMONTHNAME10 "tháng mười" + LOCALE_SMONTHNAME11 "tháng mười một" + LOCALE_SMONTHNAME12 "tháng mười hai" LOCALE_SMONTHNAME13 "" LOCALE_SMONTHOUSANDSEP "." LOCALE_SNAME "vi-VN" - LOCALE_SNATIVECTRYNAME "Vi��t Nam" + LOCALE_SNATIVECTRYNAME "Việt Nam" LOCALE_SNATIVECURRNAME L"Do\x0302\x0300ng" LOCALE_SNATIVEDIGITS "0123456789" - LOCALE_SNATIVEDISPLAYNAME "Ti��ng Vi��t Nam (Vi��t Nam)" - LOCALE_SNATIVELANGNAME "Ti��ng Vi��t Nam" + LOCALE_SNATIVEDISPLAYNAME "Tiếng Việt Nam (Việt Nam)" + LOCALE_SNATIVELANGNAME "Tiếng Việt Nam" LOCALE_SNEGATIVESIGN "-" LOCALE_SOPENTYPELANGUAGETAG "VIT " LOCALE_SPOSITIVESIGN "" @@ -136,10 +136,10 @@ STRINGTABLE LANGUAGE LANG_VIETNAMESE, SUBLANG_DEFAULT LOCALE_SSHORTDATE "dd/MM/yyyy" LOCALE_SSHORTESTDAYNAME1 "hai" LOCALE_SSHORTESTDAYNAME2 "ba" - LOCALE_SSHORTESTDAYNAME3 "t�" - LOCALE_SSHORTESTDAYNAME4 "n�m" - LOCALE_SSHORTESTDAYNAME5 "sa�u" - LOCALE_SSHORTESTDAYNAME6 "ba�y" + LOCALE_SSHORTESTDAYNAME3 "tư" + LOCALE_SSHORTESTDAYNAME4 "năm" + LOCALE_SSHORTESTDAYNAME5 "sáu" + LOCALE_SSHORTESTDAYNAME6 "bảy" LOCALE_SSHORTESTDAYNAME7 "cn" LOCALE_SSHORTTIME "h:mm tt" LOCALE_SSORTNAME "Default"

1 0

Francois Gouget : user32/tests: Fix a spelling error in a scroll comment.
by Alexandre Julliard May 16, 2016

May 16, 2016

Module: wine Branch: master Commit: 6fe747bbbc66bea5c410bd9e135078ebbc1384f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6fe747bbbc66bea5c410bd9e1… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun May 15 15:36:03 2016 +0200 user32/tests: Fix a spelling error in a scroll comment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/scroll.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/tests/scroll.c b/dlls/user32/tests/scroll.c index 1c454fb..7691af3 100644 --- a/dlls/user32/tests/scroll.c +++ b/dlls/user32/tests/scroll.c @@ -114,7 +114,7 @@ static void test_EnableScrollBar(void) ok( ret, "The scrollbar should be enabled.\n" ); ok( IsWindowEnabled( hScroll ), "The scrollbar window should be enabled.\n" ); - /* disable window, try to reenable */ + /* disable window, try to re-enable */ ret = EnableWindow( hScroll, FALSE ); ok( !ret, "got %d\n", ret ); ok( !IsWindowEnabled( hScroll ), "The scrollbar window should be disabled.\n" );

1 0

Nikolay Sivov : kernel32: Set C3_KASHIDA only for kashida character.
by Alexandre Julliard May 16, 2016

May 16, 2016

Module: wine Branch: master Commit: 632266e5b589232fbb2866fdf810087d9e8d1e78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=632266e5b589232fbb2866fdf… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 15 10:30:33 2016 +0300 kernel32: Set C3_KASHIDA only for kashida character. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/locale.c | 2 +- dlls/kernel32/tests/locale.c | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 14b2ba7..b5a8680 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -2864,7 +2864,7 @@ BOOL WINAPI GetStringTypeW( DWORD type, LPCWSTR src, INT count, LPWORD chartype if ((c>=0x30A0)&&(c<=0x30FF)) type3 |= C3_KATAKANA; if ((c>=0x3040)&&(c<=0x309F)) type3 |= C3_HIRAGANA; if ((c>=0x4E00)&&(c<=0x9FAF)) type3 |= C3_IDEOGRAPH; - if ((c>=0x0600)&&(c<=0x06FF)) type3 |= C3_KASHIDA; + if (c == 0x0640) type3 |= C3_KASHIDA; if ((c>=0x3000)&&(c<=0x303F)) type3 |= C3_SYMBOL; if ((c>=0xD800)&&(c<=0xDBFF)) type3 |= C3_HIGHSURROGATE; diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 70944a2..d677836 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -3766,6 +3766,18 @@ static void test_GetStringTypeW(void) GetStringTypeW(CT_CTYPE1, ch, 2, types); ok(types[0] == (C1_DEFINED|C1_SPACE), "got %x\n", types[0]); ok(types[1] == (C1_DEFINED|C1_SPACE), "got %x\n", types[1]); + + /* check Arabic range for kashida flag */ + for (ch[0] = 0x600; ch[0] <= 0x6ff; ch[0] += 1) + { + types[0] = 0; + ret = GetStringTypeW(CT_CTYPE3, ch, 1, types); + ok(ret, "%#x: failed %d\n", ch[0], ret); + if (ch[0] == 0x640) /* ARABIC TATWEEL (Kashida) */ + ok(types[0] & C3_KASHIDA, "%#x: type %#x\n", ch[0], types[0]); + else + ok(!(types[0] & C3_KASHIDA), "%#x: type %#x\n", ch[0], types[0]); + } } static void test_IdnToNameprepUnicode(void)

1 0