July 2017 - Wine-commits - list.winehq.org

Nikolay Sivov : xmllite/writer: Fix empty element and state handling in WriteElementString().
by Alexandre Julliard 24 Jul '17

24 Jul '17

Module: wine Branch: master Commit: 5f4ed88ee8eb162c0e3af5044e0450e927226ab1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f4ed88ee8eb162c0e3af5044… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jul 23 14:55:44 2017 +0300 xmllite/writer: Fix empty element and state handling in WriteElementString(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/tests/writer.c | 82 +++++++++++++++++++++++++++------------------ dlls/xmllite/writer.c | 26 +++++++------- 2 files changed, 64 insertions(+), 44 deletions(-) diff --git a/dlls/xmllite/tests/writer.c b/dlls/xmllite/tests/writer.c index 89fdb4e..6408b54 100644 --- a/dlls/xmllite/tests/writer.c +++ b/dlls/xmllite/tests/writer.c @@ -67,6 +67,14 @@ static void check_output(IStream *stream, const char *expected, BOOL todo, int l #define CHECK_OUTPUT(stream, expected) check_output(stream, expected, FALSE, __LINE__) #define CHECK_OUTPUT_TODO(stream, expected) check_output(stream, expected, TRUE, __LINE__) +static void writer_set_property(IXmlWriter *writer, XmlWriterProperty property) +{ + HRESULT hr; + + hr = IXmlWriter_SetProperty(writer, property, TRUE); + ok(hr == S_OK, "Failed to set writer property, hr %#x.\n", hr); +} + /* used to test all Write* methods for consistent error state */ static void check_writer_state(IXmlWriter *writer, HRESULT exp_hr) { @@ -475,8 +483,7 @@ static void test_omitxmldeclaration(void) stream = writer_set_output(writer); - hr = IXmlWriter_SetProperty(writer, XmlWriterProperty_OmitXmlDeclaration, TRUE); - ok(hr == S_OK, "got 0x%08x\n", hr); + writer_set_property(writer, XmlWriterProperty_OmitXmlDeclaration); hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Yes); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -557,8 +564,7 @@ static void test_bom(void) hr = CreateXmlWriter(&IID_IXmlWriter, (void**)&writer, NULL); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - hr = IXmlWriter_SetProperty(writer, XmlWriterProperty_OmitXmlDeclaration, TRUE); - ok(hr == S_OK, "got 0x%08x\n", hr); + writer_set_property(writer, XmlWriterProperty_OmitXmlDeclaration); hr = IXmlWriter_SetOutput(writer, output); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -664,7 +670,6 @@ static void test_bom(void) static void test_writestartelement(void) { static const WCHAR valueW[] = {'v','a','l','u','e',0}; - static const char *str = "<a>value"; static const WCHAR aW[] = {'a',0}; static const WCHAR bW[] = {'b',0}; IXmlWriter *writer; @@ -726,10 +731,14 @@ static void test_writestartelement(void) hr = IXmlWriter_WriteElementString(writer, NULL, bW, NULL, valueW); ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IXmlWriter_WriteElementString(writer, NULL, bW, NULL, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IXmlWriter_Flush(writer); ok(hr == S_OK, "got 0x%08x\n", hr); - CHECK_OUTPUT(stream, str); + CHECK_OUTPUT(stream, + "<a>value"); IStream_Release(stream); IXmlWriter_Release(writer); @@ -840,8 +849,7 @@ static void test_WriteComment(void) hr = CreateXmlWriter(&IID_IXmlWriter, (void**)&writer, NULL); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - hr = IXmlWriter_SetProperty(writer, XmlWriterProperty_OmitXmlDeclaration, TRUE); - ok(hr == S_OK, "got 0x%08x\n", hr); + writer_set_property(writer, XmlWriterProperty_OmitXmlDeclaration); hr = IXmlWriter_WriteComment(writer, aW); ok(hr == E_UNEXPECTED, "got 0x%08x\n", hr); @@ -888,8 +896,7 @@ static void test_WriteCData(void) hr = CreateXmlWriter(&IID_IXmlWriter, (void**)&writer, NULL); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - hr = IXmlWriter_SetProperty(writer, XmlWriterProperty_OmitXmlDeclaration, TRUE); - ok(hr == S_OK, "got 0x%08x\n", hr); + writer_set_property(writer, XmlWriterProperty_OmitXmlDeclaration); hr = IXmlWriter_WriteCData(writer, aW); ok(hr == E_UNEXPECTED, "got 0x%08x\n", hr); @@ -1087,11 +1094,8 @@ static void test_indentation(void) stream = writer_set_output(writer); - hr = IXmlWriter_SetProperty(writer, XmlWriterProperty_OmitXmlDeclaration, TRUE); - ok(hr == S_OK, "got 0x%08x\n", hr); - - hr = IXmlWriter_SetProperty(writer, XmlWriterProperty_Indent, TRUE); - ok(hr == S_OK, "got 0x%08x\n", hr); + writer_set_property(writer, XmlWriterProperty_OmitXmlDeclaration); + writer_set_property(writer, XmlWriterProperty_Indent); hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Omit); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -1117,8 +1121,31 @@ static void test_indentation(void) " \r\n" "</a>"); - IXmlWriter_Release(writer); IStream_Release(stream); + + /* WriteElementString */ + stream = writer_set_output(writer); + + hr = IXmlWriter_WriteStartElement(writer, NULL, aW, NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IXmlWriter_WriteElementString(writer, NULL, bW, NULL, NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IXmlWriter_WriteEndElement(writer); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IXmlWriter_Flush(writer); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + CHECK_OUTPUT_TODO(stream, + "<a>\r\n" + " \r\n" + "</a>"); + + IStream_Release(stream); + + IXmlWriter_Release(writer); } static void test_WriteAttributeString(void) @@ -1139,8 +1166,7 @@ static void test_WriteAttributeString(void) stream = writer_set_output(writer); - hr = IXmlWriter_SetProperty(writer, XmlWriterProperty_OmitXmlDeclaration, TRUE); - ok(hr == S_OK, "got 0x%08x\n", hr); + writer_set_property(writer, XmlWriterProperty_OmitXmlDeclaration); hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Omit); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -1219,11 +1245,8 @@ static void test_WriteFullEndElement(void) /* standalone element */ stream = writer_set_output(writer); - hr = IXmlWriter_SetProperty(writer, XmlWriterProperty_OmitXmlDeclaration, TRUE); - ok(hr == S_OK, "got 0x%08x\n", hr); - - hr = IXmlWriter_SetProperty(writer, XmlWriterProperty_Indent, TRUE); - ok(hr == S_OK, "got 0x%08x\n", hr); + writer_set_property(writer, XmlWriterProperty_OmitXmlDeclaration); + writer_set_property(writer, XmlWriterProperty_Indent); hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Omit); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -1247,11 +1270,8 @@ static void test_WriteFullEndElement(void) /* nested elements */ stream = writer_set_output(writer); - hr = IXmlWriter_SetProperty(writer, XmlWriterProperty_OmitXmlDeclaration, TRUE); - ok(hr == S_OK, "got 0x%08x\n", hr); - - hr = IXmlWriter_SetProperty(writer, XmlWriterProperty_Indent, TRUE); - ok(hr == S_OK, "got 0x%08x\n", hr); + writer_set_property(writer, XmlWriterProperty_OmitXmlDeclaration); + writer_set_property(writer, XmlWriterProperty_Indent); hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Omit); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -1293,8 +1313,7 @@ static void test_WriteCharEntity(void) /* without indentation */ stream = writer_set_output(writer); - hr = IXmlWriter_SetProperty(writer, XmlWriterProperty_OmitXmlDeclaration, TRUE); - ok(hr == S_OK, "got 0x%08x\n", hr); + writer_set_property(writer, XmlWriterProperty_OmitXmlDeclaration); hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Omit); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -1334,8 +1353,7 @@ static void test_WriteString(void) hr = CreateXmlWriter(&IID_IXmlWriter, (void**)&writer, NULL); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - hr = IXmlWriter_SetProperty(writer, XmlWriterProperty_OmitXmlDeclaration, TRUE); - ok(hr == S_OK, "got 0x%08x\n", hr); + writer_set_property(writer, XmlWriterProperty_OmitXmlDeclaration); hr = IXmlWriter_WriteString(writer, aW); ok(hr == E_UNEXPECTED, "got 0x%08x\n", hr); diff --git a/dlls/xmllite/writer.c b/dlls/xmllite/writer.c index b0e16c0..ba0c60a 100644 --- a/dlls/xmllite/writer.c +++ b/dlls/xmllite/writer.c @@ -40,6 +40,7 @@ DEFINE_GUID(IID_IXmlWriterOutput, 0xc1131708, 0x0f59, 0x477f, 0x93, 0x59, 0x7d, #define ARRAY_SIZE(array) (sizeof(array)/sizeof((array)[0])) static const WCHAR closeelementW[] = {'<','/'}; +static const WCHAR closetagW[] = {' ','/','>'}; static const WCHAR closepiW[] = {'?','>'}; static const WCHAR ltW[] = {'<'}; static const WCHAR gtW[] = {'>'}; @@ -835,26 +836,27 @@ static HRESULT WINAPI xmlwriter_WriteElementString(IXmlWriter *iface, LPCWSTR pr case XmlWriterState_ElemStarted: writer_close_starttag(This); break; - case XmlWriterState_Ready: - case XmlWriterState_DocStarted: - case XmlWriterState_PIDocStarted: - break; - default: - This->state = XmlWriterState_DocClosed; + case XmlWriterState_DocClosed: return WR_E_INVALIDACTION; + default: + ; } write_encoding_bom(This); write_output_buffer(This->output, ltW, ARRAY_SIZE(ltW)); write_output_qname(This->output, prefix, local_name); - write_output_buffer(This->output, gtW, ARRAY_SIZE(gtW)); if (value) + { + write_output_buffer(This->output, gtW, ARRAY_SIZE(gtW)); write_output_buffer(This->output, value, -1); + write_output_buffer(This->output, closeelementW, ARRAY_SIZE(closeelementW)); + write_output_qname(This->output, prefix, local_name); + write_output_buffer(This->output, gtW, ARRAY_SIZE(gtW)); + } + else + write_output_buffer(This->output, closetagW, ARRAY_SIZE(closetagW)); - write_output_buffer(This->output, closeelementW, ARRAY_SIZE(closeelementW)); - write_output_qname(This->output, prefix, local_name); - write_output_buffer(This->output, gtW, ARRAY_SIZE(gtW)); This->state = XmlWriterState_Content; return S_OK; @@ -911,8 +913,8 @@ static HRESULT WINAPI xmlwriter_WriteEndElement(IXmlWriter *iface) writer_dec_indent(This); - if (This->starttagopen) { - static WCHAR closetagW[] = {' ','/','>'}; + if (This->starttagopen) + { write_output_buffer(This->output, closetagW, ARRAY_SIZE(closetagW)); This->starttagopen = FALSE; }

1 0

Nikolay Sivov : xmllite/writer: Fix indentation on WriteElementString().
by Alexandre Julliard 24 Jul '17

24 Jul '17

Module: wine Branch: master Commit: 5773a5d3b4bc1e11558f5f2eb4f741027c56508c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5773a5d3b4bc1e11558f5f2eb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jul 23 14:55:45 2017 +0300 xmllite/writer: Fix indentation on WriteElementString(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/tests/writer.c | 6 +++++- dlls/xmllite/writer.c | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/xmllite/tests/writer.c b/dlls/xmllite/tests/writer.c index 6408b54..b82e154 100644 --- a/dlls/xmllite/tests/writer.c +++ b/dlls/xmllite/tests/writer.c @@ -1132,15 +1132,19 @@ static void test_indentation(void) hr = IXmlWriter_WriteElementString(writer, NULL, bW, NULL, NULL); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IXmlWriter_WriteElementString(writer, NULL, bW, NULL, NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IXmlWriter_WriteEndElement(writer); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = IXmlWriter_Flush(writer); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - CHECK_OUTPUT_TODO(stream, + CHECK_OUTPUT(stream, "<a>\r\n" " \r\n" + " \r\n" "</a>"); IStream_Release(stream); diff --git a/dlls/xmllite/writer.c b/dlls/xmllite/writer.c index ba0c60a..ac28c47 100644 --- a/dlls/xmllite/writer.c +++ b/dlls/xmllite/writer.c @@ -843,6 +843,7 @@ static HRESULT WINAPI xmlwriter_WriteElementString(IXmlWriter *iface, LPCWSTR pr } write_encoding_bom(This); + write_node_indent(This); write_output_buffer(This->output, ltW, ARRAY_SIZE(ltW)); write_output_qname(This->output, prefix, local_name);

1 0

Nikolay Sivov : xmllite/writer: Do not indent after just BOM has been written.
by Alexandre Julliard 24 Jul '17

24 Jul '17

Module: wine Branch: master Commit: a6d6bebede744c9e7f93ef315883909fc93c6f20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6d6bebede744c9e7f93ef315… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jul 23 14:55:46 2017 +0300 xmllite/writer: Do not indent after just BOM has been written. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/tests/writer.c | 5 ++++- dlls/xmllite/writer.c | 7 +++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/xmllite/tests/writer.c b/dlls/xmllite/tests/writer.c index b82e154..8ef2e70 100644 --- a/dlls/xmllite/tests/writer.c +++ b/dlls/xmllite/tests/writer.c @@ -648,6 +648,8 @@ static void test_bom(void) hr = IXmlWriter_SetOutput(writer, output); ok(hr == S_OK, "got 0x%08x\n", hr); + writer_set_property(writer, XmlWriterProperty_Indent); + hr = IXmlWriter_WriteElementString(writer, NULL, aW, NULL, NULL); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -658,7 +660,8 @@ static void test_bom(void) ok(hr == S_OK, "got 0x%08x\n", hr); ptr = GlobalLock(hglobal); - ok(ptr[0] == 0xff && ptr[1] == 0xfe, "got %x,%x\n", ptr[0], ptr[1]); + ok(ptr[0] == 0xff && ptr[1] == 0xfe && ptr[2] == '<', "Unexpected output: %#x,%#x,%#x\n", + ptr[0], ptr[1], ptr[2]); GlobalUnlock(hglobal); IUnknown_Release(output); diff --git a/dlls/xmllite/writer.c b/dlls/xmllite/writer.c index ac28c47..9e99338 100644 --- a/dlls/xmllite/writer.c +++ b/dlls/xmllite/writer.c @@ -447,7 +447,9 @@ static void write_node_indent(xmlwriter *writer) if (!writer->indent) return; - if (writer->output->buffer.written) + /* Do state check to prevent newline inserted after BOM. It is assumed that + state does not change between writing BOM and inserting indentation. */ + if (writer->output->buffer.written && writer->state != XmlWriterState_Ready) write_output_buffer(writer->output, crlfW, ARRAY_SIZE(crlfW)); while (indent_level--) write_output_buffer(writer->output, dblspaceW, ARRAY_SIZE(dblspaceW)); @@ -1208,12 +1210,13 @@ static HRESULT WINAPI xmlwriter_WriteStartElement(IXmlWriter *iface, LPCWSTR pre return E_OUTOFMEMORY; write_encoding_bom(This); + write_node_indent(This); + This->state = XmlWriterState_ElemStarted; This->starttagopen = TRUE; push_element(This, element); - write_node_indent(This); write_output_buffer(This->output, ltW, ARRAY_SIZE(ltW)); write_output_qname(This->output, prefix, local_name); writer_inc_indent(This);

1 0

Alistair Leslie-Hughes : wmvcore: Support IWMHeaderInfo/2/ 3 interfaces in IWMReader.
by Alexandre Julliard 24 Jul '17

24 Jul '17

Module: wine Branch: master Commit: b1702c41b5323af5795d10e0d6e36b40b9dfa94f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1702c41b5323af5795d10e0d… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Jul 23 00:51:26 2017 +0000 wmvcore: Support IWMHeaderInfo/2/3 interfaces in IWMReader. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmvcore/tests/wmvcore.c | 6 +- dlls/wmvcore/wmvcore_main.c | 230 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 233 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b1702c41b5323af5795d1…

1 0

Rosanne DiMesio : Do not automatically delete test reports along with distributions
by Jeremy Newman 24 Jul '17

24 Jul '17

Module: appdb Branch: master Commit: 76017c2d50203a7daa3ec0d62f6d9761e1a1de19 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=76017c2d50203a7daa3ec0d6… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Mon Jul 24 10:46:27 2017 -0500 Do not automatically delete test reports along with distributions The decision of what to do with the related test reports should be made by admins. Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- include/distribution.php | 6 ------ 1 file changed, 6 deletions(-) diff --git a/include/distribution.php b/include/distribution.php index 9cbf538..a6e9d27 100644 --- a/include/distribution.php +++ b/include/distribution.php @@ -194,12 +194,6 @@ class distribution { $bSuccess = TRUE; - foreach($this->objectGetChildren() as $oChild) - { - if(!$oChild->delete()) - $bSuccess = FALSE; - } - // now delete the Distribution $sQuery = "UPDATE distributions SET state = 'deleted' WHERE distributionId = '?'

1 0

Alexandre Julliard : Wine release 2.13
by Alexandre Julliard 21 Jul '17

21 Jul '17

Module: website Branch: master Commit: c7faf2715a239b9826ada74caeddf6f82062a806 URL: http://source.winehq.org/git/website.git/?a=commit;h=c7faf2715a239b9826ada7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 21 21:09:28 2017 +0200 Wine release 2.13 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2017072101.xml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/news/en/2017072101.xml b/news/en/2017072101.xml new file mode 100644 index 0000000..bff5dae --- /dev/null +++ b/news/en/2017072101.xml @@ -0,0 +1,19 @@ +<news> +<date>July 21, 2017</date> +<title>Wine 2.13 Released</title> +<body> + The Wine development release 2.13 is now available. + <a href="{$root}/announce/2.13">What's new</a> in this release: +<ul> + <li>Unicode data updated to Unicode 10.0.0.</li> + <li>Nicer looking default mouse cursors.</li> + <li>Persistent connections support in WinHTTP.</li> + <li>Message Framing protocol support in WebServices.</li> + <li>Improved metafile support in GdiPlus.</li> + <li>Debug registers support in x86-64 exception handling.</li> + <li>Anti-aliasing improvements in DirectWrite.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/2.x/wine-2.13.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Józef Kucia : d3d11: Introduce d3d_depthstencil_state_create() helper function.
by Alexandre Julliard 21 Jul '17

21 Jul '17

Module: wine Branch: master Commit: 95d5d84a0909753f87324b475e1e1fa6246f91ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=95d5d84a0909753f87324b475… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jul 20 14:10:59 2017 +0200 d3d11: Introduce d3d_depthstencil_state_create() helper function. 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 | 77 ++++---------------------------------------- dlls/d3d11/state.c | 79 +++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 86 insertions(+), 74 deletions(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index b887ac5..8b89e6d 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -425,8 +425,8 @@ static inline struct d3d_depthstencil_state *impl_from_ID3D11DepthStencilState(I return CONTAINING_RECORD(iface, struct d3d_depthstencil_state, ID3D11DepthStencilState_iface); } -HRESULT d3d_depthstencil_state_init(struct d3d_depthstencil_state *state, struct d3d_device *device, - const D3D11_DEPTH_STENCIL_DESC *desc) DECLSPEC_HIDDEN; +HRESULT d3d_depthstencil_state_create(struct d3d_device *device, const D3D11_DEPTH_STENCIL_DESC *desc, + struct d3d_depthstencil_state **state) DECLSPEC_HIDDEN; struct d3d_depthstencil_state *unsafe_impl_from_ID3D11DepthStencilState( ID3D11DepthStencilState *iface) DECLSPEC_HIDDEN; struct d3d_depthstencil_state *unsafe_impl_from_ID3D10DepthStencilState( diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 95783e9..e7a79e0 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -3018,76 +3018,13 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateDepthStencilState(ID3D11Devi { struct d3d_device *device = impl_from_ID3D11Device(iface); struct d3d_depthstencil_state *object; - D3D11_DEPTH_STENCIL_DESC tmp_desc; - struct wine_rb_entry *entry; HRESULT hr; TRACE("iface %p, desc %p, depth_stencil_state %p.\n", iface, desc, depth_stencil_state); - if (!desc) - return E_INVALIDARG; - - /* D3D11_DEPTH_STENCIL_DESC has a hole, which is a problem because we use - * it as a key in the rbtree. */ - memset(&tmp_desc, 0, sizeof(tmp_desc)); - tmp_desc.DepthEnable = desc->DepthEnable; - if (desc->DepthEnable) - { - tmp_desc.DepthWriteMask = desc->DepthWriteMask; - tmp_desc.DepthFunc = desc->DepthFunc; - } - else - { - tmp_desc.DepthWriteMask = D3D11_DEPTH_WRITE_MASK_ALL; - tmp_desc.DepthFunc = D3D11_COMPARISON_LESS; - } - tmp_desc.StencilEnable = desc->StencilEnable; - if (desc->StencilEnable) - { - tmp_desc.StencilReadMask = desc->StencilReadMask; - tmp_desc.StencilWriteMask = desc->StencilWriteMask; - tmp_desc.FrontFace = desc->FrontFace; - tmp_desc.BackFace = desc->BackFace; - } - else - { - tmp_desc.StencilReadMask = D3D11_DEFAULT_STENCIL_READ_MASK; - tmp_desc.StencilWriteMask = D3D11_DEFAULT_STENCIL_WRITE_MASK; - tmp_desc.FrontFace.StencilFailOp = D3D11_STENCIL_OP_KEEP; - tmp_desc.FrontFace.StencilDepthFailOp = D3D11_STENCIL_OP_KEEP; - tmp_desc.FrontFace.StencilPassOp = D3D11_STENCIL_OP_KEEP; - tmp_desc.FrontFace.StencilFunc = D3D11_COMPARISON_ALWAYS; - tmp_desc.BackFace.StencilFailOp = D3D11_STENCIL_OP_KEEP; - tmp_desc.BackFace.StencilDepthFailOp = D3D11_STENCIL_OP_KEEP; - tmp_desc.BackFace.StencilPassOp = D3D11_STENCIL_OP_KEEP; - tmp_desc.BackFace.StencilFunc = D3D11_COMPARISON_ALWAYS; - } - - wined3d_mutex_lock(); - if ((entry = wine_rb_get(&device->depthstencil_states, &tmp_desc))) - { - object = WINE_RB_ENTRY_VALUE(entry, struct d3d_depthstencil_state, entry); - - TRACE("Returning existing depthstencil state %p.\n", object); - *depth_stencil_state = &object->ID3D11DepthStencilState_iface; - ID3D11DepthStencilState_AddRef(*depth_stencil_state); - wined3d_mutex_unlock(); - - return S_OK; - } - wined3d_mutex_unlock(); - - if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) - return E_OUTOFMEMORY; - - if (FAILED(hr = d3d_depthstencil_state_init(object, device, &tmp_desc))) - { - WARN("Failed to initialize depthstencil state, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, object); + if (FAILED(hr = d3d_depthstencil_state_create(device, desc, &object))) return hr; - } - TRACE("Created depthstencil state %p.\n", object); *depth_stencil_state = &object->ID3D11DepthStencilState_iface; return S_OK; @@ -5385,19 +5322,17 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateDepthStencilState(ID3D10Devi const D3D10_DEPTH_STENCIL_DESC *desc, ID3D10DepthStencilState **depth_stencil_state) { struct d3d_device *device = impl_from_ID3D10Device(iface); - ID3D11DepthStencilState *d3d11_depth_stencil_state; + struct d3d_depthstencil_state *object; HRESULT hr; TRACE("iface %p, desc %p, depth_stencil_state %p.\n", iface, desc, depth_stencil_state); - if (FAILED(hr = d3d11_device_CreateDepthStencilState(&device->ID3D11Device_iface, - (const D3D11_DEPTH_STENCIL_DESC *)desc, &d3d11_depth_stencil_state))) + if (FAILED(hr = d3d_depthstencil_state_create(device, (const D3D11_DEPTH_STENCIL_DESC *)desc, &object))) return hr; - hr = ID3D11DepthStencilState_QueryInterface(d3d11_depth_stencil_state, &IID_ID3D10DepthStencilState, - (void **)depth_stencil_state); - ID3D11DepthStencilState_Release(d3d11_depth_stencil_state); - return hr; + *depth_stencil_state = &object->ID3D10DepthStencilState_iface; + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d10_device_CreateRasterizerState(ID3D10Device1 *iface, diff --git a/dlls/d3d11/state.c b/dlls/d3d11/state.c index be687f3..7cc35db 100644 --- a/dlls/d3d11/state.c +++ b/dlls/d3d11/state.c @@ -641,7 +641,7 @@ static const struct ID3D10DepthStencilStateVtbl d3d10_depthstencil_state_vtbl = d3d10_depthstencil_state_GetDesc, }; -HRESULT d3d_depthstencil_state_init(struct d3d_depthstencil_state *state, struct d3d_device *device, +static HRESULT d3d_depthstencil_state_init(struct d3d_depthstencil_state *state, struct d3d_device *device, const D3D11_DEPTH_STENCIL_DESC *desc) { state->ID3D11DepthStencilState_iface.lpVtbl = &d3d11_depthstencil_state_vtbl; @@ -666,6 +666,83 @@ HRESULT d3d_depthstencil_state_init(struct d3d_depthstencil_state *state, struct return S_OK; } +HRESULT d3d_depthstencil_state_create(struct d3d_device *device, const D3D11_DEPTH_STENCIL_DESC *desc, + struct d3d_depthstencil_state **state) +{ + struct d3d_depthstencil_state *object; + D3D11_DEPTH_STENCIL_DESC tmp_desc; + struct wine_rb_entry *entry; + HRESULT hr; + + if (!desc) + return E_INVALIDARG; + + /* D3D11_DEPTH_STENCIL_DESC has a hole, which is a problem because we use + * it as a key in the rbtree. */ + memset(&tmp_desc, 0, sizeof(tmp_desc)); + tmp_desc.DepthEnable = desc->DepthEnable; + if (desc->DepthEnable) + { + tmp_desc.DepthWriteMask = desc->DepthWriteMask; + tmp_desc.DepthFunc = desc->DepthFunc; + } + else + { + tmp_desc.DepthWriteMask = D3D11_DEPTH_WRITE_MASK_ALL; + tmp_desc.DepthFunc = D3D11_COMPARISON_LESS; + } + tmp_desc.StencilEnable = desc->StencilEnable; + if (desc->StencilEnable) + { + tmp_desc.StencilReadMask = desc->StencilReadMask; + tmp_desc.StencilWriteMask = desc->StencilWriteMask; + tmp_desc.FrontFace = desc->FrontFace; + tmp_desc.BackFace = desc->BackFace; + } + else + { + tmp_desc.StencilReadMask = D3D11_DEFAULT_STENCIL_READ_MASK; + tmp_desc.StencilWriteMask = D3D11_DEFAULT_STENCIL_WRITE_MASK; + tmp_desc.FrontFace.StencilFailOp = D3D11_STENCIL_OP_KEEP; + tmp_desc.FrontFace.StencilDepthFailOp = D3D11_STENCIL_OP_KEEP; + tmp_desc.FrontFace.StencilPassOp = D3D11_STENCIL_OP_KEEP; + tmp_desc.FrontFace.StencilFunc = D3D11_COMPARISON_ALWAYS; + tmp_desc.BackFace.StencilFailOp = D3D11_STENCIL_OP_KEEP; + tmp_desc.BackFace.StencilDepthFailOp = D3D11_STENCIL_OP_KEEP; + tmp_desc.BackFace.StencilPassOp = D3D11_STENCIL_OP_KEEP; + tmp_desc.BackFace.StencilFunc = D3D11_COMPARISON_ALWAYS; + } + + wined3d_mutex_lock(); + if ((entry = wine_rb_get(&device->depthstencil_states, &tmp_desc))) + { + object = WINE_RB_ENTRY_VALUE(entry, struct d3d_depthstencil_state, entry); + + TRACE("Returning existing depthstencil state %p.\n", object); + ID3D11DepthStencilState_AddRef(&object->ID3D11DepthStencilState_iface); + *state = object; + wined3d_mutex_unlock(); + + return S_OK; + } + wined3d_mutex_unlock(); + + if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + return E_OUTOFMEMORY; + + if (FAILED(hr = d3d_depthstencil_state_init(object, device, &tmp_desc))) + { + WARN("Failed to initialize depthstencil state, hr %#x.\n", hr); + HeapFree(GetProcessHeap(), 0, object); + return hr; + } + + TRACE("Created depthstencil state %p.\n", object); + *state = object; + + return S_OK; +} + struct d3d_depthstencil_state *unsafe_impl_from_ID3D11DepthStencilState(ID3D11DepthStencilState *iface) { if (!iface)

1 0

Józef Kucia : d3d11: Fix race condition in d3d_depthstencil_state_create().
by Alexandre Julliard 21 Jul '17

21 Jul '17

Module: wine Branch: master Commit: 10ae9eb3d9aecb71853b977d66cb775697e1a57f URL: http://source.winehq.org/git/wine.git/?a=commit;h=10ae9eb3d9aecb71853b977d6… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jul 20 14:11:00 2017 +0200 d3d11: Fix race condition in d3d_depthstencil_state_create(). Spotted by Kimmo Myllyvirta. 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/state.c | 34 +++++++++++++++++++++------------- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/dlls/d3d11/state.c b/dlls/d3d11/state.c index 7cc35db..3048b9d 100644 --- a/dlls/d3d11/state.c +++ b/dlls/d3d11/state.c @@ -447,6 +447,12 @@ static ULONG STDMETHODCALLTYPE d3d11_depthstencil_state_AddRef(ID3D11DepthStenci return refcount; } +static void d3d_depthstencil_state_cleanup(struct d3d_depthstencil_state *state) +{ + wined3d_private_store_cleanup(&state->private_store); + ID3D11Device_Release(state->device); +} + static ULONG STDMETHODCALLTYPE d3d11_depthstencil_state_Release(ID3D11DepthStencilState *iface) { struct d3d_depthstencil_state *state = impl_from_ID3D11DepthStencilState(iface); @@ -459,8 +465,7 @@ static ULONG STDMETHODCALLTYPE d3d11_depthstencil_state_Release(ID3D11DepthStenc struct d3d_device *device = impl_from_ID3D11Device(state->device); wined3d_mutex_lock(); wine_rb_remove(&device->depthstencil_states, &state->entry); - ID3D11Device_Release(state->device); - wined3d_private_store_cleanup(&state->private_store); + d3d_depthstencil_state_cleanup(state); wined3d_mutex_unlock(); HeapFree(GetProcessHeap(), 0, state); } @@ -647,19 +652,9 @@ static HRESULT d3d_depthstencil_state_init(struct d3d_depthstencil_state *state, state->ID3D11DepthStencilState_iface.lpVtbl = &d3d11_depthstencil_state_vtbl; state->ID3D10DepthStencilState_iface.lpVtbl = &d3d10_depthstencil_state_vtbl; state->refcount = 1; - wined3d_mutex_lock(); wined3d_private_store_init(&state->private_store); state->desc = *desc; - if (wine_rb_put(&device->depthstencil_states, desc, &state->entry) == -1) - { - ERR("Failed to insert depthstencil state entry.\n"); - wined3d_private_store_cleanup(&state->private_store); - wined3d_mutex_unlock(); - return E_FAIL; - } - wined3d_mutex_unlock(); - state->device = &device->ID3D11Device_iface; ID3D11Device_AddRef(state->device); @@ -725,18 +720,31 @@ HRESULT d3d_depthstencil_state_create(struct d3d_device *device, const D3D11_DEP return S_OK; } - wined3d_mutex_unlock(); if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + { + wined3d_mutex_unlock(); return E_OUTOFMEMORY; + } if (FAILED(hr = d3d_depthstencil_state_init(object, device, &tmp_desc))) { WARN("Failed to initialize depthstencil state, hr %#x.\n", hr); HeapFree(GetProcessHeap(), 0, object); + wined3d_mutex_unlock(); return hr; } + if (wine_rb_put(&device->depthstencil_states, desc, &object->entry) == -1) + { + ERR("Failed to insert depthstencil state entry.\n"); + d3d_depthstencil_state_cleanup(object); + HeapFree(GetProcessHeap(), 0, object); + wined3d_mutex_unlock(); + return E_FAIL; + } + wined3d_mutex_unlock(); + TRACE("Created depthstencil state %p.\n", object); *state = object;

1 0

Józef Kucia : d3d11: Introduce d3d_rasterizer_state_create() helper function.
by Alexandre Julliard 21 Jul '17

21 Jul '17

Module: wine Branch: master Commit: 8b2d71443e9257de8ba7dcd370e559ab68c055f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b2d71443e9257de8ba7dcd37… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jul 20 14:11:01 2017 +0200 d3d11: Introduce d3d_rasterizer_state_create() helper function. 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 | 40 ++++++---------------------------------- dlls/d3d11/state.c | 42 +++++++++++++++++++++++++++++++++++++++++- 3 files changed, 49 insertions(+), 37 deletions(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index 8b89e6d..b2cb29f 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -446,8 +446,8 @@ struct d3d_rasterizer_state ID3D11Device *device; }; -HRESULT d3d_rasterizer_state_init(struct d3d_rasterizer_state *state, struct d3d_device *device, - const D3D11_RASTERIZER_DESC *desc) DECLSPEC_HIDDEN; +HRESULT d3d_rasterizer_state_create(struct d3d_device *device, const D3D11_RASTERIZER_DESC *desc, + struct d3d_rasterizer_state **state) DECLSPEC_HIDDEN; struct d3d_rasterizer_state *unsafe_impl_from_ID3D11RasterizerState(ID3D11RasterizerState *iface) DECLSPEC_HIDDEN; struct d3d_rasterizer_state *unsafe_impl_from_ID3D10RasterizerState(ID3D10RasterizerState *iface) DECLSPEC_HIDDEN; diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index e7a79e0..b756517 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -3035,39 +3035,13 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateRasterizerState(ID3D11Device { struct d3d_device *device = impl_from_ID3D11Device(iface); struct d3d_rasterizer_state *object; - struct wine_rb_entry *entry; HRESULT hr; TRACE("iface %p, desc %p, rasterizer_state %p.\n", iface, desc, rasterizer_state); - if (!desc) - return E_INVALIDARG; - - wined3d_mutex_lock(); - if ((entry = wine_rb_get(&device->rasterizer_states, desc))) - { - object = WINE_RB_ENTRY_VALUE(entry, struct d3d_rasterizer_state, entry); - - TRACE("Returning existing rasterizer state %p.\n", object); - *rasterizer_state = &object->ID3D11RasterizerState_iface; - ID3D11RasterizerState_AddRef(*rasterizer_state); - wined3d_mutex_unlock(); - - return S_OK; - } - wined3d_mutex_unlock(); - - if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) - return E_OUTOFMEMORY; - - if (FAILED(hr = d3d_rasterizer_state_init(object, device, desc))) - { - WARN("Failed to initialize rasterizer state, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, object); + if (FAILED(hr = d3d_rasterizer_state_create(device, desc, &object))) return hr; - } - TRACE("Created rasterizer state %p.\n", object); *rasterizer_state = &object->ID3D11RasterizerState_iface; return S_OK; @@ -5339,19 +5313,17 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateRasterizerState(ID3D10Device const D3D10_RASTERIZER_DESC *desc, ID3D10RasterizerState **rasterizer_state) { struct d3d_device *device = impl_from_ID3D10Device(iface); - ID3D11RasterizerState *d3d11_rasterizer_state; + struct d3d_rasterizer_state *object; HRESULT hr; TRACE("iface %p, desc %p, rasterizer_state %p.\n", iface, desc, rasterizer_state); - if (FAILED(hr = d3d11_device_CreateRasterizerState(&device->ID3D11Device_iface, - (const D3D11_RASTERIZER_DESC *)desc, &d3d11_rasterizer_state))) + if (FAILED(hr = d3d_rasterizer_state_create(device, (const D3D11_RASTERIZER_DESC *)desc, &object))) return hr; - hr = ID3D11RasterizerState_QueryInterface(d3d11_rasterizer_state, - &IID_ID3D10RasterizerState, (void **)rasterizer_state); - ID3D11RasterizerState_Release(d3d11_rasterizer_state); - return hr; + *rasterizer_state = &object->ID3D10RasterizerState_iface; + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d10_device_CreateSamplerState(ID3D10Device1 *iface, diff --git a/dlls/d3d11/state.c b/dlls/d3d11/state.c index 3048b9d..110d04e 100644 --- a/dlls/d3d11/state.c +++ b/dlls/d3d11/state.c @@ -1033,7 +1033,7 @@ static const struct wined3d_parent_ops d3d_rasterizer_state_wined3d_parent_ops = d3d_rasterizer_state_wined3d_object_destroyed, }; -HRESULT d3d_rasterizer_state_init(struct d3d_rasterizer_state *state, struct d3d_device *device, +static HRESULT d3d_rasterizer_state_init(struct d3d_rasterizer_state *state, struct d3d_device *device, const D3D11_RASTERIZER_DESC *desc) { struct wined3d_rasterizer_state_desc wined3d_desc; @@ -1074,6 +1074,46 @@ HRESULT d3d_rasterizer_state_init(struct d3d_rasterizer_state *state, struct d3d return S_OK; } +HRESULT d3d_rasterizer_state_create(struct d3d_device *device, const D3D11_RASTERIZER_DESC *desc, + struct d3d_rasterizer_state **state) +{ + struct d3d_rasterizer_state *object; + struct wine_rb_entry *entry; + HRESULT hr; + + if (!desc) + return E_INVALIDARG; + + wined3d_mutex_lock(); + if ((entry = wine_rb_get(&device->rasterizer_states, desc))) + { + object = WINE_RB_ENTRY_VALUE(entry, struct d3d_rasterizer_state, entry); + + TRACE("Returning existing rasterizer state %p.\n", object); + ID3D11RasterizerState_AddRef(&object->ID3D11RasterizerState_iface); + *state = object; + wined3d_mutex_unlock(); + + return S_OK; + } + wined3d_mutex_unlock(); + + if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + return E_OUTOFMEMORY; + + if (FAILED(hr = d3d_rasterizer_state_init(object, device, desc))) + { + WARN("Failed to initialize rasterizer state, hr %#x.\n", hr); + HeapFree(GetProcessHeap(), 0, object); + return hr; + } + + TRACE("Created rasterizer state %p.\n", object); + *state = object; + + return S_OK; +} + struct d3d_rasterizer_state *unsafe_impl_from_ID3D11RasterizerState(ID3D11RasterizerState *iface) { if (!iface)

1 0

Józef Kucia : d3d11: Fix race condition in d3d_rasterizer_state_create().
by Alexandre Julliard 21 Jul '17

21 Jul '17

Module: wine Branch: master Commit: 7c020facc3813381a59568d29f60f930366a4436 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c020facc3813381a59568d29… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jul 20 14:11:02 2017 +0200 d3d11: Fix race condition in d3d_rasterizer_state_create(). Spotted by Kimmo Myllyvirta. 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/state.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/d3d11/state.c b/dlls/d3d11/state.c index 110d04e..87fed6f 100644 --- a/dlls/d3d11/state.c +++ b/dlls/d3d11/state.c @@ -1042,7 +1042,6 @@ static HRESULT d3d_rasterizer_state_init(struct d3d_rasterizer_state *state, str state->ID3D11RasterizerState_iface.lpVtbl = &d3d11_rasterizer_state_vtbl; state->ID3D10RasterizerState_iface.lpVtbl = &d3d10_rasterizer_state_vtbl; state->refcount = 1; - wined3d_mutex_lock(); wined3d_private_store_init(&state->private_store); state->desc = *desc; @@ -1050,7 +1049,6 @@ static HRESULT d3d_rasterizer_state_init(struct d3d_rasterizer_state *state, str { ERR("Failed to insert rasterizer state entry.\n"); wined3d_private_store_cleanup(&state->private_store); - wined3d_mutex_unlock(); return E_FAIL; } @@ -1064,10 +1062,8 @@ static HRESULT d3d_rasterizer_state_init(struct d3d_rasterizer_state *state, str WARN("Failed to create wined3d rasterizer state, hr %#x.\n", hr); wined3d_private_store_cleanup(&state->private_store); wine_rb_remove(&device->rasterizer_states, &state->entry); - wined3d_mutex_unlock(); return hr; } - wined3d_mutex_unlock(); ID3D11Device_AddRef(state->device = &device->ID3D11Device_iface); @@ -1096,12 +1092,16 @@ HRESULT d3d_rasterizer_state_create(struct d3d_device *device, const D3D11_RASTE return S_OK; } - wined3d_mutex_unlock(); if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + { + wined3d_mutex_unlock(); return E_OUTOFMEMORY; + } - if (FAILED(hr = d3d_rasterizer_state_init(object, device, desc))) + hr = d3d_rasterizer_state_init(object, device, desc); + wined3d_mutex_unlock(); + if (FAILED(hr)) { WARN("Failed to initialize rasterizer state, hr %#x.\n", hr); HeapFree(GetProcessHeap(), 0, object);

1 0