January 2017 - Wine-commits

Vincent Povirk : hhctrl.ocx: Don't skip a tag in next_node.
by Alexandre Julliard 25 Jan '17

25 Jan '17

Module: wine Branch: master Commit: 89ca96d06cf7ef063664a36069000341dfdc39c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=89ca96d06cf7ef063664a3606… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Jan 25 11:23:02 2017 -0600 hhctrl.ocx: Don't skip a tag in next_node. At the time this function is called, we're already past the '<' that begins the current tag. Calling find_end_node twice here means we were skipping every other tag. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hhctrl.ocx/stream.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/dlls/hhctrl.ocx/stream.c b/dlls/hhctrl.ocx/stream.c index 84ed317..b4239ca 100644 --- a/dlls/hhctrl.ocx/stream.c +++ b/dlls/hhctrl.ocx/stream.c @@ -139,17 +139,6 @@ static BOOL find_node_end(stream_t *stream, strbuf_t *buf) BOOL next_node(stream_t *stream, strbuf_t *buf) { - strbuf_t tmpbuf; - - /* search through the end of the current node */ - strbuf_init(&tmpbuf); - if(!find_node_end(stream, &tmpbuf)) - { - strbuf_free(&tmpbuf); - return FALSE; - } - strbuf_free(&tmpbuf); - /* find the beginning of the next node */ if(!stream_chr(stream, NULL, '<')) return FALSE;

1 0

Bruno Jesus : iphlpapi/tests: Avoid ntoa() twice in function call as it returns same pointer.
by Alexandre Julliard 25 Jan '17

25 Jan '17

Module: wine Branch: master Commit: 76644a7c26f2c2b3a5968665c349b45bdb294387 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76644a7c26f2c2b3a5968665c… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Jan 25 15:33:00 2017 -0200 iphlpapi/tests: Avoid ntoa() twice in function call as it returns same pointer. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/tests/iphlpapi.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index cb73a9d..64d03cf 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -1598,9 +1598,12 @@ static void test_AllocateAndGetTcpExTableFromStack(void) trace( "AllocateAndGetTcpExTableFromStack table: %u entries\n", table_ex->dwNumEntries ); for (i = 0; i < table_ex->dwNumEntries; i++) { + char remote_ip[16]; + + strcpy(remote_ip, ntoa(table_ex->table[i].dwRemoteAddr)); trace( "%u: local %s:%u remote %s:%u state %u pid %u\n", i, ntoa(table_ex->table[i].dwLocalAddr), ntohs(table_ex->table[i].dwLocalPort), - ntoa( table_ex->table[i].dwRemoteAddr ), ntohs(table_ex->table[i].dwRemotePort), + remote_ip, ntohs(table_ex->table[i].dwRemotePort), U(table_ex->table[i]).dwState, table_ex->table[i].dwOwningPid ); } }

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

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 : 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 : 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

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

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

Matteo Bruni : d3d9: Fix DrawIndexedPrimitiveUP with non-zero min_vertex_idx.
by Alexandre Julliard 25 Jan '17

25 Jan '17

