September 2017 - Wine-commits

Huw Davies : sapi: Add a stub SpDataKey object implementation.
by Alexandre Julliard 28 Sep '17

28 Sep '17

Module: wine Branch: master Commit: c82d27429330db91b7ebda107e17df910e75fe0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c82d27429330db91b7ebda107… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Sep 28 08:40:46 2017 +0100 sapi: Add a stub SpDataKey object implementation. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/sapi/Makefile.in | 3 +- dlls/sapi/main.c | 91 ++++++++++++++++++++ dlls/sapi/sapi.spec | 2 +- dlls/sapi/sapi_private.h | 31 +++++++ dlls/sapi/token.c | 215 +++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 340 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c82d27429330db91b7ebd…

1 0

Huw Davies : sapi: Implement SpDataKey::SetKey().
by Alexandre Julliard 28 Sep '17

28 Sep '17

Module: wine Branch: master Commit: 41144614c7d2a68fa470ddb8b357b02c2f481817 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41144614c7d2a68fa470ddb8b… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Sep 28 08:40:47 2017 +0100 sapi: Implement SpDataKey::SetKey(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/sapi/tests/Makefile.in | 5 ++++ dlls/sapi/tests/token.c | 57 +++++++++++++++++++++++++++++++++++++++++++++ dlls/sapi/token.c | 17 ++++++++++++-- 5 files changed, 79 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 339bfc5..f3247bd 100755 --- a/configure +++ b/configure @@ -18667,6 +18667,7 @@ wine_fn_config_dll rtutils enable_rtutils implib wine_fn_config_dll samlib enable_samlib wine_fn_config_dll sane.ds enable_sane_ds clean wine_fn_config_dll sapi enable_sapi clean +wine_fn_config_test dlls/sapi/tests sapi_test wine_fn_config_dll scarddlg enable_scarddlg wine_fn_config_dll sccbase enable_sccbase wine_fn_config_dll schannel enable_schannel diff --git a/configure.ac b/configure.ac index e1dc522..b958ff3 100644 --- a/configure.ac +++ b/configure.ac @@ -3448,6 +3448,7 @@ WINE_CONFIG_DLL(rtutils,,[implib]) WINE_CONFIG_DLL(samlib) WINE_CONFIG_DLL(sane.ds,,[clean]) WINE_CONFIG_DLL(sapi,,[clean]) +WINE_CONFIG_TEST(dlls/sapi/tests) WINE_CONFIG_DLL(scarddlg) WINE_CONFIG_DLL(sccbase) WINE_CONFIG_DLL(schannel) diff --git a/dlls/sapi/tests/Makefile.in b/dlls/sapi/tests/Makefile.in new file mode 100644 index 0000000..bf924d7 --- /dev/null +++ b/dlls/sapi/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = sapi.dll +IMPORTS = ole32 user32 advapi32 + +C_SRCS = \ + token.c diff --git a/dlls/sapi/tests/token.c b/dlls/sapi/tests/token.c new file mode 100644 index 0000000..8c445ea --- /dev/null +++ b/dlls/sapi/tests/token.c @@ -0,0 +1,57 @@ +/* + * Speech API (SAPI) token tests. + * + * Copyright (C) 2017 Huw Davies + * + * 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 "initguid.h" +#include "sapiddk.h" +#include "sperror.h" + +#include "wine/test.h" + +static void test_data_key(void) +{ + ISpRegDataKey *data_key; + HRESULT hr; + HKEY key; + LONG res; + + hr = CoCreateInstance( &CLSID_SpDataKey, NULL, CLSCTX_INPROC_SERVER, + &IID_ISpRegDataKey, (void **)&data_key ); + ok( hr == S_OK, "got %08x\n", hr ); + + res = RegCreateKeyExA( HKEY_CURRENT_USER, "Software\\Winetest\\sapi", 0, NULL, 0, KEY_ALL_ACCESS, + NULL, &key, NULL ); + ok( res == ERROR_SUCCESS, "got %d\n", res ); + + hr = ISpRegDataKey_SetKey( data_key, key, FALSE ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = ISpRegDataKey_SetKey( data_key, key, FALSE ); + ok( hr == SPERR_ALREADY_INITIALIZED, "got %08x\n", hr ); + + ISpRegDataKey_Release( data_key ); +} + +START_TEST(token) +{ + CoInitialize( NULL ); + test_data_key(); + CoUninitialize(); +} diff --git a/dlls/sapi/token.c b/dlls/sapi/token.c index bcacba8..a274f5f 100644 --- a/dlls/sapi/token.c +++ b/dlls/sapi/token.c @@ -39,6 +39,9 @@ struct data_key { ISpRegDataKey ISpRegDataKey_iface; LONG ref; + + HKEY key; + BOOL read_only; }; struct data_key *impl_from_ISpRegDataKey( ISpRegDataKey *iface ) @@ -84,6 +87,7 @@ static ULONG WINAPI data_key_Release( ISpRegDataKey *iface ) if (!ref) { + if (This->key) RegCloseKey( This->key ); heap_free( This ); } @@ -175,8 +179,15 @@ static HRESULT WINAPI data_key_EnumValues( ISpRegDataKey *iface, static HRESULT WINAPI data_key_SetKey( ISpRegDataKey *iface, HKEY key, BOOL read_only ) { - FIXME( "stub\n" ); - return E_NOTIMPL; + struct data_key *This = impl_from_ISpRegDataKey( iface ); + + TRACE( "(%p)->(%p %d)\n", This, key, read_only ); + + if (This->key) return SPERR_ALREADY_INITIALIZED; + + This->key = key; + This->read_only = read_only; + return S_OK; } const struct ISpRegDataKeyVtbl data_key_vtbl = @@ -207,6 +218,8 @@ HRESULT data_key_create( IUnknown *outer, REFIID iid, void **obj ) if (!This) return E_OUTOFMEMORY; This->ISpRegDataKey_iface.lpVtbl = &data_key_vtbl; This->ref = 1; + This->key = NULL; + This->read_only = FALSE; hr = ISpRegDataKey_QueryInterface( &This->ISpRegDataKey_iface, iid, obj );

1 0

Rosanne DiMesio : Fix typo in testResults form
by Jeremy Newman 28 Sep '17

28 Sep '17

Module: appdb Branch: master Commit: c054cad9176dc39158043de88d977a3635a41805 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=c054cad9176dc39158043de8… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Thu Sep 28 15:13:34 2017 -0500 Fix typo in testResults form Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- include/testData.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/testData.php b/include/testData.php index 12a0721..ad4dea9 100644 --- a/include/testData.php +++ b/include/testData.php @@ -110,7 +110,7 @@ class testData{ $this->sState, $this->sGpuMfr, $this->sGraphicsDriver, - $this-sHasProblems); + $this->sHasProblems); if($hResult) {

1 0

Huw Davies : sapi: Create the Voices registry key.
by Alexandre Julliard 27 Sep '17

27 Sep '17

Module: wine Branch: master Commit: 35347b0e406eb2bba6feef217da3fc11b3e66232 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35347b0e406eb2bba6feef217… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Sep 27 10:17:18 2017 +0100 sapi: Create the Voices registry key. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/sapi/Makefile.in | 3 +++ dlls/sapi/sapi.rc | 22 ++++++++++++++++++++++ dlls/sapi/sapi.rgs | 15 +++++++++++++++ 3 files changed, 40 insertions(+) diff --git a/dlls/sapi/Makefile.in b/dlls/sapi/Makefile.in index 99a0143..5303299 100644 --- a/dlls/sapi/Makefile.in +++ b/dlls/sapi/Makefile.in @@ -7,3 +7,6 @@ C_SRCS = \ IDL_SRCS = \ sapi_classes.idl \ sapi_typelib.idl + +RC_SRCS = \ + sapi.rc diff --git a/dlls/sapi/sapi.rc b/dlls/sapi/sapi.rc new file mode 100644 index 0000000..cbf6293 --- /dev/null +++ b/dlls/sapi/sapi.rc @@ -0,0 +1,22 @@ +/* + * Speech API (SAPI) resource file. + * + * Copyright (C) 2017 Huw Davies + * + * 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 + */ + +/* @makedep: sapi.rgs */ +1 WINE_REGISTRY sapi.rgs diff --git a/dlls/sapi/sapi.rgs b/dlls/sapi/sapi.rgs new file mode 100644 index 0000000..b086303 --- /dev/null +++ b/dlls/sapi/sapi.rgs @@ -0,0 +1,15 @@ +HKLM +{ + NoRemove Software + { + NoRemove Microsoft + { + NoRemove Speech + { + NoRemove Voices + { + } + } + } + } +}

1 0

Alistair Leslie-Hughes : ole32: Add pointer check.
by Alexandre Julliard 27 Sep '17

27 Sep '17

Module: wine Branch: master Commit: fcc261adfd402133385820b06bf0d6589829fcf9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcc261adfd402133385820b06… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Sep 26 01:12:52 2017 +0000 ole32: Add pointer check. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/storage32.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 2da7a99..51f178b 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -7267,6 +7267,8 @@ BlockChainStream* BlockChainStream_Construct( BlockChainStream* newStream; newStream = HeapAlloc(GetProcessHeap(), 0, sizeof(BlockChainStream)); + if(!newStream) + return NULL; newStream->parentStorage = parentStorage; newStream->headOfStreamPlaceHolder = headOfStreamPlaceHolder;

1 0

Jacek Caban : mscoree: Added CreateConfigStream implementation.
by Alexandre Julliard 27 Sep '17

27 Sep '17

Module: wine Branch: master Commit: 8fff6813b11387c68e0b949e2c482c5dd4d9765d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fff6813b11387c68e0b949e2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 26 18:09:52 2017 +0200 mscoree: Added CreateConfigStream implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/config.c | 187 +++++++++++++++++++++++++++++++++++++++++++ dlls/mscoree/mscoree_main.c | 6 -- dlls/mscoree/tests/mscoree.c | 27 ++++--- 3 files changed, 203 insertions(+), 17 deletions(-) diff --git a/dlls/mscoree/config.c b/dlls/mscoree/config.c index a52a521..af2ccf2 100644 --- a/dlls/mscoree/config.c +++ b/dlls/mscoree/config.c @@ -29,6 +29,7 @@ #include "msxml2.h" #include "mscoree.h" #include "corhdr.h" +#include "corerror.h" #include "metahost.h" #include "cordebug.h" #include "wine/list.h" @@ -60,6 +61,192 @@ typedef struct ConfigFileHandler parsed_config_file *result; } ConfigFileHandler; +typedef struct +{ + IStream IStream_iface; + LONG ref; + HANDLE file; +} ConfigStream; + +static inline ConfigStream *impl_from_IStream(IStream *iface) +{ + return CONTAINING_RECORD(iface, ConfigStream, IStream_iface); +} + +static HRESULT WINAPI ConfigStream_QueryInterface(IStream *iface, REFIID riid, void **ppv) +{ + ConfigStream *This = impl_from_IStream(iface); + + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); + + if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IStream)) + *ppv = &This->IStream_iface; + else + { + WARN("Not supported iface %s\n", debugstr_guid(riid)); + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI ConfigStream_AddRef(IStream *iface) +{ + ConfigStream *This = impl_from_IStream(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%u\n", This, ref); + + return ref; +} + +static ULONG WINAPI ConfigStream_Release(IStream *iface) +{ + ConfigStream *This = impl_from_IStream(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%u\n",This, ref); + + if (!ref) + { + CloseHandle(This->file); + HeapFree(GetProcessHeap(), 0, This); + } + + return ref; +} + +static HRESULT WINAPI ConfigStream_Read(IStream *iface, void *buf, ULONG size, ULONG *ret_read) +{ + ConfigStream *This = impl_from_IStream(iface); + DWORD read = 0; + + TRACE("(%p)->(%p %u %p)\n", This, buf, size, ret_read); + + if (!ReadFile(This->file, buf, size, &read, NULL)) + { + WARN("error %d reading file\n", GetLastError()); + return HRESULT_FROM_WIN32(GetLastError()); + } + + if (ret_read) *ret_read = read; + return S_OK; +} + +static HRESULT WINAPI ConfigStream_Write(IStream *iface, const void *buf, ULONG size, ULONG *written) +{ + ConfigStream *This = impl_from_IStream(iface); + TRACE("(%p)->(%p %u %p)\n", This, buf, size, written); + return E_FAIL; +} + +static HRESULT WINAPI ConfigStream_Seek(IStream *iface, LARGE_INTEGER dlibMove, + DWORD dwOrigin, ULARGE_INTEGER *pNewPos) +{ + ConfigStream *This = impl_from_IStream(iface); + TRACE("(%p)->(%d %d %p)\n", This, dlibMove.u.LowPart, dwOrigin, pNewPos); + return E_NOTIMPL; +} + +static HRESULT WINAPI ConfigStream_SetSize(IStream *iface, ULARGE_INTEGER libNewSize) +{ + ConfigStream *This = impl_from_IStream(iface); + TRACE("(%p)->(%d)\n", This, libNewSize.u.LowPart); + return E_NOTIMPL; +} + +static HRESULT WINAPI ConfigStream_CopyTo(IStream *iface, IStream *stream, ULARGE_INTEGER size, + ULARGE_INTEGER *read, ULARGE_INTEGER *written) +{ + ConfigStream *This = impl_from_IStream(iface); + FIXME("(%p)->(%p %d %p %p)\n", This, stream, size.u.LowPart, read, written); + return E_NOTIMPL; +} + +static HRESULT WINAPI ConfigStream_Commit(IStream *iface, DWORD flags) +{ + ConfigStream *This = impl_from_IStream(iface); + FIXME("(%p,%d)\n", This, flags); + return E_NOTIMPL; +} + +static HRESULT WINAPI ConfigStream_Revert(IStream *iface) +{ + ConfigStream *This = impl_from_IStream(iface); + TRACE("(%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI ConfigStream_LockUnlockRegion(IStream *iface, ULARGE_INTEGER libOffset, + ULARGE_INTEGER cb, DWORD dwLockType) +{ + ConfigStream *This = impl_from_IStream(iface); + TRACE("(%p,%d,%d,%d)\n", This, libOffset.u.LowPart, cb.u.LowPart, dwLockType); + return E_NOTIMPL; +} + +static HRESULT WINAPI ConfigStream_Stat(IStream *iface, STATSTG *lpStat, DWORD grfStatFlag) +{ + ConfigStream *This = impl_from_IStream(iface); + FIXME("(%p,%p,%d)\n", This, lpStat, grfStatFlag); + return E_NOTIMPL; +} + +static HRESULT WINAPI ConfigStream_Clone(IStream *iface, IStream **ppstm) +{ + ConfigStream *This = impl_from_IStream(iface); + TRACE("(%p)\n",This); + return E_NOTIMPL; +} + +static const IStreamVtbl ConfigStreamVtbl = { + ConfigStream_QueryInterface, + ConfigStream_AddRef, + ConfigStream_Release, + ConfigStream_Read, + ConfigStream_Write, + ConfigStream_Seek, + ConfigStream_SetSize, + ConfigStream_CopyTo, + ConfigStream_Commit, + ConfigStream_Revert, + ConfigStream_LockUnlockRegion, + ConfigStream_LockUnlockRegion, + ConfigStream_Stat, + ConfigStream_Clone +}; + +HRESULT WINAPI CreateConfigStream(const WCHAR *filename, IStream **stream) +{ + ConfigStream *config_stream; + HANDLE file; + + TRACE("(%s, %p)\n", debugstr_w(filename), stream); + + if (!stream) + return COR_E_NULLREFERENCE; + + file = CreateFileW(filename, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0); + if (file == INVALID_HANDLE_VALUE) + return GetLastError() == ERROR_FILE_NOT_FOUND ? COR_E_FILENOTFOUND : E_FAIL; + + config_stream = HeapAlloc(GetProcessHeap(), 0, sizeof(*config_stream)); + if (!config_stream) + { + CloseHandle(file); + return E_OUTOFMEMORY; + } + + config_stream->IStream_iface.lpVtbl = &ConfigStreamVtbl; + config_stream->ref = 1; + config_stream->file = file; + + *stream = &config_stream->IStream_iface; + return S_OK; +} + static inline ConfigFileHandler *impl_from_ISAXContentHandler(ISAXContentHandler *iface) { return CONTAINING_RECORD(iface, ConfigFileHandler, ISAXContentHandler_iface); diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index 2c5d2cb..9561405 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -551,12 +551,6 @@ BOOL WINAPI StrongNameSignatureVerificationEx(LPCWSTR filename, BOOL forceVerifi return FALSE; } -HRESULT WINAPI CreateConfigStream(LPCWSTR filename, IStream **stream) -{ - FIXME("(%s, %p): stub\n", debugstr_w(filename), stream); - return E_NOTIMPL; -} - HRESULT WINAPI CreateDebuggingInterfaceFromVersion(int nDebugVersion, LPCWSTR version, IUnknown **ppv) { const WCHAR v2_0[] = {'v','2','.','0','.','5','0','7','2','7',0}; diff --git a/dlls/mscoree/tests/mscoree.c b/dlls/mscoree/tests/mscoree.c index abe105d..63517dc 100644 --- a/dlls/mscoree/tests/mscoree.c +++ b/dlls/mscoree/tests/mscoree.c @@ -437,24 +437,24 @@ static void test_createconfigstream(void) GetFullPathNameW(file, MAX_PATH, path, NULL); hr = pCreateConfigStream(NULL, &stream); - todo_wine ok(hr == E_FAIL || - broken(hr == HRESULT_FROM_WIN32(ERROR_PROC_NOT_FOUND)) || /* some WinXP, Win2K3 and Win7 */ - broken(hr == S_OK && !stream), /* some Win2K3 */ - "CreateConfigStream returned %x\n", hr); + ok(hr == E_FAIL || + broken(hr == HRESULT_FROM_WIN32(ERROR_PROC_NOT_FOUND)) || /* some WinXP, Win2K3 and Win7 */ + broken(hr == S_OK && !stream), /* some Win2K3 */ + "CreateConfigStream returned %x\n", hr); hr = pCreateConfigStream(path, NULL); - todo_wine ok(hr == COR_E_NULLREFERENCE, "CreateConfigStream returned %x\n", hr); + ok(hr == COR_E_NULLREFERENCE, "CreateConfigStream returned %x\n", hr); hr = pCreateConfigStream(NULL, NULL); - todo_wine ok(hr == COR_E_NULLREFERENCE, "CreateConfigStream returned %x\n", hr); + ok(hr == COR_E_NULLREFERENCE, "CreateConfigStream returned %x\n", hr); hr = pCreateConfigStream(nonexistent, &stream); - todo_wine ok(hr == COR_E_FILENOTFOUND, "CreateConfigStream returned %x\n", hr); + ok(hr == COR_E_FILENOTFOUND, "CreateConfigStream returned %x\n", hr); ok(stream == NULL, "Expected stream to be NULL\n"); hr = pCreateConfigStream(path, &stream); - todo_wine ok(hr == S_OK, "CreateConfigStream failed, hr=%x\n", hr); - todo_wine ok(stream != NULL, "Expected non-NULL stream\n"); + ok(hr == S_OK, "CreateConfigStream failed, hr=%x\n", hr); + ok(stream != NULL, "Expected non-NULL stream\n"); if (stream) { @@ -462,12 +462,17 @@ static void test_createconfigstream(void) LARGE_INTEGER pos; ULARGE_INTEGER size; IStream *stream2 = NULL; + ULONG ref; hr = IStream_Read(stream, buffer, strlen(xmldata), &count); ok(hr == S_OK, "IStream_Read failed, hr=%x\n", hr); ok(count == strlen(xmldata), "wrong count: %u\n", count); ok(!strcmp(buffer, xmldata), "Strings do not match\n"); + hr = IStream_Read(stream, buffer, sizeof(buffer), &count); + ok(hr == S_OK, "IStream_Read failed, hr=%x\n", hr); + ok(!count, "wrong count: %u\n", count); + hr = IStream_Write(stream, xmldata, strlen(xmldata), &count); ok(hr == E_FAIL, "IStream_Write returned hr=%x\n", hr); @@ -488,8 +493,8 @@ static void test_createconfigstream(void) hr = IStream_Revert(stream); ok(hr == E_NOTIMPL, "IStream_Revert returned hr=%x\n", hr); - hr = IStream_Release(stream); - ok(hr == S_OK, "IStream_Release returned hr=%x\n", hr); + ref = IStream_Release(stream); + ok(!ref, "IStream_Release returned %u\n", ref); } DeleteFileW(file); }

1 0

Jacek Caban : mscoree: Use CreateConfigStream in parse_config_file.
by Alexandre Julliard 27 Sep '17

27 Sep '17

Module: wine Branch: master Commit: dd16a49144a35cdbda758b5eacb51e47f2789365 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd16a49144a35cdbda758b5ea… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 26 18:10:11 2017 +0200 mscoree: Use CreateConfigStream in parse_config_file. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/config.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/dlls/mscoree/config.c b/dlls/mscoree/config.c index af2ccf2..48f12f4 100644 --- a/dlls/mscoree/config.c +++ b/dlls/mscoree/config.c @@ -34,7 +34,6 @@ #include "cordebug.h" #include "wine/list.h" #include "mscoree_private.h" -#include "shlwapi.h" #include "wine/debug.h" @@ -664,20 +663,18 @@ HRESULT parse_config_file(LPCWSTR filename, parsed_config_file *result) init_config(result); - initresult = CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); - - hr = SHCreateStreamOnFileW(filename, STGM_SHARE_DENY_WRITE | STGM_READ | STGM_FAILIFTHERE, &stream); - if (SUCCEEDED(hr)) - { - V_VT(&var) = VT_UNKNOWN; - V_UNKNOWN(&var) = (IUnknown*)stream; + hr = CreateConfigStream(filename, &stream); + if (FAILED(hr)) + return hr; - hr = parse_config(var, result); + initresult = CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + V_VT(&var) = VT_UNKNOWN; + V_UNKNOWN(&var) = (IUnknown*)stream; - IStream_Release(stream); - } + hr = parse_config(var, result); + IStream_Release(stream); if (SUCCEEDED(initresult)) CoUninitialize();

1 0

Jacek Caban : rpcrt4: Wait for available pipe when connecting to busy server.
by Alexandre Julliard 27 Sep '17

27 Sep '17

Module: wine Branch: master Commit: ac6325e4bbfa6ba9ace5c98787ef770325ddf051 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac6325e4bbfa6ba9ace5c9878… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 27 20:18:07 2017 +0200 rpcrt4: Wait for available pipe when connecting to busy server. It's most likely to happen when server just accepted another connection and didn't create a new listening pipe instance yet. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/rpc_transport.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 5735b0f..c374ba1 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -153,6 +153,10 @@ static RPC_STATUS rpcrt4_conn_open_pipe(RpcConnection *Connection, LPCSTR pname, if (pipe != INVALID_HANDLE_VALUE) break; err = GetLastError(); if (err == ERROR_PIPE_BUSY) { + if (WaitNamedPipeA(pname, NMPWAIT_USE_DEFAULT_WAIT)) { + TRACE("retrying busy server\n"); + continue; + } TRACE("connection failed, error=%x\n", err); return RPC_S_SERVER_TOO_BUSY; }

1 0

Michael Stefaniuc : tools/sfnt2fon: Just skip all glyphs below 0x20.
by Alexandre Julliard 27 Sep '17

27 Sep '17

Module: wine Branch: master Commit: 89e79d8144308a24676ef069d567a14655985b0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=89e79d8144308a24676ef069d… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Sep 28 00:23:41 2017 +0200 tools/sfnt2fon: Just skip all glyphs below 0x20. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/sfnt2fon/sfnt2fon.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/sfnt2fon/sfnt2fon.c b/tools/sfnt2fon/sfnt2fon.c index ea915da..25f0763 100644 --- a/tools/sfnt2fon/sfnt2fon.c +++ b/tools/sfnt2fon/sfnt2fon.c @@ -439,9 +439,9 @@ static struct fontinfo *fill_fontinfo( const char *face_name, int ppem, int enc, el = 0; first_char = FT_Get_First_Char(face, &gi); - if(first_char == 0xd) /* fontforge's first glyph is 0xd, we'll catch this and skip it */ - first_char = 32; /* FT_Get_Next_Char for some reason returns too high - number in this case */ + if(first_char < 0x20) /* Ignore glyphs below 0x20 */ + first_char = 0x20; /* FT_Get_Next_Char for some reason returns too high + number in this case */ info = calloc( 1, sizeof(*info) );

1 0

Michael Stefaniuc : fonts: Increase the Em size to fix a build failure with freetype 2.8.1.
by Alexandre Julliard 27 Sep '17

27 Sep '17

Module: wine Branch: master Commit: 40166848a7944383a4cfdaac9b18bd03fbb2b4f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40166848a7944383a4cfdaac9… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Sep 28 00:23:42 2017 +0200 fonts: Increase the Em size to fix a build failure with freetype 2.8.1. Freetype 2.8.1 implemented the stricter Em bounds from OpenType 1.8.2 which require a minimum Em size of 16. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- fonts/courier.sfd | 1015 +++++++++++++------------- fonts/courier.ttf | Bin 17884 -> 17892 bytes fonts/fixedsys.sfd | 519 ++++++------- fonts/fixedsys.ttf | Bin 10696 -> 10704 bytes fonts/ms_sans_serif.sfd | 1051 +++++++++++++------------- fonts/ms_sans_serif.ttf | Bin 38360 -> 38536 bytes fonts/small_fonts.sfd | 1825 +++++++++++++++++++++++----------------------- fonts/small_fonts.ttf | Bin 18796 -> 19068 bytes fonts/small_fonts_jp.sfd | 881 +++++++++++----------- fonts/small_fonts_jp.ttf | Bin 9820 -> 9828 bytes 10 files changed, 2648 insertions(+), 2643 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=40166848a7944383a4cfd…

1 0