February 2016 - Wine-commits

Nikolay Sivov : dwrite: Initial implementation of MapCharacters().
by Alexandre Julliard 15 Feb '16

15 Feb '16

Module: wine Branch: master Commit: 5d174042876b31c51d4c75523e00d62bec04f696 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d174042876b31c51d4c75523… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Feb 14 19:05:09 2016 +0300 dwrite: Initial implementation of MapCharacters(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 176 +++++++++++++++++++++++++++++++++++++++++++-- dlls/dwrite/tests/layout.c | 31 ++++---- 2 files changed, 185 insertions(+), 22 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5d174042876b31c51d4c7…

1 0

Nikolay Sivov : dwrite: Use current layout fallback when creating run font faces.
by Alexandre Julliard 15 Feb '16

15 Feb '16

Module: wine Branch: master Commit: 7fc7f2f074105757ae48c0fb10ae94a45700e950 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fc7f2f074105757ae48c0fb1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Feb 14 19:05:10 2016 +0300 dwrite: Use current layout fallback when creating run font faces. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 2 +- dlls/dwrite/dwrite_private.h | 2 + dlls/dwrite/layout.c | 127 ++++++++++++++++++++++++++++++------------- 3 files changed, 91 insertions(+), 40 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 10ff0a2..66fa29c 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -1745,7 +1745,7 @@ static const struct fallback_mapping *find_fallback_mapping(struct dwrite_fontfa return NULL; } -static HRESULT create_matching_font(IDWriteFontCollection *collection, const WCHAR *name, +HRESULT create_matching_font(IDWriteFontCollection *collection, const WCHAR *name, DWRITE_FONT_WEIGHT weight, DWRITE_FONT_STYLE style, DWRITE_FONT_STRETCH stretch, IDWriteFont **font) { IDWriteFontFamily *family; diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 1e4cf59..5a01061 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -145,6 +145,8 @@ extern HRESULT create_colorglyphenum(FLOAT,FLOAT,const DWRITE_GLYPH_RUN*,const D extern BOOL lb_is_newline_char(WCHAR) DECLSPEC_HIDDEN; extern HRESULT create_system_fontfallback(IDWriteFactory2*,IDWriteFontFallback**) DECLSPEC_HIDDEN; extern void release_system_fontfallback(IDWriteFontFallback*) DECLSPEC_HIDDEN; +extern HRESULT create_matching_font(IDWriteFontCollection*,const WCHAR*,DWRITE_FONT_WEIGHT,DWRITE_FONT_STYLE,DWRITE_FONT_STRETCH, + IDWriteFont**) DECLSPEC_HIDDEN; /* Opentype font table functions */ struct dwrite_font_props { diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index b60f2ce..164ac48 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -696,39 +696,6 @@ static void layout_set_cluster_metrics(struct dwrite_textlayout *layout, const s #define SCALE_FONT_METRIC(metric, emSize, metrics) ((FLOAT)(metric) * (emSize) / (FLOAT)(metrics)->designUnitsPerEm) -static HRESULT create_fontface_by_pos(struct dwrite_textlayout *layout, struct layout_range *range, IDWriteFontFace **fontface) -{ - static DWRITE_GLYPH_RUN_DESCRIPTION descr = { 0 }; - IDWriteFontFamily *family; - BOOL exists = FALSE; - IDWriteFont *font; - UINT32 index; - HRESULT hr; - - *fontface = NULL; - - hr = IDWriteFontCollection_FindFamilyName(range->collection, range->fontfamily, &index, &exists); - if (FAILED(hr) || !exists) { - WARN("%s: family %s not found in collection %p\n", debugstr_rundescr(&descr), debugstr_w(range->fontfamily), range->collection); - return hr; - } - - hr = IDWriteFontCollection_GetFontFamily(range->collection, index, &family); - if (FAILED(hr)) - return hr; - - hr = IDWriteFontFamily_GetFirstMatchingFont(family, range->weight, range->stretch, range->style, &font); - IDWriteFontFamily_Release(family); - if (FAILED(hr)) { - WARN("%s: failed to get a matching font\n", debugstr_rundescr(&descr)); - return hr; - } - - hr = IDWriteFont_CreateFontFace(font, fontface); - IDWriteFont_Release(font); - return hr; -} - static void layout_get_font_metrics(struct dwrite_textlayout *layout, IDWriteFontFace *fontface, FLOAT emsize, DWRITE_FONT_METRICS *fontmetrics) { @@ -749,6 +716,7 @@ static void layout_get_font_height(FLOAT emsize, DWRITE_FONT_METRICS *fontmetric static HRESULT layout_compute_runs(struct dwrite_textlayout *layout) { + IDWriteFontFallback *fallback; IDWriteTextAnalyzer *analyzer; struct layout_range *range; struct layout_run *r; @@ -808,6 +776,82 @@ static HRESULT layout_compute_runs(struct dwrite_textlayout *layout) break; } + if (layout->format.fallback) { + fallback = layout->format.fallback; + IDWriteFontFallback_AddRef(fallback); + } + else { + hr = IDWriteFactory2_GetSystemFontFallback(layout->factory, &fallback); + if (FAILED(hr)) + return hr; + } + + /* resolve run fonts */ + LIST_FOR_EACH_ENTRY(r, &layout->runs, struct layout_run, entry) { + struct regular_layout_run *run = &r->u.regular; + UINT32 length; + + if (r->kind == LAYOUT_RUN_INLINE) + continue; + + range = get_layout_range_by_pos(layout, run->descr.textPosition); + length = run->descr.stringLength; + + while (length) { + UINT32 mapped_length; + IDWriteFont *font; + FLOAT scale; + + run = &r->u.regular; + + hr = IDWriteFontFallback_MapCharacters(fallback, + (IDWriteTextAnalysisSource*)&layout->IDWriteTextAnalysisSource1_iface, + run->descr.textPosition, + run->descr.stringLength, + range->collection, + range->fontfamily, + range->weight, + range->style, + range->stretch, + &mapped_length, + &font, + &scale); + if (FAILED(hr)) { + WARN("%s: failed to map family %s, collection %p\n", debugstr_rundescr(&run->descr), debugstr_w(range->fontfamily), range->collection); + return hr; + } + + hr = IDWriteFont_CreateFontFace(font, &run->run.fontFace); + IDWriteFont_Release(font); + if (FAILED(hr)) + return hr; + run->run.fontEmSize = range->fontsize * scale; + + if (mapped_length < length) { + struct regular_layout_run *nextrun = &r->u.regular; + struct layout_run *nextr; + + /* keep mapped part for current run, add another run for the rest */ + nextr = alloc_layout_run(LAYOUT_RUN_REGULAR); + if (!nextr) + return E_OUTOFMEMORY; + + *nextr = *r; + nextrun = &nextr->u.regular; + nextrun->descr.textPosition = run->descr.textPosition + mapped_length; + nextrun->descr.stringLength = run->descr.stringLength - mapped_length; + nextrun->descr.string = &layout->str[nextrun->descr.textPosition]; + run->descr.stringLength = mapped_length; + list_add_after(&r->entry, &nextr->entry); + r = nextr; + } + + length -= mapped_length; + } + } + + IDWriteFontFallback_Release(fallback); + /* fill run info */ LIST_FOR_EACH_ENTRY(r, &layout->runs, struct layout_run, entry) { DWRITE_SHAPING_GLYPH_PROPERTIES *glyph_props = NULL; @@ -850,11 +894,6 @@ static HRESULT layout_compute_runs(struct dwrite_textlayout *layout) } range = get_layout_range_by_pos(layout, run->descr.textPosition); - hr = create_fontface_by_pos(layout, range, &run->run.fontFace); - if (FAILED(hr)) - continue; - - run->run.fontEmSize = range->fontsize; run->descr.localeName = range->locale; run->clustermap = heap_alloc(run->descr.stringLength*sizeof(UINT16)); @@ -1606,10 +1645,20 @@ static HRESULT layout_set_dummy_line_metrics(struct dwrite_textlayout *layout, U DWRITE_LINE_METRICS metrics; struct layout_range *range; IDWriteFontFace *fontface; + IDWriteFont *font; HRESULT hr; range = get_layout_range_by_pos(layout, pos); - hr = create_fontface_by_pos(layout, range, &fontface); + hr = create_matching_font(range->collection, + range->fontfamily, + range->weight, + range->style, + range->stretch, + &font); + if (FAILED(hr)) + return hr; + hr = IDWriteFont_CreateFontFace(font, &fontface); + IDWriteFont_Release(font); if (FAILED(hr)) return hr;

1 0

Nikolay Sivov : po: Update Russian translation.
by Alexandre Julliard 15 Feb '16

15 Feb '16

Module: wine Branch: master Commit: 2c88713a5f2d03905c9c7d6134e6007dfc0c34d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c88713a5f2d03905c9c7d613… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Feb 14 19:15:51 2016 +0300 po: Update Russian translation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ru.po | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/po/ru.po b/po/ru.po index 278e8fb..d88342b 100644 --- a/po/ru.po +++ b/po/ru.po @@ -5,14 +5,14 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2016-02-09 23:19+0300\n" +"PO-Revision-Date: 2016-02-14 19:13+0300\n" "Last-Translator: Nikolay Sivov <nsivov(a)codeweavers.com>\n" "Language-Team: Russian\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 1.8.6\n" +"X-Generator: Poedit 1.8.7\n" #: appwiz.rc:58 msgid "Install/Uninstall" @@ -11619,22 +11619,16 @@ msgid "(Default)" msgstr "(По умолчанию)" #: reg.rc:49 -#, fuzzy -#| msgid "Are you sure you want to delete these values?" msgid "Are you sure you want to delete the registry value '%1'?" -msgstr "Вы уверены что хотите удалить эти значения?" +msgstr "Вы точно хотите удалить параметр реестра «%1»?" #: reg.rc:50 -#, fuzzy -#| msgid "Are you sure you want to delete value '%s'?" msgid "Are you sure you want to delete all registry values in '%1'?" -msgstr "Удалить значение «%s»?" +msgstr "Вы точно хотите удалить все параметры реестра из «%s»?" #: reg.rc:51 -#, fuzzy -#| msgid "Are you sure you want to delete '%1'?" msgid "Are you sure you want to delete the registry key '%1'?" -msgstr "Удалить «%1»?" +msgstr "Вы точно хотите удалить ключ реестра «%1»?" #: regedit.rc:34 msgid "&Registry"

1 0

Nikolay Sivov : dwrite: Suppress noisy message when parsing name records.
by Alexandre Julliard 15 Feb '16

15 Feb '16

Module: wine Branch: master Commit: c7305c07af92ca82707567745050f933bf39a5b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7305c07af92ca82707567745… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Feb 14 21:54:37 2016 +0300 dwrite: Suppress noisy message when parsing name records. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 7d59bf8..7fb1749 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -1367,7 +1367,7 @@ static void get_name_record_locale(enum OPENTYPE_PLATFORM_ID platform, USHORT la const char *locale_name = NULL; if (lang_id > TT_NAME_MAC_LANGID_AZER_ROMAN) - ERR("invalid mac lang id %d\n", lang_id); + WARN("invalid mac lang id %d\n", lang_id); else if (!name_mac_langid_to_locale[lang_id][0]) FIXME("failed to map mac lang id %d to locale name\n", lang_id); else

1 0

Jactry Zeng : user32/tests: Test DDE end to end with Chinese text that starts with Latin characters.
by Alexandre Julliard 15 Feb '16

15 Feb '16

Module: wine Branch: master Commit: 477b713a72e599cd8a18ee6fdbb64459ce2afbc4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=477b713a72e599cd8a18ee6fd… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Mon Feb 15 14:33:53 2016 +0800 user32/tests: Test DDE end to end with Chinese text that starts with Latin characters. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/dde.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/dlls/user32/tests/dde.c b/dlls/user32/tests/dde.c index f2e3cea..c90bac9 100644 --- a/dlls/user32/tests/dde.c +++ b/dlls/user32/tests/dde.c @@ -43,6 +43,15 @@ static WNDPROC old_dde_client_wndproc; static const DWORD default_timeout = 200; +static BOOL is_cjk(void) +{ + int lang_id = PRIMARYLANGID(GetUserDefaultLangID()); + + if (lang_id == LANG_CHINESE || lang_id == LANG_JAPANESE || lang_id == LANG_KOREAN) + return TRUE; + return FALSE; +} + static void flush_events(void) { MSG msg; @@ -2385,6 +2394,7 @@ static WCHAR test_cmd_w_to_w[][32] = { { 0x2018, 0x2019, 0x0161, 0x0041, 0x02dc, 0 }, /* some chars that should map properly to CP1252 */ { 0x2026, 0x2020, 0x2021, 0x0d0a, 0 }, /* false negative for IsTextUnicode */ { 0x4efa, 0x4efc, 0x0061, 0x4efe, 0 }, /* some Chinese chars */ + { 0x0061, 0x0062, 0x0063, 0x9152, 0 }, /* Chinese with latin characters begin */ }; static const int nb_callbacks = 5 + sizeof(test_cmd_w_to_w)/sizeof(test_cmd_w_to_w[0]); @@ -2545,6 +2555,41 @@ static HDDEDATA CALLBACK server_end_to_end_callback(UINT uType, UINT uFmt, HCONV "Expected %s, msg_index=%d\n", wine_dbgstr_w(cmd_w), msg_index); } break; + case 5: /* Chinese with latin characters begin */ + if (unicode_server && unicode_client) + { + todo_wine ok(size == size_w, "Wrong size %d expected %d, msg_index=%d\n", size, size_w, msg_index); + MultiByteToWideChar(CP_ACP, 0, test_cmd_w_to_a, size_w, test_cmd_a_to_w, + sizeof(test_cmd_a_to_w)/sizeof(WCHAR)); + todo_wine ok(!lstrcmpW((WCHAR*)buffer, cmd_w), + "Expected %s got %s, msg_index=%d\n", wine_dbgstr_w(cmd_w), wine_dbgstr_w((WCHAR *)buffer), msg_index); + } + else if (unicode_server) + { + todo_wine ok(size == size_w, "Wrong size %d expected %d, msg_index=%d\n", size, size_w, msg_index); + MultiByteToWideChar(CP_ACP, 0, test_cmd_w_to_a, size_w, test_cmd_a_to_w, + sizeof(test_cmd_a_to_w)/sizeof(WCHAR)); + if (!is_cjk()) + todo_wine ok(!lstrcmpW((WCHAR*)buffer, test_cmd_a_to_w), "Expected %s, got %s, msg_index=%d\n", + wine_dbgstr_w(test_cmd_a_to_w), wine_dbgstr_w((WCHAR*)buffer), msg_index); + else + todo_wine ok(!lstrcmpW((WCHAR*)buffer, cmd_w), + "Expected %s got %s, msg_index=%d\n", wine_dbgstr_w(cmd_w), wine_dbgstr_w((WCHAR *)buffer), msg_index); + } + else if (unicode_client) + { + ok(size == size_w_to_a, "Wrong size %d expected %d, msg_index=%d\n", size, size_w_to_a, msg_index); + ok(!lstrcmpA((CHAR*)buffer, test_cmd_w_to_a), "Expected %s, got %s, msg_index=%d\n", + test_cmd_w_to_a, buffer, msg_index); + } + else + { + todo_wine ok(size == size_w_to_a || size == (size_w_to_a - 1), "Wrong size %d expected %d or %d, msg_index=%d\n", + size, size_w_to_a, size_w_to_a - 1, msg_index); + todo_wine ok(!lstrcmpA((CHAR*)buffer, test_cmd_w_to_a), "Expected %s, got %s, msg_index=%d\n", + test_cmd_w_to_a, buffer, msg_index); + } + break; default: ok( 0, "Invalid message %u\n", msg_index );

1 0

Henri Verbeet : wined3d: Use FIELD_OFFSET to calculate the size in surface_create_dib_section().
by Alexandre Julliard 15 Feb '16

15 Feb '16

Module: wine Branch: master Commit: 649d2dfb3b7ccfa689eb9fbce2f094fe5c03c738 URL: http://source.winehq.org/git/wine.git/?a=commit;h=649d2dfb3b7ccfa689eb9fbce… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 12 18:52:20 2016 +0100 wined3d: Use FIELD_OFFSET to calculate the size in surface_create_dib_section(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 459cbdc..0e6bf28 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -379,17 +379,17 @@ HRESULT surface_create_dib_section(struct wined3d_surface *surface) case 2: case 4: /* Allocate extra space to store the RGB bit masks. */ - b_info = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(BITMAPINFOHEADER) + 3 * sizeof(DWORD)); + b_info = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, FIELD_OFFSET(BITMAPINFO, bmiColors[3])); break; case 3: - b_info = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(BITMAPINFOHEADER)); + b_info = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, FIELD_OFFSET(BITMAPINFO, bmiColors[0])); break; default: /* Allocate extra space for a palette. */ b_info = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - sizeof(BITMAPINFOHEADER) + sizeof(RGBQUAD) * (1u << (format->byte_count * 8))); + FIELD_OFFSET(BITMAPINFO, bmiColors[1u << (format->byte_count * 8)])); break; }

1 0

Henri Verbeet : wined3d: Use a wined3d_string_buffer to dump the intermediate shader code.
by Alexandre Julliard 15 Feb '16

15 Feb '16

Module: wine Branch: master Commit: e5719e9899ea5bd421b8f019e5c11b972e3900cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5719e9899ea5bd421b8f019e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 12 18:52:21 2016 +0100 wined3d: Use a wined3d_string_buffer to dump the intermediate shader code. Instead of abusing TRACE. There's probably still some room for improvement. There may also be value in dumping things in a format that's compatible with D3D shader assembly, but I don't think it's a priority. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/shader.c | 481 ++++++++++++++++++++++------------------- dlls/wined3d/shader_sm1.c | 2 - dlls/wined3d/wined3d_private.h | 4 - 3 files changed, 263 insertions(+), 224 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e5719e9899ea5bd421b8f…

1 0

Henri Verbeet : d3d8: Disable WINED3D_SRGB_READ_WRITE_CONTROL.
by Alexandre Julliard 15 Feb '16

15 Feb '16

Module: wine Branch: master Commit: 5647fffb83ea8b6ef5d63a4528128085deb54cba URL: http://source.winehq.org/git/wine.git/?a=commit;h=5647fffb83ea8b6ef5d63a452… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 12 18:52:22 2016 +0100 d3d8: Disable WINED3D_SRGB_READ_WRITE_CONTROL. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/directx.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c index 863e596..a64790b 100644 --- a/dlls/d3d8/directx.c +++ b/dlls/d3d8/directx.c @@ -438,8 +438,7 @@ static const struct IDirect3D8Vtbl d3d8_vtbl = BOOL d3d8_init(struct d3d8 *d3d8) { DWORD flags = WINED3D_LEGACY_DEPTH_BIAS | WINED3D_VIDMEM_ACCOUNTING - | WINED3D_HANDLE_RESTORE | WINED3D_PIXEL_CENTER_INTEGER - | WINED3D_SRGB_READ_WRITE_CONTROL; + | WINED3D_HANDLE_RESTORE | WINED3D_PIXEL_CENTER_INTEGER; d3d8->IDirect3D8_iface.lpVtbl = &d3d8_vtbl; d3d8->refcount = 1;

1 0

Alexandre Julliard : patches: Display a clear error mark for patches without a signoff.
by Alexandre Julliard 15 Feb '16

15 Feb '16

Module: tools Branch: master Commit: 8e94784c2092a6f776a963c5a6d4be5083630aba URL: http://source.winehq.org/git/tools.git/?a=commit;h=8e94784c2092a6f776a963c5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 15 14:00:13 2016 +0900 patches: Display a clear error mark for patches without a signoff. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- patches/patches.css | 1 + patches/update | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/patches/patches.css b/patches/patches.css index 091052d..020d48c 100644 --- a/patches/patches.css +++ b/patches/patches.css @@ -141,6 +141,7 @@ tr.odd { background-color: #f8e8e8; } .id, .status, .testbot { text-align: center; } .id, .status, .author { white-space: nowrap; padding: 0 3px; } .checkmark { text-align: center; color:green; } +.failmark { text-align: center; color: red; } .signoffextra { color: #A50D0D; border: 1px solid #601919; } .sha1 { white-space: nowrap; font-family: monospace; padding: 2px 12px; } diff --git a/patches/update b/patches/update index 86578d7..037297f 100755 --- a/patches/update +++ b/patches/update @@ -233,7 +233,7 @@ foreach my $file (sort { $patches{$b}->{"order"} <=> $patches{$a}->{"order"} } k } else { - printf INDEX "<td></td>"; + printf INDEX "<td class=\"failmark\">X</td>"; } if ($patch->{"testbot"} eq "Failed") {

1 0

Matteo Bruni : wined3d: Add WINED3DFMT_FLAG_RENDERTARGET to WINED3DFMT_B5G5R5X1_UNORM.
by Alexandre Julliard 12 Feb '16

12 Feb '16

Module: wine Branch: master Commit: 1061969eb6e291566591f37a5ea5e48af3a48297 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1061969eb6e291566591f37a5… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Feb 11 16:10:46 2016 +0100 wined3d: Add WINED3DFMT_FLAG_RENDERTARGET to WINED3DFMT_B5G5R5X1_UNORM. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index dae30c1..b52b967 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1133,7 +1133,8 @@ static const struct wined3d_format_texture_info format_texture_info[] = ARB_ES2_COMPATIBILITY, NULL}, {WINED3DFMT_B5G5R5X1_UNORM, GL_RGB5, GL_RGB5, 0, GL_BGRA, GL_UNSIGNED_SHORT_1_5_5_5_REV, 0, - WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING, + WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING + | WINED3DFMT_FLAG_RENDERTARGET, WINED3D_GL_EXT_NONE, NULL}, {WINED3DFMT_B5G5R5A1_UNORM, GL_RGB5_A1, GL_RGB5_A1, 0, GL_BGRA, GL_UNSIGNED_SHORT_1_5_5_5_REV, 0,

1 0