Module: wine Branch: master Commit: bbce5af7d39c54bad156aa0754e7eb4cd03552e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbce5af7d39c54bad156aa075… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Jan 18 21:35:28 2017 +0100 d3d9: Fix DrawIndexedPrimitiveUP with non-zero min_vertex_idx. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index e0bc585..e646cb7 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2485,18 +2485,16 @@ static HRESULT WINAPI d3d9_device_DrawIndexedPrimitiveUP(IDirect3DDevice9Ex *ifa UINT primitive_count, const void *index_data, D3DFORMAT index_format, const void *vertex_data, UINT vertex_stride) { - struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); - HRESULT hr; UINT idx_count = vertex_count_from_primitive_count(primitive_type, primitive_count); + struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); UINT idx_fmt_size = index_format == D3DFMT_INDEX16 ? 2 : 4; + UINT vtx_size = vertex_count * vertex_stride; UINT idx_size = idx_count * idx_fmt_size; struct wined3d_map_desc wined3d_map_desc; struct wined3d_box wined3d_box = {0}; struct wined3d_resource *ib, *vb; - UINT ib_pos; - - UINT vtx_size = vertex_count * vertex_stride; - UINT vb_pos, align; + UINT vb_pos, ib_pos, align; + HRESULT hr; TRACE("iface %p, primitive_type %#x, min_vertex_idx %u, vertex_count %u, primitive_count %u, " "index_data %p, index_format %#x, vertex_data %p, vertex_stride %u.\n", @@ -2536,7 +2534,7 @@ static HRESULT WINAPI d3d9_device_DrawIndexedPrimitiveUP(IDirect3DDevice9Ex *ifa if (FAILED(hr = wined3d_resource_map(vb, 0, &wined3d_map_desc, &wined3d_box, vb_pos ? WINED3D_MAP_NOOVERWRITE : WINED3D_MAP_DISCARD))) goto done; - memcpy(wined3d_map_desc.data, vertex_data, vtx_size); + memcpy(wined3d_map_desc.data, (char *)vertex_data + min_vertex_idx * vertex_stride, vtx_size); wined3d_resource_unmap(vb, 0); device->vertex_buffer_pos = vb_pos + vtx_size; @@ -2568,7 +2566,7 @@ static HRESULT WINAPI d3d9_device_DrawIndexedPrimitiveUP(IDirect3DDevice9Ex *ifa wined3d_device_set_index_buffer(device->wined3d_device, device->index_buffer, wined3dformat_from_d3dformat(index_format), 0); - wined3d_device_set_base_vertex_index(device->wined3d_device, vb_pos / vertex_stride); + wined3d_device_set_base_vertex_index(device->wined3d_device, vb_pos / vertex_stride - min_vertex_idx); wined3d_device_set_primitive_type(device->wined3d_device, primitive_type); hr = wined3d_device_draw_indexed_primitive(device->wined3d_device, ib_pos / idx_fmt_size, idx_count);

1 0

Matteo Bruni : d3d8: Fix DrawIndexedPrimitiveUP with non-zero min_vertex_idx.
by Alexandre Julliard 25 Jan '17

25 Jan '17

Module: wine Branch: master Commit: 76686d4cc63e29e7a86335da1070c64f671b33db URL: http://source.winehq.org/git/wine.git/?a=commit;h=76686d4cc63e29e7a86335da1… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Jan 18 21:35:29 2017 +0100 d3d8: Fix DrawIndexedPrimitiveUP with non-zero min_vertex_idx. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 43b8e2b..805694b 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2124,18 +2124,16 @@ static HRESULT WINAPI d3d8_device_DrawIndexedPrimitiveUP(IDirect3DDevice8 *iface UINT primitive_count, const void *index_data, D3DFORMAT index_format, const void *vertex_data, UINT vertex_stride) { - struct d3d8_device *device = impl_from_IDirect3DDevice8(iface); - HRESULT hr; UINT idx_count = vertex_count_from_primitive_count(primitive_type, primitive_count); + struct d3d8_device *device = impl_from_IDirect3DDevice8(iface); UINT idx_fmt_size = index_format == D3DFMT_INDEX16 ? 2 : 4; + UINT vtx_size = vertex_count * vertex_stride; UINT idx_size = idx_count * idx_fmt_size; struct wined3d_map_desc wined3d_map_desc; struct wined3d_box wined3d_box = {0}; struct wined3d_resource *ib, *vb; - UINT ib_pos; - - UINT vtx_size = vertex_count * vertex_stride; - UINT vb_pos, align; + UINT vb_pos, ib_pos, align; + HRESULT hr; TRACE("iface %p, primitive_type %#x, min_vertex_idx %u, vertex_count %u, primitive_count %u, " "index_data %p, index_format %#x, vertex_data %p, vertex_stride %u.\n", @@ -2168,7 +2166,7 @@ static HRESULT WINAPI d3d8_device_DrawIndexedPrimitiveUP(IDirect3DDevice8 *iface if (FAILED(hr = wined3d_resource_map(vb, 0, &wined3d_map_desc, &wined3d_box, vb_pos ? WINED3D_MAP_NOOVERWRITE : WINED3D_MAP_DISCARD))) goto done; - memcpy(wined3d_map_desc.data, vertex_data, vtx_size); + memcpy(wined3d_map_desc.data, (char *)vertex_data + min_vertex_idx * vertex_stride, vtx_size); wined3d_resource_unmap(vb, 0); device->vertex_buffer_pos = vb_pos + vtx_size; @@ -2200,7 +2198,7 @@ static HRESULT WINAPI d3d8_device_DrawIndexedPrimitiveUP(IDirect3DDevice8 *iface wined3d_device_set_index_buffer(device->wined3d_device, device->index_buffer, wined3dformat_from_d3dformat(index_format), 0); - wined3d_device_set_base_vertex_index(device->wined3d_device, vb_pos / vertex_stride); + wined3d_device_set_base_vertex_index(device->wined3d_device, vb_pos / vertex_stride - min_vertex_idx); wined3d_device_set_primitive_type(device->wined3d_device, primitive_type); hr = wined3d_device_draw_indexed_primitive(device->wined3d_device, ib_pos / idx_fmt_size, idx_count);

1 0