wine-commits February 2017

wine-commits@winehq.org

2 participants
838 discussions

Jacek Caban : mshtml: Added IHTMLDocument5:: onmousewheel property implementation.
by Alexandre Julliard 16 Feb '17

16 Feb '17

Module: wine Branch: master Commit: 7f6b21e1c5e1b98255f8fac906c7d755f527ccfe URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f6b21e1c5e1b98255f8fac90… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 16 16:35:53 2017 +0100 mshtml: Added IHTMLDocument5::onmousewheel property implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 87df4b0..8c29b80 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -2803,15 +2803,19 @@ static HRESULT WINAPI HTMLDocument5_Invoke(IHTMLDocument5 *iface, DISPID dispIdM static HRESULT WINAPI HTMLDocument5_put_onmousewheel(IHTMLDocument5 *iface, VARIANT v) { HTMLDocument *This = impl_from_IHTMLDocument5(iface); - FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); + + return set_doc_event(This, EVENTID_MOUSEWHEEL, &v); } static HRESULT WINAPI HTMLDocument5_get_onmousewheel(IHTMLDocument5 *iface, VARIANT *p) { HTMLDocument *This = impl_from_IHTMLDocument5(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_doc_event(This, EVENTID_MOUSEWHEEL, p); } static HRESULT WINAPI HTMLDocument5_get_doctype(IHTMLDocument5 *iface, IHTMLDOMNode **p)

1 0

Jacek Caban : mshtml: Added IHTMLDocument7:: onchange property implementation.
by Alexandre Julliard 16 Feb '17

16 Feb '17

Module: wine Branch: master Commit: c058ce52c00233d2d508dc0bc211762d3d9ab61e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c058ce52c00233d2d508dc0bc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 16 16:35:45 2017 +0100 mshtml: Added IHTMLDocument7::onchange property implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 3241c6a..87df4b0 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -3475,15 +3475,19 @@ static HRESULT WINAPI HTMLDocument7_get_onchange(IHTMLDocument7 *iface, VARIANT static HRESULT WINAPI HTMLDocument7_put_ondrag(IHTMLDocument7 *iface, VARIANT v) { HTMLDocument *This = impl_from_IHTMLDocument7(iface); - FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); + + return set_doc_event(This, EVENTID_DRAG, &v); } static HRESULT WINAPI HTMLDocument7_get_ondrag(IHTMLDocument7 *iface, VARIANT *p) { HTMLDocument *This = impl_from_IHTMLDocument7(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_doc_event(This, EVENTID_DRAG, p); } static HRESULT WINAPI HTMLDocument7_put_ondragend(IHTMLDocument7 *iface, VARIANT v)

1 0

Jacek Caban : mshtml: Added IHTMLDocument4:: onselectionchange property implementation.
by Alexandre Julliard 16 Feb '17

16 Feb '17

Module: wine Branch: master Commit: e51ece778fcef338b62f4634343f8b9b78778b27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e51ece778fcef338b62f46343… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 16 16:35:37 2017 +0100 mshtml: Added IHTMLDocument4::onselectionchange property implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 12 ++++++++---- dlls/mshtml/htmlevent.c | 5 +++++ dlls/mshtml/htmlevent.h | 1 + 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 9ef11e9..3241c6a 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -2624,15 +2624,19 @@ static HRESULT WINAPI HTMLDocument4_hasFocus(IHTMLDocument4 *iface, VARIANT_BOOL static HRESULT WINAPI HTMLDocument4_put_onselectionchange(IHTMLDocument4 *iface, VARIANT v) { HTMLDocument *This = impl_from_IHTMLDocument4(iface); - FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); + + return set_doc_event(This, EVENTID_SELECTIONCHANGE, &v); } static HRESULT WINAPI HTMLDocument4_get_onselectionchange(IHTMLDocument4 *iface, VARIANT *p) { HTMLDocument *This = impl_from_IHTMLDocument4(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_doc_event(This, EVENTID_SELECTIONCHANGE, p); } static HRESULT WINAPI HTMLDocument4_get_namespace(IHTMLDocument4 *iface, IDispatch **p) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 57c13c6..77c998f 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -139,6 +139,9 @@ static const WCHAR onscrollW[] = {'o','n','s','c','r','o','l','l',0}; static const WCHAR selectstartW[] = {'s','e','l','e','c','t','s','t','a','r','t',0}; static const WCHAR onselectstartW[] = {'o','n','s','e','l','e','c','t','s','t','a','r','t',0}; +static const WCHAR selectionchangeW[] = {'s','e','l','e','c','t','i','o','n','c','h','a','n','g','e',0}; +static const WCHAR onselectionchangeW[] = {'o','n','s','e','l','e','c','t','i','o','n','c','h','a','n','g','e',0}; + static const WCHAR submitW[] = {'s','u','b','m','i','t',0}; static const WCHAR onsubmitW[] = {'o','n','s','u','b','m','i','t',0}; @@ -242,6 +245,8 @@ static const event_info_t event_info[] = { EVENT_DEFAULTLISTENER|EVENT_BUBBLE}, {scrollW, onscrollW, EVENTT_HTML, DISPID_EVMETH_ONSCROLL, EVENT_DEFAULTLISTENER|EVENT_BUBBLE}, + {selectionchangeW, onselectionchangeW, EVENTT_NONE, DISPID_EVMETH_ONSELECTSTART, + EVENT_FIXME}, {selectstartW, onselectstartW, EVENTT_MOUSE, DISPID_EVMETH_ONSELECTSTART, EVENT_CANCELABLE}, {submitW, onsubmitW, EVENTT_HTML, DISPID_EVMETH_ONSUBMIT, diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index 8844eb3..b88f32f3 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -48,6 +48,7 @@ typedef enum { EVENTID_READYSTATECHANGE, EVENTID_RESIZE, EVENTID_SCROLL, + EVENTID_SELECTIONCHANGE, EVENTID_SELECTSTART, EVENTID_SUBMIT, EVENTID_UNLOAD,

1 0

Jacek Caban : mshtml: Added IHTMLDocument7:: onscroll property implementation.
by Alexandre Julliard 16 Feb '17

16 Feb '17

Module: wine Branch: master Commit: 59e146562ccecd8395a27dacbb37dcc14b347e80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=59e146562ccecd8395a27dacb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 16 16:35:26 2017 +0100 mshtml: Added IHTMLDocument7::onscroll property implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index d0433ed..9ef11e9 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -3779,15 +3779,19 @@ static HRESULT WINAPI HTMLDocument7_get_onreset(IHTMLDocument7 *iface, VARIANT * static HRESULT WINAPI HTMLDocument7_put_onscroll(IHTMLDocument7 *iface, VARIANT v) { HTMLDocument *This = impl_from_IHTMLDocument7(iface); - FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); + + return set_doc_event(This, EVENTID_SCROLL, &v); } static HRESULT WINAPI HTMLDocument7_get_onscroll(IHTMLDocument7 *iface, VARIANT *p) { HTMLDocument *This = impl_from_IHTMLDocument7(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_doc_event(This, EVENTID_SCROLL, p); } static HRESULT WINAPI HTMLDocument7_put_onseekend(IHTMLDocument7 *iface, VARIANT v)

1 0

Alistair Leslie-Hughes : dpnet/tests: Add tests to show IDirectPlay8ThreadPool is a singleton object.
by Alexandre Julliard 16 Feb '17

16 Feb '17

Module: wine Branch: master Commit: 1f788c0314390620ae5f8dbcbee22ba8dfc055fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f788c0314390620ae5f8dbcb… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Feb 16 06:36:02 2017 +0000 dpnet/tests: Add tests to show IDirectPlay8ThreadPool is a singleton object. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dpnet/tests/thread.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/dlls/dpnet/tests/thread.c b/dlls/dpnet/tests/thread.c index 37c226f..7129739 100644 --- a/dlls/dpnet/tests/thread.c +++ b/dlls/dpnet/tests/thread.c @@ -209,6 +209,34 @@ static void test_enum_hosts(void) CloseHandle(enumevent); } +static void test_singleton(void) +{ + HRESULT hr; + IDirectPlay8ThreadPool *pool1, *pool2; + + hr = CoCreateInstance( &CLSID_DirectPlay8ThreadPool, NULL, CLSCTX_ALL, &IID_IDirectPlay8ThreadPool, (void**)&pool1); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = CoCreateInstance( &CLSID_DirectPlay8ThreadPool, NULL, CLSCTX_ALL, &IID_IDirectPlay8ThreadPool, (void**)&pool2); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(pool1 != pool2, "same pointer returned.\n"); + + hr = IDirectPlay8ThreadPool_Initialize(pool1, NULL, &DirectPlayThreadHandler, 0); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDirectPlay8ThreadPool_Initialize(pool2, NULL, &DirectPlayThreadHandler, 0); + todo_wine ok(hr == DPNERR_ALREADYINITIALIZED, "got 0x%08x\n", hr); + + hr = IDirectPlay8ThreadPool_Close(pool1, 0); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDirectPlay8ThreadPool_Close(pool2, 0); + todo_wine ok(hr == DPNERR_UNINITIALIZED, "got 0x%08x\n", hr); + + IDirectPlay8ThreadPool_Release(pool1); + IDirectPlay8ThreadPool_Release(pool2); +} + START_TEST(thread) { HRESULT hr; @@ -251,6 +279,7 @@ START_TEST(thread) create_threadpool(); test_enum_hosts(); + test_singleton(); CoUninitialize(); }

1 0

Alistair Leslie-Hughes : dplayx/tests: Skip tests if dplayx is a stub dll or firewall is enabled.
by Alexandre Julliard 16 Feb '17

16 Feb '17

Module: wine Branch: master Commit: cad9f2dbd7d5a09597313f5b7cc0f2dffdb4d141 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cad9f2dbd7d5a09597313f5b7… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Feb 16 06:35:44 2017 +0000 dplayx/tests: Skip tests if dplayx is a stub dll or firewall is enabled. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dplayx/tests/Makefile.in | 2 +- dlls/dplayx/tests/dplayx.c | 264 +++++++++++++++++++++++++++++++++++++++--- 2 files changed, 249 insertions(+), 17 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cad9f2dbd7d5a09597313…

1 0

Michael Stefaniuc : crypt32/tests: Use IsEqualGUID() to compare GUIDs.
by Alexandre Julliard 16 Feb '17

16 Feb '17

Module: wine Branch: master Commit: b669dbc2f63c0d5ba5f576c24ef91a4c97c408cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=b669dbc2f63c0d5ba5f576c24… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Feb 16 11:50:34 2017 +0100 crypt32/tests: Use IsEqualGUID() to compare GUIDs. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/tests/sip.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/crypt32/tests/sip.c b/dlls/crypt32/tests/sip.c index 0677903..e2ec2f4 100644 --- a/dlls/crypt32/tests/sip.c +++ b/dlls/crypt32/tests/sip.c @@ -176,8 +176,8 @@ static void test_SIPRetrieveSubjectGUID(void) GetLastError() == ERROR_PATH_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND or ERROR_PATH_NOT_FOUND, got %d.\n", GetLastError()); - ok ( !memcmp(&subject, &nullSubject, sizeof(GUID)), - "Expected a NULL GUID for c:\\deadbeef.dbf, not %s\n", wine_dbgstr_guid(&subject)); + ok(IsEqualGUID(&subject, &nullSubject), + "Expected a NULL GUID for c:\\deadbeef.dbf, not %s\n", wine_dbgstr_guid(&subject)); /* Now with an executable that should exist * @@ -195,8 +195,8 @@ static void test_SIPRetrieveSubjectGUID(void) memset(&subject, 1, sizeof(GUID)); ret = CryptSIPRetrieveSubjectGuid(regeditPathW, NULL, &subject); ok ( ret, "Expected CryptSIPRetrieveSubjectGuid to succeed\n"); - ok ( !memcmp(&subject, &unknownGUID, sizeof(GUID)), - "Expected (%s), got (%s).\n", wine_dbgstr_guid(&unknownGUID), wine_dbgstr_guid(&subject)); + ok(IsEqualGUID(&subject, &unknownGUID), + "Expected (%s), got (%s).\n", wine_dbgstr_guid(&unknownGUID), wine_dbgstr_guid(&subject)); /* The same thing but now with a handle instead of a filename */ file = CreateFileA(regeditPath, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, NULL); @@ -204,8 +204,8 @@ static void test_SIPRetrieveSubjectGUID(void) memset(&subject, 1, sizeof(GUID)); ret = CryptSIPRetrieveSubjectGuid(NULL, file, &subject); ok ( ret, "Expected CryptSIPRetrieveSubjectGuid to succeed\n"); - ok ( !memcmp(&subject, &unknownGUID, sizeof(GUID)), - "Expected (%s), got (%s).\n", wine_dbgstr_guid(&unknownGUID), wine_dbgstr_guid(&subject)); + ok(IsEqualGUID(&subject, &unknownGUID), + "Expected (%s), got (%s).\n", wine_dbgstr_guid(&unknownGUID), wine_dbgstr_guid(&subject)); CloseHandle(file); /* And both */ @@ -214,8 +214,8 @@ static void test_SIPRetrieveSubjectGUID(void) memset(&subject, 1, sizeof(GUID)); ret = CryptSIPRetrieveSubjectGuid(regeditPathW, file, &subject); ok ( ret, "Expected CryptSIPRetrieveSubjectGuid to succeed\n"); - ok ( !memcmp(&subject, &unknownGUID, sizeof(GUID)), - "Expected (%s), got (%s).\n", wine_dbgstr_guid(&unknownGUID), wine_dbgstr_guid(&subject)); + ok(IsEqualGUID(&subject, &unknownGUID), + "Expected (%s), got (%s).\n", wine_dbgstr_guid(&unknownGUID), wine_dbgstr_guid(&subject)); CloseHandle(file); /* Now with an empty file */ @@ -234,8 +234,8 @@ static void test_SIPRetrieveSubjectGUID(void) GetLastError() == ERROR_SUCCESS /* most Win98 */ || GetLastError() == TRUST_E_SUBJECT_FORM_UNKNOWN /* some Win98 */, "Expected ERROR_FILE_INVALID, ERROR_INVALID_PARAMETER, ERROR_SUCCESS or TRUST_E_SUBJECT_FORM_UNKNOWN, got 0x%08x\n", GetLastError()); - ok ( !memcmp(&subject, &nullSubject, sizeof(GUID)), - "Expected a NULL GUID for empty file %s, not %s\n", tempfile, wine_dbgstr_guid(&subject)); + ok(IsEqualGUID(&subject, &nullSubject), + "Expected a NULL GUID for empty file %s, not %s\n", tempfile, wine_dbgstr_guid(&subject)); /* Use a file with a size of 3 (at least < 4) */ file = CreateFileA(tempfile, GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, NULL); @@ -250,8 +250,8 @@ static void test_SIPRetrieveSubjectGUID(void) GetLastError() == ERROR_SUCCESS /* most Win98 */ || GetLastError() == TRUST_E_SUBJECT_FORM_UNKNOWN /* some Win98 */, "Expected ERROR_INVALID_PARAMETER, ERROR_SUCCESS or TRUST_E_SUBJECT_FORM_UNKNOWN, got 0x%08x\n", GetLastError()); - ok ( !memcmp(&subject, &nullSubject, sizeof(GUID)), - "Expected a NULL GUID for empty file %s, not %s\n", tempfile, wine_dbgstr_guid(&subject)); + ok(IsEqualGUID(&subject, &nullSubject), + "Expected a NULL GUID for empty file %s, not %s\n", tempfile, wine_dbgstr_guid(&subject)); /* And now >= 4 */ file = CreateFileA(tempfile, GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, NULL); @@ -265,8 +265,8 @@ static void test_SIPRetrieveSubjectGUID(void) ok ( GetLastError() == TRUST_E_SUBJECT_FORM_UNKNOWN || GetLastError() == ERROR_SUCCESS /* Win98 */, "Expected TRUST_E_SUBJECT_FORM_UNKNOWN or ERROR_SUCCESS, got 0x%08x\n", GetLastError()); - ok ( !memcmp(&subject, &nullSubject, sizeof(GUID)), - "Expected a NULL GUID for empty file %s, not %s\n", tempfile, wine_dbgstr_guid(&subject)); + ok(IsEqualGUID(&subject, &nullSubject), + "Expected a NULL GUID for empty file %s, not %s\n", tempfile, wine_dbgstr_guid(&subject)); /* Clean up */ DeleteFileA(tempfile); @@ -283,8 +283,8 @@ static void test_SIPRetrieveSubjectGUID(void) ret = CryptSIPRetrieveSubjectGuid(tempfileW, NULL, &subject); ok( ret, "CryptSIPRetrieveSubjectGuid failed: %d (0x%08x)\n", GetLastError(), GetLastError() ); - ok ( !memcmp(&subject, &cabGUID, sizeof(GUID)), - "Expected GUID %s for cabinet file, not %s\n", wine_dbgstr_guid(&cabGUID), wine_dbgstr_guid(&subject)); + ok(IsEqualGUID(&subject, &cabGUID), + "Expected GUID %s for cabinet file, not %s\n", wine_dbgstr_guid(&cabGUID), wine_dbgstr_guid(&subject)); /* Clean up */ DeleteFileA(tempfile); @@ -301,8 +301,8 @@ static void test_SIPRetrieveSubjectGUID(void) ret = CryptSIPRetrieveSubjectGuid(tempfileW, NULL, &subject); ok( ret, "CryptSIPRetrieveSubjectGuid failed: %d (0x%08x)\n", GetLastError(), GetLastError() ); - ok ( !memcmp(&subject, &cabGUID, sizeof(GUID)), - "Expected GUID %s for cabinet file, not %s\n", wine_dbgstr_guid(&cabGUID), wine_dbgstr_guid(&subject)); + ok(IsEqualGUID(&subject, &cabGUID), + "Expected GUID %s for cabinet file, not %s\n", wine_dbgstr_guid(&cabGUID), wine_dbgstr_guid(&subject)); /* Clean up */ DeleteFileA(tempfile);

1 0

Alex Henrie : ddraw: Validate the "surface" pointer before creating the surface in CreateSurface().
by Alexandre Julliard 16 Feb '17

16 Feb '17

Module: wine Branch: master Commit: 062f1ae7524ef0049bbb8579bd6d03e6eca0be16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=062f1ae7524ef0049bbb8579b… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Feb 16 15:12:15 2017 +0100 ddraw: Validate the "surface" pointer before creating the surface in CreateSurface(). And thereby avoid leaking the surface on the error path. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/ddraw.c | 128 +++++++++++++++++++++++++++-------------------------- 1 file changed, 66 insertions(+), 62 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 254dae7..ba264c0 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -2815,6 +2815,18 @@ static HRESULT WINAPI ddraw7_CreateSurface(IDirectDraw7 *iface, DDSURFACEDESC2 * return DDERR_INVALIDPARAMS; } + __TRY + { + *surface = NULL; + } + __EXCEPT_PAGE_FAULT + { + WARN("Surface pointer %p is invalid.\n", surface); + wined3d_mutex_unlock(); + return DDERR_INVALIDPARAMS; + } + __ENDTRY; + if(surface_desc->ddsCaps.dwCaps & (DDSCAPS_FRONTBUFFER | DDSCAPS_BACKBUFFER)) { if (TRACE_ON(ddraw)) @@ -2830,23 +2842,12 @@ static HRESULT WINAPI ddraw7_CreateSurface(IDirectDraw7 *iface, DDSURFACEDESC2 * hr = ddraw_surface_create(ddraw, surface_desc, &impl, outer_unknown, 7); wined3d_mutex_unlock(); + if (FAILED(hr)) + return hr; - __TRY - { - if (FAILED(hr)) - { - *surface = NULL; - break; - } - *surface = &impl->IDirectDrawSurface7_iface; - IDirectDraw7_AddRef(iface); - impl->ifaceToRelease = (IUnknown *)iface; - } - __EXCEPT_PAGE_FAULT - { - hr = E_INVALIDARG; - } - __ENDTRY; + *surface = &impl->IDirectDrawSurface7_iface; + IDirectDraw7_AddRef(iface); + impl->ifaceToRelease = (IUnknown *)iface; return hr; } @@ -2877,6 +2878,18 @@ static HRESULT WINAPI ddraw4_CreateSurface(IDirectDraw4 *iface, return DDERR_INVALIDPARAMS; } + __TRY + { + *surface = NULL; + } + __EXCEPT_PAGE_FAULT + { + WARN("Surface pointer %p is invalid.\n", surface); + wined3d_mutex_unlock(); + return DDERR_INVALIDPARAMS; + } + __ENDTRY; + if(surface_desc->ddsCaps.dwCaps & (DDSCAPS_FRONTBUFFER | DDSCAPS_BACKBUFFER)) { if (TRACE_ON(ddraw)) @@ -2892,23 +2905,12 @@ static HRESULT WINAPI ddraw4_CreateSurface(IDirectDraw4 *iface, hr = ddraw_surface_create(ddraw, surface_desc, &impl, outer_unknown, 4); wined3d_mutex_unlock(); + if (FAILED(hr)) + return hr; - __TRY - { - if (FAILED(hr)) - { - *surface = NULL; - break; - } - *surface = &impl->IDirectDrawSurface4_iface; - IDirectDraw4_AddRef(iface); - impl->ifaceToRelease = (IUnknown *)iface; - } - __EXCEPT_PAGE_FAULT - { - hr = E_INVALIDARG; - } - __ENDTRY; + *surface = &impl->IDirectDrawSurface4_iface; + IDirectDraw4_AddRef(iface); + impl->ifaceToRelease = (IUnknown *)iface; return hr; } @@ -2940,6 +2942,18 @@ static HRESULT WINAPI ddraw2_CreateSurface(IDirectDraw2 *iface, return DDERR_INVALIDPARAMS; } + __TRY + { + *surface = NULL; + } + __EXCEPT_PAGE_FAULT + { + WARN("Surface pointer %p is invalid.\n", surface); + wined3d_mutex_unlock(); + return DDERR_INVALIDPARAMS; + } + __ENDTRY; + DDSD_to_DDSD2(surface_desc, &surface_desc2); if(surface_desc->ddsCaps.dwCaps & (DDSCAPS_FRONTBUFFER | DDSCAPS_BACKBUFFER)) { @@ -2956,22 +2970,11 @@ static HRESULT WINAPI ddraw2_CreateSurface(IDirectDraw2 *iface, hr = ddraw_surface_create(ddraw, &surface_desc2, &impl, outer_unknown, 2); wined3d_mutex_unlock(); + if (FAILED(hr)) + return hr; - __TRY - { - if (FAILED(hr)) - { - *surface = NULL; - break; - } - *surface = &impl->IDirectDrawSurface_iface; - impl->ifaceToRelease = NULL; - } - __EXCEPT_PAGE_FAULT - { - hr = E_INVALIDARG; - } - __ENDTRY; + *surface = &impl->IDirectDrawSurface_iface; + impl->ifaceToRelease = NULL; return hr; } @@ -3003,6 +3006,18 @@ static HRESULT WINAPI ddraw1_CreateSurface(IDirectDraw *iface, return DDERR_INVALIDPARAMS; } + __TRY + { + *surface = NULL; + } + __EXCEPT_PAGE_FAULT + { + WARN("Surface pointer %p is invalid.\n", surface); + wined3d_mutex_unlock(); + return DDERR_INVALIDPARAMS; + } + __ENDTRY; + if ((surface_desc->ddsCaps.dwCaps & (DDSCAPS_PRIMARYSURFACE | DDSCAPS_BACKBUFFER)) == (DDSCAPS_PRIMARYSURFACE | DDSCAPS_BACKBUFFER) || (surface_desc->ddsCaps.dwCaps & (DDSCAPS_FLIP | DDSCAPS_FRONTBUFFER)) @@ -3016,22 +3031,11 @@ static HRESULT WINAPI ddraw1_CreateSurface(IDirectDraw *iface, DDSD_to_DDSD2(surface_desc, &surface_desc2); hr = ddraw_surface_create(ddraw, &surface_desc2, &impl, outer_unknown, 1); wined3d_mutex_unlock(); + if (FAILED(hr)) + return hr; - __TRY - { - if (FAILED(hr)) - { - *surface = NULL; - break; - } - *surface = &impl->IDirectDrawSurface_iface; - impl->ifaceToRelease = NULL; - } - __EXCEPT_PAGE_FAULT - { - hr = E_INVALIDARG; - } - __ENDTRY; + *surface = &impl->IDirectDrawSurface_iface; + impl->ifaceToRelease = NULL; return hr; }

1 0

Alex Henrie : ddraw/tests: Validate the "surface" pointer is unmodified after CreateSurface() without cooperative level.
by Alexandre Julliard 16 Feb '17

16 Feb '17

Module: wine Branch: master Commit: 438d0fed865b9e55dad0efa4dd98dc0afafe80a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=438d0fed865b9e55dad0efa4d… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Feb 16 15:12:14 2017 +0100 ddraw/tests: Validate the "surface" pointer is unmodified after CreateSurface() without cooperative level. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 2 ++ dlls/ddraw/tests/ddraw2.c | 2 ++ dlls/ddraw/tests/ddraw4.c | 2 ++ dlls/ddraw/tests/ddraw7.c | 2 ++ 4 files changed, 8 insertions(+) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index c682466..1001d4f 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -3296,8 +3296,10 @@ static void test_coop_level_surf_create(void) ddsd.dwSize = sizeof(ddsd); ddsd.dwFlags = DDSD_CAPS; ddsd.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE; + surface = (void *)0xdeadbeef; hr = IDirectDraw_CreateSurface(ddraw, &ddsd, &surface, NULL); ok(hr == DDERR_NOCOOPERATIVELEVELSET, "Surface creation returned hr %#x.\n", hr); + ok(surface == (void *)0xdeadbeef, "Got unexpected surface %p.\n", surface); IDirectDraw_Release(ddraw); } diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index d6491ea..1836f76 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -3517,8 +3517,10 @@ static void test_coop_level_surf_create(void) ddsd.dwSize = sizeof(ddsd); ddsd.dwFlags = DDSD_CAPS; ddsd.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE; + surface = (void *)0xdeadbeef; hr = IDirectDraw2_CreateSurface(ddraw, &ddsd, &surface, NULL); ok(hr == DDERR_NOCOOPERATIVELEVELSET, "Surface creation returned hr %#x.\n", hr); + ok(surface == (void *)0xdeadbeef, "Got unexpected surface %p.\n", surface); IDirectDraw2_Release(ddraw); } diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index bda2ebf..557854a 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -3647,8 +3647,10 @@ static void test_coop_level_surf_create(void) ddsd.dwSize = sizeof(ddsd); ddsd.dwFlags = DDSD_CAPS; ddsd.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE; + surface = (void *)0xdeadbeef; hr = IDirectDraw4_CreateSurface(ddraw, &ddsd, &surface, NULL); ok(hr == DDERR_NOCOOPERATIVELEVELSET, "Surface creation returned hr %#x.\n", hr); + ok(surface == (void *)0xdeadbeef, "Got unexpected surface %p.\n", surface); IDirectDraw4_Release(ddraw); } diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 31e7640..827496b 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -3373,8 +3373,10 @@ static void test_coop_level_surf_create(void) ddsd.dwSize = sizeof(ddsd); ddsd.dwFlags = DDSD_CAPS; ddsd.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE; + surface = (void *)0xdeadbeef; hr = IDirectDraw7_CreateSurface(ddraw, &ddsd, &surface, NULL); ok(hr == DDERR_NOCOOPERATIVELEVELSET, "Surface creation returned hr %#x.\n", hr); + ok(surface == (void *)0xdeadbeef, "Got unexpected surface %p.\n", surface); IDirectDraw7_Release(ddraw); }

1 0

Józef Kucia : d3d11/tests: Add test for unaligned raw buffer access.
by Alexandre Julliard 16 Feb '17

16 Feb '17

Module: wine Branch: master Commit: c2a4e620ee5a959daafd3de8e629dfb212bef6f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2a4e620ee5a959daafd3de8e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Feb 16 13:02:24 2017 +0100 d3d11/tests: Add test for unaligned raw buffer access. 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/d3d11/tests/d3d11.c | 304 +++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 296 insertions(+), 8 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c2a4e620ee5a959daafd3…

1 0

← Newer
1
...
35
36
37
38
39
40
41
...
84
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 February 2017