November 2017 - Wine-commits

Jacek Caban : urlmon: Added user marshaling implementation for OnDataAvailable.
by Alexandre Julliard 14 Nov '17

14 Nov '17

Module: wine Branch: master Commit: 185b235d2f60747be61afa6a79cd2daf05dcbd09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=185b235d2f60747be61afa6a7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 13 23:30:05 2017 +0100 urlmon: Added user marshaling implementation for OnDataAvailable. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/usrmarshal.c | 155 +++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 151 insertions(+), 4 deletions(-) diff --git a/dlls/urlmon/usrmarshal.c b/dlls/urlmon/usrmarshal.c index e15c91b..f196883 100644 --- a/dlls/urlmon/usrmarshal.c +++ b/dlls/urlmon/usrmarshal.c @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define NONAMELESSUNION + #include "urlmon_main.h" #include "wine/debug.h" @@ -84,6 +86,115 @@ HRESULT __RPC_STUB IBindHost_MonikerBindToObject_Stub(IBindHost* This, return IBindHost_MonikerBindToObject(This, moniker, bc, bsc, riid, (void**)obj); } +static HRESULT marshal_stgmed(STGMEDIUM *stgmed, RemSTGMEDIUM **ret) +{ + RemSTGMEDIUM *rem_stgmed; + IStream *stream = NULL; + ULONG size = 0; + HRESULT hres = S_OK; + + if((stgmed->tymed == TYMED_ISTREAM && stgmed->u.pstm) || stgmed->pUnkForRelease) { + hres = CreateStreamOnHGlobal(NULL, TRUE, &stream); + if(FAILED(hres)) + return hres; + } + + switch(stgmed->tymed) { + case TYMED_NULL: + break; + case TYMED_ISTREAM: + if(stgmed->u.pstm) + hres = CoMarshalInterface(stream, &IID_IStream, (IUnknown*)stgmed->u.pstm, + MSHCTX_LOCAL, NULL, MSHLFLAGS_NORMAL); + break; + default: + FIXME("unsupported tymed %u\n", stgmed->tymed); + break; + } + + if(SUCCEEDED(hres) && stgmed->pUnkForRelease) + hres = CoMarshalInterface(stream, &IID_IUnknown, stgmed->pUnkForRelease, + MSHCTX_LOCAL, NULL, MSHLFLAGS_NORMAL); + if(FAILED(hres)) { + if(stream) + IStream_Release(stream); + return hres; + } + + if(stream) { + LARGE_INTEGER zero; + ULARGE_INTEGER off; + + zero.QuadPart = 0; + IStream_Seek(stream, zero, STREAM_SEEK_CUR, &off); + size = off.QuadPart; + IStream_Seek(stream, zero, STREAM_SEEK_SET, &off); + } + + rem_stgmed = heap_alloc_zero(FIELD_OFFSET(RemSTGMEDIUM, data[size])); + if(!rem_stgmed) { + if(stream) + IStream_Release(stream); + return E_OUTOFMEMORY; + } + + rem_stgmed->tymed = stgmed->tymed; + rem_stgmed->dwHandleType = 0; + rem_stgmed->pData = stgmed->u.pstm != NULL; + rem_stgmed->pUnkForRelease = stgmed->pUnkForRelease != NULL; + rem_stgmed->cbData = size; + if(stream) { + IStream_Read(stream, rem_stgmed->data, size, &size); + IStream_Release(stream); + } + + *ret = rem_stgmed; + return S_OK; +} + +static HRESULT unmarshal_stgmed(RemSTGMEDIUM *rem_stgmed, STGMEDIUM *stgmed) +{ + IStream *stream = NULL; + HRESULT hres = S_OK; + + stgmed->tymed = rem_stgmed->tymed; + + if((stgmed->tymed == TYMED_ISTREAM && rem_stgmed->pData) || rem_stgmed->pUnkForRelease) { + LARGE_INTEGER zero; + + hres = CreateStreamOnHGlobal(NULL, TRUE, &stream); + if(FAILED(hres)) + return hres; + + hres = IStream_Write(stream, rem_stgmed->data, rem_stgmed->cbData, NULL); + if(FAILED(hres)) { + IStream_Release(stream); + return hres; + } + + zero.QuadPart = 0; + IStream_Seek(stream, zero, STREAM_SEEK_SET, NULL); + } + + switch(stgmed->tymed) { + case TYMED_NULL: + break; + case TYMED_ISTREAM: + if(rem_stgmed->pData) + hres = CoUnmarshalInterface(stream, &IID_IStream, (void**)&stgmed->u.pstm); + break; + default: + FIXME("unsupported tymed %u\n", stgmed->tymed); + break; + } + + if(SUCCEEDED(hres) && rem_stgmed->pUnkForRelease) + hres = CoUnmarshalInterface(stream, &IID_IUnknown, (void**)&stgmed->pUnkForRelease); + if(stream) + IStream_Release(stream); + return hres; +} + HRESULT CALLBACK IBindStatusCallbackEx_GetBindInfoEx_Proxy( IBindStatusCallbackEx* This, DWORD *grfBINDF, BINDINFO *pbindinfo, DWORD *grfBINDF2, DWORD *pdwReserved) @@ -119,16 +230,52 @@ HRESULT CALLBACK IBindStatusCallback_OnDataAvailable_Proxy( IBindStatusCallback* This, DWORD grfBSCF, DWORD dwSize, FORMATETC *pformatetc, STGMEDIUM *pstgmed) { - FIXME("stub\n"); - return E_NOTIMPL; + RemFORMATETC rem_formatetc; + RemSTGMEDIUM *rem_stgmed; + HRESULT hres; + + TRACE("(%p)->(%x %u %p %p)\n", This, grfBSCF, dwSize, pformatetc, pstgmed); + + hres = marshal_stgmed(pstgmed, &rem_stgmed); + if(FAILED(hres)) + return hres; + + rem_formatetc.cfFormat = pformatetc->cfFormat; + rem_formatetc.ptd = 0; + rem_formatetc.dwAspect = pformatetc->dwAspect; + rem_formatetc.lindex = pformatetc->lindex; + rem_formatetc.tymed = pformatetc->tymed; + + hres = IBindStatusCallback_RemoteOnDataAvailable_Proxy(This, grfBSCF, dwSize, &rem_formatetc, rem_stgmed); + + heap_free(rem_stgmed); + return hres; } HRESULT __RPC_STUB IBindStatusCallback_OnDataAvailable_Stub( IBindStatusCallback* This, DWORD grfBSCF, DWORD dwSize, RemFORMATETC *pformatetc, RemSTGMEDIUM *pstgmed) { - FIXME("stub\n"); - return E_NOTIMPL; + STGMEDIUM stgmed = { TYMED_NULL }; + FORMATETC formatetc; + HRESULT hres; + + TRACE("(%p)->(%x %u %p %p)\n", This, grfBSCF, dwSize, pformatetc, pstgmed); + + hres = unmarshal_stgmed(pstgmed, &stgmed); + if(FAILED(hres)) + return hres; + + formatetc.cfFormat = pformatetc->cfFormat; + formatetc.ptd = NULL; + formatetc.dwAspect = pformatetc->dwAspect; + formatetc.lindex = pformatetc->lindex; + formatetc.tymed = pformatetc->tymed; + + hres = IBindStatusCallback_OnDataAvailable(This, grfBSCF, dwSize, &formatetc, &stgmed); + + ReleaseStgMedium(&stgmed); + return hres; } HRESULT CALLBACK IBinding_GetBindResult_Proxy(IBinding* This,

