wine-commits October 2015

wine-commits@winehq.org

2 participants
749 discussions

Daniel Lehman : msxml3: Treat namespace as attribute in IXMLDOMElement:: getAttribute.
by Alexandre Julliard 08 Oct '15

08 Oct '15

Module: wine Branch: master Commit: a20d152282ece6bd28c407ea02cd3826592581ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=a20d152282ece6bd28c407ea0… Author: Daniel Lehman <dlehman(a)esri.com> Date: Tue Aug 18 15:32:58 2015 -0700 msxml3: Treat namespace as attribute in IXMLDOMElement::getAttribute. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/element.c | 25 ++++++++++++++++++++++- dlls/msxml3/tests/domdoc.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 75 insertions(+), 1 deletion(-) diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index 38d3b47..6e00aa0 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -1203,7 +1203,9 @@ static HRESULT WINAPI domelem_getAttribute( domelem *This = impl_from_IXMLDOMElement( iface ); xmlNodePtr element; xmlChar *xml_name, *xml_value = NULL; + xmlChar *local, *prefix; HRESULT hr = S_FALSE; + xmlNsPtr ns; TRACE("(%p)->(%s %p)\n", This, debugstr_w(name), value); @@ -1222,7 +1224,28 @@ static HRESULT WINAPI domelem_getAttribute( if(!xmlValidateNameValue(xml_name)) hr = E_FAIL; else - xml_value = xmlGetNsProp(element, xml_name, NULL); + { + if ((local = xmlSplitQName2(xml_name, &prefix))) + { + if (xmlStrEqual(prefix, BAD_CAST "xmlns")) + { + ns = xmlSearchNs(element->doc, element, local); + if (ns) + xml_value = xmlStrdup(ns->href); + } + else + { + ns = xmlSearchNs(element->doc, element, prefix); + if (ns) + xml_value = xmlGetNsProp(element, local, ns->href); + } + + xmlFree(prefix); + xmlFree(local); + } + else + xml_value = xmlGetNsProp(element, xml_name, NULL); + } heap_free(xml_name); if(xml_value) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index ff6783b..1afc894 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -10882,6 +10882,56 @@ static void test_getAttributeNode(void) free_bstrs(); } +static void test_getAttribute(void) +{ + IXMLDOMDocument *doc; + IXMLDOMElement *elem; + VARIANT_BOOL v; + VARIANT var; + HRESULT hr; + + doc = create_document(&IID_IXMLDOMDocument); + + hr = IXMLDOMDocument_loadXML(doc, _bstr_(szExampleXML), &v); + EXPECT_HR(hr, S_OK); + + hr = IXMLDOMDocument_get_documentElement(doc, &elem); + EXPECT_HR(hr, S_OK); + + VariantInit(&var); + hr = IXMLDOMElement_getAttribute( elem, _bstr_("xmlns:foo"), &var ); + EXPECT_HR(hr, S_OK); + ok( V_VT(&var) == VT_BSTR, "vt = %x\n", V_VT(&var)); + ok( !lstrcmpW(V_BSTR(&var), _bstr_("urn:uuid:86B2F87F-ACB6-45cd-8B77-9BDB92A01A29")), "wrong attr value: %s\n", wine_dbgstr_w(V_BSTR(&var))); + VariantClear(&var); + + hr = IXMLDOMElement_getAttribute( elem, _bstr_("a"), &var ); + EXPECT_HR(hr, S_OK); + ok( V_VT(&var) == VT_BSTR, "vt = %x\n", V_VT(&var)); + ok( !lstrcmpW(V_BSTR(&var), _bstr_("attr a")), "wrong attr value: %s\n", wine_dbgstr_w(V_BSTR(&var))); + VariantClear(&var); + + hr = IXMLDOMElement_getAttribute( elem, _bstr_("foo:b"), &var ); + EXPECT_HR(hr, S_OK); + ok( V_VT(&var) == VT_BSTR, "vt = %x\n", V_VT(&var)); + ok( !lstrcmpW(V_BSTR(&var), _bstr_("attr b")), "wrong attr value: %s\n", wine_dbgstr_w(V_BSTR(&var))); + VariantClear(&var); + + hr = IXMLDOMElement_getAttribute( elem, _bstr_("b"), &var ); + EXPECT_HR(hr, S_FALSE); + ok( V_VT(&var) == VT_NULL, "vt = %x\n", V_VT(&var)); + VariantClear(&var); + + hr = IXMLDOMElement_getAttribute( elem, _bstr_("non-existent"), &var ); + EXPECT_HR(hr, S_FALSE); + ok( V_VT(&var) == VT_NULL, "vt = %x\n", V_VT(&var)); + VariantClear(&var); + + IXMLDOMElement_Release(elem); + IXMLDOMDocument_Release(doc); + free_bstrs(); +} + typedef struct { DOMNodeType type; const char *name; @@ -12071,6 +12121,7 @@ START_TEST(domdoc) test_dispex(); test_parseerror(); test_getAttributeNode(); + test_getAttribute(); test_supporterrorinfo(); test_nodeValue(); test_get_namespaces();

1 0

Thomas Faller : amstream: Fix use of uninitialized memory.
by Alexandre Julliard 08 Oct '15

08 Oct '15

Module: wine Branch: master Commit: 2fb791b0ebcdfbbebc20afb1dd1205d793617d1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fb791b0ebcdfbbebc20afb1d… Author: Thomas Faller <tfaller1(a)gmx.de> Date: Mon Sep 28 18:16:57 2015 +0200 amstream: Fix use of uninitialized memory. --- dlls/amstream/mediastream.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/amstream/mediastream.c b/dlls/amstream/mediastream.c index 947be1e..79f9822 100644 --- a/dlls/amstream/mediastream.c +++ b/dlls/amstream/mediastream.c @@ -1003,6 +1003,7 @@ static HRESULT ddrawstreamsample_create(IDirectDrawMediaStream *parent, IDirectD desc.ddpfPixelFormat.dwBBitMask = 0x0000ff; desc.ddpfPixelFormat.dwRGBAlphaBitMask = 0; desc.ddsCaps.dwCaps = DDSCAPS_SYSTEMMEMORY|DDSCAPS_OFFSCREENPLAIN; + desc.lpSurface = NULL; hr = IDirectDraw_CreateSurface(ddraw, &desc, &object->surface, NULL); IDirectDraw_Release(ddraw);

1 0

Joachim Priesner : mshtml: Treat "data:" as Gecko special URI scheme.
by Alexandre Julliard 08 Oct '15

08 Oct '15

Module: wine Branch: master Commit: e7fc477921543d58dfa31acf92c71179d24042d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7fc477921543d58dfa31acf9… Author: Joachim Priesner <joachim.priesner(a)web.de> Date: Mon Sep 28 15:45:20 2015 +0200 mshtml: Treat "data:" as Gecko special URI scheme. This enables loading of inline content specified as data: URI, such as background images. Signed-off-by: Joachim Priesner <joachim.priesner(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/nsio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 45ad55f..c4efc5c 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -3545,7 +3545,7 @@ static nsresult NSAPI nsIOService_GetProtocolFlags(nsIIOService *iface, const ch static BOOL is_gecko_special_uri(const char *spec) { - static const char *special_schemes[] = {"chrome:", "jar:", "moz-safe-about", "resource:", "javascript:", "wyciwyg:"}; + static const char *special_schemes[] = {"chrome:", "data:", "jar:", "moz-safe-about", "resource:", "javascript:", "wyciwyg:"}; unsigned int i; for(i=0; i < sizeof(special_schemes)/sizeof(*special_schemes); i++) {

1 0

Józef Kucia : d3d11/tests: Port test_create_blend_state() from d3d10core.
by Alexandre Julliard 08 Oct '15

08 Oct '15

Module: wine Branch: master Commit: bd8a7f9e5dbd69a1de4c545042118eef6e1f3f2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd8a7f9e5dbd69a1de4c54504… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Oct 8 02:55:57 2015 +0200 d3d11/tests: Port test_create_blend_state() from d3d10core. 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 | 228 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 228 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bd8a7f9e5dbd69a1de4c5…

1 0

Józef Kucia : d3d10core/tests: Test conversion from D3D10_BLEND_DESC to D3D11_BLEND_DESC.
by Alexandre Julliard 08 Oct '15

08 Oct '15

Module: wine Branch: master Commit: a80902084f34345dc1e7abbd75e9f383f0211fb0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a80902084f34345dc1e7abbd7… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Oct 8 02:55:56 2015 +0200 d3d10core/tests: Test conversion from D3D10_BLEND_DESC to D3D11_BLEND_DESC. 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/d3d10core/tests/device.c | 151 +++++++++++++++++++++++++++++++++++++----- 1 file changed, 134 insertions(+), 17 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a80902084f34345dc1e7a…

1 0

Józef Kucia : d3d11: Implement d3d11_device_CreateBlendState().
by Alexandre Julliard 08 Oct '15

08 Oct '15

Module: wine Branch: master Commit: e2f851783313f34c88943025e80b01e191b14973 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2f851783313f34c88943025e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Oct 8 02:55:55 2015 +0200 d3d11: Implement d3d11_device_CreateBlendState(). 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/d3d11_private.h | 4 +- dlls/d3d11/device.c | 136 +++++++++++++++++++++++++++++++-------------- dlls/d3d11/state.c | 23 +++++++- 3 files changed, 117 insertions(+), 46 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e2f851783313f34c88943…

1 0

Józef Kucia : d3d11: Implement ID3D11BlendState interface.
by Alexandre Julliard 08 Oct '15

08 Oct '15

Module: wine Branch: master Commit: abf6b7422d7604f3a2f1d1736b5d57bf9568b2b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=abf6b7422d7604f3a2f1d1736… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Oct 8 02:55:54 2015 +0200 d3d11: Implement ID3D11BlendState interface. 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/d3d11_private.h | 5 +- dlls/d3d11/state.c | 148 +++++++++++++++++++++++++++++++++++++++------ 2 files changed, 131 insertions(+), 22 deletions(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index b2de1a7..3ee0606 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -275,16 +275,17 @@ struct d3d_pixel_shader *unsafe_impl_from_ID3D10PixelShader(ID3D10PixelShader *i HRESULT shader_parse_signature(const char *data, DWORD data_size, struct wined3d_shader_signature *s) DECLSPEC_HIDDEN; void shader_free_signature(struct wined3d_shader_signature *s) DECLSPEC_HIDDEN; -/* ID3D10BlendState */ +/* ID3D11BlendState, ID3D10BlendState */ struct d3d_blend_state { + ID3D11BlendState ID3D11BlendState_iface; ID3D10BlendState ID3D10BlendState_iface; LONG refcount; struct wined3d_private_store private_store; D3D10_BLEND_DESC desc; struct wine_rb_entry entry; - ID3D10Device1 *device; + ID3D11Device *device; }; HRESULT d3d_blend_state_init(struct d3d_blend_state *state, struct d3d_device *device, diff --git a/dlls/d3d11/state.c b/dlls/d3d11/state.c index 2130399..cdc6ebe 100644 --- a/dlls/d3d11/state.c +++ b/dlls/d3d11/state.c @@ -30,56 +30,66 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d11); #define D3D10_FILTER_ANISO_MASK 0x40 #define D3D10_FILTER_COMPARE_MASK 0x80 -static inline struct d3d_blend_state *impl_from_ID3D10BlendState(ID3D10BlendState *iface) +/* ID3D11BlendState methods */ + +static inline struct d3d_blend_state *impl_from_ID3D11BlendState(ID3D11BlendState *iface) { - return CONTAINING_RECORD(iface, struct d3d_blend_state, ID3D10BlendState_iface); + return CONTAINING_RECORD(iface, struct d3d_blend_state, ID3D11BlendState_iface); } -/* IUnknown methods */ - -static HRESULT STDMETHODCALLTYPE d3d10_blend_state_QueryInterface(ID3D10BlendState *iface, +static HRESULT STDMETHODCALLTYPE d3d11_blend_state_QueryInterface(ID3D11BlendState *iface, REFIID riid, void **object) { + struct d3d_blend_state *state = impl_from_ID3D11BlendState(iface); + TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object); - if (IsEqualGUID(riid, &IID_ID3D10BlendState) - || IsEqualGUID(riid, &IID_ID3D10DeviceChild) + if (IsEqualGUID(riid, &IID_ID3D11BlendState) + || IsEqualGUID(riid, &IID_ID3D11DeviceChild) || IsEqualGUID(riid, &IID_IUnknown)) { - IUnknown_AddRef(iface); + ID3D11BlendState_AddRef(iface); *object = iface; return S_OK; } + if (IsEqualGUID(riid, &IID_ID3D10BlendState) + || IsEqualGUID(riid, &IID_ID3D10DeviceChild)) + { + ID3D10BlendState_AddRef(&state->ID3D10BlendState_iface); + *object = &state->ID3D10BlendState_iface; + return S_OK; + } + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); *object = NULL; return E_NOINTERFACE; } -static ULONG STDMETHODCALLTYPE d3d10_blend_state_AddRef(ID3D10BlendState *iface) +static ULONG STDMETHODCALLTYPE d3d11_blend_state_AddRef(ID3D11BlendState *iface) { - struct d3d_blend_state *This = impl_from_ID3D10BlendState(iface); - ULONG refcount = InterlockedIncrement(&This->refcount); + struct d3d_blend_state *state = impl_from_ID3D11BlendState(iface); + ULONG refcount = InterlockedIncrement(&state->refcount); - TRACE("%p increasing refcount to %u.\n", This, refcount); + TRACE("%p increasing refcount to %u.\n", state, refcount); return refcount; } -static ULONG STDMETHODCALLTYPE d3d10_blend_state_Release(ID3D10BlendState *iface) +static ULONG STDMETHODCALLTYPE d3d11_blend_state_Release(ID3D11BlendState *iface) { - struct d3d_blend_state *state = impl_from_ID3D10BlendState(iface); + struct d3d_blend_state *state = impl_from_ID3D11BlendState(iface); ULONG refcount = InterlockedDecrement(&state->refcount); TRACE("%p decreasing refcount to %u.\n", state, refcount); if (!refcount) { - struct d3d_device *device = impl_from_ID3D10Device(state->device); + struct d3d_device *device = impl_from_ID3D11Device(state->device); wined3d_mutex_lock(); wine_rb_remove(&device->blend_states, &state->desc); - ID3D10Device1_Release(state->device); + ID3D11Device_Release(state->device); wined3d_private_store_cleanup(&state->private_store); wined3d_mutex_unlock(); HeapFree(GetProcessHeap(), 0, state); @@ -88,6 +98,104 @@ static ULONG STDMETHODCALLTYPE d3d10_blend_state_Release(ID3D10BlendState *iface return refcount; } +static void STDMETHODCALLTYPE d3d11_blend_state_GetDevice(ID3D11BlendState *iface, + ID3D11Device **device) +{ + struct d3d_blend_state *state = impl_from_ID3D11BlendState(iface); + + TRACE("iface %p, device %p.\n", iface, device); + + *device = state->device; + ID3D11Device_AddRef(*device); +} + +static HRESULT STDMETHODCALLTYPE d3d11_blend_state_GetPrivateData(ID3D11BlendState *iface, + REFGUID guid, UINT *data_size, void *data) +{ + struct d3d_blend_state *state = impl_from_ID3D11BlendState(iface); + + TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); + + return d3d_get_private_data(&state->private_store, guid, data_size, data); +} + +static HRESULT STDMETHODCALLTYPE d3d11_blend_state_SetPrivateData(ID3D11BlendState *iface, + REFGUID guid, UINT data_size, const void *data) +{ + struct d3d_blend_state *state = impl_from_ID3D11BlendState(iface); + + TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data); + + return d3d_set_private_data(&state->private_store, guid, data_size, data); +} + +static HRESULT STDMETHODCALLTYPE d3d11_blend_state_SetPrivateDataInterface(ID3D11BlendState *iface, + REFGUID guid, const IUnknown *data) +{ + struct d3d_blend_state *state = impl_from_ID3D11BlendState(iface); + + TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data); + + return d3d_set_private_data_interface(&state->private_store, guid, data); +} + +static void STDMETHODCALLTYPE d3d11_blend_state_GetDesc(ID3D11BlendState *iface, D3D11_BLEND_DESC *desc) +{ + FIXME("iface %p, desc %p stub!\n", iface, desc); +} + +static const struct ID3D11BlendStateVtbl d3d11_blend_state_vtbl = +{ + /* IUnknown methods */ + d3d11_blend_state_QueryInterface, + d3d11_blend_state_AddRef, + d3d11_blend_state_Release, + /* ID3D11DeviceChild methods */ + d3d11_blend_state_GetDevice, + d3d11_blend_state_GetPrivateData, + d3d11_blend_state_SetPrivateData, + d3d11_blend_state_SetPrivateDataInterface, + /* ID3D11BlendState methods */ + d3d11_blend_state_GetDesc, +}; + +/* ID3D10BlendState methods */ + +static inline struct d3d_blend_state *impl_from_ID3D10BlendState(ID3D10BlendState *iface) +{ + return CONTAINING_RECORD(iface, struct d3d_blend_state, ID3D10BlendState_iface); +} + +/* IUnknown methods */ + +static HRESULT STDMETHODCALLTYPE d3d10_blend_state_QueryInterface(ID3D10BlendState *iface, + REFIID riid, void **object) +{ + struct d3d_blend_state *state = impl_from_ID3D10BlendState(iface); + + TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object); + + return d3d11_blend_state_QueryInterface(&state->ID3D11BlendState_iface, riid, object); +} + +static ULONG STDMETHODCALLTYPE d3d10_blend_state_AddRef(ID3D10BlendState *iface) +{ + struct d3d_blend_state *state = impl_from_ID3D10BlendState(iface); + + TRACE("iface %p.\n", iface); + + return d3d11_blend_state_AddRef(&state->ID3D11BlendState_iface); +} + +static ULONG STDMETHODCALLTYPE d3d10_blend_state_Release(ID3D10BlendState *iface) +{ + struct d3d_blend_state *state = impl_from_ID3D10BlendState(iface); + + TRACE("iface %p.\n", iface); + + return d3d11_blend_state_Release(&state->ID3D11BlendState_iface); +} + /* ID3D10DeviceChild methods */ static void STDMETHODCALLTYPE d3d10_blend_state_GetDevice(ID3D10BlendState *iface, ID3D10Device **device) @@ -96,8 +204,7 @@ static void STDMETHODCALLTYPE d3d10_blend_state_GetDevice(ID3D10BlendState *ifac TRACE("iface %p, device %p.\n", iface, device); - *device = (ID3D10Device *)state->device; - ID3D10Device_AddRef(*device); + ID3D11Device_QueryInterface(state->device, &IID_ID3D10Device, (void **)device); } static HRESULT STDMETHODCALLTYPE d3d10_blend_state_GetPrivateData(ID3D10BlendState *iface, @@ -162,6 +269,7 @@ static const struct ID3D10BlendStateVtbl d3d10_blend_state_vtbl = HRESULT d3d_blend_state_init(struct d3d_blend_state *state, struct d3d_device *device, const D3D10_BLEND_DESC *desc) { + state->ID3D11BlendState_iface.lpVtbl = &d3d11_blend_state_vtbl; state->ID3D10BlendState_iface.lpVtbl = &d3d10_blend_state_vtbl; state->refcount = 1; wined3d_mutex_lock(); @@ -177,8 +285,8 @@ HRESULT d3d_blend_state_init(struct d3d_blend_state *state, struct d3d_device *d } wined3d_mutex_unlock(); - state->device = &device->ID3D10Device1_iface; - ID3D10Device1_AddRef(state->device); + state->device = &device->ID3D11Device_iface; + ID3D11Device_AddRef(state->device); return S_OK; }

1 0

Józef Kucia : d3d11: Rename d3d10_blend_state to d3d_blend_state.
by Alexandre Julliard 08 Oct '15

08 Oct '15

Module: wine Branch: master Commit: c2a171850fd1d2e22c2f4c9aed290cce25fadf1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2a171850fd1d2e22c2f4c9ae… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Oct 8 02:55:53 2015 +0200 d3d11: Rename d3d10_blend_state to d3d_blend_state. 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/d3d11_private.h | 8 ++++---- dlls/d3d11/device.c | 16 ++++++++-------- dlls/d3d11/state.c | 22 +++++++++++----------- 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index 313867e..b2de1a7 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -276,7 +276,7 @@ HRESULT shader_parse_signature(const char *data, DWORD data_size, struct wined3d void shader_free_signature(struct wined3d_shader_signature *s) DECLSPEC_HIDDEN; /* ID3D10BlendState */ -struct d3d10_blend_state +struct d3d_blend_state { ID3D10BlendState ID3D10BlendState_iface; LONG refcount; @@ -287,9 +287,9 @@ struct d3d10_blend_state ID3D10Device1 *device; }; -HRESULT d3d10_blend_state_init(struct d3d10_blend_state *state, struct d3d_device *device, +HRESULT d3d_blend_state_init(struct d3d_blend_state *state, struct d3d_device *device, const D3D10_BLEND_DESC *desc) DECLSPEC_HIDDEN; -struct d3d10_blend_state *unsafe_impl_from_ID3D10BlendState(ID3D10BlendState *iface) DECLSPEC_HIDDEN; +struct d3d_blend_state *unsafe_impl_from_ID3D10BlendState(ID3D10BlendState *iface) DECLSPEC_HIDDEN; /* ID3D11DepthStencilState, ID3D10DepthStencilState */ struct d3d_depthstencil_state @@ -378,7 +378,7 @@ struct d3d_device struct wine_rb_tree rasterizer_states; struct wine_rb_tree sampler_states; - struct d3d10_blend_state *blend_state; + struct d3d_blend_state *blend_state; float blend_factor[4]; struct d3d_depthstencil_state *depth_stencil_state; UINT stencil_ref; diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 4939883..059be51 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -2422,7 +2422,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateBlendState(ID3D10Device1 *if const D3D10_BLEND_DESC *desc, ID3D10BlendState **blend_state) { struct d3d_device *device = impl_from_ID3D10Device(iface); - struct d3d10_blend_state *object; + struct d3d_blend_state *object; struct wine_rb_entry *entry; HRESULT hr; @@ -2434,7 +2434,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateBlendState(ID3D10Device1 *if wined3d_mutex_lock(); if ((entry = wine_rb_get(&device->blend_states, desc))) { - object = WINE_RB_ENTRY_VALUE(entry, struct d3d10_blend_state, entry); + object = WINE_RB_ENTRY_VALUE(entry, struct d3d_blend_state, entry); TRACE("Returning existing blend state %p.\n", object); *blend_state = &object->ID3D10BlendState_iface; @@ -2449,7 +2449,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateBlendState(ID3D10Device1 *if if (!object) return E_OUTOFMEMORY; - if (FAILED(hr = d3d10_blend_state_init(object, device, desc))) + if (FAILED(hr = d3d_blend_state_init(object, device, desc))) { WARN("Failed to initialize blend state, hr %#x.\n", hr); HeapFree(GetProcessHeap(), 0, object); @@ -3090,20 +3090,20 @@ static const struct wine_rb_functions d3d10_sampler_state_rb_ops = d3d10_sampler_state_compare, }; -static int d3d10_blend_state_compare(const void *key, const struct wine_rb_entry *entry) +static int d3d_blend_state_compare(const void *key, const struct wine_rb_entry *entry) { const D3D10_BLEND_DESC *ka = key; - const D3D10_BLEND_DESC *kb = &WINE_RB_ENTRY_VALUE(entry, const struct d3d10_blend_state, entry)->desc; + const D3D10_BLEND_DESC *kb = &WINE_RB_ENTRY_VALUE(entry, const struct d3d_blend_state, entry)->desc; return memcmp(ka, kb, sizeof(*ka)); } -static const struct wine_rb_functions d3d10_blend_state_rb_ops = +static const struct wine_rb_functions d3d_blend_state_rb_ops = { d3d_rb_alloc, d3d_rb_realloc, d3d_rb_free, - d3d10_blend_state_compare, + d3d_blend_state_compare, }; static int d3d_depthstencil_state_compare(const void *key, const struct wine_rb_entry *entry) @@ -3151,7 +3151,7 @@ HRESULT d3d_device_init(struct d3d_device *device, void *outer_unknown) /* COM aggregation always takes place */ device->outer_unk = outer_unknown; - if (wine_rb_init(&device->blend_states, &d3d10_blend_state_rb_ops) == -1) + if (wine_rb_init(&device->blend_states, &d3d_blend_state_rb_ops) == -1) { WARN("Failed to initialize blend state rbtree.\n"); return E_FAIL; diff --git a/dlls/d3d11/state.c b/dlls/d3d11/state.c index 1586067..2130399 100644 --- a/dlls/d3d11/state.c +++ b/dlls/d3d11/state.c @@ -30,9 +30,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d11); #define D3D10_FILTER_ANISO_MASK 0x40 #define D3D10_FILTER_COMPARE_MASK 0x80 -static inline struct d3d10_blend_state *impl_from_ID3D10BlendState(ID3D10BlendState *iface) +static inline struct d3d_blend_state *impl_from_ID3D10BlendState(ID3D10BlendState *iface) { - return CONTAINING_RECORD(iface, struct d3d10_blend_state, ID3D10BlendState_iface); + return CONTAINING_RECORD(iface, struct d3d_blend_state, ID3D10BlendState_iface); } /* IUnknown methods */ @@ -59,7 +59,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_blend_state_QueryInterface(ID3D10BlendSta static ULONG STDMETHODCALLTYPE d3d10_blend_state_AddRef(ID3D10BlendState *iface) { - struct d3d10_blend_state *This = impl_from_ID3D10BlendState(iface); + struct d3d_blend_state *This = impl_from_ID3D10BlendState(iface); ULONG refcount = InterlockedIncrement(&This->refcount); TRACE("%p increasing refcount to %u.\n", This, refcount); @@ -69,7 +69,7 @@ static ULONG STDMETHODCALLTYPE d3d10_blend_state_AddRef(ID3D10BlendState *iface) static ULONG STDMETHODCALLTYPE d3d10_blend_state_Release(ID3D10BlendState *iface) { - struct d3d10_blend_state *state = impl_from_ID3D10BlendState(iface); + struct d3d_blend_state *state = impl_from_ID3D10BlendState(iface); ULONG refcount = InterlockedDecrement(&state->refcount); TRACE("%p decreasing refcount to %u.\n", state, refcount); @@ -92,7 +92,7 @@ static ULONG STDMETHODCALLTYPE d3d10_blend_state_Release(ID3D10BlendState *iface static void STDMETHODCALLTYPE d3d10_blend_state_GetDevice(ID3D10BlendState *iface, ID3D10Device **device) { - struct d3d10_blend_state *state = impl_from_ID3D10BlendState(iface); + struct d3d_blend_state *state = impl_from_ID3D10BlendState(iface); TRACE("iface %p, device %p.\n", iface, device); @@ -103,7 +103,7 @@ static void STDMETHODCALLTYPE d3d10_blend_state_GetDevice(ID3D10BlendState *ifac static HRESULT STDMETHODCALLTYPE d3d10_blend_state_GetPrivateData(ID3D10BlendState *iface, REFGUID guid, UINT *data_size, void *data) { - struct d3d10_blend_state *state = impl_from_ID3D10BlendState(iface); + struct d3d_blend_state *state = impl_from_ID3D10BlendState(iface); TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); @@ -114,7 +114,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_blend_state_GetPrivateData(ID3D10BlendSta static HRESULT STDMETHODCALLTYPE d3d10_blend_state_SetPrivateData(ID3D10BlendState *iface, REFGUID guid, UINT data_size, const void *data) { - struct d3d10_blend_state *state = impl_from_ID3D10BlendState(iface); + struct d3d_blend_state *state = impl_from_ID3D10BlendState(iface); TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data); @@ -125,7 +125,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_blend_state_SetPrivateData(ID3D10BlendSta static HRESULT STDMETHODCALLTYPE d3d10_blend_state_SetPrivateDataInterface(ID3D10BlendState *iface, REFGUID guid, const IUnknown *data) { - struct d3d10_blend_state *state = impl_from_ID3D10BlendState(iface); + struct d3d_blend_state *state = impl_from_ID3D10BlendState(iface); TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data); @@ -137,7 +137,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_blend_state_SetPrivateDataInterface(ID3D1 static void STDMETHODCALLTYPE d3d10_blend_state_GetDesc(ID3D10BlendState *iface, D3D10_BLEND_DESC *desc) { - struct d3d10_blend_state *state = impl_from_ID3D10BlendState(iface); + struct d3d_blend_state *state = impl_from_ID3D10BlendState(iface); TRACE("iface %p, desc %p.\n", iface, desc); @@ -159,7 +159,7 @@ static const struct ID3D10BlendStateVtbl d3d10_blend_state_vtbl = d3d10_blend_state_GetDesc, }; -HRESULT d3d10_blend_state_init(struct d3d10_blend_state *state, struct d3d_device *device, +HRESULT d3d_blend_state_init(struct d3d_blend_state *state, struct d3d_device *device, const D3D10_BLEND_DESC *desc) { state->ID3D10BlendState_iface.lpVtbl = &d3d10_blend_state_vtbl; @@ -183,7 +183,7 @@ HRESULT d3d10_blend_state_init(struct d3d10_blend_state *state, struct d3d_devic return S_OK; } -struct d3d10_blend_state *unsafe_impl_from_ID3D10BlendState(ID3D10BlendState *iface) +struct d3d_blend_state *unsafe_impl_from_ID3D10BlendState(ID3D10BlendState *iface) { if (!iface) return NULL;

1 0

Matteo Bruni : d3d9/tests: Fix color_match().
by Alexandre Julliard 08 Oct '15

08 Oct '15

Module: wine Branch: master Commit: 7ee0578019e0d8ae10d48163f49c28996a4e4b6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ee0578019e0d8ae10d48163f… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Oct 8 01:26:41 2015 +0200 d3d9/tests: Fix color_match(). Clang on OS X complains about calling abs() on an unsigned value. 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/tests/visual.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index a9b1ade..49f3ad4 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -65,13 +65,13 @@ static HWND create_window(void) static BOOL color_match(D3DCOLOR c1, D3DCOLOR c2, BYTE max_diff) { - if (abs((c1 & 0xff) - (c2 & 0xff)) > max_diff) return FALSE; + if (abs((int)(c1 & 0xff) - (int)(c2 & 0xff)) > max_diff) return FALSE; c1 >>= 8; c2 >>= 8; - if (abs((c1 & 0xff) - (c2 & 0xff)) > max_diff) return FALSE; + if (abs((int)(c1 & 0xff) - (int)(c2 & 0xff)) > max_diff) return FALSE; c1 >>= 8; c2 >>= 8; - if (abs((c1 & 0xff) - (c2 & 0xff)) > max_diff) return FALSE; + if (abs((int)(c1 & 0xff) - (int)(c2 & 0xff)) > max_diff) return FALSE; c1 >>= 8; c2 >>= 8; - if (abs((c1 & 0xff) - (c2 & 0xff)) > max_diff) return FALSE; + if (abs((int)(c1 & 0xff) - (int)(c2 & 0xff)) > max_diff) return FALSE; return TRUE; }

1 0

Riccardo Bortolato : wined3d: Merge wined3d_volume_{inc, dec}ref in their respective caller.
by Alexandre Julliard 08 Oct '15

08 Oct '15

Module: wine Branch: master Commit: cee9409ab857593f04c9709c8a20c5bac80f2934 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cee9409ab857593f04c9709c8… Author: Riccardo Bortolato <rikyz619(a)gmail.com> Date: Wed Oct 7 19:04:35 2015 +0200 wined3d: Merge wined3d_volume_{inc, dec}ref in their respective caller. Signed-off-by: Riccardo Bortolato <rikyz619(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/volume.c | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index 6a7cc5c..41264e8 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -460,20 +460,6 @@ static void volume_unload(struct wined3d_resource *resource) resource_unload(resource); } -static ULONG CDECL wined3d_volume_incref(struct wined3d_volume *volume) -{ - TRACE("Forwarding to container %p.\n", volume->container); - - return wined3d_texture_incref(volume->container); -} - -static ULONG CDECL wined3d_volume_decref(struct wined3d_volume *volume) -{ - TRACE("Forwarding to container %p.\n", volume->container); - - return wined3d_texture_decref(volume->container); -} - static BOOL volume_check_block_align(const struct wined3d_volume *volume, const struct wined3d_box *box) { @@ -700,12 +686,18 @@ HRESULT wined3d_volume_unmap(struct wined3d_volume *volume) static ULONG volume_resource_incref(struct wined3d_resource *resource) { - return wined3d_volume_incref(volume_from_resource(resource)); + struct wined3d_volume *volume = volume_from_resource(resource); + TRACE("Forwarding to container %p.\n", volume->container); + + return wined3d_texture_incref(volume->container); } static ULONG volume_resource_decref(struct wined3d_resource *resource) { - return wined3d_volume_decref(volume_from_resource(resource)); + struct wined3d_volume *volume = volume_from_resource(resource); + TRACE("Forwarding to container %p.\n", volume->container); + + return wined3d_texture_decref(volume->container); } static const struct wined3d_resource_ops volume_resource_ops =

1 0

← Newer
1
...
49
50
51
52
53
54
55
...
75
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 October 2015