February 2016 - Wine-Commits

Henri Verbeet : ddraw: Disable WINED3D_SRGB_READ_WRITE_CONTROL.
by Alexandre Julliard Feb. 15, 2016

Feb. 15, 2016

Module: wine Branch: master Commit: c6a72849245bdb9b824b8336a8c46bd1444488a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6a72849245bdb9b824b8336a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 12 18:52:23 2016 +0100 ddraw: 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/ddraw/ddraw_private.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 2e7624b..26bc242 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -60,8 +60,7 @@ struct FvfToDecl #define DDRAW_STRIDE_ALIGNMENT 8 #define DDRAW_WINED3D_FLAGS (WINED3D_LEGACY_DEPTH_BIAS | WINED3D_VIDMEM_ACCOUNTING \ - | WINED3D_RESTORE_MODE_ON_ACTIVATE | WINED3D_FOCUS_MESSAGES | WINED3D_PIXEL_CENTER_INTEGER \ - | WINED3D_SRGB_READ_WRITE_CONTROL) + | WINED3D_RESTORE_MODE_ON_ACTIVATE | WINED3D_FOCUS_MESSAGES | WINED3D_PIXEL_CENTER_INTEGER) enum ddraw_device_state {

1 0

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

Feb. 15, 2016

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

Nikolay Sivov : dwrite: Move local stream tracing to a separate channel.
by Alexandre Julliard Feb. 15, 2016

Feb. 15, 2016

Module: wine Branch: master Commit: 2c29838b11f3239fc3b0276cb234793b1e246e0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c29838b11f3239fc3b0276cb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Feb 14 19:05:08 2016 +0300 dwrite: Move local stream tracing to a separate channel. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 9bd5404..292866e 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -27,6 +27,7 @@ #include "dwrite_private.h" WINE_DEFAULT_DEBUG_CHANNEL(dwrite); +WINE_DECLARE_DEBUG_CHANNEL(dwrite_file); #define MS_HEAD_TAG DWRITE_MAKE_OPENTYPE_TAG('h','e','a','d') #define MS_OS2_TAG DWRITE_MAKE_OPENTYPE_TAG('O','S','/','2') @@ -3793,7 +3794,7 @@ static inline struct dwrite_localfontfilestream *impl_from_IDWriteFontFileStream static HRESULT WINAPI localfontfilestream_QueryInterface(IDWriteFontFileStream *iface, REFIID riid, void **obj) { struct dwrite_localfontfilestream *This = impl_from_IDWriteFontFileStream(iface); - TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), obj); + TRACE_(dwrite_file)("(%p)->(%s %p)\n", This, debugstr_guid(riid), obj); if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IDWriteFontFileStream)) { *obj = iface; @@ -3809,7 +3810,7 @@ static ULONG WINAPI localfontfilestream_AddRef(IDWriteFontFileStream *iface) { struct dwrite_localfontfilestream *This = impl_from_IDWriteFontFileStream(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p)->(%d)\n", This, ref); + TRACE_(dwrite_file)("(%p)->(%d)\n", This, ref); return ref; } @@ -3825,7 +3826,7 @@ static ULONG WINAPI localfontfilestream_Release(IDWriteFontFileStream *iface) struct dwrite_localfontfilestream *This = impl_from_IDWriteFontFileStream(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p)->(%d)\n", This, ref); + TRACE_(dwrite_file)("(%p)->(%d)\n", This, ref); if (!ref) { UnmapViewOfFile(This->file_ptr); @@ -3840,7 +3841,7 @@ static HRESULT WINAPI localfontfilestream_ReadFileFragment(IDWriteFontFileStream { struct dwrite_localfontfilestream *This = impl_from_IDWriteFontFileStream(iface); - TRACE("(%p)->(%p, %s, %s, %p)\n",This, fragment_start, + TRACE_(dwrite_file)("(%p)->(%p, %s, %s, %p)\n",This, fragment_start, wine_dbgstr_longlong(offset), wine_dbgstr_longlong(fragment_size), fragment_context); *fragment_context = NULL; @@ -3857,13 +3858,13 @@ static HRESULT WINAPI localfontfilestream_ReadFileFragment(IDWriteFontFileStream static void WINAPI localfontfilestream_ReleaseFileFragment(IDWriteFontFileStream *iface, void *fragment_context) { struct dwrite_localfontfilestream *This = impl_from_IDWriteFontFileStream(iface); - TRACE("(%p)->(%p)\n", This, fragment_context); + TRACE_(dwrite_file)("(%p)->(%p)\n", This, fragment_context); } static HRESULT WINAPI localfontfilestream_GetFileSize(IDWriteFontFileStream *iface, UINT64 *size) { struct dwrite_localfontfilestream *This = impl_from_IDWriteFontFileStream(iface); - TRACE("(%p)->(%p)\n", This, size); + TRACE_(dwrite_file)("(%p)->(%p)\n", This, size); *size = This->size; return S_OK; } @@ -3873,7 +3874,7 @@ static HRESULT WINAPI localfontfilestream_GetLastWriteTime(IDWriteFontFileStream struct dwrite_localfontfilestream *This = impl_from_IDWriteFontFileStream(iface); ULARGE_INTEGER li; - TRACE("(%p)->(%p)\n", This, last_writetime); + TRACE_(dwrite_file)("(%p)->(%p)\n", This, last_writetime); li.u.LowPart = This->entry->key->writetime.dwLowDateTime; li.u.HighPart = This->entry->key->writetime.dwHighDateTime;

