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

Henri Verbeet : iphlpapi: Simplify the calculation of "ptr" in CreateSortedAddressPairs().
by Alexandre Julliard Aug. 12, 2015

Aug. 12, 2015

Module: wine Branch: master Commit: 0b69c27c4150c02aa6a9bd0da439f506c45291c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b69c27c4150c02aa6a9bd0da… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Aug 9 13:13:52 2015 +0200 iphlpapi: Simplify the calculation of "ptr" in CreateSortedAddressPairs(). --- dlls/iphlpapi/iphlpapi_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index b6ab612..4b1261a 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -387,7 +387,7 @@ DWORD WINAPI CreateSortedAddressPairs( const PSOCKADDR_IN6 src_list, DWORD src_c size = dst_count * sizeof(*pairs); size += dst_count * sizeof(SOCKADDR_IN6) * 2; /* source address + destination address */ if (!(pairs = HeapAlloc( GetProcessHeap(), 0, size ))) return ERROR_NOT_ENOUGH_MEMORY; - ptr = (SOCKADDR_IN6 *)(char *)pairs + dst_count * sizeof(*pairs); + ptr = (SOCKADDR_IN6 *)&pairs[dst_count]; if ((ret = getIPAddrTable( &table, GetProcessHeap(), 0 ))) {

1 0

André Hentschel : user32/tests: Add ARM and ARM64 arch strings.
by Alexandre Julliard Aug. 12, 2015

Aug. 12, 2015

Module: wine Branch: master Commit: 3c9b8d702814c86ab7f68b2d5b5454cebf69b349 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c9b8d702814c86ab7f68b2d5… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Aug 9 14:04:03 2015 +0200 user32/tests: Add ARM and ARM64 arch strings. --- dlls/user32/tests/msg.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 8b4475f..d92fbc7 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -64,6 +64,10 @@ #define ARCH "x86" #elif defined __x86_64__ #define ARCH "amd64" +#elif defined __arm__ +#define ARCH "arm" +#elif defined __aarch64__ +#define ARCH "arm64" #else #define ARCH "none" #endif

1 0

Michael Müller : imagehlp: Remove unused structure.
by Alexandre Julliard Aug. 12, 2015

Aug. 12, 2015

Module: wine Branch: master Commit: b741180b3a164915049f31c1fd148a701c3e1d40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b741180b3a164915049f31c1f… Author: Michael Müller <michael(a)fds-team.de> Date: Tue Aug 11 09:24:46 2015 +0200 imagehlp: Remove unused structure. --- dlls/imagehlp/access.c | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/dlls/imagehlp/access.c b/dlls/imagehlp/access.c index 9e1f187..6a33c0c 100644 --- a/dlls/imagehlp/access.c +++ b/dlls/imagehlp/access.c @@ -36,23 +36,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(imagehlp); static PLOADED_IMAGE IMAGEHLP_pFirstLoadedImage=NULL; -static LOADED_IMAGE IMAGEHLP_EmptyLoadedImage = { - NULL, /* ModuleName */ - 0, /* hFile */ - NULL, /* MappedAddress */ - NULL, /* FileHeader */ - NULL, /* LastRvaSection */ - 0, /* NumberOfSections */ - NULL, /* Sections */ - 1, /* Characteristics */ - FALSE, /* fSystemImage */ - FALSE, /* fDOSImage */ - FALSE, /* fReadOnly */ - 0, /* Version */ - { &IMAGEHLP_EmptyLoadedImage.Links, &IMAGEHLP_EmptyLoadedImage.Links }, /* Links */ - 148, /* SizeOfImage; */ -}; - DECLSPEC_HIDDEN extern HANDLE IMAGEHLP_hHeap; /***********************************************************************

1 0

André Hentschel : ntdll: Fix stack alignment on ARM64.
by Alexandre Julliard Aug. 12, 2015

Aug. 12, 2015

Module: wine Branch: master Commit: ccc91f25c646fae7e9e16c3c068292798b0f0c94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ccc91f25c646fae7e9e16c3c0… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Aug 10 19:49:45 2015 +0200 ntdll: Fix stack alignment on ARM64. --- dlls/ntdll/signal_arm64.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index bd91d81..3a41c84 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -344,7 +344,7 @@ static EXCEPTION_RECORD *setup_exception( ucontext_t *sigcontext, raise_func fun } *stack; DWORD exception_code = 0; - stack = (struct stack_layout *)(SP_sig(sigcontext) & ~3); + stack = (struct stack_layout *)(SP_sig(sigcontext) & ~15); stack--; /* push the stack_layout structure */ stack->rec.ExceptionRecord = NULL;

1 0

Nikolay Sivov : dwrite: Set font stretch from 'head' table as a fallback.
by Alexandre Julliard Aug. 12, 2015

Aug. 12, 2015

Module: wine Branch: master Commit: 123c7cde07c73f01e576f2ab4dd01cdc8968047a URL: http://source.winehq.org/git/wine.git/?a=commit;h=123c7cde07c73f01e576f2ab4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 10 13:50:25 2015 +0300 dwrite: Set font stretch from 'head' table as a fallback. --- dlls/dwrite/opentype.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 852ad96..57660a3 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -133,8 +133,13 @@ typedef struct enum TT_HEAD_MACSTYLE { - TT_HEAD_MACSTYLE_BOLD = 1 << 0, - TT_HEAD_MACSTYLE_ITALIC = 1 << 1, + TT_HEAD_MACSTYLE_BOLD = 1 << 0, + TT_HEAD_MACSTYLE_ITALIC = 1 << 1, + TT_HEAD_MACSTYLE_UNDERLINE = 1 << 2, + TT_HEAD_MACSTYLE_OUTLINE = 1 << 3, + TT_HEAD_MACSTYLE_SHADOW = 1 << 4, + TT_HEAD_MACSTYLE_CONDENSED = 1 << 5, + TT_HEAD_MACSTYLE_EXTENDED = 1 << 6, }; typedef struct @@ -1051,6 +1056,11 @@ void opentype_get_font_properties(IDWriteFontFileStream *stream, DWRITE_FONT_FAC USHORT macStyle = GET_BE_WORD(tt_head->macStyle); if (macStyle & TT_HEAD_MACSTYLE_ITALIC) props->style = DWRITE_FONT_STYLE_ITALIC; + + if (macStyle & TT_HEAD_MACSTYLE_CONDENSED) + props->stretch = DWRITE_FONT_STRETCH_CONDENSED; + else if (macStyle & TT_HEAD_MACSTYLE_EXTENDED) + props->stretch = DWRITE_FONT_STRETCH_EXPANDED; } TRACE("stretch=%d, weight=%d, style %d\n", props->stretch, props->weight, props->style);

1 0

Nikolay Sivov : dwrite: Fix font table tag tracing.
by Alexandre Julliard Aug. 12, 2015

Aug. 12, 2015

Module: wine Branch: master Commit: c7d1b911541a5c775e67ec635f3d3df3e2331a4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7d1b911541a5c775e67ec635… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 10 13:49:13 2015 +0300 dwrite: Fix font table tag tracing. --- dlls/dwrite/font.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 93aae86..6036720 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -211,7 +211,7 @@ static inline struct dwrite_colorglyphenum *impl_from_IDWriteColorGlyphRunEnumer static inline const char *debugstr_tag(UINT32 tag) { - return wine_dbg_sprintf("%c%c%c%c", tag >> 24, (tag >> 16) & 0xff, (tag >> 8) & 0xff, tag & 0xff); + return wine_dbg_sprintf("%c%c%c%c", tag & 0xff, (tag >> 8) & 0xff, (tag >> 16) & 0xff, tag >> 24); } static HRESULT get_cached_glyph_metrics(struct dwrite_fontface *fontface, UINT16 glyph, DWRITE_GLYPH_METRICS *metrics)

1 0

André Hentschel : comctl32/tests: Add ARM and ARM64 arch strings.
by Alexandre Julliard Aug. 12, 2015

Aug. 12, 2015

Module: wine Branch: master Commit: 80f887a064c4ccce11eda206562039daa65c6d45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80f887a064c4ccce11eda2065… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Aug 9 14:03:33 2015 +0200 comctl32/tests: Add ARM and ARM64 arch strings. --- dlls/comctl32/tests/v6util.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/comctl32/tests/v6util.h b/dlls/comctl32/tests/v6util.h index 1300598..9f5a9c4 100644 --- a/dlls/comctl32/tests/v6util.h +++ b/dlls/comctl32/tests/v6util.h @@ -26,6 +26,10 @@ #define ARCH "x86" #elif defined __x86_64__ #define ARCH "amd64" +#elif defined __arm__ +#define ARCH "arm" +#elif defined __aarch64__ +#define ARCH "arm64" #else #define ARCH "none" #endif

1 0

Nikolay Sivov : dwrite: Use OS/2 table data to set font style, make it preferable.
by Alexandre Julliard Aug. 12, 2015

Aug. 12, 2015

Module: wine Branch: master Commit: 4b4674bea84817d624bf34fb8efd010ec72e3775 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b4674bea84817d624bf34fb8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 10 13:49:52 2015 +0300 dwrite: Use OS/2 table data to set font style, make it preferable. --- dlls/dwrite/opentype.c | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index f8c66fc..852ad96 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -131,6 +131,12 @@ typedef struct SHORT glyphdata_format; } TT_HEAD; +enum TT_HEAD_MACSTYLE +{ + TT_HEAD_MACSTYLE_BOLD = 1 << 0, + TT_HEAD_MACSTYLE_ITALIC = 1 << 1, +}; + typedef struct { ULONG Version; @@ -1028,21 +1034,27 @@ void opentype_get_font_properties(IDWriteFontFileStream *stream, DWRITE_FONT_FAC /* DWRITE_FONT_STRETCH enumeration values directly match font data values */ if (tt_os2) { + USHORT version = GET_BE_WORD(tt_os2->version); + USHORT fsSelection = GET_BE_WORD(tt_os2->fsSelection); + if (GET_BE_WORD(tt_os2->usWidthClass) <= DWRITE_FONT_STRETCH_ULTRA_EXPANDED) props->stretch = GET_BE_WORD(tt_os2->usWidthClass); props->weight = GET_BE_WORD(tt_os2->usWeightClass); + if (version >= 4 && (fsSelection & OS2_FSSELECTION_OBLIQUE)) + props->style = DWRITE_FONT_STYLE_OBLIQUE; + else if (fsSelection & OS2_FSSELECTION_ITALIC) + props->style = DWRITE_FONT_STYLE_ITALIC; memcpy(&props->panose, &tt_os2->panose, sizeof(props->panose)); - - TRACE("stretch=%d, weight=%d\n", props->stretch, props->weight); } - - if (tt_head) { + else if (tt_head) { USHORT macStyle = GET_BE_WORD(tt_head->macStyle); - if (macStyle & 0x0002) + if (macStyle & TT_HEAD_MACSTYLE_ITALIC) props->style = DWRITE_FONT_STYLE_ITALIC; } + TRACE("stretch=%d, weight=%d, style %d\n", props->stretch, props->weight, props->style); + if (tt_os2) IDWriteFontFileStream_ReleaseFileFragment(stream, os2_context); if (tt_head)

1 0

Nikolay Sivov : dwrite: Improve the way font weight is set with both OS/ 2 and 'head' values.
by Alexandre Julliard Aug. 12, 2015

Aug. 12, 2015

Module: wine Branch: master Commit: 785c592ada7a6bc161c2026c3df29b7c6d825bb1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=785c592ada7a6bc161c2026c3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 10 13:50:59 2015 +0300 dwrite: Improve the way font weight is set with both OS/2 and 'head' values. --- dlls/dwrite/opentype.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 57660a3..c6d4ec3 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -1041,11 +1041,19 @@ void opentype_get_font_properties(IDWriteFontFileStream *stream, DWRITE_FONT_FAC if (tt_os2) { USHORT version = GET_BE_WORD(tt_os2->version); USHORT fsSelection = GET_BE_WORD(tt_os2->fsSelection); + USHORT usWeightClass = GET_BE_WORD(tt_os2->usWeightClass); if (GET_BE_WORD(tt_os2->usWidthClass) <= DWRITE_FONT_STRETCH_ULTRA_EXPANDED) props->stretch = GET_BE_WORD(tt_os2->usWidthClass); - props->weight = GET_BE_WORD(tt_os2->usWeightClass); + if (usWeightClass >= 1 && usWeightClass <= 9) + usWeightClass *= 100; + + if (usWeightClass > DWRITE_FONT_WEIGHT_ULTRA_BLACK) + props->weight = DWRITE_FONT_WEIGHT_ULTRA_BLACK; + else + props->weight = usWeightClass; + if (version >= 4 && (fsSelection & OS2_FSSELECTION_OBLIQUE)) props->style = DWRITE_FONT_STYLE_OBLIQUE; else if (fsSelection & OS2_FSSELECTION_ITALIC) @@ -1054,13 +1062,17 @@ void opentype_get_font_properties(IDWriteFontFileStream *stream, DWRITE_FONT_FAC } else if (tt_head) { USHORT macStyle = GET_BE_WORD(tt_head->macStyle); - if (macStyle & TT_HEAD_MACSTYLE_ITALIC) - props->style = DWRITE_FONT_STYLE_ITALIC; if (macStyle & TT_HEAD_MACSTYLE_CONDENSED) props->stretch = DWRITE_FONT_STRETCH_CONDENSED; else if (macStyle & TT_HEAD_MACSTYLE_EXTENDED) props->stretch = DWRITE_FONT_STRETCH_EXPANDED; + + if (macStyle & TT_HEAD_MACSTYLE_BOLD) + props->weight = DWRITE_FONT_WEIGHT_BOLD; + + if (macStyle & TT_HEAD_MACSTYLE_ITALIC) + props->style = DWRITE_FONT_STYLE_ITALIC; } TRACE("stretch=%d, weight=%d, style %d\n", props->stretch, props->weight, props->style);

1 0

Sebastian Lackner : wininet/tests: Print the correct function name in ok() messages.
by Alexandre Julliard Aug. 12, 2015

Aug. 12, 2015

Module: wine Branch: master Commit: 9a7ce5614507adc05bcff991022e6e6871f7bdf6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a7ce5614507adc05bcff9910… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Aug 10 16:45:54 2015 +0200 wininet/tests: Print the correct function name in ok() messages. --- dlls/wininet/tests/internet.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index 5e09525..2efde07 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -1111,29 +1111,29 @@ static void test_InternetSetOption(void) SetLastError(0xdeadbeef); ulArg = 11; ret = InternetSetOptionA(NULL, INTERNET_OPTION_ERROR_MASK, (void*)&ulArg, sizeof(ULONG)); - ok(ret == FALSE, "InternetQueryOption should've failed\n"); + ok(ret == FALSE, "InternetSetOption should've failed\n"); ok(GetLastError() == ERROR_INTERNET_INCORRECT_HANDLE_TYPE, "GetLastError() = %x\n", GetLastError()); SetLastError(0xdeadbeef); ulArg = 11; ret = InternetSetOptionA(req, INTERNET_OPTION_ERROR_MASK, (void*)&ulArg, 20); - ok(ret == FALSE, "InternetQueryOption should've failed\n"); + ok(ret == FALSE, "InternetSetOption should've failed\n"); ok(GetLastError() == ERROR_INTERNET_BAD_OPTION_LENGTH, "GetLastError() = %d\n", GetLastError()); ulArg = 11; ret = InternetSetOptionA(req, INTERNET_OPTION_ERROR_MASK, (void*)&ulArg, sizeof(ULONG)); - ok(ret == TRUE, "InternetQueryOption should've succeeded\n"); + ok(ret == TRUE, "InternetSetOption should've succeeded\n"); SetLastError(0xdeadbeef); ulArg = 4; ret = InternetSetOptionA(req, INTERNET_OPTION_ERROR_MASK, (void*)&ulArg, sizeof(ULONG)); - ok(ret == FALSE, "InternetQueryOption should've failed\n"); + ok(ret == FALSE, "InternetSetOption should've failed\n"); ok(GetLastError() == ERROR_INVALID_PARAMETER, "GetLastError() = %x\n", GetLastError()); SetLastError(0xdeadbeef); ulArg = 16; ret = InternetSetOptionA(req, INTERNET_OPTION_ERROR_MASK, (void*)&ulArg, sizeof(ULONG)); - ok(ret == FALSE, "InternetQueryOption should've failed\n"); + ok(ret == FALSE, "InternetSetOption should've failed\n"); ok(GetLastError() == ERROR_INVALID_PARAMETER, "GetLastError() = %x\n", GetLastError()); ret = InternetCloseHandle(req);

1 0