June 2015 - Wine-Commits - list.winehq.org

Sebastian Lackner : ntdll: Fix status code when NtMapViewOfSection parameter check fails.
by Alexandre Julliard June 8, 2015

June 8, 2015

Module: wine Branch: master Commit: 8ddab2c2f47c53753aa69c588ba86dc9e22d8939 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ddab2c2f47c53753aa69c588… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Jun 5 07:35:11 2015 +0200 ntdll: Fix status code when NtMapViewOfSection parameter check fails. --- dlls/kernel32/tests/virtual.c | 3 --- dlls/ntdll/virtual.c | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index 15fc715..6082740 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -1072,7 +1072,6 @@ static void test_NtMapViewOfSection(void) size = 0; offset.QuadPart = 1; status = pNtMapViewOfSection( mapping, hProcess, &ptr2, 0, 0, &offset, &size, 1, 0, PAGE_READWRITE ); - todo_wine ok( status == STATUS_MAPPED_ALIGNMENT, "NtMapViewOfSection returned %x\n", status ); /* ptr has to be aligned */ @@ -1080,7 +1079,6 @@ static void test_NtMapViewOfSection(void) size = 0; offset.QuadPart = 0; status = pNtMapViewOfSection( mapping, hProcess, &ptr2, 0, 0, &offset, &size, 1, 0, PAGE_READWRITE ); - todo_wine ok( status == STATUS_MAPPED_ALIGNMENT, "NtMapViewOfSection returned %x\n", status ); /* still not 64k aligned */ @@ -1088,7 +1086,6 @@ static void test_NtMapViewOfSection(void) size = 0; offset.QuadPart = 0; status = pNtMapViewOfSection( mapping, hProcess, &ptr2, 0, 0, &offset, &size, 1, 0, PAGE_READWRITE ); - todo_wine ok( status == STATUS_MAPPED_ALIGNMENT, "NtMapViewOfSection returned %x\n", status ); /* zero_bits != 0 is not allowed when an address is set */ diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 0629816..72309f6 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -2602,7 +2602,7 @@ NTSTATUS WINAPI NtMapViewOfSection( HANDLE handle, HANDLE process, PVOID *addr_p /* Check parameters */ if ((offset.u.LowPart & mask) || (*addr_ptr && ((UINT_PTR)*addr_ptr & mask))) - return STATUS_INVALID_PARAMETER; + return STATUS_MAPPED_ALIGNMENT; switch(protect) {

1 0

Sebastian Lackner : ws2_32: Fix uninitialized memory access in do_poll ( Coverity).
by Alexandre Julliard June 8, 2015

June 8, 2015

Module: wine Branch: master Commit: f542a0c18b5a6f0f4d0ef3ce1eb72f48c458035f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f542a0c18b5a6f0f4d0ef3ce1… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sun Jun 7 19:19:39 2015 +0200 ws2_32: Fix uninitialized memory access in do_poll (Coverity). --- dlls/ws2_32/socket.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index fdf68a3..1a4533b 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -4800,6 +4800,7 @@ static int do_poll(struct pollfd *pollfds, int count, int timeout) { if (errno != EINTR) break; if (timeout < 0) continue; + if (timeout == 0) return 0; gettimeofday( &tv2, 0 );

1 0

Sebastian Lackner : ws2_32/tests: Add tests for calling select with zero timeout.
by Alexandre Julliard June 8, 2015

June 8, 2015

Module: wine Branch: master Commit: 3d51b4eb9de6922affb52e57e36fb28e46f334ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d51b4eb9de6922affb52e57e… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sun Jun 7 19:18:51 2015 +0200 ws2_32/tests: Add tests for calling select with zero timeout. --- dlls/ws2_32/tests/sock.c | 38 +++++++++++++++++++++++++++----------- 1 file changed, 27 insertions(+), 11 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 6d328e6..610a563 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -3523,30 +3523,46 @@ static void test_select(void) struct sockaddr_in address; select_thread_params thread_params; HANDLE thread_handle; - DWORD id; + DWORD ticks, id; fdRead = socket(AF_INET, SOCK_STREAM, 0); ok( (fdRead != INVALID_SOCKET), "socket failed unexpectedly: %d\n", WSAGetLastError() ); fdWrite = socket(AF_INET, SOCK_STREAM, 0); ok( (fdWrite != INVALID_SOCKET), "socket failed unexpectedly: %d\n", WSAGetLastError() ); + maxfd = fdRead; + if (fdWrite > maxfd) + maxfd = fdWrite; + FD_ZERO_ALL(); FD_SET_ALL(fdRead); FD_SET_ALL(fdWrite); select_timeout.tv_sec=0; - select_timeout.tv_usec=500; + select_timeout.tv_usec=0; - maxfd = fdRead; - if (fdWrite > maxfd) - maxfd = fdWrite; - + ticks = GetTickCount(); ret = select(maxfd+1, &readfds, &writefds, &exceptfds, &select_timeout); - ok ( (ret == 0), "select should not return any socket handles\n"); - ok ( !FD_ISSET(fdRead, &readfds), "FD should not be set\n"); - ok ( !FD_ISSET(fdWrite, &writefds), "FD should not be set\n"); - ok ( !FD_ISSET(fdRead, &exceptfds), "FD should not be set\n"); - ok ( !FD_ISSET(fdWrite, &exceptfds), "FD should not be set\n"); + ticks = GetTickCount() - ticks; + ok(ret == 0, "select should not return any socket handles\n"); + ok(ticks < 10, "select was blocking for %u ms, expected < 10 ms\n", ticks); + ok(!FD_ISSET(fdRead, &readfds), "FD should not be set\n"); + ok(!FD_ISSET(fdWrite, &writefds), "FD should not be set\n"); + ok(!FD_ISSET(fdRead, &exceptfds), "FD should not be set\n"); + ok(!FD_ISSET(fdWrite, &exceptfds), "FD should not be set\n"); + FD_ZERO_ALL(); + FD_SET_ALL(fdRead); + FD_SET_ALL(fdWrite); + select_timeout.tv_sec=0; + select_timeout.tv_usec=500; + + ret = select(maxfd+1, &readfds, &writefds, &exceptfds, &select_timeout); + ok(ret == 0, "select should not return any socket handles\n"); + ok(!FD_ISSET(fdRead, &readfds), "FD should not be set\n"); + ok(!FD_ISSET(fdWrite, &writefds), "FD should not be set\n"); + ok(!FD_ISSET(fdRead, &exceptfds), "FD should not be set\n"); + ok(!FD_ISSET(fdWrite, &exceptfds), "FD should not be set\n"); + ok ((listen(fdWrite, SOMAXCONN) == SOCKET_ERROR), "listen did not fail\n"); ret = closesocket(fdWrite); ok ( (ret == 0), "closesocket failed unexpectedly: %d\n", ret);

1 0

Nikolay Sivov : kernel32: Fail properly for unsupported classes in GetFileInformationByHandleEx.
by Alexandre Julliard June 8, 2015

June 8, 2015

Module: wine Branch: master Commit: b17e4376d571347ebdbbe1ddd3e612614d3fc1e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b17e4376d571347ebdbbe1ddd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jun 7 00:56:14 2015 +0300 kernel32: Fail properly for unsupported classes in GetFileInformationByHandleEx. --- dlls/kernel32/file.c | 10 +++++----- dlls/kernel32/tests/file.c | 29 ++++++++++++++++++++++++++++- include/winbase.h | 30 ++++++++++++++++++++++++++++++ 3 files changed, 63 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index a680ab2..0b208a5 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -897,14 +897,9 @@ BOOL WINAPI GetFileInformationByHandleEx( HANDLE handle, FILE_INFO_BY_HANDLE_CLA switch (class) { - case FileRenameInfo: - case FileDispositionInfo: - case FileAllocationInfo: - case FileEndOfFileInfo: case FileStreamInfo: case FileCompressionInfo: case FileAttributeTagInfo: - case FileIoPriorityHintInfo: case FileRemoteProtocolInfo: case FileFullDirectoryInfo: case FileFullDirectoryRestartInfo: @@ -936,6 +931,11 @@ BOOL WINAPI GetFileInformationByHandleEx( HANDLE handle, FILE_INFO_BY_HANDLE_CLA (class == FileIdBothDirectoryRestartInfo) ); break; + case FileRenameInfo: + case FileDispositionInfo: + case FileAllocationInfo: + case FileIoPriorityHintInfo: + case FileEndOfFileInfo: default: SetLastError( ERROR_INVALID_PARAMETER ); return FALSE; diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index bd85e01..9480bd4 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -3830,6 +3830,12 @@ static void test_GetFileInformationByHandleEx(void) FILE_STANDARD_INFO *standardInfo; FILE_NAME_INFO *nameInfo; LARGE_INTEGER prevWrite; + FILE_IO_PRIORITY_HINT_INFO priohintinfo; + FILE_ALLOCATION_INFO allocinfo; + FILE_DISPOSITION_INFO dispinfo; + FILE_END_OF_FILE_INFO eofinfo; + FILE_RENAME_INFO renameinfo; + struct { FILE_INFO_BY_HANDLE_CLASS handleClass; void *ptr; @@ -3952,8 +3958,29 @@ static void test_GetFileInformationByHandleEx(void) for (i = 0; i < nameInfo->FileNameLength/2; i++) ok(strPtr[i] == nameInfo->FileName[i], "Incorrect filename char %d: %c vs %c\n", i, strPtr[i], nameInfo->FileName[i]); - CloseHandle(file); + /* invalid classes */ + SetLastError(0xdeadbeef); + ret = pGetFileInformationByHandleEx(file, FileEndOfFileInfo, &eofinfo, sizeof(eofinfo)); + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "got %d, error %d\n", ret, GetLastError()); + + SetLastError(0xdeadbeef); + ret = pGetFileInformationByHandleEx(file, FileIoPriorityHintInfo, &priohintinfo, sizeof(priohintinfo)); + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "got %d, error %d\n", ret, GetLastError()); + + SetLastError(0xdeadbeef); + ret = pGetFileInformationByHandleEx(file, FileAllocationInfo, &allocinfo, sizeof(allocinfo)); + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "got %d, error %d\n", ret, GetLastError()); + + SetLastError(0xdeadbeef); + ret = pGetFileInformationByHandleEx(file, FileDispositionInfo, &dispinfo, sizeof(dispinfo)); + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "got %d, error %d\n", ret, GetLastError()); + + SetLastError(0xdeadbeef); + ret = pGetFileInformationByHandleEx(file, FileRenameInfo, &renameinfo, sizeof(renameinfo)); + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "got %d, error %d\n", ret, GetLastError()); + + CloseHandle(file); DeleteFileA(tempFileName); } diff --git a/include/winbase.h b/include/winbase.h index 3601051..4795d87 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -844,6 +844,36 @@ typedef struct _FILE_NAME_INFO { WCHAR FileName[1]; } FILE_NAME_INFO, *PFILE_NAME_INFO; +typedef enum _PRIORITY_HINT { + IoPriorityHintVeryLow, + IoPriorityHintLow, + IoPriorityHintNormal, + MaximumIoPriorityHintType +} PRIORITY_HINT; + +typedef struct _FILE_IO_PRIORITY_HINT_INFO { + PRIORITY_HINT PriorityHint; +} FILE_IO_PRIORITY_HINT_INFO; + +typedef struct _FILE_ALLOCATION_INFO { + LARGE_INTEGER AllocationSize; +} FILE_ALLOCATION_INFO, *PFILE_ALLOCATION_INFO; + +typedef struct _FILE_DISPOSITION_INFO { + BOOLEAN DeleteFile; +} FILE_DISPOSITION_INFO, *PFILE_DISPOSITION_INFO; + +typedef struct _FILE_END_OF_FILE_INFO { + LARGE_INTEGER EndOfFile; +} FILE_END_OF_FILE_INFO, *PFILE_END_OF_FILE_INFO; + +typedef struct _FILE_RENAME_INFO { + BOOLEAN ReplaceIfExists; + HANDLE RootDirectory; + DWORD FileNameLength; + WCHAR FileName[1]; +} FILE_RENAME_INFO, *PFILE_RENAME_INFO; + #define PIPE_ACCESS_INBOUND 1 #define PIPE_ACCESS_OUTBOUND 2 #define PIPE_ACCESS_DUPLEX 3

