September 2018 - Wine-commits

Nikolay Sivov : opcservices/tests: Add some tests.
by Alexandre Julliard 03 Sep '18

03 Sep '18

Module: wine Branch: master Commit: 5144584553a2310dedddfa205e9d0828150f5356 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5144584553a2310dedddfa20… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Sep 3 07:18:23 2018 +0300 opcservices/tests: Add some tests. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/opcservices/tests/Makefile.in | 5 +++ dlls/opcservices/tests/opcservices.c | 85 ++++++++++++++++++++++++++++++++++++ 4 files changed, 92 insertions(+) diff --git a/configure b/configure index 5d520f0..b800fd2 100755 --- a/configure +++ b/configure @@ -19715,6 +19715,7 @@ wine_fn_config_makefile dlls/olesvr.dll16 enable_win16 wine_fn_config_makefile dlls/olesvr32 enable_olesvr32 wine_fn_config_makefile dlls/olethk32 enable_olethk32 wine_fn_config_makefile dlls/opcservices enable_opcservices +wine_fn_config_makefile dlls/opcservices/tests enable_tests wine_fn_config_makefile dlls/openal32 enable_openal32 wine_fn_config_makefile dlls/opencl enable_opencl wine_fn_config_makefile dlls/opengl32 enable_opengl32 diff --git a/configure.ac b/configure.ac index 2b63d6a..d7d5e8e 100644 --- a/configure.ac +++ b/configure.ac @@ -3574,6 +3574,7 @@ WINE_CONFIG_MAKEFILE(dlls/olesvr.dll16,enable_win16) WINE_CONFIG_MAKEFILE(dlls/olesvr32) WINE_CONFIG_MAKEFILE(dlls/olethk32) WINE_CONFIG_MAKEFILE(dlls/opcservices) +WINE_CONFIG_MAKEFILE(dlls/opcservices/tests) WINE_CONFIG_MAKEFILE(dlls/openal32) WINE_CONFIG_MAKEFILE(dlls/opencl) WINE_CONFIG_MAKEFILE(dlls/opengl32) diff --git a/dlls/opcservices/tests/Makefile.in b/dlls/opcservices/tests/Makefile.in new file mode 100644 index 0000000..7c0963c --- /dev/null +++ b/dlls/opcservices/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = opcservices.dll +IMPORTS = ole32 + +C_SRCS = \ + opcservices.c diff --git a/dlls/opcservices/tests/opcservices.c b/dlls/opcservices/tests/opcservices.c new file mode 100644 index 0000000..e257c6e --- /dev/null +++ b/dlls/opcservices/tests/opcservices.c @@ -0,0 +1,85 @@ +/* + * Font related tests + * + * Copyright 2012, 2014-2017 Nikolay Sivov for CodeWeavers + * Copyright 2014 Aric Stewart for CodeWeavers + * + * 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 + */ + +#define COBJMACROS + +#include "windows.h" +#include "initguid.h" +#include "msopc.h" + +#include "wine/test.h" + +static IOpcFactory *create_factory(void) +{ + IOpcFactory *factory = NULL; + CoCreateInstance(&CLSID_OpcFactory, NULL, CLSCTX_INPROC_SERVER, &IID_IOpcFactory, (void **)&factory); + return factory; +} + +static void test_package(void) +{ + IOpcPartSet *partset, *partset2; + IOpcFactory *factory; + IOpcPackage *package; + HRESULT hr; + + factory = create_factory(); + + hr = IOpcFactory_CreatePackage(factory, &package); + ok(SUCCEEDED(hr) || broken(hr == E_NOTIMPL) /* Vista */, "Failed to create a package, hr %#x.\n", hr); + if (FAILED(hr)) + { + IOpcFactory_Release(factory); + return; + } + + hr = IOpcPackage_GetPartSet(package, &partset); + ok(SUCCEEDED(hr), "Failed to create a part set, hr %#x.\n", hr); + + hr = IOpcPackage_GetPartSet(package, &partset2); + ok(SUCCEEDED(hr), "Failed to create a part set, hr %#x.\n", hr); + ok(partset == partset2, "Expected same part set instance.\n"); + + IOpcPackage_Release(package); + + IOpcFactory_Release(factory); +} + +START_TEST(opcservices) +{ + IOpcFactory *factory; + HRESULT hr; + + hr = CoInitialize(NULL); + ok(SUCCEEDED(hr), "Failed to initialize COM, hr %#x.\n", hr); + + if (!(factory = create_factory())) { + win_skip("Failed to create IOpcFactory factory.\n"); + CoUninitialize(); + return; + } + + test_package(); + + IOpcFactory_Release(factory); + + CoUninitialize(); +}

