November 2014 - Wine-Commits

Nikolay Sivov : dwrite: Reuse local file stream instances.
by Alexandre Julliard Nov. 17, 2014

Nov. 17, 2014

Module: wine Branch: master Commit: 8b769332e25face5d80d7568c838269c795440f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b769332e25face5d80d7568c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 17 12:30:25 2014 +0300 dwrite: Reuse local file stream instances. --- dlls/dwrite/font.c | 84 +++++++++++++++++++++++++++++++++++++++++++----- dlls/dwrite/tests/font.c | 51 +++++++++++++++++++++++++++++ 2 files changed, 127 insertions(+), 8 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index a83baa7..a8d1efe 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -21,6 +21,7 @@ #define COBJMACROS +#include "wine/list.h" #include "dwrite_private.h" WINE_DEFAULT_DEBUG_CHANNEL(dwrite); @@ -1975,12 +1976,20 @@ HRESULT create_fontface(DWRITE_FONT_FACE_TYPE facetype, UINT32 files_number, IDW } /* IDWriteLocalFontFileLoader and its required IDWriteFontFileStream */ +struct local_cached_stream +{ + struct list entry; + IDWriteFontFileStream *stream; + void *key; + UINT32 key_size; +}; struct dwrite_localfontfilestream { IDWriteFontFileStream IDWriteFontFileStream_iface; LONG ref; + struct local_cached_stream *entry; HANDLE handle; }; @@ -1993,6 +2002,8 @@ struct local_refkey struct dwrite_localfontfileloader { IDWriteLocalFontFileLoader IDWriteLocalFontFileLoader_iface; LONG ref; + + struct list streams; }; static inline struct dwrite_localfontfileloader *impl_from_IDWriteLocalFontFileLoader(IDWriteLocalFontFileLoader *iface) @@ -2028,6 +2039,13 @@ static ULONG WINAPI localfontfilestream_AddRef(IDWriteFontFileStream *iface) return ref; } +static inline void release_cached_stream(struct local_cached_stream *stream) +{ + list_remove(&stream->entry); + heap_free(stream->key); + heap_free(stream); +} + static ULONG WINAPI localfontfilestream_Release(IDWriteFontFileStream *iface) { struct dwrite_localfontfilestream *This = impl_from_IDWriteFontFileStream(iface); @@ -2035,10 +2053,10 @@ static ULONG WINAPI localfontfilestream_Release(IDWriteFontFileStream *iface) TRACE("(%p)->(%d)\n", This, ref); - if (!ref) - { + if (!ref) { if (This->handle != INVALID_HANDLE_VALUE) CloseHandle(This->handle); + release_cached_stream(This->entry); heap_free(This); } @@ -2107,7 +2125,7 @@ static const IDWriteFontFileStreamVtbl localfontfilestreamvtbl = localfontfilestream_GetLastWriteTime }; -static HRESULT create_localfontfilestream(HANDLE handle, IDWriteFontFileStream** iface) +static HRESULT create_localfontfilestream(HANDLE handle, struct local_cached_stream *entry, IDWriteFontFileStream** iface) { struct dwrite_localfontfilestream *This = heap_alloc(sizeof(struct dwrite_localfontfilestream)); if (!This) @@ -2116,6 +2134,7 @@ static HRESULT create_localfontfilestream(HANDLE handle, IDWriteFontFileStream** This->ref = 1; This->handle = handle; This->IDWriteFontFileStream_iface.lpVtbl = &localfontfilestreamvtbl; + This->entry = entry; *iface = &This->IDWriteFontFileStream_iface; return S_OK; @@ -2153,28 +2172,76 @@ static ULONG WINAPI localfontfileloader_Release(IDWriteLocalFontFileLoader *ifac TRACE("(%p)->(%d)\n", This, ref); - if (!ref) + if (!ref) { + struct local_cached_stream *stream, *stream2; + + /* This will detach all entries from cache. Entries are released together with streams, + so stream controls its lifetime. */ + LIST_FOR_EACH_ENTRY_SAFE(stream, stream2, &This->streams, struct local_cached_stream, entry) + list_init(&stream->entry); + heap_free(This); + } return ref; } -static HRESULT WINAPI localfontfileloader_CreateStreamFromKey(IDWriteLocalFontFileLoader *iface, const void *key, UINT32 key_size, IDWriteFontFileStream **fontFileStream) +static HRESULT WINAPI localfontfileloader_CreateStreamFromKey(IDWriteLocalFontFileLoader *iface, const void *key, UINT32 key_size, IDWriteFontFileStream **ret) { struct dwrite_localfontfileloader *This = impl_from_IDWriteLocalFontFileLoader(iface); const struct local_refkey *refkey = key; + struct local_cached_stream *stream; + IDWriteFontFileStream *filestream; HANDLE handle; + HRESULT hr; - TRACE("(%p)->(%p, %i, %p)\n", This, key, key_size, fontFileStream); + TRACE("(%p)->(%p, %i, %p)\n", This, key, key_size, ret); TRACE("name: %s\n", debugstr_w(refkey->name)); + + /* search cache first */ + LIST_FOR_EACH_ENTRY(stream, &This->streams, struct local_cached_stream, entry) { + if (key_size == stream->key_size && !memcmp(stream->key, key, key_size)) { + *ret = stream->stream; + IDWriteFontFileStream_AddRef(*ret); + return S_OK; + } + } + + *ret = NULL; + handle = CreateFileW(refkey->name, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); if (handle == INVALID_HANDLE_VALUE) return E_FAIL; - return create_localfontfilestream(handle, fontFileStream); + stream = heap_alloc(sizeof(*stream)); + if (!stream) + return E_OUTOFMEMORY; + + stream->key = heap_alloc(key_size); + if (!stream->key) { + heap_free(stream); + return E_OUTOFMEMORY; + } + + stream->key_size = key_size; + memcpy(stream->key, key, key_size); + + hr = create_localfontfilestream(handle, stream, &filestream); + if (FAILED(hr)) { + heap_free(stream->key); + heap_free(stream); + return hr; + } + + stream->stream = filestream; + list_add_head(&This->streams, &stream->entry); + + *ret = stream->stream; + + return S_OK; } static HRESULT WINAPI localfontfileloader_GetFilePathLengthFromKey(IDWriteLocalFontFileLoader *iface, void const *key, UINT32 key_size, UINT32 *length) @@ -2229,8 +2296,9 @@ HRESULT create_localfontfileloader(IDWriteLocalFontFileLoader** iface) if (!This) return E_OUTOFMEMORY; - This->ref = 1; This->IDWriteLocalFontFileLoader_iface.lpVtbl = &localfontfileloadervtbl; + This->ref = 1; + list_init(&This->streams); *iface = &This->IDWriteLocalFontFileLoader_iface; return S_OK; diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 1fdb8d0..b8ff22d 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -2355,6 +2355,56 @@ if (0) { /* crashes on native */ IDWriteFactory_Release(factory); } +static void test_CreateStreamFromKey(void) +{ + IDWriteLocalFontFileLoader *localloader; + IDWriteFontFileStream *stream, *stream2; + IDWriteFontFileLoader *loader; + IDWriteFactory *factory; + IDWriteFontFile *file; + void *key; + UINT32 size; + HRESULT hr; + + factory = create_factory(); + + create_testfontfile(test_fontfile); + + hr = IDWriteFactory_CreateFontFileReference(factory, test_fontfile, NULL, &file); + ok(hr == S_OK, "got 0x%08x\n",hr); + + key = NULL; + size = 0; + hr = IDWriteFontFile_GetReferenceKey(file, (const void**)&key, &size); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(size != 0, "got %u\n", size); + + hr = IDWriteFontFile_GetLoader(file, &loader); + ok(hr == S_OK, "got 0x%08x\n", hr); + IDWriteFontFileLoader_QueryInterface(loader, &IID_IDWriteLocalFontFileLoader, (void**)&localloader); + IDWriteFontFileLoader_Release(loader); + + hr = IDWriteLocalFontFileLoader_CreateStreamFromKey(localloader, key, size, &stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + EXPECT_REF(stream, 1); + + hr = IDWriteLocalFontFileLoader_CreateStreamFromKey(localloader, key, size, &stream2); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(stream == stream2, "got %p, %p\n", stream, stream2); + EXPECT_REF(stream, 2); + IDWriteFontFileStream_Release(stream); + IDWriteFontFileStream_Release(stream2); + + hr = IDWriteLocalFontFileLoader_CreateStreamFromKey(localloader, key, size, &stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + EXPECT_REF(stream, 1); + IDWriteFontFileStream_Release(stream); + + IDWriteLocalFontFileLoader_Release(localloader); + IDWriteFactory_Release(factory); + DeleteFileW(test_fontfile); +} + START_TEST(font) { IDWriteFactory *factory; @@ -2386,6 +2436,7 @@ START_TEST(font) test_GetFaceNames(); test_TryGetFontTable(); test_ConvertFontToLOGFONT(); + test_CreateStreamFromKey(); IDWriteFactory_Release(factory); }