1 0

Nikolay Sivov : oleaut32: Remove dead switch case VT_I1 entry for VarSub ( Coverity).
by Alexandre Julliard June 8, 2015

June 8, 2015

Module: wine Branch: master Commit: 7bb743cca6b41a82e8aa4117a87afd50be9e6fc3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7bb743cca6b41a82e8aa4117a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jun 7 23:14:50 2015 +0300 oleaut32: Remove dead switch case VT_I1 entry for VarSub (Coverity). --- dlls/oleaut32/variant.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index feba6c5..8ca9cf9 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -3947,9 +3947,6 @@ HRESULT WINAPI VarSub(LPVARIANT left, LPVARIANT right, LPVARIANT result) case VT_I2: V_I2(result) = V_I2(&lv) - V_I2(&rv); break; - case VT_I1: - V_I1(result) = V_I1(&lv) - V_I1(&rv); - break; case VT_UI1: V_UI1(result) = V_UI2(&lv) - V_UI1(&rv); break;

1 0

Nikolay Sivov : riched20: Implement GetDuplicate() for selection.
by Alexandre Julliard June 8, 2015

June 8, 2015

Module: wine Branch: master Commit: 5f933018a289125c180b83002f4a355ca3d20daa URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f933018a289125c180b83002… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jun 6 21:32:00 2015 +0300 riched20: Implement GetDuplicate() for selection. --- dlls/riched20/richole.c | 14 ++++++-- dlls/riched20/tests/richole.c | 75 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 86 insertions(+), 3 deletions(-) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 019a25f..b7f0298 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -4223,14 +4223,22 @@ static HRESULT WINAPI ITextSelection_fnSetChar(ITextSelection *me, LONG ch) return E_NOTIMPL; } -static HRESULT WINAPI ITextSelection_fnGetDuplicate(ITextSelection *me, ITextRange **ppRange) +static HRESULT WINAPI ITextSelection_fnGetDuplicate(ITextSelection *me, ITextRange **range) { ITextSelectionImpl *This = impl_from_ITextSelection(me); + LONG start, end; + + TRACE("(%p)->(%p)\n", This, range); + if (!This->reOle) return CO_E_RELEASED; - FIXME("not implemented\n"); - return E_NOTIMPL; + if (!range) + return E_INVALIDARG; + + ITextSelection_GetStart(me, &start); + ITextSelection_GetEnd(me, &end); + return CreateITextRange(This->reOle, start, end, range); } static HRESULT WINAPI ITextSelection_fnGetFormattedText(ITextSelection *me, ITextRange **ppRange) diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index 515b9ad..fd4d9e8 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -3177,6 +3177,80 @@ static void test_GetStoryLength(void) ITextRange_Release(range); } +static void test_ITextSelection_GetDuplicate(void) +{ + static const CHAR test_text1[] = "TestSomeText"; + IRichEditOle *reOle = NULL; + ITextDocument *doc = NULL; + ITextSelection *selection, *sel2; + ITextRange *range, *range2; + ITextFont *font; + LONG value; + HRESULT hr; + HWND hwnd; + + create_interfaces(&hwnd, &reOle, &doc, &selection); + SendMessageA(hwnd, WM_SETTEXT, 0, (LPARAM)test_text1); + SendMessageA(hwnd, EM_SETSEL, 1, 2); + + hr = ITextSelection_GetDuplicate(selection, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + EXPECT_REF(selection, 2); + + hr = ITextSelection_GetDuplicate(selection, &range); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = ITextSelection_GetDuplicate(selection, &range2); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(range != range2, "got %p, %p\n", range, range2); + + EXPECT_REF(selection, 2); + EXPECT_REF(range, 1); + EXPECT_REF(range2, 1); + + ITextRange_Release(range2); + + value = 0; + hr = ITextRange_GetStart(range, &value); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(value == 1, "got %d\n", value); + + value = 0; + hr = ITextRange_GetEnd(range, &value); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(value == 2, "got %d\n", value); + + SendMessageA(hwnd, EM_SETSEL, 2, 3); + + value = 0; + hr = ITextRange_GetStart(range, &value); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(value == 1, "got %d\n", value); + + value = 0; + hr = ITextRange_GetEnd(range, &value); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(value == 2, "got %d\n", value); + + hr = ITextRange_QueryInterface(range, &IID_ITextSelection, (void**)&sel2); + ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); + + release_interfaces(&hwnd, &reOle, &doc, NULL); + + hr = ITextSelection_GetDuplicate(selection, NULL); + ok(hr == CO_E_RELEASED, "got 0x%08x\n", hr); + + hr = ITextSelection_GetDuplicate(selection, &range); + ok(hr == CO_E_RELEASED, "got 0x%08x\n", hr); + + hr = ITextRange_GetFont(range, &font); + ok(hr == CO_E_RELEASED, "got 0x%08x\n", hr); + + ITextSelection_Release(selection); + ITextRange_Release(range); +} + START_TEST(richole) { /* Must explicitly LoadLibrary(). The test has no references to functions in @@ -3211,4 +3285,5 @@ START_TEST(richole) test_SetFont(); test_InsertObject(); test_GetStoryLength(); + test_ITextSelection_GetDuplicate(); }

1 0

Nikolay Sivov : dwrite: Validate per-range attribute values.
by Alexandre Julliard June 8, 2015

June 8, 2015

Module: wine Branch: master Commit: 7be11594799c7b37ae2a285ce36f68bcdaec9d21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7be11594799c7b37ae2a285ce… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jun 6 19:05:00 2015 +0300 dwrite: Validate per-range attribute values. --- dlls/dwrite/layout.c | 9 +++++++++ dlls/dwrite/tests/layout.c | 28 +++++++++++++++++++++++++++- 2 files changed, 36 insertions(+), 1 deletion(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index af0e6f3..150e34b 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -1937,6 +1937,9 @@ static HRESULT WINAPI dwritetextlayout_SetFontStyle(IDWriteTextLayout2 *iface, D TRACE("(%p)->(%d %s)\n", This, style, debugstr_range(&range)); + if ((UINT32)style > DWRITE_FONT_STYLE_ITALIC) + return E_INVALIDARG; + value.range = range; value.u.style = style; return set_layout_range_attr(This, LAYOUT_RANGE_ATTR_STYLE, &value); @@ -1949,6 +1952,9 @@ static HRESULT WINAPI dwritetextlayout_SetFontStretch(IDWriteTextLayout2 *iface, TRACE("(%p)->(%d %s)\n", This, stretch, debugstr_range(&range)); + if (stretch == DWRITE_FONT_STRETCH_UNDEFINED || (UINT32)stretch > DWRITE_FONT_STRETCH_ULTRA_EXPANDED) + return E_INVALIDARG; + value.range = range; value.u.stretch = stretch; return set_layout_range_attr(This, LAYOUT_RANGE_ATTR_STRETCH, &value); @@ -1961,6 +1967,9 @@ static HRESULT WINAPI dwritetextlayout_SetFontSize(IDWriteTextLayout2 *iface, FL TRACE("(%p)->(%.2f %s)\n", This, size, debugstr_range(&range)); + if (size <= 0.0) + return E_INVALIDARG; + value.range = range; value.u.fontsize = size; return set_layout_range_attr(This, LAYOUT_RANGE_ATTR_FONTSIZE, &value); diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 4c76f50..a740c4f 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -1832,6 +1832,15 @@ static void test_SetFontSize(void) hr = IDWriteFactory_CreateTextLayout(factory, strW, 4, format, 1000.0, 1000.0, &layout); ok(hr == S_OK, "got 0x%08x\n", hr); + /* negative/zero size */ + r.startPosition = 1; + r.length = 1; + hr = IDWriteTextLayout_SetFontSize(layout, -15.0, r); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + hr = IDWriteTextLayout_SetFontSize(layout, 0.0, r); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + r.startPosition = 1; r.length = 0; size = 0.0; @@ -1909,6 +1918,12 @@ static void test_SetFontFamilyName(void) hr = IDWriteFactory_CreateTextLayout(factory, strW, 4, format, 1000.0, 1000.0, &layout); ok(hr == S_OK, "got 0x%08x\n", hr); + /* NULL name */ + r.startPosition = 1; + r.length = 1; + hr = IDWriteTextLayout_SetFontFamilyName(layout, NULL, r); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + r.startPosition = 1; r.length = 0; nameW[0] = 0; @@ -1961,6 +1976,12 @@ static void test_SetFontStyle(void) hr = IDWriteFactory_CreateTextLayout(factory, strW, 4, format, 1000.0, 1000.0, &layout); ok(hr == S_OK, "got 0x%08x\n", hr); + /* invalid style value */ + r.startPosition = 1; + r.length = 1; + hr = IDWriteTextLayout_SetFontStyle(layout, DWRITE_FONT_STYLE_ITALIC+1, r); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + r.startPosition = 1; r.length = 0; hr = IDWriteTextLayout_GetFontStyle(layout, 0, &style, &r); @@ -2036,6 +2057,12 @@ static void test_SetFontStretch(void) hr = IDWriteFactory_CreateTextLayout(factory, strW, 4, format, 1000.0, 1000.0, &layout); ok(hr == S_OK, "got 0x%08x\n", hr); + /* invalid stretch value */ + r.startPosition = 1; + r.length = 1; + hr = IDWriteTextLayout_SetFontStretch(layout, DWRITE_FONT_STRETCH_ULTRA_EXPANDED+1, r); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + r.startPosition = 1; r.length = 0; stretch = DWRITE_FONT_STRETCH_UNDEFINED; @@ -2093,7 +2120,6 @@ static void test_SetFontStretch(void) r.startPosition = 0; r.length = 2; hr = IDWriteTextLayout_SetFontStretch(layout, DWRITE_FONT_STRETCH_UNDEFINED, r); -todo_wine ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); IDWriteTextLayout_Release(layout);

