November 2014 - Wine-Commits

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

Nov. 17, 2014

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 : mscms/tests: Simplify the check for an empty string ( PVS-Studio).
by Alexandre Julliard Nov. 17, 2014

Nov. 17, 2014

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

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

Nov. 17, 2014

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

Sebastian Lackner : server: Close fd if there is no space in thread inflight fd list.
by Alexandre Julliard Nov. 17, 2014

Nov. 17, 2014

Module: wine Branch: master Commit: 749e2aa36fb8fb5c252905f58680b3f854d8be46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=749e2aa36fb8fb5c252905f58… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sat Nov 15 01:04:29 2014 +0100 server: Close fd if there is no space in thread inflight fd list. --- server/thread.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/server/thread.c b/server/thread.c index 50d6940..97860ee 100644 --- a/server/thread.c +++ b/server/thread.c @@ -1047,6 +1047,8 @@ int thread_add_inflight_fd( struct thread *thread, int client, int server ) thread->inflight[i].server = server; return i; } + + close( server ); return -1; }

1 0

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

Nov. 17, 2014

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

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

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

Nov. 14, 2014

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

Alexandre Julliard : Release 1.7.31.
by Alexandre Julliard Nov. 14, 2014

Nov. 14, 2014

Module: wine Branch: master Commit: 6d6dd3c42b96bb813d5366b97fbff80441e75918 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d6dd3c42b96bb813d5366b97… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 14 22:28:17 2014 +0900 Release 1.7.31. --- ANNOUNCE | 567 +++++++++++++++++++++++++++++++++----------------------------- AUTHORS | 2 + VERSION | 2 +- configure | 18 +- 4 files changed, 318 insertions(+), 271 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6d6dd3c42b96bb813d536…

1 0

Michael Stefaniuc : fusion/tests: Simplify the check for an empty string ( PVS-Studio).
by Alexandre Julliard Nov. 14, 2014

Nov. 14, 2014

Module: wine Branch: master Commit: 159192cdb477eec88e8fffab09ffe06d1dcdda18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=159192cdb477eec88e8fffab0… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Nov 14 11:05:00 2014 +0100 fusion/tests: Simplify the check for an empty string (PVS-Studio). --- dlls/fusion/tests/asmname.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/fusion/tests/asmname.c b/dlls/fusion/tests/asmname.c index ac5b27b..a075288 100644 --- a/dlls/fusion/tests/asmname.c +++ b/dlls/fusion/tests/asmname.c @@ -425,7 +425,7 @@ static void test_CreateAssemblyNameObject(void) str[0] = '\0'; hr = IAssemblyName_GetName(name, &size, str); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - ok(lstrlenW(str) == 0, "Expected empty name\n"); + ok(!str[0], "Expected empty name\n"); ok(size == 0, "Expected 0, got %d\n", size); hi = 0xbeefcace; @@ -461,7 +461,7 @@ static void test_CreateAssemblyNameObject(void) str[0] = '\0'; hr = IAssemblyName_GetName(name, &size, str); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - ok(lstrlenW(str) == 0, "Expected empty name\n"); + ok(!str[0], "Expected empty name\n"); ok(size == 1, "Expected 1, got %d\n", size); hi = 0xbeefcace;

1 0

Michael Stefaniuc : appwiz.cpl: Simplify the check for an empty string ( PVS-Studio).
by Alexandre Julliard Nov. 14, 2014

Nov. 14, 2014

