February 2011 - Wine-commits

Austin English : winspool.drv: Make sure to use return values (LLVM/Clang).
by Alexandre Julliard 07 Feb '11

07 Feb '11

Module: wine Branch: master Commit: 60c11fe037b57796f977ff152bc420766d29de1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=60c11fe037b57796f977ff152… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Feb 4 23:08:04 2011 -0800 winspool.drv: Make sure to use return values (LLVM/Clang). --- dlls/winspool.drv/tests/info.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c index 1c7e917..da4fc38 100644 --- a/dlls/winspool.drv/tests/info.c +++ b/dlls/winspool.drv/tests/info.c @@ -372,6 +372,7 @@ static void test_AddMonitor(void) mi2a.pEnvironment = entry->env; SetLastError(MAGIC_DEAD); res = AddMonitorA(NULL, 2, (LPBYTE) &mi2a); + ok(res, "AddMonitor error %d\n", GetLastError()); /* NT: ERROR_INVALID_PARAMETER, 9x: ERROR_PRIVILEGE_NOT_HELD */ } @@ -1937,6 +1938,7 @@ static void test_SetDefaultPrinter(void) org_value[0] = '\0'; SetLastError(MAGIC_DEAD); res = GetProfileStringA("windows", "device", NULL, org_value, size); + ok(res, "GetProfileString error %d\n", GetLastError()); /* first part: with the default Printer */ SetLastError(MAGIC_DEAD); @@ -2011,11 +2013,13 @@ static void test_SetDefaultPrinter(void) /* restore the original value */ res = pSetDefaultPrinterA(default_printer); /* the nice way */ + ok(res, "SetDefaultPrinter error %d\n", GetLastError()); WriteProfileStringA("windows", "device", org_value); /* the old way */ buffer[0] = '\0'; SetLastError(MAGIC_DEAD); res = GetProfileStringA("windows", "device", NULL, buffer, size); + ok(res, "GetProfileString error %d\n", GetLastError()); ok(!lstrcmpA(org_value, buffer), "'%s' (expected '%s')\n", buffer, org_value); } @@ -2305,6 +2309,7 @@ static void test_GetPrinter(void) { DWORD double_needed; ret = pGetPrinterW(hprn, level, NULL, 0, &double_needed); + ok(!ret, "level %d: GetPrinter error %d\n", level, GetLastError()); ok(double_needed == needed, "level %d: GetPrinterA returned different size %d than GetPrinterW (%d)\n", level, needed, double_needed); } @@ -2313,6 +2318,7 @@ static void test_GetPrinter(void) SetLastError(0xdeadbeef); filled = -1; ret = GetPrinter(hprn, level, buf, needed, &filled); + ok(ret, "level %d: GetPrinter error %d\n", level, GetLastError()); ok(needed == filled, "needed %d != filled %d\n", needed, filled); if (level == 2) @@ -2540,6 +2546,7 @@ static void test_GetPrinterDriver(void) { DWORD double_needed; ret = pGetPrinterDriverW(hprn, NULL, level, NULL, 0, &double_needed); + ok(!ret, "level %d: GetPrinterDriver error %d\n", level, GetLastError()); ok(double_needed == needed, "GetPrinterDriverA returned different size %d than GetPrinterDriverW (%d)\n", needed, double_needed); }

1 0

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

07 Feb '11

Module: wine Branch: master Commit: 0d8f2b364c247b32dd203a56a8ae9ed3e6c5e24f URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d8f2b364c247b32dd203a56a… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Feb 4 23:16:28 2011 -0800 gdiplus/tests: Make sure to use return values (LLVM/Clang). --- dlls/gdiplus/tests/font.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c index 834ba60..323461a 100644 --- a/dlls/gdiplus/tests/font.c +++ b/dlls/gdiplus/tests/font.c @@ -254,6 +254,7 @@ static void test_fontfamily_properties (void) ok(result == 1854, "Expected 1854, got %d\n", result); result = 0; stat = GdipGetCellDescent(FontFamily, FontStyleRegular, &result); + expect(Ok, stat); ok(result == 434, "Expected 434, got %d\n", result); GdipDeleteFontFamily(FontFamily); } @@ -277,6 +278,7 @@ static void test_fontfamily_properties (void) ok(result == 1825, "Expected 1825, got %d\n", result); result = 0; stat = GdipGetCellDescent(FontFamily, FontStyleRegular, &result); + expect(Ok, stat); ok(result == 443, "Expected 443 got %d\n", result); GdipDeleteFontFamily(FontFamily); }

