September 2016 - Wine-commits

Filip Frąckiewicz : wined3d: Add NVIDIA GTX 690 ( GK104) to the GPU list.
by Alexandre Julliard 23 Sep '16

23 Sep '16

Module: wine Branch: master Commit: 7c261059d4f676fd16f98275b3432e38089ed932 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c261059d4f676fd16f98275b… Author: Filip Frąckiewicz <fjfrackiewicz(a)gmail.com> Date: Thu Sep 22 05:56:42 2016 +0200 wined3d: Add NVIDIA GTX 690 (GK104) to the GPU list. Signed-off-by: Filip Frąckiewicz <fjfrackiewicz(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 4 +++- dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index a9a2922..783cd45 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1282,6 +1282,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX670, "NVIDIA GeForce GTX 670", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX670MX, "NVIDIA GeForce GTX 670MX", DRIVER_NVIDIA_GEFORCE8, 3072}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX680, "NVIDIA GeForce GTX 680", DRIVER_NVIDIA_GEFORCE8, 2048}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX690, "NVIDIA GeForce GTX 690", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT730, "NVIDIA GeForce GT 730", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT730M, "NVIDIA GeForce GT 730M", DRIVER_NVIDIA_GEFORCE8, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT740M, "NVIDIA GeForce GT 740M", DRIVER_NVIDIA_GEFORCE8, 2048}, @@ -1803,6 +1804,7 @@ cards_nvidia_binary[] = {"GT 740M", CARD_NVIDIA_GEFORCE_GT740M}, /* Geforce 700 - midend mobile */ {"GT 730M", CARD_NVIDIA_GEFORCE_GT730M}, /* Geforce 700 - midend mobile */ {"GT 730", CARD_NVIDIA_GEFORCE_GT730}, /* Geforce 700 - lowend */ + {"GTX 690", CARD_NVIDIA_GEFORCE_GTX690}, /* Geforce 600 - highend */ {"GTX 680", CARD_NVIDIA_GEFORCE_GTX680}, /* Geforce 600 - highend */ {"GTX 670MX", CARD_NVIDIA_GEFORCE_GTX670MX}, /* Geforce 600 - highend */ {"GTX 670", CARD_NVIDIA_GEFORCE_GTX670}, /* Geforce 600 - midend high */ @@ -2166,7 +2168,7 @@ cards_nvidia_mesa[] = {"NVF1", CARD_NVIDIA_GEFORCE_GTX780TI}, {"NVF0", CARD_NVIDIA_GEFORCE_GTX780}, {"NVE6", CARD_NVIDIA_GEFORCE_GTX770M}, - {"NVE4", CARD_NVIDIA_GEFORCE_GTX680}, + {"NVE4", CARD_NVIDIA_GEFORCE_GTX680}, /* 690 */ /* Fermi */ {"NVD9", CARD_NVIDIA_GEFORCE_GT520}, {"NVD7", CARD_NVIDIA_GEFORCE_820M}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 3b47384..f1440ba 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1918,6 +1918,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX670 = 0x1189, CARD_NVIDIA_GEFORCE_GTX670MX = 0x11a1, CARD_NVIDIA_GEFORCE_GTX680 = 0x1180, + CARD_NVIDIA_GEFORCE_GTX690 = 0x1188, CARD_NVIDIA_GEFORCE_GT730 = 0x1287, CARD_NVIDIA_GEFORCE_GT730M = 0x0fe1, CARD_NVIDIA_GEFORCE_GT740M = 0x1292,

1 0

Akihiro Sagawa : kernel32/tests: Consolidate duplicated code for invalid LCMapString flag tests.
by Alexandre Julliard 23 Sep '16

23 Sep '16

