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

Józef Kucia : ddraw: Forbid creating flippable cubemaps.
by Alexandre Julliard 17 May '16

17 May '16

Module: wine Branch: master Commit: 00bf75066b752193d879c3b1d6ce6cbc20646e5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=00bf75066b752193d879c3b1d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri May 13 13:55:28 2016 +0200 ddraw: Forbid creating flippable cubemaps. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/surface.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index e38e668..d36afe7 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -5735,6 +5735,13 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ return DDERR_INVALIDCAPS; } + if (desc->ddsCaps.dwCaps2 & DDSCAPS2_CUBEMAP) + { + WARN("Tried to create a flippable cubemap.\n"); + HeapFree(GetProcessHeap(), 0, texture); + return DDERR_INVALIDPARAMS; + } + if (desc->ddsCaps.dwCaps & DDSCAPS_TEXTURE) { FIXME("Flippable textures not implemented.\n"); @@ -5748,6 +5755,8 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ { WARN("Tried to specify a back buffer count for a non-flippable surface.\n"); HeapFree(GetProcessHeap(), 0, texture); + if (desc->ddsCaps.dwCaps2 & DDSCAPS2_CUBEMAP) + return DDERR_INVALIDPARAMS; return DDERR_INVALIDCAPS; } }

1 0

Kirill Smirnov : regedit: Fix an out-of-bounds array access (clang).
by Alexandre Julliard 17 May '16

17 May '16

