wine-commits January 2017

wine-commits@winehq.org

2 participants
492 discussions

Józef Kucia : ddraw: Relax "dwSize" validation in ddraw_surface*_Lock().
by Alexandre Julliard 25 Jan '17

25 Jan '17

Module: wine Branch: master Commit: 2bef0eafd03430189e88f535ffa3d3b9a981b678 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2bef0eafd03430189e88f535f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jan 17 12:26:37 2017 +0100 ddraw: Relax "dwSize" validation in ddraw_surface*_Lock(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/ddraw_private.h | 6 +-- dlls/ddraw/surface.c | 91 ++++++++++++++++++++++++++-------------------- dlls/ddraw/tests/ddraw7.c | 4 -- 3 files changed, 54 insertions(+), 47 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2bef0eafd03430189e88f…

1 0

Józef Kucia : ddraw: Cleanup ddraw7_GetAvailableVidMem().
by Alexandre Julliard 25 Jan '17

25 Jan '17

Module: wine Branch: master Commit: d7b3ef0783f66a40421544e2fe43a6dce5f0d556 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7b3ef0783f66a40421544e2f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jan 2 10:44:39 2017 +0100 ddraw: Cleanup ddraw7_GetAvailableVidMem(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/ddraw.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 3b4c628..e313a75 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -1886,7 +1886,7 @@ static HRESULT WINAPI ddraw1_GetVerticalBlankStatus(IDirectDraw *iface, BOOL *st * Returns the total and free video memory * * Params: - * Caps: Specifies the memory type asked for + * caps: Specifies the memory type asked for * total: Pointer to a DWORD to be filled with the total memory * free: Pointer to a DWORD to be filled with the free memory * @@ -1895,7 +1895,7 @@ static HRESULT WINAPI ddraw1_GetVerticalBlankStatus(IDirectDraw *iface, BOOL *st * DDERR_INVALIDPARAMS if free and total are NULL * *****************************************************************************/ -static HRESULT WINAPI ddraw7_GetAvailableVidMem(IDirectDraw7 *iface, DDSCAPS2 *Caps, DWORD *total, +static HRESULT WINAPI ddraw7_GetAvailableVidMem(IDirectDraw7 *iface, DDSCAPS2 *caps, DWORD *total, DWORD *free) { unsigned int framebuffer_size, total_vidmem, free_vidmem; @@ -1903,12 +1903,15 @@ static HRESULT WINAPI ddraw7_GetAvailableVidMem(IDirectDraw7 *iface, DDSCAPS2 *C struct wined3d_display_mode mode; HRESULT hr = DD_OK; - TRACE("iface %p, caps %p, total %p, free %p.\n", iface, Caps, total, free); + TRACE("iface %p, caps %p, total %p, free %p.\n", iface, caps, total, free); + + if (!total && !free) + return DDERR_INVALIDPARAMS; if (TRACE_ON(ddraw)) { TRACE("Asked for memory with description: "); - DDRAW_dump_DDSCAPS2(Caps); + DDRAW_dump_DDSCAPS2(caps); } wined3d_mutex_lock(); @@ -1917,12 +1920,6 @@ static HRESULT WINAPI ddraw7_GetAvailableVidMem(IDirectDraw7 *iface, DDSCAPS2 *C * resources, but that's not important */ - if( (!total) && (!free) ) - { - wined3d_mutex_unlock(); - return DDERR_INVALIDPARAMS; - } - /* Some applications (e.g. 3DMark 2000) assume that the reported amount of * video memory doesn't include the memory used by the default framebuffer. */

1 0

Jacek Caban : inetcomm: Added MimeHtmlProtocol stub implementation.
by Alexandre Julliard 25 Jan '17

25 Jan '17

Module: wine Branch: master Commit: 6832273ed8d39d51c3de44c9ec1bbdd3a8365248 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6832273ed8d39d51c3de44c9e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 25 12:05:47 2017 +0100 inetcomm: Added MimeHtmlProtocol stub implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inetcomm/Makefile.in | 1 + dlls/inetcomm/inetcomm_main.c | 9 +- dlls/inetcomm/inetcomm_private.h | 11 +++ dlls/inetcomm/protocol.c | 192 +++++++++++++++++++++++++++++++++++++++ dlls/inetcomm/tests/mimeole.c | 20 ++++ include/mimeole.idl | 2 + 6 files changed, 234 insertions(+), 1 deletion(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6832273ed8d39d51c3de4…

1 0

Jacek Caban : inetcomm: Register mhtml protocol handler.
by Alexandre Julliard 25 Jan '17

25 Jan '17

Module: wine Branch: master Commit: d5d9aa361adafca27671e2d11fec59d62bf454a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5d9aa361adafca27671e2d11… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 25 12:05:32 2017 +0100 inetcomm: Register mhtml protocol handler. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inetcomm/Makefile.in | 2 ++ dlls/inetcomm/inetcomm.idl | 7 +++++++ dlls/inetcomm/inetcomm.rc | 20 ++++++++++++++++++++ dlls/inetcomm/inetcomm.rgs | 13 +++++++++++++ 4 files changed, 42 insertions(+) diff --git a/dlls/inetcomm/Makefile.in b/dlls/inetcomm/Makefile.in index d00aa67..df25a68 100644 --- a/dlls/inetcomm/Makefile.in +++ b/dlls/inetcomm/Makefile.in @@ -11,4 +11,6 @@ C_SRCS = \ pop3transport.c \ smtptransport.c +RC_SRCS = inetcomm.rc + IDL_SRCS = inetcomm.idl diff --git a/dlls/inetcomm/inetcomm.idl b/dlls/inetcomm/inetcomm.idl index 03cd20a..ea4d716 100644 --- a/dlls/inetcomm/inetcomm.idl +++ b/dlls/inetcomm/inetcomm.idl @@ -124,3 +124,10 @@ coclass IPropFindRequest { interface IPropFindRequest; } uuid(ea678830-235d-11d2-a8b6-0000f8084f96) ] coclass IPropPatchRequest { interface IPropPatchRequest; } + +[ + helpstring("MHTML Asynchronous Pluggable Protocol Handler"), + threading(both), + uuid(05300401-bcbc-11d0-85e3-00c04fd85ab4) +] +coclass MimeHtmlProtocol { interface IInternetProtocol; } diff --git a/dlls/inetcomm/inetcomm.rc b/dlls/inetcomm/inetcomm.rc new file mode 100644 index 0000000..94f51ce --- /dev/null +++ b/dlls/inetcomm/inetcomm.rc @@ -0,0 +1,20 @@ +/* + * Copyright 2016 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 + */ + +/* @makedep: inetcomm.rgs */ +1 WINE_REGISTRY inetcomm.rgs diff --git a/dlls/inetcomm/inetcomm.rgs b/dlls/inetcomm/inetcomm.rgs new file mode 100644 index 0000000..dbbae08 --- /dev/null +++ b/dlls/inetcomm/inetcomm.rgs @@ -0,0 +1,13 @@ +HKCR +{ + NoRemove PROTOCOLS + { + NoRemove Handler + { + ForceRemove mhtml = s 'MHTML Asynchronous Pluggable Protocol Handler' + { + val CLSID = s '{05300401-bcbc-11d0-85e3-00c04fd85ab4}' + } + } + } +}

1 0

Jacek Caban : mshtml: Added MHTMLDocument object class factory stub implementation.
by Alexandre Julliard 25 Jan '17

25 Jan '17

Module: wine Branch: master Commit: 0e8c7bece60d4c1ea51ebdab81de309851f13f6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e8c7bece60d4c1ea51ebdab8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 25 11:56:40 2017 +0100 mshtml: Added MHTMLDocument object class factory stub implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 6 ++++++ dlls/mshtml/main.c | 4 +++- dlls/mshtml/mshtml_private.h | 1 + include/mshtml.idl | 2 ++ 4 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index cf9344f..b409e7d 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -5105,3 +5105,9 @@ HRESULT HTMLDocument_Create(IUnknown *pUnkOuter, REFIID riid, void** ppvObject) return S_OK; } + +HRESULT MHTMLDocument_Create(IUnknown *outer, REFIID riid, void **ppv) +{ + FIXME("(%p %s %p)\n", outer, debugstr_mshtml_guid(riid), ppv); + return E_NOTIMPL; +} diff --git a/dlls/mshtml/main.c b/dlls/mshtml/main.c index 2a00aee..ad6bb2b 100644 --- a/dlls/mshtml/main.c +++ b/dlls/mshtml/main.c @@ -339,6 +339,9 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) if(IsEqualGUID(&CLSID_HTMLDocument, rclsid)) { TRACE("(CLSID_HTMLDocument %s %p)\n", debugstr_mshtml_guid(riid), ppv); return ClassFactory_Create(riid, ppv, HTMLDocument_Create); + }else if(IsEqualGUID(&CLSID_MHTMLDocument, rclsid)) { + TRACE("(CLSID_MHTMLDocument %s %p)\n", debugstr_mshtml_guid(riid), ppv); + return ClassFactory_Create(riid, ppv, MHTMLDocument_Create); }else if(IsEqualGUID(&CLSID_AboutProtocol, rclsid)) { TRACE("(CLSID_AboutProtocol %s %p)\n", debugstr_mshtml_guid(riid), ppv); return ProtocolFactory_Create(rclsid, riid, ppv); @@ -441,7 +444,6 @@ DEFINE_GUID(CLSID_HTMLServerDoc, 0x3050F4E7, 0x98B5, 0x11CF, 0xBB,0x82, 0x00,0xA DEFINE_GUID(CLSID_IImageDecodeFilter, 0x607FD4E8, 0x0A03, 0x11D1, 0xAB,0x1D, 0x00,0xC0,0x4F,0xC9,0xB3,0x04); DEFINE_GUID(CLSID_IImgCtx, 0x3050F3D6, 0x98B5, 0x11CF, 0xBB,0x82, 0x00,0xAA,0x00,0xBD,0xCE,0x0B); DEFINE_GUID(CLSID_IntDitherer, 0x05F6FE1A, 0xECEF, 0x11D0, 0xAA,0xE7, 0x00,0xC0,0x4F,0xC9,0xB3,0x04); -DEFINE_GUID(CLSID_MHTMLDocument, 0x3050F3D9, 0x98B5, 0x11CF, 0xBB,0x82, 0x00,0xAA,0x00,0xBD,0xCE,0x0B); DEFINE_GUID(CLSID_TridentAPI, 0x429AF92C, 0xA51F, 0x11D2, 0x86,0x1E, 0x00,0xC0,0x4F,0xA3,0x5C,0x89); #define INF_SET_ID(id) \ diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 1d4dcc5..5a559ea 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -823,6 +823,7 @@ struct HTMLDocumentNode { }; HRESULT HTMLDocument_Create(IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; +HRESULT MHTMLDocument_Create(IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; HRESULT HTMLLoadOptions_Create(IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; HRESULT create_doc_from_nsdoc(nsIDOMHTMLDocument*,HTMLDocumentObj*,HTMLInnerWindow*,HTMLDocumentNode**) DECLSPEC_HIDDEN; diff --git a/include/mshtml.idl b/include/mshtml.idl index f004f39..cbcb44f 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -33,6 +33,8 @@ import "dispex.idl"; cpp_quote("#include <olectl.h>") +cpp_quote("DEFINE_GUID(CLSID_MHTMLDocument, 0x3050f3d9,0x98b5,0x11cf,0xbb,0x82,0x00,0xaa,0x00,0xbd,0xce,0x0b);") + cpp_quote("DEFINE_GUID(SID_SEditCommandTarget, 0x3050f4b5,0x98b5,0x11cf,0xbb,0x82,0x00,0xaa,0x00,0xbd,0xce,0x0b);") cpp_quote("DEFINE_GUID(SID_SHTMLEditHost, 0x3050f6a0,0x98b5,0x11cf,0xbb,0x82,0x00,0xaa,0x00,0xbd,0xce,0x0b);") cpp_quote("DEFINE_GUID(SID_SHTMLEditServices, 0x3050f7f9,0x98b5,0x11cf,0xbb,0x82,0x00,0xaa,0x00,0xbd,0xce,0x0b);")

1 0

Jacek Caban : urlmon: Added Seek implementations for streams using cache file.
by Alexandre Julliard 25 Jan '17

25 Jan '17

Module: wine Branch: master Commit: 32671b1d2f7b1d92264abd76b67fbb0985f86607 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32671b1d2f7b1d92264abd76b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 25 11:52:59 2017 +0100 urlmon: Added Seek implementations for streams using cache file. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/binding.c | 36 ++++++++++++++++++++++++++++++++-- dlls/urlmon/tests/url.c | 51 +++++++++++++++++++++++++++++++++++++++---------- 2 files changed, 75 insertions(+), 12 deletions(-) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index 9b78582..88b3c1c 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -520,8 +520,40 @@ static HRESULT WINAPI ProtocolStream_Seek(IStream *iface, LARGE_INTEGER dlibMove DWORD dwOrigin, ULARGE_INTEGER *plibNewPosition) { ProtocolStream *This = impl_from_IStream(iface); - FIXME("(%p)->(%d %08x %p)\n", This, dlibMove.u.LowPart, dwOrigin, plibNewPosition); - return E_NOTIMPL; + LARGE_INTEGER new_pos; + DWORD method; + + TRACE("(%p)->(%d %08x %p)\n", This, dlibMove.u.LowPart, dwOrigin, plibNewPosition); + + if(This->buf->file == INVALID_HANDLE_VALUE) { + /* We should probably call protocol handler's Seek. */ + FIXME("no cache file, not supported\n"); + return E_FAIL; + } + + switch(dwOrigin) { + case STREAM_SEEK_SET: + method = FILE_BEGIN; + break; + case STREAM_SEEK_CUR: + method = FILE_CURRENT; + break; + case STREAM_SEEK_END: + method = FILE_END; + break; + default: + WARN("Invalid origin %x\n", dwOrigin); + return E_FAIL; + } + + if(!SetFilePointerEx(This->buf->file, dlibMove, &new_pos, method)) { + FIXME("SetFilePointerEx failed: %u\n", GetLastError()); + return E_FAIL; + } + + if(plibNewPosition) + plibNewPosition->QuadPart = new_pos.QuadPart; + return S_OK; } static HRESULT WINAPI ProtocolStream_SetSize(IStream *iface, ULARGE_INTEGER libNewSize) diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index 9ccd8ef..cd1d855 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -1949,6 +1949,31 @@ static HRESULT WINAPI statusclb_GetBindInfo(IBindStatusCallbackEx *iface, DWORD return S_OK; } +static void test_stream_seek(IStream *stream) +{ + ULARGE_INTEGER new_pos; + LARGE_INTEGER pos; + HRESULT hres; + + pos.QuadPart = 0; + new_pos.QuadPart = 0xdeadbeef; + hres = IStream_Seek(stream, pos, STREAM_SEEK_SET, &new_pos); + ok(hres == S_OK, "Seek failed: %08x\n", hres); + ok(!new_pos.QuadPart, "new_pos.QuadPart != 0\n"); + + pos.QuadPart = 0; + new_pos.QuadPart = 0xdeadbeef; + hres = IStream_Seek(stream, pos, STREAM_SEEK_END, &new_pos); + ok(hres == S_OK, "Seek failed: %08x\n", hres); + ok(new_pos.QuadPart, "new_pos.QuadPart = 0\n"); + + pos.QuadPart = 0; + new_pos.QuadPart = 0xdeadbeef; + hres = IStream_Seek(stream, pos, 100, &new_pos); + ok(hres == E_FAIL, "Seek failed: %08x\n", hres); + ok(new_pos.QuadPart == 0xdeadbeef, "unexpected new_pos.QuadPart\n"); +} + static HRESULT WINAPI statusclb_OnDataAvailable(IBindStatusCallbackEx *iface, DWORD grfBSCF, DWORD dwSize, FORMATETC* pformatetc, STGMEDIUM* pstgmed) { @@ -1995,24 +2020,28 @@ static HRESULT WINAPI statusclb_OnDataAvailable(IBindStatusCallbackEx *iface, DW ok(pstgmed->pUnkForRelease != NULL, "pUnkForRelease == NULL\n"); switch(pstgmed->tymed) { - case TYMED_ISTREAM: + case TYMED_ISTREAM: { + IStream *stream = U(*pstgmed).pstm; + + ok(stream != NULL, "U(*pstgmed).pstm == NULL\n"); + if(grfBSCF & BSCF_FIRSTDATANOTIFICATION) { STATSTG stat; - hres = IStream_Write(U(*pstgmed).pstm, buf, 10, NULL); + hres = IStream_Write(stream, buf, 10, NULL); ok(hres == STG_E_ACCESSDENIED, "Write failed: %08x, expected STG_E_ACCESSDENIED\n", hres); - hres = IStream_Commit(U(*pstgmed).pstm, 0); + hres = IStream_Commit(stream, 0); ok(hres == E_NOTIMPL, "Commit failed: %08x, expected E_NOTIMPL\n", hres); - hres = IStream_Revert(U(*pstgmed).pstm); + hres = IStream_Revert(stream); ok(hres == E_NOTIMPL, "Revert failed: %08x, expected E_NOTIMPL\n", hres); - hres = IStream_Stat(U(*pstgmed).pstm, NULL, STATFLAG_NONAME); + hres = IStream_Stat(stream, NULL, STATFLAG_NONAME); ok(hres == E_FAIL, "hres = %x\n", hres); if(use_cache_file && emulate_protocol) { - hres = IStream_Stat(U(*pstgmed).pstm, &stat, STATFLAG_DEFAULT); + hres = IStream_Stat(stream, &stat, STATFLAG_DEFAULT); ok(hres == S_OK, "hres = %x\n", hres); ok(!lstrcmpW(stat.pwcsName, cache_file_name), "stat.pwcsName = %s, cache_file_name = %s\n", @@ -2021,7 +2050,7 @@ static HRESULT WINAPI statusclb_OnDataAvailable(IBindStatusCallbackEx *iface, DW ok(U(stat.cbSize).LowPart == (bindf&BINDF_ASYNCHRONOUS?0:6500), "stat.cbSize.LowPart = %u\n", U(stat.cbSize).LowPart); } else { - hres = IStream_Stat(U(*pstgmed).pstm, &stat, STATFLAG_NONAME); + hres = IStream_Stat(stream, &stat, STATFLAG_NONAME); ok(hres == S_OK, "hres = %x\n", hres); ok(!stat.pwcsName || broken(stat.pwcsName!=NULL), "stat.pwcsName = %s\n", wine_dbgstr_w(stat.pwcsName)); @@ -2034,17 +2063,19 @@ static HRESULT WINAPI statusclb_OnDataAvailable(IBindStatusCallbackEx *iface, DW ok(stat.reserved == 0, "stat.reserved = %x\n", stat.reserved); } - ok(U(*pstgmed).pstm != NULL, "U(*pstgmed).pstm == NULL\n"); if(callback_read) { do { - hres = IStream_Read(U(*pstgmed).pstm, buf, 512, &readed); + hres = IStream_Read(stream, buf, 512, &readed); if(test_protocol == HTTP_TEST && emulate_protocol && readed) ok(buf[0] == (use_cache_file && !(bindf&BINDF_ASYNCHRONOUS) ? 'X' : '?'), "buf[0] = '%c'\n", buf[0]); }while(hres == S_OK); ok(hres == S_FALSE || hres == E_PENDING, "IStream_Read returned %08x\n", hres); } - break; + if(use_cache_file && (grfBSCF & BSCF_FIRSTDATANOTIFICATION) && !(bindf & BINDF_PULLDATA)) + test_stream_seek(stream); + break; + } case TYMED_FILE: if(test_protocol == FILE_TEST) ok(!lstrcmpW(pstgmed->u.lpszFileName, file_url+7),

1 0

Huw Davies : urlmon/tests: Windows 10 has changed the behaviour of domain detection.
by Alexandre Julliard 25 Jan '17

25 Jan '17

Module: wine Branch: master Commit: df6143325a78dea3ab5d62baff2affc6b9f00b43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df6143325a78dea3ab5d62baf… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jan 25 08:59:56 2017 +0000 urlmon/tests: Windows 10 has changed the behaviour of domain detection. The changes seem to be for the better, so the new values are not marked as broken. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/tests/uri.c | 98 ++++++++++++++++++++++++++++++++++++------------- 1 file changed, 72 insertions(+), 26 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=df6143325a78dea3ab5d6…

1 0

Fabian Maurer : gdi32: Add traces for painting functions.
by Alexandre Julliard 25 Jan '17

25 Jan '17

Module: wine Branch: master Commit: e0ad2c3e5f59ae977595915fcd8159e02ce1e2f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0ad2c3e5f59ae977595915fc… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Wed Jan 25 03:56:15 2017 +0100 gdi32: Add traces for painting functions. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/painting.c | 56 +++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 52 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/painting.c b/dlls/gdi32/painting.c index b12f312..d61ab4a 100644 --- a/dlls/gdi32/painting.c +++ b/dlls/gdi32/painting.c @@ -237,6 +237,8 @@ BOOL WINAPI LineTo( HDC hdc, INT x, INT y ) PHYSDEV physdev; BOOL ret; + TRACE( "%p, (%d, %d)\n", hdc, x, y ); + if(!dc) return FALSE; update_dc( dc ); @@ -262,6 +264,8 @@ BOOL WINAPI MoveToEx( HDC hdc, INT x, INT y, LPPOINT pt ) PHYSDEV physdev; DC * dc = get_dc_ptr( hdc ); + TRACE( "%p, (%d, %d), %p\n", hdc, x, y, pt ); + if(!dc) return FALSE; if(pt) @@ -288,6 +292,8 @@ BOOL WINAPI Arc( HDC hdc, INT left, INT top, INT right, BOOL ret; DC * dc = get_dc_ptr( hdc ); + TRACE( "%p, (%d, %d)-(%d, %d), (%d, %d), (%d, %d)\n", hdc, left, top, right, bottom, xstart, ystart, xend, yend ); + if (!dc) return FALSE; update_dc( dc ); physdev = GET_DC_PHYSDEV( dc, pArc ); @@ -315,8 +321,10 @@ BOOL WINAPI ArcTo( HDC hdc, PHYSDEV physdev; BOOL result; DC * dc = get_dc_ptr( hdc ); - if(!dc) return FALSE; + TRACE( "%p, (%d, %d)-(%d, %d), (%d, %d), (%d, %d)\n", hdc, left, top, right, bottom, xstart, ystart, xend, yend ); + + if(!dc) return FALSE; update_dc( dc ); physdev = GET_DC_PHYSDEV( dc, pArcTo ); result = physdev->funcs->pArcTo( physdev, left, top, right, bottom, xstart, ystart, xend, yend ); @@ -343,8 +351,10 @@ BOOL WINAPI Pie( HDC hdc, INT left, INT top, BOOL ret; PHYSDEV physdev; DC * dc = get_dc_ptr( hdc ); - if (!dc) return FALSE; + TRACE( "%p, (%d, %d)-(%d, %d), (%d, %d), (%d, %d)\n", hdc, left, top, right, bottom, xstart, ystart, xend, yend ); + + if (!dc) return FALSE; update_dc( dc ); physdev = GET_DC_PHYSDEV( dc, pPie ); ret = physdev->funcs->pPie( physdev, left, top, right, bottom, xstart, ystart, xend, yend ); @@ -363,8 +373,10 @@ BOOL WINAPI Chord( HDC hdc, INT left, INT top, BOOL ret; PHYSDEV physdev; DC * dc = get_dc_ptr( hdc ); - if (!dc) return FALSE; + TRACE( "%p, (%d, %d)-(%d, %d), (%d, %d), (%d, %d)\n", hdc, left, top, right, bottom, xstart, ystart, xend, yend ); + + if (!dc) return FALSE; update_dc( dc ); physdev = GET_DC_PHYSDEV( dc, pChord ); ret = physdev->funcs->pChord( physdev, left, top, right, bottom, xstart, ystart, xend, yend ); @@ -382,8 +394,10 @@ BOOL WINAPI Ellipse( HDC hdc, INT left, INT top, BOOL ret; PHYSDEV physdev; DC * dc = get_dc_ptr( hdc ); - if (!dc) return FALSE; + TRACE( "%p, (%d, %d)-(%d, %d)\n", hdc, left, top, right, bottom ); + + if (!dc) return FALSE; update_dc( dc ); physdev = GET_DC_PHYSDEV( dc, pEllipse ); ret = physdev->funcs->pEllipse( physdev, left, top, right, bottom ); @@ -402,6 +416,8 @@ BOOL WINAPI Rectangle( HDC hdc, INT left, INT top, BOOL ret; DC * dc = get_dc_ptr( hdc ); + TRACE( "%p, (%d, %d)-(%d, %d)\n", hdc, left, top, right, bottom ); + if (!dc) return FALSE; update_dc( dc ); physdev = GET_DC_PHYSDEV( dc, pRectangle ); @@ -421,6 +437,8 @@ BOOL WINAPI RoundRect( HDC hdc, INT left, INT top, INT right, BOOL ret; DC *dc = get_dc_ptr( hdc ); + TRACE( "%p, (%d, %d)-(%d, %d), %dx%d\n", hdc, left, top, right, bottom, ell_width, ell_height ); + if (!dc) return FALSE; update_dc( dc ); physdev = GET_DC_PHYSDEV( dc, pRoundRect ); @@ -534,6 +552,8 @@ BOOL WINAPI PaintRgn( HDC hdc, HRGN hrgn ) BOOL ret; DC * dc = get_dc_ptr( hdc ); + TRACE( "%p, %p\n", hdc, hrgn ); + if (!dc) return FALSE; update_dc( dc ); physdev = GET_DC_PHYSDEV( dc, pPaintRgn ); @@ -552,6 +572,8 @@ BOOL WINAPI FillRgn( HDC hdc, HRGN hrgn, HBRUSH hbrush ) BOOL retval; DC * dc = get_dc_ptr( hdc ); + TRACE( "%p, %p, %p\n", hdc, hrgn, hbrush ); + if (!dc) return FALSE; update_dc( dc ); physdev = GET_DC_PHYSDEV( dc, pFillRgn ); @@ -571,6 +593,8 @@ BOOL WINAPI FrameRgn( HDC hdc, HRGN hrgn, HBRUSH hbrush, BOOL ret; DC *dc = get_dc_ptr( hdc ); + TRACE( "%p, %p, %p, %dx%d\n", hdc, hrgn, hbrush, nWidth, nHeight ); + if (!dc) return FALSE; update_dc( dc ); physdev = GET_DC_PHYSDEV( dc, pFrameRgn ); @@ -589,6 +613,8 @@ BOOL WINAPI InvertRgn( HDC hdc, HRGN hrgn ) BOOL ret; DC *dc = get_dc_ptr( hdc ); + TRACE( "%p, %p\n", hdc, hrgn ); + if (!dc) return FALSE; update_dc( dc ); physdev = GET_DC_PHYSDEV( dc, pInvertRgn ); @@ -607,6 +633,8 @@ BOOL WINAPI Polyline( HDC hdc, const POINT* pt, INT count ) BOOL ret; DC * dc = get_dc_ptr( hdc ); + TRACE( "%p, %p, %d\n", hdc, pt, count ); + if (!dc) return FALSE; update_dc( dc ); physdev = GET_DC_PHYSDEV( dc, pPolyline ); @@ -624,6 +652,8 @@ BOOL WINAPI PolylineTo( HDC hdc, const POINT* pt, DWORD cCount ) PHYSDEV physdev; BOOL ret; + TRACE( "%p, %p, %u\n", hdc, pt, cCount ); + if(!dc) return FALSE; update_dc( dc ); @@ -647,6 +677,8 @@ BOOL WINAPI Polygon( HDC hdc, const POINT* pt, INT count ) BOOL ret; DC * dc = get_dc_ptr( hdc ); + TRACE( "%p, %p, %d\n", hdc, pt, count ); + if (!dc) return FALSE; update_dc( dc ); physdev = GET_DC_PHYSDEV( dc, pPolygon ); @@ -666,6 +698,8 @@ BOOL WINAPI PolyPolygon( HDC hdc, const POINT* pt, const INT* counts, BOOL ret; DC * dc = get_dc_ptr( hdc ); + TRACE( "%p, %p, %p, %u\n", hdc, pt, counts, polygons ); + if (!dc) return FALSE; update_dc( dc ); physdev = GET_DC_PHYSDEV( dc, pPolyPolygon ); @@ -684,6 +718,8 @@ BOOL WINAPI PolyPolyline( HDC hdc, const POINT* pt, const DWORD* counts, BOOL ret; DC * dc = get_dc_ptr( hdc ); + TRACE( "%p, %p, %p, %u\n", hdc, pt, counts, polylines ); + if (!dc) return FALSE; update_dc( dc ); physdev = GET_DC_PHYSDEV( dc, pPolyPolyline ); @@ -702,6 +738,8 @@ BOOL WINAPI ExtFloodFill( HDC hdc, INT x, INT y, COLORREF color, BOOL ret; DC * dc = get_dc_ptr( hdc ); + TRACE( "%p, (%d, %d), %08x, %x\n", hdc, x, y, color, fillType ); + if (!dc) return FALSE; update_dc( dc ); physdev = GET_DC_PHYSDEV( dc, pExtFloodFill ); @@ -739,6 +777,8 @@ BOOL WINAPI PolyBezier( HDC hdc, const POINT* lppt, DWORD cPoints ) BOOL ret; DC * dc; + TRACE( "%p, %p, %u\n", hdc, lppt, cPoints ); + /* cPoints must be 3 * n + 1 (where n>=1) */ if (cPoints == 1 || (cPoints % 3) != 1) return FALSE; @@ -771,6 +811,8 @@ BOOL WINAPI PolyBezierTo( HDC hdc, const POINT* lppt, DWORD cPoints ) BOOL ret; PHYSDEV physdev; + TRACE( "%p, %p, %u\n", hdc, lppt, cPoints ); + /* cbPoints must be 3 * n (where n>=1) */ if (!cPoints || (cPoints % 3) != 0) return FALSE; @@ -797,6 +839,8 @@ BOOL WINAPI AngleArc(HDC hdc, INT x, INT y, DWORD dwRadius, FLOAT eStartAngle, F BOOL result; DC *dc; + TRACE( "%p, (%d, %d), %u, %f, %f\n", hdc, x, y, dwRadius, eStartAngle, eSweepAngle ); + if( (signed int)dwRadius < 0 ) return FALSE; @@ -826,6 +870,8 @@ BOOL WINAPI PolyDraw(HDC hdc, const POINT *lppt, const BYTE *lpbTypes, PHYSDEV physdev; BOOL result; + TRACE( "%p, %p, %p, %u\n", hdc, lppt, lpbTypes, cCount ); + if(!dc) return FALSE; update_dc( dc ); @@ -851,6 +897,8 @@ BOOL WINAPI LineDDA(INT nXStart, INT nYStart, INT nXEnd, INT nYEnd, INT dx = nXEnd - nXStart; INT dy = nYEnd - nYStart; + TRACE( "(%d, %d), (%d, %d), %p, %lx\n", nXStart, nYStart, nXEnd, nYEnd, callback, lParam ); + if (dx < 0) { dx = -dx;

1 0

Nikolay Sivov : comctl32/tests: Use win_skip() for tests that should not be skipped on Wine.
by Alexandre Julliard 25 Jan '17

25 Jan '17

Module: wine Branch: master Commit: ad566da137f495a43d7c502146596d258f0d8f9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad566da137f495a43d7c50214… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 25 02:31:00 2017 +0300 comctl32/tests: Use win_skip() for tests that should not be skipped on Wine. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/datetime.c | 23 +++++++---------------- dlls/comctl32/tests/header.c | 2 +- dlls/comctl32/tests/monthcal.c | 2 +- dlls/comctl32/tests/mru.c | 2 +- 4 files changed, 10 insertions(+), 19 deletions(-) diff --git a/dlls/comctl32/tests/datetime.c b/dlls/comctl32/tests/datetime.c index 708921f..85fb940 100644 --- a/dlls/comctl32/tests/datetime.c +++ b/dlls/comctl32/tests/datetime.c @@ -527,23 +527,14 @@ static void test_dtm_set_and_get_system_time(void) { LRESULT r; SYSTEMTIME st, getSt, ref; - HWND hWnd, hWndDateTime_test_gdt_none; - - hWndDateTime_test_gdt_none = create_datetime_control(0); - - ok(hWndDateTime_test_gdt_none!=NULL, "Expected non NULL, got %p\n", hWndDateTime_test_gdt_none); - if(hWndDateTime_test_gdt_none) { - r = SendMessageA(hWndDateTime_test_gdt_none, DTM_SETSYSTEMTIME, GDT_NONE, (LPARAM)&st); - expect(0, r); - } - else { - skip("hWndDateTime_test_gdt_none is NULL\n"); - flush_sequences(sequences, NUM_MSG_SEQUENCES); + HWND hWnd; - return; - } + hWnd = create_datetime_control(0); + ok(hWnd !=NULL, "Expected non NULL, got %p\n", hWnd); + r = SendMessageA(hWnd, DTM_SETSYSTEMTIME, GDT_NONE, (LPARAM)&st); + expect(0, r); - DestroyWindow(hWndDateTime_test_gdt_none); + DestroyWindow(hWnd); hWnd = create_datetime_control(DTS_SHOWNONE); flush_sequences(sequences, NUM_MSG_SEQUENCES); @@ -797,7 +788,7 @@ START_TEST(datetime) pInitCommonControlsEx = (void*)GetProcAddress(hComctl32, "InitCommonControlsEx"); if (!pInitCommonControlsEx) { - skip("InitCommonControlsEx() is missing. Skipping the tests\n"); + win_skip("InitCommonControlsEx() is missing. Skipping the tests\n"); return; } iccex.dwSize = sizeof(iccex); diff --git a/dlls/comctl32/tests/header.c b/dlls/comctl32/tests/header.c index 5c35b60..3ae83f8 100644 --- a/dlls/comctl32/tests/header.c +++ b/dlls/comctl32/tests/header.c @@ -1662,7 +1662,7 @@ static BOOL init(void) pInitCommonControlsEx = (void*)GetProcAddress(hComctl32, "InitCommonControlsEx"); if (!pInitCommonControlsEx) { - skip("InitCommonControlsEx() is missing. Skipping the tests\n"); + win_skip("InitCommonControlsEx() is missing. Skipping the tests\n"); return FALSE; } diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c index 30da089..003a1ec 100644 --- a/dlls/comctl32/tests/monthcal.c +++ b/dlls/comctl32/tests/monthcal.c @@ -2053,7 +2053,7 @@ START_TEST(monthcal) pInitCommonControlsEx = (void*)GetProcAddress(hComctl32, "InitCommonControlsEx"); if (!pInitCommonControlsEx) { - skip("InitCommonControlsEx() is missing. Skipping the tests\n"); + win_skip("InitCommonControlsEx() is missing. Skipping the tests\n"); return; } iccex.dwSize = sizeof(iccex); diff --git a/dlls/comctl32/tests/mru.c b/dlls/comctl32/tests/mru.c index 5b5f98e..af49aba 100644 --- a/dlls/comctl32/tests/mru.c +++ b/dlls/comctl32/tests/mru.c @@ -236,7 +236,7 @@ static void test_MRUListA(void) if (!pCreateMRUListA || !pFreeMRUList || !pAddMRUStringA || !pEnumMRUListA) { - skip("MRU entry points not found\n"); + win_skip("MRU entry points not found\n"); return; }

1 0

Nikolay Sivov : dwrite: Use OpenType 1.8 'hhea' table structure.
by Alexandre Julliard 25 Jan '17

25 Jan '17

Module: wine Branch: master Commit: 669d033ee160dfe3dd76e9ee14cc6868d10d90a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=669d033ee160dfe3dd76e9ee1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 25 00:54:14 2017 +0300 dwrite: Use OpenType 1.8 'hhea' table structure. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 3 ++- dlls/dwrite/tests/font.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index f4ed51f..7a3e641 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -205,7 +205,8 @@ typedef struct } TT_OS2_V2; typedef struct { - ULONG version; + USHORT majorVersion; + USHORT minorVersion; SHORT ascender; SHORT descender; SHORT linegap; diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 9382569..c373d14 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -217,7 +217,8 @@ typedef struct { } TT_POST; typedef struct { - ULONG version; + USHORT majorVersion; + USHORT minorVersion; SHORT ascender; SHORT descender; SHORT linegap;

1 0

← Newer
1
...
26
27
28
29
30
31
32
...
50
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2017