wine-commits December 2009

wine-commits@winehq.org

3 participants
1233 discussions

Eric Pouech : winedbg: In "info threads" commands, also show the name of the processes even if not debugged.
by Alexandre Julliard 30 Dec '09

30 Dec '09

Module: wine Branch: master Commit: 280259aaca74cd6652b569e6f9c7cebd1f50abee URL: http://source.winehq.org/git/wine.git/?a=commit;h=280259aaca74cd6652b569e6f… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Wed Dec 30 09:43:38 2009 +0100 winedbg: In "info threads" commands, also show the name of the processes even if not debugged. --- programs/winedbg/info.c | 30 +++++++++++++++++++++++++++--- 1 files changed, 27 insertions(+), 3 deletions(-) diff --git a/programs/winedbg/info.c b/programs/winedbg/info.c index 2afdf75..e501f43 100644 --- a/programs/winedbg/info.c +++ b/programs/winedbg/info.c @@ -475,6 +475,22 @@ void info_win32_processes(void) } } +static BOOL get_process_name(DWORD pid, PROCESSENTRY32* entry) +{ + BOOL ret = FALSE; + HANDLE snap = CreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0); + + if (snap != INVALID_HANDLE_VALUE) + { + entry->dwSize = sizeof(*entry); + if (Process32First(snap, entry)) + while (!(ret = (entry->th32ProcessID == pid)) && + Process32Next(snap, entry)); + CloseHandle(snap); + } + return ret; +} + void info_win32_threads(void) { HANDLE snap = CreateToolhelp32Snapshot(TH32CS_SNAPTHREAD, 0); @@ -500,11 +516,19 @@ void info_win32_threads(void) if (entry.th32OwnerProcessID != lastProcessId) { struct dbg_process* p = dbg_get_process(entry.th32OwnerProcessID); + PROCESSENTRY32 pcs_entry; + const char* exename; + + if (p) + exename = dbg_W2A(p->imageName, -1); + else if (get_process_name(entry.th32OwnerProcessID, &pcs_entry)) + exename = pcs_entry.szExeFile; + else + exename = ""; dbg_printf("%08x%s %s\n", - entry.th32OwnerProcessID, p ? " (D)" : "", - p ? dbg_W2A(p->imageName, -1) : ""); - lastProcessId = entry.th32OwnerProcessID; + entry.th32OwnerProcessID, p ? " (D)" : "", exename); + lastProcessId = entry.th32OwnerProcessID; } dbg_printf("\t%08x %4d%s\n", entry.th32ThreadID, entry.tpBasePri,

1 0

Christian Costa : mciqtz: Add stub for MCI_SETAUDIO.
by Alexandre Julliard 30 Dec '09

30 Dec '09

