August 2016 - Wine-Commits - list.winehq.org

Sebastian Lackner : gdi32/enhmfdrv: Remove unused debug channel.
by Alexandre Julliard Aug. 1, 2016

Aug. 1, 2016

Module: wine Branch: master Commit: aa4a1e17a28df648c7657375f1ce90eb4590b8b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa4a1e17a28df648c7657375f… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sun Jul 31 19:59:28 2016 +0200 gdi32/enhmfdrv: Remove unused debug channel. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/enhmfdrv/dc.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/gdi32/enhmfdrv/dc.c b/dlls/gdi32/enhmfdrv/dc.c index 64c6136..91fde55 100644 --- a/dlls/gdi32/enhmfdrv/dc.c +++ b/dlls/gdi32/enhmfdrv/dc.c @@ -21,9 +21,6 @@ #include <assert.h> #include "enhmfdrv/enhmetafiledrv.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(enhmetafile); /* get the emf physdev from the path physdev */ static inline PHYSDEV get_emfdev( PHYSDEV path )

1 0

Michael Stefaniuc : comctl32/tests: Avoid using memset() on RECTs.
by Alexandre Julliard Aug. 1, 2016

Aug. 1, 2016

Module: wine Branch: master Commit: 61a6f98a9e5f4b0e1e86c787195334f78c7be1a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61a6f98a9e5f4b0e1e86c7871… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sat Jul 30 21:55:12 2016 +0200 comctl32/tests: Avoid using memset() on RECTs. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/listview.c | 11 ++++------- dlls/comctl32/tests/trackbar.c | 4 ++-- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 1444a9f..549dc21 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -890,8 +890,7 @@ static void test_images(void) r = SendMessageA(hwnd, LVM_INSERTITEMA, 0, (LPARAM) &item); ok(r == 0, "should not fail\n"); - memset(&r1, 0, sizeof r1); - r1.left = LVIR_ICON; + SetRect(&r1, LVIR_ICON, 0, 0, 0); r = SendMessageA(hwnd, LVM_GETITEMRECT, 0, (LPARAM) &r1); expect(1, r); @@ -903,8 +902,7 @@ static void test_images(void) r = SendMessageA(hwnd, LVM_INSERTITEMA, 0, (LPARAM) &item); ok(r == 0, "should not fail\n"); - memset(&r2, 0, sizeof r2); - r2.left = LVIR_ICON; + SetRect(&r2, LVIR_ICON, 0, 0, 0); r = SendMessageA(hwnd, LVM_GETITEMRECT, 0, (LPARAM) &r2); expect(1, r); @@ -3605,8 +3603,7 @@ static void test_hittest(void) r = SendMessageA(hwnd, LVM_SETCOLUMNWIDTH, 1, MAKELPARAM(100, 0)); expect(TRUE, r); - memset(&bounds, 0, sizeof(bounds)); - bounds.left = LVIR_BOUNDS; + SetRect(&bounds, LVIR_BOUNDS, 0, 0, 0); r = SendMessageA(hwnd, LVM_GETITEMRECT, 0, (LPARAM)&bounds); expect(1, r); ok(bounds.bottom - bounds.top > 0, "Expected non zero item height\n"); @@ -3834,7 +3831,7 @@ static void test_getitemposition(void) expect(TRUE, r); ok_sequence(sequences, LISTVIEW_SEQ_INDEX, getitemposition_seq2, "get item position 2", TRUE); - memset(&rect, 0, sizeof(rect)); + SetRectEmpty(&rect); SendMessageA(header, HDM_GETITEMRECT, 0, (LPARAM)&rect); /* some padding? */ expect(2, pt.x); diff --git a/dlls/comctl32/tests/trackbar.c b/dlls/comctl32/tests/trackbar.c index 918cf1a..28af8c5 100644 --- a/dlls/comctl32/tests/trackbar.c +++ b/dlls/comctl32/tests/trackbar.c @@ -655,8 +655,8 @@ static void test_position(void) oldproc = (WNDPROC)SetWindowLongPtrA(hWndTrackbar, GWLP_WNDPROC, (LONG_PTR)trackbar_no_wmpaint_proc); SetWindowLongPtrA(hWndTrackbar, GWLP_USERDATA, (LONG_PTR)oldproc); - memset(&rect, 0, sizeof(rect)); - memset(&rect2, 0, sizeof(rect2)); + SetRectEmpty(&rect); + SetRectEmpty(&rect2); SendMessageA(hWndTrackbar, TBM_GETTHUMBRECT, 0, (LPARAM)&rect);

1 0

Nikolay Sivov : include: TVS_EX_NOSINGLECOLLAPSE is documented.
by Alexandre Julliard Aug. 1, 2016

Aug. 1, 2016

