October 2016 - Wine-Commits

André Hentschel : shell32/tests: Mark win10 failure as broken.
by Alexandre Julliard Oct. 3, 2016

Oct. 3, 2016

Module: wine Branch: master Commit: 410a9832d1c78c372deeb8544460ce4807495ef0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=410a9832d1c78c372deeb8544… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Oct 2 14:48:55 2016 +0200 shell32/tests: Mark win10 failure as broken. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shlfolder.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 1591b7b..90418bd 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -1588,7 +1588,8 @@ static void test_FolderShortcut(void) { if (hr != S_OK) return; hr = IShellFolder_GetDisplayNameOf(pShellFolder, NULL, SHGDN_FORPARSING, &strret); - ok(hr == S_OK, "IShellFolder_GetDisplayNameOf(NULL) failed! hr = %08x\n", hr); + ok(hr == S_OK || broken(hr == E_INVALIDARG) /* win10 */, + "IShellFolder_GetDisplayNameOf(NULL) failed! hr = %08x\n", hr); if (hr != S_OK) { IShellFolder_Release(pShellFolder); return;

1 0

Gerald Pfeifer : wininet: Increase buffer in _test_status_code to avoid potential potential overflow.
by Alexandre Julliard Oct. 3, 2016

Oct. 3, 2016

Module: wine Branch: master Commit: 3cb027c7436d0299c5179fb1e19fa1416e0ca6f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cb027c7436d0299c5179fb1e… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun Oct 2 12:15:40 2016 +0200 wininet: Increase buffer in _test_status_code to avoid potential potential overflow. Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/tests/http.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index fc68fe1..f2fe25c 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -200,7 +200,7 @@ static BOOL proxy_active(void) static void _test_status_code(unsigned line, HINTERNET req, DWORD excode, BOOL is_todo) { DWORD code, size, index; - char exbuf[10], bufa[10]; + char exbuf[12], bufa[10]; WCHAR bufw[10]; BOOL res;

1 0

Akihiro Sagawa : kernel32: Implement LCMAP_HALFWIDTH.
by Alexandre Julliard Oct. 3, 2016

Oct. 3, 2016

Module: wine Branch: master Commit: 429ca40fc89df38342a28047cf387ade9e2a05dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=429ca40fc89df38342a28047c… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Oct 3 00:06:57 2016 +0900 kernel32: Implement LCMAP_HALFWIDTH. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/locale.c | 121 ++++++++++++++++++++++++++++++++++++++++++- dlls/kernel32/tests/locale.c | 10 ++-- 2 files changed, 126 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 92435c8..8c5736b 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -3227,6 +3227,100 @@ static INT map_to_fullwidth( LPCWSTR src, INT srclen, LPWSTR dst ) return 1; } +/* decompose a full-width katakana character into one or two half-width characters. */ +static INT decompose_katakana( WCHAR c, LPWSTR dst, INT dstlen ) +{ + const static BYTE katakana_map[] = { + /* */ 0x9e, 0x9f, 0x9e, 0x9f, 0x00, 0x00, 0x00, /* U+3099- */ + 0x00, 0x67, 0x71, 0x68, 0x72, 0x69, 0x73, 0x6a, /* U+30a1- */ + 0x74, 0x6b, 0x75, 0x76, 0x01, 0x77, 0x01, 0x78, /* U+30a8- */ + 0x01, 0x79, 0x01, 0x7a, 0x01, 0x7b, 0x01, 0x7c, /* U+30b0- */ + 0x01, 0x7d, 0x01, 0x7e, 0x01, 0x7f, 0x01, 0x80, /* U+30b8- */ + 0x01, 0x81, 0x01, 0x6f, 0x82, 0x01, 0x83, 0x01, /* U+30c0- */ + 0x84, 0x01, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, /* U+30c8- */ + 0x01, 0x02, 0x8b, 0x01, 0x02, 0x8c, 0x01, 0x02, /* U+30d0- */ + 0x8d, 0x01, 0x02, 0x8e, 0x01, 0x02, 0x8f, 0x90, /* U+30d8- */ + 0x91, 0x92, 0x93, 0x6c, 0x94, 0x6d, 0x95, 0x6e, /* U+30e0- */ + 0x96, 0x97, 0x98, 0x99, 0x9a, 0x9b, 0x00, 0x9c, /* U+30e8- */ + 0x00, 0x00, 0x66, 0x9d, 0x4e, 0x00, 0x00, 0x08, /* U+30f0- */ + 0x58, 0x58, 0x08, 0x65, 0x70, 0x00, 0x51 /* U+30f8- */ + }; + INT len = 0, shift = c - 0x3099; + BYTE k; + + if (shift < 0 || shift >= sizeof(katakana_map)/sizeof(katakana_map[0])) + return 0; + + k = katakana_map[shift]; + + if (!k) + { + if (dstlen > 0) + *dst = c; + len++; + } + else if (k > 0x60) + { + if (dstlen > 0) + *dst = k | 0xff00; + len++; + } + else + { + if (dstlen >= 2) + { + dst[0] = (k > 0x50) ? (c - (k & 0xf)) : (katakana_map[shift - k] | 0xff00); + dst[1] = (k == 2) ? 0xff9f : 0xff9e; + } + len += 2; + } + return len; +} + +/* map single full-width character to single or double half-width characters. */ +static INT map_to_halfwidth(WCHAR c, LPWSTR dst, INT dstlen) +{ + INT n = decompose_katakana(c, dst, dstlen); + if (n > 0) + return n; + + if (c == 0x3000) + *dst = ' '; + else if (c == 0x3001) + *dst = 0xff64; + else if (c == 0x3002) + *dst = 0xff61; + else if (c == 0x300c || c == 0x300d) + *dst = (c - 0x300c) + 0xff62; + else if (c >= 0x3131 && c <= 0x3163) + { + *dst = c - 0x3131 + 0xffa1; + if (*dst >= 0xffbf) *dst += 3; + if (*dst >= 0xffc8) *dst += 2; + if (*dst >= 0xffd0) *dst += 2; + if (*dst >= 0xffd8) *dst += 2; + } + else if (c == 0x3164) + *dst = 0xffa0; + else if (c == 0x2019) + *dst = '\''; + else if (c == 0x201d) + *dst = '"'; + else if (c > 0xff00 && c < 0xff5f && c != 0xff3c) + *dst = c - 0xff00 + 0x20; + else if (c >= 0xffe0 && c <= 0xffe6) + { + const static WCHAR misc_symbol_map[] = { + 0x00a2, 0x00a3, 0x00ac, 0x00af, 0x00a6, 0x00a5, 0x20a9 + }; + *dst = misc_symbol_map[c - 0xffe0]; + } + else + *dst = c; + + return 1; +} + /************************************************************************* * LCMapStringEx (KERNEL32.@) * @@ -3310,7 +3404,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 | LCMAP_KATAKANA | LCMAP_FULLWIDTH)) && + ((flags & (LCMAP_HIRAGANA | LCMAP_KATAKANA | LCMAP_HALFWIDTH | LCMAP_FULLWIDTH)) && (flags & (LCMAP_SIMPLIFIED_CHINESE | LCMAP_TRADITIONAL_CHINESE)))) { SetLastError(ERROR_INVALID_FLAGS); @@ -3349,6 +3443,12 @@ INT WINAPI LCMapStringEx(LPCWSTR name, DWORD flags, LPCWSTR src, INT srclen, LPW } } } + else if (flags & LCMAP_HALFWIDTH) + { + for (len = 0; srclen; src++, srclen--, len++) + if (decompose_katakana(*src, NULL, 0) == 2) + len++; + } else len = srclen; return len; @@ -3407,7 +3507,24 @@ INT WINAPI LCMapStringEx(LPCWSTR name, DWORD flags, LPCWSTR src, INT srclen, LPW wch == 0x30FD || wch == 0x30FE) wch -= 0x60; } - *dst_ptr = wch; + + if (flags & LCMAP_HALFWIDTH) + { + /* map full-width character to half-width one, + e.g. U+30A2 -> U+FF71, U+30D7 -> U+FF8C U+FF9F. */ + if (map_to_halfwidth(wch, dst_ptr, dstlen) == 2) + { + dstlen--; + dst_ptr++; + if (!dstlen) + { + SetLastError(ERROR_INSUFFICIENT_BUFFER); + return 0; + } + } + } + else + *dst_ptr = wch; } if (!(flags & (LCMAP_UPPERCASE | LCMAP_LOWERCASE))) goto done; diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 0f55de0..dd946a2 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -2218,6 +2218,10 @@ static const DWORD lcmap_invalid_flags[] = { LCMAP_FULLWIDTH | NORM_IGNORESYMBOLS, LCMAP_FULLWIDTH | LCMAP_SIMPLIFIED_CHINESE, LCMAP_FULLWIDTH | LCMAP_TRADITIONAL_CHINESE, + LCMAP_HALFWIDTH | NORM_IGNORENONSPACE, + LCMAP_HALFWIDTH | NORM_IGNORESYMBOLS, + LCMAP_HALFWIDTH | LCMAP_SIMPLIFIED_CHINESE, + LCMAP_HALFWIDTH | LCMAP_TRADITIONAL_CHINESE, }; static void test_LCMapStringA(void) @@ -2486,9 +2490,9 @@ static void test_lcmapstring_unicode(lcmapstring_wrapper func_ptr, const char *f /* 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, + 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); + 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); @@ -2505,7 +2509,7 @@ static void test_lcmapstring_unicode(lcmapstring_wrapper func_ptr, const char *f buf[0] = 0x30ac; SetLastError(0xdeadbeef); ret = func_ptr(LCMAP_HALFWIDTH, buf, 1, buf2, 1); - todo_wine ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, + 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 */

1 0

Alexandre Julliard : Wine release 1.9.20
by Alexandre Julliard Oct. 1, 2016

Oct. 1, 2016

Module: website Branch: master Commit: 1c8806b92973a1a9810e5f814bce43e60fb3c744 URL: http://source.winehq.org/git/website.git/?a=commit;h=1c8806b92973a1a9810e5f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Oct 1 17:34:54 2016 +0200 Wine release 1.9.20 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2016100101.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/en/2016100101.xml b/news/en/2016100101.xml new file mode 100644 index 0000000..58cd9b5 --- /dev/null +++ b/news/en/2016100101.xml @@ -0,0 +1,15 @@ +<news> +<date>October 1, 2016</date> +<title>Wine 1.9.20 Released</title> +<body> + The Wine development release 1.9.20 is now available. + <a href="{$root}/announce/1.9.20">What's new</a> in this release: +<ul> + <li>Reimplementation of the clipboard API.</li> + <li>Message handling in WebServices.</li> + <li>Many more API Set libraries.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/1.9/wine-1.9.20.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

Tag wine-1.9.20 : Alexandre Julliard : Release 1.9.20
by Alexandre Julliard Oct. 1, 2016

Oct. 1, 2016

Module: wine Branch: refs/tags/wine-1.9.20 Tag: 43e53e9057964b4e4c886ed042007f7b9d7bb928 URL: http://source.winehq.org/git/wine.git/?a=tag;h=43e53e9057964b4e4c886ed04200… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Oct 1 17:29:06 2016 +0200 Release 1.9.20

1 0

Alexandre Julliard : Release 1.9.20.
by Alexandre Julliard Oct. 1, 2016

Oct. 1, 2016

Module: wine Branch: master Commit: 8a92dd9a5720c4b6b334e4f13629c0b0f5a72e94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a92dd9a5720c4b6b334e4f13… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Oct 1 17:29:06 2016 +0200 Release 1.9.20. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 480 +++++++++++++++++++++++++++++++------------------------------- AUTHORS | 2 + VERSION | 2 +- configure | 18 +-- 4 files changed, 252 insertions(+), 250 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8a92dd9a5720c4b6b334e…

1 0

Detlef Riekenberg : scrrun/tests: Use case insensitive compare for filenames.
by Alexandre Julliard Oct. 1, 2016

Oct. 1, 2016

Module: wine Branch: master Commit: b488a67bafbfe231579bfd2a47f45db7d7decf7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b488a67bafbfe231579bfd2a4… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Thu Sep 29 23:56:56 2016 +0200 scrrun/tests: Use case insensitive compare for filenames. Signed-off-by: Detlef Riekenberg <wine.dev(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/scrrun/tests/filesystem.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index 8457714..cd0e6d6 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -621,7 +621,7 @@ static void test_GetFile(void) hr = IFile_get_Path(file, &str); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(!lstrcmpW(str, pathW), "got %s\n", wine_dbgstr_w(str)); + ok(!lstrcmpiW(str, pathW), "got %s\n", wine_dbgstr_w(str)); SysFreeString(str); #define FILE_ATTR_MASK (FILE_ATTRIBUTE_READONLY | FILE_ATTRIBUTE_HIDDEN | \

1 0

Sebastian Lackner : server: Handle error when memdup fails in synthesize_formats.
by Alexandre Julliard Oct. 1, 2016

Oct. 1, 2016

Module: wine Branch: master Commit: b6b54fa14abe58d35e7d68afe2b8af5319c8983a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6b54fa14abe58d35e7d68afe… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Sep 30 03:41:38 2016 +0200 server: Handle error when memdup fails in synthesize_formats. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/clipboard.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/clipboard.c b/server/clipboard.c index d8b5f96..89ce835 100644 --- a/server/clipboard.c +++ b/server/clipboard.c @@ -206,7 +206,7 @@ static int synthesize_formats( struct clipboard *clipboard ) (HAS_FORMAT( map, CF_TEXT ) || HAS_FORMAT( map, CF_OEMTEXT ) || HAS_FORMAT( map, CF_UNICODETEXT ))) { void *data = memdup( &clipboard->lcid, sizeof(clipboard->lcid) ); - if ((format = add_format( clipboard, CF_LOCALE ))) + if (data && (format = add_format( clipboard, CF_LOCALE ))) { format->seqno = clipboard->seqno++; format->data = data;

1 0

Piotr Caban : msvcp120: Don't add basic_ios:: _Add_vtordisp virtual functions.
by Alexandre Julliard Oct. 1, 2016

Oct. 1, 2016

Module: wine Branch: master Commit: b5933916286899a20d8f6744b03a206dc0bfea2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5933916286899a20d8f6744b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Sep 30 09:14:14 2016 +0200 msvcp120: Don't add basic_ios::_Add_vtordisp virtual functions. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/ios.c | 64 +++++++++++++++++++++++++++--------------------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index ddd9580..f673bc1 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -759,21 +759,21 @@ void __asm_dummy_vtables(void) { VTABLE_ADD_FUNC(ios_base_vector_dtor)); __ASM_VTABLE(basic_ios_char, VTABLE_ADD_FUNC(basic_ios_char_vector_dtor) -#if _MSVCP_VER >= 110 +#if _MSVCP_VER == 110 VTABLE_ADD_FUNC(basic_ios__Add_vtordisp1) VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2) #endif ); __ASM_VTABLE(basic_ios_wchar, VTABLE_ADD_FUNC(basic_ios_wchar_vector_dtor) -#if _MSVCP_VER >= 110 +#if _MSVCP_VER == 110 VTABLE_ADD_FUNC(basic_ios__Add_vtordisp1) VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2) #endif ); __ASM_VTABLE(basic_ios_short, VTABLE_ADD_FUNC(basic_ios_wchar_vector_dtor) -#if _MSVCP_VER >= 110 +#if _MSVCP_VER == 110 VTABLE_ADD_FUNC(basic_ios__Add_vtordisp1) VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2) #endif @@ -957,189 +957,189 @@ void __asm_dummy_vtables(void) { VTABLE_ADD_FUNC(basic_streambuf_wchar_imbue)); __ASM_VTABLE(basic_ostream_char, VTABLE_ADD_FUNC(basic_ostream_char_vector_dtor) -#if _MSVCP_VER >= 110 +#if _MSVCP_VER == 110 VTABLE_ADD_FUNC(basic_ios__Add_vtordisp1) VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2) #endif ); __ASM_VTABLE(basic_ostream_wchar, VTABLE_ADD_FUNC(basic_ostream_wchar_vector_dtor) -#if _MSVCP_VER >= 110 +#if _MSVCP_VER == 110 VTABLE_ADD_FUNC(basic_ios__Add_vtordisp1) VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2) #endif ); __ASM_VTABLE(basic_ostream_short, VTABLE_ADD_FUNC(basic_ostream_wchar_vector_dtor) -#if _MSVCP_VER >= 110 +#if _MSVCP_VER == 110 VTABLE_ADD_FUNC(basic_ios__Add_vtordisp1) VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2) #endif ); __ASM_VTABLE(basic_istream_char, VTABLE_ADD_FUNC(basic_istream_char_vector_dtor) -#if _MSVCP_VER >= 110 +#if _MSVCP_VER == 110 VTABLE_ADD_FUNC(basic_ios__Add_vtordisp1) VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2) #endif ); __ASM_VTABLE(basic_istream_wchar, VTABLE_ADD_FUNC(basic_istream_wchar_vector_dtor) -#if _MSVCP_VER >= 110 +#if _MSVCP_VER == 110 VTABLE_ADD_FUNC(basic_ios__Add_vtordisp1) VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2) #endif ); __ASM_VTABLE(basic_istream_short, VTABLE_ADD_FUNC(basic_istream_wchar_vector_dtor) -#if _MSVCP_VER >= 110 +#if _MSVCP_VER == 110 VTABLE_ADD_FUNC(basic_ios__Add_vtordisp1) VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2) #endif ); __ASM_VTABLE(basic_iostream_char, VTABLE_ADD_FUNC(basic_iostream_char_vector_dtor) -#if _MSVCP_VER >= 110 +#if _MSVCP_VER == 110 VTABLE_ADD_FUNC(basic_ios__Add_vtordisp1) VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2) #endif ); __ASM_VTABLE(basic_iostream_wchar, VTABLE_ADD_FUNC(basic_iostream_wchar_vector_dtor) -#if _MSVCP_VER >= 110 +#if _MSVCP_VER == 110 VTABLE_ADD_FUNC(basic_ios__Add_vtordisp1) VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2) #endif ); __ASM_VTABLE(basic_iostream_short, VTABLE_ADD_FUNC(basic_iostream_wchar_vector_dtor) -#if _MSVCP_VER >= 110 +#if _MSVCP_VER == 110 VTABLE_ADD_FUNC(basic_ios__Add_vtordisp1) VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2) #endif ); __ASM_VTABLE(basic_ofstream_char, VTABLE_ADD_FUNC(basic_ofstream_char_vector_dtor) -#if _MSVCP_VER >= 110 +#if _MSVCP_VER == 110 VTABLE_ADD_FUNC(basic_ios__Add_vtordisp1) VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2) #endif ); __ASM_VTABLE(basic_ofstream_wchar, VTABLE_ADD_FUNC(basic_ofstream_wchar_vector_dtor) -#if _MSVCP_VER >= 110 +#if _MSVCP_VER == 110 VTABLE_ADD_FUNC(basic_ios__Add_vtordisp1) VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2) #endif ); __ASM_VTABLE(basic_ofstream_short, VTABLE_ADD_FUNC(basic_ofstream_wchar_vector_dtor) -#if _MSVCP_VER >= 110 +#if _MSVCP_VER == 110 VTABLE_ADD_FUNC(basic_ios__Add_vtordisp1) VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2) #endif ); __ASM_VTABLE(basic_ifstream_char, VTABLE_ADD_FUNC(basic_ifstream_char_vector_dtor) -#if _MSVCP_VER >= 110 +#if _MSVCP_VER == 110 VTABLE_ADD_FUNC(basic_ios__Add_vtordisp1) VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2) #endif ); __ASM_VTABLE(basic_ifstream_wchar, VTABLE_ADD_FUNC(basic_ifstream_wchar_vector_dtor) -#if _MSVCP_VER >= 110 +#if _MSVCP_VER == 110 VTABLE_ADD_FUNC(basic_ios__Add_vtordisp1) VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2) #endif ); __ASM_VTABLE(basic_ifstream_short, VTABLE_ADD_FUNC(basic_ifstream_wchar_vector_dtor) -#if _MSVCP_VER >= 110 +#if _MSVCP_VER == 110 VTABLE_ADD_FUNC(basic_ios__Add_vtordisp1) VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2) #endif ); __ASM_VTABLE(basic_fstream_char, VTABLE_ADD_FUNC(basic_fstream_char_vector_dtor) -#if _MSVCP_VER >= 110 +#if _MSVCP_VER == 110 VTABLE_ADD_FUNC(basic_ios__Add_vtordisp1) VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2) #endif ); __ASM_VTABLE(basic_fstream_wchar, VTABLE_ADD_FUNC(basic_fstream_wchar_vector_dtor) -#if _MSVCP_VER >= 110 +#if _MSVCP_VER == 110 VTABLE_ADD_FUNC(basic_ios__Add_vtordisp1) VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2) #endif ); __ASM_VTABLE(basic_fstream_short, VTABLE_ADD_FUNC(basic_fstream_wchar_vector_dtor) -#if _MSVCP_VER >= 110 +#if _MSVCP_VER == 110 VTABLE_ADD_FUNC(basic_ios__Add_vtordisp1) VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2) #endif ); __ASM_VTABLE(basic_ostringstream_char, VTABLE_ADD_FUNC(basic_ostringstream_char_vector_dtor) -#if _MSVCP_VER >= 110 +#if _MSVCP_VER == 110 VTABLE_ADD_FUNC(basic_ios__Add_vtordisp1) VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2) #endif ); __ASM_VTABLE(basic_ostringstream_wchar, VTABLE_ADD_FUNC(basic_ostringstream_wchar_vector_dtor) -#if _MSVCP_VER >= 110 +#if _MSVCP_VER == 110 VTABLE_ADD_FUNC(basic_ios__Add_vtordisp1) VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2) #endif ); __ASM_VTABLE(basic_ostringstream_short, VTABLE_ADD_FUNC(basic_ostringstream_wchar_vector_dtor) -#if _MSVCP_VER >= 110 +#if _MSVCP_VER == 110 VTABLE_ADD_FUNC(basic_ios__Add_vtordisp1) VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2) #endif ); __ASM_VTABLE(basic_istringstream_char, VTABLE_ADD_FUNC(basic_istringstream_char_vector_dtor) -#if _MSVCP_VER >= 110 +#if _MSVCP_VER == 110 VTABLE_ADD_FUNC(basic_ios__Add_vtordisp1) VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2) #endif ); __ASM_VTABLE(basic_istringstream_wchar, VTABLE_ADD_FUNC(basic_istringstream_wchar_vector_dtor) -#if _MSVCP_VER >= 110 +#if _MSVCP_VER == 110 VTABLE_ADD_FUNC(basic_ios__Add_vtordisp1) VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2) #endif ); __ASM_VTABLE(basic_istringstream_short, VTABLE_ADD_FUNC(basic_istringstream_wchar_vector_dtor) -#if _MSVCP_VER >= 110 +#if _MSVCP_VER == 110 VTABLE_ADD_FUNC(basic_ios__Add_vtordisp1) VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2) #endif ); __ASM_VTABLE(basic_stringstream_char, VTABLE_ADD_FUNC(basic_stringstream_char_vector_dtor) -#if _MSVCP_VER >= 110 +#if _MSVCP_VER == 110 VTABLE_ADD_FUNC(basic_ios__Add_vtordisp1) VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2) #endif ); __ASM_VTABLE(basic_stringstream_wchar, VTABLE_ADD_FUNC(basic_stringstream_wchar_vector_dtor) -#if _MSVCP_VER >= 110 +#if _MSVCP_VER == 110 VTABLE_ADD_FUNC(basic_ios__Add_vtordisp1) VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2) #endif ); __ASM_VTABLE(basic_stringstream_short, VTABLE_ADD_FUNC(basic_stringstream_wchar_vector_dtor) -#if _MSVCP_VER >= 110 +#if _MSVCP_VER == 110 VTABLE_ADD_FUNC(basic_ios__Add_vtordisp1) VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2) #endif @@ -1163,14 +1163,14 @@ void __asm_dummy_vtables(void) { VTABLE_ADD_FUNC(basic_streambuf_char_imbue)); __ASM_VTABLE(ostrstream, VTABLE_ADD_FUNC(ostrstream_vector_dtor) -#if _MSVCP_VER >= 110 +#if _MSVCP_VER == 110 VTABLE_ADD_FUNC(basic_ios__Add_vtordisp1) VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2) #endif ); __ASM_VTABLE(strstream, VTABLE_ADD_FUNC(strstream_vector_dtor) -#if _MSVCP_VER >= 110 +#if _MSVCP_VER == 110 VTABLE_ADD_FUNC(basic_ios__Add_vtordisp1) VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2) #endif

1 0

Detlef Riekenberg : ntdll/tests: Use case insensitive compare for filenames.
by Alexandre Julliard Oct. 1, 2016

Oct. 1, 2016

Module: wine Branch: master Commit: 1ebbfb1a1d54c4573d79367261030d259e2925cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ebbfb1a1d54c4573d7936726… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Thu Sep 29 23:07:47 2016 +0200 ntdll/tests: Use case insensitive compare for filenames. Signed-off-by: Detlef Riekenberg <wine.dev(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/file.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 649b6b4..586b2c9 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -1571,7 +1571,7 @@ static void test_file_rename_information(void) res = pNtQueryInformationFile( handle, &io, fni, sizeof(FILE_NAME_INFORMATION) + MAX_PATH * sizeof(WCHAR), FileNameInformation ); ok( res == STATUS_SUCCESS, "res expected STATUS_SUCCESS, got %x\n", res ); fni->FileName[ fni->FileNameLength / sizeof(WCHAR) ] = 0; - ok( !lstrcmpW(fni->FileName, newpath + 2), "FileName expected %s, got %s\n", + ok( !lstrcmpiW(fni->FileName, newpath + 2), "FileName expected %s, got %s\n", wine_dbgstr_w(newpath + 2), wine_dbgstr_w(fni->FileName) ); HeapFree( GetProcessHeap(), 0, fni ); @@ -1741,7 +1741,7 @@ static void test_file_rename_information(void) res = pNtQueryInformationFile( handle, &io, fni, sizeof(FILE_NAME_INFORMATION) + MAX_PATH * sizeof(WCHAR), FileNameInformation ); ok( res == STATUS_SUCCESS, "res expected STATUS_SUCCESS, got %x\n", res ); fni->FileName[ fni->FileNameLength / sizeof(WCHAR) ] = 0; - ok( !lstrcmpW(fni->FileName, newpath + 2), "FileName expected %s, got %s\n", + ok( !lstrcmpiW(fni->FileName, newpath + 2), "FileName expected %s, got %s\n", wine_dbgstr_w(newpath + 2), wine_dbgstr_w(fni->FileName) ); HeapFree( GetProcessHeap(), 0, fni ); @@ -2147,7 +2147,7 @@ static void test_file_rename_information(void) res = pNtQueryInformationFile( handle, &io, fni, sizeof(FILE_NAME_INFORMATION) + MAX_PATH * sizeof(WCHAR), FileNameInformation ); ok( res == STATUS_SUCCESS, "res expected STATUS_SUCCESS, got %x\n", res ); fni->FileName[ fni->FileNameLength / sizeof(WCHAR) ] = 0; - todo_wine ok( !lstrcmpW(fni->FileName, newpath + 2), "FileName expected %s, got %s\n", + todo_wine ok( !lstrcmpiW(fni->FileName, newpath + 2), "FileName expected %s, got %s\n", wine_dbgstr_w(newpath + 2), wine_dbgstr_w(fni->FileName) ); HeapFree( GetProcessHeap(), 0, fni ); @@ -2203,7 +2203,7 @@ static void test_file_link_information(void) res = pNtQueryInformationFile( handle, &io, fni, sizeof(FILE_NAME_INFORMATION) + MAX_PATH * sizeof(WCHAR), FileNameInformation ); ok( res == STATUS_SUCCESS, "res expected STATUS_SUCCESS, got %x\n", res ); fni->FileName[ fni->FileNameLength / sizeof(WCHAR) ] = 0; - ok( !lstrcmpW(fni->FileName, oldpath + 2), "FileName expected %s, got %s\n", + ok( !lstrcmpiW(fni->FileName, oldpath + 2), "FileName expected %s, got %s\n", wine_dbgstr_w(oldpath + 2), wine_dbgstr_w(fni->FileName) ); HeapFree( GetProcessHeap(), 0, fni ); @@ -2373,7 +2373,7 @@ static void test_file_link_information(void) res = pNtQueryInformationFile( handle, &io, fni, sizeof(FILE_NAME_INFORMATION) + MAX_PATH * sizeof(WCHAR), FileNameInformation ); ok( res == STATUS_SUCCESS, "res expected STATUS_SUCCESS, got %x\n", res ); fni->FileName[ fni->FileNameLength / sizeof(WCHAR) ] = 0; - ok( !lstrcmpW(fni->FileName, oldpath + 2), "FileName expected %s, got %s\n", + ok( !lstrcmpiW(fni->FileName, oldpath + 2), "FileName expected %s, got %s\n", wine_dbgstr_w(oldpath + 2), wine_dbgstr_w(fni->FileName) ); HeapFree( GetProcessHeap(), 0, fni ); @@ -2776,7 +2776,7 @@ static void test_file_link_information(void) res = pNtQueryInformationFile( handle, &io, fni, sizeof(FILE_NAME_INFORMATION) + MAX_PATH * sizeof(WCHAR), FileNameInformation ); ok( res == STATUS_SUCCESS, "res expected STATUS_SUCCESS, got %x\n", res ); fni->FileName[ fni->FileNameLength / sizeof(WCHAR) ] = 0; - ok( !lstrcmpW(fni->FileName, oldpath + 2), "FileName expected %s, got %s\n", + ok( !lstrcmpiW(fni->FileName, oldpath + 2), "FileName expected %s, got %s\n", wine_dbgstr_w(oldpath + 2), wine_dbgstr_w(fni->FileName) ); HeapFree( GetProcessHeap(), 0, fni );

1 0