1 0

Nikolay Sivov : crypt32: Fix tracing of out argument (Coverity).
by Alexandre Julliard June 8, 2015

June 8, 2015

Module: wine Branch: master Commit: 55e3a03ba3e1d47b9860ae5e274bea481e8bf461 URL: http://source.winehq.org/git/wine.git/?a=commit;h=55e3a03ba3e1d47b9860ae5e2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jun 7 09:04:45 2015 +0300 crypt32: Fix tracing of out argument (Coverity). --- dlls/crypt32/decode.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index 90d8cdf..888ea05 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -5757,8 +5757,8 @@ BOOL CRYPT_AsnDecodeCMSSignedInfo(const BYTE *pbEncoded, DWORD cbEncoded, offsetof(CRYPT_SIGNED_INFO, rgSignerInfo), 0 }, }; - TRACE("%p, %d, %08x, %p, %p, %d\n", pbEncoded, cbEncoded, dwFlags, - pDecodePara, signedInfo, *pcbSignedInfo); + TRACE("%p, %d, %08x, %p, %p, %p\n", pbEncoded, cbEncoded, dwFlags, + pDecodePara, signedInfo, pcbSignedInfo); ret = CRYPT_AsnDecodeSequence(items, sizeof(items) / sizeof(items[0]), pbEncoded, cbEncoded, dwFlags, pDecodePara, signedInfo, pcbSignedInfo, @@ -5875,8 +5875,8 @@ BOOL CRYPT_AsnDecodePKCSEnvelopedData(const BYTE *pbEncoded, DWORD cbEncoded, offsetof(CRYPT_ENVELOPED_DATA, encryptedContentInfo.contentType), 0 }, }; - TRACE("%p, %d, %08x, %p, %p, %d\n", pbEncoded, cbEncoded, dwFlags, - pDecodePara, envelopedData, *pcbEnvelopedData); + TRACE("%p, %d, %08x, %p, %p, %p\n", pbEncoded, cbEncoded, dwFlags, + pDecodePara, envelopedData, pcbEnvelopedData); ret = CRYPT_AsnDecodeSequence(items, sizeof(items) / sizeof(items[0]), pbEncoded, cbEncoded, dwFlags, pDecodePara, envelopedData,