Module: wine Branch: master Commit: d0a3ef4f407fbf604e722034e098c9f837bfbfbb URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0a3ef4f407fbf604e722034e… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Wed Dec 30 09:40:29 2009 +0100 mciqtz: Add stub for MCI_SETAUDIO. --- dlls/mciqtz32/mciqtz.c | 24 +++++++++++++++++++++++- 1 files changed, 23 insertions(+), 1 deletions(-) diff --git a/dlls/mciqtz32/mciqtz.c b/dlls/mciqtz32/mciqtz.c index 354a9f5..1625a8d 100644 --- a/dlls/mciqtz32/mciqtz.c +++ b/dlls/mciqtz32/mciqtz.c @@ -604,6 +604,27 @@ static DWORD MCIQTZ_mciWhere(UINT wDevID, DWORD dwFlags, LPMCI_DGV_RECT_PARMS lp return 0; } +/*************************************************************************** + * MCIQTZ_mciSetAudio [internal] + */ +static DWORD MCIQTZ_mciSetAudio(UINT wDevID, DWORD dwFlags, LPMCI_DGV_SETAUDIO_PARMSW lpParms) +{ + WINE_MCIQTZ *wma; + + FIXME("(%04x, %08x, %p) : stub\n", wDevID, dwFlags, lpParms); + + if (!lpParms) + return MCIERR_NULL_PARAMETER_BLOCK; + + wma = MCIQTZ_mciGetOpenDev(wDevID); + if (!wma) + return MCIERR_INVALID_DEVICE_ID; + + MCIQTZ_mciStop(wDevID, MCI_WAIT, NULL); + + return 0; +} + /*======================================================================* * MCI QTZ entry points * *======================================================================*/ @@ -644,6 +665,8 @@ LRESULT CALLBACK MCIQTZ_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, case MCI_SET: return MCIQTZ_mciSet (dwDevID, dwParam1, (LPMCI_DGV_SET_PARMS) dwParam2); case MCI_STATUS: return MCIQTZ_mciStatus (dwDevID, dwParam1, (LPMCI_DGV_STATUS_PARMSW) dwParam2); case MCI_WHERE: return MCIQTZ_mciWhere (dwDevID, dwParam1, (LPMCI_DGV_RECT_PARMS) dwParam2); + /* Digital Video specific */ + case MCI_SETAUDIO: return MCIQTZ_mciSetAudio (dwDevID, dwParam1, (LPMCI_DGV_SETAUDIO_PARMSW) dwParam2); case MCI_RECORD: case MCI_PAUSE: case MCI_RESUME: @@ -666,7 +689,6 @@ LRESULT CALLBACK MCIQTZ_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, case MCI_CAPTURE: case MCI_MONITOR: case MCI_RESERVE: - case MCI_SETAUDIO: case MCI_SIGNAL: case MCI_SETVIDEO: case MCI_QUALITY:

1 0

Loïc Hoguin : winemp3.acm: mpg123_getformat must be called on MPG123_NEW_FORMAT errors for libmpg123 < 1.8.0.
by Alexandre Julliard 30 Dec '09

30 Dec '09

Module: wine Branch: master Commit: 05a258b2c9d20cfdec9d329a692f8a02204f5905 URL: http://source.winehq.org/git/wine.git/?a=commit;h=05a258b2c9d20cfdec9d329a6… Author: Loïc Hoguin <essen(a)dev-extend.eu> Date: Mon Dec 28 18:17:24 2009 +0100 winemp3.acm: mpg123_getformat must be called on MPG123_NEW_FORMAT errors for libmpg123 < 1.8.0. The documentation for libmpg123 clearly state that mpg123_getformat MUST be called if an error MPG123_NEW_FORMAT is returned, for libmpg123 < 1.8.0. On versions above that, the call is optional. The patch make sure to call that function all the time (instead of just when trace is activated) so that mp3 works in Morrowind and others. --- dlls/winemp3.acm/mpegl3.c | 11 ++++------- 1 files changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/winemp3.acm/mpegl3.c b/dlls/winemp3.acm/mpegl3.c index 2d291cf..fd06c0d 100644 --- a/dlls/winemp3.acm/mpegl3.c +++ b/dlls/winemp3.acm/mpegl3.c @@ -174,13 +174,10 @@ static void mp3_horse(PACMDRVSTREAMINSTANCE adsi, if (ret == MPG123_NEW_FORMAT) { - if TRACE_ON(mpeg3) - { - long rate; - int channels, enc; - mpg123_getformat(amd->mh, &rate, &channels, &enc); - TRACE("New format: %li Hz, %i channels, encoding value %i\n", rate, channels, enc); - } + long rate; + int channels, enc; + mpg123_getformat(amd->mh, &rate, &channels, &enc); + TRACE("New format: %li Hz, %i channels, encoding value %i\n", rate, channels, enc); } dpos += size; } while (ret == MPG123_OK);

1 0

Dmitry Timoshkov : user32: Handle virtual key codes only in the WM_KEYDOWN case.
by Alexandre Julliard 30 Dec '09

30 Dec '09

