October 2013 - Wine-Commits

Dmitry Timoshkov : winspool.drv/tests: Fix test failures under Windows 8.
by Alexandre Julliard Oct. 31, 2013

Oct. 31, 2013

Module: wine Branch: master Commit: a521990a326423b4bcd1fff21c02d3b279013ec3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a521990a326423b4bcd1fff21… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Oct 31 11:52:25 2013 +0900 winspool.drv/tests: Fix test failures under Windows 8. --- dlls/winspool.drv/tests/info.c | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c index 4ab9c89..602e6e2 100644 --- a/dlls/winspool.drv/tests/info.c +++ b/dlls/winspool.drv/tests/info.c @@ -2916,9 +2916,19 @@ static void test_OpenPrinter_defaults(void) default_size = pi->pDevMode->u1.s1.dmPaperSize; HeapFree( GetProcessHeap(), 0, pi ); + needed = 0; + SetLastError( 0xdeadbeef ); ret = AddJobA( printer, 1, NULL, 0, &needed ); ok( !ret, "got %d\n", ret ); - add_job = HeapAlloc( GetProcessHeap(), 0, needed ); + if (GetLastError() == ERROR_NOT_SUPPORTED) /* win8 */ + { + win_skip( "AddJob is not supported on this platform\n" ); + ClosePrinter( printer ); + return; + } + ok( GetLastError() == ERROR_INSUFFICIENT_BUFFER, "expected ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError() ); + ok( needed > sizeof(ADDJOB_INFO_1A), "AddJob needs %u bytes\n", needed); + add_job = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, needed ); ret = AddJobA( printer, 1, (BYTE *)add_job, needed, &needed ); ok( ret, "AddJobA() failed le=%d\n", GetLastError() );

1 0

Frédéric Delanoy : shell32/tests: Use BOOL type where appropriate.
by Alexandre Julliard Oct. 31, 2013

Oct. 31, 2013

Module: wine Branch: master Commit: c398f8ce0e7f137c4c40f40369b8064b158b94f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c398f8ce0e7f137c4c40f4036… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Oct 30 22:00:15 2013 +0100 shell32/tests: Use BOOL type where appropriate. --- dlls/shell32/tests/msg.h | 2 +- dlls/shell32/tests/progman_dde.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/tests/msg.h b/dlls/shell32/tests/msg.h index 361ccdb..a457fd4 100644 --- a/dlls/shell32/tests/msg.h +++ b/dlls/shell32/tests/msg.h @@ -106,7 +106,7 @@ static void flush_sequences(struct msg_sequence **seq, int n) } static void ok_sequence_(struct msg_sequence **seq, int sequence_index, - const struct message *expected, const char *context, int todo, + const struct message *expected, const char *context, BOOL todo, const char *file, int line) { struct msg_sequence *msg_seq = seq[sequence_index]; diff --git a/dlls/shell32/tests/progman_dde.c b/dlls/shell32/tests/progman_dde.c index 3f2adee..5b22387 100644 --- a/dlls/shell32/tests/progman_dde.c +++ b/dlls/shell32/tests/progman_dde.c @@ -363,7 +363,7 @@ static void DdeExecuteCommand(DWORD instance, HCONV hConv, const char *strCmd, H * window creation happened were not encouraging (not including * SetWindowsHookEx). */ -static void CheckWindowCreated(const char *winName, int closeWindow, int testParams) +static void CheckWindowCreated(const char *winName, BOOL closeWindow, int testParams) { HWND window = NULL; int i; @@ -387,7 +387,7 @@ static void CheckWindowCreated(const char *winName, int closeWindow, int testPar /* Check for Existence (or non-existence) of a file or group * When testing for existence of a group, groupName is not needed */ -static void CheckFileExistsInProgramGroups(const char *nameToCheck, int shouldExist, int isGroup, +static void CheckFileExistsInProgramGroups(const char *nameToCheck, BOOL shouldExist, BOOL isGroup, const char *groupName, int testParams) { char path[MAX_PATH]; @@ -469,7 +469,7 @@ static void CreateGroupTest(DWORD instance, HCONV hConv, const char *command, UI * 1. window is open */ static void ShowGroupTest(DWORD instance, HCONV hConv, const char *command, UINT expected_result, - const char *groupName, const char *windowTitle, int closeAfterShowing, int testParams) + const char *groupName, const char *windowTitle, BOOL closeAfterShowing, int testParams) { HDDEDATA hData; UINT error;

1 0

Frédéric Delanoy : opengl32/tests: Use BOOL type where appropriate.
by Alexandre Julliard Oct. 31, 2013

Oct. 31, 2013

Module: wine Branch: master Commit: eafb3d8fca609e2b16da3d583412dafa94dddfc4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eafb3d8fca609e2b16da3d583… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Oct 30 22:00:14 2013 +0100 opengl32/tests: Use BOOL type where appropriate. --- dlls/opengl32/tests/opengl.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c index 83c5256..4303d1c 100644 --- a/dlls/opengl32/tests/opengl.c +++ b/dlls/opengl32/tests/opengl.c @@ -343,7 +343,7 @@ static void test_setpixelformat(HDC winhdc) static void test_sharelists(HDC winhdc) { HGLRC hglrc1, hglrc2, hglrc3; - int res; + BOOL res; hglrc1 = wglCreateContext(winhdc); res = wglShareLists(0, 0); @@ -451,7 +451,7 @@ static void test_colorbits(HDC hdc) int iAttribRet[sizeof(iAttribList)/sizeof(iAttribList[0])]; const int iAttribs[] = { WGL_ALPHA_BITS_ARB, 1, 0 }; unsigned int nFormats; - int res; + BOOL res; int iPixelFormat = 0; if (!pwglChoosePixelFormatARB) @@ -486,7 +486,7 @@ static void test_gdi_dbuf(HDC hdc) int iAttribRet[sizeof(iAttribList)/sizeof(iAttribList[0])]; unsigned int nFormats; int iPixelFormat; - int res; + BOOL res; if (!pwglGetPixelFormatAttribivARB) { @@ -730,7 +730,8 @@ static void test_deletecontext(HWND hwnd, HDC hdc) struct wgl_thread_param thread_params; HGLRC hglrc = wglCreateContext(hdc); HANDLE thread_handle; - DWORD res, tid; + BOOL res; + DWORD tid; SetLastError(0xdeadbeef); res = wglDeleteContext(NULL);

1 0

Vincent Povirk : gdiplus: Use clip region in GdipFillPath.
by Alexandre Julliard Oct. 31, 2013

Oct. 31, 2013

Module: wine Branch: master Commit: feef61743d188698907dc0b956395788c22c4666 URL: http://source.winehq.org/git/wine.git/?a=commit;h=feef61743d188698907dc0b95… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Oct 30 11:14:12 2013 -0500 gdiplus: Use clip region in GdipFillPath. --- dlls/gdiplus/graphics.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index ad5e2be..366fa0e 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -3618,6 +3618,7 @@ static GpStatus GDI32_GdipFillPath(GpGraphics *graphics, GpBrush *brush, GpPath { INT save_state; GpStatus retval; + HRGN hrgn=NULL; if(!graphics->hdc || !brush_can_fill_path(brush)) return NotImplemented; @@ -3627,6 +3628,14 @@ static GpStatus GDI32_GdipFillPath(GpGraphics *graphics, GpBrush *brush, GpPath SetPolyFillMode(graphics->hdc, (path->fill == FillModeAlternate ? ALTERNATE : WINDING)); + retval = get_clip_hrgn(graphics, &hrgn); + + if (retval != Ok) + goto end; + + if (hrgn) + ExtSelectClipRgn(graphics->hdc, hrgn, RGN_AND); + BeginPath(graphics->hdc); retval = draw_poly(graphics, NULL, path->pathdata.Points, path->pathdata.Types, path->pathdata.Count, FALSE); @@ -3641,6 +3650,7 @@ static GpStatus GDI32_GdipFillPath(GpGraphics *graphics, GpBrush *brush, GpPath end: RestoreDC(graphics->hdc, save_state); + DeleteObject(hrgn); return retval; }

1 0

Michael Stefaniuc : winmm/tests: Avoid duplicating the tested call in the ok() message.
by Alexandre Julliard Oct. 31, 2013

Oct. 31, 2013

Module: wine Branch: master Commit: d9efd9f67e8d415ee86db8793f2b12089e3dc730 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9efd9f67e8d415ee86db8793… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Oct 31 00:59:33 2013 +0100 winmm/tests: Avoid duplicating the tested call in the ok() message. --- dlls/winmm/tests/mci.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/winmm/tests/mci.c b/dlls/winmm/tests/mci.c index d95a0a7..867b377 100644 --- a/dlls/winmm/tests/mci.c +++ b/dlls/winmm/tests/mci.c @@ -397,12 +397,13 @@ static void test_openCloseWAVE(HWND hwnd) parm.sys.dwRetSize = sizeof(DWORD); parm.sys.wDeviceType = MCI_DEVTYPE_WAVEFORM_AUDIO; /* ignored */ err = mciSendCommand(MCI_ALL_DEVICE_ID, MCI_SYSINFO, MCI_SYSINFO_QUANTITY | MCI_WAIT, (DWORD_PTR)&parm); - ok(!err,"mciSendCommand(MCI_ALL_DEVICE_ID, MCI_SYSINFO QUANTITY, MCI_WAIT, 0) returned %s\n", dbg_mcierr(err)); + ok(!err, "mciCommand sysinfo all quantity returned %s\n", dbg_mcierr(err)); if(!err) ok(atoi(buf)==intbuf[1],"sysinfo all quantity string and command differ\n"); parm.sys.dwRetSize = sizeof(DWORD)-1; err = mciSendCommand(MCI_ALL_DEVICE_ID, MCI_SYSINFO, MCI_SYSINFO_QUANTITY, (DWORD_PTR)&parm); - ok(err==MCIERR_PARAM_OVERFLOW || broken(!err/* Win9x */),"mciSendCommand MCI_SYSINFO with too small buffer returned %s\n", dbg_mcierr(err)); + ok(err == MCIERR_PARAM_OVERFLOW || broken(!err/* Win9x */), + "mciCommand sysinfo with too small buffer returned %s\n", dbg_mcierr(err)); err = mciSendStringA("open new type waveaudio alias r shareable", buf, sizeof(buf), NULL); ok(err==MCIERR_UNSUPPORTED_FUNCTION,"mci open new shareable returned %s\n", dbg_mcierr(err)); @@ -603,14 +604,14 @@ static void test_openCloseWAVE(HWND hwnd) * making for funny test cases. */ err = mciSendCommand(MCI_ALL_DEVICE_ID, MCI_CLOSE, MCI_WAIT, 0); /* from MSDN */ - ok(!err,"mciSendCommand(MCI_ALL_DEVICE_ID, MCI_CLOSE, MCI_WAIT, 0) returned %s\n", dbg_mcierr(err)); + ok(!err, "mciCommand close returned %s\n", dbg_mcierr(err)); err = mciSendCommand(MCI_ALL_DEVICE_ID, MCI_CLOSE, MCI_NOTIFY, 0); - ok(!err,"mciSendCommand(MCI_ALL_DEVICE_ID, MCI_CLOSE, MCI_NOTIFY, 0) returned %s\n", dbg_mcierr(err)); + ok(!err, "mciCommand close returned %s\n", dbg_mcierr(err)); parm.gen.dwCallback = (DWORD_PTR)hwnd; err = mciSendCommand(MCI_ALL_DEVICE_ID, MCI_CLOSE, MCI_NOTIFY, (DWORD_PTR)&parm); - ok(!err,"mciSendCommand(MCI_ALL_DEVICE_ID, MCI_CLOSE, MCI_NOTIFY, hwnd) returned %s\n", dbg_mcierr(err)); + ok(!err, "mciCommand close returned %s\n", dbg_mcierr(err)); test_notification(hwnd, command_close_all, 0); /* None left */ } @@ -1184,7 +1185,7 @@ static void test_AutoOpenWAVE(HWND hwnd) parm.sys.dwRetSize = 2*sizeof(DWORD); /* only one DWORD is used */ parm.sys.wDeviceType = MCI_DEVTYPE_WAVEFORM_AUDIO; err = mciSendCommand(0, MCI_SYSINFO, MCI_SYSINFO_QUANTITY | MCI_SYSINFO_OPEN, (DWORD_PTR)&parm); - ok(!err,"mciSendCommand(0(WAVEAUDIO), MCI_SYSINFO, OPEN | MCI_NOTIFY) returned %s\n", dbg_mcierr(err)); + ok(!err, "mciCommand sysinfo waveaudio open notify returned %s\n", dbg_mcierr(err)); if(!err) ok(atoi(buf)==intbuf[1],"sysinfo waveaudio quantity open string and command differ\n"); err = mciSendStringA("sysinfo waveaudio name 1 open notify", buf, sizeof(buf), hwnd);

1 0

Vincent Povirk : gdiplus: Use clip region in GdipDrawPath.
by Alexandre Julliard Oct. 31, 2013

Oct. 31, 2013

Module: wine Branch: master Commit: 08b650202cf9dccd94be8ec9d73564ae539620db URL: http://source.winehq.org/git/wine.git/?a=commit;h=08b650202cf9dccd94be8ec9d… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Oct 30 11:13:46 2013 -0500 gdiplus: Use clip region in GdipDrawPath. --- dlls/gdiplus/graphics.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 1b9d0e9..ad5e2be 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -3342,6 +3342,7 @@ GpStatus WINGDIPAPI GdipDrawPath(GpGraphics *graphics, GpPen *pen, GpPath *path) { INT save_state; GpStatus retval; + HRGN hrgn=NULL; TRACE("(%p, %p, %p)\n", graphics, pen, path); @@ -3359,10 +3360,20 @@ GpStatus WINGDIPAPI GdipDrawPath(GpGraphics *graphics, GpPen *pen, GpPath *path) save_state = prepare_dc(graphics, pen); + retval = get_clip_hrgn(graphics, &hrgn); + + if (retval != Ok) + goto end; + + if (hrgn) + ExtSelectClipRgn(graphics->hdc, hrgn, RGN_AND); + retval = draw_poly(graphics, pen, path->pathdata.Points, path->pathdata.Types, path->pathdata.Count, TRUE); +end: restore_dc(graphics, save_state); + DeleteObject(hrgn); return retval; }

1 0

Michael Stefaniuc : winmm/tests: Fix the includes for generated.c.
by Alexandre Julliard Oct. 31, 2013

Oct. 31, 2013

Module: wine Branch: master Commit: 3101b50121c666c35debfc04ef73d6a72a32ffca URL: http://source.winehq.org/git/wine.git/?a=commit;h=3101b50121c666c35debfc04e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Oct 31 01:07:26 2013 +0100 winmm/tests: Fix the includes for generated.c. --- dlls/winmm/tests/generated.c | 3 ++- tools/winapi/tests.dat | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/winmm/tests/generated.c b/dlls/winmm/tests/generated.c index ae51c64..ccad9a7 100644 --- a/dlls/winmm/tests/generated.c +++ b/dlls/winmm/tests/generated.c @@ -11,7 +11,8 @@ #define WINE_NOWINSOCK -#include "windows.h" +#include "windef.h" +#include "mmsystem.h" #include "wine/test.h" diff --git a/tools/winapi/tests.dat b/tools/winapi/tests.dat index 68d95f7..08474ee 100644 --- a/tools/winapi/tests.dat +++ b/tools/winapi/tests.dat @@ -1737,7 +1737,8 @@ mmsystem.h %include -"windows.h" +"windef.h" +"mmsystem.h" %type

1 0

Michael Stefaniuc : winmm/tests: Use the explicit mciSendCommandA() version .
by Alexandre Julliard Oct. 31, 2013

Oct. 31, 2013

Module: wine Branch: master Commit: e31d53616f152e8815e59f81f2948c0f97f03ff1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e31d53616f152e8815e59f81f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Oct 31 01:02:08 2013 +0100 winmm/tests: Use the explicit mciSendCommandA() version. --- dlls/winmm/tests/mci.c | 77 ++++++++++++++++++++++---------------------- dlls/winmm/tests/mcicda.c | 78 ++++++++++++++++++++++---------------------- 2 files changed, 78 insertions(+), 77 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e31d53616f152e8815e59…

1 0

Frédéric Delanoy : opengl32: Use BOOL type where appropriate.
by Alexandre Julliard Oct. 31, 2013

Oct. 31, 2013

Module: wine Branch: master Commit: 129df098a27cd26100dc6c0a92b64d59e5a838b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=129df098a27cd26100dc6c0a9… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Oct 30 22:00:12 2013 +0100 opengl32: Use BOOL type where appropriate. --- dlls/opengl32/wgl.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index 361a1ec..1a9b1b4 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -588,7 +588,7 @@ INT WINAPI wglGetPixelFormat(HDC hdc) BOOL WINAPI wglSetPixelFormat( HDC hdc, INT format, const PIXELFORMATDESCRIPTOR *descr ) { struct opengl_funcs *funcs = get_dc_funcs( hdc ); - if (!funcs) return 0; + if (!funcs) return FALSE; return funcs->wgl.p_wglSetPixelFormat( hdc, format, descr ); }

1 0

Frédéric Delanoy : msvcrt: Use BOOL type where appropriate.
by Alexandre Julliard Oct. 31, 2013

Oct. 31, 2013

Module: wine Branch: master Commit: 508365a2c1df219f70d9b0ecb40b6b08f208b7b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=508365a2c1df219f70d9b0ecb… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Oct 30 22:00:11 2013 +0100 msvcrt: Use BOOL type where appropriate. --- dlls/msvcrt/cppexcept.h | 2 +- dlls/msvcrt/wcs.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/cppexcept.h b/dlls/msvcrt/cppexcept.h index 7947a17..16a6e16 100644 --- a/dlls/msvcrt/cppexcept.h +++ b/dlls/msvcrt/cppexcept.h @@ -41,7 +41,7 @@ typedef struct __exception { const vtable_ptr *vtable; char *name; /* Name of this exception, always a new copy for each object */ - int do_free; /* Whether to free 'name' in our dtor */ + BOOL do_free; /* Whether to free 'name' in our dtor */ } exception; typedef void (*cxx_copy_ctor)(void); diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 97d916f..3f85a84 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1895,7 +1895,7 @@ MSVCRT_wchar_t* CDECL MSVCRT_wcsstr(const MSVCRT_wchar_t *str, const MSVCRT_wcha __int64 CDECL _wtoi64_l(const MSVCRT_wchar_t *str, MSVCRT__locale_t locale) { ULONGLONG RunningTotal = 0; - char bMinus = 0; + BOOL bMinus = FALSE; while (isspaceW(*str)) { str++; @@ -1904,7 +1904,7 @@ __int64 CDECL _wtoi64_l(const MSVCRT_wchar_t *str, MSVCRT__locale_t locale) if (*str == '+') { str++; } else if (*str == '-') { - bMinus = 1; + bMinus = TRUE; str++; } /* if */

1 0