Module: wine Branch: master Commit: 138dc2716e42a029edd476d11cb6362616fda6ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=138dc2716e42a029edd476d11… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Sep 23 00:06:07 2016 +0900 kernel32/tests: Consolidate duplicated code for invalid LCMapString flag tests. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 85 +++++++++++++++++--------------------------- 1 file changed, 33 insertions(+), 52 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 701f8d7..da33ff1 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -2195,9 +2195,16 @@ static void test_CompareStringEx(void) } +static const DWORD lcmap_invalid_flags[] = { + LCMAP_HIRAGANA | LCMAP_KATAKANA, + LCMAP_HALFWIDTH | LCMAP_FULLWIDTH, + LCMAP_TRADITIONAL_CHINESE | LCMAP_SIMPLIFIED_CHINESE, + LCMAP_LOWERCASE | SORT_STRINGSORT, +}; + static void test_LCMapStringA(void) { - int ret, ret2; + int ret, ret2, i; char buf[256], buf2[256]; static const char upper_case[] = "\tJUST! A, TEST; STRING 1/*+-.\r\n"; static const char lower_case[] = "\tjust! a, test; string 1/*+-.\r\n"; @@ -2217,30 +2224,18 @@ static void test_LCMapStringA(void) ok(GetLastError() == ERROR_INVALID_FLAGS, "unexpected error code %d\n", GetLastError()); - ret = LCMapStringA(LOCALE_USER_DEFAULT, LCMAP_HIRAGANA | LCMAP_KATAKANA, - upper_case, -1, buf, sizeof(buf)); - ok(!ret, "LCMAP_HIRAGANA and LCMAP_KATAKANA are mutually exclusive\n"); - ok(GetLastError() == ERROR_INVALID_FLAGS, - "unexpected error code %d\n", GetLastError()); - - ret = LCMapStringA(LOCALE_USER_DEFAULT, LCMAP_HALFWIDTH | LCMAP_FULLWIDTH, - upper_case, -1, buf, sizeof(buf)); - ok(!ret, "LCMAP_HALFWIDTH | LCMAP_FULLWIDTH are mutually exclusive\n"); - ok(GetLastError() == ERROR_INVALID_FLAGS, - "unexpected error code %d\n", GetLastError()); - - ret = LCMapStringA(LOCALE_USER_DEFAULT, LCMAP_TRADITIONAL_CHINESE | LCMAP_SIMPLIFIED_CHINESE, - upper_case, -1, buf, sizeof(buf)); - ok(!ret, "LCMAP_TRADITIONAL_CHINESE and LCMAP_SIMPLIFIED_CHINESE are mutually exclusive\n"); - ok(GetLastError() == ERROR_INVALID_FLAGS, - "unexpected error code %d\n", GetLastError()); - - /* SORT_STRINGSORT must be used exclusively with LCMAP_SORTKEY */ - SetLastError(0xdeadbeef); - ret = LCMapStringA(LOCALE_USER_DEFAULT, LCMAP_LOWERCASE | SORT_STRINGSORT, - upper_case, -1, buf, sizeof(buf)); - ok(GetLastError() == ERROR_INVALID_FLAGS, "expected ERROR_INVALID_FLAGS, got %d\n", GetLastError()); - ok(!ret, "SORT_STRINGSORT without LCMAP_SORTKEY must fail\n"); + /* test invalid flag combinations */ + for (i = 0; i < sizeof(lcmap_invalid_flags)/sizeof(lcmap_invalid_flags[0]); i++) { + lstrcpyA(buf, "foo"); + SetLastError(0xdeadbeef); + ret = LCMapStringA(LOCALE_USER_DEFAULT, lcmap_invalid_flags[i], + lower_case, -1, buf, sizeof(buf)); + ok(GetLastError() == ERROR_INVALID_FLAGS, + "LCMapStringA (flag %08x) unexpected error code %d\n", + lcmap_invalid_flags[i], GetLastError()); + ok(!ret, "LCMapStringA (flag %08x) should return 0, got %d\n", + lcmap_invalid_flags[i], ret); + } /* test LCMAP_LOWERCASE */ ret = LCMapStringA(LOCALE_USER_DEFAULT, LCMAP_LOWERCASE, @@ -2363,7 +2358,7 @@ typedef INT (*lcmapstring_wrapper)(DWORD, LPCWSTR, INT, LPWSTR, INT); static void test_lcmapstring_unicode(lcmapstring_wrapper func_ptr, const char *func_name) { - int ret, ret2; + int ret, ret2, i; WCHAR buf[256], buf2[256]; char *p_buf = (char *)buf, *p_buf2 = (char *)buf2; @@ -2378,32 +2373,18 @@ static void test_lcmapstring_unicode(lcmapstring_wrapper func_ptr, const char *f func_name, GetLastError()); } - ret = func_ptr(LCMAP_HIRAGANA | LCMAP_KATAKANA, - upper_case, -1, buf, sizeof(buf)/sizeof(WCHAR)); - ok(!ret, "%s LCMAP_HIRAGANA and LCMAP_KATAKANA are mutually exclusive\n", func_name); - ok(GetLastError() == ERROR_INVALID_FLAGS, "%s unexpected error code %d\n", - func_name, GetLastError()); - - ret = func_ptr(LCMAP_HALFWIDTH | LCMAP_FULLWIDTH, - upper_case, -1, buf, sizeof(buf)/sizeof(WCHAR)); - ok(!ret, "%s LCMAP_HALFWIDTH | LCMAP_FULLWIDTH are mutually exclusive\n", func_name); - ok(GetLastError() == ERROR_INVALID_FLAGS, "%s unexpected error code %d\n", - func_name, GetLastError()); - - ret = func_ptr(LCMAP_TRADITIONAL_CHINESE | LCMAP_SIMPLIFIED_CHINESE, - upper_case, -1, buf, sizeof(buf)/sizeof(WCHAR)); - ok(!ret, "%s LCMAP_TRADITIONAL_CHINESE and LCMAP_SIMPLIFIED_CHINESE are mutually exclusive\n", - func_name); - ok(GetLastError() == ERROR_INVALID_FLAGS, "%s unexpected error code %d\n", - func_name, GetLastError()); - - /* SORT_STRINGSORT must be used exclusively with LCMAP_SORTKEY */ - SetLastError(0xdeadbeef); - ret = func_ptr(LCMAP_LOWERCASE | SORT_STRINGSORT, - upper_case, -1, buf, sizeof(buf)/sizeof(WCHAR)); - ok(GetLastError() == ERROR_INVALID_FLAGS, "%s expected ERROR_INVALID_FLAGS, got %d\n", - func_name, GetLastError()); - ok(!ret, "%s SORT_STRINGSORT without LCMAP_SORTKEY must fail\n", func_name); + /* test invalid flag combinations */ + for (i = 0; i < sizeof(lcmap_invalid_flags)/sizeof(lcmap_invalid_flags[0]); i++) { + lstrcpyW(buf, fooW); + SetLastError(0xdeadbeef); + ret = func_ptr(lcmap_invalid_flags[i], + lower_case, -1, buf, sizeof(buf)); + ok(GetLastError() == ERROR_INVALID_FLAGS, + "%s (flag %08x) unexpected error code %d\n", + func_name, lcmap_invalid_flags[i], GetLastError()); + ok(!ret, "%s (flag %08x) should return 0, got %d\n", + func_name, lcmap_invalid_flags[i], ret); + } /* test LCMAP_LOWERCASE */ ret = func_ptr(LCMAP_LOWERCASE,

1 0

Akihiro Sagawa : kernel32: Do not allow to combine NORM_IGNORENONSPACE and /or NORM_IGNORESYMBOLS with other LCMAP flags.
by Alexandre Julliard 23 Sep '16

23 Sep '16

Module: wine Branch: master Commit: 70a6546753ba5140a6c8d0358895168dd4614462 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70a6546753ba5140a6c8d0358… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Sep 23 00:06:09 2016 +0900 kernel32: Do not allow to combine NORM_IGNORENONSPACE and/or NORM_IGNORESYMBOLS with other LCMAP flags. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/locale.c | 16 ++++++++-------- dlls/kernel32/tests/locale.c | 20 ++++++++++++++++++++ 2 files changed, 28 insertions(+), 8 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index b04d190..ce64fe6 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -3190,6 +3190,12 @@ INT WINAPI LCMapStringEx(LPCWSTR name, DWORD flags, LPCWSTR src, INT srclen, LPW SetLastError(ERROR_INVALID_FLAGS); return 0; } + if ((flags & (NORM_IGNORENONSPACE | NORM_IGNORESYMBOLS)) && + (flags & ~(NORM_IGNORENONSPACE | NORM_IGNORESYMBOLS))) + { + SetLastError(ERROR_INVALID_FLAGS); + return 0; + } if (srclen < 0) srclen = strlenW(src) + 1; @@ -3218,10 +3224,7 @@ INT WINAPI LCMapStringEx(LPCWSTR name, DWORD flags, LPCWSTR src, INT srclen, LPW { for (dst_ptr = dst; srclen && dstlen; src++, srclen--) { - WCHAR wch = *src; - if ((flags & NORM_IGNORESYMBOLS) && (get_char_typeW(wch) & (C1_PUNCT | C1_SPACE))) - continue; - *dst_ptr++ = toupperW(wch); + *dst_ptr++ = toupperW(*src); dstlen--; } } @@ -3229,10 +3232,7 @@ INT WINAPI LCMapStringEx(LPCWSTR name, DWORD flags, LPCWSTR src, INT srclen, LPW { for (dst_ptr = dst; srclen && dstlen; src++, srclen--) { - WCHAR wch = *src; - if ((flags & NORM_IGNORESYMBOLS) && (get_char_typeW(wch) & (C1_PUNCT | C1_SPACE))) - continue; - *dst_ptr++ = tolowerW(wch); + *dst_ptr++ = tolowerW(*src); dstlen--; } } diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index da33ff1..c1dee00 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -2200,6 +2200,10 @@ static const DWORD lcmap_invalid_flags[] = { LCMAP_HALFWIDTH | LCMAP_FULLWIDTH, LCMAP_TRADITIONAL_CHINESE | LCMAP_SIMPLIFIED_CHINESE, LCMAP_LOWERCASE | SORT_STRINGSORT, + LCMAP_UPPERCASE | NORM_IGNORESYMBOLS, + LCMAP_LOWERCASE | NORM_IGNORESYMBOLS, + LCMAP_UPPERCASE | NORM_IGNORENONSPACE, + LCMAP_LOWERCASE | NORM_IGNORENONSPACE, }; static void test_LCMapStringA(void) @@ -2346,6 +2350,14 @@ static void test_LCMapStringA(void) lstrlenA(symbols_stripped) + 1, ret); ok(!lstrcmpA(buf, symbols_stripped), "LCMapStringA should return %s, but not %s\n", lower_case, buf); + /* test NORM_IGNORESYMBOLS | NORM_IGNORENONSPACE */ + lstrcpyA(buf, "foo"); + ret = LCMapStringA(LOCALE_USER_DEFAULT, NORM_IGNORESYMBOLS | NORM_IGNORENONSPACE, + lower_case, -1, buf, sizeof(buf)); + ok(ret == lstrlenA(symbols_stripped) + 1, "LCMapStringA should return %d, ret = %d\n", + lstrlenA(symbols_stripped) + 1, ret); + ok(!lstrcmpA(buf, symbols_stripped), "LCMapStringA should return %s, but not %s\n", lower_case, buf); + /* test srclen = 0 */ SetLastError(0xdeadbeef); ret = LCMapStringA(LOCALE_USER_DEFAULT, 0, upper_case, 0, buf, sizeof(buf)); @@ -2480,6 +2492,14 @@ static void test_lcmapstring_unicode(lcmapstring_wrapper func_ptr, const char *f lstrlenW(symbols_stripped) + 1, ret); ok(!lstrcmpW(buf, symbols_stripped), "%s string comparison mismatch\n", func_name); + /* test NORM_IGNORESYMBOLS | NORM_IGNORENONSPACE */ + lstrcpyW(buf, fooW); + ret = func_ptr(NORM_IGNORESYMBOLS | NORM_IGNORENONSPACE, + lower_case, -1, buf, sizeof(buf)/sizeof(WCHAR)); + ok(ret == lstrlenW(symbols_stripped) + 1, "%s func_ptr should return %d, ret = %d\n", func_name, + lstrlenW(symbols_stripped) + 1, ret); + ok(!lstrcmpW(buf, symbols_stripped), "%s string comparison mismatch\n", func_name); + /* test srclen = 0 */ SetLastError(0xdeadbeef); ret = func_ptr(0, upper_case, 0, buf, sizeof(buf)/sizeof(WCHAR));

1 0

Akihiro Sagawa : kernel32: Zero is an invalid flag value.
by Alexandre Julliard 23 Sep '16

23 Sep '16

Module: wine Branch: master Commit: 5fbdd644d6493c19eb3e2634fd2101b54661f336 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fbdd644d6493c19eb3e2634f… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Sep 23 00:06:10 2016 +0900 kernel32: Zero is an invalid flag value. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/locale.c | 3 ++- dlls/kernel32/tests/locale.c | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index ce64fe6..24911e8 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -3154,7 +3154,8 @@ INT WINAPI LCMapStringEx(LPCWSTR name, DWORD flags, LPCWSTR src, INT srclen, LPW if ((flags & (LCMAP_LOWERCASE | LCMAP_UPPERCASE)) == (LCMAP_LOWERCASE | LCMAP_UPPERCASE) || (flags & (LCMAP_HIRAGANA | LCMAP_KATAKANA)) == (LCMAP_HIRAGANA | LCMAP_KATAKANA) || (flags & (LCMAP_HALFWIDTH | LCMAP_FULLWIDTH)) == (LCMAP_HALFWIDTH | LCMAP_FULLWIDTH) || - (flags & (LCMAP_TRADITIONAL_CHINESE | LCMAP_SIMPLIFIED_CHINESE)) == (LCMAP_TRADITIONAL_CHINESE | LCMAP_SIMPLIFIED_CHINESE)) + (flags & (LCMAP_TRADITIONAL_CHINESE | LCMAP_SIMPLIFIED_CHINESE)) == (LCMAP_TRADITIONAL_CHINESE | LCMAP_SIMPLIFIED_CHINESE) || + !flags) { SetLastError(ERROR_INVALID_FLAGS); return 0; diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index c1dee00..a37d367 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -2196,6 +2196,7 @@ static void test_CompareStringEx(void) } static const DWORD lcmap_invalid_flags[] = { + 0, LCMAP_HIRAGANA | LCMAP_KATAKANA, LCMAP_HALFWIDTH | LCMAP_FULLWIDTH, LCMAP_TRADITIONAL_CHINESE | LCMAP_SIMPLIFIED_CHINESE,

1 0

Akihiro Sagawa : kernel32/tests: Add LCMAP_TITLECASE test.
by Alexandre Julliard 23 Sep '16

23 Sep '16

Module: wine Branch: master Commit: 6a50e362f49b4a765b35256a5c20507a2b503565 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a50e362f49b4a765b35256a5… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Sep 23 00:06:12 2016 +0900 kernel32/tests: Add LCMAP_TITLECASE test. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index a37d367..3783c9e 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -38,6 +38,7 @@ static const WCHAR upper_case[] = {'\t','J','U','S','T','!',' ','A',',',' ','T','E','S','T',';',' ','S','T','R','I','N','G',' ','1','/','*','+','-','.','\r','\n',0}; static const WCHAR lower_case[] = {'\t','j','u','s','t','!',' ','a',',',' ','t','e','s','t',';',' ','s','t','r','i','n','g',' ','1','/','*','+','-','.','\r','\n',0}; +static const WCHAR title_case[] = {'\t','J','u','s','t','!',' ','A',',',' ','T','e','s','t',';',' ','S','t','r','i','n','g',' ','1','/','*','+','-','.','\r','\n',0}; static const WCHAR symbols_stripped[] = {'j','u','s','t','a','t','e','s','t','s','t','r','i','n','g','1',0}; static const WCHAR localeW[] = {'e','n','-','U','S',0}; static const WCHAR fooW[] = {'f','o','o',0}; @@ -2375,16 +2376,14 @@ static void test_lcmapstring_unicode(lcmapstring_wrapper func_ptr, const char *f WCHAR buf[256], buf2[256]; char *p_buf = (char *)buf, *p_buf2 = (char *)buf2; + /* LCMAP_LOWERCASE | LCMAP_UPPERCASE makes LCMAP_TITLECASE, so it's valid now. */ ret = func_ptr(LCMAP_LOWERCASE | LCMAP_UPPERCASE, - upper_case, -1, buf, sizeof(buf)/sizeof(WCHAR)); - if (broken(ret)) - ok(lstrcmpW(buf, upper_case) == 0, "Expected upper case string\n"); - else - { - ok(!ret, "%s LCMAP_LOWERCASE and LCMAP_UPPERCASE are mutually exclusive\n", func_name); - ok(GetLastError() == ERROR_INVALID_FLAGS, "%s unexpected error code %d\n", - func_name, GetLastError()); - } + lower_case, -1, buf, sizeof(buf)/sizeof(WCHAR)); + todo_wine ok(ret == lstrlenW(title_case) + 1 || broken(!ret), + "%s ret %d, error %d, expected value %d\n", func_name, + ret, GetLastError(), lstrlenW(title_case) + 1); + todo_wine ok(lstrcmpW(buf, title_case) == 0 || broken(!ret), + "Expected title case string\n"); /* test invalid flag combinations */ for (i = 0; i < sizeof(lcmap_invalid_flags)/sizeof(lcmap_invalid_flags[0]); i++) {

1 0

Akihiro Sagawa : kernel32/tests: Add more mapping tests for LCMapString.
by Alexandre Julliard 23 Sep '16

23 Sep '16

Module: wine Branch: master Commit: a901b68f5995deca4a7dc4b2fb2a20ee04d810d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a901b68f5995deca4a7dc4b2f… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Sep 23 00:06:13 2016 +0900 kernel32/tests: Add more mapping tests for LCMapString. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 77 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 3783c9e..5e149d8 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -2372,6 +2372,22 @@ typedef INT (*lcmapstring_wrapper)(DWORD, LPCWSTR, INT, LPWSTR, INT); static void test_lcmapstring_unicode(lcmapstring_wrapper func_ptr, const char *func_name) { + const static WCHAR japanese_text[] = { + 0x3044, 0x309d, 0x3084, 0x3001, 0x30a4, 0x30fc, 0x30cf, + 0x30c8, 0x30fc, 0x30f4, 0x30a9, 0x306e, 0x2026, 0 + }; + const static WCHAR hiragana_text[] = { + 0x3044, 0x309d, 0x3084, 0x3001, 0x3044, 0x30fc, 0x306f, + 0x3068, 0x30fc, 0x3094, 0x3049, 0x306e, 0x2026, 0 + }; + const static WCHAR katakana_text[] = { + 0x30a4, 0x30fd, 0x30e4, 0x3001, 0x30a4, 0x30fc, 0x30cf, + 0x30c8, 0x30fc, 0x30f4, 0x30a9, 0x30ce, 0x2026, 0 + }; + const static WCHAR halfwidth_text[] = { + 0x3044, 0x309d, 0x3084, 0xff64, 0xff72, 0xff70, 0xff8a, + 0xff84, 0xff70, 0xff73, 0xff9e, 0xff6b, 0x306e, 0x2026, 0 + }; int ret, ret2, i; WCHAR buf[256], buf2[256]; char *p_buf = (char *)buf, *p_buf2 = (char *)buf2; @@ -2412,6 +2428,59 @@ static void test_lcmapstring_unicode(lcmapstring_wrapper func_ptr, const char *f ret, GetLastError(), lstrlenW(lower_case) + 1); ok(!lstrcmpW(buf, upper_case), "%s string compare mismatch\n", func_name); + /* test LCMAP_HIRAGANA */ + ret = func_ptr(LCMAP_HIRAGANA, + japanese_text, -1, buf, sizeof(buf)/sizeof(WCHAR)); + ok(ret == lstrlenW(hiragana_text) + 1, "%s ret %d, error %d, expected value %d\n", func_name, + ret, GetLastError(), lstrlenW(hiragana_text) + 1); + todo_wine ok(!lstrcmpW(buf, hiragana_text), "%s string compare mismatch\n", func_name); + + buf[0] = 0x30f5; /* KATAKANA LETTER SMALL KA */ + ret = func_ptr(LCMAP_HIRAGANA, buf, 1, buf2, 1); + ok(ret == 1, "%s ret %d, error %d, expected value 1\n", func_name, + ret, GetLastError()); + /* U+3095: HIRAGANA LETTER SMALL KA was added in Unicode 3.2 */ + todo_wine ok(buf2[0] == 0x3095 || broken(buf2[0] == 0x30f5 /* Vista and earlier versions */), + "%s expected %04x, got %04x\n", func_name, 0x3095, buf2[0]); + + /* test LCMAP_KATAKANA | LCMAP_LOWERCASE */ + ret = func_ptr(LCMAP_KATAKANA | LCMAP_LOWERCASE, + japanese_text, -1, buf, sizeof(buf)/sizeof(WCHAR)); + ok(ret == lstrlenW(katakana_text) + 1, "%s ret %d, error %d, expected value %d\n", func_name, + ret, GetLastError(), lstrlenW(katakana_text) + 1); + todo_wine ok(!lstrcmpW(buf, katakana_text), "%s string compare mismatch\n", func_name); + + /* test LCMAP_FULLWIDTH */ + ret = func_ptr(LCMAP_FULLWIDTH, + halfwidth_text, -1, buf, sizeof(buf)/sizeof(WCHAR)); + todo_wine ok(ret == lstrlenW(japanese_text) + 1, "%s ret %d, error %d, expected value %d\n", func_name, + ret, GetLastError(), lstrlenW(japanese_text) + 1); + todo_wine ok(!lstrcmpW(buf, japanese_text), "%s string compare mismatch\n", func_name); + + ret2 = func_ptr(LCMAP_FULLWIDTH, halfwidth_text, -1, NULL, 0); + ok(ret == ret2, "%s ret %d, expected value %d\n", func_name, ret2, ret); + + /* test LCMAP_FULLWIDTH | LCMAP_HIRAGANA + (half-width katakana is converted into full-wdith hiragana) */ + ret = func_ptr(LCMAP_FULLWIDTH | LCMAP_HIRAGANA, + halfwidth_text, -1, buf, sizeof(buf)/sizeof(WCHAR)); + todo_wine ok(ret == lstrlenW(hiragana_text) + 1, "%s ret %d, error %d, expected value %d\n", func_name, + ret, GetLastError(), lstrlenW(hiragana_text) + 1); + todo_wine ok(!lstrcmpW(buf, hiragana_text), "%s string compare mismatch\n", func_name); + + ret2 = func_ptr(LCMAP_FULLWIDTH | LCMAP_HIRAGANA, halfwidth_text, -1, NULL, 0); + ok(ret == ret2, "%s ret %d, expected value %d\n", func_name, ret, ret2); + + /* test LCMAP_HALFWIDTH */ + ret = func_ptr(LCMAP_HALFWIDTH, + japanese_text, -1, buf, sizeof(buf)/sizeof(WCHAR)); + todo_wine ok(ret == lstrlenW(halfwidth_text) + 1, "%s ret %d, error %d, expected value %d\n", func_name, + ret, GetLastError(), lstrlenW(halfwidth_text) + 1); + todo_wine ok(!lstrcmpW(buf, halfwidth_text), "%s string compare mismatch\n", func_name); + + ret2 = func_ptr(LCMAP_HALFWIDTH, japanese_text, -1, NULL, 0); + ok(ret == ret2, "%s ret %d, expected value %d\n", func_name, ret, ret2); + /* test buffer overflow */ SetLastError(0xdeadbeef); ret = func_ptr(LCMAP_UPPERCASE, @@ -2419,6 +2488,14 @@ static void test_lcmapstring_unicode(lcmapstring_wrapper func_ptr, const char *f ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "%s should return 0 and ERROR_INSUFFICIENT_BUFFER, got %d\n", func_name, ret); + /* KATAKANA LETTER GA (U+30AC) is converted into two half-width characters. + Thus, it requires two WCHARs. */ + buf[0] = 0x30ac; + SetLastError(0xdeadbeef); + ret = func_ptr(LCMAP_HALFWIDTH, buf, 1, buf2, 1); + todo_wine ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "%s should return 0 and ERROR_INSUFFICIENT_BUFFER, got %d\n", func_name, ret); + /* LCMAP_UPPERCASE or LCMAP_LOWERCASE should accept src == dst */ lstrcpyW(buf, lower_case); ret = func_ptr(LCMAP_UPPERCASE,

1 0

Akihiro Sagawa : kernel32: Short circuit required length calculation.
by Alexandre Julliard 23 Sep '16

23 Sep '16

Module: wine Branch: master Commit: 5d907050e235e7545c0c7f8fc0f041726e3db5a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d907050e235e7545c0c7f8fc… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Sep 23 00:06:15 2016 +0900 kernel32: Short circuit required length calculation. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/locale.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 24911e8..422d63f 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -3207,17 +3207,22 @@ INT WINAPI LCMapStringEx(LPCWSTR name, DWORD flags, LPCWSTR src, INT srclen, LPW { INT len; - for (len = 0; srclen; src++, srclen--) + if (flags & NORM_IGNORESYMBOLS) { - WCHAR wch = *src; - /* tests show that win2k just ignores NORM_IGNORENONSPACE, - * and skips white space and punctuation characters for - * NORM_IGNORESYMBOLS. - */ - if ((flags & NORM_IGNORESYMBOLS) && (get_char_typeW(wch) & (C1_PUNCT | C1_SPACE))) - continue; - len++; + for (len = 0; srclen; src++, srclen--) + { + WCHAR wch = *src; + /* tests show that win2k just ignores NORM_IGNORENONSPACE, + * and skips white space and punctuation characters for + * NORM_IGNORESYMBOLS. + */ + if (get_char_typeW(wch) & (C1_PUNCT | C1_SPACE)) + continue; + len++; + } } + else + len = srclen; return len; }

1 0

Akihiro Sagawa : kernel32: Refactor the codepath and a variable usage.
by Alexandre Julliard 23 Sep '16

23 Sep '16

Module: wine Branch: master Commit: 659e161d7e32eaec215622db99c7c238d8f1bb58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=659e161d7e32eaec215622db9… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Sep 23 00:06:16 2016 +0900 kernel32: Refactor the codepath and a variable usage. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/locale.c | 48 +++++++++++++++++++++++++++++------------------- 1 file changed, 29 insertions(+), 19 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 422d63f..97a22ba 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -3135,6 +3135,7 @@ INT WINAPI LCMapStringEx(LPCWSTR name, DWORD flags, LPCWSTR src, INT srclen, LPW LPNLSVERSIONINFO version, LPVOID reserved, LPARAM lparam) { LPWSTR dst_ptr; + INT len; if (version) FIXME("unsupported version structure %p\n", version); if (reserved) FIXME("unsupported reserved pointer %p\n", reserved); @@ -3205,8 +3206,6 @@ INT WINAPI LCMapStringEx(LPCWSTR name, DWORD flags, LPCWSTR src, INT srclen, LPW if (!dst) /* return required string length */ { - INT len; - if (flags & NORM_IGNORESYMBOLS) { for (len = 0; srclen; src++, srclen--) @@ -3226,39 +3225,50 @@ INT WINAPI LCMapStringEx(LPCWSTR name, DWORD flags, LPCWSTR src, INT srclen, LPW return len; } + if (src == dst && (flags & ~(LCMAP_LOWERCASE | LCMAP_UPPERCASE))) + { + SetLastError(ERROR_INVALID_FLAGS); + return 0; + } + + if (flags & (NORM_IGNORENONSPACE | NORM_IGNORESYMBOLS)) + { + for (len = dstlen, dst_ptr = dst; srclen && len; src++, srclen--) + { + WCHAR wch = *src; + if ((flags & NORM_IGNORESYMBOLS) && (get_char_typeW(wch) & (C1_PUNCT | C1_SPACE))) + continue; + *dst_ptr++ = wch; + len--; + } + goto done; + } + if (flags & LCMAP_UPPERCASE) { - for (dst_ptr = dst; srclen && dstlen; src++, srclen--) + for (len = dstlen, dst_ptr = dst; srclen && len; src++, srclen--) { *dst_ptr++ = toupperW(*src); - dstlen--; + len--; } } else if (flags & LCMAP_LOWERCASE) { - for (dst_ptr = dst; srclen && dstlen; src++, srclen--) + for (len = dstlen, dst_ptr = dst; srclen && len; src++, srclen--) { *dst_ptr++ = tolowerW(*src); - dstlen--; + len--; } } else { - if (src == dst) - { - SetLastError(ERROR_INVALID_FLAGS); - return 0; - } - for (dst_ptr = dst; srclen && dstlen; src++, srclen--) - { - WCHAR wch = *src; - if ((flags & NORM_IGNORESYMBOLS) && (get_char_typeW(wch) & (C1_PUNCT | C1_SPACE))) - continue; - *dst_ptr++ = wch; - dstlen--; - } + len = min(srclen, dstlen); + memcpy(dst, src, len * sizeof(WCHAR)); + dst_ptr = dst + len; + srclen -= len; } +done: if (srclen) { SetLastError(ERROR_INSUFFICIENT_BUFFER);

1 0

Akihiro Sagawa : kernel32: Implement LCMAP_HIRAGANA.
by Alexandre Julliard 23 Sep '16

23 Sep '16

Module: wine Branch: master Commit: c4af6088452deb0429ee66d637abfd1482795753 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4af6088452deb0429ee66d63… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Sep 23 00:06:18 2016 +0900 kernel32: Implement LCMAP_HIRAGANA. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/locale.c | 18 ++++++++++++++++-- dlls/kernel32/tests/locale.c | 8 ++++++-- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 97a22ba..de1a28c 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -3192,8 +3192,10 @@ INT WINAPI LCMapStringEx(LPCWSTR name, DWORD flags, LPCWSTR src, INT srclen, LPW SetLastError(ERROR_INVALID_FLAGS); return 0; } - if ((flags & (NORM_IGNORENONSPACE | NORM_IGNORESYMBOLS)) && - (flags & ~(NORM_IGNORENONSPACE | NORM_IGNORESYMBOLS))) + if (((flags & (NORM_IGNORENONSPACE | NORM_IGNORESYMBOLS)) && + (flags & ~(NORM_IGNORENONSPACE | NORM_IGNORESYMBOLS))) || + ((flags & LCMAP_HIRAGANA) && + (flags & (LCMAP_SIMPLIFIED_CHINESE | LCMAP_TRADITIONAL_CHINESE)))) { SetLastError(ERROR_INVALID_FLAGS); return 0; @@ -3268,6 +3270,18 @@ INT WINAPI LCMapStringEx(LPCWSTR name, DWORD flags, LPCWSTR src, INT srclen, LPW srclen -= len; } + if (flags & LCMAP_HIRAGANA) + { + /* map katakana to hiragana, e.g. U+30A1 -> U+3041. + we can't use C3_KATAKANA as some characters can't map to hiragana */ + for (len = dst_ptr - dst, dst_ptr = dst; len; len--, dst_ptr++) + { + if ((*dst_ptr >= 0x30A1 && *dst_ptr <= 0x30F6) || + *dst_ptr == 0x30FD || *dst_ptr == 0x30FE) + *dst_ptr -= 0x60; + } + } + done: if (srclen) { diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 5e149d8..94d3d8a 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -2206,6 +2206,10 @@ static const DWORD lcmap_invalid_flags[] = { LCMAP_LOWERCASE | NORM_IGNORESYMBOLS, LCMAP_UPPERCASE | NORM_IGNORENONSPACE, LCMAP_LOWERCASE | NORM_IGNORENONSPACE, + LCMAP_HIRAGANA | NORM_IGNORENONSPACE, + LCMAP_HIRAGANA | NORM_IGNORESYMBOLS, + LCMAP_HIRAGANA | LCMAP_SIMPLIFIED_CHINESE, + LCMAP_HIRAGANA | LCMAP_TRADITIONAL_CHINESE, }; static void test_LCMapStringA(void) @@ -2433,14 +2437,14 @@ static void test_lcmapstring_unicode(lcmapstring_wrapper func_ptr, const char *f japanese_text, -1, buf, sizeof(buf)/sizeof(WCHAR)); ok(ret == lstrlenW(hiragana_text) + 1, "%s ret %d, error %d, expected value %d\n", func_name, ret, GetLastError(), lstrlenW(hiragana_text) + 1); - todo_wine ok(!lstrcmpW(buf, hiragana_text), "%s string compare mismatch\n", func_name); + ok(!lstrcmpW(buf, hiragana_text), "%s string compare mismatch\n", func_name); buf[0] = 0x30f5; /* KATAKANA LETTER SMALL KA */ ret = func_ptr(LCMAP_HIRAGANA, buf, 1, buf2, 1); ok(ret == 1, "%s ret %d, error %d, expected value 1\n", func_name, ret, GetLastError()); /* U+3095: HIRAGANA LETTER SMALL KA was added in Unicode 3.2 */ - todo_wine ok(buf2[0] == 0x3095 || broken(buf2[0] == 0x30f5 /* Vista and earlier versions */), + ok(buf2[0] == 0x3095 || broken(buf2[0] == 0x30f5 /* Vista and earlier versions */), "%s expected %04x, got %04x\n", func_name, 0x3095, buf2[0]); /* test LCMAP_KATAKANA | LCMAP_LOWERCASE */

1 0

Akihiro Sagawa : kernel32: Implement LCMAP_KATAKANA.
by Alexandre Julliard 23 Sep '16

23 Sep '16

Module: wine Branch: master Commit: 12c547919f2760595a7bbf8566da6e45a89344e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=12c547919f2760595a7bbf856… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Sep 23 00:06:19 2016 +0900 kernel32: Implement LCMAP_KATAKANA. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/locale.c | 13 ++++++++++++- dlls/kernel32/tests/locale.c | 6 +++++- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index de1a28c..842922a 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -3194,7 +3194,7 @@ INT WINAPI LCMapStringEx(LPCWSTR name, DWORD flags, LPCWSTR src, INT srclen, LPW } if (((flags & (NORM_IGNORENONSPACE | NORM_IGNORESYMBOLS)) && (flags & ~(NORM_IGNORENONSPACE | NORM_IGNORESYMBOLS))) || - ((flags & LCMAP_HIRAGANA) && + ((flags & (LCMAP_HIRAGANA | LCMAP_KATAKANA)) && (flags & (LCMAP_SIMPLIFIED_CHINESE | LCMAP_TRADITIONAL_CHINESE)))) { SetLastError(ERROR_INVALID_FLAGS); @@ -3281,6 +3281,17 @@ INT WINAPI LCMapStringEx(LPCWSTR name, DWORD flags, LPCWSTR src, INT srclen, LPW *dst_ptr -= 0x60; } } + else if (flags & LCMAP_KATAKANA) + { + /* map hiragana to katakana, e.g. U+3041 -> U+30A1. + we can't use C3_HIRAGANA as some characters can't map to katakana */ + for (len = dst_ptr - dst, dst_ptr = dst; len; len--, dst_ptr++) + { + if ((*dst_ptr >= 0x3041 && *dst_ptr <= 0x3096) || + *dst_ptr == 0x309D || *dst_ptr == 0x309E) + *dst_ptr += 0x60; + } + } done: if (srclen) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 94d3d8a..5721979 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -2210,6 +2210,10 @@ static const DWORD lcmap_invalid_flags[] = { LCMAP_HIRAGANA | NORM_IGNORESYMBOLS, LCMAP_HIRAGANA | LCMAP_SIMPLIFIED_CHINESE, LCMAP_HIRAGANA | LCMAP_TRADITIONAL_CHINESE, + LCMAP_KATAKANA | NORM_IGNORENONSPACE, + LCMAP_KATAKANA | NORM_IGNORESYMBOLS, + LCMAP_KATAKANA | LCMAP_SIMPLIFIED_CHINESE, + LCMAP_KATAKANA | LCMAP_TRADITIONAL_CHINESE, }; static void test_LCMapStringA(void) @@ -2452,7 +2456,7 @@ static void test_lcmapstring_unicode(lcmapstring_wrapper func_ptr, const char *f japanese_text, -1, buf, sizeof(buf)/sizeof(WCHAR)); ok(ret == lstrlenW(katakana_text) + 1, "%s ret %d, error %d, expected value %d\n", func_name, ret, GetLastError(), lstrlenW(katakana_text) + 1); - todo_wine ok(!lstrcmpW(buf, katakana_text), "%s string compare mismatch\n", func_name); + ok(!lstrcmpW(buf, katakana_text), "%s string compare mismatch\n", func_name); /* test LCMAP_FULLWIDTH */ ret = func_ptr(LCMAP_FULLWIDTH,

1 0