Module: wine Branch: master Commit: 2d0b2433c20040c9a56b7f867d192ce414c6d229 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d0b2433c20040c9a56b7f867… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Dec 30 13:25:45 2009 +0800 user32: Handle virtual key codes only in the WM_KEYDOWN case. Reported by David Quintana. --- dlls/user32/combo.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/user32/combo.c b/dlls/user32/combo.c index 86b5680..85e372a 100644 --- a/dlls/user32/combo.c +++ b/dlls/user32/combo.c @@ -1987,12 +1987,7 @@ LRESULT ComboWndProc_common( HWND hwnd, UINT message, WPARAM wParam, LPARAM lPar COMBO_FlipListbox( lphc, FALSE, FALSE ); return 0; - case WM_CHAR: - case WM_IME_CHAR: case WM_KEYDOWN: - { - HWND hwndTarget; - if ((wParam == VK_RETURN || wParam == VK_ESCAPE) && (lphc->wState & CBF_DROPPED)) { @@ -2004,6 +1999,11 @@ LRESULT ComboWndProc_common( HWND hwnd, UINT message, WPARAM wParam, LPARAM lPar COMBO_FlipListbox( lphc, FALSE, FALSE ); return TRUE; } + /* fall through */ + case WM_CHAR: + case WM_IME_CHAR: + { + HWND hwndTarget; if( lphc->wState & CBF_EDIT ) hwndTarget = lphc->hWndEdit;

1 0

Alexander Kochetkov : ole32/storage32: Fix return value for invalid access mode in OpenStream.
by Alexandre Julliard 30 Dec '09

30 Dec '09

Module: wine Branch: master Commit: 56bc0515c2bd095764914631d614224763dc0623 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56bc0515c2bd095764914631d… Author: Alexander Kochetkov <al.kochet(a)gmail.com> Date: Wed Dec 30 03:54:20 2009 +0300 ole32/storage32: Fix return value for invalid access mode in OpenStream. --- dlls/ole32/storage32.c | 2 +- dlls/ole32/tests/storage32.c | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 229fe76..e000535 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -448,7 +448,7 @@ static HRESULT WINAPI StorageBaseImpl_OpenStream( if(!(This->openFlags & STGM_TRANSACTED)) { if ( STGM_ACCESS_MODE( grfMode ) > STGM_ACCESS_MODE( This->openFlags ) ) { - res = STG_E_ACCESSDENIED; + res = STG_E_INVALIDFLAG; goto end; } } diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index 19c1e8f..ceca756 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -355,6 +355,19 @@ static void test_storage_stream(void) r = IStorage_Release(stg); ok(r == 0, "wrong ref count\n"); + + /* try create some invalid streams */ + stg = NULL; + stm = NULL; + r = StgOpenStorage(filename, NULL, STGM_READ | STGM_SHARE_DENY_WRITE, NULL, 0, &stg); + ok(r == S_OK, "should succeed\n"); + if (stg) + { + r = IStorage_OpenStream(stg, stmname, NULL, STGM_SHARE_EXCLUSIVE | STGM_READWRITE, 0, &stm); + ok(r == STG_E_INVALIDFLAG, "IStorage->OpenStream should return STG_E_INVALIDFLAG instead of 0x%08x\n", r); + IStorage_Release(stg); + } + r = DeleteFileA(filenameA); ok(r, "file should exist\n"); }

1 0

Michael Stefaniuc : winetest: Remove superfluous WPARAM casts.
by Alexandre Julliard 30 Dec '09

30 Dec '09

Module: wine Branch: master Commit: 75fde14ffc9310ecbd1678066062a552a7636c1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=75fde14ffc9310ecbd1678066… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Dec 29 23:16:17 2009 +0100 winetest: Remove superfluous WPARAM casts. --- programs/winetest/gui.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/winetest/gui.c b/programs/winetest/gui.c index a2b1e7f..cb59ac2 100644 --- a/programs/winetest/gui.c +++ b/programs/winetest/gui.c @@ -108,7 +108,7 @@ guiProgress (va_list ap) else progressScale = 1; pb = GetDlgItem (dialog, IDC_PB0 + progressGroup * 2); SendMessage (pb, PBM_SETRANGE, 0, MAKELPARAM (0, max)); - SendMessage (pb, PBM_SETSTEP, (WPARAM)1, 0); + SendMessage (pb, PBM_SETSTEP, 1, 0); return 0; } @@ -134,7 +134,7 @@ guiStep (va_list ap) progressCurr++; SetDlgItemText (dialog, pgID, str); SendDlgItemMessage (dialog, pgID+1, PBM_SETPOS, - (WPARAM)(progressScale * progressCurr), 0); + progressScale * progressCurr, 0); heap_free (str); return 0; } @@ -163,7 +163,7 @@ guiDelta (va_list ap) progressCurr += inc; SetDlgItemText (dialog, pgID, str); SendDlgItemMessage (dialog, pgID+1, PBM_SETPOS, - (WPARAM)(progressScale * progressCurr), 0); + progressScale * progressCurr, 0); heap_free (str); return 0; }