Module: wine Branch: master Commit: bbff30f30e44fafbad4ebbac62d1d420c4fde8dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbff30f30e44fafbad4ebbac6… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Nov 14 10:51:38 2014 +0100 appwiz.cpl: Simplify the check for an empty string (PVS-Studio). --- dlls/appwiz.cpl/appwiz.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/appwiz.cpl/appwiz.c b/dlls/appwiz.cpl/appwiz.c index cd76f51..9d53e79 100644 --- a/dlls/appwiz.cpl/appwiz.c +++ b/dlls/appwiz.cpl/appwiz.c @@ -567,7 +567,7 @@ static void SetInfoDialogText(HKEY hKey, LPCWSTR lpKeyName, LPCWSTR lpAltMessage /* if hKey is null, lpKeyName contains the string we want to check */ if (hKey == NULL) { - if ((lpKeyName) && (lstrlenW(lpKeyName) > 0)) + if (lpKeyName && lpKeyName[0]) SetWindowTextW(hWndDlgItem, lpKeyName); else SetWindowTextW(hWndDlgItem, lpAltMessage); @@ -577,7 +577,7 @@ static void SetInfoDialogText(HKEY hKey, LPCWSTR lpKeyName, LPCWSTR lpAltMessage buflen = MAX_STRING_LEN; if ((RegQueryValueExW(hKey, lpKeyName, 0, 0, (LPBYTE) buf, &buflen) == - ERROR_SUCCESS) && (lstrlenW(buf) > 0)) + ERROR_SUCCESS) && buf[0]) SetWindowTextW(hWndDlgItem, buf); else SetWindowTextW(hWndDlgItem, lpAltMessage);

1 0

Sebastian Lackner : psapi/tests: Add tests for GetPerformanceInfo function.
by Alexandre Julliard Nov. 14, 2014

Nov. 14, 2014

Module: wine Branch: master Commit: 4297046d013c9e941221d850728fefd285108181 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4297046d013c9e941221d8507… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Nov 14 06:47:13 2014 +0100 psapi/tests: Add tests for GetPerformanceInfo function. --- dlls/psapi/tests/psapi_main.c | 137 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 136 insertions(+), 1 deletion(-) diff --git a/dlls/psapi/tests/psapi_main.c b/dlls/psapi/tests/psapi_main.c index 62d4f5c..7220da9 100644 --- a/dlls/psapi/tests/psapi_main.c +++ b/dlls/psapi/tests/psapi_main.c @@ -53,14 +53,16 @@ static DWORD (WINAPI *pGetModuleFileNameExW)(HANDLE, HMODULE, LPWSTR, DWORD); static BOOL (WINAPI *pGetModuleInformation)(HANDLE, HMODULE, LPMODULEINFO, DWORD); static DWORD (WINAPI *pGetMappedFileNameA)(HANDLE, LPVOID, LPSTR, DWORD); static DWORD (WINAPI *pGetMappedFileNameW)(HANDLE, LPVOID, LPWSTR, DWORD); +static BOOL (WINAPI *pGetPerformanceInfo)(PPERFORMANCE_INFORMATION, DWORD); static DWORD (WINAPI *pGetProcessImageFileNameA)(HANDLE, LPSTR, DWORD); static DWORD (WINAPI *pGetProcessImageFileNameW)(HANDLE, LPWSTR, DWORD); static BOOL (WINAPI *pGetProcessMemoryInfo)(HANDLE, PPROCESS_MEMORY_COUNTERS, DWORD); static BOOL (WINAPI *pGetWsChanges)(HANDLE, PPSAPI_WS_WATCH_INFORMATION, DWORD); static BOOL (WINAPI *pInitializeProcessForWsWatch)(HANDLE); static BOOL (WINAPI *pQueryWorkingSet)(HANDLE, PVOID, DWORD); +static NTSTATUS (WINAPI *pNtQuerySystemInformation)(SYSTEM_INFORMATION_CLASS, PVOID, ULONG, PULONG); static NTSTATUS (WINAPI *pNtQueryVirtualMemory)(HANDLE, LPCVOID, ULONG, PVOID, SIZE_T, SIZE_T *); - + static BOOL InitFunctionPtrs(HMODULE hpsapi) { PSAPI_GET_PROC(EmptyWorkingSet); @@ -77,10 +79,13 @@ static BOOL InitFunctionPtrs(HMODULE hpsapi) PSAPI_GET_PROC(InitializeProcessForWsWatch); PSAPI_GET_PROC(QueryWorkingSet); /* GetProcessImageFileName is not exported on NT4 */ + pGetPerformanceInfo = + (void *)GetProcAddress(hpsapi, "GetPerformanceInfo"); pGetProcessImageFileNameA = (void *)GetProcAddress(hpsapi, "GetProcessImageFileNameA"); pGetProcessImageFileNameW = (void *)GetProcAddress(hpsapi, "GetProcessImageFileNameW"); + pNtQuerySystemInformation = (void *)GetProcAddress(GetModuleHandleA("ntdll.dll"), "NtQuerySystemInformation"); pNtQueryVirtualMemory = (void *)GetProcAddress(GetModuleHandleA("ntdll.dll"), "NtQueryVirtualMemory"); return TRUE; } @@ -184,6 +189,135 @@ static void test_GetModuleInformation(void) ok(info.lpBaseOfDll == hMod, "lpBaseOfDll=%p hMod=%p\n", info.lpBaseOfDll, hMod); } +static void test_GetPerformanceInfo(void) +{ + PERFORMANCE_INFORMATION info; + NTSTATUS status; + DWORD size; + BOOL ret; + + SetLastError(0xdeadbeef); + ret = pGetPerformanceInfo(&info, sizeof(info)-1); + ok(!ret, "GetPerformanceInfo unexpectedly succeeded\n"); + ok(GetLastError() == ERROR_BAD_LENGTH, "expected error=ERROR_BAD_LENGTH but got %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = pGetPerformanceInfo(&info, sizeof(info)); + todo_wine + ok(ret, "GetPerformanceInfo failed with %d\n", GetLastError()); + todo_wine + ok(info.cb == sizeof(PERFORMANCE_INFORMATION), "got %d\n", info.cb); + + if (!pNtQuerySystemInformation) + win_skip("NtQuerySystemInformation not found, skipping tests\n"); + else + { + char performance_buffer[sizeof(SYSTEM_PERFORMANCE_INFORMATION) + 16]; /* larger on w2k8/win7 */ + SYSTEM_PERFORMANCE_INFORMATION *sys_performance_info = (SYSTEM_PERFORMANCE_INFORMATION *)performance_buffer; + SYSTEM_PROCESS_INFORMATION *sys_process_info = NULL, *spi; + SYSTEM_BASIC_INFORMATION sys_basic_info; + DWORD process_count, handle_count, thread_count; + + /* compare with values from SYSTEM_PERFORMANCE_INFORMATION */ + size = 0; + status = pNtQuerySystemInformation(SystemPerformanceInformation, sys_performance_info, sizeof(performance_buffer), &size); + ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %08x\n", status); + ok(size >= sizeof(SYSTEM_PERFORMANCE_INFORMATION), "incorrect length %d\n", size); + + todo_wine + ok(info.CommitTotal == sys_performance_info->TotalCommittedPages, + "expected info.CommitTotal=%u but got %u\n", + sys_performance_info->TotalCommittedPages, (ULONG)info.CommitTotal); + + todo_wine + ok(info.CommitLimit == sys_performance_info->TotalCommitLimit, + "expected info.CommitLimit=%u but got %u\n", + sys_performance_info->TotalCommitLimit, (ULONG)info.CommitLimit); + + todo_wine + ok(info.CommitPeak == sys_performance_info->PeakCommitment, + "expected info.CommitPeak=%u but got %u\n", + sys_performance_info->PeakCommitment, (ULONG)info.CommitPeak); + + todo_wine + ok(info.PhysicalAvailable >= max(sys_performance_info->AvailablePages, 25) - 25 && + info.PhysicalAvailable <= sys_performance_info->AvailablePages + 25, + "expected approximately info.PhysicalAvailable=%u but got %u\n", + sys_performance_info->AvailablePages, (ULONG)info.PhysicalAvailable); + + /* TODO: info.SystemCache not checked yet - to which field(s) does this value correspond to? */ + + todo_wine + ok(info.KernelTotal == sys_performance_info->PagedPoolUsage + sys_performance_info->NonPagedPoolUsage, + "expected info.KernelTotal=%u but got %u\n", + sys_performance_info->PagedPoolUsage + sys_performance_info->NonPagedPoolUsage, (ULONG)info.KernelTotal); + + todo_wine + ok(info.KernelPaged == sys_performance_info->PagedPoolUsage, + "expected info.KernelPaged=%u but got %u\n", + sys_performance_info->PagedPoolUsage, (ULONG)info.KernelPaged); + + todo_wine + ok(info.KernelNonpaged == sys_performance_info->NonPagedPoolUsage, + "expected info.KernelNonpaged=%u but got %u\n", + sys_performance_info->NonPagedPoolUsage, (ULONG)info.KernelNonpaged); + + /* compare with values from SYSTEM_BASIC_INFORMATION */ + size = 0; + status = pNtQuerySystemInformation(SystemBasicInformation, &sys_basic_info, sizeof(sys_basic_info), &size); + ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %08x\n", status); + ok(size >= sizeof(SYSTEM_BASIC_INFORMATION), "incorrect length %d\n", size); + + todo_wine + ok(info.PhysicalTotal == sys_basic_info.MmNumberOfPhysicalPages, + "expected info.PhysicalTotal=%u but got %u\n", + sys_basic_info.MmNumberOfPhysicalPages, (ULONG)info.PhysicalTotal); + + todo_wine + ok(info.PageSize == sys_basic_info.PageSize, + "expected info.PageSize=%u but got %u\n", + sys_basic_info.PageSize, (ULONG)info.PageSize); + + /* compare with values from SYSTEM_PROCESS_INFORMATION */ + size = 0; + status = pNtQuerySystemInformation(SystemProcessInformation, NULL, 0, &size); + ok(status == STATUS_INFO_LENGTH_MISMATCH, "expected STATUS_LENGTH_MISMATCH, got %08x\n", status); + ok(size > 0, "incorrect length %d\n", size); + while (status == STATUS_INFO_LENGTH_MISMATCH) + { + sys_process_info = HeapAlloc(GetProcessHeap(), 0, size); + ok(sys_process_info != NULL, "failed to allocate memory\n"); + status = pNtQuerySystemInformation(SystemProcessInformation, sys_process_info, size, &size); + if (status == STATUS_SUCCESS) break; + HeapFree(GetProcessHeap(), 0, sys_process_info); + } + ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %08x\n", status); + + process_count = handle_count = thread_count = 0; + for (spi = sys_process_info;; spi = (SYSTEM_PROCESS_INFORMATION *)(((char *)spi) + spi->NextEntryOffset)) + { + process_count++; + handle_count += spi->HandleCount; + thread_count += spi->dwThreadCount; + if (spi->NextEntryOffset == 0) break; + } + HeapFree(GetProcessHeap(), 0, sys_process_info); + + todo_wine + ok(info.HandleCount == handle_count, + "expected info.HandleCount=%u but got %u\n", handle_count, info.HandleCount); + + todo_wine + ok(info.ProcessCount == process_count, + "expected info.ProcessCount=%u but got %u\n", process_count, info.ProcessCount); + + todo_wine + ok(info.ThreadCount == thread_count, + "expected info.ThreadCount=%u but got %u\n", thread_count, info.ThreadCount); + } +} + + static void test_GetProcessMemoryInfo(void) { PROCESS_MEMORY_COUNTERS pmc; @@ -677,6 +811,7 @@ START_TEST(psapi_main) test_EnumProcesses(); test_EnumProcessModules(); test_GetModuleInformation(); + test_GetPerformanceInfo(); test_GetProcessMemoryInfo(); test_GetMappedFileName(); test_GetProcessImageFileName();

1 0

Alexandre Julliard : configure: Don't require libXext for Xrender.
by Alexandre Julliard Nov. 14, 2014

Nov. 14, 2014

Module: wine Branch: master Commit: 60fcafcf048fe426e4bc3e830712be08d1828729 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60fcafcf048fe426e4bc3e830… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 14 15:36:38 2014 +0900 configure: Don't require libXext for Xrender. --- configure | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index b469858..909b622 100755 --- a/configure +++ b/configure @@ -9818,7 +9818,7 @@ This is an error since --with-xxf86vm was requested." "$LINENO" 5 ;; esac fi - if test "$ac_cv_header_X11_extensions_Xrender_h" = "yes" -a "x$ac_cv_lib_soname_X11" != "x" -a "x$ac_cv_lib_soname_Xext" != "x" + if test "$ac_cv_header_X11_extensions_Xrender_h" = "yes" -a "x$ac_cv_lib_soname_X11" != "x" then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -lXrender" >&5 $as_echo_n "checking for -lXrender... " >&6; } diff --git a/configure.ac b/configure.ac index 398d60b..4ee8133 100644 --- a/configure.ac +++ b/configure.ac @@ -1161,7 +1161,7 @@ then [libXxf86vm ${notice_platform}development files not found, XFree86 Vidmode won't be supported.]) dnl *** Check for Transform functions in Xrender - if test "$ac_cv_header_X11_extensions_Xrender_h" = "yes" -a "x$ac_cv_lib_soname_X11" != "x" -a "x$ac_cv_lib_soname_Xext" != "x" + if test "$ac_cv_header_X11_extensions_Xrender_h" = "yes" -a "x$ac_cv_lib_soname_X11" != "x" then WINE_CHECK_SONAME(Xrender,XRenderQueryExtension, [AC_CHECK_LIB(Xrender,XRenderSetPictureTransform,

1 0

Bruno Jesus : ole32: Avoid a possible null dereference.
by Alexandre Julliard Nov. 14, 2014

Nov. 14, 2014

Module: wine Branch: master Commit: 959ca6ac0264e5a285d1360598cb813b1956a4cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=959ca6ac0264e5a285d136059… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Nov 13 22:13:40 2014 -0200 ole32: Avoid a possible null dereference. --- dlls/ole32/clipboard.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c index 6404f36..0c3be3b 100644 --- a/dlls/ole32/clipboard.c +++ b/dlls/ole32/clipboard.c @@ -210,13 +210,11 @@ UINT ole_private_data_clipboard_format = 0; static UINT wine_marshal_clipboard_format; -static inline char *dump_fmtetc(FORMATETC *fmt) +static inline const char *dump_fmtetc(FORMATETC *fmt) { - static char buf[100]; - - snprintf(buf, sizeof(buf), "cf %04x ptd %p aspect %x lindex %d tymed %x", - fmt->cfFormat, fmt->ptd, fmt->dwAspect, fmt->lindex, fmt->tymed); - return buf; + if (!fmt) return "(null)"; + return wine_dbg_sprintf("cf %04x ptd %p aspect %x lindex %d tymed %x", + fmt->cfFormat, fmt->ptd, fmt->dwAspect, fmt->lindex, fmt->tymed); } /*---------------------------------------------------------------------*

1 0

Vincent Povirk : windowscodecs: Add fallback to unknown metadata reader.
by Alexandre Julliard Nov. 14, 2014

Nov. 14, 2014

Module: wine Branch: master Commit: fa455f594bceb085562ae847ad1bcdcca40ecb8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa455f594bceb085562ae847a… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Nov 12 16:00:55 2014 -0600 windowscodecs: Add fallback to unknown metadata reader. --- dlls/windowscodecs/imgfactory.c | 25 ++++++++++++++++++++++++- dlls/windowscodecs/tests/metadata.c | 2 +- 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/imgfactory.c b/dlls/windowscodecs/imgfactory.c index 444f2e4..42b4e59 100644 --- a/dlls/windowscodecs/imgfactory.c +++ b/dlls/windowscodecs/imgfactory.c @@ -1050,7 +1050,30 @@ start: IEnumUnknown_Release(enumreaders); if (!*reader && !(options & WICMetadataCreationFailUnknown)) - FIXME("create unknown metadata reader\n"); + { + hr = IStream_Seek(stream, zero, STREAM_SEEK_SET, NULL); + + if (SUCCEEDED(hr)) + hr = UnknownMetadataReader_CreateInstance(&IID_IWICMetadataReader, (void**)reader); + + if (SUCCEEDED(hr)) + { + hr = IWICMetadataReader_QueryInterface(*reader, &IID_IWICPersistStream, (void**)&wicpersiststream); + + if (SUCCEEDED(hr)) + { + hr = IWICPersistStream_LoadEx(wicpersiststream, stream, NULL, options & WICPersistOptionsMask); + + IWICPersistStream_Release(wicpersiststream); + } + + if (FAILED(hr)) + { + IWICMetadataReader_Release(*reader); + *reader = NULL; + } + } + } if (*reader) return S_OK; diff --git a/dlls/windowscodecs/tests/metadata.c b/dlls/windowscodecs/tests/metadata.c index 2dc6049..fa9d701 100644 --- a/dlls/windowscodecs/tests/metadata.c +++ b/dlls/windowscodecs/tests/metadata.c @@ -876,7 +876,7 @@ static void test_create_reader(void) hr = IWICComponentFactory_CreateMetadataReaderFromContainer(factory, &GUID_ContainerFormatWmp, NULL, WICPersistOptionsDefault, stream, &reader); - todo_wine ok(hr == S_OK, "CreateMetadataReaderFromContainer failed, hr=%x\n", hr); + ok(hr == S_OK, "CreateMetadataReaderFromContainer failed, hr=%x\n", hr); if (SUCCEEDED(hr)) {

1 0

Sebastian Lackner : kernel32: Fix implementation of K32GetPerformanceInfo.
by Alexandre Julliard Nov. 14, 2014

Nov. 14, 2014

Module: wine Branch: master Commit: 4032eef90fc9cb6dcd09310a9ed5372e234e7653 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4032eef90fc9cb6dcd09310a9… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Nov 14 08:07:34 2014 +0100 kernel32: Fix implementation of K32GetPerformanceInfo. --- dlls/kernel32/cpu.c | 64 ++++++++++++++++++++++++++++++++++++++++++- dlls/psapi/tests/psapi_main.c | 14 ---------- 2 files changed, 63 insertions(+), 15 deletions(-) diff --git a/dlls/kernel32/cpu.c b/dlls/kernel32/cpu.c index 0ebf8f3..f48fcf0 100644 --- a/dlls/kernel32/cpu.c +++ b/dlls/kernel32/cpu.c @@ -216,12 +216,74 @@ BOOL WINAPI IsProcessorFeaturePresent ( */ BOOL WINAPI K32GetPerformanceInfo(PPERFORMANCE_INFORMATION info, DWORD size) { + union + { + SYSTEM_PERFORMANCE_INFORMATION performance; + SYSTEM_PROCESS_INFORMATION process; + SYSTEM_BASIC_INFORMATION basic; + } *sysinfo; + SYSTEM_PROCESS_INFORMATION *spi; + DWORD process_info_size; NTSTATUS status; TRACE( "(%p, %d)\n", info, size ); - status = NtQuerySystemInformation( SystemPerformanceInformation, info, size, NULL ); + if (size < sizeof(*info)) + { + SetLastError( ERROR_BAD_LENGTH ); + return FALSE; + } + + memset( info, 0, sizeof(*info) ); + info->cb = sizeof(*info); + + /* fields from SYSTEM_PROCESS_INFORMATION */ + NtQuerySystemInformation( SystemProcessInformation, NULL, 0, &process_info_size ); + for (;;) + { + sysinfo = HeapAlloc( GetProcessHeap(), 0, max(process_info_size, sizeof(*sysinfo)) ); + if (!sysinfo) + { + SetLastError( ERROR_OUTOFMEMORY ); + return FALSE; + } + status = NtQuerySystemInformation( SystemProcessInformation, &sysinfo->process, + process_info_size, &process_info_size ); + if (!status) break; + if (status != STATUS_INFO_LENGTH_MISMATCH) + goto err; + HeapFree( GetProcessHeap(), 0, sysinfo ); + } + for (spi = &sysinfo->process;; spi = (SYSTEM_PROCESS_INFORMATION *)(((PCHAR)spi) + spi->NextEntryOffset)) + { + info->ProcessCount++; + info->HandleCount += spi->HandleCount; + info->ThreadCount += spi->dwThreadCount; + if (spi->NextEntryOffset == 0) break; + } + + /* fields from SYSTEM_PERFORMANCE_INFORMATION */ + status = NtQuerySystemInformation( SystemPerformanceInformation, &sysinfo->performance, + sizeof(sysinfo->performance), NULL ); + if (status) goto err; + info->CommitTotal = sysinfo->performance.TotalCommittedPages; + info->CommitLimit = sysinfo->performance.TotalCommitLimit; + info->CommitPeak = sysinfo->performance.PeakCommitment; + info->PhysicalAvailable = sysinfo->performance.AvailablePages; + info->KernelTotal = sysinfo->performance.PagedPoolUsage + + sysinfo->performance.NonPagedPoolUsage; + info->KernelPaged = sysinfo->performance.PagedPoolUsage; + info->KernelNonpaged = sysinfo->performance.NonPagedPoolUsage; + + /* fields from SYSTEM_BASIC_INFORMATION */ + status = NtQuerySystemInformation( SystemBasicInformation, &sysinfo->basic, + sizeof(sysinfo->basic), NULL ); + if (status) goto err; + info->PhysicalTotal = sysinfo->basic.MmNumberOfPhysicalPages; + info->PageSize = sysinfo->basic.PageSize; +err: + HeapFree( GetProcessHeap(), 0, sysinfo ); if (status) { SetLastError( RtlNtStatusToDosError( status ) ); diff --git a/dlls/psapi/tests/psapi_main.c b/dlls/psapi/tests/psapi_main.c index 7220da9..890b4ac 100644 --- a/dlls/psapi/tests/psapi_main.c +++ b/dlls/psapi/tests/psapi_main.c @@ -203,9 +203,7 @@ static void test_GetPerformanceInfo(void) SetLastError(0xdeadbeef); ret = pGetPerformanceInfo(&info, sizeof(info)); - todo_wine ok(ret, "GetPerformanceInfo failed with %d\n", GetLastError()); - todo_wine ok(info.cb == sizeof(PERFORMANCE_INFORMATION), "got %d\n", info.cb); if (!pNtQuerySystemInformation) @@ -224,22 +222,18 @@ static void test_GetPerformanceInfo(void) ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %08x\n", status); ok(size >= sizeof(SYSTEM_PERFORMANCE_INFORMATION), "incorrect length %d\n", size); - todo_wine ok(info.CommitTotal == sys_performance_info->TotalCommittedPages, "expected info.CommitTotal=%u but got %u\n", sys_performance_info->TotalCommittedPages, (ULONG)info.CommitTotal); - todo_wine ok(info.CommitLimit == sys_performance_info->TotalCommitLimit, "expected info.CommitLimit=%u but got %u\n", sys_performance_info->TotalCommitLimit, (ULONG)info.CommitLimit); - todo_wine ok(info.CommitPeak == sys_performance_info->PeakCommitment, "expected info.CommitPeak=%u but got %u\n", sys_performance_info->PeakCommitment, (ULONG)info.CommitPeak); - todo_wine ok(info.PhysicalAvailable >= max(sys_performance_info->AvailablePages, 25) - 25 && info.PhysicalAvailable <= sys_performance_info->AvailablePages + 25, "expected approximately info.PhysicalAvailable=%u but got %u\n", @@ -247,17 +241,14 @@ static void test_GetPerformanceInfo(void) /* TODO: info.SystemCache not checked yet - to which field(s) does this value correspond to? */ - todo_wine ok(info.KernelTotal == sys_performance_info->PagedPoolUsage + sys_performance_info->NonPagedPoolUsage, "expected info.KernelTotal=%u but got %u\n", sys_performance_info->PagedPoolUsage + sys_performance_info->NonPagedPoolUsage, (ULONG)info.KernelTotal); - todo_wine ok(info.KernelPaged == sys_performance_info->PagedPoolUsage, "expected info.KernelPaged=%u but got %u\n", sys_performance_info->PagedPoolUsage, (ULONG)info.KernelPaged); - todo_wine ok(info.KernelNonpaged == sys_performance_info->NonPagedPoolUsage, "expected info.KernelNonpaged=%u but got %u\n", sys_performance_info->NonPagedPoolUsage, (ULONG)info.KernelNonpaged); @@ -268,12 +259,10 @@ static void test_GetPerformanceInfo(void) ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %08x\n", status); ok(size >= sizeof(SYSTEM_BASIC_INFORMATION), "incorrect length %d\n", size); - todo_wine ok(info.PhysicalTotal == sys_basic_info.MmNumberOfPhysicalPages, "expected info.PhysicalTotal=%u but got %u\n", sys_basic_info.MmNumberOfPhysicalPages, (ULONG)info.PhysicalTotal); - todo_wine ok(info.PageSize == sys_basic_info.PageSize, "expected info.PageSize=%u but got %u\n", sys_basic_info.PageSize, (ULONG)info.PageSize); @@ -303,15 +292,12 @@ static void test_GetPerformanceInfo(void) } HeapFree(GetProcessHeap(), 0, sys_process_info); - todo_wine ok(info.HandleCount == handle_count, "expected info.HandleCount=%u but got %u\n", handle_count, info.HandleCount); - todo_wine ok(info.ProcessCount == process_count, "expected info.ProcessCount=%u but got %u\n", process_count, info.ProcessCount); - todo_wine ok(info.ThreadCount == thread_count, "expected info.ThreadCount=%u but got %u\n", thread_count, info.ThreadCount); }

1 0

Sebastian Lackner : d3dx9_36: Allow NULL pointer for optional arguments of D3DXIntersectTri.
by Alexandre Julliard Nov. 14, 2014

Nov. 14, 2014

Module: wine Branch: master Commit: b69038e3d96bd4eee19be6d6c6de7d4abb03460d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b69038e3d96bd4eee19be6d6c… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sat Nov 8 19:29:53 2014 +0100 d3dx9_36: Allow NULL pointer for optional arguments of D3DXIntersectTri. --- dlls/d3dx9_36/mesh.c | 6 +++--- dlls/d3dx9_36/tests/mesh.c | 9 +++++++++ 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index 9aece61..6f268f2 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -2407,9 +2407,9 @@ BOOL WINAPI D3DXIntersectTri(const D3DXVECTOR3 *p0, const D3DXVECTOR3 *p1, const D3DXVec4Transform(&vec, &vec, &m); if ( (vec.x >= 0.0f) && (vec.y >= 0.0f) && (vec.x + vec.y <= 1.0f) && (vec.z >= 0.0f) ) { - *pu = vec.x; - *pv = vec.y; - *pdist = fabsf( vec.z ); + if (pu) *pu = vec.x; + if (pv) *pv = vec.y; + if (pdist) *pdist = fabsf( vec.z ); return TRUE; } } diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index 870f62a..dac0f60 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -1104,6 +1104,9 @@ static void D3DXIntersectTriTest(void) ok( compare(exp_v,got_v), "Expected v = %f, got %f\n",exp_v,got_v); ok( compare(exp_dist,got_dist), "Expected distance = %f, got %f\n",exp_dist,got_dist); + got_res = D3DXIntersectTri(&vertex[0], &vertex[1], &vertex[2], &position, &ray, NULL, NULL, NULL); + ok(got_res == exp_res, "Expected result = %d, got %d\n", exp_res, got_res); + /*Only positive ray is taken in account*/ vertex[0].x = 1.0f; vertex[0].y = 0.0f; vertex[0].z = 0.0f; @@ -1119,6 +1122,9 @@ static void D3DXIntersectTriTest(void) got_res = D3DXIntersectTri(&vertex[0],&vertex[1],&vertex[2],&position,&ray,&got_u,&got_v,&got_dist); ok( got_res == exp_res, "Expected result = %d, got %d\n",exp_res,got_res); + got_res = D3DXIntersectTri(&vertex[0], &vertex[1], &vertex[2], &position, &ray, NULL, NULL, NULL); + ok(got_res == exp_res, "Expected result = %d, got %d\n", exp_res, got_res); + /*Intersection between ray and triangle in a same plane is considered as empty*/ vertex[0].x = 4.0f; vertex[0].y = 0.0f; vertex[0].z = 0.0f; @@ -1133,6 +1139,9 @@ static void D3DXIntersectTriTest(void) got_res = D3DXIntersectTri(&vertex[0],&vertex[1],&vertex[2],&position,&ray,&got_u,&got_v,&got_dist); ok( got_res == exp_res, "Expected result = %d, got %d\n",exp_res,got_res); + + got_res = D3DXIntersectTri(&vertex[0], &vertex[1], &vertex[2], &position, &ray, NULL, NULL, NULL); + ok(got_res == exp_res, "Expected result = %d, got %d\n", exp_res, got_res); } static void D3DXCreateMeshTest(void)

1 0