October 2015 - Wine-commits

Aric Stewart : usp10/tests: fix some tests on Hebrew and Arabic locales.
by Alexandre Julliard 01 Oct '15

01 Oct '15

Module: wine Branch: master Commit: 6b657e0760ff029e88d3fa8c9f937b70d9eda983 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b657e0760ff029e88d3fa8c9… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Sep 30 13:05:42 2015 -0500 usp10/tests: fix some tests on Hebrew and Arabic locales. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> --- dlls/usp10/tests/usp10.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 92b17c5..bfd84d4 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -1921,7 +1921,7 @@ static void test_ScriptGetFontProperties(HDC hdc) /* U+0020: numeric space U+200B: zero width space U+F71B: unknown, found by black box testing */ - BOOL is_terminal, is_arial, is_times_new_roman, is_arabic = (system_lang_id == LANG_ARABIC); + BOOL is_arial, is_times_new_roman, is_arabic = (system_lang_id == LANG_ARABIC); /* Some sanity checks for ScriptGetFontProperties */ @@ -2019,10 +2019,12 @@ static void test_ScriptGetFontProperties(HDC hdc) ret = GetTextMetricsA(hdc, &tmA); ok(ret != 0, "GetTextMetricsA failed!\n"); - is_terminal = !(lstrcmpA(lf.lfFaceName, "Terminal") && lstrcmpA(lf.lfFaceName, "@Terminal")); - ok(sfp.wgBlank == tmA.tmBreakChar || broken(is_terminal) || broken(is_arabic), "bitmap font %s wgBlank %04x tmBreakChar %04x\n", lf.lfFaceName, sfp.wgBlank, tmA.tmBreakChar); + ret = pGetGlyphIndicesW(hdc, invalids, 1, gi, GGI_MARK_NONEXISTING_GLYPHS); + ok(ret != GDI_ERROR, "GetGlyphIndicesW failed!\n"); + + ok(sfp.wgBlank == tmA.tmBreakChar || sfp.wgBlank == gi[0], "bitmap font %s wgBlank %04x tmBreakChar %04x Space %04x\n", lf.lfFaceName, sfp.wgBlank, tmA.tmBreakChar, gi[0]); - ok(sfp.wgDefault == tmA.tmDefaultChar || broken(is_arabic), "bitmap font %s wgDefault %04x, tmDefaultChar %04x\n", lf.lfFaceName, sfp.wgDefault, tmA.tmDefaultChar); + ok(sfp.wgDefault == 0 || sfp.wgDefault == tmA.tmDefaultChar || broken(sfp.wgDefault == (0x100 | tmA.tmDefaultChar)), "bitmap font %s wgDefault %04x, tmDefaultChar %04x\n", lf.lfFaceName, sfp.wgDefault, tmA.tmDefaultChar); ok(sfp.wgInvalid == sfp.wgBlank || broken(is_arabic), "bitmap font %s wgInvalid %02x wgBlank %02x\n", lf.lfFaceName, sfp.wgInvalid, sfp.wgBlank);

1 0

Nikolay Sivov : gdi32: Return font ids from GetFontRealizationInfo().
by Alexandre Julliard 01 Oct '15

01 Oct '15