Module: wine Branch: master Commit: fe517f9256e9b9aaa32afb05b01198eec3e5ea17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe517f9256e9b9aaa32afb05b… Author: Kirill Smirnov <kirill.k.smirnov(a)gmail.com> Date: Mon May 9 19:50:44 2016 +0300 regedit: Fix an out-of-bounds array access (clang). Signed-off-by: Kirill K. Smirnov <kirill.k.smirnov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regedit.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/regedit/regedit.c b/programs/regedit/regedit.c index acff701..2cbd4bb 100644 --- a/programs/regedit/regedit.c +++ b/programs/regedit/regedit.c @@ -105,8 +105,8 @@ static void get_file_name(CHAR **command_line, CHAR *file_name) } } memcpy(file_name, *command_line, pos * sizeof((*command_line)[0])); - /* remove the last backslash */ - if (file_name[pos - 1] == '\\') { + /* Terminate the string and remove the trailing backslash */ + if (pos > 0 && file_name[pos - 1] == '\\') { file_name[pos - 1] = '\0'; } else { file_name[pos] = '\0';

1 0

Kirill Smirnov : winhlp32: Do not pass NULL to strchr() (spotted by clang) .
by Alexandre Julliard 17 May '16

17 May '16

Module: wine Branch: master Commit: 5a3ad0ecf08c00fc0b7b2f24e55be27b7c3f5da0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a3ad0ecf08c00fc0b7b2f24e… Author: Kirill Smirnov <kirill.k.smirnov(a)gmail.com> Date: Mon May 9 18:56:14 2016 +0300 winhlp32: Do not pass NULL to strchr() (spotted by clang). Signed-off-by: Kirill K. Smirnov <kirill.k.smirnov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winhlp32/macro.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/winhlp32/macro.c b/programs/winhlp32/macro.c index f0a6893..5a25d6c 100644 --- a/programs/winhlp32/macro.c +++ b/programs/winhlp32/macro.c @@ -607,7 +607,7 @@ static void CALLBACK MACRO_JumpID(LPCSTR lpszPathWindow, LPCSTR topic_id) LPSTR ptr; WINE_TRACE("(%s, %s)\n", debugstr_a(lpszPathWindow), debugstr_a(topic_id)); - if ((ptr = strchr(lpszPathWindow, '>')) != NULL) + if (lpszPathWindow && (ptr = strchr(lpszPathWindow, '>')) != NULL) { LPSTR tmp; size_t sz;

1 0

Kirill Smirnov : winhlp32: Fix an uninitialized variable (clang).
by Alexandre Julliard 17 May '16

17 May '16

Module: wine Branch: master Commit: 85c67cca96b2010cd885a6789def5ba1444ab1be URL: http://source.winehq.org/git/wine.git/?a=commit;h=85c67cca96b2010cd885a6789… Author: Kirill Smirnov <kirill.k.smirnov(a)gmail.com> Date: Mon May 9 19:09:46 2016 +0300 winhlp32: Fix an uninitialized variable (clang). Signed-off-by: Kirill K. Smirnov <kirill.k.smirnov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winhlp32/winhelp.c | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/winhlp32/winhelp.c b/programs/winhlp32/winhelp.c index b7d99e8..dc6777b 100644 --- a/programs/winhlp32/winhelp.c +++ b/programs/winhlp32/winhelp.c @@ -986,6 +986,7 @@ static BOOL WINHELP_CheckPopup(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam popup = Globals.active_popup; Globals.active_popup = NULL; WINHELP_ReleaseWindow(popup); + if (lret) *lret = 1; return TRUE; } return FALSE;

1 0

Andrey Gusev : kernel32/tests: Fix a typo in comment.
by Alexandre Julliard 17 May '16

17 May '16

Module: wine Branch: master Commit: a7f0dc8c3b23cc7dd2a95ec9c1410ca4ba3d7baf URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7f0dc8c3b23cc7dd2a95ec9c… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon May 16 16:42:44 2016 +0300 kernel32/tests: Fix a typo in comment. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/process.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 2631aa3..61dcdc2 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -2991,7 +2991,7 @@ static void test_process_info(void) sizeof(buf) /* ProcessHandleTracing */, sizeof(ULONG) /* ProcessIoPriority */, sizeof(ULONG) /* ProcessExecuteFlags */, -#if 0 /* FIXME: Add remaning classes */ +#if 0 /* FIXME: Add remaining classes */ ProcessResourceManagement, sizeof(ULONG) /* ProcessCookie */, sizeof(SECTION_IMAGE_INFORMATION) /* ProcessImageInformation */,

1 0

Andrey Gusev : secur32: Fix a typo in comment.
by Alexandre Julliard 17 May '16

17 May '16

Module: wine Branch: master Commit: d987cc3d83bd234d1c81a4262fd66a36a8c9341a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d987cc3d83bd234d1c81a4262… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon May 16 22:38:02 2016 +0300 secur32: Fix a typo in comment. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/ntlm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/secur32/ntlm.c b/dlls/secur32/ntlm.c index a38d81a..d24c763 100644 --- a/dlls/secur32/ntlm.c +++ b/dlls/secur32/ntlm.c @@ -1460,7 +1460,7 @@ static SECURITY_STATUS SEC_ENTRY ntlm_RevertSecurityContext(PCtxtHandle phContex * As both MakeSignature and VerifySignature need this, but different keys * are needed for NTLM2, the logic goes into a helper function. * To ensure maximal reusability, we can specify the direction as NTLM_SEND for - * signing/encrypting and NTLM_RECV for verfying/decrypting. When encrypting, + * signing/encrypting and NTLM_RECV for verifying/decrypting. When encrypting, * the signature is encrypted after the message was encrypted, so * CreateSignature shouldn't do it. In this case, encrypt_sig can be set to * false.

1 0

Ken Thomases : winex11: Fix logic of whether to use XUnmapWindow() or XWithdrawWindow() in make_window_embedded().
by Alexandre Julliard 17 May '16

17 May '16

Module: wine Branch: master Commit: daa351ee82c1b699fb34652ca91ae5cb93b1dbab URL: http://source.winehq.org/git/wine.git/?a=commit;h=daa351ee82c1b699fb34652ca… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon May 16 22:34:26 2016 -0500 winex11: Fix logic of whether to use XUnmapWindow() or XWithdrawWindow() in make_window_embedded(). Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/window.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 4789f98..59affca 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1174,7 +1174,7 @@ void make_window_embedded( struct x11drv_win_data *data ) /* the window cannot be mapped before being embedded */ if (data->mapped) { - if (data->managed) XUnmapWindow( data->display, data->whole_window ); + if (!data->managed) XUnmapWindow( data->display, data->whole_window ); else XWithdrawWindow( data->display, data->whole_window, data->vis.screen ); data->net_wm_state = 0; }

1 0

Nikolay Sivov : kernel32/nls: Fix shortest day names for Thai and Vietnamese.
by Alexandre Julliard 17 May '16

17 May '16

Module: wine Branch: master Commit: 45edebfb4f07ab3533821e50b20369482df91d2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=45edebfb4f07ab3533821e50b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 17 08:42:34 2016 +0300 kernel32/nls: Fix shortest day names for Thai and Vietnamese. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/nls/tha.nls | 16 ++++++++-------- dlls/kernel32/nls/vit.nls | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/kernel32/nls/tha.nls b/dlls/kernel32/nls/tha.nls index 7e2e6ad..1b35e19 100644 --- a/dlls/kernel32/nls/tha.nls +++ b/dlls/kernel32/nls/tha.nls @@ -134,13 +134,13 @@ STRINGTABLE LANGUAGE LANG_THAI, SUBLANG_DEFAULT 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 "," @@ -160,7 +160,7 @@ STRINGTABLE LANGUAGE LANG_THAI, SUBLANG_DEFAULT LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE "Simplified Chinese" LGRPID_THAI+LGRPID_RES_BASE "Thai" LGRPID_HEBREW+LGRPID_RES_BASE "Hebrew" - LGRPID_ARABIC+LGRPID_RES_BASE "Arabic" + LGRPID_ARABIC+LGRPID_RES_BASE "Arabic" LGRPID_VIETNAMESE+LGRPID_RES_BASE "Vietnamese" LGRPID_INDIC+LGRPID_RES_BASE "Indic" LGRPID_GEORGIAN+LGRPID_RES_BASE "Georgian" diff --git a/dlls/kernel32/nls/vit.nls b/dlls/kernel32/nls/vit.nls index 89b030c..b66c796 100644 --- a/dlls/kernel32/nls/vit.nls +++ b/dlls/kernel32/nls/vit.nls @@ -134,13 +134,13 @@ STRINGTABLE LANGUAGE LANG_VIETNAMESE, SUBLANG_DEFAULT LOCALE_SPOSITIVESIGN "" LOCALE_SSCRIPTS "Latn;" 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_SSHORTESTDAYNAME7 "cn" + LOCALE_SSHORTESTDAYNAME1 "H" + LOCALE_SSHORTESTDAYNAME2 "B" + LOCALE_SSHORTESTDAYNAME3 "T" + LOCALE_SSHORTESTDAYNAME4 "N" + LOCALE_SSHORTESTDAYNAME5 "S" + LOCALE_SSHORTESTDAYNAME6 "B" + LOCALE_SSHORTESTDAYNAME7 "C" LOCALE_SSHORTTIME "h:mm tt" LOCALE_SSORTNAME "Default" LOCALE_STHOUSAND "." @@ -160,7 +160,7 @@ STRINGTABLE LANGUAGE LANG_VIETNAMESE, SUBLANG_DEFAULT LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE "Simplified Chinese" LGRPID_THAI+LGRPID_RES_BASE "Thai" LGRPID_HEBREW+LGRPID_RES_BASE "Hebrew" - LGRPID_ARABIC+LGRPID_RES_BASE "Arabic" + LGRPID_ARABIC+LGRPID_RES_BASE "Arabic" LGRPID_VIETNAMESE+LGRPID_RES_BASE "Vietnamese" LGRPID_INDIC+LGRPID_RES_BASE "Indic" LGRPID_GEORGIAN+LGRPID_RES_BASE "Georgian"

1 0

Akihiro Sagawa : kernel32/tests: Add more partial DBCS character tests that contains a null character.
by Alexandre Julliard 17 May '16

17 May '16

Module: wine Branch: master Commit: cfe015a98c77bb7ceb61aeb12527740a81e1744f URL: http://source.winehq.org/git/wine.git/?a=commit;h=cfe015a98c77bb7ceb61aeb12… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sun May 15 21:08:46 2016 +0900 kernel32/tests: Add more partial DBCS character tests that contains a null character. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/codepage.c | 69 ++++++++++++++++++++++++++++++++++++++---- 1 file changed, 63 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/tests/codepage.c b/dlls/kernel32/tests/codepage.c index 65ce924..3161b8b 100644 --- a/dlls/kernel32/tests/codepage.c +++ b/dlls/kernel32/tests/codepage.c @@ -1139,8 +1139,8 @@ static void test_threadcp(void) static void test_dbcs_to_widechar(void) { int i, count, count2; - WCHAR wbuf[2]; - unsigned char buf[] = {0xbf, 0xb4, 0xc7}; + WCHAR wbuf[5]; + unsigned char buf[] = {0xbf, 0xb4, 0xc7, '\0', 'x'}; static const DWORD flags[] = { MB_PRECOMPOSED, MB_COMPOSITE, @@ -1157,8 +1157,7 @@ static void test_dbcs_to_widechar(void) for (i = 0; i < sizeof(flags)/sizeof(DWORD); ++i) { - wbuf[0] = 0xffff; - wbuf[1] = 0xffff; + memset(wbuf, 0xff, sizeof(wbuf)); count = MultiByteToWideChar(936, flags[i], (char*)&buf[0], 2, NULL, 0); count2 = MultiByteToWideChar(936, flags[i], (char*)&buf[0], 2, wbuf, count); @@ -1170,8 +1169,7 @@ static void test_dbcs_to_widechar(void) for (i = 0; i < sizeof(flags)/sizeof(DWORD); ++i) { - wbuf[0] = 0xffff; - wbuf[1] = 0xffff; + memset(wbuf, 0xff, sizeof(wbuf)); count = MultiByteToWideChar(936, flags[i], (char*)&buf[0], 3, NULL, 0); SetLastError( 0xdeadbeef ); count2 = MultiByteToWideChar(936, flags[i], (char*)&buf[0], 3, wbuf, count); @@ -1190,6 +1188,65 @@ static void test_dbcs_to_widechar(void) ok(wbuf[0] == 0x770b, "%04x: returned %04x (expected 770b)\n", flags[i], wbuf[0]); ok(wbuf[1] == 0x003f || broken(wbuf[1] == 0), /*windows xp*/ "%04x: wrong wide char: %04x\n", flags[i], wbuf[1]); + ok(wbuf[2] == 0xffff, "%04x: returned %04x (expected ffff)\n", flags[i], wbuf[2]); + } + } + + /* src ends with null character */ + for (i = 0; i < sizeof(flags)/sizeof(DWORD); ++i) + { + memset(wbuf, 0xff, sizeof(wbuf)); + count = MultiByteToWideChar(936, flags[i], (char*)&buf[0], 4, NULL, 0); + SetLastError( 0xdeadbeef ); + count2 = MultiByteToWideChar(936, flags[i], (char*)&buf[0], 4, wbuf, count); + ok(count == count2, "%04x: returned %d (expected %d)\n", flags[i], count2, count); + + if (flags[i] & MB_ERR_INVALID_CHARS) + { + ok(count == 0, "%04x: returned %d (expected 0)\n", flags[i], count); + ok(GetLastError() == ERROR_NO_UNICODE_TRANSLATION, "%04x: returned %d (expected %d)\n", + flags[i], GetLastError(), ERROR_NO_UNICODE_TRANSLATION); + } + else + { + WCHAR wbuf_ok[] = { 0x770b, 0x003f, '\0', 0xffff }; + WCHAR wbuf_broken[] = { 0x770b, '\0', 0xffff, 0xffff }; + todo_wine ok(count == 3 || broken(count == 2 /*windows xp*/), + "%04x: returned %d (expected 3)\n", flags[i], count); + todo_wine ok(!memcmp(wbuf, wbuf_ok, sizeof(wbuf_ok)) + || broken(!memcmp(wbuf, wbuf_broken, sizeof(wbuf_broken))), + "%04x: returned %04x %04x %04x %04x (expected %04x %04x %04x %04x)\n", + flags[i], wbuf[0], wbuf[1], wbuf[2], wbuf[3], + wbuf_ok[0], wbuf_ok[1], wbuf_ok[2], wbuf_ok[3]); + } + } + + /* src has null character, but not ends with it */ + for (i = 0; i < sizeof(flags)/sizeof(DWORD); ++i) + { + memset(wbuf, 0xff, sizeof(wbuf)); + count = MultiByteToWideChar(936, flags[i], (char*)&buf[0], 5, NULL, 0); + SetLastError( 0xdeadbeef ); + count2 = MultiByteToWideChar(936, flags[i], (char*)&buf[0], 5, wbuf, count); + ok(count == count2, "%04x: returned %d (expected %d)\n", flags[i], count2, count); + + if (flags[i] & MB_ERR_INVALID_CHARS) + { + ok(count == 0, "%04x: returned %d (expected 0)\n", flags[i], count); + ok(GetLastError() == ERROR_NO_UNICODE_TRANSLATION, "%04x: returned %d (expected %d)\n", + flags[i], GetLastError(), ERROR_NO_UNICODE_TRANSLATION); + } + else + { + WCHAR wbuf_ok[] = { 0x770b, 0x003f, '\0', 'x', 0xffff }; + WCHAR wbuf_broken[] = { 0x770b, '\0', 'x', 0xffff, 0xffff }; + todo_wine ok(count == 4 || broken(count == 3), + "%04x: returned %d (expected 4)\n", flags[i], count); + todo_wine ok(!memcmp(wbuf, wbuf_ok, sizeof(wbuf_ok)) + || broken(!memcmp(wbuf, wbuf_broken, sizeof(wbuf_broken))), + "%04x: returned %04x %04x %04x %04x %04x (expected %04x %04x %04x %04x %04x)\n", + flags[i], wbuf[0], wbuf[1], wbuf[2], wbuf[3], wbuf[4], + wbuf_ok[0], wbuf_ok[1], wbuf_ok[2], wbuf_ok[3], wbuf_ok[4]); } } }

1 0

Akihiro Sagawa : libport: Fix null character handling when mapping DBCS characters.
by Alexandre Julliard 17 May '16

17 May '16

Module: wine Branch: master Commit: 6938fec4aeb3b94ed184e3c272e7e278f354117e URL: http://source.winehq.org/git/wine.git/?a=commit;h=6938fec4aeb3b94ed184e3c27… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sun May 15 21:08:47 2016 +0900 libport: Fix null character handling when mapping DBCS characters. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/codepage.c | 8 ++++---- libs/port/mbtowc.c | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/kernel32/tests/codepage.c b/dlls/kernel32/tests/codepage.c index 3161b8b..8eccf99 100644 --- a/dlls/kernel32/tests/codepage.c +++ b/dlls/kernel32/tests/codepage.c @@ -1211,9 +1211,9 @@ static void test_dbcs_to_widechar(void) { WCHAR wbuf_ok[] = { 0x770b, 0x003f, '\0', 0xffff }; WCHAR wbuf_broken[] = { 0x770b, '\0', 0xffff, 0xffff }; - todo_wine ok(count == 3 || broken(count == 2 /*windows xp*/), + ok(count == 3 || broken(count == 2 /*windows xp*/), "%04x: returned %d (expected 3)\n", flags[i], count); - todo_wine ok(!memcmp(wbuf, wbuf_ok, sizeof(wbuf_ok)) + ok(!memcmp(wbuf, wbuf_ok, sizeof(wbuf_ok)) || broken(!memcmp(wbuf, wbuf_broken, sizeof(wbuf_broken))), "%04x: returned %04x %04x %04x %04x (expected %04x %04x %04x %04x)\n", flags[i], wbuf[0], wbuf[1], wbuf[2], wbuf[3], @@ -1240,9 +1240,9 @@ static void test_dbcs_to_widechar(void) { WCHAR wbuf_ok[] = { 0x770b, 0x003f, '\0', 'x', 0xffff }; WCHAR wbuf_broken[] = { 0x770b, '\0', 'x', 0xffff, 0xffff }; - todo_wine ok(count == 4 || broken(count == 3), + ok(count == 4 || broken(count == 3), "%04x: returned %d (expected 4)\n", flags[i], count); - todo_wine ok(!memcmp(wbuf, wbuf_ok, sizeof(wbuf_ok)) + ok(!memcmp(wbuf, wbuf_ok, sizeof(wbuf_ok)) || broken(!memcmp(wbuf, wbuf_broken, sizeof(wbuf_broken))), "%04x: returned %04x %04x %04x %04x %04x (expected %04x %04x %04x %04x %04x)\n", flags[i], wbuf[0], wbuf[1], wbuf[2], wbuf[3], wbuf[4], diff --git a/libs/port/mbtowc.c b/libs/port/mbtowc.c index fd7764e..4977c82 100644 --- a/libs/port/mbtowc.c +++ b/libs/port/mbtowc.c @@ -131,7 +131,7 @@ static inline int get_length_dbcs( const struct dbcs_table *table, for (len = 0; srclen; srclen--, src++, len++) { - if (cp2uni_lb[*src] && srclen > 1) + if (cp2uni_lb[*src] && srclen > 1 && src[1]) { src++; srclen--; @@ -183,7 +183,7 @@ static inline int mbstowcs_dbcs( const struct dbcs_table *table, for (len = dstlen; srclen && len; len--, srclen--, src++, dst++) { unsigned char off = cp2uni_lb[*src]; - if (off && srclen > 1) + if (off && srclen > 1 && src[1]) { src++; srclen--; @@ -212,7 +212,7 @@ static int mbstowcs_dbcs_decompose( const struct dbcs_table *table, for (len = 0; srclen; srclen--, src++) { unsigned char off = cp2uni_lb[*src]; - if (off && srclen > 1) + if (off && srclen > 1 && src[1]) { src++; srclen--; @@ -227,7 +227,7 @@ static int mbstowcs_dbcs_decompose( const struct dbcs_table *table, for (len = dstlen; srclen && len; srclen--, src++) { unsigned char off = cp2uni_lb[*src]; - if (off && srclen > 1) + if (off && srclen > 1 && src[1]) { src++; srclen--;

1 0