December 2016 - Wine-Commits

Nikolay Sivov : xmllite: Keep a list of namespace definitions.
by Alexandre Julliard Dec. 9, 2016

Dec. 9, 2016

Module: wine Branch: master Commit: 18d6deff6d844d841844d2d7c63405742d74b7fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=18d6deff6d844d841844d2d7c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 9 16:38:24 2016 +0300 xmllite: Keep a list of namespace definitions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/reader.c | 102 ++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 83 insertions(+), 19 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 8978d97..500db62 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -216,11 +216,14 @@ typedef struct } strval; static WCHAR emptyW[] = {0}; +static WCHAR xmlnsW[] = {'x','m','l','n','s',0}; static const strval strval_empty = { emptyW }; +static const strval strval_xmlns = { xmlnsW, 5 }; struct attribute { struct list entry; + strval prefix; strval localname; strval value; }; @@ -233,6 +236,14 @@ struct element strval qname; }; +struct ns +{ + struct list entry; + strval prefix; + strval uri; + struct element *element; +}; + typedef struct { IXmlReader IXmlReader_iface; @@ -250,6 +261,8 @@ typedef struct struct list attrs; /* attributes list for current node */ struct attribute *attr; /* current attribute */ UINT attr_count; + struct list nsdef; + struct list ns; struct list elements; strval strvalues[StringValue_Last]; UINT depth; @@ -369,13 +382,17 @@ static void reader_clear_attrs(xmlreader *reader) /* attribute data holds pointers to buffer data, so buffer shrink is not possible while we are on a node with attributes */ -static HRESULT reader_add_attr(xmlreader *reader, strval *localname, strval *value) +static HRESULT reader_add_attr(xmlreader *reader, strval *prefix, strval *localname, strval *value) { struct attribute *attr; attr = reader_alloc(reader, sizeof(*attr)); if (!attr) return E_OUTOFMEMORY; + if (prefix) + attr->prefix = *prefix; + else + memset(&attr->prefix, 0, sizeof(attr->prefix)); attr->localname = *localname; attr->value = *value; list_add_tail(&reader->attrs, &attr->entry); @@ -457,6 +474,36 @@ static void reader_dec_depth(xmlreader *reader) if (reader->depth > 1) reader->depth--; } +static HRESULT reader_push_ns(xmlreader *reader, const strval *prefix, const strval *uri, BOOL def) +{ + struct ns *ns; + HRESULT hr; + + ns = reader_alloc(reader, sizeof(*ns)); + if (!ns) return E_OUTOFMEMORY; + + if (def) + memset(&ns->prefix, 0, sizeof(ns->prefix)); + else { + hr = reader_strvaldup(reader, prefix, &ns->prefix); + if (FAILED(hr)) { + reader_free(reader, ns); + return hr; + } + } + + hr = reader_strvaldup(reader, uri, &ns->uri); + if (FAILED(hr)) { + reader_free_strvalued(reader, &ns->prefix); + reader_free(reader, ns); + return hr; + } + + ns->element = NULL; + list_add_head(def ? &reader->nsdef : &reader->ns, &ns->entry); + return hr; +} + static void reader_free_element(xmlreader *reader, struct element *element) { reader_free_strvalued(reader, &element->prefix); @@ -1056,7 +1103,7 @@ static HRESULT reader_parse_versioninfo(xmlreader *reader) /* skip "'"|'"' */ reader_skipn(reader, 1); - return reader_add_attr(reader, &name, &val); + return reader_add_attr(reader, NULL, &name, &val); } /* ([A-Za-z0-9._] | '-') */ @@ -1132,7 +1179,7 @@ static HRESULT reader_parse_encdecl(xmlreader *reader) /* skip "'"|'"' */ reader_skipn(reader, 1); - return reader_add_attr(reader, &name, &val); + return reader_add_attr(reader, NULL, &name, &val); } /* [32] SDDecl ::= S 'standalone' Eq (("'" ('yes' | 'no') "'") | ('"' ('yes' | 'no') '"')) */ @@ -1174,7 +1221,7 @@ static HRESULT reader_parse_sddecl(xmlreader *reader) /* skip "'"|'"' */ reader_skipn(reader, 1); - return reader_add_attr(reader, &name, &val); + return reader_add_attr(reader, NULL, &name, &val); } /* [23] XMLDecl ::= '<?xml' VersionInfo EncodingDecl? SDDecl? S? '?>' */ @@ -1644,7 +1691,7 @@ static HRESULT reader_parse_externalid(xmlreader *reader) if (FAILED(hr)) return hr; reader_init_cstrvalue(publicW, strlenW(publicW), &name); - hr = reader_add_attr(reader, &name, &pub); + hr = reader_add_attr(reader, NULL, &name, &pub); if (FAILED(hr)) return hr; cnt = reader_skipspaces(reader); @@ -1655,7 +1702,7 @@ static HRESULT reader_parse_externalid(xmlreader *reader) if (FAILED(hr)) return S_OK; reader_init_cstrvalue(systemW, strlenW(systemW), &name); - hr = reader_add_attr(reader, &name, &sys); + hr = reader_add_attr(reader, NULL, &name, &sys); if (FAILED(hr)) return hr; return S_OK; @@ -1669,7 +1716,7 @@ static HRESULT reader_parse_externalid(xmlreader *reader) if (FAILED(hr)) return hr; reader_init_cstrvalue(systemW, strlenW(systemW), &name); - return reader_add_attr(reader, &name, &sys); + return reader_add_attr(reader, NULL, &name, &sys); } return S_FALSE; @@ -2042,23 +2089,18 @@ static HRESULT reader_parse_attvalue(xmlreader *reader, strval *value) [15 NS] Attribute ::= NSAttName Eq AttValue | QName Eq AttValue */ static HRESULT reader_parse_attribute(xmlreader *reader) { - static const WCHAR xmlnsW[] = {'x','m','l','n','s',0}; - strval prefix, local, qname, xmlns, value; + strval prefix, local, qname, value; + BOOL ns = FALSE, nsdef = FALSE; HRESULT hr; hr = reader_parse_qname(reader, &prefix, &local, &qname); if (FAILED(hr)) return hr; - reader_init_cstrvalue((WCHAR*)xmlnsW, 5, &xmlns); - - if (strval_eq(reader, &prefix, &xmlns)) - { - FIXME("namespace definitions not supported\n"); - return E_NOTIMPL; - } + if (strval_eq(reader, &prefix, &strval_xmlns)) + ns = TRUE; - if (strval_eq(reader, &qname, &xmlns)) - FIXME("default namespace definitions not supported\n"); + if (strval_eq(reader, &qname, &strval_xmlns)) + ns = nsdef = TRUE; hr = reader_parse_eq(reader); if (FAILED(hr)) return hr; @@ -2066,8 +2108,11 @@ static HRESULT reader_parse_attribute(xmlreader *reader) hr = reader_parse_attvalue(reader, &value); if (FAILED(hr)) return hr; + if (ns) + reader_push_ns(reader, nsdef ? &strval_xmlns : &local, &value, nsdef); + TRACE("%s=%s\n", debug_strval(reader, &local), debug_strval(reader, &value)); - return reader_add_attr(reader, &local, &value); + return reader_add_attr(reader, &prefix, &local, &value); } /* [12 NS] STag ::= '<' QName (S Attribute)* S? '>' @@ -2487,6 +2532,22 @@ static ULONG WINAPI xmlreader_AddRef(IXmlReader *iface) return ref; } +static void reader_clear_ns(xmlreader *reader) +{ + struct ns *ns, *ns2; + + LIST_FOR_EACH_ENTRY_SAFE(ns, ns2, &reader->ns, struct ns, entry) { + reader_free_strvalued(reader, &ns->prefix); + reader_free_strvalued(reader, &ns->uri); + reader_free(reader, ns); + } + + LIST_FOR_EACH_ENTRY_SAFE(ns, ns2, &reader->nsdef, struct ns, entry) { + reader_free_strvalued(reader, &ns->uri); + reader_free(reader, ns); + } +} + static ULONG WINAPI xmlreader_Release(IXmlReader *iface) { xmlreader *This = impl_from_IXmlReader(iface); @@ -2501,6 +2562,7 @@ static ULONG WINAPI xmlreader_Release(IXmlReader *iface) if (This->resolver) IXmlResolver_Release(This->resolver); if (This->mlang) IUnknown_Release(This->mlang); reader_clear_attrs(This); + reader_clear_ns(This); reader_clear_elements(This); reader_free_strvalues(This); reader_free(This, This); @@ -3044,6 +3106,8 @@ HRESULT WINAPI CreateXmlReader(REFIID riid, void **obj, IMalloc *imalloc) list_init(&reader->attrs); reader->attr_count = 0; reader->attr = NULL; + list_init(&reader->nsdef); + list_init(&reader->ns); list_init(&reader->elements); reader->depth = 0; reader->max_depth = 256;

1 0

Nikolay Sivov : xmllite: Improve writer methods tracing.
by Alexandre Julliard Dec. 9, 2016

Dec. 9, 2016

Module: wine Branch: master Commit: a39251b09634db16d48c1da079e51dfb2d5dc644 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a39251b09634db16d48c1da07… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 9 16:38:21 2016 +0300 xmllite: Improve writer methods tracing. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/writer.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/xmllite/writer.c b/dlls/xmllite/writer.c index bcc0e85..f7f2604 100644 --- a/dlls/xmllite/writer.c +++ b/dlls/xmllite/writer.c @@ -447,7 +447,7 @@ static HRESULT WINAPI xmlwriter_QueryInterface(IXmlWriter *iface, REFIID riid, v { xmlwriter *This = impl_from_IXmlWriter(iface); - TRACE("%p %s %p\n", This, debugstr_guid(riid), ppvObject); + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppvObject); if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IXmlWriter)) @@ -463,23 +463,23 @@ static HRESULT WINAPI xmlwriter_QueryInterface(IXmlWriter *iface, REFIID riid, v static ULONG WINAPI xmlwriter_AddRef(IXmlWriter *iface) { xmlwriter *This = impl_from_IXmlWriter(iface); - TRACE("%p\n", This); - return InterlockedIncrement(&This->ref); + ULONG ref = InterlockedIncrement(&This->ref); + TRACE("(%p)->(%u)\n", This, ref); + return ref; } static ULONG WINAPI xmlwriter_Release(IXmlWriter *iface) { xmlwriter *This = impl_from_IXmlWriter(iface); - LONG ref; + ULONG ref = InterlockedDecrement(&This->ref); - TRACE("%p\n", This); + TRACE("(%p)->>(%u)\n", This, ref); - ref = InterlockedDecrement(&This->ref); if (ref == 0) { struct element *element, *element2; IMalloc *imalloc = This->imalloc; - IXmlWriter_Flush(iface); + writeroutput_flush_stream(This->output); if (This->output) IUnknown_Release(&This->output->IXmlWriterOutput_iface); /* element stack */

