February 2011 - Wine-commits

Gerald Pfeifer : comctl32/tests: Remove unused parameter from test_removeimage().
by Alexandre Julliard 14 Feb '11

14 Feb '11

Module: wine Branch: master Commit: d698e226f6ed18cc452bf11482a7af2877314b39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d698e226f6ed18cc452bf1148… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun Feb 13 00:54:25 2011 +0100 comctl32/tests: Remove unused parameter from test_removeimage(). --- dlls/comctl32/tests/tab.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/tab.c b/dlls/comctl32/tests/tab.c index 03c4390..4c464e6 100644 --- a/dlls/comctl32/tests/tab.c +++ b/dlls/comctl32/tests/tab.c @@ -1148,7 +1148,7 @@ static void test_delete_focus(HWND parent_wnd) DestroyWindow(hTab); } -static void test_removeimage(HWND parent_wnd) +static void test_removeimage(void) { static const BYTE bits[32]; HWND hwTab; @@ -1408,7 +1408,7 @@ START_TEST(tab) test_insert_focus(parent_wnd); test_delete_focus(parent_wnd); test_delete_selection(parent_wnd); - test_removeimage(parent_wnd); + test_removeimage(); test_TCM_SETITEMEXTRA(parent_wnd); test_TCS_OWNERDRAWFIXED(parent_wnd);

1 0

Gerald Pfeifer : wpp: Fix the output type for the "unsigned OP signed" cases in BIN_OP_INT and friends.
by Alexandre Julliard 14 Feb '11

14 Feb '11

Module: wine Branch: master Commit: 7f6d6b835dc361eab32e939c2745bd37930de888 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f6d6b835dc361eab32e939c2… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun Feb 13 00:54:05 2011 +0100 wpp: Fix the output type for the "unsigned OP signed" cases in BIN_OP_INT and friends. --- libs/wpp/ppy.y | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/wpp/ppy.y b/libs/wpp/ppy.y index 5a63494..5f1566e 100644 --- a/libs/wpp/ppy.y +++ b/libs/wpp/ppy.y @@ -61,7 +61,7 @@ else if(cv_signed(v1) && !cv_signed(v2)) \ r.val.si = v1.val.si OP v2.val.ui; \ else if(!cv_signed(v1) && cv_signed(v2)) \ - r.val.ui = v1.val.ui OP v2.val.si; \ + r.val.si = v1.val.ui OP v2.val.si; \ else \ r.val.ui = v1.val.ui OP v2.val.ui; @@ -72,7 +72,7 @@ else if(cv_signed(v1) && !cv_signed(v2)) \ r.val.sl = v1.val.sl OP v2.val.ul; \ else if(!cv_signed(v1) && cv_signed(v2)) \ - r.val.ul = v1.val.ul OP v2.val.sl; \ + r.val.sl = v1.val.ul OP v2.val.sl; \ else \ r.val.ul = v1.val.ul OP v2.val.ul; @@ -83,7 +83,7 @@ else if(cv_signed(v1) && !cv_signed(v2)) \ r.val.sll = v1.val.sll OP v2.val.ull; \ else if(!cv_signed(v1) && cv_signed(v2)) \ - r.val.ull = v1.val.ull OP v2.val.sll; \ + r.val.sll = v1.val.ull OP v2.val.sll; \ else \ r.val.ull = v1.val.ull OP v2.val.ull;

1 0

Alexander Lakhin : cryptui: Add Russian translation resources.
by Alexandre Julliard 14 Feb '11

14 Feb '11

Module: wine Branch: master Commit: 09c006751d6d56e79938f28c6c01661d61689cd8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09c006751d6d56e79938f28c6… Author: Alexander Lakhin <exclusion(a)gmail.com> Date: Fri Feb 11 20:59:37 2011 +0300 cryptui: Add Russian translation resources. --- dlls/cryptui/Makefile.in | 1 + dlls/cryptui/cryptui_Ru.rc | 316 ++++++++++++++++++++++++++++++++++++++++++++ po/ru.po | 15 +- 3 files changed, 324 insertions(+), 8 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=09c006751d6d56e79938f…

1 0

Austin English : shell32/tests: Don't check return values inside of if(0) ( LLVM/Clang).
by Alexandre Julliard 14 Feb '11

14 Feb '11

Module: wine Branch: master Commit: 8a3294e8b67b5313f4c408f96f2d14735ecdc038 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a3294e8b67b5313f4c408f96… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Feb 10 11:57:20 2011 -0800 shell32/tests: Don't check return values inside of if(0) (LLVM/Clang). --- dlls/shell32/tests/shlfolder.c | 43 +++++++++++++++++++-------------------- 1 files changed, 21 insertions(+), 22 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index ea675b9..9dd6296 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -2369,7 +2369,7 @@ static void test_SHCreateShellItem(void) if(0) { /* Crashes under windows 7 */ - ret = pSHCreateItemFromParsingName(NULL, NULL, &IID_IShellItem, NULL); + pSHCreateItemFromParsingName(NULL, NULL, &IID_IShellItem, NULL); } shellitem = (void*)0xdeadbeef; @@ -2411,7 +2411,7 @@ static void test_SHCreateShellItem(void) if(0) { /* Crashes under win7 */ - ret = pSHCreateItemFromIDList(NULL, &IID_IShellItem, NULL); + pSHCreateItemFromIDList(NULL, &IID_IShellItem, NULL); } ret = pSHCreateItemFromIDList(NULL, &IID_IShellItem, (void**)&shellitem); @@ -2497,7 +2497,7 @@ static void test_SHGetNameFromIDList(void) if(0) { /* Crashes under win7 */ - hres = pSHGetNameFromIDList(NULL, 0, NULL); + pSHGetNameFromIDList(NULL, 0, NULL); } hres = pSHGetNameFromIDList(NULL, 0, &name_string); @@ -2639,7 +2639,7 @@ static void test_SHGetItemFromDataObject(void) if(0) { /* Crashes under win7 */ - hres = pSHGetItemFromDataObject(NULL, 0, &IID_IShellItem, NULL); + pSHGetItemFromDataObject(NULL, 0, &IID_IShellItem, NULL); } hres = pSHGetItemFromDataObject(NULL, 0, &IID_IShellItem, (void**)&psv); @@ -2830,9 +2830,9 @@ static void test_ShellItemCompare(void) if(0) { /* Crashes on native (win7, winxp) */ - hr = IShellItem_Compare(psi_a, NULL, 0, NULL); - hr = IShellItem_Compare(psi_a, psi_b, 0, NULL); - hr = IShellItem_Compare(psi_a, NULL, 0, &order); + IShellItem_Compare(psi_a, NULL, 0, NULL); + IShellItem_Compare(psi_a, psi_b, 0, NULL); + IShellItem_Compare(psi_a, NULL, 0, &order); } /* Basics */ @@ -3204,9 +3204,9 @@ static void test_SHGetItemFromObject(void) if(0) { /* Crashes with Windows 7 */ - hres = pSHGetItemFromObject((IUnknown*)psfdesktop, &IID_IUnknown, NULL); - hres = pSHGetItemFromObject(NULL, &IID_IUnknown, NULL); - hres = pSHGetItemFromObject((IUnknown*)psfdesktop, NULL, (void**)&punk); + pSHGetItemFromObject((IUnknown*)psfdesktop, &IID_IUnknown, NULL); + pSHGetItemFromObject(NULL, &IID_IUnknown, NULL); + pSHGetItemFromObject((IUnknown*)psfdesktop, NULL, (void**)&punk); } hres = pSHGetItemFromObject(NULL, &IID_IUnknown, (void**)&punk); @@ -3340,7 +3340,7 @@ static void test_SHCreateShellItemArray(void) if(0) { /* Crashes in Windows 7 */ - hr = IShellItemArray_GetCount(psia, NULL); + IShellItemArray_GetCount(psia, NULL); } IShellItemArray_GetCount(psia, &numitems); @@ -3384,9 +3384,9 @@ static void test_SHCreateShellItemArray(void) if(0) { /* Crashes under Windows 7 */ - hr = pSHCreateShellItemArrayFromShellItem(NULL, &IID_IShellItemArray, NULL); - hr = pSHCreateShellItemArrayFromShellItem(NULL, &IID_IShellItemArray, (void**)&psia); - hr = pSHCreateShellItemArrayFromShellItem(psi, &IID_IShellItemArray, NULL); + pSHCreateShellItemArrayFromShellItem(NULL, &IID_IShellItemArray, NULL); + pSHCreateShellItemArrayFromShellItem(NULL, &IID_IShellItemArray, (void**)&psia); + pSHCreateShellItemArrayFromShellItem(psi, &IID_IShellItemArray, NULL); } hr = pSHCreateItemFromIDList(pidl_testdir, &IID_IShellItem, (void**)&psi); @@ -3437,7 +3437,7 @@ static void test_SHCreateShellItemArray(void) if(0) { /* Crashes under Windows 7 */ - hr = pSHCreateShellItemArrayFromDataObject(NULL, &IID_IShellItemArray, NULL); + pSHCreateShellItemArrayFromDataObject(NULL, &IID_IShellItemArray, NULL); } hr = pSHCreateShellItemArrayFromDataObject(NULL, &IID_IShellItemArray, (void**)&psia); ok(hr == E_INVALIDARG, "Got 0x%08x\n", hr); @@ -3548,8 +3548,8 @@ static void test_ShellItemBindToHandler(void) if(0) { /* Crashes under Windows 7 */ - hr = IShellItem_BindToHandler(psi, NULL, NULL, NULL, NULL); - hr = IShellItem_BindToHandler(psi, NULL, &IID_IUnknown, &IID_IUnknown, NULL); + IShellItem_BindToHandler(psi, NULL, NULL, NULL, NULL); + IShellItem_BindToHandler(psi, NULL, &IID_IUnknown, &IID_IUnknown, NULL); } hr = IShellItem_BindToHandler(psi, NULL, &IID_IUnknown, &IID_IUnknown, (void**)&punk); ok(hr == MK_E_NOOBJECT, "Got 0x%08x\n", hr); @@ -3702,8 +3702,7 @@ void test_ShellItemGetAttributes(void) if(0) { /* Crashes on native (Win 7) */ - hr = IShellItem_GetAttributes(psi, 0, NULL); - ok(hr == S_OK, "Got 0x%08x\n", hr); + IShellItem_GetAttributes(psi, 0, NULL); } /* Test GetAttributes on the desktop folder. */ @@ -3733,9 +3732,9 @@ static void test_SHParseDisplayName(void) if (0) { /* crashes on native */ - hr = pSHParseDisplayName(NULL, NULL, NULL, 0, NULL); + pSHParseDisplayName(NULL, NULL, NULL, 0, NULL); nameW[0] = 0; - hr = pSHParseDisplayName(nameW, NULL, NULL, 0, NULL); + pSHParseDisplayName(nameW, NULL, NULL, 0, NULL); } pidl1 = (LPITEMIDLIST)0xdeadbeef; @@ -3792,7 +3791,7 @@ static void test_desktop_IPersist(void) if (0) { /* crashes on native */ - hr = IPersist_GetClassID(persist, NULL); + IPersist_GetClassID(persist, NULL); } memset(&clsid, 0, sizeof(clsid)); hr = IPersist_GetClassID(persist, &clsid);

1 0

Austin English : shell32/tests: Make sure a return value is used (LLVM/ Clang).
by Alexandre Julliard 14 Feb '11

14 Feb '11

Module: wine Branch: master Commit: 3c69f657fbf4f2519f4eee30d7f66827222f11dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c69f657fbf4f2519f4eee30d… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Feb 10 11:58:08 2011 -0800 shell32/tests: Make sure a return value is used (LLVM/Clang). --- dlls/shell32/tests/shlfolder.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 9dd6296..bc3e426 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -3477,6 +3477,7 @@ static void test_SHCreateShellItemArray(void) { UINT count_sia, i; hr = IShellItemArray_GetCount(psia, &count_sia); + ok(hr == S_OK, "Got 0x%08x\n", hr); ok(count_sia == count, "Counts differ (%d, %d)\n", count, count_sia); for(i = 0; i < count_sia; i++) {

1 0

Austin English : shell32/tests: Don't check return values inside of if(0) ( LLVM/Clang).
by Alexandre Julliard 14 Feb '11

14 Feb '11

Module: wine Branch: master Commit: 2811f68e92c67f0cd07908f6aedf4c02752e44b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2811f68e92c67f0cd07908f6a… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Feb 10 13:28:39 2011 -0800 shell32/tests: Don't check return values inside of if(0) (LLVM/Clang). --- dlls/shell32/tests/shlview.c | 27 ++++++++++++--------------- 1 files changed, 12 insertions(+), 15 deletions(-) diff --git a/dlls/shell32/tests/shlview.c b/dlls/shell32/tests/shlview.c index 9d2fb47..6e97499 100644 --- a/dlls/shell32/tests/shlview.c +++ b/dlls/shell32/tests/shlview.c @@ -509,7 +509,7 @@ static void test_IShellView_CreateViewWindow(void) if (0) { /* crashes on native */ - hr = IShellView_CreateViewWindow(view, NULL, &settings, NULL, NULL, NULL); + IShellView_CreateViewWindow(view, NULL, &settings, NULL, NULL, NULL); } settings.ViewMode = FVM_ICON; @@ -577,14 +577,14 @@ static void test_IFolderView(void) if (0) { /* crashes on Vista and Win2k8 - List not created yet case */ - hr = IFolderView_GetSpacing(fv, &pt); + IFolderView_GetSpacing(fv, &pt); /* crashes on XP */ - hr = IFolderView_GetSelectionMarkedItem(fv, NULL); - hr = IFolderView_GetFocusedItem(fv, NULL); + IFolderView_GetSelectionMarkedItem(fv, NULL); + IFolderView_GetFocusedItem(fv, NULL); /* crashes on Vista+ */ - hr = IFolderView_Item(fv, 0, NULL); + IFolderView_Item(fv, 0, NULL); } browser = IShellBrowserImpl_Construct(); @@ -632,20 +632,17 @@ if (0) if (0) { /* crashes on XP */ - hr = IFolderView_ItemCount(fv, SVGIO_ALLVIEW, NULL); + IFolderView_ItemCount(fv, SVGIO_ALLVIEW, NULL); } flush_sequences(sequences, NUM_MSG_SEQUENCES); - hr = IFolderView_ItemCount(fv, SVGIO_ALLVIEW, &count); - ok(hr == S_OK, "got (0x%08x)\n", hr); - ok_sequence(sequences, LISTVIEW_SEQ_INDEX, count ? folderview_itemcount_seq : empty_seq, - "IFolderView::ItemCount", FALSE); + IFolderView_ItemCount(fv, SVGIO_ALLVIEW, &count); /* IFolderView::GetSelectionMarkedItem */ if (0) { /* crashes on XP */ - hr = IFolderView_GetSelectionMarkedItem(fv, NULL); + IFolderView_GetSelectionMarkedItem(fv, NULL); } flush_sequences(sequences, NUM_MSG_SEQUENCES); @@ -671,8 +668,8 @@ if (0) if (0) { /* crashes on XP */ - hr = IFolderView_GetFolder(fv, NULL, (void**)&folder); - hr = IFolderView_GetFolder(fv, NULL, NULL); + IFolderView_GetFolder(fv, NULL, (void**)&folder); + IFolderView_GetFolder(fv, NULL, NULL); } hr = IFolderView_GetFolder(fv, &IID_IShellFolder, NULL); @@ -930,10 +927,10 @@ static void test_GetSetCurrentViewMode(void) HWND hwnd_lv; UINT count; - if(0) + if (0) { /* Crashes under Win7/WinXP */ - hr = IFolderView_GetCurrentViewMode(fview, NULL); + IFolderView_GetCurrentViewMode(fview, NULL); } hr = IFolderView_GetCurrentViewMode(fview, &viewmode);

1 0

Austin English : mshtml/tests: Make sure a return value is used (LLVM/Clang ).
by Alexandre Julliard 14 Feb '11

14 Feb '11

Module: wine Branch: master Commit: 746e8b237ed86ae5293c29722a254af8d557d88f URL: http://source.winehq.org/git/wine.git/?a=commit;h=746e8b237ed86ae5293c29722… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Feb 10 13:27:19 2011 -0800 mshtml/tests: Make sure a return value is used (LLVM/Clang). --- dlls/mshtml/tests/htmldoc.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 75be8ab..17d23c5 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -4014,6 +4014,7 @@ static void test_ClientSite(IOleObject *oleobj, DWORD flags) if(flags & CLIENTSITE_SETNULL) { hres = IOleObject_GetClientSite(oleobj, &clientsite); + ok(hres == S_OK, "SetClientSite failed: %08x\n", hres); if(set_clientsite) ok(clientsite == &ClientSite, "clientsite=%p, expected %p\n", clientsite, &ClientSite); else

1 0

Austin English : mshtml/tests: Make sure a return value is used (LLVM/Clang ).
by Alexandre Julliard 14 Feb '11

14 Feb '11

Module: wine Branch: master Commit: 1091ceef7b440650e96452bb515b612cdca86257 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1091ceef7b440650e96452bb5… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Feb 10 13:27:29 2011 -0800 mshtml/tests: Make sure a return value is used (LLVM/Clang). --- dlls/mshtml/tests/script.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/tests/script.c b/dlls/mshtml/tests/script.c index f9aafbb..761d440 100644 --- a/dlls/mshtml/tests/script.c +++ b/dlls/mshtml/tests/script.c @@ -1832,6 +1832,7 @@ static void test_nextdispid(IDispatchEx *dispex) V_VT(&var) = VT_EMPTY; hres = dispex_propput(dispex, dyn_id, 0, &var); + ok(hres == S_OK, "dispex_propput failed: %08x\n", hres); while(last_id != dyn_id) { hres = IDispatchEx_GetNextDispID(dispex, fdexEnumAll, last_id, &id);

1 0

Detlef Riekenberg : winspool: Do not mark AddPrinterA as stub.
by Alexandre Julliard 14 Feb '11

14 Feb '11

Module: wine Branch: master Commit: 14fc2eff44f068406d43c8bcea2ff862fb12e04b URL: http://source.winehq.org/git/wine.git/?a=commit;h=14fc2eff44f068406d43c8bce… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Feb 11 17:25:34 2011 +0100 winspool: Do not mark AddPrinterA as stub. --- dlls/winspool.drv/info.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index e4a464a..9d36657 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -2614,7 +2614,7 @@ HANDLE WINAPI AddPrinterA(LPSTR pName, DWORD Level, LPBYTE pPrinter) PRINTER_INFO_2A *piA = (PRINTER_INFO_2A*)pPrinter; HANDLE ret; - TRACE("(%s,%d,%p): stub\n", debugstr_a(pName), Level, pPrinter); + TRACE("(%s, %d, %p)\n", debugstr_a(pName), Level, pPrinter); if(Level != 2) { ERR("Level = %d, unsupported!\n", Level); SetLastError(ERROR_INVALID_LEVEL);

1 0

Detlef Riekenberg : msi/tests: Fix a typo.
by Alexandre Julliard 14 Feb '11

14 Feb '11

Module: wine Branch: master Commit: 1c2183a85a9f53570a9b70d26e94ee51f51214fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c2183a85a9f53570a9b70d26… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Feb 11 17:34:50 2011 +0100 msi/tests: Fix a typo. --- dlls/msi/tests/package.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index f86e3d1..0830cf0 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -11956,7 +11956,7 @@ static void test_sourcedir(void) size = MAX_PATH; lstrcpyA(path, "kiwi"); r = MsiGetSourcePath(hpkg, "SOURCEDIR", path, &size); - ok(r == ERROR_DIRECTORY, "Expected ERROR_SUCCESS, got %d\n", r); + ok(r == ERROR_DIRECTORY, "Expected ERROR_DIRECTORY, got %d\n", r); ok(!lstrcmpA(path, "kiwi"), "Expected \"kiwi\", got \"%s\"\n", path); ok(size == MAX_PATH, "Expected %d, got %d\n", MAX_PATH, size);

1 0