September 2018 - Wine-Commits

Jactry Zeng : ntoskrnl: Add FsRtlIsNameInExpression stub.
by Alexandre Julliard Sept. 14, 2018

Sept. 14, 2018

Module: wine Branch: master Commit: c43030b664da2345b4763ea3feb664ac722e1148 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c43030b664da2345b4763ea3… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Fri Sep 14 16:59:47 2018 +0800 ntoskrnl: Add FsRtlIsNameInExpression stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=41039 Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 10 ++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/ddk/ntifs.h | 1 + 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 18524af..9fbf22d 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2048,6 +2048,16 @@ NTSTATUS WINAPI ExInitializeZone(PZONE_HEADER Zone, } /*********************************************************************** +* FsRtlIsNameInExpression (NTOSKRNL.EXE.@) +*/ +BOOLEAN WINAPI FsRtlIsNameInExpression(PUNICODE_STRING expression, PUNICODE_STRING name, + BOOLEAN ignore, PWCH upcase) +{ + FIXME("stub: %p %p %d %p\n", expression, name, ignore, upcase); + return FALSE; +} + +/*********************************************************************** * FsRtlRegisterUncProvider (NTOSKRNL.EXE.@) */ NTSTATUS WINAPI FsRtlRegisterUncProvider(PHANDLE MupHandle, PUNICODE_STRING RedirDevName, diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 12f9ddb..422d575 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -234,7 +234,7 @@ @ stub FsRtlIsDbcsInExpression @ stub FsRtlIsFatDbcsLegal @ stub FsRtlIsHpfsDbcsLegal -@ stub FsRtlIsNameInExpression +@ stdcall FsRtlIsNameInExpression(ptr ptr long ptr) @ stub FsRtlIsNtstatusExpected @ stub FsRtlIsPagingFile @ stub FsRtlIsTotalDeviceFailure diff --git a/include/ddk/ntifs.h b/include/ddk/ntifs.h index 50aaabe..a1ed847 100644 --- a/include/ddk/ntifs.h +++ b/include/ddk/ntifs.h @@ -129,6 +129,7 @@ typedef struct _FS_FILTER_CALLBACKS PFS_FILTER_COMPLETION_CALLBACK PostReleaseForModifiedPageWriter; } FS_FILTER_CALLBACKS, *PFS_FILTER_CALLBACKS; +BOOLEAN WINAPI FsRtlIsNameInExpression(PUNICODE_STRING, PUNICODE_STRING, BOOLEAN, PWCH); NTSTATUS WINAPI ObQueryNameString(PVOID,POBJECT_NAME_INFORMATION,ULONG,PULONG); #endif

1 0

Francois Gouget : cmd: A spelling fix in a comment.
by Alexandre Julliard Sept. 14, 2018

Sept. 14, 2018

Module: wine Branch: master Commit: 99fdd9e61c4a68660bdc67b292783476da68d082 URL: https://source.winehq.org/git/wine.git/?a=commit;h=99fdd9e61c4a68660bdc67b2… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Sep 14 16:47:32 2018 +0200 cmd: A spelling fix in a comment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/builtins.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index e6a9ce3..25b9881 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -1628,7 +1628,7 @@ static void WCMD_part_execute(CMD_LIST **cmdList, const WCHAR *firstcmd, } if (curPosition == *cmdList) *cmdList = (*cmdList)->nextcommand; - /* If we were in an IF statement and we didnt find an else and yet we get back to + /* If we were in an IF statement and we didn't find an else and yet we get back to the same bracket depth as the IF, then the IF statement is over. This is required to handle nested ifs properly */ } else if (isIF && (*cmdList)->bracketDepth == myDepth) {

1 0

Henri Verbeet : wined3d: Introduce WINED3DFMT_FLAG_VERTEX_ATTRIBUTE.
by Alexandre Julliard Sept. 14, 2018

Sept. 14, 2018

