September 2018 - Wine-Commits

Francois Gouget : winhttp: Make winsock_init() static.
by Alexandre Julliard Sept. 17, 2018

Sept. 17, 2018

Module: wine Branch: master Commit: 8c0225ef75e2575325fc9137e94a566b8153b478 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8c0225ef75e2575325fc9137… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Sep 14 16:48:18 2018 +0200 winhttp: Make winsock_init() static. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/net.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index c141185..020ec5b 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -167,7 +167,7 @@ static BOOL WINAPI winsock_startup( INIT_ONCE *once, void *param, void **ctx ) return TRUE; } -void winsock_init(void) +static void winsock_init(void) { static INIT_ONCE once = INIT_ONCE_STATIC_INIT; InitOnceExecuteOnce( &once, winsock_startup, NULL, NULL );

1 0

Zebediah Figura : ole32: Use the real proxy IID in ClientRpcChannelBuffer_GetBuffer().
by Alexandre Julliard Sept. 17, 2018

Sept. 17, 2018

Module: wine Branch: master Commit: 904d1688a37197fe7f0c7c23f4491bc8320a79c7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=904d1688a37197fe7f0c7c23… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Sep 13 11:01:13 2018 -0500 ole32: Use the real proxy IID in ClientRpcChannelBuffer_GetBuffer(). Delegated proxies pass the IID of the parent interface to NdrProxyGetBuffer(). However, this interface was never registered with ole32 on the server side, so calls to delegated methods will return RPC_S_UNKNOWN_IF. Therefore we have ole32 ignore the passed-in parameter and use the real proxy ID. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45673 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/compobj_private.h | 2 +- dlls/ole32/marshal.c | 2 +- dlls/ole32/rpc.c | 6 ++++-- dlls/rpcrt4/tests/cstub.c | 2 -- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h index 212d328..1e564a3 100644 --- a/dlls/ole32/compobj_private.h +++ b/dlls/ole32/compobj_private.h @@ -210,7 +210,7 @@ struct dispatch_params; void RPC_StartRemoting(struct apartment *apt) DECLSPEC_HIDDEN; HRESULT RPC_CreateClientChannel(const OXID *oxid, const IPID *ipid, - const OXID_INFO *oxid_info, + const OXID_INFO *oxid_info, const IID *iid, DWORD dest_context, void *dest_context_data, IRpcChannelBuffer **chan, APARTMENT *apt) DECLSPEC_HIDDEN; HRESULT RPC_CreateServerChannel(DWORD dest_context, void *dest_context_data, IRpcChannelBuffer **chan) DECLSPEC_HIDDEN; diff --git a/dlls/ole32/marshal.c b/dlls/ole32/marshal.c index 7c0f541..6bfd47e 100644 --- a/dlls/ole32/marshal.c +++ b/dlls/ole32/marshal.c @@ -1290,7 +1290,7 @@ static HRESULT unmarshal_object(const STDOBJREF *stdobjref, APARTMENT *apt, { IRpcChannelBuffer *chanbuf; hr = RPC_CreateClientChannel(&stdobjref->oxid, &stdobjref->ipid, - &proxy_manager->oxid_info, + &proxy_manager->oxid_info, riid, proxy_manager->dest_context, proxy_manager->dest_context_data, &chanbuf, apt); diff --git a/dlls/ole32/rpc.c b/dlls/ole32/rpc.c index 9aa945b..bd4611d 100644 --- a/dlls/ole32/rpc.c +++ b/dlls/ole32/rpc.c @@ -109,6 +109,7 @@ typedef struct OXID oxid; /* apartment in which the channel is valid */ DWORD server_pid; /* id of server process */ HANDLE event; /* cached event handle */ + IID iid; /* IID of the proxy this belongs to */ } ClientRpcChannelBuffer; struct dispatch_params @@ -650,7 +651,7 @@ static HRESULT WINAPI ClientRpcChannelBuffer_GetBuffer(LPRPCCHANNELBUFFER iface, cif->Length = sizeof(RPC_CLIENT_INTERFACE); /* RPC interface ID = COM interface ID */ - cif->InterfaceId.SyntaxGUID = *riid; + cif->InterfaceId.SyntaxGUID = This->iid; /* COM objects always have a version of 0.0 */ cif->InterfaceId.SyntaxVersion.MajorVersion = 0; cif->InterfaceId.SyntaxVersion.MinorVersion = 0; @@ -1096,7 +1097,7 @@ static const IRpcChannelBufferVtbl ServerRpcChannelBufferVtbl = /* returns a channel buffer for proxies */ HRESULT RPC_CreateClientChannel(const OXID *oxid, const IPID *ipid, - const OXID_INFO *oxid_info, + const OXID_INFO *oxid_info, const IID *iid, DWORD dest_context, void *dest_context_data, IRpcChannelBuffer **chan, APARTMENT *apt) { @@ -1155,6 +1156,7 @@ HRESULT RPC_CreateClientChannel(const OXID *oxid, const IPID *ipid, apartment_getoxid(apt, &This->oxid); This->server_pid = oxid_info->dwPid; This->event = NULL; + This->iid = *iid; *chan = &This->super.IRpcChannelBuffer_iface; diff --git a/dlls/rpcrt4/tests/cstub.c b/dlls/rpcrt4/tests/cstub.c index 22d4569..6b99e82 100644 --- a/dlls/rpcrt4/tests/cstub.c +++ b/dlls/rpcrt4/tests/cstub.c @@ -1403,10 +1403,8 @@ static void test_delegated_methods(void) ok(ret == 9, "got %d\n", ret); hr = ITest1_GetClassID(test_obj, &clsid); -todo_wine { ok(hr == S_OK, "got %#x\n", hr); ok(IsEqualGUID(&clsid, &CLSID_test1), "got %s\n", wine_dbgstr_guid(&clsid)); -} ITest1_Release(test_obj);

1 0

Alexandre Julliard : Wine release 3.16
by Alexandre Julliard Sept. 14, 2018

Sept. 14, 2018

Module: website Branch: master Commit: 0ad107e8fc844e7eadb8abf8eab40f85a51a1434 URL: https://source.winehq.org/git/website.git/?a=commit;h=0ad107e8fc844e7eadb8a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 14 21:21:22 2018 +0200 Wine release 3.16 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2018091401.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/en/2018091401.xml b/news/en/2018091401.xml new file mode 100644 index 0000000..064b365 --- /dev/null +++ b/news/en/2018091401.xml @@ -0,0 +1,16 @@ +<news> +<date>September 14, 2018</date> +<title>Wine 3.16 Released</title> +<body> + The Wine development release 3.16 is now available. + <a href="{$root}/announce/3.16">What's new</a> in this release: +<ul> + <li>Initial implementation of OPC Services.</li> + <li>Support for rendering buttons from an ImageList.</li> + <li>Better support for CSS properties in MSHTML.</li> + <li>Namespace fixes in XML Writer.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/3.x/wine-3.16.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 : wined3d: Set WINED3DFMT_FLAG_COMPRESSED based on format block info.
by Alexandre Julliard Sept. 14, 2018

Sept. 14, 2018

Module: wine Branch: master Commit: ea8a88047c8a502d2dfdfbd6d618ce611b7514d3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea8a88047c8a502d2dfdfbd6… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Sep 14 14:00:57 2018 +0200 wined3d: Set WINED3DFMT_FLAG_COMPRESSED based on format block info. 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/utils.c | 103 +++++++++++++++++++++++---------------------------- 1 file changed, 47 insertions(+), 56 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ea8a88047c8a502d2dfd…

1 0

Francois Gouget : ole32/tests: Fix spelling of a variable name.
by Alexandre Julliard Sept. 14, 2018

Sept. 14, 2018

Module: wine Branch: master Commit: 8330192951adc06f024b136ef016414c6cf345ed URL: https://source.winehq.org/git/wine.git/?a=commit;h=8330192951adc06f024b136e… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Sep 14 16:47:39 2018 +0200 ole32/tests: Fix spelling of a variable name. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/ole2.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index 9b82e49..18cfb19 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -4620,7 +4620,7 @@ static void test_OleCreateStaticFromData(void) IOleObject *ole_obj = NULL; IStorage *storage; ILockBytes *ilb; - IPersist *presist; + IPersist *persist; CLSID clsid; STATSTG statstg; int enumerated_streams, matched_streams; @@ -4699,9 +4699,9 @@ static void test_OleCreateStaticFromData(void) hr = OleCreateStaticFromData(&DataObject, &IID_IOleObject, OLERENDER_FORMAT, dib_fmt, NULL, storage, (void **)&ole_obj); ok(hr == S_OK, "OleCreateStaticFromData failed: 0x%08x.\n", hr); - hr = IOleObject_QueryInterface(ole_obj, &IID_IPersist, (void **)&presist); + hr = IOleObject_QueryInterface(ole_obj, &IID_IPersist, (void **)&persist); ok(hr == S_OK, "IOleObject_QueryInterface failed: 0x%08x.\n", hr); - hr = IPersist_GetClassID(presist, &clsid); + hr = IPersist_GetClassID(persist, &clsid); ok(hr == S_OK, "IPersist_GetClassID failed: 0x%08x.\n", hr); ok(IsEqualCLSID(&clsid, &CLSID_Picture_Dib), "Got wrong clsid: %s, expected: %s.\n", wine_dbgstr_guid(&clsid), wine_dbgstr_guid(&CLSID_Picture_Dib)); @@ -4717,7 +4717,7 @@ static void test_OleCreateStaticFromData(void) ok(enumerated_streams == stg_def_dib.stream_count, "created %d != def streams %d\n", enumerated_streams, stg_def_dib.stream_count); ReleaseStgMedium(&stgmed); - IPersist_Release(presist); + IPersist_Release(persist); IStorage_Release(storage); IOleObject_Release(ole_obj); @@ -4733,9 +4733,9 @@ static void test_OleCreateStaticFromData(void) hr = OleCreateStaticFromData(&DataObject, &IID_IOleObject, OLERENDER_FORMAT, emf_fmt, NULL, storage, (void **)&ole_obj); ok(hr == S_OK, "OleCreateStaticFromData failed: 0x%08x.\n", hr); - hr = IOleObject_QueryInterface(ole_obj, &IID_IPersist, (void **)&presist); + hr = IOleObject_QueryInterface(ole_obj, &IID_IPersist, (void **)&persist); ok(hr == S_OK, "IOleObject_QueryInterface failed: 0x%08x.\n", hr); - hr = IPersist_GetClassID(presist, &clsid); + hr = IPersist_GetClassID(persist, &clsid); ok(hr == S_OK, "IPersist_GetClassID failed: 0x%08x.\n", hr); ok(IsEqualCLSID(&clsid, &CLSID_Picture_EnhMetafile), "Got wrong clsid: %s, expected: %s.\n", wine_dbgstr_guid(&clsid), wine_dbgstr_guid(&CLSID_Picture_EnhMetafile)); @@ -4751,7 +4751,7 @@ static void test_OleCreateStaticFromData(void) ok(enumerated_streams == stg_def_emf.stream_count, "created %d != def streams %d\n", enumerated_streams, stg_def_emf.stream_count); ReleaseStgMedium(&stgmed); - IPersist_Release(presist); + IPersist_Release(persist); IStorage_Release(storage); IOleObject_Release(ole_obj);

1 0

Roger Zoellner : ntdll: Relax checks for valid affinity mask in NtSetInformationThread().
by Alexandre Julliard Sept. 14, 2018

Sept. 14, 2018

Module: wine Branch: master Commit: 575c1c9066f353fdd6b9fb770c110705c4ddd6c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=575c1c9066f353fdd6b9fb77… Author: Roger Zoellner <zoellner.roger(a)gmail.com> Date: Tue Sep 11 02:41:09 2018 +0200 ntdll: Relax checks for valid affinity mask in NtSetInformationThread(). Signed-off-by: Roger Zoellner <zoellner.roger(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/info.c | 21 +++++++++++++++++++++ dlls/ntdll/thread.c | 7 +++---- 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index e7b07e5..7690696 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -2049,6 +2049,27 @@ static void test_affinity(void) ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); ok( tbi.AffinityMask == 1, "Unexpected thread affinity\n" ); + /* NOTE: Pre-Vista does not allow bits to be set that are higher than the highest set bit in process affinity mask */ + thread_affinity = (pbi.AffinityMask << 1) | pbi.AffinityMask; + status = pNtSetInformationThread( GetCurrentThread(), ThreadAffinityMask, &thread_affinity, sizeof(thread_affinity) ); + ok( broken(status == STATUS_INVALID_PARAMETER) || (status == STATUS_SUCCESS), "Expected STATUS_SUCCESS, got %08x\n", status ); + if (status == STATUS_SUCCESS) + { + status = pNtQueryInformationThread( GetCurrentThread(), ThreadBasicInformation, &tbi, sizeof(tbi), NULL ); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status ); + ok( tbi.AffinityMask == pbi.AffinityMask, "Unexpected thread affinity. Expected %lx, got %lx\n", pbi.AffinityMask, tbi.AffinityMask ); + } + + thread_affinity = ~(DWORD_PTR)0 - 1; + status = pNtSetInformationThread( GetCurrentThread(), ThreadAffinityMask, &thread_affinity, sizeof(thread_affinity) ); + ok( broken(status == STATUS_INVALID_PARAMETER) || (status == STATUS_SUCCESS), "Expected STATUS_SUCCESS, got %08x\n", status ); + if (status == STATUS_SUCCESS) + { + status = pNtQueryInformationThread( GetCurrentThread(), ThreadBasicInformation, &tbi, sizeof(tbi), NULL ); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status ); + ok( tbi.AffinityMask == (pbi.AffinityMask & (~(DWORD_PTR)0 - 1)), "Unexpected thread affinity. Expected %lx, got %lx\n", pbi.AffinityMask & (~(DWORD_PTR)0 - 1), tbi.AffinityMask ); + } + /* NOTE: Pre-Vista does not recognize the "all processors" flag (all bits set) */ thread_affinity = ~(DWORD_PTR)0; status = pNtSetInformationThread( GetCurrentThread(), ThreadAffinityMask, &thread_affinity, sizeof(thread_affinity) ); diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 59d64e1..f8b9ce1 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -1288,10 +1288,9 @@ NTSTATUS WINAPI NtSetInformationThread( HANDLE handle, THREADINFOCLASS class, ULONG_PTR req_aff; if (length != sizeof(ULONG_PTR)) return STATUS_INVALID_PARAMETER; - req_aff = *(const ULONG_PTR *)data; - if ((ULONG)req_aff == ~0u) req_aff = affinity_mask; - else if (req_aff & ~affinity_mask) return STATUS_INVALID_PARAMETER; - else if (!req_aff) return STATUS_INVALID_PARAMETER; + req_aff = *(const ULONG_PTR *)data & affinity_mask; + if (!req_aff) return STATUS_INVALID_PARAMETER; + SERVER_START_REQ( set_thread_info ) { req->handle = wine_server_obj_handle( handle );

1 0

Nikolay Sivov : xmllite/writer: Use internal function to create writer output implicitly.
by Alexandre Julliard Sept. 14, 2018

Sept. 14, 2018

Module: wine Branch: master Commit: 2564862b51c9737f05067e08f97bb604aaaee210 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2564862b51c9737f05067e08… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Sep 14 13:06:48 2018 +0300 xmllite/writer: Use internal function to create writer output implicitly. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/writer.c | 59 ++++++++++++++++++++++++++++++++------------------- 1 file changed, 37 insertions(+), 22 deletions(-) diff --git a/dlls/xmllite/writer.c b/dlls/xmllite/writer.c index f0eac77..a359e35 100644 --- a/dlls/xmllite/writer.c +++ b/dlls/xmllite/writer.c @@ -148,6 +148,9 @@ static const char *debugstr_writer_prop(XmlWriterProperty prop) return prop_names[prop]; } +static HRESULT create_writer_output(IUnknown *stream, IMalloc *imalloc, xml_encoding encoding, + const WCHAR *encoding_name, xmlwriteroutput **out); + /* writer output memory allocation functions */ static inline void *writeroutput_alloc(xmlwriteroutput *output, size_t len) { @@ -735,10 +738,10 @@ static HRESULT WINAPI xmlwriter_SetOutput(IXmlWriter *iface, IUnknown *output) } if (hr != S_OK || !writeroutput) { - /* create IXmlWriterOutput basing on supplied interface */ - hr = CreateXmlWriterOutputWithEncodingName(output, This->imalloc, NULL, &writeroutput); - if (hr != S_OK) return hr; - This->output = impl_from_IXmlWriterOutput(writeroutput); + /* Create output for given stream. */ + hr = create_writer_output(output, This->imalloc, XmlEncoding_UTF8, NULL, &This->output); + if (hr != S_OK) + return hr; } if (This->output->encoding == XmlEncoding_Unknown) @@ -1795,12 +1798,12 @@ HRESULT WINAPI CreateXmlWriter(REFIID riid, void **obj, IMalloc *imalloc) } static HRESULT create_writer_output(IUnknown *stream, IMalloc *imalloc, xml_encoding encoding, - const WCHAR *encoding_name, IXmlWriterOutput **output) + const WCHAR *encoding_name, xmlwriteroutput **out) { xmlwriteroutput *writeroutput; HRESULT hr; - *output = NULL; + *out = NULL; if (imalloc) writeroutput = IMalloc_Alloc(imalloc, sizeof(*writeroutput)); @@ -1833,40 +1836,52 @@ static HRESULT create_writer_output(IUnknown *stream, IMalloc *imalloc, xml_enco IUnknown_QueryInterface(stream, &IID_IUnknown, (void**)&writeroutput->output); - *output = &writeroutput->IXmlWriterOutput_iface; + *out = writeroutput; - TRACE("returning iface %p\n", *output); + TRACE("Created writer output %p\n", *out); return S_OK; } -HRESULT WINAPI CreateXmlWriterOutputWithEncodingName(IUnknown *stream, - IMalloc *imalloc, - LPCWSTR encoding, - IXmlWriterOutput **output) +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; + + TRACE("%p %p %s %p\n", stream, imalloc, debugstr_w(encoding), out); - TRACE("%p %p %s %p\n", stream, imalloc, debugstr_w(encoding), output); + if (!stream || !out) + return E_INVALIDARG; - if (!stream || !output) return E_INVALIDARG; + *out = NULL; xml_enc = parse_encoding_name(encoding ? encoding : utf8W, -1); - return create_writer_output(stream, imalloc, xml_enc, encoding, output); + if (SUCCEEDED(hr = create_writer_output(stream, imalloc, xml_enc, encoding, &output))) + *out = &output->IXmlWriterOutput_iface; + + return hr; } -HRESULT WINAPI CreateXmlWriterOutputWithEncodingCodePage(IUnknown *stream, - IMalloc *imalloc, - UINT codepage, - IXmlWriterOutput **output) +HRESULT WINAPI CreateXmlWriterOutputWithEncodingCodePage(IUnknown *stream, IMalloc *imalloc, UINT codepage, + IXmlWriterOutput **out) { + xmlwriteroutput *output; xml_encoding xml_enc; + HRESULT hr; - TRACE("%p %p %u %p\n", stream, imalloc, codepage, output); + TRACE("%p %p %u %p\n", stream, imalloc, codepage, out); - if (!stream || !output) return E_INVALIDARG; + if (!stream || !out) + return E_INVALIDARG; + + *out = NULL; xml_enc = get_encoding_from_codepage(codepage); - return create_writer_output(stream, imalloc, xml_enc, NULL, output); + if (SUCCEEDED(hr = create_writer_output(stream, imalloc, xml_enc, NULL, &output))) + *out = &output->IXmlWriterOutput_iface; + + return hr; }

1 0

Nikolay Sivov : xmllite/writer: Free finished element data (Valgrind).
by Alexandre Julliard Sept. 14, 2018

Sept. 14, 2018

Module: wine Branch: master Commit: 5f548d2af39a41536468f570ed0aa3ada7080a84 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5f548d2af39a41536468f570… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Sep 14 13:06:45 2018 +0300 xmllite/writer: Free finished element data (Valgrind). 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, 3 insertions(+) diff --git a/dlls/xmllite/writer.c b/dlls/xmllite/writer.c index aa6ff7f..92217b8 100644 --- a/dlls/xmllite/writer.c +++ b/dlls/xmllite/writer.c @@ -1221,6 +1221,7 @@ static HRESULT WINAPI xmlwriter_WriteEndElement(IXmlWriter *iface) write_output_buffer(This->output, element->qname, element->len); write_output_buffer(This->output, gtW, ARRAY_SIZE(gtW)); } + writer_free_element(This, element); return S_OK; } @@ -1287,6 +1288,8 @@ static HRESULT WINAPI xmlwriter_WriteFullEndElement(IXmlWriter *iface) write_output_buffer(This->output, element->qname, element->len); write_output_buffer(This->output, gtW, ARRAY_SIZE(gtW)); + writer_free_element(This, element); + return S_OK; }

