November 2014 - Wine-commits

Alexandre Julliard : Wine release 1.7.32
by Alexandre Julliard 28 Nov '14

28 Nov '14

Module: website Branch: master Commit: 422a63015da754ae6569aaebef3c22de921d5a1d URL: http://source.winehq.org/git/website.git/?a=commit;h=422a63015da754ae6569aa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 28 20:57:57 2014 +0100 Wine release 1.7.32 --- news/en/2014112801.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/en/2014112801.xml b/news/en/2014112801.xml new file mode 100644 index 0000000..89bcb8c --- /dev/null +++ b/news/en/2014112801.xml @@ -0,0 +1,16 @@ +<news> +<date>November 28, 2014</date> +<title>Wine 1.7.32 Released</title> +<body> + The Wine development release 1.7.32 is now available. + <a href="{$root}/announce/1.7.32">What's new</a> in this release: +<ul> + <li>New version of the Mono engine.</li> + <li>A few more functions implemented in MSHTML.</li> + <li>Improved support for restoring display mode.</li> + <li>Font metrics improvements in DirectWrite.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.32.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Alexandre Julliard : Release 1.7.32.
by Alexandre Julliard 28 Nov '14

28 Nov '14

Module: wine Branch: master Commit: fe2466ffdfa505329d009dac14cf933e77a14495 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe2466ffdfa505329d009dac1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 28 20:48:59 2014 +0100 Release 1.7.32. --- .mailmap | 1 + ANNOUNCE | 567 +++++++++++++++++++++++++++++--------------------------------- AUTHORS | 2 +- VERSION | 2 +- configure | 18 +- 5 files changed, 278 insertions(+), 312 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fe2466ffdfa505329d009…

1 0

Tag wine-1.7.32 : Alexandre Julliard : Release 1.7.32
by Alexandre Julliard 28 Nov '14

28 Nov '14

Module: wine Branch: refs/tags/wine-1.7.32 Tag: a5f42b4b5d52276963369652bc0c388312f3dadf URL: http://source.winehq.org/git/wine.git/?a=tag;h=a5f42b4b5d52276963369652bc0c… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 28 20:48:59 2014 +0100 Release 1.7.32

1 0

Piotr Caban : ws2_32/tests: Add more select tests.
by Alexandre Julliard 28 Nov '14

28 Nov '14