1 0

Nikolay Sivov : xmllite: Store empty element fields separately.
by Alexandre Julliard Dec. 9, 2016

Dec. 9, 2016

Module: wine Branch: master Commit: f185dd51fdb4c1afeb2771445e3db304790f1eee URL: http://source.winehq.org/git/wine.git/?a=commit;h=f185dd51fdb4c1afeb2771445… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 9 16:38:22 2016 +0300 xmllite: Store empty element fields separately. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/reader.c | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 9484173..c3b68d2 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -253,7 +253,8 @@ typedef struct strval strvalues[StringValue_Last]; UINT depth; UINT max_depth; - BOOL empty_element; + BOOL is_empty_element; + struct element empty_element; UINT resume[XmlReadResume_Last]; /* offsets used to resume reader */ } xmlreader; @@ -433,7 +434,7 @@ static void reader_clear_elements(xmlreader *reader) reader_free(reader, elem); } list_init(&reader->elements); - reader->empty_element = FALSE; + reader->is_empty_element = FALSE; } static HRESULT reader_inc_depth(xmlreader *reader) @@ -479,7 +480,7 @@ static HRESULT reader_push_element(xmlreader *reader, strval *qname, strval *loc } list_add_head(&reader->elements, &elem->entry); - reader->empty_element = FALSE; + reader->is_empty_element = FALSE; return hr; } @@ -2075,7 +2076,9 @@ static HRESULT reader_parse_stag(xmlreader *reader, strval *prefix, strval *loca { /* skip '/>' */ reader_skipn(reader, 2); - reader->empty_element = TRUE; + reader->is_empty_element = TRUE; + reader->empty_element.localname = *local; + reader->empty_element.qname = *qname; return S_OK; } @@ -2707,7 +2710,6 @@ static HRESULT WINAPI xmlreader_MoveToAttributeByName(IXmlReader* iface, static HRESULT WINAPI xmlreader_MoveToElement(IXmlReader* iface) { xmlreader *This = impl_from_IXmlReader(iface); - struct element *elem; TRACE("(%p)\n", This); @@ -2715,11 +2717,16 @@ static HRESULT WINAPI xmlreader_MoveToElement(IXmlReader* iface) This->attr = NULL; /* FIXME: support other node types with 'attributes' like DTD */ - elem = LIST_ENTRY(list_head(&This->elements), struct element, entry); - if (elem) - { - reader_set_strvalue(This, StringValue_QualifiedName, &elem->qname); - reader_set_strvalue(This, StringValue_LocalName, &elem->localname); + if (This->is_empty_element) { + reader_set_strvalue(This, StringValue_LocalName, &This->empty_element.localname); + reader_set_strvalue(This, StringValue_QualifiedName, &This->empty_element.qname); + } + else { + struct element *element = LIST_ENTRY(list_head(&This->elements), struct element, entry); + if (element) { + reader_set_strvalue(This, StringValue_LocalName, &element->localname); + reader_set_strvalue(This, StringValue_QualifiedName, &element->qname); + } } return S_OK; @@ -2841,7 +2848,7 @@ static BOOL WINAPI xmlreader_IsEmptyElement(IXmlReader* iface) TRACE("(%p)\n", This); /* Empty elements are not placed in stack, it's stored as a global reader flag that makes sense when current node is start tag of an element */ - return (reader_get_nodetype(This) == XmlNodeType_Element) ? This->empty_element : FALSE; + return (reader_get_nodetype(This) == XmlNodeType_Element) ? This->is_empty_element : FALSE; } static HRESULT WINAPI xmlreader_GetLineNumber(IXmlReader* iface, UINT *lineNumber) @@ -3024,7 +3031,7 @@ HRESULT WINAPI CreateXmlReader(REFIID riid, void **obj, IMalloc *imalloc) list_init(&reader->elements); reader->depth = 0; reader->max_depth = 256; - reader->empty_element = FALSE; + reader->is_empty_element = FALSE; memset(reader->resume, 0, sizeof(reader->resume)); for (i = 0; i < StringValue_Last; i++)

1 0

Hans Leidekker : dpnet/tests: Skip tests if dpnet is a stub dll.
by Alexandre Julliard Dec. 9, 2016

Dec. 9, 2016