Module: wine Branch: master Commit: 86ac45836d1d4327070fa1582ef37fdd6e29ea84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86ac45836d1d4327070fa1582… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jul 31 01:48:15 2016 +0300 include: TVS_EX_NOSINGLECOLLAPSE is documented. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/explorerframe/explorerframe_main.h | 3 --- dlls/explorerframe/tests/nstc.c | 3 --- include/commctrl.h | 1 + 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/dlls/explorerframe/explorerframe_main.h b/dlls/explorerframe/explorerframe_main.h index 44e7253..e6cea63 100644 --- a/dlls/explorerframe/explorerframe_main.h +++ b/dlls/explorerframe/explorerframe_main.h @@ -25,9 +25,6 @@ #include "shlobj.h" -/* Not declared in commctrl.h ("for internal use (msdn)") */ -#define TVS_EX_NOSINGLECOLLAPSE 0x0001 - extern HINSTANCE explorerframe_hinstance DECLSPEC_HIDDEN; extern LONG EFRAME_refCount DECLSPEC_HIDDEN; diff --git a/dlls/explorerframe/tests/nstc.c b/dlls/explorerframe/tests/nstc.c index 54365b0..1d1673c 100644 --- a/dlls/explorerframe/tests/nstc.c +++ b/dlls/explorerframe/tests/nstc.c @@ -30,9 +30,6 @@ static HWND hwnd; -/* "Intended for internal use" */ -#define TVS_EX_NOSINGLECOLLAPSE 0x1 - static HRESULT (WINAPI *pSHCreateShellItem)(LPCITEMIDLIST,IShellFolder*,LPCITEMIDLIST,IShellItem**); static HRESULT (WINAPI *pSHGetIDListFromObject)(IUnknown*, PIDLIST_ABSOLUTE*); static HRESULT (WINAPI *pSHCreateItemFromParsingName)(PCWSTR,IBindCtx*,REFIID,void**); diff --git a/include/commctrl.h b/include/commctrl.h index aa33cab..7d6f5c5 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -2409,6 +2409,7 @@ static const WCHAR WC_TREEVIEWW[] = { 'S','y','s', #define TVS_SHAREDIMAGELISTS 0x0000 #define TVS_PRIVATEIMAGELISTS 0x0400 +#define TVS_EX_NOSINGLECOLLAPSE 0x0001 #define TVS_EX_MULTISELECT 0x0002 #define TVS_EX_DOUBLEBUFFER 0x0004 #define TVS_EX_NOINDENTSTATE 0x0008

1 0

Francois Gouget : ntoskrnl.exe: Add a trailing '\n' to a FIXME() message.
by Alexandre Julliard Aug. 1, 2016

Aug. 1, 2016

Module: wine Branch: master Commit: 0be7d7fad864f7d8d2cf5dfe57ac5997a1ae8ebb URL: http://source.winehq.org/git/wine.git/?a=commit;h=0be7d7fad864f7d8d2cf5dfe5… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Jul 29 12:55:12 2016 +0200 ntoskrnl.exe: Add a trailing '\n' to a FIXME() message. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index dc19dee..9acfeaa 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -838,7 +838,7 @@ static void build_driver_keypath( const WCHAR *name, UNICODE_STRING *keypath ) if (strncmpW( name, driverW, strlenW(driverW) ) == 0) name += strlenW(driverW); else - FIXME( "Driver name %s does not properly begin with \\Driver\\", debugstr_w(name) ); + FIXME( "Driver name %s does not properly begin with \\Driver\\\n", debugstr_w(name) ); str = HeapAlloc( GetProcessHeap(), 0, sizeof(servicesW) + strlenW(name)*sizeof(WCHAR)); lstrcpyW( str, servicesW );

1 0

Sebastian Lackner : winetest: Remove duplicate if check.
by Alexandre Julliard Aug. 1, 2016

Aug. 1, 2016

Module: wine Branch: master Commit: 13aa0c0419679beb5026f37820c1ad7e9d57fa59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=13aa0c0419679beb5026f3782… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sun Jul 31 20:04:10 2016 +0200 winetest: Remove duplicate if check. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winetest/gui.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/programs/winetest/gui.c b/programs/winetest/gui.c index a8bcf05..2948d7e 100644 --- a/programs/winetest/gui.c +++ b/programs/winetest/gui.c @@ -547,8 +547,7 @@ report (enum report_type t, ...) } va_start (ap, t); - if (t < sizeof text_funcs / sizeof text_funcs[0] && - t < sizeof GUI_funcs / sizeof GUI_funcs[0]) ret = funcs[t](ap); + if (t < sizeof text_funcs / sizeof text_funcs[0]) ret = funcs[t](ap); else report (R_WARNING, "unimplemented report type: %d", t); va_end (ap); return ret;

1 0

