February 2011 - Wine-Commits

Nikolay Sivov : comctl32/listview: Remove duplicated operation (LLVM/Clang) .
by Alexandre Julliard Feb. 7, 2011

Feb. 7, 2011

Module: wine Branch: master Commit: 6992ccc042f26f7cbe89faf745c1fee20eb7bba0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6992ccc042f26f7cbe89faf74… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Feb 5 03:35:01 2011 +0300 comctl32/listview: Remove duplicated operation (LLVM/Clang). --- dlls/comctl32/listview.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index ea2e0cb..a59406f 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -5084,8 +5084,6 @@ enddraw: static DWORD LISTVIEW_ApproximateViewRect(const LISTVIEW_INFO *infoPtr, INT nItemCount, WORD wWidth, WORD wHeight) { - INT nItemCountPerColumn = 1; - INT nColumnCount = 0; DWORD dwViewRect = 0; if (nItemCount == -1) @@ -5093,6 +5091,9 @@ static DWORD LISTVIEW_ApproximateViewRect(const LISTVIEW_INFO *infoPtr, INT nIte if (infoPtr->uView == LV_VIEW_LIST) { + INT nItemCountPerColumn = 1; + INT nColumnCount = 0; + if (wHeight == 0xFFFF) { /* use current height */ @@ -5153,9 +5154,6 @@ static DWORD LISTVIEW_ApproximateViewRect(const LISTVIEW_INFO *infoPtr, INT nIte nItemWidth = infoPtr->iconSpacing.cx; nItemHeight = infoPtr->iconSpacing.cy; - if (nItemCount == -1) - nItemCount = infoPtr->nItemCount; - if (wWidth == 0xffff) wWidth = infoPtr->rcList.right - infoPtr->rcList.left;

1 0

Austin English : shdocvw/tests: Make sure to use return value (LLVM/Clang).
by Alexandre Julliard Feb. 7, 2011

Feb. 7, 2011

Module: wine Branch: master Commit: 84b900dabd3457788130fe805fa3859663aeef9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=84b900dabd3457788130fe805… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Feb 4 22:39:18 2011 -0800 shdocvw/tests: Make sure to use return value (LLVM/Clang). --- dlls/shdocvw/tests/intshcut.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/shdocvw/tests/intshcut.c b/dlls/shdocvw/tests/intshcut.c index 0b90cf7..e8afb74 100644 --- a/dlls/shdocvw/tests/intshcut.c +++ b/dlls/shdocvw/tests/intshcut.c @@ -257,6 +257,7 @@ static void test_ReadAndWriteProperties(void) hr = urlAFromFile->lpVtbl->GetURL(urlAFromFile, &url); + ok(hr == S_OK, "Unable to get url from file, hr=0x%x\n", hr); ok(lstrcmp(url, testurl) == 0, "Wrong url read from file: %s\n",url);

1 0

Nikolay Sivov : comctl32/listview: Remove some useless operations (LLVM/ Clang).
by Alexandre Julliard Feb. 7, 2011

Feb. 7, 2011

Module: wine Branch: master Commit: e8b73fa8f3606a2a4833b8543b52dd73d9695333 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8b73fa8f3606a2a4833b8543… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Feb 5 03:30:46 2011 +0300 comctl32/listview: Remove some useless operations (LLVM/Clang). --- dlls/comctl32/listview.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 9c50f8c..ea2e0cb 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -6,7 +6,7 @@ * Copyright 2000 Jason Mawdsley * Copyright 2001 CodeWeavers Inc. * Copyright 2002 Dimitrie O. Paun - * Copyright 2009, 2010 Nikolay Sivov + * Copyright 2009-2011 Nikolay Sivov * Copyright 2009 Owen Rudge for CodeWeavers * * This library is free software; you can redistribute it and/or @@ -617,7 +617,7 @@ static const char* debugscrollinfo(const SCROLLINFO *pScrollInfo) if (pScrollInfo->fMask & SIF_TRACKPOS) len = snprintf(buf, size, "nTrackPos=%d, ", pScrollInfo->nTrackPos); else len = 0; - if (len == -1) goto end; buf += len; size -= len; + if (len == -1) goto end; buf += len; goto undo; end: buf = text + strlen(text); @@ -662,7 +662,7 @@ static const char* debuglvitem_t(const LVITEMW *lpLVItem, BOOL isW) if (lpLVItem->mask & LVIF_INDENT) len = snprintf(buf, size, "iIndent=%d, ", lpLVItem->iIndent); else len = 0; - if (len == -1) goto end; buf += len; size -= len; + if (len == -1) goto end; buf += len; goto undo; end: buf = text + strlen(text); @@ -702,7 +702,7 @@ static const char* debuglvcolumn_t(const LVCOLUMNW *lpColumn, BOOL isW) if (lpColumn->mask & LVCF_ORDER) len = snprintf(buf, size, "iOrder=%d, ", lpColumn->iOrder); else len = 0; - if (len == -1) goto end; buf += len; size -= len; + if (len == -1) goto end; buf += len; goto undo; end: buf = text + strlen(text);

1 0

Austin English : wininet/tests: Make sure to use return value (LLVM/Clang).
by Alexandre Julliard Feb. 7, 2011

Feb. 7, 2011

Module: wine Branch: master Commit: 5da40467c89123897663c67c5875cab3bec1eaa8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5da40467c89123897663c67c5… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Feb 4 22:52:25 2011 -0800 wininet/tests: Make sure to use return value (LLVM/Clang). --- dlls/wininet/tests/internet.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index e179dca..48379f7 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -304,6 +304,7 @@ static void test_complicated_cookie(void) len = 1024; ret = InternetGetCookie("http://testing.example.com", NULL, buffer, &len); + ok(ret == TRUE,"InternetGetCookie failed\n"); ok(strstr(buffer,"A=B")!=NULL,"A=B missing\n"); ok(strstr(buffer,"C=D")!=NULL,"C=D missing\n"); ok(strstr(buffer,"E=F")!=NULL,"E=F missing\n"); @@ -315,6 +316,7 @@ static void test_complicated_cookie(void) len = 1024; ret = InternetGetCookie("http://testing.example.com/foobar", NULL, buffer, &len); + ok(ret == TRUE,"InternetGetCookie failed\n"); ok(strstr(buffer,"A=B")!=NULL,"A=B missing\n"); ok(strstr(buffer,"C=D")!=NULL,"C=D missing\n"); ok(strstr(buffer,"E=F")!=NULL,"E=F missing\n"); @@ -326,6 +328,7 @@ static void test_complicated_cookie(void) len = 1024; ret = InternetGetCookie("http://testing.example.com/foobar/", NULL, buffer, &len); + ok(ret == TRUE,"InternetGetCookie failed\n"); ok(strstr(buffer,"A=B")!=NULL,"A=B missing\n"); ok(strstr(buffer,"C=D")!=NULL,"C=D missing\n"); ok(strstr(buffer,"E=F")!=NULL,"E=F missing\n"); @@ -337,6 +340,7 @@ static void test_complicated_cookie(void) len = 1024; ret = InternetGetCookie("http://testing.example.com/foo/bar", NULL, buffer, &len); + ok(ret == TRUE,"InternetGetCookie failed\n"); ok(strstr(buffer,"A=B")!=NULL,"A=B missing\n"); ok(strstr(buffer,"C=D")!=NULL,"C=D missing\n"); ok(strstr(buffer,"E=F")!=NULL,"E=F missing\n"); @@ -348,6 +352,7 @@ static void test_complicated_cookie(void) len = 1024; ret = InternetGetCookie("http://testing.example.com/barfoo", NULL, buffer, &len); + ok(ret == TRUE,"InternetGetCookie failed\n"); ok(strstr(buffer,"A=B")!=NULL,"A=B missing\n"); ok(strstr(buffer,"C=D")!=NULL,"C=D missing\n"); ok(strstr(buffer,"E=F")!=NULL,"E=F missing\n"); @@ -359,6 +364,7 @@ static void test_complicated_cookie(void) len = 1024; ret = InternetGetCookie("http://testing.example.com/barfoo/", NULL, buffer, &len); + ok(ret == TRUE,"InternetGetCookie failed\n"); ok(strstr(buffer,"A=B")!=NULL,"A=B missing\n"); ok(strstr(buffer,"C=D")!=NULL,"C=D missing\n"); ok(strstr(buffer,"E=F")!=NULL,"E=F missing\n"); @@ -370,6 +376,7 @@ static void test_complicated_cookie(void) len = 1024; ret = InternetGetCookie("http://testing.example.com/bar/foo", NULL, buffer, &len); + ok(ret == TRUE,"InternetGetCookie failed\n"); ok(strstr(buffer,"A=B")!=NULL,"A=B missing\n"); ok(strstr(buffer,"C=D")!=NULL,"C=D missing\n"); ok(strstr(buffer,"E=F")!=NULL,"E=F missing\n");

1 0

Nikolay Sivov : comctl32/listview: Remove couple of dead assignments (LLVM/ Clang).
by Alexandre Julliard Feb. 7, 2011

Feb. 7, 2011

Module: wine Branch: master Commit: b5ddadce6f98cca57abff52c0e0c746c10b8f0dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5ddadce6f98cca57abff52c0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Feb 5 03:23:16 2011 +0300 comctl32/listview: Remove couple of dead assignments (LLVM/Clang). --- dlls/comctl32/listview.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 9588fa9..9c50f8c 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -1813,8 +1813,6 @@ static INT LISTVIEW_ProcessLetterKeys(LISTVIEW_INFO *infoPtr, WPARAM charCode, L infoPtr->charCode = charCode; infoPtr->szSearchParam[0] = charCode; infoPtr->nSearchParamLength = 1; - /* redundant with the 1 char string */ - charCode = 0; } /* and search from the current position */ @@ -3256,7 +3254,7 @@ static BOOL ranges_del(RANGES ranges, RANGE range) /* case 5: fully internal */ else { - RANGE tmprgn = *chkrgn, *newrgn; + RANGE *newrgn; if (!(newrgn = Alloc(sizeof(RANGE)))) goto fail; newrgn->lower = chkrgn->lower; @@ -3267,7 +3265,6 @@ static BOOL ranges_del(RANGES ranges, RANGE range) Free(newrgn); goto fail; } - chkrgn = &tmprgn; break; }

1 0

Austin English : dinput/tests: Make sure to use return value (LLVM/Clang).
by Alexandre Julliard Feb. 7, 2011

Feb. 7, 2011

Module: wine Branch: master Commit: d6d749f4d755a3dae162a34dd951d6f1f8c1903a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6d749f4d755a3dae162a34dd… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Feb 4 16:01:15 2011 -0800 dinput/tests: Make sure to use return value (LLVM/Clang). --- dlls/dinput/tests/joystick.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/dinput/tests/joystick.c b/dlls/dinput/tests/joystick.c index a60d6e2..194069d 100644 --- a/dlls/dinput/tests/joystick.c +++ b/dlls/dinput/tests/joystick.c @@ -489,6 +489,7 @@ static BOOL CALLBACK EnumJoysticks( hr = IDirectInputDevice_Acquire(pJoystick); ok(hr==DI_OK,"IDirectInputDevice_Acquire() failed: %08x\n", hr); hr = IDirectInputDevice2_GetProperty(pJoystick, DIPROP_AUTOCENTER, &diprop_word.diph); + ok(hr==DI_OK,"IDirectInputDevice2_GetProperty() failed: %08x\n", hr); /* Device gain (DIPROP_FFGAIN). * From MSDN:

1 0

Austin English : credui/tests: Make sure to use return value (LLVM/Clang).
by Alexandre Julliard Feb. 7, 2011

Feb. 7, 2011

Module: wine Branch: master Commit: c56ce79160687d85b61d8c0304271e6a174436c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c56ce79160687d85b61d8c030… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Feb 4 16:05:09 2011 -0800 credui/tests: Make sure to use return value (LLVM/Clang). --- dlls/credui/tests/credui.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/dlls/credui/tests/credui.c b/dlls/credui/tests/credui.c index 969b096..18fc5bc 100644 --- a/dlls/credui/tests/credui.c +++ b/dlls/credui/tests/credui.c @@ -83,7 +83,10 @@ static void test_CredUIPromptForCredentials(void) &save, CREDUI_FLAGS_EXPECT_CONFIRMATION); ok(ret == ERROR_SUCCESS || ret == ERROR_CANCELLED, "CredUIPromptForCredentials failed with error %d\n", ret); if (ret == ERROR_SUCCESS) + { ret = CredUIConfirmCredentialsW(wszServerName, FALSE); + ok(ret == ERROR_SUCCESS, "CredUIConfirmCredentials failed with error %d\n", ret); + } credui_info.pszCaptionText = wszCaption1; ret = CredUIPromptForCredentialsW(&credui_info, wszServerName, NULL, @@ -93,7 +96,10 @@ static void test_CredUIPromptForCredentials(void) &save, CREDUI_FLAGS_EXPECT_CONFIRMATION); ok(ret == ERROR_SUCCESS || ret == ERROR_CANCELLED, "CredUIPromptForCredentials failed with error %d\n", ret); if (ret == ERROR_SUCCESS) + { ret = CredUIConfirmCredentialsW(wszServerName, FALSE); + ok(ret == ERROR_SUCCESS, "CredUIConfirmCredentials failed with error %d\n", ret); + } credui_info.pszCaptionText = wszCaption2; ret = CredUIPromptForCredentialsW(&credui_info, wszServerName, NULL, 0, @@ -102,7 +108,11 @@ static void test_CredUIPromptForCredentials(void) NULL, CREDUI_FLAGS_INCORRECT_PASSWORD|CREDUI_FLAGS_EXPECT_CONFIRMATION); ok(ret == ERROR_SUCCESS || ret == ERROR_CANCELLED, "CredUIPromptForCredentials failed with error %d\n", ret); if (ret == ERROR_SUCCESS) + { ret = CredUIConfirmCredentialsW(wszServerName, FALSE); + ok(ret == ERROR_SUCCESS, "CredUIConfirmCredentials failed with error %d\n", ret); + } + save = TRUE; credui_info.pszCaptionText = wszCaption3; @@ -122,7 +132,11 @@ static void test_CredUIPromptForCredentials(void) ok(ret == ERROR_SUCCESS || ret == ERROR_CANCELLED, "CredUIPromptForCredentials failed with error %d\n", ret); ok(!save, "save flag should have been untouched\n"); if (ret == ERROR_SUCCESS) + { ret = CredUIConfirmCredentialsW(wszServerName, FALSE); + ok(ret == ERROR_SUCCESS, "CredUIConfirmCredentials failed with error %d\n", ret); + } + } }

1 0

Austin English : cryptnet/tests: Make sure to use return value (LLVM/Clang) .
by Alexandre Julliard Feb. 7, 2011

Feb. 7, 2011

Module: wine Branch: master Commit: 66ebabaee1c892d0dae236d2a4cde18a3edca7b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66ebabaee1c892d0dae236d2a… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Feb 4 16:07:10 2011 -0800 cryptnet/tests: Make sure to use return value (LLVM/Clang). --- dlls/cryptnet/tests/cryptnet.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/cryptnet/tests/cryptnet.c b/dlls/cryptnet/tests/cryptnet.c index 64491e7..113406c 100644 --- a/dlls/cryptnet/tests/cryptnet.c +++ b/dlls/cryptnet/tests/cryptnet.c @@ -357,6 +357,7 @@ static void test_retrieveObjectByUrl(void) cert = (PCCERT_CONTEXT)0xdeadbeef; ret = CryptRetrieveObjectByUrlA(url, CONTEXT_OID_CERTIFICATE, 0, 0, (void **)&cert, NULL, NULL, NULL, NULL); + ok(ret, "CryptRetrieveObjectByUrlA failed: %d\n", GetLastError()); ok(cert && cert != (PCCERT_CONTEXT)0xdeadbeef, "Expected a cert\n"); if (cert && cert != (PCCERT_CONTEXT)0xdeadbeef) CertFreeCertificateContext(cert); @@ -560,7 +561,7 @@ static void test_verifyRevocation(void) if (0) { /* Crash */ - ret = pCertVerifyRevocation(0, 0, 0, NULL, 0, NULL, NULL); + pCertVerifyRevocation(0, 0, 0, NULL, 0, NULL, NULL); } SetLastError(0xdeadbeef); ret = pCertVerifyRevocation(0, 0, 0, NULL, 0, NULL, &status);

1 0

Austin English : gdi32/tests: Make sure to use return value (LLVM/Clang).
by Alexandre Julliard Feb. 7, 2011

Feb. 7, 2011

Module: wine Branch: master Commit: 0a649054aea6bbabb42aec502447463a9aed40e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a649054aea6bbabb42aec502… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Feb 4 16:42:30 2011 -0800 gdi32/tests: Make sure to use return value (LLVM/Clang). --- dlls/gdi32/tests/font.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 3ea883a..8bce92b 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -1136,6 +1136,7 @@ static void test_GetGlyphIndices(void) lf.lfCharSet = ANSI_CHARSET; hfont = CreateFontIndirectA(&lf); + ok(hfont != 0, "CreateFontIndirectEx failed\n"); ok(GetTextMetrics(hdc, &textm), "GetTextMetric failed\n"); if (textm.tmCharSet == ANSI_CHARSET) {

1 0

Austin English : comctl32/tests: Make sure to use return value (LLVM/Clang) .
by Alexandre Julliard Feb. 7, 2011

Feb. 7, 2011

Module: wine Branch: master Commit: 3391c28d410eddd5ed2f9cdb85f19b8d7196e5a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3391c28d410eddd5ed2f9cdb8… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Feb 4 16:08:42 2011 -0800 comctl32/tests: Make sure to use return value (LLVM/Clang). --- dlls/comctl32/tests/imagelist.c | 15 +++++++-------- 1 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index bbb7d85..28b21a4 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -751,7 +751,6 @@ static INT DIB_GetWidthBytes( int width, int bpp ) case 32: words = width; break; default: - words=0; trace("Unknown depth %d, please report.\n", bpp ); assert(0); break; @@ -1616,7 +1615,7 @@ static void test_IImageList_Draw(void) if (0) { /* crashes on native */ - hr = IImageList_Draw(imgl, NULL); + IImageList_Draw(imgl, NULL); } memset(&imldp, 0, sizeof (imldp)); @@ -1691,8 +1690,8 @@ static void test_IImageList_Merge(void) if (0) { /* null cases that crash on native */ - hr = IImageList_Merge(imgl1, -1, NULL, 0, 0, 0, &IID_IImageList, (void**)&merge); - hr = IImageList_Merge(imgl1, -1, (IUnknown*) imgl2, 0, 0, 0, &IID_IImageList, NULL); + IImageList_Merge(imgl1, -1, NULL, 0, 0, 0, &IID_IImageList, (void**)&merge); + IImageList_Merge(imgl1, -1, (IUnknown*) imgl2, 0, 0, 0, &IID_IImageList, NULL); } /* If himl1 has no images, merge still succeeds */ @@ -1805,7 +1804,7 @@ static void test_IImageList_Clone(void) if (0) { /* crashes on native */ - hr = IImageList_Clone(imgl, &IID_IImageList, NULL); + IImageList_Clone(imgl, &IID_IImageList, NULL); } hr = IImageList_Clone(imgl, &IID_IImageList, (void**)&imgl2); @@ -1829,7 +1828,7 @@ static void test_IImageList_GetBkColor(void) if (0) { /* crashes on native */ - hr = IImageList_GetBkColor(imgl, NULL); + IImageList_GetBkColor(imgl, NULL); } hr = IImageList_GetBkColor(imgl, &color); @@ -1851,7 +1850,7 @@ static void test_IImageList_SetBkColor(void) if (0) { /* crashes on native */ - hr = IImageList_SetBkColor(imgl, RGB(0, 0, 0), NULL); + IImageList_SetBkColor(imgl, RGB(0, 0, 0), NULL); } hr = IImageList_SetBkColor(imgl, CLR_NONE, &color); @@ -1881,7 +1880,7 @@ static void test_IImageList_GetImageCount(void) if (0) { /* crashes on native */ - hr = IImageList_GetImageCount(imgl, NULL); + IImageList_GetImageCount(imgl, NULL); } count = -1;

1 0