Module: wine Branch: master Commit: e017d9bcd4b34a45854ed43642b65b98c7cd920c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e017d9bcd4b34a45854ed4364… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Dec 9 18:03:04 2016 +0100 dpnet/tests: Skip tests if dpnet is a stub dll. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dpnet/tests/Makefile.in | 2 +- dlls/dpnet/tests/address.c | 34 ++++++++++++++++++++++++++++++++++ dlls/dpnet/tests/client.c | 34 ++++++++++++++++++++++++++++++++++ dlls/dpnet/tests/server.c | 34 ++++++++++++++++++++++++++++++++++ 4 files changed, 103 insertions(+), 1 deletion(-) diff --git a/dlls/dpnet/tests/Makefile.in b/dlls/dpnet/tests/Makefile.in index 13eae44..d7f6d71 100644 --- a/dlls/dpnet/tests/Makefile.in +++ b/dlls/dpnet/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = dpnet.dll -IMPORTS = dxguid uuid dpnet ole32 +IMPORTS = dxguid uuid dpnet ole32 version C_SRCS = \ address.c \ diff --git a/dlls/dpnet/tests/address.c b/dlls/dpnet/tests/address.c index dd0ef23..16ba6a7 100644 --- a/dlls/dpnet/tests/address.c +++ b/dlls/dpnet/tests/address.c @@ -353,10 +353,44 @@ static void address_duplicate(void) } } +/* taken from programs/winetest/main.c */ +static BOOL is_stub_dll(const char *filename) +{ + DWORD size, ver; + BOOL isstub = FALSE; + char *p, *data; + + size = GetFileVersionInfoSizeA(filename, &ver); + if (!size) return FALSE; + + data = HeapAlloc(GetProcessHeap(), 0, size); + if (!data) return FALSE; + + if (GetFileVersionInfoA(filename, ver, size, data)) + { + char buf[256]; + + sprintf(buf, "\\StringFileInfo\\%04x%04x\\OriginalFilename", MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), 1200); + if (VerQueryValueA(data, buf, (void**)&p, &size)) + isstub = !lstrcmpiA("wcodstub.dll", p); + } + HeapFree(GetProcessHeap(), 0, data); + + return isstub; +} + START_TEST(address) { HRESULT hr; + if (!winetest_interactive && + (is_stub_dll("c:\\windows\\system32\\dpnet.dll") || + is_stub_dll("c:\\windows\\syswow64\\dpnet.dll"))) + { + win_skip("dpnet is a stub dll, skipping tests\n"); + return; + } + hr = CoInitialize(0); ok(hr == S_OK, "failed to init com\n"); if(hr != S_OK) diff --git a/dlls/dpnet/tests/client.c b/dlls/dpnet/tests/client.c index 68b3832..db08f73 100644 --- a/dlls/dpnet/tests/client.c +++ b/dlls/dpnet/tests/client.c @@ -606,8 +606,42 @@ static void test_cleanup_dp_peer(void) CoUninitialize(); } +/* taken from programs/winetest/main.c */ +static BOOL is_stub_dll(const char *filename) +{ + DWORD size, ver; + BOOL isstub = FALSE; + char *p, *data; + + size = GetFileVersionInfoSizeA(filename, &ver); + if (!size) return FALSE; + + data = HeapAlloc(GetProcessHeap(), 0, size); + if (!data) return FALSE; + + if (GetFileVersionInfoA(filename, ver, size, data)) + { + char buf[256]; + + sprintf(buf, "\\StringFileInfo\\%04x%04x\\OriginalFilename", MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), 1200); + if (VerQueryValueA(data, buf, (void**)&p, &size)) + isstub = !lstrcmpiA("wcodstub.dll", p); + } + HeapFree(GetProcessHeap(), 0, data); + + return isstub; +} + START_TEST(client) { + if (!winetest_interactive && + (is_stub_dll("c:\\windows\\system32\\dpnet.dll") || + is_stub_dll("c:\\windows\\syswow64\\dpnet.dll"))) + { + win_skip("dpnet is a stub dll, skipping tests\n"); + return; + } + if(!test_init_dp()) return; diff --git a/dlls/dpnet/tests/server.c b/dlls/dpnet/tests/server.c index 928c6a0..307167f 100644 --- a/dlls/dpnet/tests/server.c +++ b/dlls/dpnet/tests/server.c @@ -180,10 +180,44 @@ static void test_server_info(void) } } +/* taken from programs/winetest/main.c */ +static BOOL is_stub_dll(const char *filename) +{ + DWORD size, ver; + BOOL isstub = FALSE; + char *p, *data; + + size = GetFileVersionInfoSizeA(filename, &ver); + if (!size) return FALSE; + + data = HeapAlloc(GetProcessHeap(), 0, size); + if (!data) return FALSE; + + if (GetFileVersionInfoA(filename, ver, size, data)) + { + char buf[256]; + + sprintf(buf, "\\StringFileInfo\\%04x%04x\\OriginalFilename", MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), 1200); + if (VerQueryValueA(data, buf, (void**)&p, &size)) + isstub = !lstrcmpiA("wcodstub.dll", p); + } + HeapFree(GetProcessHeap(), 0, data); + + return isstub; +} + START_TEST(server) { HRESULT hr; + if (!winetest_interactive && + (is_stub_dll("c:\\windows\\system32\\dpnet.dll") || + is_stub_dll("c:\\windows\\syswow64\\dpnet.dll"))) + { + win_skip("dpnet is a stub dll, skipping tests\n"); + return; + } + hr = CoInitialize(0); ok( hr == S_OK, "failed to init com\n"); if (hr != S_OK)

1 0

Michael Stefaniuc : dsound: Avoid casts from COM object to interface.
by Alexandre Julliard Dec. 9, 2016

Dec. 9, 2016

Module: wine Branch: master Commit: 48b32c78d29950443ee6f279f49b099a3960b979 URL: http://source.winehq.org/git/wine.git/?a=commit;h=48b32c78d29950443ee6f279f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Dec 9 16:10:05 2016 +0100 dsound: Avoid casts from COM object to interface. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsound/dsound.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c index 43b252d..e8c10a7 100644 --- a/dlls/dsound/dsound.c +++ b/dlls/dsound/dsound.c @@ -452,8 +452,8 @@ static HRESULT DirectSoundDevice_CreateSoundBuffer( if (device->primary) { WARN("Primary Buffer already created\n"); - IDirectSoundBuffer_AddRef((LPDIRECTSOUNDBUFFER8)(device->primary)); - *ppdsb = (LPDIRECTSOUNDBUFFER)(device->primary); + IDirectSoundBuffer8_AddRef(&device->primary->IDirectSoundBuffer8_iface); + *ppdsb = (IDirectSoundBuffer *)&device->primary->IDirectSoundBuffer8_iface; } else { hres = primarybuffer_create(device, &device->primary, dsbd); if (device->primary) {

1 0

Nikolay Sivov : xmllite: Add maintainer entry.
by Alexandre Julliard Dec. 9, 2016

Dec. 9, 2016

Module: wine Branch: master Commit: 831c202c38e97730c5446b95c8a542714febd99b URL: http://source.winehq.org/git/wine.git/?a=commit;h=831c202c38e97730c5446b95c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 9 16:38:34 2016 +0300 xmllite: Add maintainer entry. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- MAINTAINERS | 1 + dlls/xmllite/reader.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index 55a7834..cec6cdb 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -265,6 +265,7 @@ F: dlls/winex11.drv/ XML parsing M: Nikolay Sivov <nsivov(a)codeweavers.com> F: dlls/msxml*/ +F: dlls/xmllite/ THE REST M: Alexandre Julliard <julliard(a)winehq.org> diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 2dadfa2..0fedd91 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -1,7 +1,7 @@ /* * IXmlReader implementation * - * Copyright 2010, 2012-2013 Nikolay Sivov + * Copyright 2010, 2012-2013, 2016 Nikolay Sivov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public

1 0

Nikolay Sivov : xmllite: Improve GetValue() for namespace definition nodes.
by Alexandre Julliard Dec. 9, 2016

Dec. 9, 2016

Module: wine Branch: master Commit: 20c575e81fdf2038a37eae2ac9bdb809a2542de8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20c575e81fdf2038a37eae2ac… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 9 16:38:30 2016 +0300 xmllite: Improve GetValue() for namespace definition nodes. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/reader.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 24a061c..47649f5 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -3002,6 +3002,18 @@ static HRESULT WINAPI xmlreader_GetPrefix(IXmlReader* iface, LPCWSTR *prefix, UI return S_OK; } +static BOOL is_namespace_definition(xmlreader *reader) +{ + const strval *local = &reader->strvalues[StringValue_LocalName]; + const strval *prefix = &reader->strvalues[StringValue_Prefix]; + + if (reader_get_nodetype(reader) != XmlNodeType_Attribute) + return FALSE; + + return ((strval_eq(reader, prefix, &strval_empty) && strval_eq(reader, local, &strval_xmlns)) || + strval_eq(reader, prefix, &strval_xmlns)); +} + static HRESULT WINAPI xmlreader_GetValue(IXmlReader* iface, const WCHAR **value, UINT *len) { xmlreader *reader = impl_from_IXmlReader(iface); @@ -3032,6 +3044,18 @@ static HRESULT WINAPI xmlreader_GetValue(IXmlReader* iface, const WCHAR **value, val->str = ptr; } + /* For namespace definition attributes return values from namespace list */ + if (is_namespace_definition(reader)) { + const strval *local = &reader->strvalues[StringValue_LocalName]; + struct ns *ns; + + ns = reader_lookup_ns(reader, local); + if (!ns) + ns = reader_lookup_nsdef(reader); + + val = &ns->uri; + } + *value = val->str; if (len) *len = val->len; return S_OK;

1 0

Józef Kucia : wined3d: Do not try to create texture views for depth slices.
by Alexandre Julliard Dec. 9, 2016

Dec. 9, 2016

Module: wine Branch: master Commit: b76f39936f8ae3da33c29424477ca0ba817822c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b76f39936f8ae3da33c294244… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Dec 9 11:30:44 2016 +0100 wined3d: Do not try to create texture views for depth slices. 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/wined3d/view.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 237122d..27ee9d2 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -65,6 +65,7 @@ static void create_texture_view(struct wined3d_gl_view *view, GLenum view_target const struct wined3d_format *view_format) { const struct wined3d_gl_info *gl_info; + unsigned int layer_idx, layer_count; struct wined3d_context *context; struct gl_texture *gl_texture; @@ -83,10 +84,19 @@ static void create_texture_view(struct wined3d_gl_view *view, GLenum view_target wined3d_texture_prepare_texture(texture, context, FALSE); gl_texture = wined3d_texture_get_gl_texture(texture, FALSE); + layer_idx = desc->u.texture.layer_idx; + layer_count = desc->u.texture.layer_count; + if (view_target == GL_TEXTURE_3D && (layer_idx || layer_count != 1)) + { + FIXME("Depth slice (%u-%u) not supported.\n", layer_idx, layer_count); + layer_idx = 0; + layer_count = 1; + } + gl_info->gl_ops.gl.p_glGenTextures(1, &view->name); GL_EXTCALL(glTextureView(view->name, view->target, gl_texture->name, view_format->glInternal, desc->u.texture.level_idx, desc->u.texture.level_count, - desc->u.texture.layer_idx, desc->u.texture.layer_count)); + layer_idx, layer_count)); checkGLcall("Create texture view"); if (is_stencil_view_format(view_format))

1 0

Józef Kucia : wined3d: Generate declaration for typed buffer UAVs.
by Alexandre Julliard Dec. 9, 2016

Dec. 9, 2016

Module: wine Branch: master Commit: bdccf5e1e0930e8354426af5cd36cb5a716d68d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdccf5e1e0930e8354426af5c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Dec 9 11:30:38 2016 +0100 wined3d: Generate declaration for typed buffer UAVs. 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/wined3d/glsl_shader.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 627832c..a800939 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2123,6 +2123,10 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont switch (reg_maps->uav_resource_info[i].type) { + case WINED3D_SHADER_RESOURCE_BUFFER: + image_type = "imageBuffer"; + break; + case WINED3D_SHADER_RESOURCE_TEXTURE_2D: image_type = "image2D"; break;

1 0

Józef Kucia : wined3d: Allow creating raw shader resource views.
by Alexandre Julliard Dec. 9, 2016

Dec. 9, 2016

Module: wine Branch: master Commit: c5719b4fc4bb6a2b3e0985eb2c153d3dddf67388 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5719b4fc4bb6a2b3e0985eb2… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Dec 9 11:30:37 2016 +0100 wined3d: Allow creating raw shader resource views. 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/wined3d/view.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index ef602de..adbd159 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -375,7 +375,8 @@ static HRESULT wined3d_shader_resource_view_init(struct wined3d_shader_resource_ const struct wined3d_format *view_format; view_format = wined3d_get_format(gl_info, desc->format_id); - if (wined3d_format_is_typeless(view_format)) + if (wined3d_format_is_typeless(view_format) + && !(view_format->id == WINED3DFMT_R32_TYPELESS && (desc->flags & WINED3D_VIEW_BUFFER_RAW))) { WARN("Trying to create view for typeless format %s.\n", debug_d3dformat(view_format->id)); return E_INVALIDARG;

1 0

Lauri Kenttä : user32/tests: Add tests for LockWindowUpdate.
by Alexandre Julliard Dec. 9, 2016

Dec. 9, 2016

Module: wine Branch: master Commit: 26be29138f71fe6a937ef35b0d77be7630d2f0b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=26be29138f71fe6a937ef35b0… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Thu Dec 8 20:49:18 2016 +0200 user32/tests: Add tests for LockWindowUpdate. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 71 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 71 insertions(+) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 428a88f..375d387 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -9325,6 +9325,76 @@ todo_wine ok(ret, "got %d\n", ret); } +static void test_LockWindowUpdate(HWND parent) +{ + typedef struct + { + HWND hwnd_lock, hwnd_draw; + BOOL allow_drawing; + BOOL expect_valid; + } TEST; + + int i; + HWND child = CreateWindowA("static", 0, WS_CHILD | WS_VISIBLE, 0, 0, 20, 20, parent, 0, 0, 0); + + TEST tests[] = { + {child, child, 0, 0}, + {child, child, 1, 1}, + {child, parent, 0, 1}, + {child, parent, 1, 1}, + {parent, child, 0, 0}, + {parent, child, 1, 1}, + {parent, parent, 0, 0}, + {parent, parent, 1, 1} + }; + + if (!child) + { + skip("CreateWindow failed, skipping LockWindowUpdate tests\n"); + return; + } + + ShowWindow(parent, SW_SHOW); + UpdateWindow(parent); + flush_events(TRUE); + + for (i = 0; i < sizeof(tests) / sizeof(tests[0]); ++i) + { + HDC hdc; + POINT p = {10, 10}; + BOOL ret; + const DWORD dc_flags = DCX_USESTYLE | (tests[i].allow_drawing ? DCX_LOCKWINDOWUPDATE : 0); + const COLORREF c1 = 0x111100, c2 = 0x222200; + + trace("hwnd_lock = %s, hwnd_draw = %s, allow_drawing = %d\n", + tests[i].hwnd_lock == parent ? "parent" : "child", + tests[i].hwnd_draw == parent ? "parent" : "child", + tests[i].allow_drawing); + + hdc = GetDCEx(tests[i].hwnd_draw, 0, dc_flags); + +#define TEST_PIXEL(c_valid, c_invalid) \ + do { \ + COLORREF c = GetPixel(hdc, p.x, p.y); \ + COLORREF e = tests[i].expect_valid ? (c_valid) : (c_invalid); \ + todo_wine_if(!tests[i].expect_valid) \ + ok(c == e, "GetPixel: got %08x, expected %08x\n", c, e); \ + } while (0) + + SetPixel(hdc, p.x, p.y, c1); + ret = LockWindowUpdate(tests[i].hwnd_lock); + ok(ret, "LockWindowUpdate failed\n"); + TEST_PIXEL(c1, CLR_INVALID); + SetPixel(hdc, p.x, p.y, c2); + TEST_PIXEL(c2, CLR_INVALID); + LockWindowUpdate(0); + TEST_PIXEL(c2, c1); + ReleaseDC(tests[i].hwnd_draw, hdc); +#undef TEST_PIXEL + } + DestroyWindow(child); +} + START_TEST(win) { char **argv; @@ -9470,6 +9540,7 @@ START_TEST(win) test_activateapp(hwndMain); test_winproc_handles(argv[0]); test_deferwindowpos(); + test_LockWindowUpdate(hwndMain); /* add the tests above this line */ if (hhook) UnhookWindowsHookEx(hhook);

1 0

Bruno Jesus : xinput9_1_0: Prefer builtin DLL.
by Alexandre Julliard Dec. 9, 2016

Dec. 9, 2016

Module: wine Branch: master Commit: c0f77b4a4a2a389f54c3572156883eec6d6314d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0f77b4a4a2a389f54c357215… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Fri Dec 9 06:49:06 2016 -0200 xinput9_1_0: Prefer builtin DLL. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xinput9_1_0/Makefile.in | 3 --- dlls/xinput9_1_0/xinput9_1_0_main.c | 37 ------------------------------------- 2 files changed, 40 deletions(-) diff --git a/dlls/xinput9_1_0/Makefile.in b/dlls/xinput9_1_0/Makefile.in index df8a574..0c4b7e7 100644 --- a/dlls/xinput9_1_0/Makefile.in +++ b/dlls/xinput9_1_0/Makefile.in @@ -1,6 +1,3 @@ MODULE = xinput9_1_0.dll -C_SRCS = \ - xinput9_1_0_main.c - RC_SRCS = version.rc diff --git a/dlls/xinput9_1_0/xinput9_1_0_main.c b/dlls/xinput9_1_0/xinput9_1_0_main.c deleted file mode 100644 index 2de4317..0000000 --- a/dlls/xinput9_1_0/xinput9_1_0_main.c +++ /dev/null @@ -1,37 +0,0 @@ -/* - * The Wine project - Xinput Joystick Library - * Copyright 2008 Andrew Fenn - * - * 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 - */ - -#include "config.h" -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" - -BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved) -{ - switch(reason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(inst); - break; - } - return TRUE; -}

1 0

Bruno Jesus : xinput1_2: Prefer builtin DLL.
by Alexandre Julliard Dec. 9, 2016

Dec. 9, 2016

Module: wine Branch: master Commit: 07258c7d4b5143b0a33db933d71882bfbcfc3e55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=07258c7d4b5143b0a33db933d… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Fri Dec 9 06:49:04 2016 -0200 xinput1_2: Prefer builtin DLL. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xinput1_2/Makefile.in | 3 --- dlls/xinput1_2/xinput1_2_main.c | 37 ------------------------------------- 2 files changed, 40 deletions(-) diff --git a/dlls/xinput1_2/Makefile.in b/dlls/xinput1_2/Makefile.in index 3eaec14..16fed94 100644 --- a/dlls/xinput1_2/Makefile.in +++ b/dlls/xinput1_2/Makefile.in @@ -1,6 +1,3 @@ MODULE = xinput1_2.dll -C_SRCS = \ - xinput1_2_main.c - RC_SRCS = version.rc diff --git a/dlls/xinput1_2/xinput1_2_main.c b/dlls/xinput1_2/xinput1_2_main.c deleted file mode 100644 index 2de4317..0000000 --- a/dlls/xinput1_2/xinput1_2_main.c +++ /dev/null @@ -1,37 +0,0 @@ -/* - * The Wine project - Xinput Joystick Library - * Copyright 2008 Andrew Fenn - * - * 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 - */ - -#include "config.h" -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" - -BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved) -{ - switch(reason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(inst); - break; - } - return TRUE; -}

1 0

Nikolay Sivov : ws2_32: Fix build failure on Mac.
by Alexandre Julliard Dec. 9, 2016

Dec. 9, 2016

Module: wine Branch: master Commit: 24dbd9de9374e26721ddfb0e2cfedb504189e1d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=24dbd9de9374e26721ddfb0e2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 9 08:11:49 2016 +0300 ws2_32: Fix build failure on Mac. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 3cdeade..6bf3c9d 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1230,7 +1230,7 @@ static BOOL get_dont_fragment(SOCKET s, int level, BOOL *out) static int once; if (!once++) FIXME("IP_DONTFRAGMENT for IPv6 not supported in this platform\n"); - return TRUE /* fake success */ + return TRUE; /* fake success */ #endif }

1 0

Huw Davies : windowscodecs: Fix typo in 2 bpp conversion.
by Alexandre Julliard Dec. 9, 2016

Dec. 9, 2016

Module: wine Branch: master Commit: a531ade2fdaa21571b0adeb01c9b17b67ed92850 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a531ade2fdaa21571b0adeb01… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Dec 9 14:38:04 2016 +0000 windowscodecs: Fix typo in 2 bpp conversion. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/converter.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/windowscodecs/converter.c b/dlls/windowscodecs/converter.c index e5bce44..e5d61e1 100644 --- a/dlls/windowscodecs/converter.c +++ b/dlls/windowscodecs/converter.c @@ -257,7 +257,7 @@ static HRESULT copypixels_to_32bppBGRA(struct FormatConverter *This, const WICRe *dstpixel++ = colors[srcval>>6]; if (x+1 < prc->Width) *dstpixel++ = colors[srcval>>4&0x3]; if (x+2 < prc->Width) *dstpixel++ = colors[srcval>>2&0x3]; - if (x+1 < prc->Width) *dstpixel++ = colors[srcval&0x3]; + if (x+3 < prc->Width) *dstpixel++ = colors[srcval&0x3]; } srcrow += srcstride; dstrow += cbStride;

1 0

Huw Davies : user32/tests: Add a test to show that released cache DCs are disabled.
by Alexandre Julliard Dec. 9, 2016

Dec. 9, 2016

Module: wine Branch: master Commit: 78983d9fcd9f9e84748df68b8ce4e4981f678e0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=78983d9fcd9f9e84748df68b8… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Dec 9 14:17:31 2016 +0000 user32/tests: Add a test to show that released cache DCs are disabled. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/dce.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/user32/tests/dce.c b/dlls/user32/tests/dce.c index 6ba234e..b5f9722 100644 --- a/dlls/user32/tests/dce.c +++ b/dlls/user32/tests/dce.c @@ -110,6 +110,12 @@ static void test_dc_attributes(void) } while (i > 0) ReleaseDC( hwnd_cache, hdcs[--i] ); + /* Released cache DCs are 'disabled' */ + rop = SetROP2( old_hdc, R2_BLACK ); + todo_wine ok( rop == 0, "got %d\n", rop ); + rop = GetROP2( old_hdc ); + todo_wine ok( rop == 0, "got %d\n", rop ); + /* test own DC */ hdc = GetDC( hwnd_owndc );

1 0

Józef Kucia : wined3d: Create texture views for unordered access views.
by Alexandre Julliard Dec. 9, 2016

Dec. 9, 2016

Module: wine Branch: master Commit: 2dcfd128e1d172b477748f4dc9cbdeb3a9bc5896 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2dcfd128e1d172b477748f4dc… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Dec 9 11:30:45 2016 +0100 wined3d: Create texture views for unordered access views. 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/wined3d/context.c | 17 ++++++++++++++--- dlls/wined3d/view.c | 4 ++-- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 2ce99cb..61a9f61 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3406,8 +3406,9 @@ static void context_bind_unordered_access_views(struct wined3d_context *context, struct wined3d_unordered_access_view *view; struct wined3d_texture *texture; struct wined3d_shader *shader; - struct gl_texture *gl_texture; + GLuint texture_name; unsigned int i; + GLint level; context->uses_uavs = 0; @@ -3438,8 +3439,18 @@ static void context_bind_unordered_access_views(struct wined3d_context *context, wined3d_texture_load(texture, context, FALSE); wined3d_unordered_access_view_invalidate_location(view, ~WINED3D_LOCATION_TEXTURE_RGB); - gl_texture = wined3d_texture_get_gl_texture(texture, FALSE); - GL_EXTCALL(glBindImageTexture(i, gl_texture->name, view->level_idx, GL_TRUE, 0, GL_READ_WRITE, + if (view->gl_view.name) + { + texture_name = view->gl_view.name; + level = 0; + } + else + { + texture_name = wined3d_texture_get_gl_texture(texture, FALSE)->name; + level = view->level_idx; + } + + GL_EXTCALL(glBindImageTexture(i, texture_name, level, GL_TRUE, 0, GL_READ_WRITE, view->format->glInternal)); } checkGLcall("Bind unordered access views"); diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 27ee9d2..a57e890 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -610,8 +610,8 @@ static HRESULT wined3d_unordered_access_view_init(struct wined3d_unordered_acces if (desc->u.texture.layer_idx || desc->u.texture.layer_count != depth_or_layer_count) { - FIXME("Unordered access view unsupported yet (layers %u-%u).\n", - desc->u.texture.layer_idx, desc->u.texture.layer_count); + create_texture_view(&view->gl_view, get_texture_view_target(desc, texture), + desc, texture, view->format); } view->layer_idx = desc->u.texture.layer_idx; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 29143be..69ba146 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3321,7 +3321,7 @@ struct wined3d_unordered_access_view const struct wined3d_parent_ops *parent_ops; const struct wined3d_format *format; - + struct wined3d_gl_view gl_view; unsigned int layer_idx; unsigned int layer_count; unsigned int level_idx;

1 0

Józef Kucia : d3d11/tests: Add test showing that depth/stencil UAVs are not allowed.
by Alexandre Julliard Dec. 9, 2016

Dec. 9, 2016

Module: wine Branch: master Commit: f7bc122e007c82c45e3e46c9d540492d82c06ecf URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7bc122e007c82c45e3e46c9d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Dec 9 11:30:42 2016 +0100 d3d11/tests: Add test showing that depth/stencil UAVs are not allowed. 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 | 136 ++++++++++++++++++++++++----------------------- 1 file changed, 70 insertions(+), 66 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f7bc122e007c82c45e3e4…

1 0

Józef Kucia : wined3d: Extract create_texture_view() function from shader resource views.
by Alexandre Julliard Dec. 9, 2016

Dec. 9, 2016

Module: wine Branch: master Commit: 7d2bfe78518bbfaf3c2a2f48c43d5b85a3454af9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d2bfe78518bbfaf3c2a2f48c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Dec 9 11:30:41 2016 +0100 wined3d: Extract create_texture_view() function from shader resource views. 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/wined3d/view.c | 120 ++++++++++++++++++++--------------------- dlls/wined3d/wined3d_private.h | 9 +++- 2 files changed, 67 insertions(+), 62 deletions(-) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index adbd159..036edf3 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -30,6 +30,57 @@ static BOOL is_stencil_view_format(const struct wined3d_format *format) || format->id == WINED3DFMT_X32_TYPELESS_G8X24_UINT; } +static void create_texture_view(struct wined3d_gl_view *view, GLenum view_target, + const struct wined3d_view_desc *desc, struct wined3d_texture *texture, + const struct wined3d_format *view_format) +{ + const struct wined3d_gl_info *gl_info; + struct wined3d_context *context; + struct gl_texture *gl_texture; + + view->target = view_target; + + context = context_acquire(texture->resource.device, NULL); + gl_info = context->gl_info; + + if (!gl_info->supported[ARB_TEXTURE_VIEW]) + { + context_release(context); + FIXME("OpenGL implementation does not support texture views.\n"); + return; + } + + wined3d_texture_prepare_texture(texture, context, FALSE); + gl_texture = wined3d_texture_get_gl_texture(texture, FALSE); + + gl_info->gl_ops.gl.p_glGenTextures(1, &view->name); + GL_EXTCALL(glTextureView(view->name, view->target, gl_texture->name, view_format->glInternal, + desc->u.texture.level_idx, desc->u.texture.level_count, + desc->u.texture.layer_idx, desc->u.texture.layer_count)); + checkGLcall("Create texture view"); + + if (is_stencil_view_format(view_format)) + { + static const GLint swizzle[] = {GL_ZERO, GL_RED, GL_ZERO, GL_ZERO}; + + if (!gl_info->supported[ARB_STENCIL_TEXTURING]) + { + context_release(context); + FIXME("OpenGL implementation does not support stencil texturing.\n"); + return; + } + + context_bind_texture(context, view->target, view->name); + gl_info->gl_ops.gl.p_glTexParameteriv(view->target, GL_TEXTURE_SWIZZLE_RGBA, swizzle); + gl_info->gl_ops.gl.p_glTexParameteri(view->target, GL_DEPTH_STENCIL_TEXTURE_MODE, GL_STENCIL_INDEX); + checkGLcall("Initialize stencil view"); + + context_invalidate_state(context, STATE_SHADER_RESOURCE_BINDING); + } + + context_release(context); +} + ULONG CDECL wined3d_rendertarget_view_incref(struct wined3d_rendertarget_view *view) { ULONG refcount = InterlockedIncrement(&view->refcount); @@ -259,14 +310,14 @@ static void wined3d_shader_resource_view_destroy_object(void *object) { struct wined3d_shader_resource_view *view = object; - if (view->object) + if (view->gl_view.name) { const struct wined3d_gl_info *gl_info; struct wined3d_context *context; context = context_acquire(view->resource->device, NULL); gl_info = context->gl_info; - gl_info->gl_ops.gl.p_glDeleteTextures(1, &view->object); + gl_info->gl_ops.gl.p_glDeleteTextures(1, &view->gl_view.name); checkGLcall("glDeleteTextures"); context_release(context); } @@ -302,55 +353,6 @@ void * CDECL wined3d_shader_resource_view_get_parent(const struct wined3d_shader return view->parent; } -static void wined3d_shader_resource_view_create_texture_view(struct wined3d_shader_resource_view *view, - const struct wined3d_view_desc *desc, struct wined3d_texture *texture, - const struct wined3d_format *view_format) -{ - const struct wined3d_gl_info *gl_info; - struct wined3d_context *context; - struct gl_texture *gl_texture; - - context = context_acquire(texture->resource.device, NULL); - gl_info = context->gl_info; - - if (!gl_info->supported[ARB_TEXTURE_VIEW]) - { - context_release(context); - FIXME("OpenGL implementation does not support texture views.\n"); - return; - } - - wined3d_texture_prepare_texture(texture, context, FALSE); - gl_texture = wined3d_texture_get_gl_texture(texture, FALSE); - - gl_info->gl_ops.gl.p_glGenTextures(1, &view->object); - GL_EXTCALL(glTextureView(view->object, view->target, gl_texture->name, view_format->glInternal, - desc->u.texture.level_idx, desc->u.texture.level_count, - desc->u.texture.layer_idx, desc->u.texture.layer_count)); - checkGLcall("Create texture view"); - - if (is_stencil_view_format(view_format)) - { - static const GLint swizzle[] = {GL_ZERO, GL_RED, GL_ZERO, GL_ZERO}; - - if (!gl_info->supported[ARB_STENCIL_TEXTURING]) - { - context_release(context); - FIXME("OpenGL implementation does not support stencil texturing.\n"); - return; - } - - context_bind_texture(context, view->target, view->object); - gl_info->gl_ops.gl.p_glTexParameteriv(view->target, GL_TEXTURE_SWIZZLE_RGBA, swizzle); - gl_info->gl_ops.gl.p_glTexParameteri(view->target, GL_DEPTH_STENCIL_TEXTURE_MODE, GL_STENCIL_INDEX); - checkGLcall("Initialize stencil view"); - - context_invalidate_state(context, STATE_SHADER_RESOURCE_BINDING); - } - - context_release(context); -} - static HRESULT wined3d_shader_resource_view_init(struct wined3d_shader_resource_view *view, const struct wined3d_view_desc *desc, struct wined3d_resource *resource, void *parent, const struct wined3d_parent_ops *parent_ops) @@ -373,6 +375,7 @@ static HRESULT wined3d_shader_resource_view_init(struct wined3d_shader_resource_ const struct wined3d_gl_info *gl_info = &resource->device->adapter->gl_info; const struct wined3d_format *view_format; + GLenum view_target; view_format = wined3d_get_format(gl_info, desc->format_id); if (wined3d_format_is_typeless(view_format) @@ -386,9 +389,6 @@ static HRESULT wined3d_shader_resource_view_init(struct wined3d_shader_resource_ view->parent = parent; view->parent_ops = parent_ops; - view->target = GL_NONE; - view->object = 0; - if (resource->type == WINED3D_RTYPE_BUFFER) { FIXME("Buffer shader resource views not supported.\n"); @@ -406,19 +406,19 @@ static HRESULT wined3d_shader_resource_view_init(struct wined3d_shader_resource_ || desc->u.texture.layer_count > texture->layer_count - desc->u.texture.layer_idx) return E_INVALIDARG; - view->target = texture->target; + view_target = texture->target; for (i = 0; i < ARRAY_SIZE(view_types); ++i) { if (view_types[i].texture_target == texture->target && view_types[i].view_flags == desc->flags) { - view->target = view_types[i].view_target; + view_target = view_types[i].view_target; break; } } if (i == ARRAY_SIZE(view_types)) FIXME("Unhandled view flags %#x for texture target %#x.\n", desc->flags, texture->target); - if (resource->format->id == view_format->id && texture->target == view->target + if (resource->format->id == view_format->id && texture->target == view_target && !desc->u.texture.level_idx && desc->u.texture.level_count == texture->level_count && !desc->u.texture.layer_idx && desc->u.texture.layer_count == texture->layer_count && !is_stencil_view_format(view_format)) @@ -432,7 +432,7 @@ static HRESULT wined3d_shader_resource_view_init(struct wined3d_shader_resource_ else if (resource->format->typeless_id == view_format->typeless_id && resource->format->gl_view_class == view_format->gl_view_class) { - wined3d_shader_resource_view_create_texture_view(view, desc, texture, view_format); + create_texture_view(&view->gl_view, view_target, desc, texture, view_format); } else { @@ -476,9 +476,9 @@ void wined3d_shader_resource_view_bind(struct wined3d_shader_resource_view *view { struct wined3d_texture *texture; - if (view->object) + if (view->gl_view.name) { - context_bind_texture(context, view->target, view->object); + context_bind_texture(context, view->gl_view.target, view->gl_view.name); return; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index dd2754b..29143be 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3292,6 +3292,12 @@ static inline struct wined3d_surface *wined3d_rendertarget_view_get_surface( void wined3d_rendertarget_view_get_drawable_size(const struct wined3d_rendertarget_view *view, const struct wined3d_context *context, unsigned int *width, unsigned int *height) DECLSPEC_HIDDEN; +struct wined3d_gl_view +{ + GLenum target; + GLuint name; +}; + struct wined3d_shader_resource_view { LONG refcount; @@ -3300,8 +3306,7 @@ struct wined3d_shader_resource_view void *parent; const struct wined3d_parent_ops *parent_ops; - GLenum target; - GLuint object; + struct wined3d_gl_view gl_view; }; void wined3d_shader_resource_view_bind(struct wined3d_shader_resource_view *view,

1 0

Józef Kucia : d3d10core/tests: Add more tests for bind flags.
by Alexandre Julliard Dec. 9, 2016

Dec. 9, 2016

Module: wine Branch: master Commit: 24989883384847cfa2afa7307462457f075b9c9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=24989883384847cfa2afa7307… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Dec 9 11:30:40 2016 +0100 d3d10core/tests: Add more tests for bind flags. 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 | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 784a086..009442f 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -1236,8 +1236,13 @@ static void test_create_texture2d(void) {DXGI_FORMAT_R32_TYPELESS, 0, D3D10_BIND_SHADER_RESOURCE, 0, FALSE, FALSE}, {DXGI_FORMAT_R32_TYPELESS, 1, D3D10_BIND_SHADER_RESOURCE, 0, TRUE, FALSE}, {DXGI_FORMAT_R32_TYPELESS, 9, D3D10_BIND_SHADER_RESOURCE, 0, TRUE, FALSE}, + {DXGI_FORMAT_R32_TYPELESS, 9, D3D10_BIND_SHADER_RESOURCE | D3D10_BIND_DEPTH_STENCIL, 0, + TRUE, FALSE}, {DXGI_FORMAT_R32_TYPELESS, 9, D3D10_BIND_SHADER_RESOURCE, D3D10_RESOURCE_MISC_TEXTURECUBE, FALSE, TRUE}, + {DXGI_FORMAT_R32_TYPELESS, 1, D3D10_BIND_RENDER_TARGET, 0, TRUE, FALSE}, + {DXGI_FORMAT_R32_TYPELESS, 1, D3D10_BIND_RENDER_TARGET | D3D10_BIND_DEPTH_STENCIL, 0, + FALSE, TRUE}, {DXGI_FORMAT_R32_TYPELESS, 1, D3D10_BIND_DEPTH_STENCIL, 0, TRUE, FALSE}, {DXGI_FORMAT_R24G8_TYPELESS, 1, D3D10_BIND_VERTEX_BUFFER, 0, FALSE, TRUE}, {DXGI_FORMAT_R24G8_TYPELESS, 1, D3D10_BIND_INDEX_BUFFER, 0, FALSE, TRUE}, @@ -1259,8 +1264,13 @@ static void test_create_texture2d(void) {DXGI_FORMAT_R8G8B8A8_UINT, 1, D3D10_BIND_RENDER_TARGET, 0, TRUE, FALSE}, {DXGI_FORMAT_R8G8B8A8_SNORM, 1, D3D10_BIND_RENDER_TARGET, 0, TRUE, FALSE}, {DXGI_FORMAT_R8G8B8A8_SINT, 1, D3D10_BIND_RENDER_TARGET, 0, TRUE, FALSE}, + {DXGI_FORMAT_D24_UNORM_S8_UINT, 1, D3D10_BIND_SHADER_RESOURCE, 0, FALSE, TRUE}, {DXGI_FORMAT_D24_UNORM_S8_UINT, 1, D3D10_BIND_RENDER_TARGET, 0, FALSE, FALSE}, + {DXGI_FORMAT_D32_FLOAT, 1, D3D10_BIND_SHADER_RESOURCE, 0, FALSE, TRUE}, + {DXGI_FORMAT_D32_FLOAT, 1, D3D10_BIND_SHADER_RESOURCE | D3D10_BIND_DEPTH_STENCIL, 0, + FALSE, TRUE}, {DXGI_FORMAT_D32_FLOAT, 1, D3D10_BIND_RENDER_TARGET, 0, FALSE, FALSE}, + {DXGI_FORMAT_D32_FLOAT, 1, D3D10_BIND_DEPTH_STENCIL, 0, TRUE, FALSE}, }; if (!(device = create_device())) @@ -1373,7 +1383,8 @@ static void test_create_texture2d(void) hr = ID3D10Device_CreateTexture2D(device, &desc, NULL, (ID3D10Texture2D **)&texture); todo_wine_if(tests[i].todo) - ok(hr == (tests[i].succeeds ? S_OK : E_INVALIDARG), "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(hr == (tests[i].succeeds ? S_OK : E_INVALIDARG), + "Test %u: Got unexpected hr %#x (format %#x).\n", i, hr, desc.Format); if (SUCCEEDED(hr)) ID3D10Texture2D_Release(texture);

1 0

Józef Kucia : d3d11/tests: Add test for SM5 bufinfo instruction.
by Alexandre Julliard Dec. 9, 2016

Dec. 9, 2016

Module: wine Branch: master Commit: b3602e4c7eafdc72d2e28b2d7b012c7f6eb590d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3602e4c7eafdc72d2e28b2d7… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Dec 9 11:30:39 2016 +0100 d3d11/tests: Add test for SM5 bufinfo instruction. 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 | 296 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 296 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b3602e4c7eafdc72d2e28…

1 0

Józef Kucia : wined3d: Allow creating raw unordered access views.
by Alexandre Julliard Dec. 9, 2016

Dec. 9, 2016

Module: wine Branch: master Commit: 9d5eb9a2409514ec3aae0401d851e4d6324d1503 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d5eb9a2409514ec3aae0401d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Dec 9 11:30:36 2016 +0100 wined3d: Allow creating raw unordered access views. 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/wined3d/view.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 50c43f4..ef602de 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -566,13 +566,18 @@ static HRESULT wined3d_unordered_access_view_init(struct wined3d_unordered_acces view->format = wined3d_get_format(gl_info, desc->format_id); - if (wined3d_format_is_typeless(view->format)) + if (wined3d_format_is_typeless(view->format) + && !(view->format->id == WINED3DFMT_R32_TYPELESS && (desc->flags & WINED3D_VIEW_BUFFER_RAW))) { WARN("Trying to create view for typeless format %s.\n", debug_d3dformat(view->format->id)); return E_INVALIDARG; } - if (resource->type != WINED3D_RTYPE_BUFFER) + if (resource->type == WINED3D_RTYPE_BUFFER) + { + FIXME("Buffer unordered access views not supported.\n"); + } + else { struct wined3d_texture *texture = texture_from_resource(resource); unsigned int depth_or_layer_count;

1 0

Bruno Jesus : xinput1_3/tests: Improve vibration tests.
by Alexandre Julliard Dec. 9, 2016

Dec. 9, 2016

Module: wine Branch: master Commit: 4989d8727f91c6b730c8be94fc5341d198c179cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=4989d8727f91c6b730c8be94f… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Fri Dec 9 05:26:08 2016 -0200 xinput1_3/tests: Improve vibration tests. Specially the part to disable the vibration after the test. Manually tested on Windows 8. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xinput1_3/tests/xinput.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/dlls/xinput1_3/tests/xinput.c b/dlls/xinput1_3/tests/xinput.c index eb0bab3..0deab26 100644 --- a/dlls/xinput1_3/tests/xinput.c +++ b/dlls/xinput1_3/tests/xinput.c @@ -54,22 +54,35 @@ static void test_set_state(void) { ZeroMemory(&vibrator, sizeof(XINPUT_VIBRATION)); + vibrator.wLeftMotorSpeed = 32767; + vibrator.wRightMotorSpeed = 32767; + result = pXInputSetState(controllerNum, &vibrator); + if (result == ERROR_DEVICE_NOT_CONNECTED) continue; + + Sleep(250); vibrator.wLeftMotorSpeed = 0; vibrator.wRightMotorSpeed = 0; result = pXInputSetState(controllerNum, &vibrator); - ok(result == ERROR_SUCCESS || result == ERROR_DEVICE_NOT_CONNECTED, "XInputSetState failed with (%d)\n", result); + ok(result == ERROR_SUCCESS, "XInputSetState failed with (%d)\n", result); /* Disabling XInput here, queueing a vibration and then re-enabling XInput * is used to prove that vibrations are auto enabled when resuming XInput. - * If XInputEnable is removed the vibration will never play. */ + * If XInputEnable(1) is removed below the vibration will never play. */ if (pXInputEnable) pXInputEnable(0); + Sleep(250); vibrator.wLeftMotorSpeed = 65535; vibrator.wRightMotorSpeed = 65535; result = pXInputSetState(controllerNum, &vibrator); - ok(result == ERROR_SUCCESS || result == ERROR_DEVICE_NOT_CONNECTED, "XInputSetState failed with (%d)\n", result); + ok(result == ERROR_SUCCESS, "XInputSetState failed with (%d)\n", result); if (pXInputEnable) pXInputEnable(1); + Sleep(250); + + vibrator.wLeftMotorSpeed = 0; + vibrator.wRightMotorSpeed = 0; + result = pXInputSetState(controllerNum, &vibrator); + ok(result == ERROR_SUCCESS, "XInputSetState failed with (%d)\n", result); } result = pXInputSetState(XUSER_MAX_COUNT+1, &vibrator);

1 0

Józef Kucia : wined3d: Extract get_texture_view_target() from wined3d_shader_resource_view_init( ).
by Alexandre Julliard Dec. 9, 2016

Dec. 9, 2016

Module: wine Branch: master Commit: dc4042653d37abab813c871f4eab4ed17ee3c93d URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc4042653d37abab813c871f4… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Dec 9 11:30:43 2016 +0100 wined3d: Extract get_texture_view_target() from wined3d_shader_resource_view_init(). 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/wined3d/view.c | 59 ++++++++++++++++++++++++++++------------------------- 1 file changed, 31 insertions(+), 28 deletions(-) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 036edf3..237122d 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -30,6 +30,36 @@ static BOOL is_stencil_view_format(const struct wined3d_format *format) || format->id == WINED3DFMT_X32_TYPELESS_G8X24_UINT; } +static GLenum get_texture_view_target(const struct wined3d_view_desc *desc, + const struct wined3d_texture *texture) +{ + static const struct + { + GLenum texture_target; + unsigned int view_flags; + GLenum view_target; + } + view_types[] = + { + {GL_TEXTURE_2D, 0, GL_TEXTURE_2D}, + {GL_TEXTURE_2D, WINED3D_VIEW_TEXTURE_ARRAY, GL_TEXTURE_2D_ARRAY}, + {GL_TEXTURE_2D_ARRAY, 0, GL_TEXTURE_2D}, + {GL_TEXTURE_2D_ARRAY, WINED3D_VIEW_TEXTURE_ARRAY, GL_TEXTURE_2D_ARRAY}, + {GL_TEXTURE_2D_ARRAY, WINED3D_VIEW_TEXTURE_CUBE, GL_TEXTURE_CUBE_MAP}, + {GL_TEXTURE_3D, 0, GL_TEXTURE_3D}, + }; + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(view_types); ++i) + { + if (view_types[i].texture_target == texture->target && view_types[i].view_flags == desc->flags) + return view_types[i].view_target; + } + + FIXME("Unhandled view flags %#x for texture target %#x.\n", desc->flags, texture->target); + return texture->target; +} + static void create_texture_view(struct wined3d_gl_view *view, GLenum view_target, const struct wined3d_view_desc *desc, struct wined3d_texture *texture, const struct wined3d_format *view_format) @@ -357,22 +387,6 @@ static HRESULT wined3d_shader_resource_view_init(struct wined3d_shader_resource_ const struct wined3d_view_desc *desc, struct wined3d_resource *resource, void *parent, const struct wined3d_parent_ops *parent_ops) { - static const struct - { - GLenum texture_target; - unsigned int view_flags; - GLenum view_target; - } - view_types[] = - { - {GL_TEXTURE_2D, 0, GL_TEXTURE_2D}, - {GL_TEXTURE_2D, WINED3D_VIEW_TEXTURE_ARRAY, GL_TEXTURE_2D_ARRAY}, - {GL_TEXTURE_2D_ARRAY, 0, GL_TEXTURE_2D}, - {GL_TEXTURE_2D_ARRAY, WINED3D_VIEW_TEXTURE_ARRAY, GL_TEXTURE_2D_ARRAY}, - {GL_TEXTURE_2D_ARRAY, WINED3D_VIEW_TEXTURE_CUBE, GL_TEXTURE_CUBE_MAP}, - {GL_TEXTURE_3D, 0, GL_TEXTURE_3D}, - }; - const struct wined3d_gl_info *gl_info = &resource->device->adapter->gl_info; const struct wined3d_format *view_format; GLenum view_target; @@ -396,7 +410,6 @@ static HRESULT wined3d_shader_resource_view_init(struct wined3d_shader_resource_ else { struct wined3d_texture *texture = texture_from_resource(resource); - unsigned int i; if (!desc->u.texture.level_count || desc->u.texture.level_idx >= texture->level_count @@ -406,17 +419,7 @@ static HRESULT wined3d_shader_resource_view_init(struct wined3d_shader_resource_ || desc->u.texture.layer_count > texture->layer_count - desc->u.texture.layer_idx) return E_INVALIDARG; - view_target = texture->target; - for (i = 0; i < ARRAY_SIZE(view_types); ++i) - { - if (view_types[i].texture_target == texture->target && view_types[i].view_flags == desc->flags) - { - view_target = view_types[i].view_target; - break; - } - } - if (i == ARRAY_SIZE(view_types)) - FIXME("Unhandled view flags %#x for texture target %#x.\n", desc->flags, texture->target); + view_target = get_texture_view_target(desc, texture); if (resource->format->id == view_format->id && texture->target == view_target && !desc->u.texture.level_idx && desc->u.texture.level_count == texture->level_count

1 0

Bruno Jesus : xinput1_4: Prefer builtin DLL.
by Alexandre Julliard Dec. 9, 2016

Dec. 9, 2016

Module: wine Branch: master Commit: 2d7e13503cafa3356a66a582cbdb478a0146aeba URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d7e13503cafa3356a66a582c… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Fri Dec 9 06:49:05 2016 -0200 xinput1_4: Prefer builtin DLL. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xinput1_4/Makefile.in | 3 --- dlls/xinput1_4/xinput1_4_main.c | 37 ------------------------------------- 2 files changed, 40 deletions(-) diff --git a/dlls/xinput1_4/Makefile.in b/dlls/xinput1_4/Makefile.in index 43d1812..f881d19 100644 --- a/dlls/xinput1_4/Makefile.in +++ b/dlls/xinput1_4/Makefile.in @@ -1,6 +1,3 @@ MODULE = xinput1_4.dll -C_SRCS = \ - xinput1_4_main.c - RC_SRCS = version.rc diff --git a/dlls/xinput1_4/xinput1_4_main.c b/dlls/xinput1_4/xinput1_4_main.c deleted file mode 100644 index f91a3c5..0000000 --- a/dlls/xinput1_4/xinput1_4_main.c +++ /dev/null @@ -1,37 +0,0 @@ -/* - * The Wine project - Xinput Joystick Library - * Copyright 2013 André Hentschel - * - * 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 - */ - -#include "config.h" -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" - -BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved) -{ - switch(reason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(inst); - break; - } - return TRUE; -}

1 0