1 0

Marcus Meissner : user32: Initialize hICON to NULL (Coverity).
by Alexandre Julliard 30 Dec '09

30 Dec '09

Module: wine Branch: master Commit: 36f9248c1a6e1ffa406d0bf21aaa42997e790806 URL: http://source.winehq.org/git/wine.git/?a=commit;h=36f9248c1a6e1ffa406d0bf21… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Tue Dec 29 23:04:46 2009 +0100 user32: Initialize hICON to NULL (Coverity). --- dlls/user32/static.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/static.c b/dlls/user32/static.c index 5386c84..0c5f5fb 100644 --- a/dlls/user32/static.c +++ b/dlls/user32/static.c @@ -258,7 +258,7 @@ static HANDLE STATIC_GetImage( HWND hwnd, WPARAM wParam, DWORD style ) */ static HICON STATIC_LoadIconA( HINSTANCE hInstance, LPCSTR name, DWORD style ) { - HICON hicon; + HICON hicon = 0; if (hInstance && ((ULONG_PTR)hInstance >> 16)) { @@ -284,7 +284,7 @@ static HICON STATIC_LoadIconA( HINSTANCE hInstance, LPCSTR name, DWORD style ) */ static HICON STATIC_LoadIconW( HINSTANCE hInstance, LPCWSTR name, DWORD style ) { - HICON hicon; + HICON hicon = 0; if (hInstance && ((ULONG_PTR)hInstance >> 16)) {

1 0

Michael Stefaniuc : user.exe: Remove some superfluous WPARAM/LPARAM casts.
by Alexandre Julliard 30 Dec '09

30 Dec '09

