November 2014 - Wine-commits

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

17 Nov '14

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

Stefan Dösinger : wined3d: Minimize device windows on focus loss.
by Alexandre Julliard 17 Nov '14

17 Nov '14

Module: wine Branch: master Commit: 45d530461bf29c953f5f4532cc0e917b4c4fc296 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45d530461bf29c953f5f4532c… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Nov 13 20:39:25 2014 +0100 wined3d: Minimize device windows on focus loss. --- dlls/wined3d/device.c | 5 +++++ dlls/wined3d/swapchain.c | 6 ++++++ dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 12 insertions(+) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index ee3636e..0de444b 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4983,6 +4983,11 @@ LRESULT device_process_message(struct wined3d_device *device, HWND window, BOOL } else if (message == WM_ACTIVATEAPP) { + UINT i; + + for (i = 0; i < device->swapchain_count; i++) + wined3d_swapchain_activate(device->swapchains[i], wparam); + device->device_parent->ops->activate(device->device_parent, wparam); } diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 25e2107..4c0948f 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -1175,3 +1175,9 @@ void swapchain_update_draw_bindings(struct wined3d_swapchain *swapchain) wined3d_resource_update_draw_binding(&swapchain->back_buffers[i]->resource); } } + +void wined3d_swapchain_activate(struct wined3d_swapchain *swapchain, BOOL activate) +{ + if (!activate && !(swapchain->device->create_parms.flags & WINED3DCREATE_NOWINDOWCHANGES)) + ShowWindow(swapchain->device_window, SW_MINIMIZE); +} diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 4210d26..cba20f4 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2702,6 +2702,7 @@ struct wined3d_swapchain void x11_copy_to_screen(const struct wined3d_swapchain *swapchain, const RECT *rect) DECLSPEC_HIDDEN; +void wined3d_swapchain_activate(struct wined3d_swapchain *swapchain, BOOL activate) DECLSPEC_HIDDEN; struct wined3d_context *swapchain_get_context(struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; void swapchain_destroy_contexts(struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; HDC swapchain_get_backup_dc(struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN;

1 0

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

17 Nov '14

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

Nikolay Sivov : dwrite: Reuse local file stream instances.
by Alexandre Julliard 17 Nov '14

17 Nov '14

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

Michael Stefaniuc : mscms/tests: Simplify the check for an empty string ( PVS-Studio).
by Alexandre Julliard 17 Nov '14

17 Nov '14

Module: wine Branch: master Commit: de092c6bd397aa9d9a72947b1d24d7a2393db62b URL: http://source.winehq.org/git/wine.git/?a=commit;h=de092c6bd397aa9d9a72947b1… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Nov 17 10:59:05 2014 +0100 mscms/tests: Simplify the check for an empty string (PVS-Studio). --- dlls/mscms/tests/profile.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mscms/tests/profile.c b/dlls/mscms/tests/profile.c index fd35193..012a7dc 100644 --- a/dlls/mscms/tests/profile.c +++ b/dlls/mscms/tests/profile.c @@ -1364,10 +1364,10 @@ START_TEST(profile) /* See if we can find the standard color profile */ ret = GetSystemDirectoryA( profilefile1, sizeof(profilefile1) ); ok( ret > 0, "GetSystemDirectoryA() returns %d, LastError = %d\n", ret, GetLastError()); - ok( lstrlenA(profilefile1) > 0 && lstrlenA(profilefile1) < MAX_PATH, + ok(profilefile1[0] && lstrlenA(profilefile1) < MAX_PATH, "Expected length between 0 and MAX_PATH, got %d\n", lstrlenA(profilefile1)); MultiByteToWideChar(CP_ACP, 0, profilefile1, -1, profilefile1W, MAX_PATH); - ok( lstrlenW(profilefile1W) > 0 && lstrlenW(profilefile1W) < MAX_PATH, + ok(profilefile1W[0] && lstrlenW(profilefile1W) < MAX_PATH, "Expected length between 0 and MAX_PATH, got %d\n", lstrlenW(profilefile1W)); lstrcpyA(profilefile2, profilefile1); lstrcpyW(profilefile2W, profilefile1W);

1 0

Michael Stefaniuc : advpack: Simplify the check for an empty string ( PVS-Studio).
by Alexandre Julliard 17 Nov '14

17 Nov '14

Module: wine Branch: master Commit: 88725cb27903ee3d947a0fa05b6544a8196d411d URL: http://source.winehq.org/git/wine.git/?a=commit;h=88725cb27903ee3d947a0fa05… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Nov 17 11:05:58 2014 +0100 advpack: Simplify the check for an empty string (PVS-Studio). --- dlls/advpack/files.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/advpack/files.c b/dlls/advpack/files.c index 1e555f7..c5efbb2 100644 --- a/dlls/advpack/files.c +++ b/dlls/advpack/files.c @@ -567,7 +567,7 @@ static LPSTR convert_file_list(LPCSTR FileList, DWORD *dwNumFiles) szConvertedList[dwLen - 1] = '\0'; /* empty list */ - if (!lstrlenA(szConvertedList)) + if (!szConvertedList[0]) { HeapFree(GetProcessHeap(), 0, szConvertedList); return NULL;

1 0

Michael Stefaniuc : mciseq: Simplify the check for an empty string.
by Alexandre Julliard 17 Nov '14

17 Nov '14

Module: wine Branch: master Commit: 560a78dd40fefc1c5b62dda1bf70b487e7a2373d URL: http://source.winehq.org/git/wine.git/?a=commit;h=560a78dd40fefc1c5b62dda1b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Nov 17 11:07:02 2014 +0100 mciseq: Simplify the check for an empty string. --- dlls/mciseq/mcimidi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mciseq/mcimidi.c b/dlls/mciseq/mcimidi.c index 4fcfb48..62b3192 100644 --- a/dlls/mciseq/mcimidi.c +++ b/dlls/mciseq/mcimidi.c @@ -683,7 +683,7 @@ static DWORD MIDI_mciOpen(WINE_MCIMIDI* wmm, DWORD dwFlags, LPMCI_OPEN_PARMSW lp if (dwFlags & MCI_OPEN_ELEMENT) { TRACE("MCI_OPEN_ELEMENT %s!\n", debugstr_w(lpParms->lpstrElementName)); - if (lpParms->lpstrElementName && strlenW(lpParms->lpstrElementName) > 0) { + if (lpParms->lpstrElementName && lpParms->lpstrElementName[0]) { wmm->hFile = mmioOpenW((LPWSTR)lpParms->lpstrElementName, NULL, MMIO_ALLOCBUF | MMIO_READ | MMIO_DENYWRITE); if (wmm->hFile == 0) {

1 0

Henri Verbeet : d3d9: Remove some incorrect constants from d3d9types.h.
by Alexandre Julliard 17 Nov '14

17 Nov '14

Module: wine Branch: master Commit: 82f70e25c1e476d35d60268df9cb0d22f6dc0e75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82f70e25c1e476d35d60268df… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 17 11:29:21 2014 +0100 d3d9: Remove some incorrect constants from d3d9types.h. D3DPRESENT_BACK_BUFFER_MAX doesn't exist at all and D3DPRESENT_BACK_BUFFERS_MAX is in d3d9.h. --- include/d3d9types.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/include/d3d9types.h b/include/d3d9types.h index 4cc1195..fd7c4ce 100644 --- a/include/d3d9types.h +++ b/include/d3d9types.h @@ -206,7 +206,6 @@ #define D3DPRESENTFLAG_NOAUTOROTATE 0x00000020 /* d3d9ex, ignore display rotation */ #define D3DPRESENTFLAG_UNPRUNEDMODE 0x00000040 /* d3d9ex, specify invalid display modes */ -#define D3DPRESENT_BACK_BUFFERS_MAX __MSABI_LONG(3) #define D3DPRESENT_RATE_DEFAULT 0x00000000 /**************************** @@ -643,8 +642,6 @@ typedef enum _D3DBACKBUFFER_TYPE { D3DBACKBUFFER_TYPE_FORCE_DWORD = 0x7fffffff } D3DBACKBUFFER_TYPE; -#define D3DPRESENT_BACK_BUFFER_MAX __MSABI_LONG(3) - typedef enum _D3DBASISTYPE { D3DBASIS_BEZIER = 0, D3DBASIS_BSPLINE = 1,

1 0

Alexandre Julliard : Wine release 1.7.31
by Alexandre Julliard 14 Nov '14

14 Nov '14

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

Jonas Maebe : wined3d: Add NVIDIA Geforce GT 750M to supported device list.
by Alexandre Julliard 14 Nov '14

14 Nov '14

Module: wine Branch: master Commit: 3a7bf90f6633ebd297ab427ea124b38cd5bbc9d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a7bf90f6633ebd297ab427ea… Author: Jonas Maebe <jonas.maebe(a)elis.ugent.be> Date: Thu Nov 13 22:47:32 2014 +0100 wined3d: Add NVIDIA Geforce GT 750M to supported device list. --- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 3 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 5327949..abb25a1 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1284,6 +1284,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX670, "NVIDIA GeForce GTX 670", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX670MX, "NVIDIA GeForce GTX 670MX", DRIVER_NVIDIA_GEFORCE8, 3072}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX680, "NVIDIA GeForce GTX 680", DRIVER_NVIDIA_GEFORCE8, 2048}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT750M, "NVIDIA GeForce GT 750M", DRIVER_NVIDIA_GEFORCE8, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX750, "NVIDIA GeForce GTX 750", DRIVER_NVIDIA_GEFORCE8, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX750TI, "NVIDIA GeForce GTX 750 Ti", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX760, "NVIDIA Geforce GTX 760", DRIVER_NVIDIA_GEFORCE8, 2048}, @@ -1727,6 +1728,7 @@ cards_nvidia_binary[] = {"GTX 760", CARD_NVIDIA_GEFORCE_GTX760}, /* Geforce 700 - midend high */ {"GTX 750 Ti", CARD_NVIDIA_GEFORCE_GTX750TI}, /* Geforce 700 - midend */ {"GTX 750", CARD_NVIDIA_GEFORCE_GTX750}, /* Geforce 700 - midend */ + {"GT 750M", CARD_NVIDIA_GEFORCE_GT750M}, /* Geforce 700 - midend mobile */ {"GTX 680", CARD_NVIDIA_GEFORCE_GTX680}, /* Geforce 600 - highend */ {"GTX 670MX", CARD_NVIDIA_GEFORCE_GTX670MX}, /* Geforce 600 - highend */ {"GTX 670", CARD_NVIDIA_GEFORCE_GTX670}, /* Geforce 600 - midend high */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 0f302c4..4210d26 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1514,6 +1514,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX670 = 0x1189, CARD_NVIDIA_GEFORCE_GTX670MX = 0x11a1, CARD_NVIDIA_GEFORCE_GTX680 = 0x1180, + CARD_NVIDIA_GEFORCE_GT750M = 0x0fe9, CARD_NVIDIA_GEFORCE_GTX750 = 0x1381, CARD_NVIDIA_GEFORCE_GTX750TI = 0x1380, CARD_NVIDIA_GEFORCE_GTX760 = 0x1187,

1 0