1 0

EG Galano : gdiplus/tests: Make sure return value is used (LLVM/Clang).
by Alexandre Julliard 07 Feb '11

07 Feb '11

Module: wine Branch: master Commit: fbf9494b89d88ae50d215442b2de10fe206d3350 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbf9494b89d88ae50d215442b… Author: EG Galano <eg.galano(a)gmail.com> Date: Sat Feb 5 00:21:00 2011 -0800 gdiplus/tests: Make sure return value is used (LLVM/Clang). --- dlls/gdiplus/tests/pathiterator.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/pathiterator.c b/dlls/gdiplus/tests/pathiterator.c index 3e1c287..17cd463 100644 --- a/dlls/gdiplus/tests/pathiterator.c +++ b/dlls/gdiplus/tests/pathiterator.c @@ -124,6 +124,7 @@ static void test_nextmarker(void) expect(4, result); start = end = result = (INT)0xdeadbeef; stat = GdipPathIterNextMarker(iter, &result, &start, &end); + expect(Ok, stat); /* start/end remain unchanged */ expect((INT)0xdeadbeef, start); expect((INT)0xdeadbeef, end);

1 0

Nikolay Sivov : urlmon/uri: Remove dead assignment and useless initializer (LLVM/Clang).
by Alexandre Julliard 07 Feb '11

07 Feb '11

Module: wine Branch: master Commit: 8fb709e4ad856b9a31f777d53d464373ffdbd42f URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fb709e4ad856b9a31f777d53… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Feb 5 15:59:51 2011 +0300 urlmon/uri: Remove dead assignment and useless initializer (LLVM/Clang). --- dlls/urlmon/uri.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index e7b3078..a425212 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -1017,7 +1017,6 @@ static BOOL ipv6_to_number(const ipv6_address *address, USHORT number[8]) { if(!already_passed_elision && address->elision) { for(i = 0; i < address->elision_size; i+=2) number[cur_component++] = 0; - already_passed_elision = TRUE; } if(address->ipv4) { @@ -3443,7 +3442,7 @@ static HRESULT canonicalize_uri(const parse_data *data, Uri *uri, DWORD flags) { INT len; uri->canon_uri = NULL; - len = uri->canon_size = uri->canon_len = 0; + uri->canon_size = uri->canon_len = 0; TRACE("(%p %p %x): beginning to canonicalize URI %s.\n", data, uri, flags, debugstr_w(data->uri));

1 0

Vincent Povirk : windowscodecs: Release the icon frame substream on success too.
by Alexandre Julliard 07 Feb '11

07 Feb '11

Module: wine Branch: master Commit: 29ec595e4a2411ab72ccab7bd493f22e753988b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29ec595e4a2411ab72ccab7bd… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat Feb 5 13:01:20 2011 -0600 windowscodecs: Release the icon frame substream on success too. --- dlls/windowscodecs/icoformat.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/windowscodecs/icoformat.c b/dlls/windowscodecs/icoformat.c index de6ebe6..b4abac5 100644 --- a/dlls/windowscodecs/icoformat.c +++ b/dlls/windowscodecs/icoformat.c @@ -671,6 +671,8 @@ static HRESULT WINAPI IcoDecoder_GetFrame(IWICBitmapDecoder *iface, LeaveCriticalSection(&This->lock); + IStream_Release(substream); + return S_OK; fail:

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 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/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

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

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

07 Feb '11

Module: wine Branch: master Commit: 5ca437e758b734c191a91833d65029b4f2bded9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ca437e758b734c191a91833d… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Feb 4 22:19:07 2011 -0800 ole32/tests: Remove unused assignment (LLVM/Clang). --- dlls/ole32/tests/compobj.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 2d67b1e..3c35fab 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -870,7 +870,7 @@ static void test_CoRegisterClassObject(void) /* crashes with at least win9x DCOM! */ if (0) - hr = CoRevokeClassObject(cookie); + CoRevokeClassObject(cookie); CoUninitialize(); }

1 0