Module: wine Branch: master Commit: a220669f33411dae74aa05c80201611c93d9a932 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a220669f33411dae74aa05c8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Sep 14 01:55:49 2018 +0430 wined3d: Introduce WINED3DFMT_FLAG_VERTEX_ATTRIBUTE. To indicate a format can be used for vertex attributes. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 1 + dlls/wined3d/vertexdeclaration.c | 2 +- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 17aa8c0..d463a08 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3692,6 +3692,7 @@ static BOOL init_format_vertex_info(const struct wined3d_adapter *adapter, format->emit_idx = format_vertex_info[i].emit_idx; format->gl_vtx_type = format_vertex_info[i].gl_vtx_type; format->gl_vtx_format = format->component_count; + format->flags[WINED3D_GL_RES_TYPE_BUFFER] |= WINED3DFMT_FLAG_VERTEX_ATTRIBUTE; } if (gl_info->supported[ARB_VERTEX_ARRAY_BGRA]) diff --git a/dlls/wined3d/vertexdeclaration.c b/dlls/wined3d/vertexdeclaration.c index 89329d4..863366b 100644 --- a/dlls/wined3d/vertexdeclaration.c +++ b/dlls/wined3d/vertexdeclaration.c @@ -220,7 +220,7 @@ static HRESULT vertexdeclaration_init(struct wined3d_vertex_declaration *declara if (e->input_slot >= MAX_STREAMS) continue; - if (!e->format->gl_vtx_format) + if (!(e->format->flags[WINED3D_GL_RES_TYPE_BUFFER] & WINED3DFMT_FLAG_VERTEX_ATTRIBUTE)) { FIXME("The application tries to use an unsupported format (%s), returning E_FAIL.\n", debug_d3dformat(elements[i].format)); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 2673de0..aea874f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4293,6 +4293,7 @@ extern enum wined3d_format_id pixelformat_for_depth(DWORD depth) DECLSPEC_HIDDEN #define WINED3DFMT_FLAG_INTEGER 0x00200000 #define WINED3DFMT_FLAG_GEN_MIPMAP 0x00400000 #define WINED3DFMT_FLAG_NORMALISED 0x00800000 +#define WINED3DFMT_FLAG_VERTEX_ATTRIBUTE 0x01000000 struct wined3d_rational {

1 0

Pierre Schweitzer : mpr: Properly handle device-less connections.
by Alexandre Julliard Sept. 14, 2018

Sept. 14, 2018

Module: wine Branch: master Commit: 93fb279f4f3e150eee329b02ca5fb0251d8a239d URL: https://source.winehq.org/git/wine.git/?a=commit;h=93fb279f4f3e150eee329b02… Author: Pierre Schweitzer <pierre(a)reactos.org> Date: Fri Sep 14 08:38:28 2018 +0200 mpr: Properly handle device-less connections. Signed-off-by: Pierre Schweitzer <pierre(a)reactos.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mpr/wnet.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/mpr/wnet.c b/dlls/mpr/wnet.c index 8d83bd6..4260ee1 100644 --- a/dlls/mpr/wnet.c +++ b/dlls/mpr/wnet.c @@ -2413,6 +2413,7 @@ DWORD WINAPI WNetGetUniversalNameW ( LPCWSTR lpLocalPath, DWORD dwInfoLevel, DWORD WINAPI WNetClearConnections ( HWND owner ) { HANDLE connected; + PWSTR connection; DWORD ret, size, count; NETRESOURCEW * resources, * iter; @@ -2446,7 +2447,14 @@ DWORD WINAPI WNetClearConnections ( HWND owner ) if (ret == WN_SUCCESS || ret == WN_MORE_DATA) { for (iter = resources; count; count--, iter++) - WNetCancelConnection2W(iter->lpLocalName, 0, TRUE); + { + if (iter->lpLocalName && iter->lpLocalName[0]) + connection = iter->lpLocalName; + else + connection = iter->lpRemoteName; + + WNetCancelConnection2W(connection, 0, TRUE); + } } else break;

1 0

Nikolay Sivov : xmllite/writer: Fix formatted output for closing tags.
by Alexandre Julliard Sept. 14, 2018

Sept. 14, 2018

Module: wine Branch: master Commit: 9784ef163379295579e5b3b679e63996e9435c4e URL: https://source.winehq.org/git/wine.git/?a=commit;h=9784ef163379295579e5b3b6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Sep 14 13:06:46 2018 +0300 xmllite/writer: Fix formatted output for closing tags. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/tests/writer.c | 88 +++++++++++++++++++++++++++++++++++++-------- dlls/xmllite/writer.c | 21 ++++++----- 2 files changed, 85 insertions(+), 24 deletions(-) diff --git a/dlls/xmllite/tests/writer.c b/dlls/xmllite/tests/writer.c index 1710462..42b534f 100644 --- a/dlls/xmllite/tests/writer.c +++ b/dlls/xmllite/tests/writer.c @@ -881,6 +881,20 @@ static HRESULT write_element_string(IXmlWriter *writer, const char *prefix, cons return hr; } +static HRESULT write_string(IXmlWriter *writer, const char *str) +{ + WCHAR *strW; + HRESULT hr; + + strW = strdupAtoW(str); + + hr = IXmlWriter_WriteString(writer, strW); + + heap_free(strW); + + return hr; +} + static void test_WriteStartElement(void) { static const struct @@ -1853,10 +1867,6 @@ static void test_WriteCharEntity(void) static void test_WriteString(void) { - static const WCHAR markupW[] = {'<','&','"','>','=',0}; - static const WCHAR aW[] = {'a',0}; - static const WCHAR bW[] = {'b',0}; - static const WCHAR emptyW[] = {0}; IXmlWriter *writer; IStream *stream; HRESULT hr; @@ -1866,31 +1876,31 @@ static void test_WriteString(void) writer_set_property(writer, XmlWriterProperty_OmitXmlDeclaration); - hr = IXmlWriter_WriteString(writer, aW); + hr = write_string(writer, "a"); ok(hr == E_UNEXPECTED, "got 0x%08x\n", hr); - hr = IXmlWriter_WriteString(writer, NULL); + hr = write_string(writer, NULL); ok(hr == S_OK, "got 0x%08x\n", hr); - hr = IXmlWriter_WriteString(writer, emptyW); + hr = write_string(writer, ""); ok(hr == E_UNEXPECTED, "got 0x%08x\n", hr); stream = writer_set_output(writer); - hr = IXmlWriter_WriteStartElement(writer, NULL, bW, NULL); + hr = write_start_element(writer, NULL, "b", NULL); ok(hr == S_OK, "got 0x%08x\n", hr); - hr = IXmlWriter_WriteString(writer, NULL); + hr = write_string(writer, NULL); ok(hr == S_OK, "got 0x%08x\n", hr); - hr = IXmlWriter_WriteString(writer, emptyW); + hr = write_string(writer, ""); ok(hr == S_OK, "got 0x%08x\n", hr); - hr = IXmlWriter_WriteString(writer, aW); + hr = write_string(writer, "a"); ok(hr == S_OK, "got 0x%08x\n", hr); /* WriteString automatically escapes markup characters */ - hr = IXmlWriter_WriteString(writer, markupW); + hr = write_string(writer, "<&\">="); ok(hr == S_OK, "got 0x%08x\n", hr); hr = IXmlWriter_Flush(writer); @@ -1902,10 +1912,10 @@ static void test_WriteString(void) stream = writer_set_output(writer); - hr = IXmlWriter_WriteStartElement(writer, NULL, bW, NULL); + hr = write_start_element(writer, NULL, "b", NULL); ok(hr == S_OK, "got 0x%08x\n", hr); - hr = IXmlWriter_WriteString(writer, NULL); + hr = write_string(writer, NULL); ok(hr == S_OK, "got 0x%08x\n", hr); hr = IXmlWriter_Flush(writer); @@ -1914,7 +1924,7 @@ static void test_WriteString(void) CHECK_OUTPUT(stream, "<b"); - hr = IXmlWriter_WriteString(writer, emptyW); + hr = write_string(writer, ""); ok(hr == S_OK, "got 0x%08x\n", hr); hr = IXmlWriter_Flush(writer); @@ -1923,6 +1933,54 @@ static void test_WriteString(void) CHECK_OUTPUT(stream, ""); + IStream_Release(stream); + IXmlWriter_Release(writer); + + /* With indentation */ + hr = CreateXmlWriter(&IID_IXmlWriter, (void **)&writer, NULL); + ok(hr == S_OK, "Failed to create a writer, hr %#x.\n", hr); + + stream = writer_set_output(writer); + + writer_set_property(writer, XmlWriterProperty_Indent); + + hr = write_start_element(writer, NULL, "a", NULL); + ok(hr == S_OK, "Failed to start element, hr %#x.\n", hr); + + hr = write_start_element(writer, NULL, "b", NULL); + ok(hr == S_OK, "Failed to start element, hr %#x.\n", hr); + + hr = write_string(writer, "text"); + ok(hr == S_OK, "Failed to write a string, hr %#x.\n", hr); + + hr = IXmlWriter_Flush(writer); + ok(hr == S_OK, "Failed to flush, hr %#x.\n", hr); + + CHECK_OUTPUT(stream, + "<a>\r\n" + " text"); + + hr = IXmlWriter_WriteFullEndElement(writer); + ok(hr == S_OK, "Failed to end element, hr %#x.\n", hr); + + hr = IXmlWriter_Flush(writer); + ok(hr == S_OK, "Failed to flush, hr %#x.\n", hr); + + CHECK_OUTPUT(stream, + "<a>\r\n" + " text"); + + hr = IXmlWriter_WriteFullEndElement(writer); + ok(hr == S_OK, "Failed to end element, hr %#x.\n", hr); + + hr = IXmlWriter_Flush(writer); + ok(hr == S_OK, "Failed to flush, hr %#x.\n", hr); + + CHECK_OUTPUT(stream, + "<a>\r\n" + " text\r\n" + "</a>"); + IXmlWriter_Release(writer); IStream_Release(stream); } diff --git a/dlls/xmllite/writer.c b/dlls/xmllite/writer.c index 92217b8..94e1f2f 100644 --- a/dlls/xmllite/writer.c +++ b/dlls/xmllite/writer.c @@ -80,6 +80,7 @@ typedef struct xml_encoding encoding; WCHAR *encoding_name; /* exactly as specified on output creation */ struct output_buffer buffer; + DWORD written : 1; } xmlwriteroutput; static const struct IUnknownVtbl xmlwriteroutputvtbl; @@ -114,9 +115,9 @@ typedef struct _xmlwriter BOOL omitxmldecl; XmlConformanceLevel conformance; XmlWriterState state; - BOOL bomwritten; - BOOL starttagopen; struct list elements; + DWORD bomwritten : 1; + DWORD starttagopen : 1; } xmlwriter; static inline xmlwriter *impl_from_IXmlWriter(IXmlWriter *iface) @@ -438,6 +439,7 @@ static HRESULT write_output_buffer(xmlwriteroutput *output, const WCHAR *data, i length = WideCharToMultiByte(buffer->codepage, 0, data, len, ptr, length, NULL, NULL); buffer->written += len == -1 ? length-1 : length; } + output->written = length != 0; return S_OK; } @@ -603,7 +605,7 @@ static HRESULT writer_close_starttag(xmlwriter *writer) writer_output_ns(writer, LIST_ENTRY(list_head(&writer->elements), struct element, entry)); hr = write_output_buffer(writer->output, gtW, ARRAY_SIZE(gtW)); - writer->starttagopen = FALSE; + writer->starttagopen = 0; return hr; } @@ -629,7 +631,7 @@ static void write_node_indent(xmlwriter *writer) /* 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) + if (writer->output->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)); @@ -701,7 +703,7 @@ static HRESULT WINAPI xmlwriter_SetOutput(IXmlWriter *iface, IUnknown *output) writeroutput_release_stream(This->output); IUnknown_Release(&This->output->IXmlWriterOutput_iface); This->output = NULL; - This->bomwritten = FALSE; + This->bomwritten = 0; This->indent_level = 0; writer_free_element_stack(This); } @@ -1211,7 +1213,7 @@ static HRESULT WINAPI xmlwriter_WriteEndElement(IXmlWriter *iface) { writer_output_ns(This, element); write_output_buffer(This->output, closetagW, ARRAY_SIZE(closetagW)); - This->starttagopen = FALSE; + This->starttagopen = 0; } else { @@ -1551,7 +1553,7 @@ static HRESULT WINAPI xmlwriter_WriteStartElement(IXmlWriter *iface, LPCWSTR pre write_node_indent(This); This->state = XmlWriterState_ElemStarted; - This->starttagopen = TRUE; + This->starttagopen = 1; writer_push_element(This, element); @@ -1772,8 +1774,8 @@ HRESULT WINAPI CreateXmlWriter(REFIID riid, void **obj, IMalloc *imalloc) writer->omitxmldecl = FALSE; writer->conformance = XmlConformanceLevel_Document; writer->state = XmlWriterState_Initial; - writer->bomwritten = FALSE; - writer->starttagopen = FALSE; + writer->bomwritten = 0; + writer->starttagopen = 0; list_init(&writer->elements); hr = IXmlWriter_QueryInterface(&writer->IXmlWriter_iface, riid, obj); @@ -1819,6 +1821,7 @@ static HRESULT create_writer_output(IUnknown *stream, IMalloc *imalloc, xml_enco } else writeroutput->encoding_name = NULL; + writeroutput->written = 0; IUnknown_QueryInterface(stream, &IID_IUnknown, (void**)&writeroutput->output);

1 0

Nikolay Sivov : xmllite/writer: Simplify setting default output encoding.
by Alexandre Julliard Sept. 14, 2018

Sept. 14, 2018

Module: wine Branch: master Commit: a469d37e435cf762dc916b1dedd3856b5180ee41 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a469d37e435cf762dc916b1d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Sep 14 13:06:49 2018 +0300 xmllite/writer: Simplify setting default output encoding. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/writer.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/xmllite/writer.c b/dlls/xmllite/writer.c index a359e35..e9ad941 100644 --- a/dlls/xmllite/writer.c +++ b/dlls/xmllite/writer.c @@ -1846,7 +1846,6 @@ static HRESULT create_writer_output(IUnknown *stream, IMalloc *imalloc, xml_enco HRESULT WINAPI CreateXmlWriterOutputWithEncodingName(IUnknown *stream, IMalloc *imalloc, const WCHAR *encoding, IXmlWriterOutput **out) { - static const WCHAR utf8W[] = {'U','T','F','-','8',0}; xmlwriteroutput *output; xml_encoding xml_enc; HRESULT hr; @@ -1858,7 +1857,7 @@ HRESULT WINAPI CreateXmlWriterOutputWithEncodingName(IUnknown *stream, IMalloc * *out = NULL; - xml_enc = parse_encoding_name(encoding ? encoding : utf8W, -1); + xml_enc = encoding ? parse_encoding_name(encoding, -1) : XmlEncoding_UTF8; if (SUCCEEDED(hr = create_writer_output(stream, imalloc, xml_enc, encoding, &output))) *out = &output->IXmlWriterOutput_iface;

1 0

Nikolay Sivov : xmllite/writer: Fix formatted output with interleaving text nodes.
by Alexandre Julliard Sept. 14, 2018

Sept. 14, 2018

Module: wine Branch: master Commit: ef7b911a620d13cd5b921a35feeb86927d4933d3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef7b911a620d13cd5b921a35… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Sep 14 13:06:47 2018 +0300 xmllite/writer: Fix formatted output with interleaving text nodes. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/tests/writer.c | 87 +++++++++++++++++++++++++++++++++++++++++++++ dlls/xmllite/writer.c | 24 ++++++++----- 2 files changed, 103 insertions(+), 8 deletions(-) diff --git a/dlls/xmllite/tests/writer.c b/dlls/xmllite/tests/writer.c index 42b534f..7f731be 100644 --- a/dlls/xmllite/tests/writer.c +++ b/dlls/xmllite/tests/writer.c @@ -1981,6 +1981,93 @@ static void test_WriteString(void) " text\r\n" "</a>"); + IStream_Release(stream); + + stream = writer_set_output(writer); + + hr = write_start_element(writer, NULL, "a", NULL); + ok(hr == S_OK, "Failed to start element, hr %#x.\n", hr); + + hr = write_start_element(writer, NULL, "b", NULL); + ok(hr == S_OK, "Failed to start element, hr %#x.\n", hr); + + hr = IXmlWriter_WriteEndElement(writer); + ok(hr == S_OK, "Failed to end element, hr %#x.\n", hr); + + hr = IXmlWriter_Flush(writer); + ok(hr == S_OK, "Failed to flush, hr %#x.\n", hr); + + CHECK_OUTPUT(stream, + "<a>\r\n" + " "); + + hr = write_start_element(writer, NULL, "c", NULL); + ok(hr == S_OK, "Failed to start element, hr %#x.\n", hr); + + hr = write_attribute_string(writer, NULL, "attr", NULL, "value"); + ok(hr == S_OK, "Failed to write attribute string, hr %#x.\n", hr); + + hr = IXmlWriter_Flush(writer); + ok(hr == S_OK, "Failed to flush, hr %#x.\n", hr); + + CHECK_OUTPUT(stream, + "<a>\r\n" + " \r\n" + " <c attr=\"value\""); + + hr = write_string(writer, "text"); + ok(hr == S_OK, "Failed to write a string, hr %#x.\n", hr); + + hr = IXmlWriter_Flush(writer); + ok(hr == S_OK, "Failed to flush, hr %#x.\n", hr); + + CHECK_OUTPUT(stream, + "<a>\r\n" + " \r\n" + " <c attr=\"value\">text"); + + hr = IXmlWriter_WriteEndElement(writer); + ok(hr == S_OK, "Failed to end element, hr %#x.\n", hr); + + hr = IXmlWriter_Flush(writer); + ok(hr == S_OK, "Failed to flush, hr %#x.\n", hr); + + CHECK_OUTPUT(stream, + "<a>\r\n" + " \r\n" + " <c attr=\"value\">text</c>"); + + hr = write_start_element(writer, NULL, "d", NULL); + ok(hr == S_OK, "Failed to start element, hr %#x.\n", hr); + + hr = write_string(writer, ""); + ok(hr == S_OK, "Failed to write a string, hr %#x.\n", hr); + + hr = IXmlWriter_WriteEndElement(writer); + ok(hr == S_OK, "Failed to end element, hr %#x.\n", hr); + + hr = IXmlWriter_Flush(writer); + ok(hr == S_OK, "Failed to flush, hr %#x.\n", hr); + + CHECK_OUTPUT(stream, + "<a>\r\n" + " \r\n" + " <c attr=\"value\">text</c>\r\n" + " <d></d>"); + + hr = IXmlWriter_WriteEndElement(writer); + ok(hr == S_OK, "Failed to end element, hr %#x.\n", hr); + + hr = IXmlWriter_Flush(writer); + ok(hr == S_OK, "Failed to flush, hr %#x.\n", hr); + + CHECK_OUTPUT(stream, + "<a>\r\n" + " \r\n" + " <c attr=\"value\">text</c>\r\n" + " <d></d>\r\n" + "</a>"); + IXmlWriter_Release(writer); IStream_Release(stream); } diff --git a/dlls/xmllite/writer.c b/dlls/xmllite/writer.c index 94e1f2f..f0eac77 100644 --- a/dlls/xmllite/writer.c +++ b/dlls/xmllite/writer.c @@ -118,6 +118,7 @@ typedef struct _xmlwriter struct list elements; DWORD bomwritten : 1; DWORD starttagopen : 1; + DWORD textnode : 1; } xmlwriter; static inline xmlwriter *impl_from_IXmlWriter(IXmlWriter *iface) @@ -626,8 +627,11 @@ static void write_node_indent(xmlwriter *writer) static const WCHAR crlfW[] = {'\r','\n'}; unsigned int indent_level = writer->indent_level; - if (!writer->indent) + if (!writer->indent || writer->textnode) + { + writer->textnode = 0; return; + } /* Do state check to prevent newline inserted after BOM. It is assumed that state does not change between writing BOM and inserting indentation. */ @@ -635,6 +639,8 @@ static void write_node_indent(xmlwriter *writer) write_output_buffer(writer->output, crlfW, ARRAY_SIZE(crlfW)); while (indent_level--) write_output_buffer(writer->output, dblspaceW, ARRAY_SIZE(dblspaceW)); + + writer->textnode = 0; } static HRESULT WINAPI xmlwriter_QueryInterface(IXmlWriter *iface, REFIID riid, void **ppvObject) @@ -704,6 +710,7 @@ static HRESULT WINAPI xmlwriter_SetOutput(IXmlWriter *iface, IUnknown *output) IUnknown_Release(&This->output->IXmlWriterOutput_iface); This->output = NULL; This->bomwritten = 0; + This->textnode = 0; This->indent_level = 0; writer_free_element_stack(This); } @@ -1281,7 +1288,10 @@ static HRESULT WINAPI xmlwriter_WriteFullEndElement(IXmlWriter *iface) /* don't force full end tag to the next line */ if (This->state == XmlWriterState_ElemStarted) + { This->state = XmlWriterState_Content; + This->textnode = 0; + } else write_node_indent(This); @@ -1623,6 +1633,7 @@ static HRESULT WINAPI xmlwriter_WriteString(IXmlWriter *iface, const WCHAR *stri ; } + This->textnode = 1; write_escaped_string(This, string); return S_OK; } @@ -1761,21 +1772,18 @@ HRESULT WINAPI CreateXmlWriter(REFIID riid, void **obj, IMalloc *imalloc) writer = IMalloc_Alloc(imalloc, sizeof(*writer)); else writer = heap_alloc(sizeof(*writer)); - if(!writer) return E_OUTOFMEMORY; + if (!writer) + return E_OUTOFMEMORY; + + memset(writer, 0, sizeof(*writer)); writer->IXmlWriter_iface.lpVtbl = &xmlwriter_vtbl; writer->ref = 1; writer->imalloc = imalloc; if (imalloc) IMalloc_AddRef(imalloc); - writer->output = NULL; - writer->indent_level = 0; - writer->indent = FALSE; writer->bom = TRUE; - writer->omitxmldecl = FALSE; writer->conformance = XmlConformanceLevel_Document; writer->state = XmlWriterState_Initial; - writer->bomwritten = 0; - writer->starttagopen = 0; list_init(&writer->elements); hr = IXmlWriter_QueryInterface(&writer->IXmlWriter_iface, riid, obj);