1 0

Józef Kucia : wined3d: Use >= for shader model checks in feature_level_from_caps().
by Alexandre Julliard Sept. 14, 2018

Sept. 14, 2018

Module: wine Branch: master Commit: 2b56410081ebb820bed9d360ebf413aeaf84f8ce URL: https://source.winehq.org/git/wine.git/?a=commit;h=2b56410081ebb820bed9d360… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Sep 14 14:00:56 2018 +0200 wined3d: Use >= for shader model checks in feature_level_from_caps(). Spotted by Matteo Bruni. 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/adapter_gl.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index af17df8..6f39a3e 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -1265,15 +1265,15 @@ static enum wined3d_feature_level feature_level_from_caps(const struct wined3d_g && gl_info->supported[ARB_TEXTURE_COMPRESSION_BPTC]) return WINED3D_FEATURE_LEVEL_11; - if (shader_model == 4) + if (shader_model >= 4) return WINED3D_FEATURE_LEVEL_10; } - if (shader_model == 3) + if (shader_model >= 3) return WINED3D_FEATURE_LEVEL_9_SM3; - if (shader_model == 2) + if (shader_model >= 2) return WINED3D_FEATURE_LEVEL_9_SM2; - if (shader_model == 1) + if (shader_model >= 1) return WINED3D_FEATURE_LEVEL_8; if (fragment_caps->TextureOpCaps & WINED3DTEXOPCAPS_DOTPRODUCT3)