Module: wine Branch: master Commit: 453cf859a8a4950ea6548ed4798beb03bead053a URL: http://source.winehq.org/git/wine.git/?a=commit;h=453cf859a8a4950ea6548ed47… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Dec 29 23:16:10 2009 +0100 user.exe: Remove some superfluous WPARAM/LPARAM casts. --- dlls/user.exe16/dialog.c | 4 ++-- dlls/user.exe16/message.c | 2 +- dlls/user.exe16/user.c | 13 ++++++------- dlls/user.exe16/window.c | 10 +++++----- 4 files changed, 14 insertions(+), 15 deletions(-) diff --git a/dlls/user.exe16/dialog.c b/dlls/user.exe16/dialog.c index 469a06f..04f2435 100644 --- a/dlls/user.exe16/dialog.c +++ b/dlls/user.exe16/dialog.c @@ -541,7 +541,7 @@ HWND16 WINAPI GetDlgItem16( HWND16 hwndDlg, INT16 id ) */ void WINAPI SetDlgItemText16( HWND16 hwnd, INT16 id, SEGPTR lpString ) { - SendDlgItemMessage16( hwnd, id, WM_SETTEXT, 0, (LPARAM)lpString ); + SendDlgItemMessage16( hwnd, id, WM_SETTEXT, 0, lpString ); } @@ -550,7 +550,7 @@ void WINAPI SetDlgItemText16( HWND16 hwnd, INT16 id, SEGPTR lpString ) */ INT16 WINAPI GetDlgItemText16( HWND16 hwnd, INT16 id, SEGPTR str, UINT16 len ) { - return (INT16)SendDlgItemMessage16( hwnd, id, WM_GETTEXT, len, (LPARAM)str ); + return SendDlgItemMessage16( hwnd, id, WM_GETTEXT, len, str ); } diff --git a/dlls/user.exe16/message.c b/dlls/user.exe16/message.c index 7dccc5f..011e5c4 100644 --- a/dlls/user.exe16/message.c +++ b/dlls/user.exe16/message.c @@ -2287,7 +2287,7 @@ static LRESULT edit_proc16( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, B (INT)(SHORT)LOWORD(lParam), FALSE ); break; case EM_LINEINDEX16: - if ((INT16)wParam == -1) wParam = (WPARAM)-1; + if ((INT16)wParam == -1) wParam = -1; result = wow_handlers32.edit_proc( hwnd, msg - msg16_offset, wParam, lParam, FALSE ); break; case EM_SETSEL16: diff --git a/dlls/user.exe16/user.c b/dlls/user.exe16/user.c index 7521c54..0b321b7 100644 --- a/dlls/user.exe16/user.c +++ b/dlls/user.exe16/user.c @@ -2743,22 +2743,21 @@ DWORD WINAPI DragObject16( HWND16 hwndScope, HWND16 hWnd, UINT16 wObj, SetCursor(hCurrentCursor); /* send WM_DRAGLOOP */ - SendMessage16( hWnd, WM_DRAGLOOP, (WPARAM16)(hCurrentCursor != hBummer), - (LPARAM) spDragInfo ); + SendMessage16( hWnd, WM_DRAGLOOP, hCurrentCursor != hBummer, spDragInfo ); /* send WM_DRAGSELECT or WM_DRAGMOVE */ if( hCurrentWnd != lpDragInfo->hScope ) { if( hCurrentWnd ) SendMessage16( hCurrentWnd, WM_DRAGSELECT, 0, - (LPARAM)MAKELONG(LOWORD(spDragInfo)+sizeof(DRAGINFO16), - HIWORD(spDragInfo)) ); + MAKELPARAM(LOWORD(spDragInfo)+sizeof(DRAGINFO16), + HIWORD(spDragInfo)) ); hCurrentWnd = lpDragInfo->hScope; if( hCurrentWnd ) - SendMessage16( hCurrentWnd, WM_DRAGSELECT, 1, (LPARAM)spDragInfo); + SendMessage16( hCurrentWnd, WM_DRAGSELECT, 1, spDragInfo); } else if( hCurrentWnd ) - SendMessage16( hCurrentWnd, WM_DRAGMOVE, 0, (LPARAM)spDragInfo); + SendMessage16( hCurrentWnd, WM_DRAGMOVE, 0, spDragInfo); } while( msg.message != WM_LBUTTONUP && msg.message != WM_NCLBUTTONUP ); @@ -2769,7 +2768,7 @@ DWORD WINAPI DragObject16( HWND16 hwndScope, HWND16 hWnd, UINT16 wObj, if( hCurrentCursor != hBummer ) msg.lParam = SendMessage16( lpDragInfo->hScope, WM_DROPOBJECT, - (WPARAM16)hWnd, (LPARAM)spDragInfo ); + hWnd, spDragInfo ); else msg.lParam = 0; GlobalFree16(hDragInfo); diff --git a/dlls/user.exe16/window.c b/dlls/user.exe16/window.c index 244924f..0bd4518 100644 --- a/dlls/user.exe16/window.c +++ b/dlls/user.exe16/window.c @@ -347,7 +347,7 @@ INT16 WINAPI GetWindowText16( HWND16 hwnd, SEGPTR lpString, INT16 nMaxCount ) */ BOOL16 WINAPI SetWindowText16( HWND16 hwnd, SEGPTR lpString ) { - return SendMessage16( hwnd, WM_SETTEXT, 0, (LPARAM)lpString ); + return SendMessage16( hwnd, WM_SETTEXT, 0, lpString ); } @@ -1475,9 +1475,9 @@ void WINAPI PaintRect16( HWND16 hwndParent, HWND16 hwnd, HDC16 hdc, HWND parent = WIN_Handle32(hwndParent), hwnd32 = WIN_Handle32(hwnd); if (!parent) return; - hbrush = SendMessageW( parent, WM_CTLCOLORMSGBOX + hbrush, (WPARAM)hdc, (LPARAM)hwnd32 ); + hbrush = SendMessageW( parent, WM_CTLCOLORMSGBOX + hbrush, hdc, (LPARAM)hwnd32 ); if (!hbrush) hbrush = DefWindowProcW( parent, WM_CTLCOLORMSGBOX + hbrush, - (WPARAM)hdc, (LPARAM)hwnd32 ); + hdc, (LPARAM)hwnd32 ); } if (hbrush) FillRect16( hdc, rect, hbrush ); } @@ -1493,9 +1493,9 @@ HBRUSH16 WINAPI GetControlBrush16( HWND16 hwnd, HDC16 hdc, UINT16 ctlType ) HWND parent = GetParent( hwnd32 ); if (!parent) parent = hwnd32; - ret = SendMessageW( parent, WM_CTLCOLORMSGBOX + ctlType, (WPARAM)hdc, (LPARAM)hwnd32 ); + ret = SendMessageW( parent, WM_CTLCOLORMSGBOX + ctlType, hdc, (LPARAM)hwnd32 ); if (!ret) ret = DefWindowProcW( parent, WM_CTLCOLORMSGBOX + ctlType, - (WPARAM)hdc, (LPARAM)hwnd32 ); + hdc, (LPARAM)hwnd32 ); return ret; }