1 0

Nikolay Sivov : opcservices: Add IOpcPartUri stub.
by Alexandre Julliard 03 Sep '18

03 Sep '18

Module: wine Branch: master Commit: d5db5e7ad707537b82059ef17cfcd4fc26b0786d URL: https://source.winehq.org/git/wine.git/?a=commit;h=d5db5e7ad707537b82059ef1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Sep 3 07:18:24 2018 +0300 opcservices: Add IOpcPartUri stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opcservices/Makefile.in | 3 +- dlls/opcservices/factory.c | 4 +- dlls/opcservices/opc_private.h | 1 + dlls/opcservices/uri.c | 355 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 360 insertions(+), 3 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d5db5e7ad707537b8205…

1 0

Nikolay Sivov : opcservices: Add IOpcPart stub.
by Alexandre Julliard 03 Sep '18

03 Sep '18

Module: wine Branch: master Commit: fbe44c5762388351741180d5137c93f248a88644 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fbe44c5762388351741180d5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Sep 3 07:18:25 2018 +0300 opcservices: Add IOpcPart stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opcservices/package.c | 114 ++++++++++++++++++++++++++++++++++++++++++++- include/opcobjectmodel.idl | 30 +++++++++++- 2 files changed, 142 insertions(+), 2 deletions(-) diff --git a/dlls/opcservices/package.c b/dlls/opcservices/package.c index c49c980..a3a2fab 100644 --- a/dlls/opcservices/package.c +++ b/dlls/opcservices/package.c @@ -36,6 +36,12 @@ struct opc_package IOpcPartSet *part_set; }; +struct opc_part +{ + IOpcPart IOpcPart_iface; + LONG refcount; +}; + struct opc_part_set { IOpcPartSet IOpcPartSet_iface; @@ -52,6 +58,112 @@ static inline struct opc_part_set *impl_from_IOpcPartSet(IOpcPartSet *iface) return CONTAINING_RECORD(iface, struct opc_part_set, IOpcPartSet_iface); } +static inline struct opc_part *impl_from_IOpcPart(IOpcPart *iface) +{ + return CONTAINING_RECORD(iface, struct opc_part, IOpcPart_iface); +} + +static HRESULT WINAPI opc_part_QueryInterface(IOpcPart *iface, REFIID iid, void **out) +{ + TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); + + if (IsEqualIID(iid, &IID_IOpcPart) || + IsEqualIID(iid, &IID_IUnknown)) + { + *out = iface; + IOpcPart_AddRef(iface); + return S_OK; + } + + WARN("Unsupported interface %s.\n", debugstr_guid(iid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI opc_part_AddRef(IOpcPart *iface) +{ + struct opc_part *part = impl_from_IOpcPart(iface); + ULONG refcount = InterlockedIncrement(&part->refcount); + + TRACE("%p increasing refcount to %u.\n", iface, refcount); + + return refcount; +} + +static ULONG WINAPI opc_part_Release(IOpcPart *iface) +{ + struct opc_part *part = impl_from_IOpcPart(iface); + ULONG refcount = InterlockedDecrement(&part->refcount); + + TRACE("%p decreasing refcount to %u.\n", iface, refcount); + + if (!refcount) + heap_free(part); + + return refcount; +} + +static HRESULT WINAPI opc_part_GetRelationshipSet(IOpcPart *iface, IOpcRelationshipSet **relationship_set) +{ + FIXME("iface %p, relationship_set %p stub!\n", iface, relationship_set); + + return E_NOTIMPL; +} + +static HRESULT WINAPI opc_part_GetContentStream(IOpcPart *iface, IStream **stream) +{ + FIXME("iface %p, stream %p stub!\n", iface, stream); + + return E_NOTIMPL; +} + +static HRESULT WINAPI opc_part_GetName(IOpcPart *iface, IOpcPartUri **name) +{ + FIXME("iface %p, name %p stub!\n", iface, name); + + return E_NOTIMPL; +} + +static HRESULT WINAPI opc_part_GetContentType(IOpcPart *iface, LPWSTR *type) +{ + FIXME("iface %p, type %p stub!\n", iface, type); + + return E_NOTIMPL; +} + +static HRESULT WINAPI opc_part_GetCompressionOptions(IOpcPart *iface, OPC_COMPRESSION_OPTIONS *options) +{ + FIXME("iface %p, options %p stub!\n", iface, options); + + return E_NOTIMPL; +} + +static const IOpcPartVtbl opc_part_vtbl = +{ + opc_part_QueryInterface, + opc_part_AddRef, + opc_part_Release, + opc_part_GetRelationshipSet, + opc_part_GetContentStream, + opc_part_GetName, + opc_part_GetContentType, + opc_part_GetCompressionOptions, +}; + +static HRESULT opc_part_create(IOpcPart **out) +{ + struct opc_part *part; + + if (!(part = heap_alloc_zero(sizeof(*part)))) + return E_OUTOFMEMORY; + + part->IOpcPart_iface.lpVtbl = &opc_part_vtbl; + part->refcount = 1; + + *out = &part->IOpcPart_iface; + TRACE("Created part %p.\n", *out); + return S_OK; +} + static HRESULT WINAPI opc_part_set_QueryInterface(IOpcPartSet *iface, REFIID iid, void **out) { TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); @@ -104,7 +216,7 @@ static HRESULT WINAPI opc_part_set_CreatePart(IOpcPartSet *iface, IOpcPartUri *n FIXME("iface %p, name %p, content_type %s, compression_options %#x, part %p stub!\n", iface, name, debugstr_w(content_type), compression_options, part); - return E_NOTIMPL; + return opc_part_create(part); } static HRESULT WINAPI opc_part_set_DeletePart(IOpcPartSet *iface, IOpcPartUri *name) diff --git a/include/opcobjectmodel.idl b/include/opcobjectmodel.idl index 45bc8aa..eaf0108 100644 --- a/include/opcobjectmodel.idl +++ b/include/opcobjectmodel.idl @@ -20,10 +20,10 @@ #pragma makedep install #endif -interface IOpcPart; interface IOpcPartUri; interface IOpcUri; interface IOpcRelationship; +interface IOpcRelationshipSet; typedef [v1_enum] enum { @@ -40,6 +40,34 @@ typedef [v1_enum] enum [ object, + uuid(42195949-3b79-4fc8-89c6-fc7fb979ee71), + pointer_default(ref) +] +interface IOpcPart : IUnknown +{ + HRESULT GetRelationshipSet( + [out, retval] IOpcRelationshipSet **relationship_set + ); + + HRESULT GetContentStream( + [out, retval] IStream **stream + ); + + HRESULT GetName( + [out, retval] IOpcPartUri **name + ); + + HRESULT GetContentType( + [out, string, retval] LPWSTR *type + ); + + HRESULT GetCompressionOptions( + [out, retval] OPC_COMPRESSION_OPTIONS *options + ); +} + +[ + object, uuid(42195949-3b79-4fc8-89c6-fc7fb979ee75), pointer_default(ref) ]

1 0

Nikolay Sivov : comctl32/listbox: Fix debug channel name.
by Alexandre Julliard 03 Sep '18

03 Sep '18

Module: wine Branch: master Commit: e84742abccd8314ce5382bed8e1f83f3de796cd3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e84742abccd8314ce5382bed… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Sep 3 07:19:18 2018 +0300 comctl32/listbox: Fix debug channel name. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/listbox.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index 4d389b1..252844e 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -39,7 +39,7 @@ #include "comctl32.h" -WINE_DEFAULT_DEBUG_CHANNEL(listbox2); +WINE_DEFAULT_DEBUG_CHANNEL(listbox); /* Items array granularity */ #define LB_ARRAY_GRANULARITY 16

1 0

Nikolay Sivov : shlwapi: Don't reuse a function for different methods.
by Alexandre Julliard 03 Sep '18

03 Sep '18

Module: wine Branch: master Commit: 53271d9567759634a84f901e5506084179940e87 URL: https://source.winehq.org/git/wine.git/?a=commit;h=53271d9567759634a84f901e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Sep 3 07:20:10 2018 +0300 shlwapi: Don't reuse a function for different methods. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/istream.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/dlls/shlwapi/istream.c b/dlls/shlwapi/istream.c index 43f53ff..623232a 100644 --- a/dlls/shlwapi/istream.c +++ b/dlls/shlwapi/istream.c @@ -274,9 +274,20 @@ static HRESULT WINAPI IStream_fnRevert(IStream *iface) } /************************************************************************** - * IStream_fnLockUnlockRegion + * IStream_fnLockRegion */ -static HRESULT WINAPI IStream_fnLockUnlockRegion(IStream *iface, ULARGE_INTEGER libOffset, +static HRESULT WINAPI IStream_fnLockRegion(IStream *iface, ULARGE_INTEGER libOffset, + ULARGE_INTEGER cb, DWORD dwLockType) +{ + ISHFileStream *This = impl_from_IStream(iface); + TRACE("(%p,%s,%s,%d)\n", This, wine_dbgstr_longlong(libOffset.QuadPart), wine_dbgstr_longlong(cb.QuadPart), dwLockType); + return E_NOTIMPL; +} + +/************************************************************************** + * IStream_fnUnlockRegion + */ +static HRESULT WINAPI IStream_fnUnlockRegion(IStream *iface, ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType) { ISHFileStream *This = impl_from_IStream(iface); @@ -345,8 +356,8 @@ static const IStreamVtbl SHLWAPI_fsVTable = IStream_fnCopyTo, IStream_fnCommit, IStream_fnRevert, - IStream_fnLockUnlockRegion, - IStream_fnLockUnlockRegion, + IStream_fnLockRegion, + IStream_fnUnlockRegion, IStream_fnStat, IStream_fnClone };

1 0

Nikolay Sivov : shlwapi: Fix Stat() method for file streams.
by Alexandre Julliard 03 Sep '18

03 Sep '18

Module: wine Branch: master Commit: c8175e6c7a73d1c510fe2285f74e6bcf808c9fe2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c8175e6c7a73d1c510fe2285… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Sep 3 07:20:11 2018 +0300 shlwapi: Fix Stat() method for file streams. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/istream.c | 2 +- dlls/shlwapi/tests/istream.c | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/shlwapi/istream.c b/dlls/shlwapi/istream.c index 623232a..a77ed8a 100644 --- a/dlls/shlwapi/istream.c +++ b/dlls/shlwapi/istream.c @@ -306,7 +306,7 @@ static HRESULT WINAPI IStream_fnStat(IStream *iface, STATSTG* lpStat, TRACE("(%p,%p,%d)\n", This, lpStat, grfStatFlag); - if (!grfStatFlag) + if (!lpStat) return STG_E_INVALIDPOINTER; memset(&fi, 0, sizeof(fi)); diff --git a/dlls/shlwapi/tests/istream.c b/dlls/shlwapi/tests/istream.c index f1854a2..7d0cd61 100644 --- a/dlls/shlwapi/tests/istream.c +++ b/dlls/shlwapi/tests/istream.c @@ -191,6 +191,7 @@ static void test_stream_read_write(IStream *stream, DWORD mode) HRESULT ret; unsigned char buf[16]; DWORD written, count; + STATSTG statstg; /* IStream_Read/Write from the COBJMACROS is undefined by shlwapi.h */ @@ -245,6 +246,17 @@ static void test_stream_read_write(IStream *stream, DWORD mode) ok(count == written, "expected %u, got %u\n", written, count); if (count) ok(buf[0] == 0x5e && buf[1] == 0xa7, "expected 5ea7, got %02x%02x\n", buf[0], buf[1]); + + memset(&statstg, 0xff, sizeof(statstg)); + ret = IStream_Stat(stream, &statstg, 0); + ok(ret == S_OK, "Stat failed, hr %#x.\n", ret); + ok(statstg.pwcsName != NULL, "Unexpected name %s.\n", wine_dbgstr_w(statstg.pwcsName)); + CoTaskMemFree(statstg.pwcsName); + + memset(&statstg, 0xff, sizeof(statstg)); + ret = IStream_Stat(stream, &statstg, STATFLAG_NONAME); + ok(ret == S_OK, "Stat failed, hr %#x.\n", ret); + ok(statstg.pwcsName == NULL, "Unexpected name %s.\n", wine_dbgstr_w(statstg.pwcsName)); } static void test_stream_qi(IStream *stream)

1 0

Hans Leidekker : secur32/tests: Connect to test.winehq.org instead of www.winehq.org.
by Alexandre Julliard 03 Sep '18

03 Sep '18

Module: wine Branch: master Commit: 061b0c459b1297321f519b5d2e1745320fc28187 URL: https://source.winehq.org/git/wine.git/?a=commit;h=061b0c459b1297321f519b5d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Sep 3 09:56:27 2018 +0200 secur32/tests: Connect to test.winehq.org instead of www.winehq.org. Also make the tests more strict. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/tests/schannel.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c index 1a37c52..2bd0e01 100644 --- a/dlls/secur32/tests/schannel.c +++ b/dlls/secur32/tests/schannel.c @@ -560,11 +560,11 @@ static void test_remote_cert(PCCERT_CONTEXT remote_cert) cert_cnt++; } - ok(cert_cnt == 2 || cert_cnt == 3, "cert_cnt = %u\n", cert_cnt); + ok(cert_cnt == 4, "cert_cnt = %u\n", cert_cnt); ok(incl_remote, "context does not contain cert itself\n"); } -static const char http_request[] = "HEAD /test.html HTTP/1.1\r\nHost: www.winehq.org\r\nConnection: close\r\n\r\n"; +static const char http_request[] = "HEAD /test.html HTTP/1.1\r\nHost: test.winehq.org\r\nConnection: close\r\n\r\n"; static void init_buffers(SecBufferDesc *desc, unsigned count, unsigned size) { @@ -690,7 +690,7 @@ static void test_communication(void) SecBufferDesc buffers[2]; SecBuffer *buf; - unsigned buf_size = 4000; + unsigned buf_size = 8192; unsigned char *data; unsigned data_size; @@ -700,7 +700,7 @@ static void test_communication(void) return; } - /* Create a socket and connect to www.winehq.org */ + /* Create a socket and connect to test.winehq.org */ ret = WSAStartup(0x0202, &wsa_data); if (ret) { @@ -708,10 +708,10 @@ static void test_communication(void) return; } - host = gethostbyname("www.winehq.org"); + host = gethostbyname("test.winehq.org"); if (!host) { - skip("Can't resolve www.winehq.org\n"); + skip("Can't resolve test.winehq.org\n"); return; } @@ -728,7 +728,7 @@ static void test_communication(void) ret = connect(sock, (struct sockaddr *)&addr, sizeof(addr)); if (ret == SOCKET_ERROR) { - skip("Can't connect to www.winehq.org\n"); + skip("Can't connect to test.winehq.org\n"); return; } @@ -806,7 +806,7 @@ todo_wine ok(buffers[0].pBuffers[0].cbBuffer == buf_size, "Output buffer size changed.\n"); ok(buffers[0].pBuffers[0].BufferType == SECBUFFER_TOKEN, "Output buffer type changed.\n"); - buffers[1].cBuffers = 4; + buffers[1].cBuffers = 1; buffers[1].pBuffers[0].cbBuffer = 0; status = InitializeSecurityContextA(&cred_handle, &context, (SEC_CHAR *)"localhost", @@ -865,10 +865,9 @@ todo_wine } ok(buffers[0].pBuffers[0].cbBuffer == 0, "Output buffer size was not set to 0.\n"); - ok(status == SEC_E_OK || broken(status == SEC_E_INVALID_TOKEN) /* WinNT */, - "InitializeSecurityContext failed: %08x\n", status); + ok(status == SEC_E_OK, "InitializeSecurityContext failed: %08x\n", status); if(status != SEC_E_OK) { - win_skip("Handshake failed\n"); + skip("Handshake failed\n"); return; }

1 0

Jacek Caban : server: Support ObjectTypeInformation in pipe objects.
by Alexandre Julliard 03 Sep '18

03 Sep '18

Module: wine Branch: master Commit: 8c9c2fca08bb654568071305ab98b16d5b712c47 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8c9c2fca08bb654568071305… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 3 14:54:15 2018 +0200 server: Support ObjectTypeInformation in pipe objects. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45743 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/om.c | 28 +++++++++++++++++++++++++++- server/named_pipe.c | 12 ++++++++++-- 2 files changed, 37 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index c2b40cb..7eef55c 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -1279,7 +1279,7 @@ static void test_query_object(void) static const WCHAR type_iocompletion[] = {'I','o','C','o','m','p','l','e','t','i','o','n'}; static const WCHAR type_directory[] = {'D','i','r','e','c','t','o','r','y'}; static const WCHAR type_section[] = {'S','e','c','t','i','o','n'}; - HANDLE handle; + HANDLE handle, client; char buffer[1024]; NTSTATUS status; ULONG len, expected_len; @@ -1498,6 +1498,32 @@ static void test_query_object(void) ok( len > sizeof(UNICODE_STRING) + sizeof("\\test_pipe") * sizeof(WCHAR), "name too short %s\n", wine_dbgstr_w(str->Buffer) ); trace( "got %s len %u\n", wine_dbgstr_w(str->Buffer), len ); + + len = 0; + memset( buffer, 0, sizeof(buffer) ); + status = pNtQueryObject( handle, ObjectTypeInformation, buffer, sizeof(buffer), &len ); + ok( status == STATUS_SUCCESS, "NtQueryObject failed %x\n", status ); + ok( len > sizeof(OBJECT_TYPE_INFORMATION), "unexpected len %u\n", len ); + str = (UNICODE_STRING *)buffer; + ok( len >= sizeof(OBJECT_TYPE_INFORMATION) + str->Length + sizeof(WCHAR), "unexpected len %u\n", len ); + ok( str->Buffer && !memcmp( str->Buffer, type_file, sizeof(type_file) ), + "wrong/bad type name %s (%p)\n", wine_dbgstr_w(str->Buffer), str->Buffer ); + + client = CreateFileA( "\\\\.\\pipe\\test_pipe", GENERIC_READ | GENERIC_WRITE, + 0, NULL, OPEN_EXISTING, 0, 0 ); + ok( client != INVALID_HANDLE_VALUE, "CreateFile failed (%d)\n", GetLastError() ); + + len = 0; + memset( buffer, 0, sizeof(buffer) ); + status = pNtQueryObject( handle, ObjectTypeInformation, buffer, sizeof(buffer), &len ); + ok( status == STATUS_SUCCESS, "NtQueryObject failed %x\n", status ); + ok( len > sizeof(OBJECT_TYPE_INFORMATION), "unexpected len %u\n", len ); + str = (UNICODE_STRING *)buffer; + ok( len >= sizeof(OBJECT_TYPE_INFORMATION) + str->Length + sizeof(WCHAR), "unexpected len %u\n", len ); + ok( str->Buffer && !memcmp( str->Buffer, type_file, sizeof(type_file) ), + "wrong/bad type name %s (%p)\n", wine_dbgstr_w(str->Buffer), str->Buffer ); + + pNtClose( client ); pNtClose( handle ); pRtlCreateUnicodeStringFromAsciiz( &path, "\\REGISTRY\\Machine\\Software\\Classes" ); diff --git a/server/named_pipe.c b/server/named_pipe.c index c006acb..ae2f2de 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -134,6 +134,7 @@ static const struct object_ops named_pipe_ops = /* common server and client pipe end functions */ static void pipe_end_destroy( struct object *obj ); +static struct object_type *pipe_end_get_type( struct object *obj ); static enum server_fd_type pipe_end_get_fd_type( struct fd *fd ); static struct fd *pipe_end_get_fd( struct object *obj ); static struct security_descriptor *pipe_end_get_sd( struct object *obj ); @@ -155,7 +156,7 @@ static const struct object_ops pipe_server_ops = { sizeof(struct pipe_server), /* size */ pipe_server_dump, /* dump */ - no_get_type, /* get_type */ + pipe_end_get_type, /* get_type */ add_queue, /* add_queue */ remove_queue, /* remove_queue */ default_fd_signaled, /* signaled */ @@ -196,7 +197,7 @@ static const struct object_ops pipe_client_ops = { sizeof(struct pipe_client), /* size */ pipe_client_dump, /* dump */ - no_get_type, /* get_type */ + pipe_end_get_type, /* get_type */ add_queue, /* add_queue */ remove_queue, /* remove_queue */ default_fd_signaled, /* signaled */ @@ -315,6 +316,13 @@ static void named_pipe_destroy( struct object *obj) free_async_queue( &pipe->waiters ); } +static struct object_type *pipe_end_get_type( struct object *obj ) +{ + static const WCHAR name[] = {'F','i','l','e'}; + static const struct unicode_str str = { name, sizeof(name) }; + return get_object_type( &str ); +} + static struct fd *pipe_end_get_fd( struct object *obj ) { struct pipe_end *pipe_end = (struct pipe_end *) obj;

1 0

Alistair Leslie-Hughes : include: Add MmIsAddressValid to header.
by Alexandre Julliard 03 Sep '18

03 Sep '18

Module: wine Branch: master Commit: 82634cd9237ee1ba0c41e93a42c4848c40c45a64 URL: https://source.winehq.org/git/wine.git/?a=commit;h=82634cd9237ee1ba0c41e93a… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Aug 31 01:09:31 2018 +0000 include: Add MmIsAddressValid to header. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/ddk/ntddk.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/ddk/ntddk.h b/include/ddk/ntddk.h index 5c124ca..e76ccc9 100644 --- a/include/ddk/ntddk.h +++ b/include/ddk/ntddk.h @@ -214,6 +214,7 @@ NTSTATUS WINAPI IoQueryDeviceDescription(PINTERFACE_TYPE,PULONG,PCONFIGURATION_ PCONFIGURATION_TYPE,PULONG,PIO_QUERY_DEVICE_ROUTINE,PVOID); void WINAPI IoRegisterDriverReinitialization(PDRIVER_OBJECT,PDRIVER_REINITIALIZE,PVOID); NTSTATUS WINAPI IoRegisterShutdownNotification(PDEVICE_OBJECT); +BOOLEAN WINAPI MmIsAddressValid(void *); NTSTATUS WINAPI PsSetLoadImageNotifyRoutine(PLOAD_IMAGE_NOTIFY_ROUTINE); void WINAPI RtlInitializeGenericTableAvl(PRTL_AVL_TABLE,PRTL_AVL_COMPARE_ROUTINE,PRTL_AVL_ALLOCATE_ROUTINE, PRTL_AVL_FREE_ROUTINE,void *); void WINAPI RtlInsertElementGenericTableAvl(PRTL_AVL_TABLE,void *,ULONG,BOOL*);

1 0

Brock York : kernel32/tests: Test ReplaceFileW on open exe.
by Alexandre Julliard 03 Sep '18

03 Sep '18

Module: wine Branch: master Commit: 2bbd309d66e87abe6da44c6388df7ebaa637decc URL: https://source.winehq.org/git/wine.git/?a=commit;h=2bbd309d66e87abe6da44c63… Author: Brock York <twunknown(a)gmail.com> Date: Mon Sep 3 20:15:17 2018 +1000 kernel32/tests: Test ReplaceFileW on open exe. Replicate the scenario of an exe calling ReplaceFileW on itself. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=33845 Signed-off-by: Brock York <twunknown(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/file.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 1c41572..2e2c55b 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -3677,6 +3677,30 @@ static void test_ReplaceFileA(void) ok(ret || GetLastError() == ERROR_ACCESS_DENIED, "SetFileAttributesA: error setting to normal %d\n", GetLastError()); + /* re-create replacement file for pass w/ replaced opened with + * the same permissions as an exe (Replicating an exe trying to + * replace itself) + */ + ret = GetTempFileNameA(temp_path, prefix, 0, replacement); + ok(ret != 0, "GetTempFileNameA error (replacement) %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + /* make sure that the replacement file still exists */ + hReplacementFile = CreateFileA(replacement, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0); + ok(hReplacementFile != INVALID_HANDLE_VALUE || + broken(GetLastError() == ERROR_FILE_NOT_FOUND), /* win2k */ + "unexpected error, replacement file should still exist %d\n", GetLastError()); + CloseHandle(hReplacementFile); + + /* make sure that the replaced file is opened like an exe*/ + hReplacedFile = CreateFileA(replaced, GENERIC_READ | SYNCHRONIZE, FILE_SHARE_READ | FILE_SHARE_DELETE, NULL, OPEN_EXISTING, 0, 0); + ok(hReplacedFile != INVALID_HANDLE_VALUE, + "unexpected error, replaced file should be able to be opened %d\n", GetLastError()); + /*Calling ReplaceFileA on an exe should succeed*/ + ret = pReplaceFileA(replaced, replacement, NULL, 0, 0, 0); + todo_wine ok(ret, "ReplaceFileA: unexpected error %d\n", GetLastError()); + CloseHandle(hReplacedFile); + /* replacement file still exists, make pass w/o "replaced" */ ret = DeleteFileA(replaced); ok(ret || GetLastError() == ERROR_ACCESS_DENIED,

1 0