November 2014 - Wine-Commits

Stefan Dösinger : d3d8/tests: Call TestCooperativeLevel after Present.
by Alexandre Julliard Nov. 27, 2014

Nov. 27, 2014

Module: wine Branch: master Commit: d1bd7094715aaad6dc0ddf05006946fa14993b0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1bd7094715aaad6dc0ddf050… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Nov 26 19:08:55 2014 +0100 d3d8/tests: Call TestCooperativeLevel after Present. --- dlls/d3d8/tests/device.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 99fe70a..6a4dcc2 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -6812,10 +6812,10 @@ static void test_lost_device(void) ret = SetForegroundWindow(GetDesktopWindow()); ok(ret, "Failed to set foreground window.\n"); - hr = IDirect3DDevice8_TestCooperativeLevel(device); - ok(hr == D3DERR_DEVICELOST, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); ok(hr == D3DERR_DEVICELOST, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice8_TestCooperativeLevel(device); + ok(hr == D3DERR_DEVICELOST, "Got unexpected hr %#x.\n", hr); ret = ShowWindow(window, SW_RESTORE); ok(ret, "Failed to restore window.\n");

1 0

Alexandre Julliard : d3d9/tests: Don't require a WM_MOVE message.
by Alexandre Julliard Nov. 26, 2014

Nov. 26, 2014

Module: wine Branch: master Commit: 099bc21df7f53467664791203fd88487a89726b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=099bc21df7f53467664791203… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 26 20:40:49 2014 +0100 d3d9/tests: Don't require a WM_MOVE message. --- dlls/d3d9/tests/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 04bdf41..cd6a9bd 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -3295,7 +3295,7 @@ static void test_wndproc(void) { {WM_WINDOWPOSCHANGING, DEVICE_WINDOW, FALSE, 0}, {WM_WINDOWPOSCHANGED, DEVICE_WINDOW, FALSE, 0}, - {WM_MOVE, DEVICE_WINDOW, FALSE, 0}, + /* optional WM_MOVE here if size changed */ {WM_ACTIVATEAPP, FOCUS_WINDOW, TRUE, TRUE}, {0, 0, FALSE, 0}, };

1 0

Austin English : ole2disp: Add a stub for VARIANTCHANGETYPE.
by Alexandre Julliard Nov. 26, 2014

Nov. 26, 2014

Module: wine Branch: master Commit: 5df9286e193c2bb4cf94ce978542794d4a791092 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5df9286e193c2bb4cf94ce978… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Nov 21 19:29:33 2014 -0600 ole2disp: Add a stub for VARIANTCHANGETYPE. --- dlls/ole2disp.dll16/ole2disp.c | 10 ++++++++++ dlls/ole2disp.dll16/ole2disp.dll16.spec | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/ole2disp.dll16/ole2disp.c b/dlls/ole2disp.dll16/ole2disp.c index 957d1bc..61a4043 100644 --- a/dlls/ole2disp.dll16/ole2disp.c +++ b/dlls/ole2disp.dll16/ole2disp.c @@ -214,6 +214,16 @@ int WINAPI SysStringLen16(BSTR16 str) } /****************************************************************************** + * VariantChangeType [OLE2DISP.12] + */ +HRESULT WINAPI VariantChangeType16(VARIANTARG *vargDest, VARIANTARG *varSrc, unsigned short flags, VARTYPE vt) +{ + FIXME("stub: (%p, %p, %d, %d)\n", vargDest, varSrc, flags, vt); + return E_NOTIMPL; +} + + +/****************************************************************************** * CreateDispTypeInfo [OLE2DISP.31] */ HRESULT WINAPI CreateDispTypeInfo16( diff --git a/dlls/ole2disp.dll16/ole2disp.dll16.spec b/dlls/ole2disp.dll16/ole2disp.dll16.spec index 0bc4bae..c027d12 100644 --- a/dlls/ole2disp.dll16/ole2disp.dll16.spec +++ b/dlls/ole2disp.dll16/ole2disp.dll16.spec @@ -9,7 +9,7 @@ 9 stub VARIANTCLEAR 10 stub VARIANTCOPY 11 stub VARIANTCOPYIND -12 stub VARIANTCHANGETYPE +12 pascal VARIANTCHANGETYPE(ptr ptr long long) VariantChangeType16 13 stub VARIANTTIMETODOSDATETIME 14 stub DOSDATETIMETOVARIANTTIME 15 stub SAFEARRAYCREATE

1 0

Austin English : cryptext: Add stubs for CryptExtAddPFX/CryptExtAddPFXW.
by Alexandre Julliard Nov. 26, 2014

Nov. 26, 2014

Module: wine Branch: master Commit: ca1bf14aaf5c076a7629e9565d20c1b26f8abc3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca1bf14aaf5c076a7629e9565… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Nov 21 15:17:36 2014 -0800 cryptext: Add stubs for CryptExtAddPFX/CryptExtAddPFXW. --- dlls/cryptext/cryptext.spec | 4 ++-- dlls/cryptext/cryptext_main.c | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/cryptext/cryptext.spec b/dlls/cryptext/cryptext.spec index b0e920e..0dba38e 100644 --- a/dlls/cryptext/cryptext.spec +++ b/dlls/cryptext/cryptext.spec @@ -6,8 +6,8 @@ @ stub CryptExtAddCTLW @ stub CryptExtAddP7R @ stub CryptExtAddP7RW -@ stub CryptExtAddPFX -@ stub CryptExtAddPFXW +@ stdcall CryptExtAddPFX(str) +@ stdcall CryptExtAddPFXW(wstr) @ stub CryptExtAddSPC @ stub CryptExtAddSPCW @ stub CryptExtOpenCAT diff --git a/dlls/cryptext/cryptext_main.c b/dlls/cryptext/cryptext_main.c index 75ede4e..473c326 100644 --- a/dlls/cryptext/cryptext_main.c +++ b/dlls/cryptext/cryptext_main.c @@ -43,3 +43,21 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) return TRUE; } + +/*********************************************************************** + * CryptExtAddPFX (CRYPTEXT.@) + */ +HRESULT WINAPI CryptExtAddPFX(LPCSTR filename) +{ + FIXME("stub: %s\n", debugstr_a(filename)); + return E_NOTIMPL; +} + +/*********************************************************************** + * CryptExtAddPFXW (CRYPTEXT.@) + */ +HRESULT WINAPI CryptExtAddPFXW(LPCWSTR filename) +{ + FIXME("stub: %s\n", debugstr_w(filename)); + return E_NOTIMPL; +}