1 0

Nikolay Sivov : dwrite: Implement compatible reference key for local files and remaining loader methods.
by Alexandre Julliard Nov. 17, 2014

Nov. 17, 2014

Module: wine Branch: master Commit: 53fb0cc711eeaa7902dbe6992cc31b97252131eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=53fb0cc711eeaa7902dbe6992… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Nov 15 19:19:00 2014 +0300 dwrite: Implement compatible reference key for local files and remaining loader methods. --- dlls/dwrite/dwrite_private.h | 1 + dlls/dwrite/font.c | 71 ++++++++++++++++++++++++++++++++++++-------- dlls/dwrite/main.c | 16 ++++++++-- dlls/dwrite/tests/font.c | 39 ++++++++++++++++++++++-- 4 files changed, 110 insertions(+), 17 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index d1c42ce..3b1d283 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -108,6 +108,7 @@ extern HRESULT create_localfontfileloader(IDWriteLocalFontFileLoader** iface) DE extern HRESULT create_fontface(DWRITE_FONT_FACE_TYPE,UINT32,IDWriteFontFile* const*,UINT32,DWRITE_FONT_SIMULATIONS,IDWriteFontFace2**) DECLSPEC_HIDDEN; extern HRESULT create_font_collection(IDWriteFactory*,IDWriteFontFileEnumerator*,BOOL,IDWriteFontCollection**) DECLSPEC_HIDDEN; extern BOOL is_system_collection(IDWriteFontCollection*) DECLSPEC_HIDDEN; +extern HRESULT get_local_refkey(const WCHAR*,const FILETIME*,void**,UINT32*) DECLSPEC_HIDDEN; /* Opentype font table functions */ extern HRESULT opentype_analyze_font(IDWriteFontFileStream*,UINT32*,DWRITE_FONT_FILE_TYPE*,DWRITE_FONT_FACE_TYPE*,BOOL*) DECLSPEC_HIDDEN; diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 8bb39fa..a83baa7 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -1984,6 +1984,12 @@ struct dwrite_localfontfilestream HANDLE handle; }; +struct local_refkey +{ + FILETIME writetime; + WCHAR name[1]; +}; + struct dwrite_localfontfileloader { IDWriteLocalFontFileLoader IDWriteLocalFontFileLoader_iface; LONG ref; @@ -2153,16 +2159,16 @@ static ULONG WINAPI localfontfileloader_Release(IDWriteLocalFontFileLoader *ifac return ref; } -static HRESULT WINAPI localfontfileloader_CreateStreamFromKey(IDWriteLocalFontFileLoader *iface, const void *fontFileReferenceKey, UINT32 fontFileReferenceKeySize, IDWriteFontFileStream **fontFileStream) +static HRESULT WINAPI localfontfileloader_CreateStreamFromKey(IDWriteLocalFontFileLoader *iface, const void *key, UINT32 key_size, IDWriteFontFileStream **fontFileStream) { - HANDLE handle; struct dwrite_localfontfileloader *This = impl_from_IDWriteLocalFontFileLoader(iface); - const WCHAR *name = (const WCHAR*)fontFileReferenceKey; + const struct local_refkey *refkey = key; + HANDLE handle; - TRACE("(%p)->(%p, %i, %p)\n",This, fontFileReferenceKey, fontFileReferenceKeySize, fontFileStream); + TRACE("(%p)->(%p, %i, %p)\n", This, key, key_size, fontFileStream); - TRACE("name: %s\n",debugstr_w(name)); - handle = CreateFileW(name, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE, + TRACE("name: %s\n", debugstr_w(refkey->name)); + handle = CreateFileW(refkey->name, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); if (handle == INVALID_HANDLE_VALUE) @@ -2174,26 +2180,37 @@ static HRESULT WINAPI localfontfileloader_CreateStreamFromKey(IDWriteLocalFontFi static HRESULT WINAPI localfontfileloader_GetFilePathLengthFromKey(IDWriteLocalFontFileLoader *iface, void const *key, UINT32 key_size, UINT32 *length) { struct dwrite_localfontfileloader *This = impl_from_IDWriteLocalFontFileLoader(iface); - TRACE("(%p)->(%p, %i, %p)\n",This, key, key_size, length); - *length = key_size; + const struct local_refkey *refkey = key; + + TRACE("(%p)->(%p, %i, %p)\n", This, key, key_size, length); + + *length = strlenW(refkey->name); return S_OK; } static HRESULT WINAPI localfontfileloader_GetFilePathFromKey(IDWriteLocalFontFileLoader *iface, void const *key, UINT32 key_size, WCHAR *path, UINT32 length) { struct dwrite_localfontfileloader *This = impl_from_IDWriteLocalFontFileLoader(iface); - TRACE("(%p)->(%p, %i, %p, %i)\n",This, key, key_size, path, length); - if (length < key_size) + const struct local_refkey *refkey = key; + + TRACE("(%p)->(%p, %i, %p, %i)\n", This, key, key_size, path, length); + + if (length < strlenW(refkey->name)) return E_INVALIDARG; - lstrcpynW((WCHAR*)key, path, key_size); + + strcpyW(path, refkey->name); return S_OK; } static HRESULT WINAPI localfontfileloader_GetLastWriteTimeFromKey(IDWriteLocalFontFileLoader *iface, void const *key, UINT32 key_size, FILETIME *writetime) { struct dwrite_localfontfileloader *This = impl_from_IDWriteLocalFontFileLoader(iface); - FIXME("(%p)->(%p, %i, %p):stub\n",This, key, key_size, writetime); - return E_NOTIMPL; + const struct local_refkey *refkey = key; + + TRACE("(%p)->(%p, %i, %p)\n", This, key, key_size, writetime); + + *writetime = refkey->writetime; + return S_OK; } static const struct IDWriteLocalFontFileLoaderVtbl localfontfileloadervtbl = { @@ -2218,3 +2235,31 @@ HRESULT create_localfontfileloader(IDWriteLocalFontFileLoader** iface) *iface = &This->IDWriteLocalFontFileLoader_iface; return S_OK; } + +HRESULT get_local_refkey(const WCHAR *path, const FILETIME *writetime, void **key, UINT32 *size) +{ + struct local_refkey *refkey; + + *size = FIELD_OFFSET(struct local_refkey, name) + (strlenW(path)+1)*sizeof(WCHAR); + *key = NULL; + + refkey = heap_alloc(*size); + if (!refkey) + return E_OUTOFMEMORY; + + if (writetime) + refkey->writetime = *writetime; + else { + WIN32_FILE_ATTRIBUTE_DATA info; + + if (GetFileAttributesExW(path, GetFileExInfoStandard, &info)) + refkey->writetime = info.ftLastWriteTime; + else + memset(&refkey->writetime, 0, sizeof(refkey->writetime)); + } + strcpyW(refkey->name, path); + + *key = refkey; + + return S_OK; +} diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index 2868c3b..1292086 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -686,8 +686,11 @@ static HRESULT WINAPI dwritefactory_UnregisterFontCollectionLoader(IDWriteFactor static HRESULT WINAPI dwritefactory_CreateFontFileReference(IDWriteFactory *iface, WCHAR const *path, FILETIME const *writetime, IDWriteFontFile **font_file) { - HRESULT hr; struct dwritefactory *This = impl_from_IDWriteFactory(iface); + UINT32 key_size; + HRESULT hr; + void *key; + TRACE("(%p)->(%s %p %p)\n", This, debugstr_w(path), writetime, font_file); if (!This->localfontfileloader) @@ -696,7 +699,16 @@ static HRESULT WINAPI dwritefactory_CreateFontFileReference(IDWriteFactory *ifac if (FAILED(hr)) return hr; } - return create_font_file((IDWriteFontFileLoader*)This->localfontfileloader, path, sizeof(WCHAR) * (strlenW(path)+1), font_file); + + /* get a reference key used by local loader */ + hr = get_local_refkey(path, writetime, &key, &key_size); + if (FAILED(hr)) + return hr; + + hr = create_font_file((IDWriteFontFileLoader*)This->localfontfileloader, key, key_size, font_file); + heap_free(key); + + return hr; } static HRESULT WINAPI dwritefactory_CreateCustomFontFileReference(IDWriteFactory *iface, diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 60d0d44..1fdb8d0 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -2218,15 +2218,26 @@ static void test_GetFaceNames(void) IDWriteFactory_Release(factory); } +struct local_refkey +{ + FILETIME writetime; + WCHAR name[1]; +}; + static void test_TryGetFontTable(void) { + IDWriteLocalFontFileLoader *localloader; + WIN32_FILE_ATTRIBUTE_DATA info; + const struct local_refkey *key; + IDWriteFontFileLoader *loader; const void *table, *table2; IDWriteFontFace *fontface; void *context, *context2; IDWriteFactory *factory; IDWriteFontFile *file; - BOOL exists; - UINT32 size; + WCHAR buffW[MAX_PATH]; + BOOL exists, ret; + UINT32 size, len; HRESULT hr; create_testfontfile(test_fontfile); @@ -2236,6 +2247,30 @@ static void test_TryGetFontTable(void) hr = IDWriteFactory_CreateFontFileReference(factory, test_fontfile, NULL, &file); ok(hr == S_OK, "got 0x%08x\n",hr); + key = NULL; + size = 0; + hr = IDWriteFontFile_GetReferenceKey(file, (const void**)&key, &size); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(size != 0, "got %u\n", size); + + ret = GetFileAttributesExW(test_fontfile, GetFileExInfoStandard, &info); + ok(ret, "got %d\n", ret); + ok(!memcmp(&info.ftLastWriteTime, &key->writetime, sizeof(key->writetime)), "got wrong write time\n"); + + hr = IDWriteFontFile_GetLoader(file, &loader); + ok(hr == S_OK, "got 0x%08x\n", hr); + IDWriteFontFileLoader_QueryInterface(loader, &IID_IDWriteLocalFontFileLoader, (void**)&localloader); + IDWriteFontFileLoader_Release(loader); + + hr = IDWriteLocalFontFileLoader_GetFilePathLengthFromKey(localloader, key, size, &len); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(lstrlenW(key->name) == len, "path length %d\n", len); + + hr = IDWriteLocalFontFileLoader_GetFilePathFromKey(localloader, key, size, buffW, sizeof(buffW)/sizeof(WCHAR)); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(buffW, key->name), "got %s, expected %s\n", wine_dbgstr_w(buffW), wine_dbgstr_w(key->name)); + IDWriteLocalFontFileLoader_Release(localloader); + hr = IDWriteFactory_CreateFontFace(factory, DWRITE_FONT_FACE_TYPE_TRUETYPE, 1, &file, 0, 0, &fontface); ok(hr == S_OK, "got 0x%08x\n",hr);

1 0

Austin English : cryptext.dll: Add a stub dll.
by Alexandre Julliard Nov. 17, 2014

Nov. 17, 2014

Module: wine Branch: master Commit: a4f941286893e5cf86c6d691a81a564afbe33707 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4f941286893e5cf86c6d691a… Author: Austin English <austinenglish(a)gmail.com> Date: Sun Nov 16 21:31:52 2014 -0800 cryptext.dll: Add a stub dll. --- configure | 2 ++ configure.ac | 1 + dlls/cryptext/Makefile.in | 4 ++++ dlls/cryptext/cryptext.spec | 30 +++++++++++++++++++++++++++++ dlls/cryptext/cryptext_main.c | 45 +++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 82 insertions(+) diff --git a/configure b/configure index de03151..d09438e 100755 --- a/configure +++ b/configure @@ -932,6 +932,7 @@ enable_crtdll enable_crypt32 enable_cryptdlg enable_cryptdll +enable_cryptext enable_cryptnet enable_cryptui enable_ctapi32 @@ -16861,6 +16862,7 @@ wine_fn_config_dll crypt32 enable_crypt32 implib,po wine_fn_config_test dlls/crypt32/tests crypt32_test wine_fn_config_dll cryptdlg enable_cryptdlg po wine_fn_config_dll cryptdll enable_cryptdll implib +wine_fn_config_dll cryptext enable_cryptext wine_fn_config_dll cryptnet enable_cryptnet implib wine_fn_config_test dlls/cryptnet/tests cryptnet_test wine_fn_config_dll cryptui enable_cryptui implib,po diff --git a/configure.ac b/configure.ac index 4ee8133..04bcbd8 100644 --- a/configure.ac +++ b/configure.ac @@ -2741,6 +2741,7 @@ WINE_CONFIG_DLL(crypt32,,[implib,po]) WINE_CONFIG_TEST(dlls/crypt32/tests) WINE_CONFIG_DLL(cryptdlg,,[po]) WINE_CONFIG_DLL(cryptdll,,[implib]) +WINE_CONFIG_DLL(cryptext) WINE_CONFIG_DLL(cryptnet,,[implib]) WINE_CONFIG_TEST(dlls/cryptnet/tests) WINE_CONFIG_DLL(cryptui,,[implib,po]) diff --git a/dlls/cryptext/Makefile.in b/dlls/cryptext/Makefile.in new file mode 100644 index 0000000..e1a46ba --- /dev/null +++ b/dlls/cryptext/Makefile.in @@ -0,0 +1,4 @@ +MODULE = cryptext.dll + +C_SRCS = \ + cryptext_main.c diff --git a/dlls/cryptext/cryptext.spec b/dlls/cryptext/cryptext.spec new file mode 100644 index 0000000..b0e920e --- /dev/null +++ b/dlls/cryptext/cryptext.spec @@ -0,0 +1,30 @@ +@ stub CryptExtAddCER +@ stub CryptExtAddCERW +@ stub CryptExtAddCRL +@ stub CryptExtAddCRLW +@ stub CryptExtAddCTL +@ stub CryptExtAddCTLW +@ stub CryptExtAddP7R +@ stub CryptExtAddP7RW +@ stub CryptExtAddPFX +@ stub CryptExtAddPFXW +@ stub CryptExtAddSPC +@ stub CryptExtAddSPCW +@ stub CryptExtOpenCAT +@ stub CryptExtOpenCATW +@ stub CryptExtOpenCER +@ stub CryptExtOpenCERW +@ stub CryptExtOpenCRL +@ stub CryptExtOpenCRLW +@ stub CryptExtOpenCTL +@ stub CryptExtOpenCTLW +@ stub CryptExtOpenP7R +@ stub CryptExtOpenP7RW +@ stub CryptExtOpenPKCS7 +@ stub CryptExtOpenPKCS7W +@ stub CryptExtOpenSTR +@ stub CryptExtOpenSTRW +@ stub DllCanUnloadNow +@ stub DllGetClassObject +@ stub DllRegisterServer +@ stub DllUnregisterServer diff --git a/dlls/cryptext/cryptext_main.c b/dlls/cryptext/cryptext_main.c new file mode 100644 index 0000000..75ede4e --- /dev/null +++ b/dlls/cryptext/cryptext_main.c @@ -0,0 +1,45 @@ +/* + * Crypto Shell Extensions + * + * Copyright 2014 Austin English + * + * 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 + */ + +#include "config.h" + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(cryptext); + +BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) +{ + TRACE("(%p, %u, %p)\n", instance, reason, reserved); + + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(instance); + break; + } + + return TRUE; +}

1 0

Sebastian Lackner : shlwapi: Fix invalid usage of CompareString in StrStr functions.
by Alexandre Julliard Nov. 17, 2014

Nov. 17, 2014

Module: wine Branch: master Commit: 5aec09e4d1c92e099edff03ac786895b3896e233 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5aec09e4d1c92e099edff03ac… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Nov 17 09:11:08 2014 +0100 shlwapi: Fix invalid usage of CompareString in StrStr functions. --- dlls/shlwapi/string.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/shlwapi/string.c b/dlls/shlwapi/string.c index b4b5b8a..eaaaf3b 100644 --- a/dlls/shlwapi/string.c +++ b/dlls/shlwapi/string.c @@ -364,7 +364,7 @@ int WINAPI StrCmpIW(LPCWSTR lpszStr, LPCWSTR lpszComp) * PARAMS * lpszStr [I] First string to compare * lpszComp [I] Second string to compare - * iLen [I] Maximum number of chars to compare. + * iLen [I] Number of chars to compare * * RETURNS * An integer less than, equal to or greater than 0, indicating that @@ -395,7 +395,7 @@ INT WINAPI StrCmpNW(LPCWSTR lpszStr, LPCWSTR lpszComp, INT iLen) * PARAMS * lpszStr [I] First string to compare * lpszComp [I] Second string to compare - * iLen [I] Maximum number of chars to compare. + * iLen [I] Number of chars to compare * * RETURNS * An integer less than, equal to or greater than 0, indicating that @@ -521,13 +521,15 @@ static LPSTR SHLWAPI_StrStrHelperA(LPCSTR lpszStr, LPCSTR lpszSearch, INT (WINAPI *pStrCmpFn)(LPCSTR,LPCSTR,INT)) { size_t iLen; + LPCSTR end; if (!lpszStr || !lpszSearch || !*lpszSearch) return NULL; iLen = strlen(lpszSearch); + end = lpszStr + strlen(lpszStr); - while (*lpszStr) + while (lpszStr + iLen <= end) { if (!pStrCmpFn(lpszStr, lpszSearch, iLen)) return (LPSTR)lpszStr; @@ -670,6 +672,7 @@ LPSTR WINAPI StrStrIA(LPCSTR lpszStr, LPCSTR lpszSearch) LPWSTR WINAPI StrStrIW(LPCWSTR lpszStr, LPCWSTR lpszSearch) { int iLen; + LPCWSTR end; TRACE("(%s,%s)\n", debugstr_w(lpszStr), debugstr_w(lpszSearch)); @@ -677,8 +680,9 @@ LPWSTR WINAPI StrStrIW(LPCWSTR lpszStr, LPCWSTR lpszSearch) return NULL; iLen = strlenW(lpszSearch); + end = lpszStr + strlenW(lpszStr); - while (*lpszStr) + while (lpszStr + iLen <= end) { if (!StrCmpNIW(lpszStr, lpszSearch, iLen)) return (LPWSTR)lpszStr;

1 0

Sebastian Lackner : comctl32: Fix invalid usage of CompareString in StrStr functions.
by Alexandre Julliard Nov. 17, 2014

Nov. 17, 2014

Module: wine Branch: master Commit: 766f587f90f1192cd82ba92a90aed73c0a225988 URL: http://source.winehq.org/git/wine.git/?a=commit;h=766f587f90f1192cd82ba92a9… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Nov 17 09:10:39 2014 +0100 comctl32: Fix invalid usage of CompareString in StrStr functions. --- dlls/comctl32/string.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/string.c b/dlls/comctl32/string.c index 4c52f18..8d41508 100644 --- a/dlls/comctl32/string.c +++ b/dlls/comctl32/string.c @@ -291,7 +291,7 @@ LPSTR WINAPI StrChrA(LPCSTR lpszStr, WORD ch) * PARAMS * lpszStr [I] First string to compare * lpszComp [I] Second string to compare - * iLen [I] Maximum number of chars to compare. + * iLen [I] Number of chars to compare * * RETURNS * An integer less than, equal to or greater than 0, indicating that @@ -323,13 +323,15 @@ static LPSTR COMCTL32_StrStrHelperA(LPCSTR lpszStr, LPCSTR lpszSearch, INT (WINAPI *pStrCmpFn)(LPCSTR,LPCSTR,INT)) { size_t iLen; + LPCSTR end; if (!lpszStr || !lpszSearch || !*lpszSearch) return NULL; iLen = strlen(lpszSearch); + end = lpszStr + strlen(lpszStr); - while (*lpszStr) + while (lpszStr + iLen <= end) { if (!pStrCmpFn(lpszStr, lpszSearch, iLen)) return (LPSTR)lpszStr; @@ -382,6 +384,7 @@ INT WINAPI StrToIntA (LPCSTR lpszStr) LPWSTR WINAPI StrStrIW(LPCWSTR lpszStr, LPCWSTR lpszSearch) { int iLen; + LPCWSTR end; TRACE("(%s,%s)\n", debugstr_w(lpszStr), debugstr_w(lpszSearch)); @@ -389,8 +392,9 @@ LPWSTR WINAPI StrStrIW(LPCWSTR lpszStr, LPCWSTR lpszSearch) return NULL; iLen = strlenW(lpszSearch); + end = lpszStr + strlenW(lpszStr); - while (*lpszStr) + while (lpszStr + iLen <= end) { if (!StrCmpNIW(lpszStr, lpszSearch, iLen)) return (LPWSTR)lpszStr; @@ -480,7 +484,7 @@ LPWSTR WINAPI StrChrW(LPCWSTR lpszStr, WCHAR ch) * PARAMS * lpszStr [I] First string to compare * lpszComp [I] Second string to compare - * iLen [I] Maximum number of chars to compare. + * iLen [I] Number of chars to compare * * RETURNS * An integer less than, equal to or greater than 0, indicating that

1 0

Guillaume Charifi : riched20: Do not destroy IRichEditOle if still referenced.
by Alexandre Julliard Nov. 17, 2014

Nov. 17, 2014

Module: wine Branch: master Commit: 27ac8d265ed12c4c6da36565316ee13bf9bf9b06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27ac8d265ed12c4c6da365653… Author: Guillaume Charifi <guillaume.charifi(a)sfr.fr> Date: Sun Nov 16 22:02:24 2014 +0100 riched20: Do not destroy IRichEditOle if still referenced. --- dlls/riched20/editor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 8fdaa53..ca316d2 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2889,7 +2889,7 @@ void ME_DestroyEditor(ME_TextEditor *editor) ITextHost_Release(editor->texthost); if (editor->reOle) { - DestroyIRichEditOle(editor->reOle); + IRichEditOle_Release(editor->reOle); editor->reOle = NULL; } OleUninitialize();

1 0

Yifu Wang : msvcp120: Added std::ios_base::operator bool() implementation.
by Alexandre Julliard Nov. 17, 2014

Nov. 17, 2014

Module: wine Branch: master Commit: d732cadf4ddfd9c40ecd3aa3f32d321be03fbad0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d732cadf4ddfd9c40ecd3aa3f… Author: Yifu Wang <ywang(a)esri.com> Date: Fri Nov 14 13:11:40 2014 -0800 msvcp120: Added std::ios_base::operator bool() implementation. --- dlls/msvcp120/msvcp120.spec | 6 +++--- dlls/msvcp90/ios.c | 10 ++++++++++ 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec index 0c346ca..8ebdc80 100644 --- a/dlls/msvcp120/msvcp120.spec +++ b/dlls/msvcp120/msvcp120.spec @@ -913,9 +913,9 @@ @ cdecl -arch=arm ??Bid(a)locale@std@@QAAIXZ(ptr) locale_id_operator_size_t @ thiscall -arch=i386 ??Bid(a)locale@std@@QAEIXZ(ptr) locale_id_operator_size_t @ cdecl -arch=win64 ??Bid(a)locale@std@@QEAA_KXZ(ptr) locale_id_operator_size_t -@ stub -arch=arm ??Bios_base(a)std@@QBA_NXZ -@ stub -arch=win32 ??Bios_base(a)std@@QBE_NXZ -@ stub -arch=win64 ??Bios_base(a)std@@QEBA_NXZ +@ cdecl -arch=arm ??Bios_base(a)std@@QBA_NXZ(ptr) ios_base_operator_bool +@ thiscall -arch=i386 ??Bios_base(a)std@@QBE_NXZ(ptr) ios_base_operator_bool +@ cdecl -arch=win64 ??Bios_base(a)std@@QEBA_NXZ(ptr) ios_base_operator_bool @ extern ??_7?$basic_ios(a)DU?$char_traits(a)D@std@@@std@@6B@ MSVCP_basic_ios_char_vtable @ extern ??_7?$basic_ios(a)GU?$char_traits(a)G@std@@@std@@6B@ MSVCP_basic_ios_short_vtable @ extern ??_7?$basic_ios(a)_WU?$char_traits(a)_W@std@@@std@@6B@ MSVCP_basic_ios_wchar_vtable diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index b758887..80aebec 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -5042,6 +5042,16 @@ void* __thiscall ios_base_op_fail(const ios_base *this) return ios_base_fail(this) ? NULL : (void*)this; } +/* ??Bios_base(a)std@@QBA_NXZ */ +/* ??Bios_base(a)std@@QBE_NXZ */ +/* ??Bios_base(a)std@@QEBA_NXZ */ +DEFINE_THISCALL_WRAPPER(ios_base_operator_bool, 4) +MSVCP_bool __thiscall ios_base_operator_bool(const ios_base *this) +{ + TRACE("(%p)\n", this); + return (this->state & (IOSTATE_failbit|IOSTATE_badbit)) == 0; +} + /* ?_Addstd(a)ios_base@std@@SAXPAV12@@Z */ /* ?_Addstd(a)ios_base@std@@SAXPEAV12@@Z */ void CDECL ios_base_Addstd(ios_base *add)

1 0

Francois Gouget : ddraw/tests: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard Nov. 17, 2014

Nov. 17, 2014

Module: wine Branch: master Commit: 9006a013b0f0346c892dca62009a755dac985668 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9006a013b0f0346c892dca620… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Nov 15 13:41:47 2014 +0100 ddraw/tests: Fix compilation on systems that don't support nameless unions. --- dlls/ddraw/tests/ddraw4.c | 2 +- dlls/ddraw/tests/ddraw7.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index ab03f39..f9b94a4 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -2497,7 +2497,7 @@ static HRESULT CALLBACK test_coop_level_mode_set_enum_cb(DDSURFACEDESC2 *surface { struct test_coop_level_mode_set_enum_param *param = context; - if (U1(U4(surface_desc)->ddpfPixelFormat).dwRGBBitCount != registry_mode.dmBitsPerPel) + if (U1(U4(*surface_desc).ddpfPixelFormat).dwRGBBitCount != registry_mode.dmBitsPerPel) return DDENUMRET_OK; if (surface_desc->dwWidth == registry_mode.dmPelsWidth && surface_desc->dwHeight == registry_mode.dmPelsHeight) diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index f505c65..9da588a 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -2174,7 +2174,7 @@ static HRESULT CALLBACK test_coop_level_mode_set_enum_cb(DDSURFACEDESC2 *surface { struct test_coop_level_mode_set_enum_param *param = context; - if (U1(U4(surface_desc)->ddpfPixelFormat).dwRGBBitCount != registry_mode.dmBitsPerPel) + if (U1(U4(*surface_desc).ddpfPixelFormat).dwRGBBitCount != registry_mode.dmBitsPerPel) return DDENUMRET_OK; if (surface_desc->dwWidth == registry_mode.dmPelsWidth && surface_desc->dwHeight == registry_mode.dmPelsHeight)

1 0

Alexandre Julliard : Wine release 1.7.31
by Alexandre Julliard Nov. 14, 2014

Nov. 14, 2014

Module: website Branch: master Commit: 91b123effad8a05d80b7d75ff95aad78d066c8c8 URL: http://source.winehq.org/git/website.git/?a=commit;h=91b123effad8a05d80b7d7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 14 22:30:28 2014 +0900 Wine release 1.7.31 --- news/en/2014111401.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/en/2014111401.xml b/news/en/2014111401.xml new file mode 100644 index 0000000..e9ec56c --- /dev/null +++ b/news/en/2014111401.xml @@ -0,0 +1,16 @@ +<news> +<date>November 14, 2014</date> +<title>Wine 1.7.31 Released</title> +<body> + The Wine development release 1.7.31 is now available. + <a href="{$root}/announce/1.7.31">What's new</a> in this release: +<ul> + <li>New version of the Gecko engine based on Firefox 34.</li> + <li>Support for the Visual Studio 2013 version of the C/C++ runtimes.</li> + <li>More font metrics support in DirectWrite.</li> + <li>Some more Direct2D work.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.31.tar.bz2">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

Tag wine-1.7.31 : Alexandre Julliard : Release 1.7.31
by Alexandre Julliard Nov. 14, 2014

Nov. 14, 2014

Module: wine Branch: refs/tags/wine-1.7.31 Tag: ae79056d827a4f92e4c47d2a89d861624b61424b URL: http://source.winehq.org/git/wine.git/?a=tag;h=ae79056d827a4f92e4c47d2a89d8… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 14 22:28:17 2014 +0900 Release 1.7.31

1 0