1 0

Sebastian Lackner : opengl32: Ensure extension tables generated by make_opengl contain earliest GL_VERSION for each function.
by Alexandre Julliard Feb. 15, 2016

Feb. 15, 2016

Module: wine Branch: master Commit: 68867e30b2ff33ea04d1b6150b4cc76a72976916 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68867e30b2ff33ea04d1b6150… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sat Feb 13 00:21:03 2016 +0100 opengl32: Ensure extension tables generated by make_opengl contain earliest GL_VERSION for each function. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opengl32/make_opengl | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/opengl32/make_opengl b/dlls/opengl32/make_opengl index 2b15f58..ec782ed 100755 --- a/dlls/opengl32/make_opengl +++ b/dlls/opengl32/make_opengl @@ -692,12 +692,14 @@ sub parse_file($$) } # generate extension functions from norm functions, if they are newer than the category - while (my ($k, $v) = each(%{$data->{feature}})) { + my %features = %{$data->{feature}}; + foreach (sort keys %features) { + my ($k, $v) = %features{$_}; if (!$norm_categories{$k} && $v->{api} =~ /^gl(\||$)/) { for my $req (@{$v->{require}}) { for (keys %{$req->{command}}) { - if (!$norm_functions{$_}) { + if (!$ext_functions{$_} && !$norm_functions{$_}) { $ext_functions{$_} = [ $functions{$_}[0], $functions{$_}[1], [ $k ] ]; } }

1 0

Sebastian Lackner : ntdll/tests: Fix flags passed to VirtualFree in exception tests.
by Alexandre Julliard Feb. 15, 2016

Feb. 15, 2016

Module: wine Branch: master Commit: 446067b34df5103fbae12f7d5df8fbe3ef5d30a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=446067b34df5103fbae12f7d5… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sat Feb 13 22:26:05 2016 +0100 ntdll/tests: Fix flags passed to VirtualFree in exception tests. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/exception.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index d6a610e..c9e06ea 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -2020,5 +2020,5 @@ START_TEST(exception) #endif - VirtualFree(code_mem, 0, MEM_FREE); + VirtualFree(code_mem, 0, MEM_RELEASE); }

1 0

Henri Verbeet : d3d8: Disable WINED3D_SRGB_READ_WRITE_CONTROL.
by Alexandre Julliard Feb. 15, 2016

Feb. 15, 2016

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

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

Feb. 15, 2016

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 : wined3d: Use FIELD_OFFSET to calculate the size in surface_create_dib_section().
by Alexandre Julliard Feb. 15, 2016

Feb. 15, 2016

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

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

Feb. 15, 2016

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

Charles Davis : dwrite: Fix typos, and fix definition of Mac LangCodes for Welsh and up.
by Alexandre Julliard Feb. 12, 2016

Feb. 12, 2016

Module: wine Branch: master Commit: dcca411ac32e69a4c2f1be01595db113a20498e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dcca411ac32e69a4c2f1be015… Author: Charles Davis <cdavis5x(a)gmail.com> Date: Fri Feb 12 02:00:02 2016 -0700 dwrite: Fix typos, and fix definition of Mac LangCodes for Welsh and up. Signed-off-by: Charles Davis <cdavis5x(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 39 ++++++++++++++++++++++++++++++++++++--- 1 file changed, 36 insertions(+), 3 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 5b29c21..7d59bf8 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -470,7 +470,7 @@ enum TT_NAME_MAC_LANGUAGE_ID TT_NAME_MAC_LANGID_LAO, TT_NAME_MAC_LANGID_VIETNAMESE, TT_NAME_MAC_LANGID_INDONESIAN, - TT_NAME_MAC_LANGID_TAGALONG, + TT_NAME_MAC_LANGID_TAGALOG, TT_NAME_MAC_LANGID_MALAY_ROMAN, TT_NAME_MAC_LANGID_MALAY_ARABIC, TT_NAME_MAC_LANGID_AMHARIC, @@ -483,11 +483,11 @@ enum TT_NAME_MAC_LANGUAGE_ID TT_NAME_MAC_LANGID_NYANJA, TT_NAME_MAC_LANGID_MALAGASY, TT_NAME_MAC_LANGID_ESPERANTO, - TT_NAME_MAC_LANGID_WELSH, + TT_NAME_MAC_LANGID_WELSH = 128, TT_NAME_MAC_LANGID_BASQUE, TT_NAME_MAC_LANGID_CATALAN, TT_NAME_MAC_LANGID_LATIN, - TT_NAME_MAC_LANGID_QUENCHUA, + TT_NAME_MAC_LANGID_QUECHUA, TT_NAME_MAC_LANGID_GUARANI, TT_NAME_MAC_LANGID_AYMARA, TT_NAME_MAC_LANGID_TATAR, @@ -605,6 +605,39 @@ static const char name_mac_langid_to_locale[][10] = { "", "", "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", "cy-GB", "eu-ES", "ca-ES",

1 0