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

Nikolay Sivov : dwrite: Initial implementation of DetermineMinWidth().
by Alexandre Julliard March 30, 2015

March 30, 2015

Module: wine Branch: master Commit: 8303199cbe4e0e2a645fe45161fb36922753bc68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8303199cbe4e0e2a645fe4516… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 30 10:15:48 2015 +0300 dwrite: Initial implementation of DetermineMinWidth(). --- dlls/dwrite/layout.c | 73 +++++++++++++++++++++++++++++++++++++++++----- dlls/dwrite/tests/layout.c | 33 ++++++++++++++++++++- 2 files changed, 97 insertions(+), 9 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 054aae7..28889a7 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -1,7 +1,7 @@ /* * Text format and layout * - * Copyright 2012, 2014 Nikolay Sivov for CodeWeavers + * Copyright 2012, 2014-2015 Nikolay Sivov for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -121,6 +121,12 @@ struct layout_run { DWRITE_GLYPH_OFFSET *offsets; }; +enum layout_recompute_mask { + RECOMPUTE_NOMINAL_RUNS = 1 << 0, + RECOMPUTE_MINIMAL_WIDTH = 1 << 1, + RECOMPUTE_EVERYTHING = 0xffff +}; + struct dwrite_textlayout { IDWriteTextLayout2 IDWriteTextLayout2_iface; IDWriteTextFormat1 IDWriteTextFormat1_iface; @@ -135,13 +141,14 @@ struct dwrite_textlayout { FLOAT maxheight; struct list ranges; struct list runs; - BOOL recompute; + USHORT recompute; DWRITE_LINE_BREAKPOINT *nominal_breakpoints; DWRITE_LINE_BREAKPOINT *actual_breakpoints; DWRITE_CLUSTER_METRICS *clusters; UINT32 clusters_count; + FLOAT minwidth; /* gdi-compatible layout specifics */ BOOL gdicompatible; @@ -586,7 +593,7 @@ static HRESULT layout_compute(struct dwrite_textlayout *layout) { HRESULT hr; - if (!layout->recompute) + if (!(layout->recompute & RECOMPUTE_NOMINAL_RUNS)) return S_OK; /* nominal breakpoints are evaluated only once, because string never changes */ @@ -618,7 +625,7 @@ static HRESULT layout_compute(struct dwrite_textlayout *layout) } } - layout->recompute = FALSE; + layout->recompute &= ~RECOMPUTE_NOMINAL_RUNS; return hr; } @@ -998,7 +1005,7 @@ done: if (changed) { struct list *next, *i; - layout->recompute = TRUE; + layout->recompute = RECOMPUTE_EVERYTHING; i = list_head(ranges); while ((next = list_next(ranges, i))) { struct layout_range *next_range = LIST_ENTRY(next, struct layout_range, entry); @@ -1743,11 +1750,60 @@ static HRESULT WINAPI dwritetextlayout_GetClusterMetrics(IDWriteTextLayout2 *ifa return max_count >= This->clusters_count ? S_OK : E_NOT_SUFFICIENT_BUFFER; } +/* Only to be used with DetermineMinWidth() to find the longest cluster sequence that we don't want to try + too hard to break. */ +static inline BOOL is_terminal_cluster(struct dwrite_textlayout *layout, UINT32 index) +{ + if (layout->clusters[index].isWhitespace || layout->clusters[index].isNewline || + (index == layout->clusters_count - 1)) + return TRUE; + /* check next one */ + return (index < layout->clusters_count - 1) && layout->clusters[index+1].isWhitespace; +} + static HRESULT WINAPI dwritetextlayout_DetermineMinWidth(IDWriteTextLayout2 *iface, FLOAT* min_width) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout2(iface); - FIXME("(%p)->(%p): stub\n", This, min_width); - return E_NOTIMPL; + FLOAT width; + HRESULT hr; + UINT32 i; + + TRACE("(%p)->(%p)\n", This, min_width); + + if (!min_width) + return E_INVALIDARG; + + if (!(This->recompute & RECOMPUTE_MINIMAL_WIDTH)) + goto width_done; + + *min_width = 0.0; + hr = layout_compute(This); + if (FAILED(hr)) + return hr; + + for (i = 0; i < This->clusters_count;) { + if (is_terminal_cluster(This, i)) { + width = This->clusters[i].width; + i++; + } + else { + width = 0.0; + while (!is_terminal_cluster(This, i)) { + width += This->clusters[i].width; + i++; + } + /* count last one too */ + width += This->clusters[i].width; + } + + if (width > This->minwidth) + This->minwidth = width; + } + This->recompute &= ~RECOMPUTE_MINIMAL_WIDTH; + +width_done: + *min_width = This->minwidth; + return S_OK; } static HRESULT WINAPI dwritetextlayout_HitTestPoint(IDWriteTextLayout2 *iface, @@ -2579,11 +2635,12 @@ static HRESULT init_textlayout(const WCHAR *str, UINT32 len, IDWriteTextFormat * layout->len = len; layout->maxwidth = maxwidth; layout->maxheight = maxheight; - layout->recompute = TRUE; + layout->recompute = RECOMPUTE_EVERYTHING; layout->nominal_breakpoints = NULL; layout->actual_breakpoints = NULL; layout->clusters_count = 0; layout->clusters = NULL; + layout->minwidth = 0.0; list_init(&layout->runs); list_init(&layout->ranges); memset(&layout->format, 0, sizeof(layout->format)); diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index bbfc7bc..f36c01e 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -1,7 +1,7 @@ /* * Text layout/format tests * - * Copyright 2012, 2014 Nikolay Sivov for CodeWeavers + * Copyright 2012, 2014-2015 Nikolay Sivov for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -1297,6 +1297,36 @@ if (hr == S_OK) { IDWriteFactory_Release(factory); } +static void test_DetermineMinWidth(void) +{ + static const WCHAR strW[] = {'a','b','c','d',0}; + IDWriteTextFormat *format; + IDWriteTextLayout *layout; + IDWriteFactory *factory; + FLOAT minwidth; + HRESULT hr; + + factory = create_factory(); + + hr = IDWriteFactory_CreateTextFormat(factory, tahomaW, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, + DWRITE_FONT_STRETCH_NORMAL, 10.0, enusW, &format); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFactory_CreateTextLayout(factory, strW, lstrlenW(strW), format, 1000.0, 1000.0, &layout); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteTextLayout_DetermineMinWidth(layout, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + minwidth = 0.0; + hr = IDWriteTextLayout_DetermineMinWidth(layout, &minwidth); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(minwidth > 0.0, "got %.2f\n", minwidth); + + IDWriteTextLayout_Release(layout); + IDWriteTextFormat_Release(format); +} + START_TEST(layout) { IDWriteFactory *factory; @@ -1323,6 +1353,7 @@ START_TEST(layout) test_SetPairKerning(); test_SetVerticalGlyphOrientation(); test_fallback(); + test_DetermineMinWidth(); IDWriteFactory_Release(factory); }

1 0

Nikolay Sivov : comctl32/listview: Always forward LVM_GETCOLUMNORDERARRAY to header.
by Alexandre Julliard March 30, 2015

March 30, 2015

Module: wine Branch: master Commit: 5c2e7075df45370c6d74b230a8531fcea2fd473f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c2e7075df45370c6d74b230a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Mar 28 22:06:26 2015 +0300 comctl32/listview: Always forward LVM_GETCOLUMNORDERARRAY to header. --- dlls/comctl32/listview.c | 9 ++------- dlls/comctl32/tests/listview.c | 22 +++++++++++++++++++++- 2 files changed, 23 insertions(+), 8 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 0b3439b..44aaba0 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -6502,14 +6502,9 @@ static BOOL LISTVIEW_GetColumnT(const LISTVIEW_INFO *infoPtr, INT nColumn, LPLVC return TRUE; } - -static BOOL LISTVIEW_GetColumnOrderArray(const LISTVIEW_INFO *infoPtr, INT iCount, LPINT lpiArray) +static inline BOOL LISTVIEW_GetColumnOrderArray(const LISTVIEW_INFO *infoPtr, INT iCount, LPINT lpiArray) { - TRACE("iCount=%d, lpiArray=%p\n", iCount, lpiArray); - - if (!lpiArray) - return FALSE; - + if (!infoPtr->hwndHeader) return FALSE; return SendMessageW(infoPtr->hwndHeader, HDM_GETORDERARRAY, iCount, (LPARAM)lpiArray); } diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 8ce1cfe..0947251 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -176,6 +176,8 @@ static const struct message listview_ownerdata_switchto_seq[] = { static const struct message listview_getorderarray_seq[] = { { LVM_GETCOLUMNORDERARRAY, sent|id|wparam, 2, 0, LISTVIEW_ID }, { HDM_GETORDERARRAY, sent|id|wparam, 2, 0, HEADER_ID }, + { LVM_GETCOLUMNORDERARRAY, sent|id|wparam, 0, 0, LISTVIEW_ID }, + { HDM_GETORDERARRAY, sent|id|wparam, 0, 0, HEADER_ID }, { 0 } }; @@ -1413,13 +1415,28 @@ static void test_items(void) static void test_columns(void) { - HWND hwnd; + HWND hwnd, header; LVCOLUMNA column; LVITEMA item; INT order[2]; CHAR buff[5]; DWORD rc; + hwnd = CreateWindowExA(0, "SysListView32", "foo", LVS_LIST, + 10, 10, 100, 200, hwndparent, NULL, NULL, NULL); + ok(hwnd != NULL, "failed to create listview window\n"); + + header = (HWND)SendMessageA(hwnd, LVM_GETHEADER, 0, 0); + ok(header == NULL, "got %p\n", header); + + rc = SendMessageA(hwnd, LVM_GETCOLUMNORDERARRAY, 2, (LPARAM)&order); + ok(rc == 0, "got %d\n", rc); + + header = (HWND)SendMessageA(hwnd, LVM_GETHEADER, 0, 0); + ok(header == NULL, "got %p\n", header); + + DestroyWindow(hwnd); + hwnd = CreateWindowExA(0, "SysListView32", "foo", LVS_REPORT, 10, 10, 100, 200, hwndparent, NULL, NULL, NULL); ok(hwnd != NULL, "failed to create listview window\n"); @@ -1457,6 +1474,9 @@ static void test_columns(void) ok(order[0] == 0, "Expected order 0, got %d\n", order[0]); ok(order[1] == 1, "Expected order 1, got %d\n", order[1]); + rc = SendMessageA(hwnd, LVM_GETCOLUMNORDERARRAY, 0, 0); + expect(0, rc); + ok_sequence(sequences, LISTVIEW_SEQ_INDEX, listview_getorderarray_seq, "get order array", FALSE); /* after column added subitem is considered as present */

1 0

Nikolay Sivov : comctl32/listview: Fix scrolling in LV_VIEW_DETAILS view.
by Alexandre Julliard March 30, 2015

March 30, 2015

Module: wine Branch: master Commit: 3c9db1df604a0a56ddd769413f20053fa4cdbc4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c9db1df604a0a56ddd769413… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Mar 28 18:35:07 2015 +0300 comctl32/listview: Fix scrolling in LV_VIEW_DETAILS view. --- dlls/comctl32/listview.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 3ac84a9..0b3439b 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -4565,13 +4565,22 @@ static void LISTVIEW_DrawItemPart(LISTVIEW_INFO *infoPtr, LVITEMW *item, const N OffsetRect(&rcIcon, pos->x, pos->y); OffsetRect(&rcStateIcon, pos->x, pos->y); OffsetRect(&rcLabel, pos->x, pos->y); - TRACE(" rcBox=%s, rcSelect=%s, rcIcon=%s. rcLabel=%s\n", + TRACE("%d: box=%s, select=%s, icon=%s. label=%s\n", item->iSubItem, wine_dbgstr_rect(&rcBox), wine_dbgstr_rect(&rcSelect), wine_dbgstr_rect(&rcIcon), wine_dbgstr_rect(&rcLabel)); /* FIXME: temporary hack */ rcSelect.left = rcLabel.left; + if (infoPtr->uView == LV_VIEW_DETAILS && item->iSubItem == 0) + { + if (!(infoPtr->dwLvExStyle & LVS_EX_FULLROWSELECT)) + OffsetRect(&rcSelect, LISTVIEW_GetColumnInfo(infoPtr, 0)->rcHeader.left, 0); + OffsetRect(&rcIcon, LISTVIEW_GetColumnInfo(infoPtr, 0)->rcHeader.left, 0); + OffsetRect(&rcStateIcon, LISTVIEW_GetColumnInfo(infoPtr, 0)->rcHeader.left, 0); + OffsetRect(&rcLabel, LISTVIEW_GetColumnInfo(infoPtr, 0)->rcHeader.left, 0); + } + /* in icon mode, the label rect is really what we want to draw the * background for */ /* in detail mode, we want to paint background for label rect when @@ -4900,9 +4909,9 @@ static void LISTVIEW_RefreshReport(LISTVIEW_INFO *infoPtr, ITERATOR *i, HDC hdc, { INT rgntype; RECT rcClip, rcItem; - POINT Origin, Position; + POINT Origin; RANGES colRanges; - INT col, index; + INT col; ITERATOR j; TRACE("()\n"); @@ -4919,7 +4928,7 @@ static void LISTVIEW_RefreshReport(LISTVIEW_INFO *infoPtr, ITERATOR *i, HDC hdc, /* narrow down the columns we need to paint */ for(col = 0; col < DPA_GetPtrCount(infoPtr->hdpaColumns); col++) { - index = SendMessageW(infoPtr->hwndHeader, HDM_ORDERTOINDEX, col, 0); + INT index = SendMessageW(infoPtr->hwndHeader, HDM_ORDERTOINDEX, col, 0); LISTVIEW_GetHeaderRect(infoPtr, index, &rcItem); if ((rcItem.right + Origin.x >= rcClip.left) && (rcItem.left + Origin.x < rcClip.right)) @@ -4935,10 +4944,12 @@ static void LISTVIEW_RefreshReport(LISTVIEW_INFO *infoPtr, ITERATOR *i, HDC hdc, while(iterator_next(i)) { RANGES subitems; + POINT Position; ITERATOR k; SelectObject(hdc, infoPtr->hFont); LISTVIEW_GetItemOrigin(infoPtr, i->nItem, &Position); + Position.x = Origin.x; Position.y += Origin.y; subitems = ranges_create(DPA_GetPtrCount(infoPtr->hdpaColumns)); @@ -4947,7 +4958,6 @@ static void LISTVIEW_RefreshReport(LISTVIEW_INFO *infoPtr, ITERATOR *i, HDC hdc, while(iterator_next(&j)) { LISTVIEW_GetHeaderRect(infoPtr, j.nItem, &rcItem); - Position.x = (j.nItem == 0) ? rcItem.left + Origin.x : Origin.x; if (rgntype == COMPLEXREGION && !((infoPtr->dwLvExStyle & LVS_EX_FULLROWSELECT) && j.nItem == 0)) {

1 0

Alexandre Julliard : riched20/tests: Print full flag values in traces.
by Alexandre Julliard March 30, 2015

March 30, 2015

Module: wine Branch: master Commit: 488e3d70a6b026601cdb66c4e7f8bc584efb820a URL: http://source.winehq.org/git/wine.git/?a=commit;h=488e3d70a6b026601cdb66c4e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 30 19:48:08 2015 +0900 riched20/tests: Print full flag values in traces. --- dlls/riched20/tests/editor.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index b15f16f..151fcba 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -7615,12 +7615,12 @@ static void test_EM_SETREADONLY(void) res = SendMessageA(richedit, EM_SETREADONLY, TRUE, 0); ok(res == 1, "EM_SETREADONLY\n"); dwStyle = GetWindowLongA(richedit, GWL_STYLE); - ok(dwStyle & ES_READONLY, "got wrong value: 0x%x\n", dwStyle & ES_READONLY); + ok(dwStyle & ES_READONLY, "got wrong value: 0x%x\n", dwStyle); res = SendMessageA(richedit, EM_SETREADONLY, FALSE, 0); ok(res == 1, "EM_SETREADONLY\n"); dwStyle = GetWindowLongA(richedit, GWL_STYLE); - ok(!(dwStyle & ES_READONLY), "got wrong value: 0x%x\n", dwStyle & ES_READONLY); + ok(!(dwStyle & ES_READONLY), "got wrong value: 0x%x\n", dwStyle); DestroyWindow(richedit); }

1 0

Alexandre Julliard : msacm32: Print full flag values in traces.
by Alexandre Julliard March 30, 2015

March 30, 2015

Module: wine Branch: master Commit: 9b6c203d8fae887a08efcf2db9a23c74539a420d URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b6c203d8fae887a08efcf2db… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 30 19:47:54 2015 +0900 msacm32: Print full flag values in traces. --- dlls/msacm32/driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msacm32/driver.c b/dlls/msacm32/driver.c index 3f38961..e0c5fdd 100644 --- a/dlls/msacm32/driver.c +++ b/dlls/msacm32/driver.c @@ -168,7 +168,7 @@ MMRESULT WINAPI acmDriverAddW(PHACMDRIVERID phadid, HINSTANCE hinstModule, } break; default: - ERR("invalid flag value 0x%08x for fdwAdd\n", fdwAdd & ACM_DRIVERADDF_TYPEMASK); + ERR("invalid flag value 0x%08x for fdwAdd\n", fdwAdd); return MMSYSERR_INVALFLAG; }

1 0

Austin English : kernel32: Add a stub for QueryThreadCycleTime.
by Alexandre Julliard March 30, 2015

March 30, 2015

Module: wine Branch: master Commit: 88362a077096bab950ff2cd520abbe93b5d376ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=88362a077096bab950ff2cd52… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Mar 30 04:53:33 2015 -0500 kernel32: Add a stub for QueryThreadCycleTime. --- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/time.c | 12 ++++++++++++ include/winbase.h | 1 + 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 1179af2..d94c307 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1167,7 +1167,7 @@ @ stdcall QueryPerformanceFrequency(ptr) # @ stub QueryProcessAffinityUpdateMode # @ stub QueryProcessCycleTime -# @ stub QueryThreadCycleTime +@ stdcall QueryThreadCycleTime(long ptr) # @ stub QueryThreadProfiling # @ stub QueryThreadpoolStackInformation # @ stub -arch=x86_64 QueryUmsThreadInformation diff --git a/dlls/kernel32/time.c b/dlls/kernel32/time.c index 2f7142b..8214686 100644 --- a/dlls/kernel32/time.c +++ b/dlls/kernel32/time.c @@ -1105,6 +1105,18 @@ DWORD WINAPI GetDynamicTimeZoneInformation(PDYNAMIC_TIME_ZONE_INFORMATION info) } /*********************************************************************** + * QueryThreadCycleTime (KERNEL32.@) + */ +BOOL WINAPI QueryThreadCycleTime(HANDLE thread, PULONG64 cycle) +{ + static int once; + if (!once++) + FIXME("(%p,%p,): stub!\n", thread, cycle); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/*********************************************************************** * QueryUnbiasedInterruptTime (KERNEL32.@) */ BOOL WINAPI QueryUnbiasedInterruptTime(ULONGLONG *time) diff --git a/include/winbase.h b/include/winbase.h index 58ed07c..82220c2 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2294,6 +2294,7 @@ WINBASEAPI BOOL WINAPI QueryInformationJobObject(HANDLE,JOBOBJECTINFOCLAS WINBASEAPI BOOL WINAPI QueryMemoryResourceNotification(HANDLE,PBOOL); WINBASEAPI BOOL WINAPI QueryPerformanceCounter(LARGE_INTEGER*); WINBASEAPI BOOL WINAPI QueryPerformanceFrequency(LARGE_INTEGER*); +WINBASEAPI BOOL WINAPI QueryThreadCycleTime(HANDLE,PULONG64); WINBASEAPI DWORD WINAPI QueueUserAPC(PAPCFUNC,HANDLE,ULONG_PTR); WINBASEAPI BOOL WINAPI QueueUserWorkItem(LPTHREAD_START_ROUTINE,PVOID,ULONG); WINBASEAPI void WINAPI RaiseException(DWORD,DWORD,DWORD,const ULONG_PTR *);

1 0

Nikolay Sivov : dwrite: Return CreateStreamFromKey() failure code from Analyze().
by Alexandre Julliard March 30, 2015

March 30, 2015

Module: wine Branch: master Commit: 9ec6fd85c41f148456dae7ca74758157d4f426a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ec6fd85c41f148456dae7ca7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 30 11:57:28 2015 +0300 dwrite: Return CreateStreamFromKey() failure code from Analyze(). --- dlls/dwrite/font.c | 6 ++++-- dlls/dwrite/tests/font.c | 5 ++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 59eda80..fc067a5 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -1715,10 +1715,12 @@ HRESULT create_font_collection(IDWriteFactory2* factory, IDWriteFontFileEnumerat if (FAILED(hr)) break; + /* failed font files are skipped */ hr = IDWriteFontFile_Analyze(file, &supported, &file_type, &face_type, &face_count); if (FAILED(hr) || !supported || face_count == 0) { - TRACE("unsupported font (0x%08x, %d, %u)\n", hr, supported, face_count); + TRACE("unsupported font (%p, 0x%08x, %d, %u)\n", file, hr, supported, face_count); IDWriteFontFile_Release(file); + hr = S_OK; continue; } @@ -2080,7 +2082,7 @@ static HRESULT WINAPI dwritefontfile_Analyze(IDWriteFontFile *iface, BOOL *isSup hr = IDWriteFontFileLoader_CreateStreamFromKey(This->loader, This->reference_key, This->key_size, &stream); if (FAILED(hr)) - return S_OK; + return hr; hr = opentype_analyze_font(stream, numberOfFaces, fontFileType, fontFaceType, isSupportedFontType); diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 9762d49..3afcd0c 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -1814,15 +1814,14 @@ static void test_CreateCustomFontFileReference(void) face_type = DWRITE_FONT_FACE_TYPE_TRUETYPE; support = TRUE; count = 1; - IDWriteFontFile_Analyze(file, &support, &file_type, &face_type, &count); - ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteFontFile_Analyze(file, &support, &file_type, &face_type, &count); + ok(hr == 0x8faecafe, "got 0x%08x\n", hr); ok(support == FALSE, "got %i\n", support); ok(file_type == DWRITE_FONT_FILE_TYPE_UNKNOWN, "got %i\n", file_type); ok(face_type == DWRITE_FONT_FACE_TYPE_UNKNOWN, "got %i\n", face_type); ok(count == 0, "got %i\n", count); hr = IDWriteFactory_CreateFontFace(factory, DWRITE_FONT_FACE_TYPE_CFF, 1, &file, 0, 0, &face); -todo_wine ok(hr == 0x8faecafe, "got 0x%08x\n", hr); IDWriteFontFile_Release(file);

1 0

Michael Stefaniuc : windowscodecs/tests: Actually test the return of IWICBitmap_GetSize().
by Alexandre Julliard March 30, 2015

March 30, 2015

Module: wine Branch: master Commit: a21f30c23e14076d292e96bb8593326cbdedca51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a21f30c23e14076d292e96bb8… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Mar 30 10:13:23 2015 +0200 windowscodecs/tests: Actually test the return of IWICBitmap_GetSize(). --- dlls/windowscodecs/tests/bitmap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/tests/bitmap.c b/dlls/windowscodecs/tests/bitmap.c index 48c1bdb..1b91dca 100644 --- a/dlls/windowscodecs/tests/bitmap.c +++ b/dlls/windowscodecs/tests/bitmap.c @@ -655,7 +655,7 @@ static void test_CreateBitmapFromHICON(void) ok(IsEqualGUID(&format, &GUID_WICPixelFormat32bppBGRA), "unexpected pixel format %s\n", wine_dbgstr_guid(&format)); - IWICBitmap_GetSize(bitmap, &width, &height); + hr = IWICBitmap_GetSize(bitmap, &width, &height); ok(hr == S_OK, "IWICBitmap_GetSize error %#x\n", hr); ok(width == 16, "expected 16, got %u\n", width); ok(height == 16, "expected 16, got %u\n", height); @@ -683,7 +683,7 @@ static void test_CreateBitmapFromHICON(void) ok(IsEqualGUID(&format, &GUID_WICPixelFormat32bppBGRA), "unexpected pixel format %s\n", wine_dbgstr_guid(&format)); - IWICBitmap_GetSize(bitmap, &width, &height); + hr = IWICBitmap_GetSize(bitmap, &width, &height); ok(hr == S_OK, "IWICBitmap_GetSize error %#x\n", hr); ok(width == 16, "expected 16, got %u\n", width); ok(height == 16, "expected 16, got %u\n", height);

1 0

Henri Verbeet : d2d1: Do not multiply color brush RGB values with the brush opacity.
by Alexandre Julliard March 30, 2015

March 30, 2015

Module: wine Branch: master Commit: d9fbb3f847ed7ef050820348a130299953571c91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9fbb3f847ed7ef050820348a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 30 09:17:04 2015 +0200 d2d1: Do not multiply color brush RGB values with the brush opacity. --- dlls/d2d1/render_target.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index da8937c..c078989 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -636,9 +636,6 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_FillRectangle(ID2D1RenderTar ps = render_target->rect_solid_ps; color = brush_impl->u.solid.color; - color.r *= brush_impl->opacity; - color.g *= brush_impl->opacity; - color.b *= brush_impl->opacity; color.a *= brush_impl->opacity; buffer_desc.ByteWidth = sizeof(color);

1 0

Nikolay Sivov : comctl32/listview: Remove outdated TODO comment.
by Alexandre Julliard March 30, 2015

March 30, 2015

Module: wine Branch: master Commit: c4a3651e3489a91ff63ecf2e7889f2630b9f27f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4a3651e3489a91ff63ecf2e7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Mar 28 23:17:18 2015 +0300 comctl32/listview: Remove outdated TODO comment. --- dlls/comctl32/listview.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 44aaba0..861335b 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -6537,8 +6537,6 @@ static INT LISTVIEW_GetColumnWidth(const LISTVIEW_INFO *infoPtr, INT nColumn) /* We are not using LISTVIEW_GetHeaderRect as this data is updated only after a HDN_ITEMCHANGED. * There is an application that subclasses the listview, calls LVM_GETCOLUMNWIDTH in the * HDN_ITEMCHANGED handler and goes into infinite recursion if it receives old data. - * - * TODO: should we do the same in LVM_GETCOLUMN? */ hdItem.mask = HDI_WIDTH; if (!SendMessageW(infoPtr->hwndHeader, HDM_GETITEMW, nColumn, (LPARAM)&hdItem))

1 0