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

Austin English : kernel32/tests: Use ret in load_blackbox().
by Alexandre Julliard 24 May '10

24 May '10

Module: wine Branch: master Commit: e0c7fb66c412eb1b2437ee5414af827fe0ac2d97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0c7fb66c412eb1b2437ee541… Author: Austin English <austinenglish(a)gmail.com> Date: Sat May 22 03:38:05 2010 -0500 kernel32/tests: Use ret in load_blackbox(). --- dlls/kernel32/tests/debugger.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/debugger.c b/dlls/kernel32/tests/debugger.c index e116c9d..fa96767 100644 --- a/dlls/kernel32/tests/debugger.c +++ b/dlls/kernel32/tests/debugger.c @@ -143,7 +143,9 @@ static int load_blackbox(const char* logfile, void* blackbox, int size) ok(0, "unable to open '%s'\n", logfile); return 0; } + SetLastError(0xdeadbeef); ret=ReadFile(hFile, blackbox, size, &read, NULL); + ok(ret, "ReadFile failed: %d\n", GetLastError()); ok(read == size, "wrong size for '%s': read=%d\n", logfile, read); CloseHandle(hFile); return 1;

1 0

Austin English : usp10/tests: Check return value of SelectObject.
by Alexandre Julliard 24 May '10

24 May '10

Module: wine Branch: master Commit: 21dac9f6cd47ca66a1a9c203bbd0086e7a07f4d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21dac9f6cd47ca66a1a9c203b… Author: Austin English <austinenglish(a)gmail.com> Date: Sat May 22 03:45:33 2010 -0500 usp10/tests: Check return value of SelectObject. --- dlls/usp10/tests/usp10.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 41c9035..e47d7c5 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -1734,6 +1734,7 @@ START_TEST(usp10) lf.lfWidth = 10; hfont = SelectObject(hdc, CreateFontIndirectA(&lf)); + ok(hfont != NULL, "SelectObject failed: %p\n", hfont); test_ScriptItemize(); test_ScriptItemIzeShapePlace(hdc,pwOutGlyphs);

1 0

Austin English : kernel32/tests: Check return value of alarmThread in test_NamedPipe_2().
by Alexandre Julliard 24 May '10

24 May '10

Module: wine Branch: master Commit: 3fd4f68827de87b97795dc440c59d9ac4a166941 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fd4f68827de87b97795dc440… Author: Austin English <austinenglish(a)gmail.com> Date: Sat May 22 14:06:32 2010 -0500 kernel32/tests: Check return value of alarmThread in test_NamedPipe_2(). --- dlls/kernel32/tests/pipe.c | 18 ++++++++++++------ 1 files changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index 5abfd85..f5a56c6 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -804,31 +804,37 @@ static void test_NamedPipe_2(void) trace("test_NamedPipe_2 starting\n"); /* Set up a twenty second timeout */ alarm_event = CreateEvent( NULL, TRUE, FALSE, NULL ); + SetLastError(0xdeadbeef); alarmThread = CreateThread(NULL, 0, alarmThreadMain, (void *) 20000, 0, &alarmThreadId); + ok(alarmThread != NULL, "CreateThread failed: %d\n", GetLastError()); - /* The servers we're about to exercize do try to clean up carefully, - * but to reduce the change of a test failure due to a pipe handle + /* The servers we're about to exercise do try to clean up carefully, + * but to reduce the chance of a test failure due to a pipe handle * leak in the test code, we'll use a different pipe name for each server. */ /* Try server #1 */ + SetLastError(0xdeadbeef); serverThread = CreateThread(NULL, 0, serverThreadMain1, (void *)8, 0, &serverThreadId); - ok(serverThread != INVALID_HANDLE_VALUE, "CreateThread\n"); + ok(serverThread != NULL, "CreateThread failed: %d\n", GetLastError()); exercizeServer(PIPENAME "serverThreadMain1", serverThread); /* Try server #2 */ + SetLastError(0xdeadbeef); serverThread = CreateThread(NULL, 0, serverThreadMain2, 0, 0, &serverThreadId); - ok(serverThread != INVALID_HANDLE_VALUE, "CreateThread\n"); + ok(serverThread != NULL, "CreateThread failed: %d\n", GetLastError()); exercizeServer(PIPENAME "serverThreadMain2", serverThread); /* Try server #3 */ + SetLastError(0xdeadbeef); serverThread = CreateThread(NULL, 0, serverThreadMain3, 0, 0, &serverThreadId); - ok(serverThread != INVALID_HANDLE_VALUE, "CreateThread\n"); + ok(serverThread != NULL, "CreateThread failed: %d\n", GetLastError()); exercizeServer(PIPENAME "serverThreadMain3", serverThread); /* Try server #4 */ + SetLastError(0xdeadbeef); serverThread = CreateThread(NULL, 0, serverThreadMain4, 0, 0, &serverThreadId); - ok(serverThread != INVALID_HANDLE_VALUE, "CreateThread\n"); + ok(serverThread != NULL, "CreateThread failed: %d\n", GetLastError()); exercizeServer(PIPENAME "serverThreadMain4", serverThread); ok(SetEvent( alarm_event ), "SetEvent\n");