1 0

Nikolay Sivov : gdi32: Return GCP_USEKERNING if font has kerning pairs support.
by Alexandre Julliard June 8, 2015

June 8, 2015

Module: wine Branch: master Commit: ce58518c6e194e3d94e8aabc974cf4689b274c03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce58518c6e194e3d94e8aabc9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jun 7 08:44:57 2015 +0300 gdi32: Return GCP_USEKERNING if font has kerning pairs support. --- dlls/gdi32/font.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 9f0de0e..63de76b 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -3032,7 +3032,6 @@ DWORD WINAPI GetFontLanguageInfo(HDC hdc) GCP_GLYPHSHAPE_MASK=FS_ARABIC, GCP_KASHIDA_MASK=0x00000000, GCP_LIGATE_MASK=0x00000000, - GCP_USEKERNING_MASK=0x00000000, GCP_REORDER_MASK=FS_HEBREW|FS_ARABIC; DWORD result=0; @@ -3058,7 +3057,7 @@ DWORD WINAPI GetFontLanguageInfo(HDC hdc) if( (fontsig.fsCsb[0]&GCP_LIGATE_MASK)!=0 ) result|=GCP_LIGATE; - if( (fontsig.fsCsb[0]&GCP_USEKERNING_MASK)!=0 ) + if( GetKerningPairsW( hdc, 0, NULL ) ) result|=GCP_USEKERNING; /* this might need a test for a HEBREW- or ARABIC_CHARSET as well */

1 0

Nikolay Sivov : gameux: Use matching heap call (Coverity).
by Alexandre Julliard June 8, 2015

June 8, 2015

Module: wine Branch: master Commit: 8abd5b76c454a5dac37101292fe8fb0c1f4e1acc URL: http://source.winehq.org/git/wine.git/?a=commit;h=8abd5b76c454a5dac37101292… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jun 7 23:55:48 2015 +0300 gameux: Use matching heap call (Coverity). --- dlls/gameux/gameexplorer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gameux/gameexplorer.c b/dlls/gameux/gameexplorer.c index 6bdb2e4..63bf69d 100644 --- a/dlls/gameux/gameexplorer.c +++ b/dlls/gameux/gameexplorer.c @@ -756,7 +756,7 @@ HRESULT GAMEUX_FindGameInstanceId( if(SUCCEEDED(hr)) { ++dwMaxSubKeyLen; /* for string terminator */ - lpName = CoTaskMemAlloc(dwMaxSubKeyLen*sizeof(WCHAR)); + lpName = HeapAlloc(GetProcessHeap(), 0, dwMaxSubKeyLen*sizeof(WCHAR)); if(!lpName) hr = E_OUTOFMEMORY; }

1 0