1 0

Nikolay Sivov : user32/uitools: Fix FillRect behaviour for invalid brush passed.
by Alexandre Julliard 30 Dec '09

30 Dec '09

Module: wine Branch: master Commit: ff12594a155848ff2a12bb66e6d31ccdc16571b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff12594a155848ff2a12bb66e… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Dec 30 17:33:05 2009 +0300 user32/uitools: Fix FillRect behaviour for invalid brush passed. --- dlls/user32/tests/Makefile.in | 1 + dlls/user32/tests/uitools.c | 69 +++++++++++++++++++++++++++++++++++++++++ dlls/user32/uitools.c | 6 ++-- 3 files changed, 73 insertions(+), 3 deletions(-) diff --git a/dlls/user32/tests/Makefile.in b/dlls/user32/tests/Makefile.in index 102653f..013adf2 100644 --- a/dlls/user32/tests/Makefile.in +++ b/dlls/user32/tests/Makefile.in @@ -26,6 +26,7 @@ CTESTS = \ static.c \ sysparams.c \ text.c \ + uitools.c \ win.c \ winstation.c \ wsprintf.c diff --git a/dlls/user32/tests/uitools.c b/dlls/user32/tests/uitools.c new file mode 100644 index 0000000..c3f5508 --- /dev/null +++ b/dlls/user32/tests/uitools.c @@ -0,0 +1,69 @@ +/* Unit test suite for user interface functions + * + * Copyright 2009 Nikolay Sivov + * + * 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 "wine/test.h" +#include "winbase.h" +#include "wingdi.h" +#include "winuser.h" + +static void test_FillRect(void) +{ + HDC hdc, hdcmem; + DWORD bits[64]; + HBITMAP hbmp, oldhbmp; + COLORREF col; + HBRUSH old_brush; + RECT r; + + /* fill bitmap data with white */ + memset(bits, 0xff, sizeof(bits)); + + hdc = GetDC(0); + ok( hdc != NULL, "CreateDC rets %p\n", hdc); + /* create a memory dc */ + hdcmem = CreateCompatibleDC(hdc); + ok(hdcmem != NULL, "CreateCompatibleDC rets %p\n", hdcmem); + /* test monochrome bitmap: should always work */ + hbmp = CreateBitmap(32, 32, 1, 1, bits); + ok(hbmp != NULL, "CreateBitmap returns %p\n", hbmp); + oldhbmp = SelectObject(hdcmem, hbmp); + ok(oldhbmp != NULL, "SelectObject returned NULL\n"); /* a memdc always has a bitmap selected */ + col = GetPixel(hdcmem, 0, 0); + ok( col == 0xffffff, "GetPixel returned %08x, expected 0xffffff\n", col); + + /* select black brush */ + old_brush = SelectObject(hdcmem, GetStockObject(BLACK_BRUSH)); + r.left = r.top = 0; + r.right = r.bottom = 5; + FillRect(hdcmem, &r, 0); + SelectObject(hdcmem, old_brush); + /* bitmap filled with last selected brush */ + col = GetPixel(hdcmem, 0, 0); + ok(col == 0, "GetPixel returned %08x, expected 0\n", col); + + SelectObject(hdcmem, oldhbmp); + DeleteObject(hbmp); + DeleteDC(hdcmem); + ReleaseDC(0, hdc); +} + +START_TEST(uitools) +{ + test_FillRect(); +} diff --git a/dlls/user32/uitools.c b/dlls/user32/uitools.c index c8e9580..80490cf 100644 --- a/dlls/user32/uitools.c +++ b/dlls/user32/uitools.c @@ -1425,14 +1425,14 @@ BOOL WINAPI SubtractRect( LPRECT dest, const RECT *src1, const RECT *src2 ) */ INT WINAPI FillRect( HDC hdc, const RECT *rect, HBRUSH hbrush ) { - HBRUSH prevBrush; + HBRUSH prev_brush; if (hbrush <= (HBRUSH) (COLOR_MAX + 1)) hbrush = GetSysColorBrush( HandleToULong(hbrush) - 1 ); - if (!(prevBrush = SelectObject( hdc, hbrush ))) return 0; + prev_brush = SelectObject( hdc, hbrush ); PatBlt( hdc, rect->left, rect->top, rect->right - rect->left, rect->bottom - rect->top, PATCOPY ); - SelectObject( hdc, prevBrush ); + if (prev_brush) SelectObject( hdc, prev_brush ); return 1; }