Michael Stefaniuc : comctl32/tests: Use SetRectEmpty() instead of SetRect( ).
by Alexandre Julliard Aug. 1, 2016

Aug. 1, 2016

Module: wine Branch: master Commit: b9f552cbec66b524b702f265fe08a5ff68db050e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9f552cbec66b524b702f265f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sat Jul 30 21:57:40 2016 +0200 comctl32/tests: Use SetRectEmpty() instead of SetRect(). Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/tooltips.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/tooltips.c b/dlls/comctl32/tests/tooltips.c index feb74ad..3d5ca9a 100644 --- a/dlls/comctl32/tests/tooltips.c +++ b/dlls/comctl32/tests/tooltips.c @@ -1028,7 +1028,7 @@ static void test_margin(void) ret = SendMessageA(hwnd, TTM_SETMARGIN, 0, (LPARAM)&r); ok(!ret, "got %d\n", ret); - SetRect(&r1, 0, 0, 0, 0); + SetRectEmpty(&r1); ret = SendMessageA(hwnd, TTM_GETMARGIN, 0, (LPARAM)&r1); ok(!ret, "got %d\n", ret); ok(EqualRect(&r, &r1), "got %s, was %s\n", wine_dbgstr_rect(&r1), wine_dbgstr_rect(&r)); @@ -1036,7 +1036,7 @@ static void test_margin(void) ret = SendMessageA(hwnd, TTM_SETMARGIN, 0, 0); ok(!ret, "got %d\n", ret); - SetRect(&r1, 0, 0, 0, 0); + SetRectEmpty(&r1); ret = SendMessageA(hwnd, TTM_GETMARGIN, 0, (LPARAM)&r1); ok(!ret, "got %d\n", ret); ok(EqualRect(&r, &r1), "got %s, was %s\n", wine_dbgstr_rect(&r1), wine_dbgstr_rect(&r));

1 0

Bruno Jesus : mcicda: Use a helper to read the CD-ROM TOC.
by Alexandre Julliard Aug. 1, 2016

Aug. 1, 2016