Module: wine Branch: master Commit: 6d5b7c7344154dfe7c6faabe813ca69772e17740 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d5b7c7344154dfe7c6faabe8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Nov 27 18:52:15 2014 +0100 ws2_32/tests: Add more select tests. --- dlls/ws2_32/tests/sock.c | 75 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 75 insertions(+) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index acc2783..106588d 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -3229,6 +3229,8 @@ static void test_listen(void) static void test_select(void) { + static const char tmp_buf[1024]; + SOCKET fdRead, fdWrite; fd_set readfds, writefds, exceptfds; unsigned int maxfd; @@ -3327,6 +3329,79 @@ static void test_select(void) ok ( (ret == SOCKET_ERROR), "expected SOCKET_ERROR, got %i\n", ret); ok ( WSAGetLastError() == WSAENOTSOCK, "expected WSAENOTSOCK, got %i\n", WSAGetLastError()); ok ( !FD_ISSET(fdRead, &exceptfds), "FD should not be set\n"); + + ok(!tcp_socketpair(&fdRead, &fdWrite), "creating socket pair failed\n"); + maxfd = fdRead; + if(fdWrite > maxfd) maxfd = fdWrite; + + FD_ZERO(&readfds); + FD_SET(fdRead, &readfds); + ret = select(fdRead+1, &readfds, NULL, NULL, &select_timeout); + ok(!ret, "select returned %d\n", ret); + + FD_ZERO(&writefds); + FD_SET(fdWrite, &writefds); + ret = select(fdWrite+1, NULL, &writefds, NULL, &select_timeout); + ok(ret == 1, "select returned %d\n", ret); + ok(FD_ISSET(fdWrite, &writefds), "fdWrite socket is not in the set\n"); + + /* tests for overlapping fd_set pointers */ + FD_ZERO(&readfds); + FD_SET(fdWrite, &readfds); + ret = select(fdWrite+1, &readfds, &readfds, NULL, &select_timeout); + ok(ret == 1, "select returned %d\n", ret); + ok(FD_ISSET(fdWrite, &readfds), "fdWrite socket is not in the set\n"); + + FD_ZERO(&readfds); + FD_SET(fdWrite, &readfds); + FD_SET(fdRead, &readfds); + ret = select(maxfd+1, &readfds, &readfds, NULL, &select_timeout); + ok(ret == 2, "select returned %d\n", ret); + ok(FD_ISSET(fdWrite, &readfds), "fdWrite socket is not in the set\n"); + ok(FD_ISSET(fdRead, &readfds), "fdWrite socket is not in the set\n"); + + ok(send(fdWrite, "test", 4, 0) == 4, "failed to send data\n"); + FD_ZERO(&readfds); + FD_SET(fdRead, &readfds); + ret = select(fdRead+1, &readfds, NULL, NULL, &select_timeout); + ok(ret == 1, "select returned %d\n", ret); + ok(FD_ISSET(fdRead, &readfds), "fdWrite socket is not in the set\n"); + + FD_ZERO(&readfds); + FD_SET(fdWrite, &readfds); + FD_SET(fdRead, &readfds); + ret = select(maxfd+1, &readfds, &readfds, NULL, &select_timeout); + ok(ret == 2, "select returned %d\n", ret); + ok(FD_ISSET(fdWrite, &readfds), "fdWrite socket is not in the set\n"); + ok(FD_ISSET(fdRead, &readfds), "fdWrite socket is not in the set\n"); + + while(1) { + FD_ZERO(&writefds); + FD_SET(fdWrite, &writefds); + ret = select(fdWrite+1, NULL, &writefds, NULL, &select_timeout); + if(!ret) break; + ok(send(fdWrite, tmp_buf, sizeof(tmp_buf), 0) > 0, "failed to send data\n"); + } + FD_ZERO(&readfds); + FD_SET(fdWrite, &readfds); + FD_SET(fdRead, &readfds); + ret = select(maxfd+1, &readfds, &readfds, NULL, &select_timeout); + ok(ret == 1, "select returned %d\n", ret); + ok(!FD_ISSET(fdWrite, &readfds), "fdWrite socket is in the set\n"); + ok(FD_ISSET(fdRead, &readfds), "fdWrite socket is not in the set\n"); + + ok(send(fdRead, "test", 4, 0) == 4, "failed to send data\n"); + Sleep(100); + FD_ZERO(&readfds); + FD_SET(fdWrite, &readfds); + FD_SET(fdRead, &readfds); + ret = select(maxfd+1, &readfds, &readfds, NULL, &select_timeout); + ok(ret == 2, "select returned %d\n", ret); + ok(FD_ISSET(fdWrite, &readfds), "fdWrite socket is not in the set\n"); + ok(FD_ISSET(fdRead, &readfds), "fdWrite socket is not in the set\n"); + + closesocket(fdRead); + closesocket(fdWrite); } static DWORD WINAPI AcceptKillThread(void *param)

1 0

Sebastian Lackner : configure: Fix detection of gnutls on Ubuntu 14.10.
by Alexandre Julliard 28 Nov '14

28 Nov '14