1 0

Louis Lenders : advapi32: Add stub for TraceSetInformation.
by Alexandre Julliard Sept. 14, 2018

Sept. 14, 2018

Module: wine Branch: master Commit: b80780ad0fbeba3853ebf2b9bb39dc20bce7044d URL: https://source.winehq.org/git/wine.git/?a=commit;h=b80780ad0fbeba3853ebf2b9… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Thu Sep 13 21:57:19 2018 +0200 advapi32: Add stub for TraceSetInformation. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45813 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/advapi32.spec | 2 +- dlls/advapi32/eventlog.c | 9 ++++++++ .../api-ms-win-eventing-controller-l1-1-0.spec | 2 +- include/evntrace.h | 25 ++++++++++++++++++++++ 4 files changed, 36 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index bb817a5..5845ae0 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -818,7 +818,7 @@ @ varargs TraceMessage(int64 long ptr long) @ stdcall TraceMessageVa(int64 long ptr long ptr) # @ stub TraceQueryInformation -# @ stub TraceSetInformation +@ stdcall TraceSetInformation(int64 long ptr long) # @ stub TreeResetNamedSecurityInfoA @ stdcall TreeResetNamedSecurityInfoW(wstr long long ptr ptr ptr ptr long ptr long ptr) # @ stub TreeSetNamedSecurityInfoA diff --git a/dlls/advapi32/eventlog.c b/dlls/advapi32/eventlog.c index fbab8e8..32066c5 100644 --- a/dlls/advapi32/eventlog.c +++ b/dlls/advapi32/eventlog.c @@ -931,3 +931,12 @@ ULONG WINAPI EnumerateTraceGuids(PTRACE_GUID_PROPERTIES *propertiesarray, FIXME("%p %d %p: stub\n", propertiesarray, arraycount, guidcount); return ERROR_INVALID_PARAMETER; } + +/****************************************************************************** + * TraceSetInformation [ADVAPI32.@] + */ +ULONG WINAPI TraceSetInformation(TRACEHANDLE handle, TRACE_INFO_CLASS infoclass, VOID* info, ULONG len) +{ + FIXME("%s %d %p %d: stub\n", wine_dbgstr_longlong(handle), infoclass, info, len); + return ERROR_CALL_NOT_IMPLEMENTED; +} diff --git a/dlls/api-ms-win-eventing-controller-l1-1-0/api-ms-win-eventing-controller-l1-1-0.spec b/dlls/api-ms-win-eventing-controller-l1-1-0/api-ms-win-eventing-controller-l1-1-0.spec index 0b58510..60a4ff5 100644 --- a/dlls/api-ms-win-eventing-controller-l1-1-0/api-ms-win-eventing-controller-l1-1-0.spec +++ b/dlls/api-ms-win-eventing-controller-l1-1-0/api-ms-win-eventing-controller-l1-1-0.spec @@ -8,4 +8,4 @@ @ stdcall StartTraceW(ptr wstr ptr) advapi32.StartTraceW @ stdcall StopTraceW(int64 wstr ptr) advapi32.StopTraceW @ stub TraceQueryInformation -@ stub TraceSetInformation +@ stdcall TraceSetInformation(int64 long ptr long) advapi32.TraceSetInformation diff --git a/include/evntrace.h b/include/evntrace.h index 5722b28..2c1c625 100644 --- a/include/evntrace.h +++ b/include/evntrace.h @@ -259,6 +259,31 @@ typedef struct _ENABLE_TRACE_PARAMETERS ULONG FilterDescCount; } ENABLE_TRACE_PARAMETERS, *PENABLE_TRACE_PARAMETERS; +typedef enum _TRACE_QUERY_INFO_CLASS +{ + TraceGuidQueryList, + TraceGuidQueryInfo, + TraceGuidQueryProcess, + TraceStackTracingInfo, + TraceSystemTraceEnableFlagsInfo, + TraceSampledProfileIntervalInfo, + TraceProfileSourceConfigInfo, + TraceProfileSourceListInfo, + TracePmcEventListInfo, + TracePmcCounterListInfo, + TraceSetDisallowList, + TraceVersionInfo, + TraceGroupQueryList, + TraceGroupQueryInfo, + TraceDisallowListQuery, + TraceCompressionInfo, + TracePeriodicCaptureStateListInfo, + TracePeriodicCaptureStateInfo, + TraceProviderBinaryTracking, + TraceMaxLoggersQuery, + MaxTraceSetInfoClass +} TRACE_QUERY_INFO_CLASS, TRACE_INFO_CLASS; + #define INVALID_PROCESSTRACE_HANDLE ((TRACEHANDLE)~(ULONG_PTR)0) ULONG WINAPI CloseTrace(TRACEHANDLE);