Module: wine Branch: master Commit: 9b13bb2296cfde41629ce87dcfcf9663cde57341 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b13bb2296cfde41629ce87dc… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sat Jul 30 21:54:28 2016 -0300 mcicda: Use a helper to read the CD-ROM TOC. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mcicda/mcicda.c | 59 ++++++++++++++++++++++++---------------------------- 1 file changed, 27 insertions(+), 32 deletions(-) diff --git a/dlls/mcicda/mcicda.c b/dlls/mcicda/mcicda.c index 234e4e1..18881ef 100644 --- a/dlls/mcicda/mcicda.c +++ b/dlls/mcicda/mcicda.c @@ -253,6 +253,18 @@ static void MCICDA_Notify(DWORD_PTR hWndCallBack, WINE_MCICDAUDIO* wmcda, UINT w } /************************************************************************** + * MCICDA_ReadTOC [internal] + */ +static BOOL MCICDA_ReadTOC(WINE_MCICDAUDIO* wmcda, CDROM_TOC *toc, DWORD *br) +{ + if (!device_io(wmcda->handle, IOCTL_CDROM_READ_TOC, NULL, 0, toc, sizeof(*toc), br, NULL)) { + WARN("error reading TOC !\n"); + return FALSE; + } + return TRUE; +} + +/************************************************************************** * MCICDA_GetStatus [internal] */ static DWORD MCICDA_GetStatus(WINE_MCICDAUDIO* wmcda) @@ -722,11 +734,9 @@ static DWORD MCICDA_Status(UINT wDevID, DWORD dwFlags, LPMCI_STATUS_PARMS lpParm TRACE("CURRENT_TRACK=%lu\n", lpParms->dwReturn); break; case MCI_STATUS_LENGTH: - if (!device_io(wmcda->handle, IOCTL_CDROM_READ_TOC, NULL, 0, - &toc, sizeof(toc), &br, NULL)) { - WARN("error reading TOC !\n"); + if (!MCICDA_ReadTOC(wmcda, &toc, &br)) return MCICDA_GetError(wmcda); - } + if (dwFlags & MCI_TRACK) { TRACE("MCI_TRACK #%u LENGTH=??? !\n", lpParms->dwTrack); if (lpParms->dwTrack < toc.FirstTrack || lpParms->dwTrack > toc.LastTrack) @@ -764,11 +774,9 @@ static DWORD MCICDA_Status(UINT wDevID, DWORD dwFlags, LPMCI_STATUS_PARMS lpParm ret = MCI_RESOURCE_RETURNED; break; case MCI_STATUS_NUMBER_OF_TRACKS: - if (!device_io(wmcda->handle, IOCTL_CDROM_READ_TOC, NULL, 0, - &toc, sizeof(toc), &br, NULL)) { - WARN("error reading TOC !\n"); + if (!MCICDA_ReadTOC(wmcda, &toc, &br)) return MCICDA_GetError(wmcda); - } + lpParms->dwReturn = toc.LastTrack - toc.FirstTrack + 1; TRACE("MCI_STATUS_NUMBER_OF_TRACKS = %lu\n", lpParms->dwReturn); if (lpParms->dwReturn == (WORD)-1) @@ -777,20 +785,16 @@ static DWORD MCICDA_Status(UINT wDevID, DWORD dwFlags, LPMCI_STATUS_PARMS lpParm case MCI_STATUS_POSITION: switch (dwFlags & (MCI_STATUS_START | MCI_TRACK)) { case MCI_STATUS_START: - if (!device_io(wmcda->handle, IOCTL_CDROM_READ_TOC, NULL, 0, - &toc, sizeof(toc), &br, NULL)) { - WARN("error reading TOC !\n"); + if (!MCICDA_ReadTOC(wmcda, &toc, &br)) return MCICDA_GetError(wmcda); - } + lpParms->dwReturn = FRAME_OF_TOC(toc, toc.FirstTrack); TRACE("get MCI_STATUS_START !\n"); break; case MCI_TRACK: - if (!device_io(wmcda->handle, IOCTL_CDROM_READ_TOC, NULL, 0, - &toc, sizeof(toc), &br, NULL)) { - WARN("error reading TOC !\n"); + if (!MCICDA_ReadTOC(wmcda, &toc, &br)) return MCICDA_GetError(wmcda); - } + if (lpParms->dwTrack < toc.FirstTrack || lpParms->dwTrack > toc.LastTrack) return MCIERR_OUTOFRANGE; lpParms->dwReturn = FRAME_OF_TOC(toc, lpParms->dwTrack); @@ -835,11 +839,9 @@ static DWORD MCICDA_Status(UINT wDevID, DWORD dwFlags, LPMCI_STATUS_PARMS lpParm if (!(dwFlags & MCI_TRACK)) ret = MCIERR_MISSING_PARAMETER; else { - if (!device_io(wmcda->handle, IOCTL_CDROM_READ_TOC, NULL, 0, - &toc, sizeof(toc), &br, NULL)) { - WARN("error reading TOC !\n"); + if (!MCICDA_ReadTOC(wmcda, &toc, &br)) return MCICDA_GetError(wmcda); - } + if (lpParms->dwTrack < toc.FirstTrack || lpParms->dwTrack > toc.LastTrack) ret = MCIERR_OUTOFRANGE; else @@ -867,11 +869,9 @@ static DWORD MCICDA_SkipDataTracks(WINE_MCICDAUDIO* wmcda,DWORD *frame) int i; DWORD br; CDROM_TOC toc; - if (!device_io(wmcda->handle, IOCTL_CDROM_READ_TOC, NULL, 0, - &toc, sizeof(toc), &br, NULL)) { - WARN("error reading TOC !\n"); + if (!MCICDA_ReadTOC(wmcda, &toc, &br)) return MCICDA_GetError(wmcda); - } + if (*frame < FRAME_OF_TOC(toc,toc.FirstTrack) || *frame >= FRAME_OF_TOC(toc,toc.LastTrack+1)) /* lead-out */ return MCIERR_OUTOFRANGE; @@ -914,11 +914,8 @@ static DWORD MCICDA_Play(UINT wDevID, DWORD dwFlags, LPMCI_PLAY_PARMS lpParms) if (wmcda == NULL) return MCIERR_INVALID_DEVICE_ID; - if (!device_io(wmcda->handle, IOCTL_CDROM_READ_TOC, NULL, 0, - &toc, sizeof(toc), &br, NULL)) { - WARN("error reading TOC !\n"); + if (!MCICDA_ReadTOC(wmcda, &toc, &br)) return MCICDA_GetError(wmcda); - } if (dwFlags & MCI_FROM) { start = MCICDA_CalcFrame(wmcda, lpParms->dwFrom); @@ -1198,11 +1195,9 @@ static DWORD MCICDA_Seek(UINT wDevID, DWORD dwFlags, LPMCI_SEEK_PARMS lpParms) * then only checks the position flags, then stops and seeks. */ MCICDA_Stop(wDevID, MCI_WAIT, 0); - if (!device_io(wmcda->handle, IOCTL_CDROM_READ_TOC, NULL, 0, - &toc, sizeof(toc), &br, NULL)) { - WARN("error reading TOC !\n"); + if (!MCICDA_ReadTOC(wmcda, &toc, &br)) return MCICDA_GetError(wmcda); - } + switch (position) { case MCI_SEEK_TO_START: TRACE("Seeking to start\n");

1 0