September 2011 - Wine-commits

Alexandre Julliard : Merge branch 'upstream'.
by Alexandre Julliard 27 Sep '11

27 Sep '11

Module: bugzilla Branch: master Commit: 2488bad939b3d53ccfba6e2c3b2f5d6bf407515e URL: http://source.winehq.org/git/bugzilla.git/?a=commit;h=2488bad939b3d53ccfba6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 23 16:03:04 2011 +0200 Merge branch 'upstream'. Conflicts: template/en/default/attachment/list.html.tmpl template/en/default/bug/edit.html.tmpl template/en/default/global/common-links.html.tmpl template/en/default/list/table.html.tmpl template/en/default/pages/fields.html.tmpl ---

1 0

Francois Gouget : comctl32/tests: Add basic tests for the SysLink control.
by Alexandre Julliard 26 Sep '11

26 Sep '11

Module: wine Branch: master Commit: e6368a040c10b628d202ef5be9ff58cf3f220201 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6368a040c10b628d202ef5be… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Sep 26 16:21:39 2011 +0200 comctl32/tests: Add basic tests for the SysLink control. --- dlls/comctl32/tests/Makefile.in | 1 + dlls/comctl32/tests/syslink.c | 257 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 258 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/Makefile.in b/dlls/comctl32/tests/Makefile.in index cb4f3ff..145c125 100644 --- a/dlls/comctl32/tests/Makefile.in +++ b/dlls/comctl32/tests/Makefile.in @@ -17,6 +17,7 @@ C_SRCS = \ rebar.c \ status.c \ subclass.c \ + syslink.c \ tab.c \ toolbar.c \ tooltips.c \ diff --git a/dlls/comctl32/tests/syslink.c b/dlls/comctl32/tests/syslink.c new file mode 100644 index 0000000..ea92d42 --- /dev/null +++ b/dlls/comctl32/tests/syslink.c @@ -0,0 +1,257 @@ +/* Unit tests for the syslink control. + * + * Copyright 2011 Francois Gouget for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <windows.h> +#include <commctrl.h> + +#include "wine/test.h" +#include "v6util.h" +#include "msg.h" + +#define expect(expected, got) ok(got == expected, "Expected %d, got %d\n", expected, got) +#define NUM_MSG_SEQUENCE 2 +#define PARENT_SEQ_INDEX 0 +#define SYSLINK_SEQ_INDEX 1 + +static HWND hWndParent; + +static struct msg_sequence *sequences[NUM_MSG_SEQUENCE]; + +static const struct message empty_wnd_seq[] = { + {0} +}; + +static const struct message parent_create_syslink_wnd_seq[] = { + { WM_GETFONT, sent|optional}, /* Only on XP */ + { WM_QUERYUISTATE, sent|optional}, + { WM_CTLCOLORSTATIC, sent}, + { WM_NOTIFY, sent|wparam, 0}, + { WM_PARENTNOTIFY, sent|wparam, WM_CREATE}, + {0} +}; + +static const struct message visible_syslink_wnd_seq[] = { + { WM_STYLECHANGING, sent|wparam, GWL_STYLE}, + { WM_STYLECHANGED, sent|wparam, GWL_STYLE}, + { WM_PAINT, sent}, + {0} +}; + +static const struct message parent_visible_syslink_wnd_seq[] = { + { WM_CTLCOLORSTATIC, sent}, + { WM_NOTIFY, sent|wparam, 0}, + {0} +}; + +/* Try to make sure pending X events have been processed before continuing */ +static void flush_events(void) +{ + MSG msg; + int diff = 200; + int min_timeout = 100; + DWORD time = GetTickCount() + diff; + + while (diff > 0) + { + if (MsgWaitForMultipleObjects( 0, NULL, FALSE, min_timeout, QS_ALLINPUT ) == WAIT_TIMEOUT) break; + while (PeekMessage( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessage( &msg ); + diff = time - GetTickCount(); + } +} + +static LRESULT WINAPI parent_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + static LONG defwndproc_counter = 0; + LRESULT ret; + struct message msg; + + /* log system messages, except for painting */ + if (message < WM_USER && + message != WM_PAINT && + message != WM_ERASEBKGND && + message != WM_NCPAINT && + message != WM_NCHITTEST && + message != WM_GETTEXT && + message != WM_GETICON && + message != WM_DEVICECHANGE) + { + trace("parent: %p, %04x, %08lx, %08lx\n", hwnd, message, wParam, lParam); + + msg.message = message; + msg.flags = sent|wparam|lparam; + if (defwndproc_counter) msg.flags |= defwinproc; + msg.wParam = wParam; + msg.lParam = lParam; + add_message(sequences, PARENT_SEQ_INDEX, &msg); + } + + defwndproc_counter++; + ret = DefWindowProcW(hwnd, message, wParam, lParam); + defwndproc_counter--; + + return ret; +} + +static const WCHAR parentClassW[] = {'S','y','s','l','i','n','k',' ','t','e','s','t',' ','p','a','r','e','n','t',' ','c','l','a','s','s',0}; + +static BOOL register_parent_wnd_class(void) +{ + WNDCLASSW cls; + + cls.style = 0; + cls.lpfnWndProc = parent_wnd_proc; + cls.cbClsExtra = 0; + cls.cbWndExtra = 0; + cls.hInstance = GetModuleHandleW(NULL); + cls.hIcon = 0; + cls.hCursor = LoadCursorW(0, (LPCWSTR)IDC_ARROW); + cls.hbrBackground = GetStockObject(WHITE_BRUSH); + cls.lpszMenuName = NULL; + cls.lpszClassName = parentClassW; + return RegisterClassW(&cls); +} + +static HWND create_parent_window(void) +{ + static const WCHAR titleW[] = {'S','y','s','l','i','n','k',' ','t','e','s','t',' ','p','a','r','e','n','t',' ','w','i','n','d','o','w',0}; + if (!register_parent_wnd_class()) + return NULL; + + return CreateWindowExW(0, parentClassW, titleW, + WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | + WS_MAXIMIZEBOX | WS_VISIBLE, + 0, 0, 200, 100, GetDesktopWindow(), + NULL, GetModuleHandleW(NULL), NULL); +} + +static WNDPROC syslink_oldproc; + +static LRESULT WINAPI syslink_subclass_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + static LONG defwndproc_counter = 0; + LRESULT ret; + struct message msg; + + trace("syslink: %p, %04x, %08lx, %08lx\n", hwnd, message, wParam, lParam); + + msg.message = message; + msg.flags = sent|wparam|lparam; + if (defwndproc_counter) msg.flags |= defwinproc; + msg.wParam = wParam; + msg.lParam = lParam; + add_message(sequences, SYSLINK_SEQ_INDEX, &msg); + + defwndproc_counter++; + ret = CallWindowProcW(syslink_oldproc, hwnd, message, wParam, lParam); + defwndproc_counter--; + + return ret; +} + +static HWND create_syslink(DWORD style, HWND parent) +{ + HWND hWndSysLink; + static const WCHAR linkW[] = {'H','e','a','d',' ','<','a',' ','h','r','e','f','=','"','l','i','n','k','1','"','>','N','a','m','e','1','<','/','a','>',' ','M','i','d','d','l','e',' ','<','a',' ','h','r','e','f','=','"','l','i','n','k','2','"','>','N','a','m','e','2','<','/','a','>',' ','T','a','i','l',0}; + + /* Only Unicode will do here */ + hWndSysLink = CreateWindowExW(0, WC_LINK, linkW, + style, 0, 0, 150, 50, + parent, NULL, GetModuleHandleW(NULL), NULL); + if (!hWndSysLink) return NULL; + + if (GetWindowLongPtrW(hWndSysLink, GWLP_USERDATA)) + /* On Windows XP SysLink takes GWLP_USERDATA for itself! */ + trace("SysLink makes use of GWLP_USERDATA\n"); + + syslink_oldproc = (WNDPROC)SetWindowLongPtrW(hWndSysLink, GWLP_WNDPROC, (LONG_PTR)syslink_subclass_proc); + + return hWndSysLink; +} + + +START_TEST(syslink) +{ + ULONG_PTR ctx_cookie; + HANDLE hCtx; + HMODULE hComctl32; + BOOL (WINAPI *pInitCommonControlsEx)(const INITCOMMONCONTROLSEX*); + INITCOMMONCONTROLSEX iccex; + BOOL rc; + HWND hWndSysLink; + LONG oldstyle; + + if (!load_v6_module(&ctx_cookie, &hCtx)) + return; + + /* LoadLibrary is needed. This file has no reference to functions in comctl32 */ + hComctl32 = LoadLibraryA("comctl32.dll"); + pInitCommonControlsEx = (void*)GetProcAddress(hComctl32, "InitCommonControlsEx"); + if (!pInitCommonControlsEx) + { + win_skip("InitCommonControlsEx() is missing. Skipping the tests\n"); + return; + } + iccex.dwSize = sizeof(iccex); + iccex.dwICC = ICC_LINK_CLASS; + rc = pInitCommonControlsEx(&iccex); + ok(rc, "InitCommonControlsEx failed (le %u)\n", GetLastError()); + if (!rc) + { + skip("Could not register ICC_LINK_CLASS\n"); + return; + } + + init_msg_sequences(sequences, NUM_MSG_SEQUENCE); + + /* Create parent window */ + hWndParent = create_parent_window(); + ok(hWndParent != NULL, "Failed to create parent Window!\n"); + if (!hWndParent) + { + skip("Parent window not present\n"); + return; + } + flush_events(); + + /* Create an invisible SysLink control */ + flush_sequences(sequences, NUM_MSG_SEQUENCE); + hWndSysLink = create_syslink(WS_CHILD | WS_TABSTOP, hWndParent); + ok(hWndSysLink != NULL, "Expected non NULL value (le %u)\n", GetLastError()); + if (!hWndSysLink) + { + skip("SysLink control not present?\n"); + return; + } + flush_events(); + ok_sequence(sequences, SYSLINK_SEQ_INDEX, empty_wnd_seq, "create SysLink", FALSE); + ok_sequence(sequences, PARENT_SEQ_INDEX, parent_create_syslink_wnd_seq, "create SysLink (parent)", TRUE); + + /* Make the SysLink control visible */ + flush_sequences(sequences, NUM_MSG_SEQUENCE); + oldstyle = GetWindowLong(hWndSysLink, GWL_STYLE); + SetWindowLong(hWndSysLink, GWL_STYLE, oldstyle | WS_VISIBLE); + RedrawWindow(hWndSysLink, NULL, NULL, RDW_INVALIDATE); + flush_events(); + ok_sequence(sequences, SYSLINK_SEQ_INDEX, visible_syslink_wnd_seq, "visible SysLink", TRUE); + ok_sequence(sequences, PARENT_SEQ_INDEX, parent_visible_syslink_wnd_seq, "visible SysLink (parent)", TRUE); + + DestroyWindow(hWndSysLink); + DestroyWindow(hWndParent); + unload_v6_module(ctx_cookie, hCtx); +}