1 0

Jacek Caban : mshtml: Added fontname command support to execCommand.
by Alexandre Julliard Nov. 26, 2014

Nov. 26, 2014

Module: wine Branch: master Commit: c910c8ceeddf7723873b42dc0004f502b5d37622 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c910c8ceeddf7723873b42dc0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 26 14:55:45 2014 +0100 mshtml: Added fontname command support to execCommand. --- dlls/mshtml/htmldoc.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index c760c36..edc91e6 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -1096,6 +1096,8 @@ static HRESULT WINAPI HTMLDocument_clear(IHTMLDocument2 *iface) return S_OK; } +static const WCHAR fontnameW[] = + {'f','o','n','t','n','a','m','e',0}; static const WCHAR insertorderedlistW[] = {'i','n','s','e','r','t','o','r','d','e','r','e','d','l','i','s','t',0}; static const WCHAR insertunorderedlistW[] = @@ -1109,6 +1111,7 @@ static const struct { const WCHAR *name; OLECMDID id; }command_names[] = { + {fontnameW, IDM_FONTNAME}, {insertorderedlistW, IDM_ORDERLIST}, {insertunorderedlistW, IDM_UNORDERLIST}, {outdentW, IDM_OUTDENT},

1 0

Michael Stefaniuc : comdlg32: Remove an always true if check (PVS-Studio).
by Alexandre Julliard Nov. 26, 2014

Nov. 26, 2014

Module: wine Branch: master Commit: 0867e7fe785841f7e3ddb3d95f82eac74ce2979e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0867e7fe785841f7e3ddb3d95… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Nov 26 12:08:37 2014 +0100 comdlg32: Remove an always true if check (PVS-Studio). --- dlls/comdlg32/filedlg.c | 64 ++++++++++++++++++++++++------------------------- 1 file changed, 31 insertions(+), 33 deletions(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index 2738467..e0939ef 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -1586,39 +1586,37 @@ static LRESULT FILEDLG95_InitControls(HWND hwnd) /* 2. (All platforms) If initdir is not null, then use it */ if (!handledPath && fodInfos->initdir && *fodInfos->initdir) { - /* Work out the proper path as supplied one might be relative */ - /* (Here because supplying '.' as dir browses to My Computer) */ - if (!handledPath) { - WCHAR tmpBuf[MAX_PATH]; - WCHAR tmpBuf2[MAX_PATH]; - WCHAR *nameBit; - DWORD result; - - lstrcpyW(tmpBuf, fodInfos->initdir); - if( PathFileExistsW(tmpBuf) ) { - /* initdir does not have to be a directory. If a file is - * specified, the dir part is taken */ - if( PathIsDirectoryW(tmpBuf)) { - PathAddBackslashW( tmpBuf ); - lstrcatW(tmpBuf, szwStar); - } - result = GetFullPathNameW(tmpBuf, MAX_PATH, tmpBuf2, &nameBit); - if (result) { - *nameBit = 0x00; - MemFree(fodInfos->initdir); - fodInfos->initdir = MemAlloc((lstrlenW(tmpBuf2) + 1)*sizeof(WCHAR)); - lstrcpyW(fodInfos->initdir, tmpBuf2); - handledPath = TRUE; - TRACE("Value in InitDir changed to %s\n", debugstr_w(fodInfos->initdir)); - } - } - else if (fodInfos->initdir) - { - MemFree(fodInfos->initdir); - fodInfos->initdir = NULL; - TRACE("Value in InitDir is not an existing path, changed to (nil)\n"); - } - } + /* Work out the proper path as supplied one might be relative */ + /* (Here because supplying '.' as dir browses to My Computer) */ + WCHAR tmpBuf[MAX_PATH]; + WCHAR tmpBuf2[MAX_PATH]; + WCHAR *nameBit; + DWORD result; + + lstrcpyW(tmpBuf, fodInfos->initdir); + if (PathFileExistsW(tmpBuf)) { + /* initdir does not have to be a directory. If a file is + * specified, the dir part is taken */ + if (PathIsDirectoryW(tmpBuf)) { + PathAddBackslashW(tmpBuf); + lstrcatW(tmpBuf, szwStar); + } + result = GetFullPathNameW(tmpBuf, MAX_PATH, tmpBuf2, &nameBit); + if (result) { + *nameBit = 0x00; + MemFree(fodInfos->initdir); + fodInfos->initdir = MemAlloc((lstrlenW(tmpBuf2) + 1) * sizeof(WCHAR)); + lstrcpyW(fodInfos->initdir, tmpBuf2); + handledPath = TRUE; + TRACE("Value in InitDir changed to %s\n", debugstr_w(fodInfos->initdir)); + } + } + else if (fodInfos->initdir) + { + MemFree(fodInfos->initdir); + fodInfos->initdir = NULL; + TRACE("Value in InitDir is not an existing path, changed to (nil)\n"); + } } if (!handledPath && (!fodInfos->initdir || !*fodInfos->initdir))

1 0

Nikolay Sivov : dwrite: Use file mapping for local file stream.
by Alexandre Julliard Nov. 26, 2014

Nov. 26, 2014

Module: wine Branch: master Commit: 416527a6adb62ff446960226a9e4127d5e1ffcfd URL: http://source.winehq.org/git/wine.git/?a=commit;h=416527a6adb62ff446960226a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 26 08:59:04 2014 +0300 dwrite: Use file mapping for local file stream. --- dlls/dwrite/font.c | 58 +++++++++++++++++++++++++----------------------- dlls/dwrite/tests/font.c | 16 ++++++++----- 2 files changed, 41 insertions(+), 33 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index cef4a27..76f3e3e 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -2042,7 +2042,8 @@ struct dwrite_localfontfilestream LONG ref; struct local_cached_stream *entry; - HANDLE handle; + const void *file_ptr; + UINT64 size; }; struct dwrite_localfontfileloader { @@ -2100,8 +2101,7 @@ static ULONG WINAPI localfontfilestream_Release(IDWriteFontFileStream *iface) TRACE("(%p)->(%d)\n", This, ref); if (!ref) { - if (This->handle != INVALID_HANDLE_VALUE) - CloseHandle(This->handle); + UnmapViewOfFile(This->file_ptr); release_cached_stream(This->entry); heap_free(This); } @@ -2112,26 +2112,18 @@ static ULONG WINAPI localfontfilestream_Release(IDWriteFontFileStream *iface) static HRESULT WINAPI localfontfilestream_ReadFileFragment(IDWriteFontFileStream *iface, void const **fragment_start, UINT64 offset, UINT64 fragment_size, void **fragment_context) { struct dwrite_localfontfilestream *This = impl_from_IDWriteFontFileStream(iface); - LARGE_INTEGER distance; - DWORD bytes = fragment_size; - DWORD read; TRACE("(%p)->(%p, %s, %s, %p)\n",This, fragment_start, wine_dbgstr_longlong(offset), wine_dbgstr_longlong(fragment_size), fragment_context); *fragment_context = NULL; - distance.QuadPart = offset; - if (!SetFilePointerEx(This->handle, distance, NULL, FILE_BEGIN)) - return E_FAIL; - *fragment_start = *fragment_context = heap_alloc(bytes); - if (!*fragment_context) - return E_FAIL; - if (!ReadFile(This->handle, *fragment_context, bytes, &read, NULL)) - { - heap_free(*fragment_context); + + if ((offset >= This->size - 1) || (fragment_size > This->size - offset)) { + *fragment_start = NULL; return E_FAIL; } + *fragment_start = (char*)This->file_ptr + offset; return S_OK; } @@ -2139,16 +2131,13 @@ static void WINAPI localfontfilestream_ReleaseFileFragment(IDWriteFontFileStream { struct dwrite_localfontfilestream *This = impl_from_IDWriteFontFileStream(iface); TRACE("(%p)->(%p)\n", This, fragment_context); - heap_free(fragment_context); } static HRESULT WINAPI localfontfilestream_GetFileSize(IDWriteFontFileStream *iface, UINT64 *size) { struct dwrite_localfontfilestream *This = impl_from_IDWriteFontFileStream(iface); - LARGE_INTEGER li; - TRACE("(%p)->(%p)\n",This, size); - GetFileSizeEx(This->handle, &li); - *size = li.QuadPart; + TRACE("(%p)->(%p)\n", This, size); + *size = This->size; return S_OK; } @@ -2177,15 +2166,17 @@ static const IDWriteFontFileStreamVtbl localfontfilestreamvtbl = localfontfilestream_GetLastWriteTime }; -static HRESULT create_localfontfilestream(HANDLE handle, struct local_cached_stream *entry, IDWriteFontFileStream** iface) +static HRESULT create_localfontfilestream(const void *file_ptr, UINT64 size, struct local_cached_stream *entry, IDWriteFontFileStream** iface) { struct dwrite_localfontfilestream *This = heap_alloc(sizeof(struct dwrite_localfontfilestream)); if (!This) return E_OUTOFMEMORY; - This->ref = 1; - This->handle = handle; This->IDWriteFontFileStream_iface.lpVtbl = &localfontfilestreamvtbl; + This->ref = 1; + + This->file_ptr = file_ptr; + This->size = size; This->entry = entry; *iface = &This->IDWriteFontFileStream_iface; @@ -2244,11 +2235,12 @@ static HRESULT WINAPI localfontfileloader_CreateStreamFromKey(IDWriteLocalFontFi const struct local_refkey *refkey = key; struct local_cached_stream *stream; IDWriteFontFileStream *filestream; - HANDLE handle; + HANDLE file, mapping; + LARGE_INTEGER size; + void *file_ptr; HRESULT hr; TRACE("(%p)->(%p, %i, %p)\n", This, key, key_size, ret); - TRACE("name: %s\n", debugstr_w(refkey->name)); /* search cache first */ @@ -2262,18 +2254,27 @@ static HRESULT WINAPI localfontfileloader_CreateStreamFromKey(IDWriteLocalFontFi *ret = NULL; - handle = CreateFileW(refkey->name, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE, + file = CreateFileW(refkey->name, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + if (file == INVALID_HANDLE_VALUE) + return E_FAIL; - if (handle == INVALID_HANDLE_VALUE) + GetFileSizeEx(file, &size); + mapping = CreateFileMappingW(file, NULL, PAGE_READONLY, 0, 0, NULL); + CloseHandle(file); + if (!mapping) return E_FAIL; + file_ptr = MapViewOfFile(mapping, FILE_MAP_READ, 0, 0, 0); + CloseHandle(mapping); + stream = heap_alloc(sizeof(*stream)); if (!stream) return E_OUTOFMEMORY; stream->key = heap_alloc(key_size); if (!stream->key) { + UnmapViewOfFile(file_ptr); heap_free(stream); return E_OUTOFMEMORY; } @@ -2281,8 +2282,9 @@ static HRESULT WINAPI localfontfileloader_CreateStreamFromKey(IDWriteLocalFontFi stream->key_size = key_size; memcpy(stream->key, key, key_size); - hr = create_localfontfilestream(handle, stream, &filestream); + hr = create_localfontfilestream(file_ptr, size.QuadPart, stream, &filestream); if (FAILED(hr)) { + UnmapViewOfFile(file_ptr); heap_free(stream->key); heap_free(stream); return hr; diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 8143120..221a5d3 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -2497,16 +2497,14 @@ static void test_ReadFileFragment(void) fragment = (void*)0xdeadbeef; context = (void*)0xdeadbeef; hr = IDWriteFontFileStream_ReadFileFragment(stream, &fragment, 0, filesize+1, &context); -todo_wine { ok(hr == E_FAIL, "got 0x%08x\n", hr); ok(context == NULL, "got %p\n", context); ok(fragment == NULL, "got %p\n", fragment); -} + fragment = (void*)0xdeadbeef; context = (void*)0xdeadbeef; hr = IDWriteFontFileStream_ReadFileFragment(stream, &fragment, 0, filesize, &context); ok(hr == S_OK, "got 0x%08x\n", hr); -todo_wine ok(context == NULL, "got %p\n", context); ok(fragment != NULL, "got %p\n", fragment); @@ -2514,13 +2512,21 @@ todo_wine context2 = (void*)0xdeadbeef; hr = IDWriteFontFileStream_ReadFileFragment(stream, &fragment2, 0, filesize, &context2); ok(hr == S_OK, "got 0x%08x\n", hr); -todo_wine { ok(context2 == NULL, "got %p\n", context2); ok(fragment == fragment2, "got %p, %p\n", fragment, fragment2); -} + IDWriteFontFileStream_ReleaseFileFragment(stream, context); IDWriteFontFileStream_ReleaseFileFragment(stream, context2); + /* fragment is released, try again */ + fragment = (void*)0xdeadbeef; + context = (void*)0xdeadbeef; + hr = IDWriteFontFileStream_ReadFileFragment(stream, &fragment, 0, filesize, &context); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(context == NULL, "got %p\n", context); + ok(fragment == fragment2, "got %p, %p\n", fragment, fragment2); + IDWriteFontFileStream_ReleaseFileFragment(stream, context); + IDWriteFontFileStream_Release(stream); IDWriteLocalFontFileLoader_Release(localloader); IDWriteFactory_Release(factory);

1 0

Michael Stefaniuc : msi/tests: Remove redundant if check (PVS-Studio).
by Alexandre Julliard Nov. 26, 2014

Nov. 26, 2014

Module: wine Branch: master Commit: f52983807e3d9756742a136cd36d50fa7268aa20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f52983807e3d9756742a136cd… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Nov 26 12:08:19 2014 +0100 msi/tests: Remove redundant if check (PVS-Studio). --- dlls/msi/tests/automation.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msi/tests/automation.c b/dlls/msi/tests/automation.c index beed6fd..016b1a2 100644 --- a/dlls/msi/tests/automation.c +++ b/dlls/msi/tests/automation.c @@ -1935,7 +1935,7 @@ static void test_Session(IDispatch *pSession) hr = Session_ModePut(pSession, MSIRUNMODE_REBOOTNOW, TRUE); ok(hr == S_OK, "Session_ModePut failed, hresult 0x%08x\n", hr); - if (hr == DISP_E_EXCEPTION) ok_exception(hr, szModeFlag); + ok_exception(hr, szModeFlag); hr = Session_ModeGet(pSession, MSIRUNMODE_REBOOTNOW, &bool); ok(hr == S_OK, "Session_ModeGet failed, hresult 0x%08x\n", hr); @@ -1943,7 +1943,7 @@ static void test_Session(IDispatch *pSession) hr = Session_ModePut(pSession, MSIRUNMODE_REBOOTNOW, FALSE); /* set it again so we don't reboot */ ok(hr == S_OK, "Session_ModePut failed, hresult 0x%08x\n", hr); - if (hr == DISP_E_EXCEPTION) ok_exception(hr, szModeFlag); + ok_exception(hr, szModeFlag); hr = Session_ModePut(pSession, MSIRUNMODE_MAINTENANCE, TRUE); ok(hr == DISP_E_EXCEPTION, "Session_ModePut failed, hresult 0x%08x\n", hr);

1 0

Nikolay Sivov : gdi32: Clarify read length values used with get_font_data( ).
by Alexandre Julliard Nov. 26, 2014

Nov. 26, 2014

Module: wine Branch: master Commit: 0c507a17688719299ff2fe4962b41f5ad5a4a3fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c507a17688719299ff2fe496… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 25 22:08:22 2014 +0300 gdi32: Clarify read length values used with get_font_data(). --- dlls/gdi32/freetype.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index b063c80..f1af5d6 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -4456,7 +4456,7 @@ typedef struct { static LONG load_VDMX(GdiFont *font, LONG height) { - WORD hdr[3], tmp; + WORD hdr[3]; VDMX_group group; BYTE devXRatio, devYRatio; USHORT numRecs, numRatios; @@ -4464,7 +4464,7 @@ static LONG load_VDMX(GdiFont *font, LONG height) LONG ppem = 0; int i; - result = get_font_data(font, MS_VDMX_TAG, 0, hdr, 6); + result = get_font_data(font, MS_VDMX_TAG, 0, hdr, sizeof(hdr)); if(result == GDI_ERROR) /* no vdmx table present, use linear scaling */ return ppem; @@ -4495,8 +4495,10 @@ static LONG load_VDMX(GdiFont *font, LONG height) devYRatio >= ratio.yStartRatio && devYRatio <= ratio.yEndRatio)) { + WORD tmp; + offset = (3 * 2) + (numRatios * 4) + (i * 2); - get_font_data(font, MS_VDMX_TAG, offset, &tmp, 2); + get_font_data(font, MS_VDMX_TAG, offset, &tmp, sizeof(tmp)); offset = GET_BE_WORD(tmp); break; } @@ -4504,7 +4506,7 @@ static LONG load_VDMX(GdiFont *font, LONG height) if(offset == -1) return 0; - if(get_font_data(font, MS_VDMX_TAG, offset, &group, 4) != GDI_ERROR) { + if(get_font_data(font, MS_VDMX_TAG, offset, &group, sizeof(group)) != GDI_ERROR) { USHORT recs; BYTE startsz, endsz; WORD *vTable;

1 0

Michael Stefaniuc : shlwapi: Remove always true if-check (PVS-Studio).
by Alexandre Julliard Nov. 26, 2014

Nov. 26, 2014

Module: wine Branch: master Commit: 6ae26c7b53bf3ccd039f6976427fbe0f5bb3a7db URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ae26c7b53bf3ccd039f69764… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Nov 26 12:08:26 2014 +0100 shlwapi: Remove always true if-check (PVS-Studio). --- dlls/shlwapi/ordinal.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index 8d3f1eb..0ea235c 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -5054,11 +5054,8 @@ INT WINAPI SHFormatDateTimeW(const FILETIME UNALIGNED *fileTime, DWORD *flags, { if ((fmt_flags & FDTF_LONGDATE) && (ret < size + 2)) { - if (ret < size + 2) - { - lstrcatW(&buf[ret-1], sep1); - ret += 2; - } + lstrcatW(&buf[ret-1], sep1); + ret += 2; } else {

1 0