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

Vincent Povirk : gdiplus: Add error checking to GdipClonePen.
by Alexandre Julliard Aug. 15, 2013

Aug. 15, 2013

Module: wine Branch: master Commit: dc047ecdaaee5e2b2dae6e665b51dc57764b2091 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc047ecdaaee5e2b2dae6e665… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Aug 14 16:34:25 2013 -0500 gdiplus: Add error checking to GdipClonePen. --- dlls/gdiplus/pen.c | 23 ++++++++++++++++++++--- 1 files changed, 20 insertions(+), 3 deletions(-) diff --git a/dlls/gdiplus/pen.c b/dlls/gdiplus/pen.c index a022cfb..80ede40 100644 --- a/dlls/gdiplus/pen.c +++ b/dlls/gdiplus/pen.c @@ -87,6 +87,8 @@ static GpPenType bt_to_pt(GpBrushType bt) GpStatus WINGDIPAPI GdipClonePen(GpPen *pen, GpPen **clonepen) { + GpStatus stat; + TRACE("(%p, %p)\n", pen, clonepen); if(!pen || !clonepen) @@ -97,9 +99,24 @@ GpStatus WINGDIPAPI GdipClonePen(GpPen *pen, GpPen **clonepen) **clonepen = *pen; - GdipCloneCustomLineCap(pen->customstart, &(*clonepen)->customstart); - GdipCloneCustomLineCap(pen->customend, &(*clonepen)->customend); - GdipCloneBrush(pen->brush, &(*clonepen)->brush); + (*clonepen)->customstart = NULL; + (*clonepen)->customend = NULL; + (*clonepen)->brush = NULL; + + stat = GdipCloneBrush(pen->brush, &(*clonepen)->brush); + + if (stat == Ok && pen->customstart) + stat = GdipCloneCustomLineCap(pen->customstart, &(*clonepen)->customstart); + + if (stat == Ok && pen->customend) + stat = GdipCloneCustomLineCap(pen->customend, &(*clonepen)->customend); + + if (stat != Ok) + { + GdipDeletePen(*clonepen); + *clonepen = NULL; + return stat; + } TRACE("<-- %p\n", *clonepen);

1 0

Jacek Caban : urlmon: Added support for ROT in BindToObject.
by Alexandre Julliard Aug. 15, 2013

Aug. 15, 2013

Module: wine Branch: master Commit: 1c66fdd03b50e8ce8891609ab0d0ea11aae48355 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c66fdd03b50e8ce8891609ab… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 13 10:41:51 2013 +0200 urlmon: Added support for ROT in BindToObject. --- dlls/urlmon/umon.c | 17 ++++++++++++++++- 1 files changed, 16 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/umon.c b/dlls/urlmon/umon.c index 5cb3631..9e46319 100644 --- a/dlls/urlmon/umon.c +++ b/dlls/urlmon/umon.c @@ -233,7 +233,22 @@ static HRESULT WINAPI URLMoniker_BindToObject(IMoniker *iface, IBindCtx* pbc, IM hres = IBindCtx_GetRunningObjectTable(pbc, &obj_tbl); if(SUCCEEDED(hres)) { - FIXME("use running object table\n"); + hres = IRunningObjectTable_IsRunning(obj_tbl, &This->IMoniker_iface); + if(hres == S_OK) { + IUnknown *unk = NULL; + + TRACE("Found in running object table\n"); + + hres = IRunningObjectTable_GetObject(obj_tbl, &This->IMoniker_iface, &unk); + if(SUCCEEDED(hres)) { + hres = IUnknown_QueryInterface(unk, riid, ppv); + IUnknown_Release(unk); + } + + IRunningObjectTable_Release(obj_tbl); + return hres; + } + IRunningObjectTable_Release(obj_tbl); }

1 0

Daniel Jelinski : shell32: Fix context menu creation.
by Alexandre Julliard Aug. 15, 2013

Aug. 15, 2013

Module: wine Branch: master Commit: c687b4adf4d6c0232270f8845c5314bcca538b29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c687b4adf4d6c0232270f8845… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Sat Aug 10 18:53:29 2013 +0200 shell32: Fix context menu creation. --- dlls/shell32/shlview_cmenu.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shlview_cmenu.c b/dlls/shell32/shlview_cmenu.c index 92f671a..07c33d0 100644 --- a/dlls/shell32/shlview_cmenu.c +++ b/dlls/shell32/shlview_cmenu.c @@ -160,10 +160,10 @@ static HRESULT WINAPI ItemMenu_QueryContextMenu( mi.dwTypeData = str; mi.cch = 255; GetMenuItemInfoW(hmenu, FCIDM_SHVIEW_EXPLORE, MF_BYCOMMAND, &mi); - RemoveMenu(hmenu, FCIDM_SHVIEW_EXPLORE, MF_BYCOMMAND); + RemoveMenu(hmenu, FCIDM_SHVIEW_EXPLORE + idCmdFirst, MF_BYCOMMAND); mi.cbSize = sizeof(mi); - mi.fMask = MIIM_ID | MIIM_TYPE | MIIM_STATE; + mi.fMask = MIIM_ID | MIIM_TYPE | MIIM_STATE | MIIM_STRING; mi.dwTypeData = str; mi.fState = MFS_ENABLED; mi.wID = FCIDM_SHVIEW_EXPLORE;

1 0

Dmitry Timoshkov : kernel32/tests: Fix some typos.
by Alexandre Julliard Aug. 15, 2013

Aug. 15, 2013

Module: wine Branch: master Commit: ab7dac6886c2946848635185b4903f7d5ee28ab6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab7dac6886c2946848635185b… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Aug 15 16:37:28 2013 +0900 kernel32/tests: Fix some typos. --- dlls/kernel32/tests/comm.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/kernel32/tests/comm.c b/dlls/kernel32/tests/comm.c index bdc1cc1..e9a8690 100644 --- a/dlls/kernel32/tests/comm.c +++ b/dlls/kernel32/tests/comm.c @@ -682,7 +682,7 @@ static HANDLE test_OpenComm(BOOL doOverlap) if(!shown) { if (hcom == INVALID_HANDLE_VALUE) - trace("Could not find a valid COM port. Skipping test_ReadTimeOut\n"); + trace("Could not find a valid COM port.\n"); else trace("Found Com port %s. Connected devices may disturb results\n", port_name); /*shown = TRUE; */ @@ -1126,7 +1126,7 @@ static void test_WaitRx(HANDLE hcom) after = GetTickCount(); trace("Success 0x%08x err %d evtmask 0x%08x\n", success_wait, err_wait, evtmask); ok(success_wait || err_wait == ERROR_IO_PENDING, "overlapped WaitCommEvent failed\n"); - trace("overlapped WriteCommEvent returned.\n"); + trace("overlapped WaitCommEvent returned.\n"); success_write= WriteFile(hcom, "X", 1, &written, &overlapped_w); err_write = GetLastError(); @@ -1242,7 +1242,7 @@ static void test_WaitCts(HANDLE hcom) trace("Success 0x%08x err %d evtmask 0x%08x\n", success, err, evtmask); ok(success || err == ERROR_IO_PENDING, "overlapped WaitCommEvent failed\n"); - trace("overlapped WriteCommEvent returned.\n"); + trace("overlapped WaitCommEvent returned.\n"); if (!success && (err == ERROR_IO_PENDING)) ok(WaitForSingleObjectEx(hComPortEvent, TIMEOUT, TRUE) == 0, "WaitCts hComPortEvent failed\n"); @@ -1330,7 +1330,7 @@ static void test_AbortWaitCts(HANDLE hcom) trace("Success 0x%08x err %d evtmask 0x%08x\n", success, err, evtmask); ok(success || err == ERROR_IO_PENDING, "overlapped WaitCommEvent failed\n"); - trace("overlapped WriteCommEvent returned.\n"); + trace("overlapped WaitCommEvent returned.\n"); if (!success && (err == ERROR_IO_PENDING)) ok(WaitForSingleObjectEx(hComPortEvent, TIMEOUT, TRUE) == 0, "AbortWaitCts hComPortEvent failed\n"); @@ -1393,7 +1393,7 @@ static void test_WaitDsr(HANDLE hcom) trace("Success 0x%08x err %d evtmask 0x%08x\n", success, err, evtmask); ok(success || err == ERROR_IO_PENDING, "overlapped WaitCommEvent failed\n"); - trace("overlapped WriteCommEvent returned.\n"); + trace("overlapped WaitCommEvent returned.\n"); if (!success && (err == ERROR_IO_PENDING)) ok(WaitForSingleObjectEx(hComPortEvent, TIMEOUT, TRUE) == 0, "wait hComPortEvent failed\n"); @@ -1471,7 +1471,7 @@ static void test_WaitRing(HANDLE hcom) trace("Success 0x%08x err %d evtmask 0x%08x\n", success, err, evtmask); ok(success || err == ERROR_IO_PENDING, "overlapped WaitCommEvent failed\n"); - trace("overlapped WriteCommEvent returned.\n"); + trace("overlapped WaitCommEvent returned.\n"); if (!success && (err == ERROR_IO_PENDING)) ok(WaitForSingleObjectEx(hComPortEvent, TIMEOUT, TRUE) == 0, "wait hComPortEvent failed\n"); @@ -1482,7 +1482,7 @@ static void test_WaitRing(HANDLE hcom) success, err, evtmask, after-before, after1-before); ok(evtmask & EV_RING, "Failed to detect EV_RING: 0x%08x, expected 0x%08x\n", - evtmask, EV_CTS); + evtmask, EV_RING); ok(GetCommModemStatus(hcom, &evtmask), "GetCommModemStatus failed\n"); if(defaultStat & MS_RING_ON) ok((evtmask & MS_RING_ON) == 0,"DTR didn't change state!\n"); @@ -1543,7 +1543,7 @@ static void test_WaitDcd(HANDLE hcom) trace("Success 0x%08x err %d evtmask 0x%08x\n", success, err, evtmask); ok(success || err == ERROR_IO_PENDING, "overlapped WaitCommEvent failed\n"); - trace("overlapped WriteCommEvent returned.\n"); + trace("overlapped WaitCommEvent returned.\n"); if (!success && (err == ERROR_IO_PENDING)) ok(WaitForSingleObjectEx(hComPortEvent, TIMEOUT, TRUE) == 0, "wait hComPortEvent failed\n"); @@ -1554,7 +1554,7 @@ static void test_WaitDcd(HANDLE hcom) success, err, evtmask, after-before, after1-before); ok(evtmask & EV_RLSD, "Failed to detect EV_RLSD: 0x%08x, expected 0x%08x\n", - evtmask, EV_CTS); + evtmask, EV_RLSD); ok(GetCommModemStatus(hcom, &evtmask), "GetCommModemStatus failed\n"); if(defaultStat & MS_RLSD_ON) ok((evtmask & MS_RLSD_ON) == 0,"DTR didn't change state!\n"); @@ -1623,7 +1623,7 @@ static void test_WaitBreak(HANDLE hcom) trace("Success 0x%08x err %d evtmask 0x%08x\n", success, err, evtmask); ok(success || err == ERROR_IO_PENDING, "overlapped WaitCommEvent failed\n"); - trace("overlapped WriteCommEvent returned.\n"); + trace("overlapped WaitCommEvent returned.\n"); if (!success && (err == ERROR_IO_PENDING)) {

1 0

Vincent Povirk : gdiplus: Only clip strings if rectangle width and height are positive.
by Alexandre Julliard Aug. 15, 2013

Aug. 15, 2013

Module: wine Branch: master Commit: 814f9cf7e4af9afd91196b75c581de792a239338 URL: http://source.winehq.org/git/wine.git/?a=commit;h=814f9cf7e4af9afd91196b75c… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Aug 13 16:52:18 2013 -0500 gdiplus: Only clip strings if rectangle width and height are positive. --- dlls/gdiplus/graphics.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 76af444..79e4c7c 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -5000,7 +5000,8 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string if (scaled_rect.Height >= 1 << 23) scaled_rect.Height = 1 << 23; if (!(format_flags & StringFormatFlagsNoClip) && - scaled_rect.Width != 1 << 23 && scaled_rect.Height != 1 << 23) + scaled_rect.Width != 1 << 23 && scaled_rect.Height != 1 << 23 && + rect->Width > 0.0 && rect->Height > 0.0) { /* FIXME: If only the width or only the height is 0, we should probably still clip */ rgn = CreatePolygonRgn(corners, 4, ALTERNATE);

1 0

Henri Verbeet : d3drm: Avoid LPDIRECT3DRMLIGHTARRAY.
by Alexandre Julliard Aug. 15, 2013

Aug. 15, 2013

Module: wine Branch: master Commit: ee6734e848849230df334cb1b0ba8d457e7ad3a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee6734e848849230df334cb1b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 13 08:51:48 2013 +0200 d3drm: Avoid LPDIRECT3DRMLIGHTARRAY. --- dlls/d3drm/frame.c | 12 +++++------- dlls/d3drm/tests/d3drm.c | 14 +++++++------- include/d3drmobj.h | 6 +++--- 3 files changed, 15 insertions(+), 17 deletions(-) diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index 88540f0..4b6eae8 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -703,14 +703,13 @@ static D3DCOLOR WINAPI IDirect3DRMFrame2Impl_GetColor(IDirect3DRMFrame2* iface) return 0; } -static HRESULT WINAPI IDirect3DRMFrame2Impl_GetLights(IDirect3DRMFrame2* iface, - LPDIRECT3DRMLIGHTARRAY *lights) +static HRESULT WINAPI IDirect3DRMFrame2Impl_GetLights(IDirect3DRMFrame2 *iface, IDirect3DRMLightArray **lights) { - IDirect3DRMFrameImpl *This = impl_from_IDirect3DRMFrame2(iface); + IDirect3DRMFrameImpl *frame = impl_from_IDirect3DRMFrame2(iface); - TRACE("(%p/%p)->(%p)\n", iface, This, lights); + TRACE("iface %p, lights %p.\n", iface, lights); - return IDirect3DRMFrame3_GetLights(&This->IDirect3DRMFrame3_iface, lights); + return IDirect3DRMFrame3_GetLights(&frame->IDirect3DRMFrame3_iface, lights); } static D3DRMMATERIALMODE WINAPI IDirect3DRMFrame2Impl_GetMaterialMode(IDirect3DRMFrame2* iface) @@ -1721,8 +1720,7 @@ static D3DCOLOR WINAPI IDirect3DRMFrame3Impl_GetColor(IDirect3DRMFrame3* iface) return 0; } -static HRESULT WINAPI IDirect3DRMFrame3Impl_GetLights(IDirect3DRMFrame3* iface, - LPDIRECT3DRMLIGHTARRAY *lights) +static HRESULT WINAPI IDirect3DRMFrame3Impl_GetLights(IDirect3DRMFrame3 *iface, IDirect3DRMLightArray **lights) { IDirect3DRMFrameImpl *This = impl_from_IDirect3DRMFrame3(iface); IDirect3DRMLightArrayImpl* obj; diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 34b0fd0..7e59050 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -918,7 +918,7 @@ static void test_Frame(void) IDirect3DRMVisualArray *visual_array; IDirect3DRMLight *light1; IDirect3DRMLight *light_tmp; - LPDIRECT3DRMLIGHTARRAY pLightArray; + IDirect3DRMLightArray *light_array; D3DCOLOR color; DWORD count; CHAR cname[64] = {0}; @@ -1193,18 +1193,18 @@ static void test_Frame(void) CHECK_REFCOUNT(pFrameP1, 3); CHECK_REFCOUNT(light1, 2); - pLightArray = NULL; - hr = IDirect3DRMFrame_GetLights(pFrameP1, &pLightArray); + light_array = NULL; + hr = IDirect3DRMFrame_GetLights(pFrameP1, &light_array); ok(hr == D3DRM_OK, "Cannot get lights (hr = %x)\n", hr); - if (pLightArray) + if (light_array) { - count = IDirect3DRMLightArray_GetSize(pLightArray); + count = IDirect3DRMLightArray_GetSize(light_array); ok(count == 1, "count = %u\n", count); - hr = IDirect3DRMLightArray_GetElement(pLightArray, 0, &light_tmp); + hr = IDirect3DRMLightArray_GetElement(light_array, 0, &light_tmp); ok(hr == D3DRM_OK, "Cannot get element (hr = %x)\n", hr); ok(light_tmp == light1, "light_tmp = %p\n", light_tmp); IDirect3DRMLight_Release(light_tmp); - IDirect3DRMLightArray_Release(pLightArray); + IDirect3DRMLightArray_Release(light_array); } /* Delete Light */ diff --git a/include/d3drmobj.h b/include/d3drmobj.h index 7bae278..e1c2da9 100644 --- a/include/d3drmobj.h +++ b/include/d3drmobj.h @@ -1106,7 +1106,7 @@ DECLARE_INTERFACE_(IDirect3DRMFrame,IDirect3DRMVisual) STDMETHOD(AddVisual)(THIS_ IDirect3DRMVisual *visual) PURE; STDMETHOD(GetChildren)(THIS_ struct IDirect3DRMFrameArray **children) PURE; STDMETHOD_(D3DCOLOR, GetColor)(THIS) PURE; - STDMETHOD(GetLights)(THIS_ LPDIRECT3DRMLIGHTARRAY *lights) PURE; + STDMETHOD(GetLights)(THIS_ struct IDirect3DRMLightArray **lights) PURE; STDMETHOD_(D3DRMMATERIALMODE, GetMaterialMode)(THIS) PURE; STDMETHOD(GetParent)(THIS_ IDirect3DRMFrame **parent) PURE; STDMETHOD(GetPosition)(THIS_ IDirect3DRMFrame *reference, D3DVECTOR *return_position) PURE; @@ -1339,7 +1339,7 @@ DECLARE_INTERFACE_(IDirect3DRMFrame2,IDirect3DRMFrame) STDMETHOD(AddVisual)(THIS_ IDirect3DRMVisual *visual) PURE; STDMETHOD(GetChildren)(THIS_ struct IDirect3DRMFrameArray **children) PURE; STDMETHOD_(D3DCOLOR, GetColor)(THIS) PURE; - STDMETHOD(GetLights)(THIS_ LPDIRECT3DRMLIGHTARRAY *lights) PURE; + STDMETHOD(GetLights)(THIS_ struct IDirect3DRMLightArray **lights) PURE; STDMETHOD_(D3DRMMATERIALMODE, GetMaterialMode)(THIS) PURE; STDMETHOD(GetParent)(THIS_ IDirect3DRMFrame **parent) PURE; STDMETHOD(GetPosition)(THIS_ IDirect3DRMFrame *reference, D3DVECTOR *return_position) PURE; @@ -1621,7 +1621,7 @@ DECLARE_INTERFACE_(IDirect3DRMFrame3,IDirect3DRMVisual) STDMETHOD(AddVisual)(THIS_ LPUNKNOWN) PURE; STDMETHOD(GetChildren)(THIS_ struct IDirect3DRMFrameArray **children) PURE; STDMETHOD_(D3DCOLOR, GetColor)(THIS) PURE; - STDMETHOD(GetLights)(THIS_ LPDIRECT3DRMLIGHTARRAY *lights) PURE; + STDMETHOD(GetLights)(THIS_ struct IDirect3DRMLightArray **lights) PURE; STDMETHOD_(D3DRMMATERIALMODE, GetMaterialMode)(THIS) PURE; STDMETHOD(GetParent)(THIS_ IDirect3DRMFrame3 **parent) PURE; STDMETHOD(GetPosition)(THIS_ IDirect3DRMFrame3 *reference, D3DVECTOR *return_position) PURE;

1 0

Dmitry Timoshkov : kernel32/tests: Make test_waittxempty() use overlapped IO to avoid waiting forever when a kernel driver doesn' t support TIOCGICOUNT/TIOCSERGETLSR ioctl.
by Alexandre Julliard Aug. 15, 2013

Aug. 15, 2013

Module: wine Branch: master Commit: 507449ee783ceb670ae12ec54b8f7e542a3034d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=507449ee783ceb670ae12ec54… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Aug 15 16:40:29 2013 +0900 kernel32/tests: Make test_waittxempty() use overlapped IO to avoid waiting forever when a kernel driver doesn't support TIOCGICOUNT/TIOCSERGETLSR ioctl. Most of Linux USB-serial drivers don't support these ioctls. --- dlls/kernel32/tests/comm.c | 102 ++++++++++++++++++++++++++++++------------- 1 files changed, 71 insertions(+), 31 deletions(-) diff --git a/dlls/kernel32/tests/comm.c b/dlls/kernel32/tests/comm.c index 81953cb..b393db4 100644 --- a/dlls/kernel32/tests/comm.c +++ b/dlls/kernel32/tests/comm.c @@ -780,59 +780,99 @@ static void test_waittxempty(void) DCB dcb; COMMTIMEOUTS timeouts; char tbuf[]="test_waittxempty"; - DWORD before, after, written, timediff, evtmask = 0; - BOOL res_write, res; + DWORD before, after, bytes, timediff, evtmask; + BOOL res; DWORD baud = SLOWBAUD; + OVERLAPPED ovl_write, ovl_wait; - hcom = test_OpenComm(FALSE); + hcom = test_OpenComm(TRUE); if (hcom == INVALID_HANDLE_VALUE) return; /* set a low baud rate to have ample time*/ - ok(GetCommState(hcom, &dcb), "GetCommState failed\n"); + res = GetCommState(hcom, &dcb); + ok(res, "GetCommState error %d\n", GetLastError()); dcb.BaudRate = baud; dcb.ByteSize = 8; dcb.Parity = NOPARITY; dcb.fRtsControl=RTS_CONTROL_ENABLE; dcb.fDtrControl=DTR_CONTROL_ENABLE; dcb.StopBits = ONESTOPBIT; - ok(SetCommState(hcom, &dcb), "SetCommState failed\n"); + res = SetCommState(hcom, &dcb); + ok(res, "SetCommState error %d\n", GetLastError()); ZeroMemory( &timeouts, sizeof(timeouts)); timeouts.ReadTotalTimeoutConstant = TIMEOUT; - ok(SetCommTimeouts(hcom, &timeouts),"SetCommTimeouts failed\n"); + res = SetCommTimeouts(hcom, &timeouts); + ok(res,"SetCommTimeouts error %d\n", GetLastError()); - ok(SetupComm(hcom,1024,1024),"SetUpComm failed\n"); - ok(SetCommMask(hcom, EV_TXEMPTY), "SetCommMask failed\n"); + res = SetupComm(hcom, 1024, 1024); + ok(res, "SetUpComm error %d\n", GetLastError()); + + /* calling SetCommMask after WriteFile leads to WaitCommEvent failures + * due to timeout (no events) under testbot VMs and VirtualBox + */ + res = SetCommMask(hcom, EV_TXEMPTY); + ok(res, "SetCommMask error %d\n", GetLastError()); + SetLastError(0xdeadbeef); + res = WriteFile(hcom, tbuf, sizeof(tbuf), &bytes, NULL); +todo_wine + ok(!res, "WriteFile on an overlapped handle without ovl structure should fail\n"); +todo_wine + ok(GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + + S(U(ovl_write)).Offset = 0; + S(U(ovl_write)).OffsetHigh = 0; + ovl_write.hEvent = CreateEvent(NULL, TRUE, FALSE, NULL); before = GetTickCount(); - res_write=WriteFile(hcom, tbuf, sizeof(tbuf), &written, NULL); + SetLastError(0xdeadbeef); + res = WriteFile(hcom, tbuf, sizeof(tbuf), &bytes, &ovl_write); after = GetTickCount(); - ok(res_write == TRUE, "WriteFile failed\n"); - ok(written == sizeof(tbuf), - "WriteFile: Unexpected write_size %d\n", written); - - trace("WriteFile succeeded, took %d ms to write %d Bytes at %d Baud\n", - after - before, written, baud); - +todo_wine + ok(!res && GetLastError() == ERROR_IO_PENDING, "WriteFile returned %d, error %d\n", res, GetLastError()); +todo_wine + ok(!bytes, "expected 0, got %u\n", bytes); + ok(after - before == 0, "WriteFile took %d ms to write %d Bytes at %d Baud\n", + after - before, bytes, baud); + /* don't wait for WriteFile completion */ + + S(U(ovl_wait)).Offset = 0; + S(U(ovl_wait)).OffsetHigh = 0; + ovl_wait.hEvent = CreateEvent(NULL, TRUE, FALSE, NULL); + evtmask = 0; before = GetTickCount(); - res = WaitCommEvent(hcom, &evtmask, NULL); + SetLastError(0xdeadbeef); + res = WaitCommEvent(hcom, &evtmask, &ovl_wait); + ok(!res && GetLastError() == ERROR_IO_PENDING, "WaitCommEvent error %d\n", GetLastError()); + res = WaitForSingleObject(ovl_wait.hEvent, TIMEOUT); +todo_wine + ok(res == WAIT_OBJECT_0, "WaitCommEvent failed with a timeout\n"); + if (res == WAIT_OBJECT_0) + { + res = GetOverlappedResult(hcom, &ovl_wait, &bytes, FALSE); + ok(res, "GetOverlappedResult reported error %d\n", GetLastError()); + ok(bytes == sizeof(evtmask), "expected %u, written %u\n", (UINT)sizeof(evtmask), bytes); + res = TRUE; + } + else res = FALSE; after = GetTickCount(); - - ok(res == TRUE, "WaitCommEvent failed\n"); - ok((evtmask & EV_TXEMPTY), - "WaitCommEvent: Unexpected EvtMask 0x%08x, expected 0x%08x\n", - evtmask, EV_TXEMPTY); +todo_wine + ok(res, "WaitCommEvent error %d\n", GetLastError()); +todo_wine + ok(evtmask & EV_TXEMPTY, "WaitCommEvent: expected EV_TXEMPTY, got %#x\n", evtmask); + CloseHandle(ovl_wait.hEvent); timediff = after - before; - - trace("WaitCommEvent for EV_TXEMPTY took %d ms\n", timediff); - /* 050604: This shows a difference between XP (tested with mingw compiled crosstest): - XP returns Writefile only after everything went out of the Serial port, - while wine returns immediately. - Thus on XP, WaintCommEvent after setting the CommMask for EV_TXEMPTY - nearly return immediate, - while on wine the most time is spent here - */ + trace("WaitCommEvent for EV_TXEMPTY took %d ms (timeout %d)\n", timediff, TIMEOUT); +todo_wine + ok(timediff < 900, "WaitCommEvent used %d ms for waiting\n", timediff); + + res = WaitForSingleObject(ovl_write.hEvent, 0); + ok(res == WAIT_OBJECT_0, "WriteFile failed with a timeout\n"); + res = GetOverlappedResult(hcom, &ovl_write, &bytes, FALSE); + ok(res, "GetOverlappedResult reported error %d\n", GetLastError()); + ok(bytes == sizeof(tbuf), "expected %u, written %u\n", (UINT)sizeof(tbuf), bytes); + CloseHandle(ovl_write.hEvent); CloseHandle(hcom); }

1 0

Dmitry Timoshkov : kernel32/tests: Make serial tests self-contained.
by Alexandre Julliard Aug. 15, 2013

Aug. 15, 2013

Module: wine Branch: master Commit: 4654e7977690f27ebd2323342306bf00ac98df24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4654e7977690f27ebd2323342… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Aug 15 16:39:45 2013 +0900 kernel32/tests: Make serial tests self-contained. --- dlls/kernel32/tests/comm.c | 284 ++++++++++++++++++++++++++------------------ 1 files changed, 167 insertions(+), 117 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4654e7977690f27ebd232…

1 0

Dmitry Timoshkov : kernel32/tests: Constify test data.
by Alexandre Julliard Aug. 15, 2013

Aug. 15, 2013

Module: wine Branch: master Commit: a1b08f39a68499770d8c9b72bac8d75bd46be10c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1b08f39a68499770d8c9b72b… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Aug 15 16:39:01 2013 +0900 kernel32/tests: Constify test data. --- dlls/kernel32/tests/comm.c | 46 +++++++++++++++++++++++-------------------- 1 files changed, 25 insertions(+), 21 deletions(-) diff --git a/dlls/kernel32/tests/comm.c b/dlls/kernel32/tests/comm.c index 38a8bbc..765b54f 100644 --- a/dlls/kernel32/tests/comm.c +++ b/dlls/kernel32/tests/comm.c @@ -51,7 +51,7 @@ typedef struct COMMTIMEOUTS timeouts1, timeouts2; } TEST; -static TEST test[] = +static const TEST test[] = { { "baud=9600 parity=e data=5 stop=1 xon=on odsr=off octs=off dtr=on rts=on idsr=on", @@ -428,7 +428,7 @@ static TEST test[] = pdcb->wReserved1 & 0xffff ); } */ -static void check_result(const char *function, TEST *ptest, int initial_value, BOOL result) +static void check_result(const char *function, const TEST *ptest, int initial_value, BOOL result) { DWORD LastError = GetLastError(); DWORD CorrectError = (ptest->result ? 0xdeadbeef : ERROR_INVALID_PARAMETER); @@ -440,7 +440,7 @@ static void check_result(const char *function, TEST *ptest, int initial_value, B #define check_dcb_member(a,b) ok(pdcb1->a == pdcb2->a, "%s(\"%s\"), 0x%02x: "#a" is "b", should be "b"\n", function, ptest->string, initial_value, pdcb1->a, pdcb2->a) #define check_dcb_member2(a,c,b) if(pdcb2->a == c) { check_dcb_member(a,b); } else { ok(pdcb1->a == pdcb2->a || pdcb1->a == c, "%s(\"%s\"), 0x%02x: "#a" is "b", should be "b" or "b"\n", function, ptest->string, initial_value, pdcb1->a, pdcb2->a, c); } -static void check_dcb(const char *function, TEST *ptest, int initial_value, DCB *pdcb1, DCB *pdcb2) +static void check_dcb(const char *function, const TEST *ptest, int initial_value, const DCB *pdcb1, const DCB *pdcb2) { /* DCBlength is a special case since Win 9x sets it but NT does not. We will accept either as correct. */ @@ -512,7 +512,7 @@ static void check_dcb(const char *function, TEST *ptest, int initial_value, DCB #define check_timeouts_member(a) ok(ptimeouts1->a == ptimeouts2->a, "%s(\"%s\"), 0x%02x: "#a" is %u, should be %u\n", function, ptest->string, initial_value, ptimeouts1->a, ptimeouts2->a); -static void check_timeouts(const char *function, TEST *ptest, int initial_value, COMMTIMEOUTS *ptimeouts1, COMMTIMEOUTS *ptimeouts2) +static void check_timeouts(const char *function, const TEST *ptest, int initial_value, const COMMTIMEOUTS *ptimeouts1, const COMMTIMEOUTS *ptimeouts2) { check_timeouts_member(ReadIntervalTimeout); check_timeouts_member(ReadTotalTimeoutMultiplier); @@ -521,7 +521,7 @@ static void check_timeouts(const char *function, TEST *ptest, int initial_value, check_timeouts_member(WriteTotalTimeoutConstant); } -static void test_BuildCommDCBA(TEST *ptest, int initial_value, DCB *pexpected_dcb) +static void test_BuildCommDCBA(const char *string, const TEST *ptest, int initial_value, const DCB *pexpected_dcb) { BOOL result; DCB dcb; @@ -530,14 +530,14 @@ static void test_BuildCommDCBA(TEST *ptest, int initial_value, DCB *pexpected_dc memset(&dcb, initial_value, sizeof(DCB)); SetLastError(0xdeadbeef); - result = BuildCommDCBA(ptest->string, &dcb); + result = BuildCommDCBA(string, &dcb); /* check results */ check_result("BuildCommDCBA", ptest, initial_value, result); check_dcb("BuildCommDCBA", ptest, initial_value, &dcb, pexpected_dcb); } -static void test_BuildCommDCBAndTimeoutsA(TEST *ptest, int initial_value, DCB *pexpected_dcb, COMMTIMEOUTS *pexpected_timeouts) +static void test_BuildCommDCBAndTimeoutsA(const char *string, const TEST *ptest, int initial_value, const DCB *pexpected_dcb, const COMMTIMEOUTS *pexpected_timeouts) { BOOL result; DCB dcb; @@ -548,7 +548,7 @@ static void test_BuildCommDCBAndTimeoutsA(TEST *ptest, int initial_value, DCB *p memset(&timeouts, initial_value, sizeof(COMMTIMEOUTS)); SetLastError(0xdeadbeef); - result = BuildCommDCBAndTimeoutsA(ptest->string, &dcb, &timeouts); + result = BuildCommDCBAndTimeoutsA(string, &dcb, &timeouts); /* check results */ check_result("BuildCommDCBAndTimeoutsA", ptest, initial_value, result); @@ -556,14 +556,14 @@ static void test_BuildCommDCBAndTimeoutsA(TEST *ptest, int initial_value, DCB *p check_timeouts("BuildCommDCBAndTimeoutsA", ptest, initial_value, &timeouts, pexpected_timeouts); } -static void test_BuildCommDCBW(TEST *ptest, int initial_value, DCB *pexpected_dcb) +static void test_BuildCommDCBW(const char *string, const TEST *ptest, int initial_value, const DCB *pexpected_dcb) { BOOL result; DCB dcb; WCHAR wide_string[sizeof(ptest->string)]; static int reportedDCBW = 0; - MultiByteToWideChar(CP_ACP, 0, ptest->string, -1, wide_string, sizeof(wide_string) / sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, string, -1, wide_string, sizeof(wide_string) / sizeof(WCHAR)); /* set initial conditions */ memset(&dcb, initial_value, sizeof(DCB)); @@ -583,7 +583,7 @@ static void test_BuildCommDCBW(TEST *ptest, int initial_value, DCB *pexpected_dc check_dcb("BuildCommDCBW", ptest, initial_value, &dcb, pexpected_dcb); } -static void test_BuildCommDCBAndTimeoutsW(TEST *ptest, int initial_value, DCB *pexpected_dcb, COMMTIMEOUTS *pexpected_timeouts) +static void test_BuildCommDCBAndTimeoutsW(const char *string, const TEST *ptest, int initial_value, const DCB *pexpected_dcb, const COMMTIMEOUTS *pexpected_timeouts) { BOOL result; DCB dcb; @@ -591,7 +591,7 @@ static void test_BuildCommDCBAndTimeoutsW(TEST *ptest, int initial_value, DCB *p WCHAR wide_string[sizeof(ptest->string)]; static int reportedDCBAndTW = 0; - MultiByteToWideChar(CP_ACP, 0, ptest->string, -1, wide_string, sizeof(wide_string) / sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, string, -1, wide_string, sizeof(wide_string) / sizeof(WCHAR)); /* set initial conditions */ memset(&dcb, initial_value, sizeof(DCB)); @@ -639,8 +639,12 @@ static void test_BuildCommDCB(void) for(i = 0; i < TEST_COUNT; i++) { + char string[sizeof(test[i].string)]; + + strcpy(string, test[i].string); + /* Check if this test case needs a valid COM port. */ - ptr = strstr(test[i].string, "COMx"); + ptr = strstr(string, "COMx"); /* If required, substitute valid port number into device control string. */ if(ptr) @@ -651,15 +655,15 @@ static void test_BuildCommDCB(void) continue; } - test_BuildCommDCBA(&test[i], 0x00, &test[i].dcb1); - test_BuildCommDCBA(&test[i], 0xff, &test[i].dcb2); - test_BuildCommDCBAndTimeoutsA(&test[i], 0x00, &test[i].dcb1, &test[i].timeouts1); - test_BuildCommDCBAndTimeoutsA(&test[i], 0xff, &test[i].dcb2, &test[i].timeouts2); + test_BuildCommDCBA(string, &test[i], 0x00, &test[i].dcb1); + test_BuildCommDCBA(string, &test[i], 0xff, &test[i].dcb2); + test_BuildCommDCBAndTimeoutsA(string, &test[i], 0x00, &test[i].dcb1, &test[i].timeouts1); + test_BuildCommDCBAndTimeoutsA(string, &test[i], 0xff, &test[i].dcb2, &test[i].timeouts2); - test_BuildCommDCBW(&test[i], 0x00, &test[i].dcb1); - test_BuildCommDCBW(&test[i], 0xff, &test[i].dcb2); - test_BuildCommDCBAndTimeoutsW(&test[i], 0x00, &test[i].dcb1, &test[i].timeouts1); - test_BuildCommDCBAndTimeoutsW(&test[i], 0xff, &test[i].dcb2, &test[i].timeouts2); + test_BuildCommDCBW(string, &test[i], 0x00, &test[i].dcb1); + test_BuildCommDCBW(string, &test[i], 0xff, &test[i].dcb2); + test_BuildCommDCBAndTimeoutsW(string, &test[i], 0x00, &test[i].dcb1, &test[i].timeouts1); + test_BuildCommDCBAndTimeoutsW(string, &test[i], 0xff, &test[i].dcb2, &test[i].timeouts2); } }

1 0

Charles Davis : configure: Use a real header guard for config.h.
by Alexandre Julliard Aug. 15, 2013

Aug. 15, 2013

Module: wine Branch: master Commit: 7fcb736d511084bff60e73e4e803ef3b5590594b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fcb736d511084bff60e73e4e… Author: Charles Davis <cdavis5x(a)gmail.com> Date: Mon Aug 12 15:07:06 2013 -0600 configure: Use a real header guard for config.h. --- configure.ac | 8 +++++--- include/config.h.in | 4 +++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index ca3d038..07ee2f0 100644 --- a/configure.ac +++ b/configure.ac @@ -2527,9 +2527,11 @@ esac dnl **** Generate output files **** -AH_TOP([#ifndef WINE_CROSSTEST -#define __WINE_CONFIG_H]) -AH_BOTTOM([#endif /* WINE_CROSSTEST */]) +AH_TOP([#ifndef __WINE_CONFIG_H +#define __WINE_CONFIG_H +#ifndef WINE_CROSSTEST]) +AH_BOTTOM([#endif /* WINE_CROSSTEST */ +#endif /* __WINE_CONFIG_H */]) AC_CONFIG_COMMANDS([include/stamp-h], [echo timestamp > include/stamp-h]) diff --git a/include/config.h.in b/include/config.h.in index e7b1898..014c78a 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -1,7 +1,8 @@ /* include/config.h.in. Generated from configure.ac by autoheader. */ -#ifndef WINE_CROSSTEST +#ifndef __WINE_CONFIG_H #define __WINE_CONFIG_H +#ifndef WINE_CROSSTEST /* Define to a function attribute for Microsoft hotpatch assembly prefix. */ #undef DECLSPEC_HOTPATCH @@ -1366,3 +1367,4 @@ #endif #endif /* WINE_CROSSTEST */ +#endif /* __WINE_CONFIG_H */

1 0