September 2018 - Wine-devel

Wine staging 3.15 release
by Alistair Leslie-Hughes 03 Sep '18

03 Sep '18

Binary packages for various distributions will be available from: https://www.winehq.org/download Summary of the past few weeks * Rebased to current wine 3.15 (890 patches are applied to wine vanilla) * Reviewed and upstreamed patches. Added * [45622] mfplat: Add MFTRegisterLocal/MFTUnRegisterLocal stubs * [45372] mfplat: Implement MFCreateMFByteStreamOnStream * [45617] mfplat: Implement MFCreateSample * [45715] mfplat: Implement MFCreateMemoryBuffer * [42631] winex11: Improve mouse support in Unity based games. * [39402] xaudio2_7: Support FXEcho interface in CreateFX Where can you help * Run Steam/Battle.net/UPlay. * Try you favorite game: 2017 Just Dance * Test your favorite applications. * Steal staging patches and get them accepted upstream. As always, if you find a bug, please report it via https://bugs.winehq.org Best Regards Alistair.

1 0

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

03 Sep '18

Also make the tests more strict. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- 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 1a37c5226a..2bd0e017f4 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; } -- 2.11.0

1 0

[PATCH 1/2] shlwapi: Don't reuse a function for different methods.
by Nikolay Sivov 03 Sep '18

03 Sep '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- 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 43f53ffc79..623232a047 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 }; -- 2.18.0

1 1

[PATCH] comctl32/listbox: Fix debug channel name.
by Nikolay Sivov 03 Sep '18

03 Sep '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- 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 4d389b13bc..252844ef75 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 -- 2.18.0

1 0

[PATCH 1/3] opcservices/tests: Add some tests.
by Nikolay Sivov 03 Sep '18

03 Sep '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- configure | 1 + configure.ac | 1 + dlls/opcservices/tests/Makefile.in | 5 ++ dlls/opcservices/tests/opcservices.c | 85 ++++++++++++++++++++++++++++ 4 files changed, 92 insertions(+) create mode 100644 dlls/opcservices/tests/Makefile.in create mode 100644 dlls/opcservices/tests/opcservices.c diff --git a/configure b/configure index 5d520f045a..b800fd269a 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 2b63d6ae50..d7d5e8e6ae 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 0000000000..7c0963cc60 --- /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 0000000000..e257c6ea2c --- /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(); +} -- 2.18.0

1 2

[PATCH 1/3] Update POOL_TYPE enumeration based on MSDN
by Derek Lesho 03 Sep '18

03 Sep '18

Update POOL_TYPE enum to include types listed on MSDN, including NonPagedPoolExecute, which is needed for Battleye. Signed-off-by: Derek Lesho <dereklesho52(a)Gmail.com> --- include/ddk/wdm.h | 31 +++++++++++++++++++++++-------- 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 0cd1673dbe..a639b3c7b7 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -183,14 +183,29 @@ typedef struct _VPB { } VPB, *PVPB; typedef enum _POOL_TYPE { - NonPagedPool, - PagedPool, - NonPagedPoolMustSucceed, - DontUseThisType, - NonPagedPoolCacheAligned, - PagedPoolCacheAligned, - NonPagedPoolCacheAlignedMustS, - MaxPoolType + NonPagedPool , + NonPagedPoolExecute , + PagedPool , + NonPagedPoolMustSucceed , + DontUseThisType , + NonPagedPoolCacheAligned , + PagedPoolCacheAligned , + NonPagedPoolCacheAlignedMustS , + MaxPoolType , + NonPagedPoolBase , + NonPagedPoolBaseMustSucceed , + NonPagedPoolBaseCacheAligned , + NonPagedPoolBaseCacheAlignedMustS , + NonPagedPoolSession , + PagedPoolSession , + NonPagedPoolMustSucceedSession , + DontUseThisTypeSession , + NonPagedPoolCacheAlignedSession , + PagedPoolCacheAlignedSession , + NonPagedPoolCacheAlignedMustSSession , + NonPagedPoolNx , + NonPagedPoolNxCacheAligned , + NonPagedPoolSessionNx } POOL_TYPE; typedef struct _WAIT_CONTEXT_BLOCK { -- 2.18.0

2 5

[PATCH] cmd: Don't print an empty line if no command was executed.
by Thomas Faller 01 Sep '18

01 Sep '18

Signed-off-by: Thomas Faller <tfaller1(a)gmx.de> --- programs/cmd/wcmdmain.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 7a7ee16f7d..cceb5883ed 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -335,7 +335,7 @@ void WCMD_print_error (void) { * */ -static void WCMD_show_prompt (void) { +static void WCMD_show_prompt (BOOL newLine) { int status; WCHAR out_string[MAX_PATH], curdir[MAX_PATH], prompt_string[MAX_PATH]; @@ -350,8 +350,10 @@ static void WCMD_show_prompt (void) { } p = prompt_string; q = out_string; - *q++ = '\r'; - *q++ = '\n'; + if (newLine) { + *q++ = '\r'; + *q++ = '\n'; + } *q = '\0'; while (*p != '\0') { if (*p != '$') { @@ -1886,7 +1888,7 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE const DWORD len = ARRAY_SIZE(echoDot); DWORD curr_size = strlenW(curPos); DWORD min_len = (curr_size < len ? curr_size : len); - WCMD_show_prompt(); + WCMD_show_prompt(TRUE); WCMD_output_asis(curPos); /* I don't know why Windows puts a space here but it does */ /* Except for lines starting with 'echo.', 'echo:' or 'echo/'. Ask MS why */ @@ -2395,6 +2397,7 @@ int wmain (int argc, WCHAR *argvW[]) WCHAR *argPos = NULL; WCHAR string[1024]; WCHAR envvar[4]; + BOOL promptNewLine = TRUE; BOOL opt_q; int opt_t = 0; static const WCHAR offW[] = {'O','F','F','\0'}; @@ -2749,11 +2752,12 @@ int wmain (int argc, WCHAR *argvW[]) /* Read until EOF (which for std input is never, but if redirect in place, may occur */ - if (echo_mode) WCMD_show_prompt(); + if (echo_mode) WCMD_show_prompt(promptNewLine); if (!WCMD_ReadAndParseLine(NULL, &toExecute, GetStdHandle(STD_INPUT_HANDLE))) break; WCMD_process_commands(toExecute, FALSE, FALSE); WCMD_free_commands(toExecute); + promptNewLine = !!toExecute; toExecute = NULL; } return 0; -- 2.17.1

1 0