1 0

Damjan Jovanovic : windowscodecs: Fix ICO palette size calculation.
by Alexandre Julliard 24 May '10

24 May '10

Module: wine Branch: master Commit: b34f04f9c4204fa777412c8d636c5501438b44c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b34f04f9c4204fa777412c8d6… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Sat May 22 07:57:54 2010 +0200 windowscodecs: Fix ICO palette size calculation. --- dlls/windowscodecs/icoformat.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/windowscodecs/icoformat.c b/dlls/windowscodecs/icoformat.c index 180dbb3..8012b4e 100644 --- a/dlls/windowscodecs/icoformat.c +++ b/dlls/windowscodecs/icoformat.c @@ -192,7 +192,7 @@ static HRESULT IcoFrameDecode_ReadPixels(IcoFrameDecode *This) if (bih.biBitCount <= 8) { /* read the palette */ - colorcount = This->entry.bColorCount ? This->entry.bColorCount : 256; + colorcount = bih.biClrUsed ? bih.biClrUsed : 1 << bih.biBitCount; hr = IStream_Read(This->parent->stream, colors, sizeof(RGBQUAD)*colorcount, &bytesread); if (FAILED(hr) || bytesread != sizeof(RGBQUAD)*colorcount) goto fail;

1 0

Sven Baars : taskmgr: Fix Dutch translation.
by Alexandre Julliard 24 May '10

24 May '10

Module: wine Branch: master Commit: 7b8243e5e55ece9b152cbee580a6603bd89c00fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b8243e5e55ece9b152cbee58… Author: Sven Baars <sven.wine(a)gmail.com> Date: Sat May 22 20:10:15 2010 +0200 taskmgr: Fix Dutch translation. --- programs/taskmgr/Nl.rc | 112 ++++++++++++++++++++++++------------------------ 1 files changed, 56 insertions(+), 56 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7b8243e5e55ece9b152cb…

1 0

Piotr Caban : msvcrt: Fix mbstowcs_l implementation.
by Alexandre Julliard 24 May '10

24 May '10

Module: wine Branch: master Commit: 2ca3b9e0162fac9d2a09c8d92df08034c4cb6b44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ca3b9e0162fac9d2a09c8d92… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat May 22 22:24:40 2010 +0200 msvcrt: Fix mbstowcs_l implementation. --- dlls/msvcrt/mbcs.c | 25 ++++++++++++++++--------- 1 files changed, 16 insertions(+), 9 deletions(-) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 837ac02..8fca06d 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -1725,22 +1725,29 @@ MSVCRT_size_t CDECL _mbstrlen(const char* str) MSVCRT_size_t CDECL MSVCRT__mbstowcs_l(MSVCRT_wchar_t *wcstr, const char *mbstr, MSVCRT_size_t count, MSVCRT__locale_t locale) { - MSVCRT_size_t tmp; + MSVCRT_size_t i, size; if(!locale) locale = get_locale(); - tmp = _mbstrlen_l(mbstr, locale); - if(tmp>count && wcstr) - tmp = count; + /* Ignore count parameter */ + if(!wcstr) + return MultiByteToWideChar(locale->locinfo->lc_codepage, 0, mbstr, -1, NULL, 0)-1; - tmp = MultiByteToWideChar(locale->locinfo->lc_codepage, 0, - mbstr, tmp, wcstr, count); + for(i=0, size=0; i<count; i++) { + if(mbstr[size] == '\0') + break; + + size += (MSVCRT_isleadbyte(mbstr[size]) ? 2 : 1); + } + + size = MultiByteToWideChar(locale->locinfo->lc_codepage, 0, + mbstr, size, wcstr, count); - if(tmp<count && wcstr) - wcstr[tmp] = '\0'; + if(size<count && wcstr) + wcstr[size] = '\0'; - return tmp; + return size; } /*********************************************************************

1 0

Piotr Caban : msvcrt: Fix wcstombs_l implementation.
by Alexandre Julliard 24 May '10

24 May '10

Module: wine Branch: master Commit: 6f358ef8675ff7b9c3101653e4dbc97532ada593 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f358ef8675ff7b9c3101653e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon May 24 10:03:55 2010 +0200 msvcrt: Fix wcstombs_l implementation. --- dlls/msvcrt/wcs.c | 30 +++++++++++++++++++----------- 1 files changed, 19 insertions(+), 11 deletions(-) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 79be91a..c26809c 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -240,26 +240,34 @@ MSVCRT_size_t CDECL MSVCRT__wcstombs_l(char *mbstr, const MSVCRT_wchar_t *wcstr, MSVCRT_size_t count, MSVCRT__locale_t locale) { char default_char = '\0'; - MSVCRT_size_t tmp; + MSVCRT_size_t tmp = 0; BOOL used_default; if(!locale) locale = get_locale(); - /* FIXME: Use wcslen here */ - tmp = strlenW(wcstr); - if(tmp>count && mbstr) - tmp = count; + if(!mbstr) + return WideCharToMultiByte(locale->locinfo->lc_codepage, WC_NO_BEST_FIT_CHARS, + wcstr, -1, NULL, 0, &default_char, &used_default)-1; - tmp = WideCharToMultiByte(locale->locinfo->lc_codepage, WC_NO_BEST_FIT_CHARS, - wcstr, tmp, mbstr, count, &default_char, &used_default); + while(*wcstr) { + char buf[3]; + MSVCRT_size_t i, size; - if(used_default) - return -1; + size = WideCharToMultiByte(locale->locinfo->lc_codepage, WC_NO_BEST_FIT_CHARS, + wcstr, 1, buf, 3, &default_char, &used_default); + if(used_default) + return -1; + if(tmp+size > count) + return tmp; - if(tmp<count && mbstr) - mbstr[tmp] = '\0'; + for(i=0; i<size; i++) + mbstr[tmp++] = buf[i]; + wcstr++; + } + if(tmp < count) + mbstr[tmp] = '\0'; return tmp; }