1 0

Francois Gouget : comctl32: Send a WM_CTLCOLORSTATIC message and erase the background while painting.
by Alexandre Julliard 26 Sep '11

26 Sep '11

Module: wine Branch: master Commit: 76b6c8f5170f1f8d95ad38febc8c8cb1b606f067 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76b6c8f5170f1f8d95ad38feb… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Sep 26 16:22:40 2011 +0200 comctl32: Send a WM_CTLCOLORSTATIC message and erase the background while painting. --- dlls/comctl32/syslink.c | 29 ++++++++++------------------- 1 files changed, 10 insertions(+), 19 deletions(-) diff --git a/dlls/comctl32/syslink.c b/dlls/comctl32/syslink.c index 01d638c..b2dfdad 100644 --- a/dlls/comctl32/syslink.c +++ b/dlls/comctl32/syslink.c @@ -832,6 +832,7 @@ static LRESULT SYSLINK_Draw (const SYSLINK_INFO *infoPtr, HDC hdc) PDOC_ITEM Current; HFONT hOldFont; COLORREF OldTextColor, OldBkColor; + HBRUSH hBrush; hOldFont = SelectObject(hdc, infoPtr->Font); OldTextColor = SetTextColor(hdc, infoPtr->TextColor); @@ -843,6 +844,13 @@ static LRESULT SYSLINK_Draw (const SYSLINK_INFO *infoPtr, HDC hdc) if(rc.right < 0 || rc.bottom < 0) return 0; + hBrush = (HBRUSH)SendMessageW(infoPtr->Notify, WM_CTLCOLORSTATIC, + (WPARAM)hdc, (LPARAM)infoPtr->Self); + if (!hBrush) + hBrush = CreateSolidBrush(infoPtr->BackColor); + FillRect(hdc, &rc, hBrush); + DeleteObject(hBrush); + for(Current = infoPtr->Items; Current != NULL; Current = Current->Next) { int n; @@ -911,23 +919,6 @@ static LRESULT SYSLINK_Paint (const SYSLINK_INFO *infoPtr, HDC hdcParam) } /*********************************************************************** - * SYSLINK_EraseBkgnd - * Handles the WM_ERASEBKGND message. - */ -static LRESULT SYSLINK_EraseBkgnd (const SYSLINK_INFO *infoPtr, HDC hdc) -{ - HBRUSH hbr; - RECT r; - - GetClientRect(infoPtr->Self, &r); - hbr = CreateSolidBrush(infoPtr->BackColor); - FillRect(hdc, &r, hbr); - DeleteObject(hbr); - - return 1; -} - -/*********************************************************************** * SYSLINK_SetFont * Set new Font for the SysLink control. */ @@ -1572,7 +1563,7 @@ static LRESULT WINAPI SysLinkWindowProc(HWND hwnd, UINT message, return SYSLINK_Paint (infoPtr, (HDC)wParam); case WM_ERASEBKGND: - return SYSLINK_EraseBkgnd(infoPtr, (HDC)wParam); + return 0; case WM_SETCURSOR: { @@ -1752,7 +1743,7 @@ static LRESULT WINAPI SysLinkWindowProc(HWND hwnd, UINT message, infoPtr->HasFocus = FALSE; infoPtr->MouseDownID = -1; infoPtr->TextColor = comctl32_color.clrWindowText; - infoPtr->LinkColor = comctl32_color.clrHotTrackingColor; + infoPtr->LinkColor = comctl32_color.clrHighlight; infoPtr->VisitedColor = comctl32_color.clrHighlight; infoPtr->BackColor = infoPtr->Style & LWS_TRANSPARENT ? comctl32_color.clrWindow : comctl32_color.clrBtnFace;

1 0

Alexandre Julliard : winecfg: Set the background color for the web link.
by Alexandre Julliard 26 Sep '11

26 Sep '11

Module: wine Branch: master Commit: 707efdc0f8c6d2735ecde8e47cb024e569681300 URL: http://source.winehq.org/git/wine.git/?a=commit;h=707efdc0f8c6d2735ecde8e47… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 26 22:53:14 2011 +0200 winecfg: Set the background color for the web link. --- programs/winecfg/about.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/programs/winecfg/about.c b/programs/winecfg/about.c index 650603a..9b32582 100644 --- a/programs/winecfg/about.c +++ b/programs/winecfg/about.c @@ -170,6 +170,7 @@ AboutDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) SetTextColor((HDC)wParam, 0x0000007F); case IDC_ABT_PANEL_TEXT: case IDC_ABT_LICENSE_TEXT: + case IDC_ABT_WEB_LINK: return (INT_PTR)CreateSolidBrush(GetSysColor(COLOR_WINDOW)); } break;

1 0

André Hentschel : shell32/tests: Don' t test function directly when reporting GetLastError().
by Alexandre Julliard 26 Sep '11

26 Sep '11

Module: wine Branch: master Commit: 8b0a2c287215aee1b4138f64e01cbda960f17ace URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b0a2c287215aee1b4138f64e… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Sep 25 20:30:42 2011 +0200 shell32/tests: Don't test function directly when reporting GetLastError(). --- dlls/shell32/tests/shlfolder.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index fb634b4..c61a972 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -3784,12 +3784,15 @@ if (0) if (!pIsWow64Process || !pIsWow64Process( GetCurrentProcess(), &is_wow64 )) is_wow64 = FALSE; if (is_wow64 && pGetSystemWow64DirectoryW) { + UINT len; *dirW = 0; - ok(GetSystemDirectoryW(dirW, MAX_PATH) > 0, "GetSystemDirectoryW failed: %u\n", GetLastError()); + len = GetSystemDirectoryW(dirW, MAX_PATH); + ok(len > 0, "GetSystemDirectoryW failed: %u\n", GetLastError()); hr = pSHParseDisplayName(dirW, NULL, &pidl1, 0, NULL); ok(hr == S_OK, "failed %08x\n", hr); *dirW = 0; - ok(pGetSystemWow64DirectoryW(dirW, MAX_PATH) > 0, "GetSystemWow64DirectoryW failed: %u\n", GetLastError()); + len = pGetSystemWow64DirectoryW(dirW, MAX_PATH); + ok(len > 0, "GetSystemWow64DirectoryW failed: %u\n", GetLastError()); hr = pSHParseDisplayName(dirW, NULL, &pidl2, 0, NULL); ok(hr == S_OK, "failed %08x\n", hr); ret = pILIsEqual(pidl1, pidl2);

1 0

André Hentschel : user32/tests: Don' t test function directly when reporting GetLastError().
by Alexandre Julliard 26 Sep '11

26 Sep '11

Module: wine Branch: master Commit: fd71f876421461dc6a9b864ad54f89ea1f627acb URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd71f876421461dc6a9b864ad… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Sep 25 20:30:44 2011 +0200 user32/tests: Don't test function directly when reporting GetLastError(). --- dlls/user32/tests/msg.c | 4 ++-- dlls/user32/tests/resource.c | 18 +++++++++--------- dlls/user32/tests/win.c | 20 ++++++++++---------- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 9aaf149..90b518d 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -9516,8 +9516,8 @@ static DWORD CALLBACK send_msg_thread_2(void *param) case WAIT_OBJECT_0 + EV_SENDMSG: trace("thread: sending message\n"); - ok( SendNotifyMessageA(info->hwnd, WM_USER, 0, 0), - "SendNotifyMessageA failed error %u\n", GetLastError()); + ret = SendNotifyMessageA(info->hwnd, WM_USER, 0, 0); + ok(ret, "SendNotifyMessageA failed error %u\n", GetLastError()); SetEvent(info->hevent[EV_ACK]); break; diff --git a/dlls/user32/tests/resource.c b/dlls/user32/tests/resource.c index 5bc2d7a..dd4342d 100644 --- a/dlls/user32/tests/resource.c +++ b/dlls/user32/tests/resource.c @@ -90,7 +90,7 @@ static void test_LoadStringA (void) {sizeof str, sizeof str - 1}, {sizeof str - 1, sizeof str - 2}}; unsigned int i; - int ret; + int ret, ret2; assert (sizeof str < sizeof buf); for (i = 0; i < sizeof tests / sizeof tests[0]; i++) { @@ -110,17 +110,17 @@ static void test_LoadStringA (void) ret = LoadStringA(hInst, 1, buf, sizeof(buf) ); ok( ret > 0, "LoadString failed: ret %d err %d\n", ret, GetLastError()); - ok( LoadStringA( hInst, MAKELONG( 1, 0x8000 ), buf, sizeof(buf)) == ret, - "LoadString failed: ret %d err %d\n", ret, GetLastError()); - ok( LoadStringA( hInst, MAKELONG( 1, 0xffff ), buf, sizeof(buf)) == ret, - "LoadString failed: ret %d err %d\n", ret, GetLastError()); + ret2 = LoadStringA( hInst, MAKELONG( 1, 0x8000 ), buf, sizeof(buf)); + ok( ret2 == ret, "LoadString failed: ret %d err %d\n", ret, GetLastError()); + ret2 = LoadStringA( hInst, MAKELONG( 1, 0xffff ), buf, sizeof(buf)); + ok( ret2 == ret, "LoadString failed: ret %d err %d\n", ret, GetLastError()); ret = LoadStringA(hInst, 65534, buf, sizeof(buf) ); ok( ret > 0, "LoadString failed: ret %d err %d\n", ret, GetLastError()); - ok( LoadStringA( hInst, MAKELONG( 65534, 0x8000 ), buf, sizeof(buf)) == ret, - "LoadString failed: ret %d err %d\n", ret, GetLastError()); - ok( LoadStringA( hInst, MAKELONG( 65534, 0xffff ), buf, sizeof(buf)) == ret, - "LoadString failed: ret %d err %d\n", ret, GetLastError()); + ret2 = LoadStringA( hInst, MAKELONG( 65534, 0x8000 ), buf, sizeof(buf)); + ok( ret2 == ret, "LoadString failed: ret %d err %d\n", ret, GetLastError()); + ret2 = LoadStringA( hInst, MAKELONG( 65534, 0xffff ), buf, sizeof(buf)); + ok( ret2 == ret, "LoadString failed: ret %d err %d\n", ret, GetLastError()); ret = LoadStringA(hInst, 0, buf, 0); ok( ret == -1 || broken(ret == 0), diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index d309f98..3fba84d 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -5094,20 +5094,20 @@ static void test_CreateWindow(void) ok( !pGetProcessDefaultLayout( NULL ), "GetProcessDefaultLayout succeeded\n" ); ok( GetLastError() == ERROR_NOACCESS, "wrong error %u\n", GetLastError() ); SetLastError( 0xdeadbeef ); - ok( pGetProcessDefaultLayout( &layout ), - "GetProcessDefaultLayout failed err %u\n", GetLastError ()); + res = pGetProcessDefaultLayout( &layout ); + ok( res, "GetProcessDefaultLayout failed err %u\n", GetLastError ()); ok( layout == 0, "GetProcessDefaultLayout wrong layout %x\n", layout ); SetLastError( 0xdeadbeef ); - ok( pSetProcessDefaultLayout( 7 ), - "SetProcessDefaultLayout failed err %u\n", GetLastError ()); - ok( pGetProcessDefaultLayout( &layout ), - "GetProcessDefaultLayout failed err %u\n", GetLastError ()); + res = pSetProcessDefaultLayout( 7 ); + ok( res, "SetProcessDefaultLayout failed err %u\n", GetLastError ()); + res = pGetProcessDefaultLayout( &layout ); + ok( res, "GetProcessDefaultLayout failed err %u\n", GetLastError ()); ok( layout == 7, "GetProcessDefaultLayout wrong layout %x\n", layout ); SetLastError( 0xdeadbeef ); - ok( pSetProcessDefaultLayout( LAYOUT_RTL ), - "SetProcessDefaultLayout failed err %u\n", GetLastError ()); - ok( pGetProcessDefaultLayout( &layout ), - "GetProcessDefaultLayout failed err %u\n", GetLastError ()); + res = pSetProcessDefaultLayout( LAYOUT_RTL ); + ok( res, "SetProcessDefaultLayout failed err %u\n", GetLastError ()); + res = pGetProcessDefaultLayout( &layout ); + ok( res, "GetProcessDefaultLayout failed err %u\n", GetLastError ()); ok( layout == LAYOUT_RTL, "GetProcessDefaultLayout wrong layout %x\n", layout ); hwnd = CreateWindowEx(WS_EX_APPWINDOW, "static", NULL, WS_POPUP, 0, 0, 100, 100, 0, 0, 0, NULL);

1 0

André Hentschel : kernel32/tests: Don' t test function directly when reporting GetLastError().
by Alexandre Julliard 26 Sep '11

26 Sep '11

Module: wine Branch: master Commit: 0ba0f505aff37eab3dbb581720879393216040a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ba0f505aff37eab3dbb58172… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Sep 25 20:30:38 2011 +0200 kernel32/tests: Don't test function directly when reporting GetLastError(). --- dlls/kernel32/tests/comm.c | 5 ++--- dlls/kernel32/tests/file.c | 3 ++- dlls/kernel32/tests/pipe.c | 3 ++- dlls/kernel32/tests/profile.c | 12 ++++++------ dlls/kernel32/tests/virtual.c | 8 ++++++-- 5 files changed, 18 insertions(+), 13 deletions(-) diff --git a/dlls/kernel32/tests/comm.c b/dlls/kernel32/tests/comm.c index b08174f..895a9ab 100644 --- a/dlls/kernel32/tests/comm.c +++ b/dlls/kernel32/tests/comm.c @@ -1115,9 +1115,8 @@ static void test_WaitRx(HANDLE hcom) ZeroMemory( &overlapped, sizeof(overlapped)); overlapped.hEvent = hComPortEvent; - ok((hComWriteEvent = CreateEvent( NULL, TRUE, FALSE, NULL )) !=0, - "CreateEvent res %d\n", - GetLastError()); + hComWriteEvent = CreateEvent( NULL, TRUE, FALSE, NULL ); + ok(hComWriteEvent != NULL, "CreateEvent res %d\n", GetLastError()); ZeroMemory( &overlapped_w, sizeof(overlapped_w)); overlapped_w.hEvent = hComWriteEvent; diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index df2ab37..3ed3f66 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -2393,7 +2393,8 @@ static void test_read_write(void) user_apc_ran = FALSE; if (pQueueUserAPC) { trace("Queueing an user APC\n"); /* verify the file is non alerable */ - ok(pQueueUserAPC(&user_apc, GetCurrentThread(), 0), "QueueUserAPC failed: %d\n", GetLastError()); + ret = pQueueUserAPC(&user_apc, GetCurrentThread(), 0); + ok(ret, "QueueUserAPC failed: %d\n", GetLastError()); } SetLastError(12345678); diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index 4b3566a..4fc6739 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -480,7 +480,8 @@ static DWORD CALLBACK serverThreadMain2(LPVOID arg) user_apc_ran = FALSE; if (i == 0 && pQueueUserAPC) { trace("Queueing an user APC\n"); /* verify the pipe is non alerable */ - ok(pQueueUserAPC(&user_apc, GetCurrentThread(), 0), "QueueUserAPC failed: %d\n", GetLastError()); + success = pQueueUserAPC(&user_apc, GetCurrentThread(), 0); + ok(success, "QueueUserAPC failed: %d\n", GetLastError()); } /* Wait for client to connect */ diff --git a/dlls/kernel32/tests/profile.c b/dlls/kernel32/tests/profile.c index 07b351c..44a7927 100644 --- a/dlls/kernel32/tests/profile.c +++ b/dlls/kernel32/tests/profile.c @@ -448,8 +448,8 @@ static void test_profile_delete_on_close(void) h = CreateFile(testfile, GENERIC_WRITE, FILE_SHARE_READ, NULL, CREATE_ALWAYS, FILE_FLAG_DELETE_ON_CLOSE, NULL); - ok( WriteFile( h, contents, sizeof contents - 1, &size, NULL ), - "Cannot write test file: %x\n", GetLastError() ); + res = WriteFile( h, contents, sizeof contents - 1, &size, NULL ); + ok( res, "Cannot write test file: %x\n", GetLastError() ); ok( size == sizeof contents - 1, "Test file: partial write\n"); SetLastError(0xdeadbeef); @@ -472,8 +472,8 @@ static void test_profile_refresh(void) h = CreateFile(testfile, GENERIC_WRITE, FILE_SHARE_READ, NULL, CREATE_ALWAYS, FILE_FLAG_DELETE_ON_CLOSE, NULL); - ok( WriteFile( h, contents1, sizeof contents1 - 1, &size, NULL ), - "Cannot write test file: %x\n", GetLastError() ); + res = WriteFile( h, contents1, sizeof contents1 - 1, &size, NULL ); + ok( res, "Cannot write test file: %x\n", GetLastError() ); ok( size == sizeof contents1 - 1, "Test file: partial write\n"); SetLastError(0xdeadbeef); @@ -488,8 +488,8 @@ static void test_profile_refresh(void) h = CreateFile(testfile, GENERIC_WRITE, FILE_SHARE_READ, NULL, CREATE_ALWAYS, FILE_FLAG_DELETE_ON_CLOSE, NULL); - ok( WriteFile( h, contents2, sizeof contents2 - 1, &size, NULL ), - "Cannot write test file: %x\n", GetLastError() ); + res = WriteFile( h, contents2, sizeof contents2 - 1, &size, NULL ); + ok( res, "Cannot write test file: %x\n", GetLastError() ); ok( size == sizeof contents2 - 1, "Test file: partial write\n"); SetLastError(0xdeadbeef); diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index cd5417c..a2a881f 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -598,12 +598,14 @@ static void test_MapViewOfFile(void) ptr = MapViewOfFile( mapping, FILE_MAP_WRITE, 0, 0, 0 ); if (!ptr) { + SIZE_T size; ok( GetLastError() == ERROR_ACCESS_DENIED, "Wrong error %d\n", GetLastError() ); SetLastError(0xdeadbeef); ptr = MapViewOfFile( mapping, FILE_MAP_READ, 0, 0, 0 ); ok( ptr != NULL, "MapViewOfFile FILE_MAP_READ error %u\n", GetLastError() ); SetLastError(0xdeadbeef); - ok( VirtualQuery( ptr, &info, sizeof(info) ) == sizeof(info), + size = VirtualQuery( ptr, &info, sizeof(info) ); + ok( size == sizeof(info), "VirtualQuery error %u\n", GetLastError() ); ok( info.BaseAddress == ptr, "%p != %p\n", info.BaseAddress, ptr ); ok( info.AllocationBase == ptr, "%p != %p\n", info.AllocationBase, ptr ); @@ -623,12 +625,14 @@ static void test_MapViewOfFile(void) ptr = MapViewOfFile( mapping, FILE_MAP_READ, 0, 0, 0 ); if (!ptr) { + SIZE_T size; ok( GetLastError() == ERROR_ACCESS_DENIED, "Wrong error %d\n", GetLastError() ); SetLastError(0xdeadbeef); ptr = MapViewOfFile( mapping, FILE_MAP_WRITE, 0, 0, 0 ); ok( ptr != NULL, "MapViewOfFile FILE_MAP_WRITE error %u\n", GetLastError() ); SetLastError(0xdeadbeef); - ok( VirtualQuery( ptr, &info, sizeof(info) ) == sizeof(info), + size = VirtualQuery( ptr, &info, sizeof(info) ); + ok( size == sizeof(info), "VirtualQuery error %u\n", GetLastError() ); ok( info.BaseAddress == ptr, "%p != %p\n", info.BaseAddress, ptr ); ok( info.AllocationBase == ptr, "%p != %p\n", info.AllocationBase, ptr );

1 0

André Hentschel : ntdll/tests: Don' t test function directly when reporting GetLastError().
by Alexandre Julliard 26 Sep '11

26 Sep '11

Module: wine Branch: master Commit: 55542281f5dcd0c538d0c5740f7ce13b1f92b04c URL: http://source.winehq.org/git/wine.git/?a=commit;h=55542281f5dcd0c538d0c5740… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Sep 25 20:30:40 2011 +0200 ntdll/tests: Don't test function directly when reporting GetLastError(). --- dlls/ntdll/tests/pipe.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/tests/pipe.c b/dlls/ntdll/tests/pipe.c index 8f7bd8f..6909882 100644 --- a/dlls/ntdll/tests/pipe.c +++ b/dlls/ntdll/tests/pipe.c @@ -238,8 +238,10 @@ static DWORD WINAPI thread(PVOID main_thread) Sleep(400); if (main_thread) { + DWORD ret; userapc_called = FALSE; - ok(pQueueUserAPC(&userapc, main_thread, 0), "can't queue user apc, GetLastError: %x\n", GetLastError()); + ret = pQueueUserAPC(&userapc, main_thread, 0); + ok(ret, "can't queue user apc, GetLastError: %x\n", GetLastError()); CloseHandle(main_thread); } @@ -264,6 +266,7 @@ static void test_alertable(void) HANDLE hPipe; NTSTATUS res; HANDLE hThread; + DWORD ret; memset(&iosb, 0x55, sizeof(iosb)); @@ -275,7 +278,8 @@ static void test_alertable(void) /* queue an user apc before calling listen */ userapc_called = FALSE; - ok(pQueueUserAPC(&userapc, GetCurrentThread(), 0), "can't queue user apc, GetLastError: %x\n", GetLastError()); + ret = pQueueUserAPC(&userapc, GetCurrentThread(), 0); + ok(ret, "can't queue user apc, GetLastError: %x\n", GetLastError()); res = listen_pipe(hPipe, hEvent, &iosb, TRUE); todo_wine ok(res == STATUS_CANCELLED, "NtFsControlFile returned %x\n", res); @@ -332,6 +336,7 @@ static void test_nonalertable(void) HANDLE hPipe; NTSTATUS res; HANDLE hThread; + DWORD ret; memset(&iosb, 0x55, sizeof(iosb)); @@ -345,7 +350,8 @@ static void test_nonalertable(void) ok(hThread != INVALID_HANDLE_VALUE, "can't create thread, GetLastError: %x\n", GetLastError()); userapc_called = FALSE; - ok(pQueueUserAPC(&userapc, GetCurrentThread(), 0), "can't queue user apc, GetLastError: %x\n", GetLastError()); + ret = pQueueUserAPC(&userapc, GetCurrentThread(), 0); + ok(ret, "can't queue user apc, GetLastError: %x\n", GetLastError()); res = listen_pipe(hPipe, hEvent, &iosb, TRUE); todo_wine ok(!res, "NtFsControlFile returned %x\n", res);

1 0

Andrew Eikum : winealsa.drv: Remove wave, mixer, and dsound driver code.
by Alexandre Julliard 26 Sep '11

26 Sep '11

Module: wine Branch: master Commit: 8258a5188cc36563809ac7495e49bc43ae4326e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8258a5188cc36563809ac7495… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Sep 23 15:03:51 2011 -0500 winealsa.drv: Remove wave, mixer, and dsound driver code. --- dlls/winealsa.drv/Makefile.in | 11 +- dlls/winealsa.drv/alsa.c | 755 ---------------- dlls/winealsa.drv/alsa.h | 197 ----- dlls/winealsa.drv/dscapture.c | 1095 ------------------------ dlls/winealsa.drv/dsoutput.c | 962 --------------------- dlls/winealsa.drv/midi.c | 30 +- dlls/winealsa.drv/mixer.c | 1612 ----------------------------------- dlls/winealsa.drv/mmdevdrv.c | 46 +- dlls/winealsa.drv/wavein.c | 780 ----------------- dlls/winealsa.drv/waveinit.c | 1011 ---------------------- dlls/winealsa.drv/waveout.c | 1182 ------------------------- dlls/winealsa.drv/winealsa.drv.spec | 3 - 12 files changed, 74 insertions(+), 7610 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8258a5188cc36563809ac…

1 0

Andrew Eikum : wineoss.drv: Remove wave, mixer, and dsound driver code.
by Alexandre Julliard 26 Sep '11

26 Sep '11

Module: wine Branch: master Commit: a83bc10c78aafcbf4e8472bce6a83aecdcf1ed0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a83bc10c78aafcbf4e8472bce… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Sep 23 15:03:59 2011 -0500 wineoss.drv: Remove wave, mixer, and dsound driver code. --- dlls/wineoss.drv/Makefile.in | 6 +- dlls/wineoss.drv/audio.c | 3189 ------------------------------------- dlls/wineoss.drv/audio.h | 183 --- dlls/wineoss.drv/dscapture.c | 1330 ---------------- dlls/wineoss.drv/dsrender.c | 966 ----------- dlls/wineoss.drv/midi.c | 27 +- dlls/wineoss.drv/mixer.c | 1553 ------------------ dlls/wineoss.drv/mmdevdrv.c | 2 +- dlls/wineoss.drv/wineoss.drv.spec | 3 - 9 files changed, 28 insertions(+), 7231 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a83bc10c78aafcbf4e847…

1 0