wine-commits February 2011

wine-commits@winehq.org

2 participants
674 discussions

Austin English : kernel32/tests: Remove unused assignment (LLVM/Clang).
by Alexandre Julliard 07 Feb '11

07 Feb '11

Module: wine Branch: master Commit: a96b23cc1b89653da33050346d3bf3dc0b95a763 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a96b23cc1b89653da33050346… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Feb 4 21:19:38 2011 -0800 kernel32/tests: Remove unused assignment (LLVM/Clang). --- dlls/kernel32/tests/change.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/change.c b/dlls/kernel32/tests/change.c index 8e22dd7..4d0bc1c 100644 --- a/dlls/kernel32/tests/change.c +++ b/dlls/kernel32/tests/change.c @@ -47,7 +47,7 @@ static DWORD CALLBACK NotificationThread(LPVOID arg) if (status == WAIT_OBJECT_0 ) { notified = TRUE; - ret = FindNextChangeNotification(change); + FindNextChangeNotification(change); } ret = FindCloseChangeNotification(change);

1 0

Nikolay Sivov : comctl32/tests: Test more return values (LLVM/Clang).
by Alexandre Julliard 07 Feb '11

07 Feb '11

Module: wine Branch: master Commit: cf36677cbcd709c2c9a61aed8533705cee0fac3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf36677cbcd709c2c9a61aed8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Feb 5 04:12:50 2011 +0300 comctl32/tests: Test more return values (LLVM/Clang). --- dlls/comctl32/tests/listview.c | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 5e71a6b..a4ffa2e 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -766,6 +766,7 @@ static void test_images(void) memset(&r1, 0, sizeof r1); r1.left = LVIR_ICON; r = SendMessage(hwnd, LVM_GETITEMRECT, 0, (LPARAM) &r1); + expect(1, r); r = SendMessage(hwnd, LVM_DELETEALLITEMS, 0, 0); ok(r == TRUE, "should not fail\n"); @@ -778,6 +779,7 @@ static void test_images(void) memset(&r2, 0, sizeof r2); r2.left = LVIR_ICON; r = SendMessage(hwnd, LVM_GETITEMRECT, 0, (LPARAM) &r2); + expect(1, r); ok(!memcmp(&r1, &r2, sizeof r1), "rectangle should be the same\n"); @@ -811,6 +813,7 @@ static void test_checkboxes(void) item.mask = LVIF_STATE; item.stateMask = 0xffff; r = SendMessage(hwnd, LVM_GETITEMA, 0, (LPARAM) &item); + expect(1, r); ok(item.state == 0xfccc, "state %x\n", item.state); /* Don't set LVIF_STATE */ @@ -827,6 +830,7 @@ static void test_checkboxes(void) item.mask = LVIF_STATE; item.stateMask = 0xffff; r = SendMessage(hwnd, LVM_GETITEMA, 0, (LPARAM) &item); + expect(1, r); ok(item.state == 0, "state %x\n", item.state); r = SendMessage(hwnd, LVM_SETEXTENDEDLISTVIEWSTYLE, LVS_EX_CHECKBOXES, LVS_EX_CHECKBOXES); @@ -837,6 +841,7 @@ static void test_checkboxes(void) item.mask = LVIF_STATE; item.stateMask = 0xffff; r = SendMessage(hwnd, LVM_GETITEMA, 0, (LPARAM) &item); + expect(1, r); if (item.state != 0x1ccc) { win_skip("LVS_EX_CHECKBOXES style is unavailable. Skipping.\n"); @@ -856,6 +861,7 @@ static void test_checkboxes(void) item.mask = LVIF_STATE; item.stateMask = 0xffff; r = SendMessage(hwnd, LVM_GETITEMA, 0, (LPARAM) &item); + expect(1, r); ok(item.state == 0x1000, "state %x\n", item.state); /* Add a further item this time specifying a state and still its state goes to 0x1000 */ @@ -871,6 +877,7 @@ static void test_checkboxes(void) item.mask = LVIF_STATE; item.stateMask = 0xffff; r = SendMessage(hwnd, LVM_GETITEMA, 0, (LPARAM) &item); + expect(1, r); ok(item.state == 0x1aaa, "state %x\n", item.state); /* Set an item's state to checked */ @@ -879,11 +886,13 @@ static void test_checkboxes(void) item.stateMask = 0xf000; item.state = 0x2000; r = SendMessage(hwnd, LVM_SETITEMA, 0, (LPARAM) &item); + expect(1, r); item.iItem = 3; item.mask = LVIF_STATE; item.stateMask = 0xffff; r = SendMessage(hwnd, LVM_GETITEMA, 0, (LPARAM) &item); + expect(1, r); ok(item.state == 0x2aaa, "state %x\n", item.state); /* Check that only the bits we asked for are returned, @@ -894,6 +903,7 @@ static void test_checkboxes(void) item.stateMask = 0xf000; item.state = 0xffff; r = SendMessage(hwnd, LVM_GETITEMA, 0, (LPARAM) &item); + expect(1, r); ok(item.state == 0x2000, "state %x\n", item.state); /* Set the style again and check that doesn't change an item's state */ @@ -904,6 +914,7 @@ static void test_checkboxes(void) item.mask = LVIF_STATE; item.stateMask = 0xffff; r = SendMessage(hwnd, LVM_GETITEMA, 0, (LPARAM) &item); + expect(1, r); ok(item.state == 0x2aaa, "state %x\n", item.state); /* Unsetting the checkbox extended style doesn't change an item's state */ @@ -914,6 +925,7 @@ static void test_checkboxes(void) item.mask = LVIF_STATE; item.stateMask = 0xffff; r = SendMessage(hwnd, LVM_GETITEMA, 0, (LPARAM) &item); + expect(1, r); ok(item.state == 0x2aaa, "state %x\n", item.state); /* Now setting the style again will change an item's state */ @@ -924,6 +936,7 @@ static void test_checkboxes(void) item.mask = LVIF_STATE; item.stateMask = 0xffff; r = SendMessage(hwnd, LVM_GETITEMA, 0, (LPARAM) &item); + expect(1, r); ok(item.state == 0x1aaa, "state %x\n", item.state); /* Toggle checkbox tests (bug 9934) */ @@ -940,6 +953,7 @@ static void test_checkboxes(void) item.mask = LVIF_STATE; item.stateMask = 0xffff; r = SendMessage(hwnd, LVM_GETITEMA, 0, (LPARAM) &item); + expect(1, r); ok(item.state == 0x1aab, "state %x\n", item.state); r = SendMessage(hwnd, WM_KEYDOWN, VK_SPACE, 0); @@ -951,6 +965,7 @@ static void test_checkboxes(void) item.mask = LVIF_STATE; item.stateMask = 0xffff; r = SendMessage(hwnd, LVM_GETITEMA, 0, (LPARAM) &item); + expect(1, r); ok(item.state == 0x2aab, "state %x\n", item.state); r = SendMessage(hwnd, WM_KEYDOWN, VK_SPACE, 0); @@ -3028,6 +3043,7 @@ static void test_hittest(void) memset(&bounds, 0, sizeof(bounds)); bounds.left = LVIR_BOUNDS; r = SendMessage(hwnd, LVM_GETITEMRECT, 0, (LPARAM)&bounds); + expect(1, r); ok(bounds.bottom - bounds.top > 0, "Expected non zero item height\n"); ok(bounds.right - bounds.left > 0, "Expected non zero item width\n"); r = SendMessage(hwnd, LVM_GETITEMSPACING, TRUE, 0);

1 0

Nikolay Sivov : comctl32/listview: Remove duplicated operation (LLVM/Clang) .
by Alexandre Julliard 07 Feb '11

07 Feb '11

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

Nikolay Sivov : comctl32/listview: Remove some useless operations (LLVM/ Clang).
by Alexandre Julliard 07 Feb '11

07 Feb '11

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

Nikolay Sivov : comctl32/listview: Remove couple of dead assignments (LLVM/ Clang).
by Alexandre Julliard 07 Feb '11

07 Feb '11

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 : explorerframe/tests: Don' t assign values to variables that are never checked (LLVM/Clang).
by Alexandre Julliard 07 Feb '11

07 Feb '11

Module: wine Branch: master Commit: 5f3ff6583928217a3d6fbd7465b9a9f1652faad1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f3ff6583928217a3d6fbd746… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Feb 4 17:06:20 2011 -0800 explorerframe/tests: Don't assign values to variables that are never checked (LLVM/Clang). --- dlls/explorerframe/tests/nstc.c | 42 +++++++++++++++++++------------------- 1 files changed, 21 insertions(+), 21 deletions(-) diff --git a/dlls/explorerframe/tests/nstc.c b/dlls/explorerframe/tests/nstc.c index 047d7cd..3ea408f 100644 --- a/dlls/explorerframe/tests/nstc.c +++ b/dlls/explorerframe/tests/nstc.c @@ -1084,8 +1084,8 @@ static void test_basics(void) if(0) { /* Crashes under Windows 7 */ - hr = INameSpaceTreeControl_AppendRoot(pnstc, NULL, SHCONTF_FOLDERS, 0, NULL); - hr = INameSpaceTreeControl_InsertRoot(pnstc, 0, NULL, SHCONTF_FOLDERS, 0, NULL); + INameSpaceTreeControl_AppendRoot(pnstc, NULL, SHCONTF_FOLDERS, 0, NULL); + INameSpaceTreeControl_InsertRoot(pnstc, 0, NULL, SHCONTF_FOLDERS, 0, NULL); } /* Note the usage of psidesktop and psidesktop2 */ @@ -1132,7 +1132,7 @@ static void test_basics(void) if(0) { /* Crashes on native. */ - hr = INameSpaceTreeControl_GetRootItems(pnstc, NULL); + INameSpaceTreeControl_GetRootItems(pnstc, NULL); } hr = INameSpaceTreeControl_GetRootItems(pnstc, &psia); @@ -1360,7 +1360,7 @@ static void test_basics(void) if(0) { /* Crashes under Windows 7 */ - hr = INameSpaceTreeControl_GetSelectedItems(pnstc, NULL); + INameSpaceTreeControl_GetSelectedItems(pnstc, NULL); } psia = (void*)0xdeadbeef; @@ -1550,9 +1550,9 @@ static void test_basics(void) if(0) { /* Crashes under win 7 */ - hr = INameSpaceTreeControl_GetItemRect(pnstc, NULL, NULL); - hr = INameSpaceTreeControl_GetItemRect(pnstc, psitestdir, NULL); - hr = INameSpaceTreeControl_GetItemRect(pnstc, NULL, &rc); + INameSpaceTreeControl_GetItemRect(pnstc, NULL, NULL); + INameSpaceTreeControl_GetItemRect(pnstc, psitestdir, NULL); + INameSpaceTreeControl_GetItemRect(pnstc, NULL, &rc); } hr = INameSpaceTreeControl_GetItemRect(pnstc, psitestdir, &rc); @@ -1690,10 +1690,10 @@ static void test_basics(void) if(0) { /* Crashes under Windows 7 */ - hr = INameSpaceTreeControl_GetItemCustomState(pnstc, NULL, NULL); - hr = INameSpaceTreeControl_GetItemCustomState(pnstc, NULL, &cbstate); - hr = INameSpaceTreeControl_GetItemCustomState(pnstc, psitestdir, NULL); - hr = INameSpaceTreeControl_SetItemCustomState(pnstc, NULL, 0); + INameSpaceTreeControl_GetItemCustomState(pnstc, NULL, NULL); + INameSpaceTreeControl_GetItemCustomState(pnstc, NULL, &cbstate); + INameSpaceTreeControl_GetItemCustomState(pnstc, psitestdir, NULL); + INameSpaceTreeControl_SetItemCustomState(pnstc, NULL, 0); } hr = INameSpaceTreeControl_AppendRoot(pnstc, psitestdir, @@ -1807,9 +1807,9 @@ static void test_events(void) if(0) { /* Crashes native */ - hr = INameSpaceTreeControl_TreeAdvise(pnstc, NULL, NULL); - hr = INameSpaceTreeControl_TreeAdvise(pnstc, NULL, &cookie1); - hr = INameSpaceTreeControl_TreeAdvise(pnstc, (IUnknown*)pnstce, NULL); + INameSpaceTreeControl_TreeAdvise(pnstc, NULL, NULL); + INameSpaceTreeControl_TreeAdvise(pnstc, NULL, &cookie1); + INameSpaceTreeControl_TreeAdvise(pnstc, (IUnknown*)pnstce, NULL); } /* TreeAdvise in NameSpaceTreeController seems to support only one @@ -2044,12 +2044,12 @@ static void test_events(void) if(0) { /* Crashes on Windows 7 */ - hr = INameSpaceTreeControl_SetItemState(pnstc, NULL, 0, 0); - hr = INameSpaceTreeControl_GetItemState(pnstc, NULL, 0, NULL); - hr = INameSpaceTreeControl_GetItemState(pnstc, psidesktop, 0, NULL); - hr = INameSpaceTreeControl_GetItemState(pnstc, NULL, 0, &itemstate); - hr = INameSpaceTreeControl_GetItemState(pnstc, psidesktop, 0, NULL); - hr = INameSpaceTreeControl_GetItemState(pnstc, NULL, 0, &itemstate); + INameSpaceTreeControl_SetItemState(pnstc, NULL, 0, 0); + INameSpaceTreeControl_GetItemState(pnstc, NULL, 0, NULL); + INameSpaceTreeControl_GetItemState(pnstc, psidesktop, 0, NULL); + INameSpaceTreeControl_GetItemState(pnstc, NULL, 0, &itemstate); + INameSpaceTreeControl_GetItemState(pnstc, psidesktop, 0, NULL); + INameSpaceTreeControl_GetItemState(pnstc, NULL, 0, &itemstate); } itemstate = 0xDEADBEEF; @@ -2302,7 +2302,7 @@ static void test_events(void) if(0) { /* Crashes on Windows 7 */ - hr = INameSpaceTreeControl_EnsureItemVisible(pnstc, NULL); + INameSpaceTreeControl_EnsureItemVisible(pnstc, NULL); } hr = INameSpaceTreeControl_EnsureItemVisible(pnstc, psidesktop);

1 0

Austin English : gdi32/tests: Make sure to use return value (LLVM/Clang).
by Alexandre Julliard 07 Feb '11

07 Feb '11

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 07 Feb '11

07 Feb '11

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

Austin English : cryptnet/tests: Make sure to use return value (LLVM/Clang) .
by Alexandre Julliard 07 Feb '11

07 Feb '11

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 : crypt32/tests: Make sure to use return value (LLVM/Clang).
by Alexandre Julliard 07 Feb '11

07 Feb '11

Module: wine Branch: master Commit: 179a01f2e2c44880a546c9ecec28c407139f77c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=179a01f2e2c44880a546c9ece… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Feb 4 16:06:38 2011 -0800 crypt32/tests: Make sure to use return value (LLVM/Clang). --- dlls/crypt32/tests/base64.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/tests/base64.c b/dlls/crypt32/tests/base64.c index dd85be4..39fa2e1 100644 --- a/dlls/crypt32/tests/base64.c +++ b/dlls/crypt32/tests/base64.c @@ -151,6 +151,7 @@ static void testBinaryToStringA(void) ret = pCryptBinaryToStringA(tests[i].toEncode, tests[i].toEncodeLen, CRYPT_STRING_BINARY, str, &strLen2); + ok(ret, "CryptBinaryToStringA failed: %d\n", GetLastError()); ok(strLen == strLen2, "Expected length %d, got %d\n", strLen, strLen2); ok(!memcmp(str, tests[i].toEncode, tests[i].toEncodeLen), @@ -187,6 +188,7 @@ static void testBinaryToStringA(void) ret = pCryptBinaryToStringA(testsNoCR[i].toEncode, testsNoCR[i].toEncodeLen, CRYPT_STRING_BINARY | CRYPT_STRING_NOCR, str, &strLen2); + ok(ret, "CryptBinaryToStringA failed: %d\n", GetLastError()); ok(strLen == strLen2, "Expected length %d, got %d\n", strLen, strLen2); ok(!memcmp(str, testsNoCR[i].toEncode, testsNoCR[i].toEncodeLen), @@ -287,6 +289,7 @@ static void decodeAndCompareBase64_A(LPCSTR toDecode, LPCSTR header, ret = pCryptStringToBinaryA(str, 0, useFormat, buf, &bufLen, &skipped, &usedFormat); + ok(ret, "CryptStringToBinaryA failed: %d\n", GetLastError()); ok(skipped == strlen(garbage), "Expected %d characters of \"%s\" skipped when trying format %08x, got %d (used format is %08x)\n", lstrlenA(garbage), str, useFormat, skipped, usedFormat);

1 0

← Newer
1
...
52
53
54
55
56
57
58
...
68
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2011