1 0

Nikolay Sivov : user32/sysparams: Return NULL from GetSysColorBrush() for invalid index.
by Alexandre Julliard 30 Dec '09

30 Dec '09

Module: wine Branch: master Commit: 385b8dcb95b2853d452ec95d140ea5fa0c05aeef URL: http://source.winehq.org/git/wine.git/?a=commit;h=385b8dcb95b2853d452ec95d1… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue Dec 29 19:27:14 2009 +0300 user32/sysparams: Return NULL from GetSysColorBrush() for invalid index. --- dlls/user32/sysparams.c | 2 +- dlls/user32/tests/sysparams.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 09e7eb5..08dde39 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -3028,7 +3028,7 @@ HBRUSH WINAPI GetSysColorBrush( INT index ) { if (0 <= index && index < NUM_SYS_COLORS) return SysColorBrushes[index]; WARN("Unknown index(%d)\n", index ); - return GetStockObject(LTGRAY_BRUSH); + return NULL; } diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index a9b79fa..ba1c802 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -2770,7 +2770,7 @@ static void test_GetSysColorBrush(void) SetLastError(0xdeadbeef); hbr = GetSysColorBrush(-1); - todo_wine ok(hbr == NULL, "Expected NULL brush\n"); + ok(hbr == NULL, "Expected NULL brush\n"); ok(GetLastError() == 0xdeadbeef, "Expected last error not set, got %x\n", GetLastError()); /* greater than max index */ hbr = GetSysColorBrush(COLOR_MENUBAR); @@ -2778,7 +2778,7 @@ static void test_GetSysColorBrush(void) { SetLastError(0xdeadbeef); hbr = GetSysColorBrush(COLOR_MENUBAR + 1); - todo_wine ok(hbr == NULL, "Expected NULL brush\n"); + ok(hbr == NULL, "Expected NULL brush\n"); ok(GetLastError() == 0xdeadbeef, "Expected last error not set, got %x\n", GetLastError()); } else

1 0

← Newer
1
2
3
4
5
6
7
8
...
124
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 December 2009