1 0

Nikolay Sivov : d2d1: Update to ID2D1DrawingStateBlock1.
by Alexandre Julliard Sept. 14, 2018

Sept. 14, 2018

Module: wine Branch: master Commit: 8b3a7c2581a81cb9c599c3fda66d2d781e265cf4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8b3a7c2581a81cb9c599c3fd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Sep 14 08:50:30 2018 +0300 d2d1: Update to ID2D1DrawingStateBlock1. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/d2d1_private.h | 8 +++--- dlls/d2d1/factory.c | 26 ++++++++++++++--- dlls/d2d1/state_block.c | 75 +++++++++++++++++++++++++++++++----------------- dlls/d2d1/tests/d2d1.c | 69 ++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 144 insertions(+), 34 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8b3a7c2581a81cb9c599…

1 0

Alexandre Julliard : Release 3.16.
by Alexandre Julliard Sept. 14, 2018

Sept. 14, 2018

Module: wine Branch: master Commit: 64d9f309b7f74d4154e685c5d1d78c1b8335c0bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=64d9f309b7f74d4154e685c5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 14 21:19:10 2018 +0200 Release 3.16. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 775 +++++++++++++++++++++++++------------------------------------- AUTHORS | 2 + VERSION | 2 +- configure | 18 +- 4 files changed, 327 insertions(+), 470 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=64d9f309b7f74d4154e6…

1 0