1 0

Michael Müller : ntdll: Add stub for ApiSetQueryApiSetPresence.
by Alexandre Julliard Sept. 14, 2018

Sept. 14, 2018

Module: wine Branch: master Commit: 3b0d0642830707e11341c24b975ed1432be2cbc8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3b0d0642830707e11341c24b… Author: Michael Müller <michael(a)fds-team.de> Date: Wed Sep 12 03:53:50 2018 +0000 ntdll: Add stub for ApiSetQueryApiSetPresence. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-apiquery-l1-1-0.spec | 2 +- dlls/ntdll/misc.c | 12 ++++++++++++ dlls/ntdll/ntdll.spec | 1 + 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/api-ms-win-core-apiquery-l1-1-0/api-ms-win-core-apiquery-l1-1-0.spec b/dlls/api-ms-win-core-apiquery-l1-1-0/api-ms-win-core-apiquery-l1-1-0.spec index 6d63b5b..1d99dd7 100644 --- a/dlls/api-ms-win-core-apiquery-l1-1-0/api-ms-win-core-apiquery-l1-1-0.spec +++ b/dlls/api-ms-win-core-apiquery-l1-1-0/api-ms-win-core-apiquery-l1-1-0.spec @@ -1 +1 @@ -@ stub ApiSetQueryApiSetPresence +@ stdcall ApiSetQueryApiSetPresence(ptr ptr) ntdll.ApiSetQueryApiSetPresence diff --git a/dlls/ntdll/misc.c b/dlls/ntdll/misc.c index 2431662..f2c0e14 100644 --- a/dlls/ntdll/misc.c +++ b/dlls/ntdll/misc.c @@ -504,3 +504,15 @@ NTSTATUS WINAPI NtCreateLowBoxToken(HANDLE *token_handle, HANDLE existing_token_ *token_handle = NULL; return STATUS_SUCCESS; } + +/********************************************************************* + * ApiSetQueryApiSetPresence (NTDLL.@) + */ +BOOL WINAPI ApiSetQueryApiSetPresence(const UNICODE_STRING *namespace, BOOLEAN *present) +{ + FIXME("(%s, %p) stub!\n", debugstr_us(namespace), present); + + if(present) + *present = TRUE; + return TRUE; +} diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 003e4f9..5e7c463 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -3,6 +3,7 @@ #if you change a Nt.. function DON'T FORGET to change the #Zw one too. +@ stdcall ApiSetQueryApiSetPresence(ptr ptr) @ stub CsrAllocateCaptureBuffer @ stub CsrAllocateCapturePointer @ stub CsrAllocateMessagePointer

1 0