1 0

Marcus Meissner : ntdll: qsort: comparator must not get the same pointer.
by Alexandre Julliard 24 May '10

24 May '10

Module: wine Branch: master Commit: 34d17c9ea18f43abfc7eefa48fa862a611dccfa2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=34d17c9ea18f43abfc7eefa48… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun May 23 13:33:40 2010 +0200 ntdll: qsort: comparator must not get the same pointer. --- dlls/ntdll/misc.c | 2 +- dlls/ntdll/tests/string.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/misc.c b/dlls/ntdll/misc.c index 621848e..2d7c0a7 100644 --- a/dlls/ntdll/misc.c +++ b/dlls/ntdll/misc.c @@ -272,7 +272,7 @@ NTDLL_mergesort( void *arr, void *barr, int elemsize, int(__cdecl *compar)(const for (k=left; k<=right; k++) { /*arr[k]=(barr[i]<barr[j])?barr[i++]:barr[j--];*/ - if (compar(X(barr,i),X(barr,j))<0) { + if (i != j && compar(X(barr,i),X(barr,j))<0) { memcpy(X(arr,k),X(barr,i),elemsize); i++; } else { diff --git a/dlls/ntdll/tests/string.c b/dlls/ntdll/tests/string.c index cd362ed..3f7236a 100644 --- a/dlls/ntdll/tests/string.c +++ b/dlls/ntdll/tests/string.c @@ -1145,16 +1145,19 @@ static void test_wcsrchr(void) static __cdecl int intcomparefunc(const void *a, const void*b) { + ok (a != b, "must never get the same pointer\n"); return (*(int*)a) - (*(int*)b); } static __cdecl int charcomparefunc(const void *a, const void*b) { + ok (a != b, "must never get the same pointer\n"); return (*(char*)a) - (*(char*)b); } static __cdecl int strcomparefunc(const void *a, const void*b) { + ok (a != b, "must never get the same pointer\n"); return lstrcmpA(*(char**)a,*(char**)b); }

1 0

Alexander Scott-Johns : clock: Remove "License..." and "NO WARRANTY..." items from "Info" menu.
by Alexandre Julliard 24 May '10

24 May '10

Module: wine Branch: master Commit: 6d49edef371a47d9e60c6af01ad73dc7aa907618 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d49edef371a47d9e60c6af01… Author: Alexander Scott-Johns <alexander.scott.johns(a)googlemail.com> Date: Tue Apr 20 14:11:52 2010 +0100 clock: Remove "License..." and "NO WARRANTY..." items from "Info" menu. --- programs/clock/Cs.rc | 2 -- programs/clock/Da.rc | 2 -- programs/clock/De.rc | 29 ----------------------------- programs/clock/En.rc | 26 -------------------------- programs/clock/Eo.rc | 2 -- programs/clock/Es.rc | 26 -------------------------- programs/clock/Fi.rc | 2 -- programs/clock/Fr.rc | 27 --------------------------- programs/clock/Hu.rc | 2 -- programs/clock/It.rc | 26 -------------------------- programs/clock/Ja.rc | 26 -------------------------- programs/clock/Ko.rc | 26 -------------------------- programs/clock/Lt.rc | 28 ---------------------------- programs/clock/Nl.rc | 27 --------------------------- programs/clock/No.rc | 26 -------------------------- programs/clock/Pl.rc | 27 --------------------------- programs/clock/Pt.rc | 28 ---------------------------- programs/clock/Ro.rc | 26 -------------------------- programs/clock/Ru.rc | 2 -- programs/clock/Si.rc | 26 -------------------------- programs/clock/Sk.rc | 2 -- programs/clock/Sv.rc | 26 -------------------------- programs/clock/Th.rc | 2 -- programs/clock/Tr.rc | 26 -------------------------- programs/clock/Wa.rc | 2 -- programs/clock/Zh.rc | 4 ---- programs/clock/clock_res.h | 9 +-------- programs/clock/main.c | 26 -------------------------- 28 files changed, 1 insertions(+), 482 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6d49edef371a47d9e60c6…

1 0

Dylan Smith : richedit: Missing HeapFree in WM_IME_COMPOSITION. (Smatch).
by Alexandre Julliard 24 May '10

24 May '10

Module: wine Branch: master Commit: fb7d6b783e8f8c48943772da3fd909e968887137 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb7d6b783e8f8c48943772da3… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Mon May 24 01:04:42 2010 -0400 richedit: Missing HeapFree in WM_IME_COMPOSITION. (Smatch). ME_InsertTextFromCursor copies the string passed into it rather than making taking ownership of it. --- dlls/riched20/editor.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 85e8f14..7764614 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -4268,6 +4268,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, ImmGetCompositionStringW(hIMC, GCS_RESULTSTR, lpCompStr, dwBufLen); lpCompStr[dwBufLen/sizeof(WCHAR)] = 0; ME_InsertTextFromCursor(editor,0,lpCompStr,dwBufLen/sizeof(WCHAR),style); + HeapFree(GetProcessHeap(), 0, lpCompStr); } else if (lParam & GCS_COMPSTR) { @@ -4280,6 +4281,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, lpCompStr[dwBufLen/sizeof(WCHAR)] = 0; ME_InsertTextFromCursor(editor,0,lpCompStr,dwBufLen/sizeof(WCHAR),style); + HeapFree(GetProcessHeap(), 0, lpCompStr); ME_SetSelection(editor,editor->imeStartIndex, editor->imeStartIndex + dwBufLen/sizeof(WCHAR)); }

1 0