Module: wine Branch: master Commit: 7f4c158a39cbd4e545703e0bcb808d19864a8707 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f4c158a39cbd4e545703e0bc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 17 11:41:20 2015 +0300 gdi32: Return font ids from GetFontRealizationInfo(). --- dlls/gdi32/freetype.c | 67 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 66 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index d870b8c5..de40d9f 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -296,6 +296,68 @@ typedef struct { typedef struct tagGdiFont GdiFont; +#define FIRST_FONT_HANDLE 1 +#define MAX_FONT_HANDLES 256 + +struct font_handle_entry +{ + void *obj; + WORD generation; /* generation count for reusing handle values */ +}; + +static struct font_handle_entry font_handles[MAX_FONT_HANDLES]; +static struct font_handle_entry *next_free; +static struct font_handle_entry *next_unused = font_handles; + +static inline DWORD entry_to_handle( struct font_handle_entry *entry ) +{ + unsigned int idx = entry - font_handles + FIRST_FONT_HANDLE; + return idx | (entry->generation << 16); +} + +static inline struct font_handle_entry *handle_entry( DWORD handle ) +{ + unsigned int idx = LOWORD(handle) - FIRST_FONT_HANDLE; + + if (idx < MAX_FONT_HANDLES) + { + if (!HIWORD( handle ) || HIWORD( handle ) == font_handles[idx].generation) + return &font_handles[idx]; + } + if (handle) WARN( "invalid handle 0x%08x\n", handle ); + return NULL; +} + +static DWORD alloc_font_handle( void *obj ) +{ + struct font_handle_entry *entry; + + entry = next_free; + if (entry) + next_free = entry->obj; + else if (next_unused < font_handles + MAX_FONT_HANDLES) + entry = next_unused++; + else + { + ERR( "out of realized font handles\n" ); + return 0; + } + entry->obj = obj; + if (++entry->generation == 0xffff) entry->generation = 1; + return entry_to_handle( entry ); +} + +static void free_font_handle( DWORD handle ) +{ + struct font_handle_entry *entry; + + if ((entry = handle_entry( handle ))) + { + entry->obj = next_free; + next_free = entry; + } +} + typedef struct { struct list entry; Face *face; @@ -337,6 +399,7 @@ struct tagGdiFont { VOID *GSUB_Table; const VOID *vert_feature; DWORD cache_num; + DWORD instance_id; }; typedef struct { @@ -4423,6 +4486,7 @@ static GdiFont *alloc_font(void) ret->font_desc.matrix.eM11 = ret->font_desc.matrix.eM22 = 1.0; ret->total_kern_pairs = (DWORD)-1; ret->kern_pairs = NULL; + ret->instance_id = alloc_font_handle(ret); list_init(&ret->child_fonts); return ret; } @@ -4441,6 +4505,7 @@ static void free_font(GdiFont *font) HeapFree(GetProcessHeap(), 0, child); } + free_font_handle(font->instance_id); if (font->ft_face) pFT_Done_Face(font->ft_face); if (font->mapping) unmap_font_file( font->mapping ); HeapFree(GetProcessHeap(), 0, font->kern_pairs); @@ -8180,7 +8245,7 @@ static BOOL freetype_GetFontRealizationInfo( PHYSDEV dev, void *ptr ) info->flags |= 2; info->cache_num = physdev->font->cache_num; - info->instance_id = -1; + info->instance_id = physdev->font->instance_id; if (info->size == sizeof(*info)) { info->unk = 0;

1 0

Dmitry Timoshkov : ntdll: Print process id in the relay log if requested.
by Alexandre Julliard 01 Oct '15

01 Oct '15

Module: wine Branch: master Commit: 451156b4fa1bbdfe321427a4dd58f05340e8421f URL: http://source.winehq.org/git/wine.git/?a=commit;h=451156b4fa1bbdfe321427a4d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Sep 23 16:07:43 2015 +0800 ntdll: Print process id in the relay log if requested. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/ntdll/relay.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/ntdll/relay.c b/dlls/ntdll/relay.c index 0ba2731..ef0af0f 100644 --- a/dlls/ntdll/relay.c +++ b/dlls/ntdll/relay.c @@ -41,6 +41,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(relay); #if defined(__i386__) || defined(__x86_64__) || defined(__arm__) WINE_DECLARE_DEBUG_CHANNEL(timestamp); +WINE_DECLARE_DEBUG_CHANNEL(pid); struct relay_descr /* descriptor for a module */ { @@ -340,6 +341,9 @@ void * WINAPI relay_trace_entry( struct relay_descr *descr, unsigned int idx, co { if (TRACE_ON(timestamp)) print_timestamp(); + if (TRACE_ON(pid)) + DPRINTF( "%04x:", GetCurrentProcessId() ); + if (entry_point->name) DPRINTF( "%04x:Call %s.%s(", GetCurrentThreadId(), data->dllname, entry_point->name ); else @@ -365,6 +369,9 @@ void WINAPI relay_trace_exit( struct relay_descr *descr, unsigned int idx, if (TRACE_ON(timestamp)) print_timestamp(); + if (TRACE_ON(pid)) + DPRINTF( "%04x:", GetCurrentProcessId() ); + if (entry_point->name) DPRINTF( "%04x:Ret %s.%s()", GetCurrentThreadId(), data->dllname, entry_point->name ); else

1 0

Dmitry Timoshkov : ntdll: Print process id in the loader log if requested.
by Alexandre Julliard 01 Oct '15

01 Oct '15

Module: wine Branch: master Commit: 7d2cd2fe61d0425537ff0366a5fffed516623efc URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d2cd2fe61d0425537ff0366a… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Sep 23 16:07:49 2015 +0800 ntdll: Print process id in the loader log if requested. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/ntdll/loader.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 8a43310..831f049 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -49,6 +49,7 @@ WINE_DECLARE_DEBUG_CHANNEL(relay); WINE_DECLARE_DEBUG_CHANNEL(snoop); WINE_DECLARE_DEBUG_CHANNEL(loaddll); WINE_DECLARE_DEBUG_CHANNEL(imports); +WINE_DECLARE_DEBUG_CHANNEL(pid); #ifdef _WIN64 #define DEFAULT_SECURITY_COOKIE_64 (((ULONGLONG)0x00002b99 << 32) | 0x2ddfa232) @@ -1036,8 +1037,12 @@ static void call_tls_callbacks( HMODULE module, UINT reason ) for (callback = (const PIMAGE_TLS_CALLBACK *)dir->AddressOfCallBacks; *callback; callback++) { if (TRACE_ON(relay)) + { + if (TRACE_ON(pid)) + DPRINTF( "%04x:", GetCurrentProcessId() ); DPRINTF("%04x:Call TLS callback (proc=%p,module=%p,reason=%s,reserved=0)\n", GetCurrentThreadId(), *callback, module, reason_names[reason] ); + } __TRY { call_dll_entry_point( (DLLENTRYPROC)*callback, module, reason, NULL ); @@ -1045,14 +1050,22 @@ static void call_tls_callbacks( HMODULE module, UINT reason ) __EXCEPT_ALL { if (TRACE_ON(relay)) + { + if (TRACE_ON(pid)) + DPRINTF( "%04x:", GetCurrentProcessId() ); DPRINTF("%04x:exception in TLS callback (proc=%p,module=%p,reason=%s,reserved=0)\n", GetCurrentThreadId(), callback, module, reason_names[reason] ); + } return; } __ENDTRY if (TRACE_ON(relay)) + { + if (TRACE_ON(pid)) + DPRINTF( "%04x:", GetCurrentProcessId() ); DPRINTF("%04x:Ret TLS callback (proc=%p,module=%p,reason=%s,reserved=0)\n", GetCurrentThreadId(), *callback, module, reason_names[reason] ); + } } } @@ -1079,6 +1092,8 @@ static NTSTATUS MODULE_InitDLL( WINE_MODREF *wm, UINT reason, LPVOID lpReserved size_t len = min( wm->ldr.BaseDllName.Length, sizeof(mod_name)-sizeof(WCHAR) ); memcpy( mod_name, wm->ldr.BaseDllName.Buffer, len ); mod_name[len / sizeof(WCHAR)] = 0; + if (TRACE_ON(pid)) + DPRINTF( "%04x:", GetCurrentProcessId() ); DPRINTF("%04x:Call PE DLL (proc=%p,module=%p %s,reason=%s,res=%p)\n", GetCurrentThreadId(), entry, module, debugstr_w(mod_name), reason_names[reason], lpReserved ); @@ -1095,8 +1110,12 @@ static NTSTATUS MODULE_InitDLL( WINE_MODREF *wm, UINT reason, LPVOID lpReserved __EXCEPT_ALL { if (TRACE_ON(relay)) + { + if (TRACE_ON(pid)) + DPRINTF( "%04x:", GetCurrentProcessId() ); DPRINTF("%04x:exception in PE entry point (proc=%p,module=%p,reason=%s,res=%p)\n", GetCurrentThreadId(), entry, module, reason_names[reason], lpReserved ); + } status = GetExceptionCode(); } __ENDTRY @@ -1105,9 +1124,13 @@ static NTSTATUS MODULE_InitDLL( WINE_MODREF *wm, UINT reason, LPVOID lpReserved to the dll. We cannot assume that this module has not been deleted. */ if (TRACE_ON(relay)) + { + if (TRACE_ON(pid)) + DPRINTF( "%04x:", GetCurrentProcessId() ); DPRINTF("%04x:Ret PE DLL (proc=%p,module=%p %s,reason=%s,res=%p) retval=%x\n", GetCurrentThreadId(), entry, module, debugstr_w(mod_name), reason_names[reason], lpReserved, retv ); + } else TRACE("(%p,%s,%p) - RETURN %d\n", module, reason_names[reason], lpReserved, retv ); return status;

1 0

Andrew Eikum : maintainers: Add MAINTAINERS file.
by Alexandre Julliard 01 Oct '15

01 Oct '15

Module: wine Branch: master Commit: 93a685ad23eb518b0bfd52a8c44837e9b77bc1b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=93a685ad23eb518b0bfd52a8c… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Sep 23 10:25:50 2015 -0500 maintainers: Add MAINTAINERS file. --- MAINTAINERS | 104 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 104 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS new file mode 100644 index 0000000..98622bd --- /dev/null +++ b/MAINTAINERS @@ -0,0 +1,104 @@ + + + List of Wine subsection maintainers + +When submitting patches to Wine, the guidelines at +<http://wiki.winehq.org/SubmittingPatches> should be followed. This file +contains a list of maintainers for subsections of Wine. When submitting +patches, you may want to CC relevant people from this list. If you have +questions about your work in an area of Wine, you may find a list of +knowledgeable people here. + +Many areas of Wine don't have a specific maintainer, although there may +be people with knowledge of those areas. If an area is not listed here +at all, you can use the git log to find developers working in that area +recently. Or, you can send a mail to wine-devel, but be aware that there +may simply be no one knowledgeable about that subject on the list. + +This file uses a similar format to the Linux kernel MAINTAINERS file. +Descriptions of section entries used here: + + M: Primary maintainer. CC patches to: FullName <address(a)domain> + P: Other knowledgeable person. FullName <address(a)domain> + F: Files and directories with wildcard patterns. + One pattern per line. Multiple F: lines acceptable. + +Maintainers List + + ----------------------------------- + +Audio I/O +M: Andrew Eikum <aeikum(a)codeweavers.com> +F: dlls/dsound/ +F: dlls/dswave/ +F: dlls/mmdevapi/ +F: dlls/winealsa.drv/ +F: dlls/winecoreaudio.drv/ +F: dlls/wineoss.drv/ +F: dlls/winmm/ +F: dlls/x3daudio*/ +F: dlls/xapofx*/ +F: dlls/xaudio*/ + +Direct2D +M: Henri Verbeet <hverbeet(a)codeweavers.com> +F: dlls/d2d*/ + +Direct3D +M: Henri Verbeet <hverbeet(a)codeweavers.com> +P: Stefan Dösinger <stefan(a)codeweavers.com> +P: Józef Kucia <jkucia(a)codeweavers.com> +P: Matteo Bruni <mbruni(a)codeweavers.com> +F: dlls/d3d*/ +F: dlls/wined3d/ + +DirectInput +P: Andrew Eikum <aeikum(a)codeweavers.com> +F: dlls/dinput/ + +HTML rendering (Gecko) +M: Jacek Caban <jacek(a)codeweavers.com> +F: dlls/mshtml/ +F: dlls/ieframe/ +F: dlls/shdocvw/ + +Input methods +M: Aric Stewart <aric(a)codeweavers.com> +F: dlls/imm32/ + +JavaScript +M: Jacek Caban <jacek(a)codeweavers.com> +F: dlls/jscript/ + +Mac OS X graphics driver +M: Ken Thomases <ken(a)codeweavers.com> +F: dlls/winemac.drv/ + +Media format conversion +M: Andrew Eikum <aeikum(a)codeweavers.com> +F: dlls/msacm32/ +F: dlls/*.acm/ + +Microsoft C Runtime +M: Piotr Caban <piotr(a)codeweavers.com> +F: dlls/msvc*/ + +MSI installers +M: Hans Leidekker <hans(a)codeweavers.com> +F: dlls/msi/ + +OLE Typelibs +P: Andrew Eikum <aeikum(a)codeweavers.com> +F: dlls/oleaut32/typelib.c + +Wine server, IPC +M: Alexandre Julliard <julliard(a)winehq.org> +F: server/ + +VB Script +M: Jacek Caban <jacek(a)codeweavers.com> +F: dlls/vbscript/ + +XML parsing +M: Nikolay Sivov <nsivov(a)codeweavers.com> +F: dlls/msxml*/

1 0

Thomas Faller : winex11.drv: Fix use of uninitialized memory.
by Alexandre Julliard 01 Oct '15

01 Oct '15

Module: wine Branch: master Commit: 587733855b55725d637e044ad9ac0232a79de919 URL: http://source.winehq.org/git/wine.git/?a=commit;h=587733855b55725d637e044ad… Author: Thomas Faller <tfaller1(a)gmx.de> Date: Thu Sep 24 23:44:17 2015 +0200 winex11.drv: Fix use of uninitialized memory. --- dlls/winex11.drv/clipboard.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index 6c6b3b9..842ebfe 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -367,8 +367,19 @@ static void intern_atoms(void) i = 0; LIST_FOR_EACH_ENTRY( format, &format_list, WINE_CLIPFORMAT, entry ) if (!format->drvData) { - GetClipboardFormatNameW( format->wFormatID, buffer, 256 ); - len = WideCharToMultiByte(CP_UNIXCP, 0, buffer, -1, NULL, 0, NULL, NULL); + if (GetClipboardFormatNameW(format->wFormatID, buffer, 256) > 0) + { + /* use defined format name */ + len = WideCharToMultiByte(CP_UNIXCP, 0, buffer, -1, NULL, 0, NULL, NULL); + } + else + { + /* create a name in the same way as ntdll/atom.c:integral_atom_name + * which is normally used by GetClipboardFormatNameW + */ + static const WCHAR fmt[] = {'#','%','u',0}; + len = sprintfW(buffer, fmt, format->wFormatID) + 1; + } names[i] = HeapAlloc(GetProcessHeap(), 0, len); WideCharToMultiByte(CP_UNIXCP, 0, buffer, -1, names[i++], len, NULL, NULL); }

1 0

Charles Davis : ntdll: Use an __ms_va_list in sscanf (Clang).
by Alexandre Julliard 01 Oct '15

01 Oct '15

Module: wine Branch: master Commit: 476d97b0eea4ad231e4341add5fcc4b419b6a77d URL: http://source.winehq.org/git/wine.git/?a=commit;h=476d97b0eea4ad231e4341add… Author: Charles Davis <cdavis5x(a)gmail.com> Date: Sat Sep 19 13:26:44 2015 -0600 ntdll: Use an __ms_va_list in sscanf (Clang). Signed-off-by: Charles Davis <cdavis5x(a)gmail.com> --- dlls/ntdll/string.c | 594 +++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 590 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=476d97b0eea4ad231e434…

1 0

Aric Stewart : gdi32/tests: Expand tests skipped in Arabic to also skip in Hebrew.
by Alexandre Julliard 01 Oct '15

01 Oct '15

Module: wine Branch: master Commit: 781b88b7c586fc295780f0c8ad76bda0ffe96cd1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=781b88b7c586fc295780f0c8a… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Oct 1 06:59:26 2015 -0500 gdi32/tests: Expand tests skipped in Arabic to also skip in Hebrew. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> --- dlls/gdi32/tests/font.c | 34 ++++++++++++++++++++++------------ 1 file changed, 22 insertions(+), 12 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index e04ee1e..dff0eb6 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -753,6 +753,7 @@ static BOOL is_CJK(void) #define FH_SCALE 0x80000000 static void test_bitmap_font_metrics(void) { + static const WORD skip_rtl[] = {LANG_ARABIC, LANG_HEBREW, 0}; static const struct font_data { const char face_name[LF_FACESIZE]; @@ -760,19 +761,19 @@ static void test_bitmap_font_metrics(void) int ave_char_width, max_char_width, dpi; BYTE first_char, last_char, def_char, break_char; DWORD ansi_bitfield; - WORD skip_lang_id; + const WORD *skip_lang_id; int scaled_height; } fd[] = { - { "MS Sans Serif", FW_NORMAL, FH_SCALE | 6, 11, 2, 2, 0, 5, 11, 96, 0x20, 0xff, 0x81, 0x20, FS_LATIN1 | FS_LATIN2, LANG_ARABIC, 13 }, + { "MS Sans Serif", FW_NORMAL, FH_SCALE | 6, 11, 2, 2, 0, 5, 11, 96, 0x20, 0xff, 0x81, 0x20, FS_LATIN1 | FS_LATIN2, skip_rtl, 13 }, { "MS Sans Serif", FW_NORMAL, FH_SCALE | 6, 11, 2, 2, 0, 5, 11, 96, 0x20, 0xff, 0x7f, 0x20, FS_CYRILLIC, 0, 13 }, - { "MS Sans Serif", FW_NORMAL, FH_SCALE | 8, 11, 2, 2, 0, 5, 11, 96, 0x20, 0xff, 0x81, 0x20, FS_LATIN1 | FS_LATIN2, LANG_ARABIC, 13 }, + { "MS Sans Serif", FW_NORMAL, FH_SCALE | 8, 11, 2, 2, 0, 5, 11, 96, 0x20, 0xff, 0x81, 0x20, FS_LATIN1 | FS_LATIN2, skip_rtl, 13 }, { "MS Sans Serif", FW_NORMAL, FH_SCALE | 8, 11, 2, 2, 0, 5, 11, 96, 0x20, 0xff, 0x7f, 0x20, FS_CYRILLIC, 0, 13 }, - { "MS Sans Serif", FW_NORMAL, FH_SCALE | 10, 11, 2, 2, 0, 5, 11, 96, 0x20, 0xff, 0x81, 0x20, FS_LATIN1 | FS_LATIN2, LANG_ARABIC, 13 }, + { "MS Sans Serif", FW_NORMAL, FH_SCALE | 10, 11, 2, 2, 0, 5, 11, 96, 0x20, 0xff, 0x81, 0x20, FS_LATIN1 | FS_LATIN2, skip_rtl, 13 }, { "MS Sans Serif", FW_NORMAL, FH_SCALE | 10, 11, 2, 2, 0, 5, 11, 96, 0x20, 0xff, 0x7f, 0x20, FS_CYRILLIC, 0, 13 }, - { "MS Sans Serif", FW_NORMAL, FH_SCALE | 14, 11, 2, 2, 0, 5, 11, 96, 0x20, 0xff, 0x81, 0x20, FS_LATIN1 | FS_LATIN2, LANG_ARABIC, 13 }, + { "MS Sans Serif", FW_NORMAL, FH_SCALE | 14, 11, 2, 2, 0, 5, 11, 96, 0x20, 0xff, 0x81, 0x20, FS_LATIN1 | FS_LATIN2, skip_rtl, 13 }, { "MS Sans Serif", FW_NORMAL, FH_SCALE | 14, 11, 2, 2, 0, 5, 11, 96, 0x20, 0xff, 0x7f, 0x20, FS_CYRILLIC, 0, 13 }, - { "MS Sans Serif", FW_NORMAL, FH_SCALE | 18, 13, 3, 3, 0, 7, 14, 96, 0x20, 0xff, 0x81, 0x20, FS_LATIN1 | FS_LATIN2, LANG_ARABIC, 16 }, + { "MS Sans Serif", FW_NORMAL, FH_SCALE | 18, 13, 3, 3, 0, 7, 14, 96, 0x20, 0xff, 0x81, 0x20, FS_LATIN1 | FS_LATIN2, skip_rtl, 16 }, { "MS Sans Serif", FW_NORMAL, FH_SCALE | 18, 13, 3, 3, 0, 7, 14, 96, 0x20, 0xff, 0x7f, 0x20, FS_CYRILLIC, 0, 16 }, { "MS Sans Serif", FW_NORMAL, FH_SCALE | 6, 13, 3, 3, 0, 7, 14, 120, 0x20, 0xff, 0x81, 0x20, FS_LATIN1 | FS_LATIN2, 0, 16 }, @@ -864,22 +865,22 @@ static void test_bitmap_font_metrics(void) { "Small Fonts", FW_NORMAL, 3, 2, 1, 0, 0, 1, 2, 96, 0x20, 0xff, 0x80, 0x20, FS_LATIN1 }, { "Small Fonts", FW_NORMAL, 3, 2, 1, 0, 0, 1, 8, 96, 0x20, 0xff, 0x80, 0x20, FS_LATIN2 | FS_CYRILLIC }, { "Small Fonts", FW_NORMAL, 3, 2, 1, 0, 0, 2, 4, 96, 0x20, 0xff, 0x80, 0x20, FS_JISJAPAN }, - { "Small Fonts", FW_NORMAL, 5, 4, 1, 1, 0, 3, 4, 96, 0x20, 0xff, 0x80, 0x20, FS_LATIN1, LANG_ARABIC }, + { "Small Fonts", FW_NORMAL, 5, 4, 1, 1, 0, 3, 4, 96, 0x20, 0xff, 0x80, 0x20, FS_LATIN1, skip_rtl}, { "Small Fonts", FW_NORMAL, 5, 4, 1, 1, 0, 2, 8, 96, 0x20, 0xff, 0x80, 0x20, FS_LATIN2 | FS_CYRILLIC }, { "Small Fonts", FW_NORMAL, 5, 4, 1, 0, 0, 3, 6, 96, 0x20, 0xff, 0x80, 0x20, FS_JISJAPAN }, - { "Small Fonts", FW_NORMAL, 6, 5, 1, 1, 0, 3, 13, 96, 0x20, 0xff, 0x80, 0x20, FS_LATIN1, LANG_ARABIC }, + { "Small Fonts", FW_NORMAL, 6, 5, 1, 1, 0, 3, 13, 96, 0x20, 0xff, 0x80, 0x20, FS_LATIN1, skip_rtl}, { "Small Fonts", FW_NORMAL, 6, 5, 1, 1, 0, 3, 8, 96, 0x20, 0xff, 0x80, 0x20, FS_LATIN2 | FS_CYRILLIC }, { "Small Fonts", FW_NORMAL, 6, 5, 1, 1, 0, 3, 8, 96, 0x00, 0xff, 0x60, 0x00, FS_ARABIC }, { "Small Fonts", FW_NORMAL, 6, 5, 1, 0, 0, 4, 8, 96, 0x20, 0xff, 0x80, 0x20, FS_JISJAPAN }, - { "Small Fonts", FW_NORMAL, 8, 7, 1, 1, 0, 4, 7, 96, 0x20, 0xff, 0x80, 0x20, FS_LATIN1, LANG_ARABIC }, + { "Small Fonts", FW_NORMAL, 8, 7, 1, 1, 0, 4, 7, 96, 0x20, 0xff, 0x80, 0x20, FS_LATIN1, skip_rtl}, { "Small Fonts", FW_NORMAL, 8, 7, 1, 1, 0, 4, 8, 96, 0x20, 0xff, 0x80, 0x20, FS_LATIN2 | FS_CYRILLIC }, { "Small Fonts", FW_NORMAL, 8, 7, 1, 1, 0, 4, 8, 96, 0x00, 0xff, 0x60, 0x00, FS_ARABIC }, { "Small Fonts", FW_NORMAL, 8, 7, 1, 0, 0, 5, 10, 96, 0x20, 0xff, 0x80, 0x20, FS_JISJAPAN }, - { "Small Fonts", FW_NORMAL, 10, 8, 2, 2, 0, 4, 8, 96, 0x20, 0xff, 0x80, 0x20, FS_LATIN1 | FS_LATIN2, LANG_ARABIC }, + { "Small Fonts", FW_NORMAL, 10, 8, 2, 2, 0, 4, 8, 96, 0x20, 0xff, 0x80, 0x20, FS_LATIN1 | FS_LATIN2, skip_rtl}, { "Small Fonts", FW_NORMAL, 10, 8, 2, 2, 0, 5, 8, 96, 0x20, 0xff, 0x80, 0x20, FS_CYRILLIC }, { "Small Fonts", FW_NORMAL, 10, 8, 2, 2, 0, 4, 9, 96, 0x00, 0xff, 0x60, 0x00, FS_ARABIC }, { "Small Fonts", FW_NORMAL, 10, 8, 2, 0, 0, 6, 12, 96, 0x20, 0xff, 0x80, 0x20, FS_JISJAPAN }, - { "Small Fonts", FW_NORMAL, 11, 9, 2, 2, 0, 5, 9, 96, 0x20, 0xff, 0x80, 0x20, FS_LATIN1 | FS_LATIN2 | FS_CYRILLIC, LANG_ARABIC }, + { "Small Fonts", FW_NORMAL, 11, 9, 2, 2, 0, 5, 9, 96, 0x20, 0xff, 0x80, 0x20, FS_LATIN1 | FS_LATIN2 | FS_CYRILLIC, skip_rtl}, { "Small Fonts", FW_NORMAL, 11, 9, 2, 2, 0, 4, 10, 96, 0x00, 0xff, 0x60, 0x00, FS_ARABIC }, { "Small Fonts", FW_NORMAL, 11, 9, 2, 0, 0, 7, 14, 96, 0x20, 0xff, 0x80, 0x20, FS_JISJAPAN }, @@ -1021,8 +1022,17 @@ static void test_bitmap_font_metrics(void) if(fd[i].dpi == tm.tmDigitizedAspectX) { + int skipme = 0; trace("matched %s, height %d charset %x dpi %d\n", lf.lfFaceName, lf.lfHeight, lf.lfCharSet, fd[i].dpi); - if (fd[i].skip_lang_id == 0 || system_lang_id != fd[i].skip_lang_id) + if (fd[i].skip_lang_id) + { + int si = 0; + skipme = 0; + while(!skipme && fd[i].skip_lang_id[si]) + if (fd[i].skip_lang_id[si++] == system_lang_id) + skipme = 1; + } + if (!skipme) { ok(tm.tmWeight == fd[i].weight, "%s(%d): tm.tmWeight %d != %d\n", fd[i].face_name, height, tm.tmWeight, fd[i].weight); if (fd[i].height & FH_SCALE)

1 0

Andrey Gusev : wined3d: TRACE fixes.
by Alexandre Julliard 01 Oct '15

01 Oct '15

Module: wine Branch: master Commit: 3c8635c8d7ef9a6f4c522f931c2be757022556fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c8635c8d7ef9a6f4c522f931… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Fri Sep 18 16:54:41 2015 +0300 wined3d: TRACE fixes. --- dlls/wined3d/buffer.c | 3 ++- dlls/wined3d/device.c | 3 ++- dlls/wined3d/directx.c | 4 ++-- dlls/wined3d/palette.c | 4 ++-- dlls/wined3d/query.c | 4 ++-- dlls/wined3d/shader.c | 4 ++-- dlls/wined3d/surface.c | 4 ++-- dlls/wined3d/texture.c | 4 ++-- dlls/wined3d/view.c | 8 ++++---- 9 files changed, 20 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 689bb5d..19df398 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1236,7 +1236,8 @@ HRESULT CDECL wined3d_buffer_create(struct wined3d_device *device, const struct struct wined3d_buffer *object; HRESULT hr; - TRACE("device %p, desc %p, data %p, parent %p, buffer %p\n", device, desc, data, parent, buffer); + TRACE("device %p, desc %p, data %p, parent %p, parent_ops %p, buffer %p\n", + device, desc, data, parent, parent_ops, buffer); object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 88f0038..def042a 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4503,7 +4503,8 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, HRESULT hr = WINED3D_OK; unsigned int i; - TRACE("device %p, swapchain_desc %p, mode %p, callback %p.\n", device, swapchain_desc, mode, callback); + TRACE("device %p, swapchain_desc %p, mode %p, callback %p, reset_state %#x.\n", + device, swapchain_desc, mode, callback, reset_state); if (!(swapchain = wined3d_device_get_swapchain(device, 0))) { diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 5ac3ca7..6801bcc 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -5451,8 +5451,8 @@ HRESULT CDECL wined3d_device_create(struct wined3d *wined3d, UINT adapter_idx, e struct wined3d_device *object; HRESULT hr; - TRACE("wined3d %p, adapter_idx %u, device_type %#x, focus_window %p, flags %#x, device_parent %p, device %p.\n", - wined3d, adapter_idx, device_type, focus_window, flags, device_parent, device); + TRACE("wined3d %p, adapter_idx %u, device_type %#x, focus_window %p, flags %#x, surface_alignment %u, device_parent %p, device %p.\n", + wined3d, adapter_idx, device_type, focus_window, flags, surface_alignment, device_parent, device); /* Validate the adapter number. If no adapters are available(no GL), ignore the adapter * number and create a device without a 3D adapter for 2D only operation. */ diff --git a/dlls/wined3d/palette.c b/dlls/wined3d/palette.c index 1ebeb11..0d7bfa4 100644 --- a/dlls/wined3d/palette.c +++ b/dlls/wined3d/palette.c @@ -157,8 +157,8 @@ HRESULT CDECL wined3d_palette_create(struct wined3d_device *device, DWORD flags, struct wined3d_palette *object; HRESULT hr; - TRACE("device %p, flags %#x, entries %p, palette %p.\n", - device, flags, entries, palette); + TRACE("device %p, flags %#x, entry_count %u, entries %p, palette %p.\n", + device, flags, entry_count, entries, palette); object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 9e6f21a..b86adf1 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -114,7 +114,7 @@ enum wined3d_event_query_result wined3d_event_query_finish(const struct wined3d_ const struct wined3d_gl_info *gl_info; enum wined3d_event_query_result ret; - TRACE("(%p)\n", query); + TRACE("query %p, device %p.\n", query, device); if (!query->context) { @@ -812,7 +812,7 @@ HRESULT CDECL wined3d_query_create(struct wined3d_device *device, struct wined3d_query *object; HRESULT hr; - TRACE("device %p, type %#x, query %p.\n", device, type, query); + TRACE("device %p, type %#x, parent %p, query %p.\n", device, type, parent, query); object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 6e9fa9e..2d80877 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -2037,8 +2037,8 @@ static HRESULT shader_set_function(struct wined3d_shader *shader, const DWORD *b unsigned int backend_version; const struct wined3d_d3d_info *d3d_info = &shader->device->adapter->d3d_info; - TRACE("shader %p, byte_code %p, output_signature %p, float_const_count %u.\n", - shader, byte_code, output_signature, float_const_count); + TRACE("shader %p, byte_code %p, output_signature %p, float_const_count %u, type %#x, max_version %u.\n", + shader, byte_code, output_signature, float_const_count, type, max_version); list_init(&shader->constantsF); list_init(&shader->constantsB); diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 999423d8..b5133b0 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3557,7 +3557,7 @@ void surface_load_ds_location(struct wined3d_surface *surface, struct wined3d_co struct wined3d_device *device = surface->resource.device; GLsizei w, h; - TRACE("surface %p, new location %#x.\n", surface, location); + TRACE("surface %p, context %p, new location %#x.\n", surface, context, location); /* TODO: Make this work for modes other than FBO */ if (wined3d_settings.offscreen_rendering_mode != ORM_FBO) return; @@ -4980,7 +4980,7 @@ HRESULT CDECL wined3d_surface_blt(struct wined3d_surface *dst_surface, const REC | WINEDDBLT_DEPTHFILL | WINEDDBLT_DONOTWAIT; - TRACE("dst_surface %p, dst_rect %s, src_surface %p, src_rect %s, flags %#x, fx %p, filter %s.\n", + TRACE("dst_surface %p, dst_rect_in %s, src_surface %p, src_rect_in %s, flags %#x, fx %p, filter %s.\n", dst_surface, wine_dbgstr_rect(dst_rect_in), src_surface, wine_dbgstr_rect(src_rect_in), flags, fx, debug_d3dtexturefiltertype(filter)); TRACE("Usage is %s.\n", debug_d3dusage(dst_surface->resource.usage)); diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index b369809..fdce24d 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -443,7 +443,7 @@ void wined3d_texture_load(struct wined3d_texture *texture, DWORD flag; UINT i; - TRACE("texture %p, srgb %#x.\n", texture, srgb); + TRACE("texture %p, context %p, srgb %#x.\n", texture, context, srgb); if (gl_info->supported[EXT_TEXTURE_SRGB_DECODE]) srgb = FALSE; @@ -826,7 +826,7 @@ static void texture2d_prepare_texture(struct wined3d_texture *texture, struct wi GLenum internal; UINT i; - TRACE("texture %p, format %s.\n", texture, debug_d3dformat(format->id)); + TRACE("texture %p, context %p, format %s.\n", texture, context, debug_d3dformat(format->id)); if (format->convert) { diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 1ff36da..846f7fd 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -131,8 +131,8 @@ HRESULT CDECL wined3d_rendertarget_view_create(const struct wined3d_rendertarget { struct wined3d_rendertarget_view *object; - TRACE("desc %p, resource %p, parent %p, view %p.\n", - desc, resource, parent, view); + TRACE("desc %p, resource %p, parent %p, parent_ops %p, view %p.\n", + desc, resource, parent, parent_ops, view); if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) return E_OUTOFMEMORY; @@ -150,7 +150,7 @@ HRESULT CDECL wined3d_rendertarget_view_create_from_surface(struct wined3d_surfa { struct wined3d_rendertarget_view_desc desc; - TRACE("surface %p, view %p.\n", surface, view); + TRACE("surface %p, parent %p, parent_ops %p, view %p.\n", surface, parent, parent_ops, view); desc.format_id = surface->resource.format->id; desc.u.texture.level_idx = surface->texture_level; @@ -199,7 +199,7 @@ HRESULT CDECL wined3d_shader_resource_view_create(struct wined3d_resource *resou { struct wined3d_shader_resource_view *object; - TRACE("parent %p, parent_ops %p, view %p.\n", parent, parent_ops, view); + TRACE("resource %p, parent %p, parent_ops %p, view %p.\n", resource, parent, parent_ops, view); if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) return E_OUTOFMEMORY;

1 0

Józef Kucia : d3d11/tests: Port test_create_shader() from d3d10core.
by Alexandre Julliard 01 Oct '15

01 Oct '15

Module: wine Branch: master Commit: dc54d70207d47f31ff62ac81400684dd8185e2fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc54d70207d47f31ff62ac814… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sun Sep 27 18:49:53 2015 +0200 d3d11/tests: Port test_create_shader() from d3d10core. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d11/tests/d3d11.c | 207 ++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 194 insertions(+), 13 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=dc54d70207d47f31ff62a…

1 0