Module: wine Branch: master Commit: 79e0cb3a26f8ddefa12a7bf1023cf442f4072b81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79e0cb3a26f8ddefa12a7bf10… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sun Sep 7 08:09:54 2014 +0200 configure: Fix detection of gnutls on Ubuntu 14.10. --- configure | 16 ++++++++-------- configure.ac | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/configure b/configure index 4b1a37d..6f45fee 100755 --- a/configure +++ b/configure @@ -6001,7 +6001,7 @@ else We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) +#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; @@ -6047,7 +6047,7 @@ else We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) +#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; @@ -6071,7 +6071,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) +#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; @@ -6116,7 +6116,7 @@ else We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) +#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; @@ -6140,7 +6140,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) +#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; @@ -11278,10 +11278,10 @@ _ACEOF if ac_fn_c_try_link "$LINENO"; then : case "$LIBEXT" in dll) ac_cv_lib_soname_gnutls=`$ac_cv_path_LDD conftest.exe | grep "gnutls" | sed -e "s/dll.*/dll/"';2,$d'` ;; - dylib) ac_cv_lib_soname_gnutls=`otool -L conftest$ac_exeext | grep "libgnutls\\.[0-9A-Za-z.]*dylib" | sed -e "s/^.*\/$libgnutls\.[0-9A-Za-z.]*dylib$.*$/\1/"';2,$d'` ;; - *) ac_cv_lib_soname_gnutls=`$READELF -d conftest$ac_exeext | grep "NEEDED.*libgnutls\\.$LIBEXT" | sed -e "s/^.*\\[\$libgnutls\\.$LIBEXT[^ ]*\$\\].*$/\1/"';2,$d'` + dylib) ac_cv_lib_soname_gnutls=`otool -L conftest$ac_exeext | grep "libgnutls\$-deb0\$\\{0,1\\}\\.[0-9A-Za-z.]*dylib" | sed -e "s/^.*\/$libgnutls\\(-deb0\$\\{0,1\\}\.[0-9A-Za-z.]*dylib\).*$/\1/"';2,$d'` ;; + *) ac_cv_lib_soname_gnutls=`$READELF -d conftest$ac_exeext | grep "NEEDED.*libgnutls\$-deb0\$\\{0,1\\}\\.$LIBEXT" | sed -e "s/^.*\\[\$libgnutls\\(-deb0\$\\{0,1\\}\\.$LIBEXT[^ ]*\\)\\].*$/\1/"';2,$d'` if ${ac_cv_lib_soname_gnutls:+false} :; then : - ac_cv_lib_soname_gnutls=`$LDD conftest$ac_exeext | grep "libgnutls\\.$LIBEXT" | sed -e "s/^.*$libgnutls\.$LIBEXT[^ ]*$.*$/\1/"';2,$d'` + ac_cv_lib_soname_gnutls=`$LDD conftest$ac_exeext | grep "libgnutls\$-deb0\$\\{0,1\\}\\.$LIBEXT" | sed -e "s/^.*$libgnutls\\(-deb0\$\\{0,1\\}\.$LIBEXT[^ ]*\).*$/\1/"';2,$d'` fi ;; esac fi diff --git a/configure.ac b/configure.ac index 5521af2..edf5408 100644 --- a/configure.ac +++ b/configure.ac @@ -1359,7 +1359,7 @@ then [AC_CHECK_HEADER(gnutls/gnutls.h, [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <gnutls/gnutls.h> #include <gnutls/crypto.h>]], [[static typeof(gnutls_mac_get_key_size) *func; if (func) return 0;]])], - [WINE_CHECK_SONAME(gnutls,gnutls_global_init,,[GNUTLS_CFLAGS=""],[$GNUTLS_LIBS])])], + [WINE_CHECK_SONAME(gnutls,gnutls_global_init,,[GNUTLS_CFLAGS=""],[$GNUTLS_LIBS],[[libgnutls\$-deb0\$\\{0,1\\}]])])], [GNUTLS_CFLAGS=""])]) fi WINE_WARNING_WITH(gnutls,[test "x$ac_cv_lib_soname_gnutls" = "x"],

1 0

Piotr Caban : ntdll: Handle ACTCTX_FLAG_ASSEMBLY_DIRECTORY_VALID flag when opening manifest in RtlCreateActivationContext.
by Alexandre Julliard 28 Nov '14

28 Nov '14