1 0

Jacek Caban : urlmon: Added user marshaling implementation for GetBindInfo [Ex].
by Alexandre Julliard 14 Nov '17

14 Nov '17

Module: wine Branch: master Commit: 907224188a9636357e2ea44ad4d0ee32e7adc7d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=907224188a9636357e2ea44ad… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 13 21:41:45 2017 +0100 urlmon: Added user marshaling implementation for GetBindInfo[Ex]. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/usrmarshal.c | 113 +++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 99 insertions(+), 14 deletions(-) diff --git a/dlls/urlmon/usrmarshal.c b/dlls/urlmon/usrmarshal.c index f196883..9ddb130 100644 --- a/dlls/urlmon/usrmarshal.c +++ b/dlls/urlmon/usrmarshal.c @@ -195,35 +195,120 @@ static HRESULT unmarshal_stgmed(RemSTGMEDIUM *rem_stgmed, STGMEDIUM *stgmed) return hres; } +static void proxy_marshal_bindinfo(BINDINFO *bindinfo, RemBINDINFO *rem_bindinfo) +{ + rem_bindinfo->szExtraInfo = bindinfo->szExtraInfo; + rem_bindinfo->grfBindInfoF = bindinfo->grfBindInfoF; + rem_bindinfo->dwBindVerb = bindinfo->dwBindVerb; + rem_bindinfo->szCustomVerb = bindinfo->szCustomVerb; + rem_bindinfo->cbstgmedData = bindinfo->cbstgmedData; +} + +static void proxy_unmarshal_bindinfo(RemBINDINFO *rem_bindinfo, BINDINFO *bindinfo) +{ + bindinfo->szExtraInfo = rem_bindinfo->szExtraInfo; + bindinfo->grfBindInfoF = rem_bindinfo->grfBindInfoF; + bindinfo->dwBindVerb = rem_bindinfo->dwBindVerb; + bindinfo->szCustomVerb = rem_bindinfo->szCustomVerb; + bindinfo->cbstgmedData = rem_bindinfo->cbstgmedData; + bindinfo->dwOptions = rem_bindinfo->dwOptions; + bindinfo->dwOptionsFlags = rem_bindinfo->dwOptionsFlags; + bindinfo->dwCodePage = rem_bindinfo->dwCodePage; + bindinfo->iid = IID_NULL; + bindinfo->pUnk = NULL; +} + +static void stub_unmarshal_bindinfo(RemBINDINFO *rem_bindinfo, BINDINFO *bindinfo) +{ + bindinfo->szExtraInfo = rem_bindinfo->szExtraInfo; + bindinfo->grfBindInfoF = rem_bindinfo->grfBindInfoF; + bindinfo->dwBindVerb = rem_bindinfo->dwBindVerb; + bindinfo->szCustomVerb = rem_bindinfo->szCustomVerb; + bindinfo->cbstgmedData = rem_bindinfo->cbstgmedData; + + if(bindinfo->stgmedData.tymed != TYMED_NULL) + WARN("stgmed data (tymed %u) will be lost!\n", bindinfo->stgmedData.tymed); +} + +static void stub_marshal_bindinfo(BINDINFO *bindinfo, RemBINDINFO *rem_bindinfo) +{ + rem_bindinfo->cbSize = sizeof(*rem_bindinfo); + rem_bindinfo->szExtraInfo = bindinfo->szExtraInfo; + rem_bindinfo->grfBindInfoF = bindinfo->grfBindInfoF; + rem_bindinfo->dwBindVerb = bindinfo->dwBindVerb; + rem_bindinfo->szCustomVerb = bindinfo->szCustomVerb; + rem_bindinfo->cbstgmedData = bindinfo->cbstgmedData; + rem_bindinfo->dwOptions = bindinfo->dwOptions; + rem_bindinfo->dwOptionsFlags = bindinfo->dwOptionsFlags; + rem_bindinfo->dwCodePage = bindinfo->dwCodePage; + rem_bindinfo->pUnk = NULL; + rem_bindinfo->dwReserved = bindinfo->dwReserved; +} + + HRESULT CALLBACK IBindStatusCallbackEx_GetBindInfoEx_Proxy( - IBindStatusCallbackEx* This, DWORD *grfBINDF, BINDINFO *pbindinfo, + IBindStatusCallbackEx* This, DWORD *grfBINDF, BINDINFO *bindinfo, DWORD *grfBINDF2, DWORD *pdwReserved) { - FIXME("stub\n"); - return E_NOTIMPL; + RemBINDINFO rem_bindinfo = {sizeof(rem_bindinfo)}; + RemSTGMEDIUM rem_stgmed = {0}; + HRESULT hres; + + TRACE("(%p)->(%p %p %p %p)\n", This, grfBINDF, bindinfo, grfBINDF2, pdwReserved); + + proxy_marshal_bindinfo(bindinfo, &rem_bindinfo); + hres = IBindStatusCallbackEx_RemoteGetBindInfoEx_Proxy(This, grfBINDF, &rem_bindinfo, + &rem_stgmed, grfBINDF2, pdwReserved); + proxy_unmarshal_bindinfo(&rem_bindinfo, bindinfo); + return hres; } HRESULT __RPC_STUB IBindStatusCallbackEx_GetBindInfoEx_Stub( - IBindStatusCallbackEx* This, DWORD *grfBINDF, RemBINDINFO *pbindinfo, - RemSTGMEDIUM *pstgmed, DWORD *grfBINDF2, DWORD *pdwReserved) + IBindStatusCallbackEx* This, DWORD *grfBINDF, RemBINDINFO *rem_bindinfo, + RemSTGMEDIUM *rem_stgmed, DWORD *grfBINDF2, DWORD *pdwReserved) { - FIXME("stub\n"); - return E_NOTIMPL; -} + BINDINFO bindinfo = {sizeof(bindinfo)}; + HRESULT hres; + + TRACE("(%p)->(%p %p %p %p %p)\n", This, grfBINDF, rem_bindinfo, rem_stgmed, grfBINDF2, pdwReserved); + /* + * Although arguments suggest support for STGMEDIUM from BINDINFO, tests show + * that it's not supported and returned data is lost. + */ + stub_unmarshal_bindinfo(rem_bindinfo, &bindinfo); + hres = IBindStatusCallbackEx_GetBindInfoEx(This, grfBINDF, &bindinfo, grfBINDF2, pdwReserved); + stub_marshal_bindinfo(&bindinfo, rem_bindinfo); + return hres; +} HRESULT CALLBACK IBindStatusCallback_GetBindInfo_Proxy( - IBindStatusCallback* This, DWORD *grfBINDF, BINDINFO *pbindinfo) + IBindStatusCallback* This, DWORD *grfBINDF, BINDINFO *bindinfo) { - FIXME("stub\n"); - return E_NOTIMPL; + RemBINDINFO rem_bindinfo = {sizeof(rem_bindinfo)}; + RemSTGMEDIUM rem_stgmed = {0}; + HRESULT hres; + + TRACE("(%p)->(%p %p)\n", This, grfBINDF, bindinfo); + + proxy_marshal_bindinfo(bindinfo, &rem_bindinfo); + hres = IBindStatusCallback_RemoteGetBindInfo_Proxy(This, grfBINDF, &rem_bindinfo, &rem_stgmed); + proxy_unmarshal_bindinfo(&rem_bindinfo, bindinfo); + return hres; } HRESULT __RPC_STUB IBindStatusCallback_GetBindInfo_Stub( IBindStatusCallback* This, DWORD *grfBINDF, - RemBINDINFO *pbindinfo, RemSTGMEDIUM *pstgmed) + RemBINDINFO *rem_bindinfo, RemSTGMEDIUM *rem_stgmed) { - FIXME("stub\n"); - return E_NOTIMPL; + BINDINFO bindinfo = {sizeof(bindinfo)}; + HRESULT hres; + + TRACE("(%p)->(%p %p %p)\n", This, grfBINDF, rem_bindinfo, rem_stgmed); + + stub_unmarshal_bindinfo(rem_bindinfo, &bindinfo); + hres = IBindStatusCallback_GetBindInfo(This, grfBINDF, &bindinfo); + stub_marshal_bindinfo(&bindinfo, rem_bindinfo); + return hres; } HRESULT CALLBACK IBindStatusCallback_OnDataAvailable_Proxy(

1 0

Jacek Caban : urlmon/tests: Added IBindStatusCallback marshaling tests.
by Alexandre Julliard 14 Nov '17

14 Nov '17

Module: wine Branch: master Commit: 05826d5a6837dfb208b773639bd4f8ac8c4e0820 URL: http://source.winehq.org/git/wine.git/?a=commit;h=05826d5a6837dfb208b773639… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 13 21:41:48 2017 +0100 urlmon/tests: Added IBindStatusCallback marshaling tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/tests/misc.c | 723 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 723 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=05826d5a6837dfb208b77…

1 0

Nikolay Sivov : msxml3/httpreq: Return S_OK from setTimeouts().
by Alexandre Julliard 14 Nov '17

14 Nov '17

Module: wine Branch: master Commit: 418c1d32bbc14933492220eac321a665091178b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=418c1d32bbc14933492220eac… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 14 08:32:29 2017 +0300 msxml3/httpreq: Return S_OK from setTimeouts(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/httprequest.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c index 72234ee..e3b521c 100644 --- a/dlls/msxml3/httprequest.c +++ b/dlls/msxml3/httprequest.c @@ -1978,7 +1978,7 @@ static HRESULT WINAPI ServerXMLHTTPRequest_setTimeouts(IServerXMLHTTPRequest *if { serverhttp *This = impl_from_IServerXMLHTTPRequest( iface ); FIXME("(%p)->(%d %d %d %d): stub\n", This, resolveTimeout, connectTimeout, sendTimeout, receiveTimeout); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI ServerXMLHTTPRequest_waitForResponse(IServerXMLHTTPRequest *iface, VARIANT timeout, VARIANT_BOOL *isSuccessful)

1 0

Huw Davies : comctl32: Simplify handling of the marquee highlight.
by Alexandre Julliard 14 Nov '17

14 Nov '17

Module: wine Branch: master Commit: da419d80b7789d537508a2c97e092fd917a562f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da419d80b7789d537508a2c97… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Nov 14 10:56:06 2017 +0000 comctl32: Simplify handling of the marquee highlight. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/listview.c | 82 ++++++++++++++++++------------------------------ 1 file changed, 31 insertions(+), 51 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 3587797..4cb1f0d 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -3843,33 +3843,44 @@ static LRESULT LISTVIEW_MouseHover(LISTVIEW_INFO *infoPtr, INT x, INT y) * None. */ static void LISTVIEW_MarqueeHighlight(LISTVIEW_INFO *infoPtr, const POINT *coords_orig, - const POINT *coords_offs, const POINT *offset, INT scroll) { BOOL controlDown = FALSE; LVITEMW item; ITERATOR old_elems, new_elems; RECT rect; + POINT coords_offs, offset; - if (coords_offs->x > infoPtr->marqueeOrigin.x) + /* Ensure coordinates are within client bounds */ + coords_offs.x = max(min(coords_orig->x, infoPtr->rcList.right), 0); + coords_offs.y = max(min(coords_orig->y, infoPtr->rcList.bottom), 0); + + /* Get offset */ + LISTVIEW_GetOrigin(infoPtr, &offset); + + /* Offset coordinates by the appropriate amount */ + coords_offs.x -= offset.x; + coords_offs.y -= offset.y; + + if (coords_offs.x > infoPtr->marqueeOrigin.x) { rect.left = infoPtr->marqueeOrigin.x; - rect.right = coords_offs->x; + rect.right = coords_offs.x; } else { - rect.left = coords_offs->x; + rect.left = coords_offs.x; rect.right = infoPtr->marqueeOrigin.x; } - if (coords_offs->y > infoPtr->marqueeOrigin.y) + if (coords_offs.y > infoPtr->marqueeOrigin.y) { rect.top = infoPtr->marqueeOrigin.y; - rect.bottom = coords_offs->y; + rect.bottom = coords_offs.y; } else { - rect.top = coords_offs->y; + rect.top = coords_offs.y; rect.bottom = infoPtr->marqueeOrigin.y; } @@ -3895,7 +3906,7 @@ static void LISTVIEW_MarqueeHighlight(LISTVIEW_INFO *infoPtr, const POINT *coord infoPtr->marqueeRect = rect; infoPtr->marqueeDrawRect = rect; - OffsetRect(&infoPtr->marqueeDrawRect, offset->x, offset->y); + OffsetRect(&infoPtr->marqueeDrawRect, offset.x, offset.y); iterator_frameditems_absolute(&new_elems, infoPtr, &infoPtr->marqueeRect); iterator_remove_common_items(&old_elems, &new_elems); @@ -3960,9 +3971,7 @@ static VOID CALLBACK LISTVIEW_ScrollTimer(HWND hWnd, UINT uMsg, UINT_PTR idEvent { LISTVIEW_INFO *infoPtr; SCROLLINFO scrollInfo; - POINT coords_orig; - POINT coords_offs; - POINT offset; + POINT coords; INT scroll = 0; infoPtr = (LISTVIEW_INFO *) idEvent; @@ -3971,19 +3980,8 @@ static VOID CALLBACK LISTVIEW_ScrollTimer(HWND hWnd, UINT uMsg, UINT_PTR idEvent return; /* Get the current cursor position and convert to client coordinates */ - GetCursorPos(&coords_orig); - ScreenToClient(hWnd, &coords_orig); - - /* Ensure coordinates are within client bounds */ - coords_offs.x = max(min(coords_orig.x, infoPtr->rcList.right), 0); - coords_offs.y = max(min(coords_orig.y, infoPtr->rcList.bottom), 0); - - /* Get offset */ - LISTVIEW_GetOrigin(infoPtr, &offset); - - /* Offset coordinates by the appropriate amount */ - coords_offs.x -= offset.x; - coords_offs.y -= offset.y; + GetCursorPos(&coords); + ScreenToClient(hWnd, &coords); scrollInfo.cbSize = sizeof(SCROLLINFO); scrollInfo.fMask = SIF_ALL; @@ -4007,12 +4005,12 @@ static VOID CALLBACK LISTVIEW_ScrollTimer(HWND hWnd, UINT uMsg, UINT_PTR idEvent scroll |= SCROLL_RIGHT; } - if (((coords_orig.x <= 0) && (scroll & SCROLL_LEFT)) || - ((coords_orig.y <= 0) && (scroll & SCROLL_UP)) || - ((coords_orig.x >= infoPtr->rcList.right) && (scroll & SCROLL_RIGHT)) || - ((coords_orig.y >= infoPtr->rcList.bottom) && (scroll & SCROLL_DOWN))) + if (((coords.x <= 0) && (scroll & SCROLL_LEFT)) || + ((coords.y <= 0) && (scroll & SCROLL_UP)) || + ((coords.x >= infoPtr->rcList.right) && (scroll & SCROLL_RIGHT)) || + ((coords.y >= infoPtr->rcList.bottom) && (scroll & SCROLL_DOWN))) { - LISTVIEW_MarqueeHighlight(infoPtr, &coords_orig, &coords_offs, &offset, scroll); + LISTVIEW_MarqueeHighlight(infoPtr, &coords, scroll); } } @@ -4034,6 +4032,9 @@ static LRESULT LISTVIEW_MouseMove(LISTVIEW_INFO *infoPtr, WORD fwKeys, INT x, IN RECT rect; POINT pt; + pt.x = x; + pt.y = y; + if (!(fwKeys & MK_LBUTTON)) infoPtr->bLButtonDown = FALSE; @@ -4046,24 +4047,6 @@ static LRESULT LISTVIEW_MouseMove(LISTVIEW_INFO *infoPtr, WORD fwKeys, INT x, IN if (infoPtr->bMarqueeSelect) { - POINT coords_orig; - POINT coords_offs; - POINT offset; - - coords_orig.x = x; - coords_orig.y = y; - - /* Get offset */ - LISTVIEW_GetOrigin(infoPtr, &offset); - - /* Ensure coordinates are within client bounds */ - coords_offs.x = max(min(x, infoPtr->rcList.right), 0); - coords_offs.y = max(min(y, infoPtr->rcList.bottom), 0); - - /* Offset coordinates by the appropriate amount */ - coords_offs.x -= offset.x; - coords_offs.y -= offset.y; - /* Enable the timer if we're going outside our bounds, in case the user doesn't move the mouse again */ @@ -4082,13 +4065,10 @@ static LRESULT LISTVIEW_MouseMove(LISTVIEW_INFO *infoPtr, WORD fwKeys, INT x, IN KillTimer(infoPtr->hwndSelf, (UINT_PTR) infoPtr); } - LISTVIEW_MarqueeHighlight(infoPtr, &coords_orig, &coords_offs, &offset, 0); + LISTVIEW_MarqueeHighlight(infoPtr, &pt, 0); return 0; } - pt.x = x; - pt.y = y; - ht.pt = pt; LISTVIEW_HitTest(infoPtr, &ht, TRUE, TRUE);

1 0

Jacek Caban : ieproxy: Added IPersistHistory proxy/stub.
by Alexandre Julliard 14 Nov '17

14 Nov '17

Module: wine Branch: master Commit: 00eba519dc7c841e7e4de1976ed3a83cb2f5a536 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00eba519dc7c841e7e4de1976… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 14 17:39:36 2017 +0100 ieproxy: Added IPersistHistory proxy/stub. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ieproxy/Makefile.in | 7 ++++--- dlls/ieproxy/ieproxy_perhist.idl | 30 ++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 3 deletions(-) diff --git a/dlls/ieproxy/Makefile.in b/dlls/ieproxy/Makefile.in index c36a7f6..00c5fd1 100644 --- a/dlls/ieproxy/Makefile.in +++ b/dlls/ieproxy/Makefile.in @@ -1,7 +1,8 @@ MODULE = ieproxy.dll -IMPORTS = uuid rpcrt4 +IMPORTS = uuid ole32 rpcrt4 IDL_SRCS = \ - ieproxy_ieautomation.idl + ieproxy_ieautomation.idl \ + ieproxy_perhist.idl -dlldata_EXTRADEFS = -DWINE_REGISTER_DLL -DPROXY_CLSID=CLSID_PSFactoryBuffer +dlldata_EXTRADEFS = -DWINE_REGISTER_DLL -DPROXY_DELEGATION -DPROXY_CLSID=CLSID_PSFactoryBuffer diff --git a/dlls/ieproxy/ieproxy_perhist.idl b/dlls/ieproxy/ieproxy_perhist.idl new file mode 100644 index 0000000..12268f5 --- /dev/null +++ b/dlls/ieproxy/ieproxy_perhist.idl @@ -0,0 +1,30 @@ +/* + * Copyright 2017 Jacek Caban 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 + */ + +/* just a wrapper for perhist.idl */ + +#pragma makedep proxy +#pragma makedep register + +#include "perhist.idl" + +[ + threading(both), + uuid(a4a1a128-768f-41e0-bf75-e4fddd701cba) /* IInternetExplorerManager */ +] +coclass PSFactoryBuffer { interface IFactoryBuffer; }

1 0

Akihiro Sagawa : imm32/tests: Add a skip message when composition string isn't available.
by Alexandre Julliard 14 Nov '17

14 Nov '17

Module: wine Branch: master Commit: c1dac18c6ae9b19b1549242867e7707807041f2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1dac18c6ae9b19b154924286… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed Nov 15 00:18:47 2017 +0900 imm32/tests: Add a skip message when composition string isn't available. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/imm32/tests/imm32.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index b02f85d..99d95c1 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -361,11 +361,19 @@ static void test_ImmGetCompositionString(void) static const WCHAR string[] = {'w','i','n','e',0x65e5,0x672c,0x8a9e}; char cstring[20]; WCHAR wstring[20]; - DWORD len; - DWORD alen,wlen; + LONG len; + LONG alen,wlen; + BOOL ret; imc = ImmGetContext(hwnd); - ImmSetCompositionStringW(imc, SCS_SETSTR, string, sizeof(string), NULL,0); + ret = ImmSetCompositionStringW(imc, SCS_SETSTR, string, sizeof(string), NULL,0); + if (!ret) { + win_skip("Composition isn't supported\n"); + ImmReleaseContext(hwnd, imc); + return; + } + msg_spy_flush_msgs(); + alen = ImmGetCompositionStringA(imc, GCS_COMPSTR, cstring, 20); wlen = ImmGetCompositionStringW(imc, GCS_COMPSTR, wstring, 20); /* windows machines without any IME installed just return 0 above */ @@ -376,6 +384,9 @@ static void test_ImmGetCompositionString(void) len = ImmGetCompositionStringA(imc, GCS_COMPATTR, NULL, 0); ok(len==alen,"GCS_COMPATTR(A) not returning correct count\n"); } + else + win_skip("Composition string isn't available\n"); + ImmReleaseContext(hwnd, imc); }

1 0

Akihiro Sagawa : imm32/tests: Add more composition string tests.
by Alexandre Julliard 14 Nov '17

14 Nov '17

Module: wine Branch: master Commit: 3955ce1e0a882cce7237920ad06d176a14da7a27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3955ce1e0a882cce7237920ad… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed Nov 15 00:18:49 2017 +0900 imm32/tests: Add more composition string tests. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/imm32/tests/imm32.c | 141 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 141 insertions(+) diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index 99d95c1..bf0f4b2 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -355,6 +355,63 @@ static void test_ImmNotifyIME(void) { } +static struct { + WNDPROC old_wnd_proc; + BOOL catch_result_str; + BOOL catch_ime_char; + DWORD start; + DWORD timer_id; +} ime_composition_test; + +static LRESULT WINAPI test_ime_wnd_proc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) +{ + switch (msg) + { + case WM_IME_COMPOSITION: + if ((lParam & GCS_RESULTSTR) && !ime_composition_test.catch_result_str) { + WCHAR wstring[20]; + HIMC imc; + LONG size; + LRESULT ret; + + ret = CallWindowProcA(ime_composition_test.old_wnd_proc, + hWnd, msg, wParam, lParam); + + imc = ImmGetContext(hWnd); + size = ImmGetCompositionStringW(imc, GCS_RESULTSTR, + wstring, sizeof(wstring)); + todo_wine + ok(size > 0, "ImmGetCompositionString(GCS_RESULTSTR) is %d\n", size); + ImmReleaseContext(hwnd, imc); + + ime_composition_test.catch_result_str = TRUE; + return ret; + } + break; + case WM_IME_CHAR: + if (!ime_composition_test.catch_ime_char) + ime_composition_test.catch_ime_char = TRUE; + break; + case WM_TIMER: + if (wParam == ime_composition_test.timer_id) { + HWND parent = GetParent(hWnd); + char title[64]; + int left = 20 - (GetTickCount() - ime_composition_test.start) / 1000; + wsprintfA(title, "%sLeft %d sec. - IME composition test", + ime_composition_test.catch_result_str ? "[*] " : "", left); + SetWindowTextA(parent, title); + if (left <= 0) + DestroyWindow(parent); + else + SetTimer(hWnd, wParam, 100, NULL); + return TRUE; + } + break; + } + return CallWindowProcA(ime_composition_test.old_wnd_proc, + hWnd, msg, wParam, lParam); +} + static void test_ImmGetCompositionString(void) { HIMC imc; @@ -364,6 +421,7 @@ static void test_ImmGetCompositionString(void) LONG len; LONG alen,wlen; BOOL ret; + DWORD prop; imc = ImmGetContext(hwnd); ret = ImmSetCompositionStringW(imc, SCS_SETSTR, string, sizeof(string), NULL,0); @@ -388,6 +446,89 @@ static void test_ImmGetCompositionString(void) win_skip("Composition string isn't available\n"); ImmReleaseContext(hwnd, imc); + + /* Test composition results input by IMM API */ + prop = ImmGetProperty(GetKeyboardLayout(0), IGP_SETCOMPSTR); + if (!(prop & SCS_CAP_COMPSTR)) { + /* Wine's IME doesn't support SCS_SETSTR in ImmSetCompositionString */ + skip("This IME doesn't support SCS_SETSTR\n"); + } + else { + ime_composition_test.old_wnd_proc = + (WNDPROC)SetWindowLongPtrA(hwnd, GWLP_WNDPROC, + (LONG_PTR)test_ime_wnd_proc); + imc = ImmGetContext(hwnd); + msg_spy_flush_msgs(); + + ret = ImmSetCompositionStringW(imc, SCS_SETSTR, + string, sizeof(string), NULL,0); + ok(ret, "ImmSetCompositionStringW failed\n"); + wlen = ImmGetCompositionStringW(imc, GCS_COMPSTR, + wstring, sizeof(wstring)); + if (wlen > 0) { + ret = ImmNotifyIME(imc, NI_COMPOSITIONSTR, CPS_COMPLETE, 0); + ok(ret, "ImmNotifyIME(CPS_COMPLETE) failed\n"); + msg_spy_flush_msgs(); + ok(ime_composition_test.catch_result_str, + "WM_IME_COMPOSITION(GCS_RESULTSTR) isn't sent\n"); + ok(ime_composition_test.catch_ime_char, + "WM_IME_CHAR isn't sent\n"); + } + else + win_skip("Composition string isn't available\n"); + ImmReleaseContext(hwnd, imc); + SetWindowLongPtrA(hwnd, GWLP_WNDPROC, + (LONG_PTR)ime_composition_test.old_wnd_proc); + msg_spy_flush_msgs(); + } + + /* Test composition results input by hand */ + memset(&ime_composition_test, 0, sizeof(ime_composition_test)); + if (winetest_interactive) { + HWND hwndMain, hwndChild; + MSG msg; + const DWORD MY_TIMER = 0xcaffe; + + hwndMain = CreateWindowExA(WS_EX_CLIENTEDGE, wndcls, + "IME composition test", + WS_OVERLAPPEDWINDOW | WS_VISIBLE, + CW_USEDEFAULT, CW_USEDEFAULT, 320, 160, + NULL, NULL, GetModuleHandleA(NULL), NULL); + hwndChild = CreateWindowExA(0, "static", + "Input a DBCS character here using IME.", + WS_CHILD | WS_VISIBLE | 0 + /* ES_AUTOHSCROLL | ES_MULTILINE */, + 0, 0, 320, 100, hwndMain, NULL, + GetModuleHandleA(NULL), NULL); + + ime_composition_test.old_wnd_proc = + (WNDPROC)SetWindowLongPtrA(hwndChild, GWLP_WNDPROC, + (LONG_PTR)test_ime_wnd_proc); + + SetFocus(hwndChild); + + /* FIXME: In wine, IME UI window is created in ImmSetOpenStatus(). + So, we prepare it here to generate WM_IME_CHAR messages. */ + imc = ImmGetContext(hwndChild); + ImmSetOpenStatus(imc, FALSE); + ImmReleaseContext(hwndChild, imc); + + ime_composition_test.timer_id = MY_TIMER; + ime_composition_test.start = GetTickCount(); + SetTimer(hwndChild, ime_composition_test.timer_id, 100, NULL); + while (GetMessageA(&msg, NULL, 0, 0)) { + TranslateMessage(&msg); + DispatchMessageA(&msg); + if (!IsWindow(hwndMain)) + break; + } + if (!ime_composition_test.catch_result_str) + skip("WM_IME_COMPOSITION(GCS_RESULTSTR) isn't tested\n"); + else + ok(ime_composition_test.catch_ime_char, + "WM_IME_CHAR isn't sent\n"); + msg_spy_flush_msgs(); + } } static void test_ImmSetCompositionString(void)

1 0

Francois Gouget : testbot: CompareTaskStatus() is not really needed. Remove it.
by Alexandre Julliard 14 Nov '17

14 Nov '17

Module: tools Branch: master Commit: da850add297378c3b21e354894873e10e7a1c953 URL: http://source.winehq.org/git/tools.git/?a=commit;h=da850add297378c3b21e3548… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Nov 13 17:06:24 2017 +0100 testbot: CompareTaskStatus() is not really needed. Remove it. The scheduler only cares about queued Tasks so there is no need to compare their Status fields. So the comparison code can easily be inlined like for Steps. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Jobs.pm | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm index c787e8a..c6eb290 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -404,11 +404,6 @@ sub CompareJobPriority return $a->Priority <=> $b->Priority || $a->Id <=> $b->Id; } -sub CompareTaskStatus -{ - return $b->Status cmp $a->Status || $a->No <=> $b->No; -} - sub min(@) { my $m = shift @_; @@ -543,7 +538,7 @@ sub ScheduleOnHost($$$) my $PrepareNextStep; my $Tasks = $Step->Tasks; $Tasks->AddFilter("Status", ["queued"]); - my @SortedTasks = sort CompareTaskStatus @{$Tasks->GetItems()}; + my @SortedTasks = sort { $a->No <=> $b->No } @{$Tasks->GetItems()}; foreach my $Task (@SortedTasks) { my $VM = $Task->VM; @@ -591,7 +586,7 @@ sub ScheduleOnHost($$$) my $Step = $SortedSteps[1]; $Tasks = $Step->Tasks; $Tasks->AddFilter("Status", ["queued"]); - @SortedTasks = sort CompareTaskStatus @{$Tasks->GetItems()}; + @SortedTasks = sort { $a->No <=> $b->No } @{$Tasks->GetItems()}; foreach my $Task (@SortedTasks) { my $VM = $Task->VM;

1 0

Francois Gouget : Revert "Add retrieve of test data files".
by Alexandre Julliard 14 Nov '17

14 Nov '17

Module: tools Branch: master Commit: 149fa941475070ab88119ecd12462bf4741d1b71 URL: http://source.winehq.org/git/tools.git/?a=commit;h=149fa941475070ab88119ecd… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Nov 13 17:06:56 2017 +0100 Revert "Add retrieve of test data files". The TestBot never creates a TestFiles.zip file in the Task directory so this is dead code. Also there is no plan to make use of that functionality so the code can be removed. This reverts commit 04a67fce26fb2fed64777239594c9c20ef56e6d7. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/GetFile.pl | 40 +++++++--------------------------------- testbot/web/JobDetails.pl | 11 ----------- 2 files changed, 7 insertions(+), 44 deletions(-) diff --git a/testbot/web/GetFile.pl b/testbot/web/GetFile.pl index 4c6e1e2..54d4c4b 100644 --- a/testbot/web/GetFile.pl +++ b/testbot/web/GetFile.pl @@ -28,7 +28,7 @@ use WineTestBot::Steps; sub GetFile($$$$) { - my ($Request, $JobKey, $StepKey, $TaskKey) = @_; + my ($Request, $JobKey, $StepKey) = @_; # Validate and untaint if (! ($JobKey =~ m/^(\d+)$/)) @@ -41,18 +41,6 @@ sub GetFile($$$$) return !1; } $StepKey = $1; - if (! defined($TaskKey)) - { - $TaskKey = undef; - } - elsif ($TaskKey =~ m/^(\d+)$/) - { - $TaskKey = $1; - } - else - { - return !1; - } my $Job = CreateJobs()->GetItem($JobKey); if (! defined($Job)) @@ -65,9 +53,7 @@ sub GetFile($$$$) return !1; } - my $FileName = "$DataDir/jobs/$JobKey/$StepKey/" . - (defined($TaskKey) ? "$TaskKey/TestFiles.zip" : - $Step->FileName); + my $FileName = "$DataDir/jobs/$JobKey/$StepKey/" . $Step->FileName; if (! sysopen(FILE, $FileName, O_RDONLY)) { return !1; @@ -100,21 +86,10 @@ sub GetFile($$$$) # HTTP/1.0 $Request->headers_out->add("Pragma", "no-cache"); - if (defined($TaskKey)) - { - # Zip file - $Request->content_type("application/zip"); - $Request->headers_out->add("Content-Disposition", - 'attachment; filename="TestFiles.zip"'); - } - else - { - # Binary file - $Request->content_type("application/octet-stream"); - $Request->headers_out->add("Content-Disposition", - 'attachment; filename="' . $Step->FileName . - '"'); - } + # Binary file + $Request->content_type("application/octet-stream"); + $Request->headers_out->add("Content-Disposition", + 'attachment; filename="' . $Step->FileName . '"'); print $ImageBytes; @@ -126,8 +101,7 @@ my $Request = shift; my $CGIObj = CGI->new($Request); my $JobKey = $CGIObj->param("JobKey"); my $StepKey = $CGIObj->param("StepKey"); -my $TaskKey = $CGIObj->param("TaskKey"); -if (! GetFile($Request, $JobKey, $StepKey, $TaskKey)) +if (! GetFile($Request, $JobKey, $StepKey)) { $Request->headers_out->set("Location", "/"); $Request->status(Apache2::Const::REDIRECT); diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index c5803ed..a4ed994 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -322,17 +322,6 @@ sub GenerateBody($) "'>Show full log</a></div>\n"; } } - my $TestFilesName = "$TaskDir/TestFiles.zip"; - if (-r $TestFilesName) - { - my $URI = "/GetFile.pl?JobKey=" . uri_escape($self->{JobId}) . - "&StepKey=" . uri_escape($Item->StepNo) . - "&TaskKey=" . uri_escape($Item->TaskNo); - print "<div class='TaskMoreInfoLink'><a href='" . - $self->CGI->escapeHTML($URI) . - "'>Retrieve test files</a></div>\n"; - } - print "</div>\n"; if (open LOGFILE, "<$LogName") {

1 0