Module: wine Branch: master Commit: f87767bc35b0da4df7c7104c04943ed67e06ea78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f87767bc35b0da4df7c7104c0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Nov 28 08:01:26 2014 +0100 ntdll: Handle ACTCTX_FLAG_ASSEMBLY_DIRECTORY_VALID flag when opening manifest in RtlCreateActivationContext. --- dlls/kernel32/tests/actctx.c | 59 ++++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/actctx.c | 25 ++++++++++++++++++- 2 files changed, 83 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c index 1f5683f..c964743 100644 --- a/dlls/kernel32/tests/actctx.c +++ b/dlls/kernel32/tests/actctx.c @@ -2166,6 +2166,65 @@ todo_wine handle = pCreateActCtxA(&actctx); ok(handle == INVALID_HANDLE_VALUE, "got handle %p\n", handle); ok(GetLastError() == ERROR_RESOURCE_TYPE_NOT_FOUND, "got error %d\n", GetLastError()); + + /* load manifest from lpAssemblyDirectory directory */ + write_manifest("testdir.manifest", manifest1); + GetTempPathA(sizeof(path)/sizeof(path[0]), path); + SetCurrentDirectoryA(path); + strcat(path, "assembly_dir"); + strcpy(dir, path); + strcat(path, "\\testdir.manifest"); + + memset(&actctx, 0, sizeof(actctx)); + actctx.cbSize = sizeof(actctx); + actctx.dwFlags = ACTCTX_FLAG_ASSEMBLY_DIRECTORY_VALID; + actctx.lpSource = "testdir.manifest"; + actctx.lpAssemblyDirectory = dir; + + SetLastError(0xdeadbeef); + handle = pCreateActCtxA(&actctx); + ok(handle == INVALID_HANDLE_VALUE, "got handle %p\n", handle); + ok(GetLastError()==ERROR_PATH_NOT_FOUND || + broken(GetLastError()==ERROR_FILE_NOT_FOUND) /* WinXP */, + "got error %d\n", GetLastError()); + + CreateDirectoryA(dir, NULL); + memset(&actctx, 0, sizeof(actctx)); + actctx.cbSize = sizeof(actctx); + actctx.dwFlags = ACTCTX_FLAG_ASSEMBLY_DIRECTORY_VALID; + actctx.lpSource = "testdir.manifest"; + actctx.lpAssemblyDirectory = dir; + + SetLastError(0xdeadbeef); + handle = pCreateActCtxA(&actctx); + ok(handle == INVALID_HANDLE_VALUE, "got handle %p\n", handle); + ok(GetLastError() == ERROR_FILE_NOT_FOUND, "got error %d\n", GetLastError()); + SetCurrentDirectoryW(work_dir); + + write_manifest("assembly_dir\\testdir.manifest", manifest1); + memset(&actctx, 0, sizeof(actctx)); + actctx.cbSize = sizeof(actctx); + actctx.dwFlags = ACTCTX_FLAG_ASSEMBLY_DIRECTORY_VALID; + actctx.lpSource = "testdir.manifest"; + actctx.lpAssemblyDirectory = dir; + + handle = pCreateActCtxA(&actctx); + ok(handle != INVALID_HANDLE_VALUE, "got handle %p\n", handle); + pReleaseActCtx(handle); + + memset(&actctx, 0, sizeof(actctx)); + actctx.cbSize = sizeof(actctx); + actctx.dwFlags = ACTCTX_FLAG_ASSEMBLY_DIRECTORY_VALID; + actctx.lpSource = path; + actctx.lpAssemblyDirectory = dir; + + handle = pCreateActCtxA(&actctx); + ok(handle != INVALID_HANDLE_VALUE, "got handle %p\n", handle); + pReleaseActCtx(handle); + + delete_manifest_file("testdir.manifest"); + delete_manifest_file("assembly_dir\\testdir.manifest"); + RemoveDirectoryA(dir); } static BOOL init_funcs(void) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 9a9dec9..15c9994 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -4535,7 +4535,30 @@ NTSTATUS WINAPI RtlCreateActivationContext( HANDLE *handle, const void *ptr ) if (pActCtx->lpSource && !((pActCtx->dwFlags & ACTCTX_FLAG_RESOURCE_NAME_VALID) && (pActCtx->dwFlags & ACTCTX_FLAG_HMODULE_VALID))) { - if (!RtlDosPathNameToNtPathName_U(pActCtx->lpSource, &nameW, NULL, NULL)) + WCHAR *source = NULL; + BOOLEAN ret; + + if (pActCtx->dwFlags & ACTCTX_FLAG_ASSEMBLY_DIRECTORY_VALID && + RtlDetermineDosPathNameType_U(pActCtx->lpSource) == RELATIVE_PATH) + { + DWORD dir_len, source_len; + + dir_len = strlenW(pActCtx->lpAssemblyDirectory); + source_len = strlenW(pActCtx->lpSource); + if (!(source = RtlAllocateHeap( GetProcessHeap(), 0, (dir_len+source_len+2)*sizeof(WCHAR)))) + { + status = STATUS_NO_MEMORY; + goto error; + } + + memcpy(source, pActCtx->lpAssemblyDirectory, dir_len*sizeof(WCHAR)); + source[dir_len] = '\\'; + memcpy(source+dir_len+1, pActCtx->lpSource, (source_len+1)*sizeof(WCHAR)); + } + + ret = RtlDosPathNameToNtPathName_U(source ? source : pActCtx->lpSource, &nameW, NULL, NULL); + if (source) RtlFreeHeap( GetProcessHeap(), 0, source ); + if (!ret) { status = STATUS_NO_SUCH_FILE; goto error;

1 0

Michael Stefaniuc : gdi32/tests: Don' t clear a variable before it goes out of scope (PVS-Studio).
by Alexandre Julliard 28 Nov '14

28 Nov '14

Module: wine Branch: master Commit: 80218d19ef5af1d3169e7a4d05f5fc1e802f8476 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80218d19ef5af1d3169e7a4d0… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Nov 28 10:57:45 2014 +0100 gdi32/tests: Don't clear a variable before it goes out of scope (PVS-Studio). --- dlls/gdi32/tests/bitmap.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index 2a2dd3a..351a5ca 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -4540,7 +4540,6 @@ static void test_GetDIBits_scanlines(void) ok( ret == 2, "got %d\n", ret ); ok( !memcmp( data, inverted_bits + 32, 16 * 4 ), "bits differ\n"); for (i = 16; i < 128; i++) ok( data[i] == 0xaaaaaaaa, "%d: got %08x\n", i, data[i] ); - memset( data, 0xaa, sizeof(data) ); DeleteObject( dib );

1 0

Nikolay Sivov : dwrite: Respect typographic metrics when font instructs us to.
by Alexandre Julliard 28 Nov '14

28 Nov '14

Module: wine Branch: master Commit: 188bfd6fd4e242a07c6cc0e9e5950a63cb81201b URL: http://source.winehq.org/git/wine.git/?a=commit;h=188bfd6fd4e242a07c6cc0e9e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 27 14:59:00 2014 +0300 dwrite: Respect typographic metrics when font instructs us to. --- dlls/dwrite/opentype.c | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 8a22699..28923c5 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -185,6 +185,19 @@ typedef struct } TT_OS2_V2; #include "poppack.h" +enum OS2_FSSELECTION { + OS2_FSSELECTION_ITALIC = 1 << 0, + OS2_FSSELECTION_UNDERSCORE = 1 << 1, + OS2_FSSELECTION_NEGATIVE = 1 << 2, + OS2_FSSELECTION_OUTLINED = 1 << 3, + OS2_FSSELECTION_STRIKEOUT = 1 << 4, + OS2_FSSELECTION_BOLD = 1 << 5, + OS2_FSSELECTION_REGULAR = 1 << 6, + OS2_FSSELECTION_USE_TYPO_METRICS = 1 << 7, + OS2_FSSELECTION_WWS = 1 << 8, + OS2_FSSELECTION_OBLIQUE = 1 << 9 +}; + typedef struct { WORD platformID; WORD encodingID; @@ -875,8 +888,12 @@ void opentype_get_font_metrics(const void *os2, const void *head, const void *po } if (tt_os2) { + USHORT version = GET_BE_WORD(tt_os2->version); + metrics->ascent = GET_BE_WORD(tt_os2->usWinAscent); metrics->descent = GET_BE_WORD(tt_os2->usWinDescent); + /* FIXME: sTypoLineGap should only be used when USE_TYPO_METRICS is set, + if not set this value is probably derived from other metrics */ metrics->lineGap = GET_BE_WORD(tt_os2->sTypoLineGap); metrics->strikethroughPosition = GET_BE_WORD(tt_os2->yStrikeoutPosition); metrics->strikethroughThickness = GET_BE_WORD(tt_os2->yStrikeoutSize); @@ -891,10 +908,21 @@ void opentype_get_font_metrics(const void *os2, const void *head, const void *po metrics->superscriptSizeY = GET_BE_WORD(tt_os2->ySuperscriptYSize); /* version 2 fields */ - if (tt_os2->version >= 2) { + if (version >= 2) { metrics->capHeight = GET_BE_WORD(tt_os2->sCapHeight); metrics->xHeight = GET_BE_WORD(tt_os2->sxHeight); } + + /* version 4 fields */ + if (version >= 4) { + if (GET_BE_WORD(tt_os2->fsSelection) & OS2_FSSELECTION_USE_TYPO_METRICS) { + SHORT descent = GET_BE_WORD(tt_os2->sTypoDescender); + metrics->ascent = GET_BE_WORD(tt_os2->sTypoAscender); + metrics->descent = descent < 0 ? -descent : 0; + metrics->lineGap = GET_BE_WORD(tt_os2->sTypoLineGap); + metrics->hasTypographicMetrics = TRUE; + } + } } if (tt_post) {

1 0

Nikolay Sivov : dwrite: Fix lineGap metric using 'hhea' table values.
by Alexandre Julliard 28 Nov '14

28 Nov '14

Module: wine Branch: master Commit: 82e66b4b4767532e0030562883dfeed6e7011723 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82e66b4b4767532e003056288… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Nov 28 09:23:51 2014 +0300 dwrite: Fix lineGap metric using 'hhea' table values. --- dlls/dwrite/dwrite_private.h | 2 +- dlls/dwrite/font.c | 19 ++++--------- dlls/dwrite/opentype.c | 67 +++++++++++++++++++++++++++++++++++++------- dlls/dwrite/tests/font.c | 4 --- 4 files changed, 64 insertions(+), 28 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=82e66b4b4767532e00305…

1 0

Stefan Dösinger : Revert "d3d10_1.idl: Added D3D10_1_SHADER_*_VERSION constants.".
by Alexandre Julliard 28 Nov '14

28 Nov '14

Module: wine Branch: master Commit: 832aa40ae69056e1055c034223d4788f29d05b62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=832aa40ae69056e1055c03422… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Nov 28 11:16:41 2014 +0100 Revert "d3d10_1.idl: Added D3D10_1_SHADER_*_VERSION constants.". This reverts commit 044d7e82bf915d36c2921b29f129aae303355af4. These were added later by 9e942d29 in the _D3D10_1_CONSTANTS ifdef block. The double define causes a compile error with midl. --- include/d3d10_1.idl | 2 -- 1 file changed, 2 deletions(-) diff --git a/include/d3d10_1.idl b/include/d3d10_1.idl index ba5517b..4ee49c6 100644 --- a/include/d3d10_1.idl +++ b/include/d3d10_1.idl @@ -48,8 +48,6 @@ cpp_quote("#define D3D10_1_FLOAT32_TO_INTEGER_TOLERANCE_IN_ULP (0.6f)") import "d3d10.idl"; cpp_quote("#include <d3d10_1shader.h>") -const UINT D3D10_1_SHADER_MAJOR_VERSION = 4; -const UINT D3D10_1_SHADER_MINOR_VERSION = 1; typedef enum D3D10_FEATURE_LEVEL1 {

1 0