December 2020 - Wine-Devel - list.winehq.org

[PATCH 15/15] msvcrt: Remove MSVCRT_ prefix from data.c functions.

by Piotr Caban

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcr100/msvcr100.spec | 30 ++++++++++----------- dlls/msvcr110/msvcr110.spec | 30 ++++++++++----------- dlls/msvcr120/msvcr120.spec | 30 ++++++++++----------- dlls/msvcr70/msvcr70.spec | 26 +++++++++---------- dlls/msvcr71/msvcr71.spec | 26 +++++++++---------- dlls/msvcr80/msvcr80.spec | 38 +++++++++++++-------------- dlls/msvcr90/msvcr90.spec | 30 ++++++++++----------- dlls/msvcrt/data.c | 38 +++++++++++++-------------- dlls/msvcrt/file.c | 10 ++++--- dlls/msvcrt/msvcrt.h | 1 - dlls/msvcrt/msvcrt.spec | 38 +++++++++++++-------------- dlls/msvcrt/process.c | 5 ++-- dlls/msvcrtd/msvcrtd.spec | 22 ++++++++-------- dlls/ucrtbase/ucrtbase.spec | 52 ++++++++++++++++++------------------- include/msvcrt/stdlib.h | 3 +++ 15 files changed, 193 insertions(+), 186 deletions(-)

Dec. 1, 2020

[PATCH 14/15] msvcrt: Remove MSVCRT_ prefix from ctype.c functions.

by Piotr Caban

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/crtdll/crtdll.spec | 44 +++++----- dlls/msvcr100/msvcr100.spec | 78 ++++++++--------- dlls/msvcr110/msvcr110.spec | 78 ++++++++--------- dlls/msvcr120/msvcr120.spec | 82 +++++++++--------- dlls/msvcr70/msvcr70.spec | 48 +++++------ dlls/msvcr71/msvcr71.spec | 48 +++++------ dlls/msvcr80/msvcr80.spec | 78 ++++++++--------- dlls/msvcr90/msvcr90.spec | 78 ++++++++--------- dlls/msvcrt/ctype.c | 144 ++++++++++++++++---------------- dlls/msvcrt/file.c | 14 ++-- dlls/msvcrt/mbcs.c | 24 +++--- dlls/msvcrt/msvcrt.h | 10 --- dlls/msvcrt/msvcrt.spec | 76 ++++++++--------- dlls/msvcrt/scanf.h | 2 +- dlls/msvcrt/string.c | 34 ++++---- dlls/msvcrt/time.c | 2 +- dlls/msvcrt/undname.c | 2 +- dlls/msvcrtd/msvcrtd.spec | 48 +++++------ dlls/ucrtbase/ucrtbase.spec | 128 ++++++++++++++-------------- include/msvcrt/corecrt_wctype.h | 1 + include/msvcrt/ctype.h | 2 + 21 files changed, 507 insertions(+), 514 deletions(-)

Dec. 1, 2020

[PATCH 13/15] msvcrt: Use FPU control word definitions from public header.

by Piotr Caban

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/math.c | 290 +++++++++++++++++++++---------------------- dlls/msvcrt/msvcrt.h | 27 ---- 2 files changed, 145 insertions(+), 172 deletions(-)

Dec. 1, 2020

[PATCH 12/15] msvcrt: Use fpclassify constants from public header.

by Piotr Caban

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/math.c | 12 ++++++------ dlls/msvcrt/msvcrt.h | 7 ------- 2 files changed, 6 insertions(+), 13 deletions(-)

Dec. 1, 2020

[PATCH 11/15] msvcrt: Use signal definitions from public header.

by Piotr Caban

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/except.c | 87 ++++++++++++++++++++++---------------------- dlls/msvcrt/exit.c | 5 ++- dlls/msvcrt/msvcrt.h | 16 -------- 3 files changed, 47 insertions(+), 61 deletions(-)

Dec. 1, 2020

[PATCH 10/15] msvcrt: Use floating point exception signals definition from public header.

by Piotr Caban

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/except.c | 19 ++++++++++--------- dlls/msvcrt/msvcrt.h | 12 ------------ 2 files changed, 10 insertions(+), 21 deletions(-)

Dec. 1, 2020

[PATCH 09/15] msvcrt: Use _ARGMAX from public header.

by Piotr Caban

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/file.c | 4 ++-- dlls/msvcrt/msvcrt.h | 1 - dlls/msvcrt/printf.h | 4 ++-- dlls/msvcrt/wcs.c | 6 +++--- 4 files changed, 7 insertions(+), 8 deletions(-)

Dec. 1, 2020

[PATCH 08/15] msvcrt: Use fpclass constants from public header.

by Piotr Caban

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/math.c | 34 +++++++++++++++++----------------- dlls/msvcrt/msvcrt.h | 12 ------------ 2 files changed, 17 insertions(+), 29 deletions(-)

Dec. 1, 2020

[PATCH 07/15] msvcrt: Use status word flags from public header.

by Piotr Caban

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/math.c | 72 ++++++++++++++++++++++---------------------- dlls/msvcrt/msvcrt.h | 14 --------- 2 files changed, 36 insertions(+), 50 deletions(-)

Dec. 1, 2020

[PATCH 06/15] msvcrt: Use ctype definition from public header.

by Piotr Caban

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/ctype.c | 104 +++++++++++++++++++++---------------------- dlls/msvcrt/locale.c | 4 +- dlls/msvcrt/msvcrt.h | 12 ----- dlls/msvcrt/wcs.c | 28 ++++++------ 4 files changed, 68 insertions(+), 80 deletions(-)

Dec. 1, 2020

[PATCH 05/15] msvcrt: Use __utimbuf{32,64} from public header.

by Piotr Caban

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/crtdll/crtdll.spec | 6 ++-- dlls/msvcr70/msvcr70.spec | 9 ++++-- dlls/msvcr71/msvcr71.spec | 9 ++++-- dlls/msvcrt/file.c | 64 ++++++--------------------------------- dlls/msvcrt/msvcrt.h | 12 -------- dlls/msvcrt/msvcrt.spec | 9 ++++-- dlls/msvcrtd/msvcrtd.spec | 9 ++++-- 7 files changed, 38 insertions(+), 80 deletions(-)

Dec. 1, 2020

[PATCH 04/15] Revert "msvcrt: Avoid conflict with mingw __iob_func declaration."

by Piotr Caban

This reverts commit 873a90e6f36b9acc74eb637a230ffee491398cd0. It's no longer needed. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/file.c | 1 - 1 file changed, 1 deletion(-)

Dec. 1, 2020

[PATCH 03/15] msvcrt: Use FILE from public header.

by Piotr Caban

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/file.c | 236 +++++++++++++++++++++--------------------- dlls/msvcrt/msvcrt.h | 54 +++++----- dlls/msvcrt/process.c | 12 +-- dlls/msvcrt/scanf.c | 20 ++-- dlls/msvcrt/scanf.h | 10 +- 5 files changed, 165 insertions(+), 167 deletions(-)

Dec. 1, 2020

[PATCH 02/15] msvcrt: Remove MSVCRT_ prefix from heap.c functions.

by Piotr Caban

Dec. 1, 2020

[PATCH 01/15] msvcrt: Remove MSVCRT_ prefix from errno.c functions.

by Piotr Caban

Dec. 1, 2020

Re: [PATCH 2/7] mfplat/mediatype: Do not add user data when converting from WAVE_FORMAT_EXTENSIBLE.

by Marvin

Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=82856 Your paranoid android. === wvistau64 (64 bit report) === mfplat: mfplat: Timeout

Dec. 1, 2020

Re: [PATCH 1/4] widl: Introduce format_namespace_buffer helper.

by Alexandre Julliard

Rémi Bernon <rbernon(a)codeweavers.com> writes: > @@ -89,41 +89,41 @@ const char *type_get_name(const type_t *type, enum name_type name_type) > return NULL; > } > > -static char *append_namespace(char *ptr, struct namespace *namespace, const char *separator) > +#define append_buf(f, ...) \ > + do { \ > + int r = f(buf + ret, max(ret, len) - ret, ## __VA_ARGS__); \ > + assert(r >= 0); \ > + ret += r; \ > + } while(0) > + That sort of macro hiding a function call is not very nice. Please use strmake() or similar helpers instead. -- Alexandre Julliard julliard(a)winehq.org

Dec. 1, 2020

[PATCH v2 6/6] gdi32/tests: Test changing system default font smoothing.

by Paul Gofman

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/gdi32/tests/dib.c | 45 ++++++++++++++++++++++++++++++++++-------- 1 file changed, 37 insertions(+), 8 deletions(-) diff --git a/dlls/gdi32/tests/dib.c b/dlls/gdi32/tests/dib.c index d16cb0df5c0..8cd054f7183 100644 --- a/dlls/gdi32/tests/dib.c +++ b/dlls/gdi32/tests/dib.c @@ -3007,7 +3007,7 @@ static inline COLORREF aa_colorref( COLORREF dst, COLORREF text, BYTE glyph ) static const BYTE masks[8] = {0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01}; -static void draw_text_2( HDC hdc, const BITMAPINFO *bmi, BYTE *bits, BOOL aa ) +static void draw_text_2( HDC hdc, const BITMAPINFO *bmi, BYTE *bits, BYTE quality, BOOL expected_aa ) { DWORD dib_size = get_dib_size(bmi), ret; LOGFONTA lf; @@ -3029,7 +3029,7 @@ static void draw_text_2( HDC hdc, const BITMAPINFO *bmi, BYTE *bits, BOOL aa ) memset( &lf, 0, sizeof(lf) ); strcpy( lf.lfFaceName, "Tahoma" ); lf.lfHeight = 24; - lf.lfQuality = aa ? ANTIALIASED_QUALITY : NONANTIALIASED_QUALITY; + lf.lfQuality = quality; font = CreateFontIndirectA( &lf ); font = SelectObject( hdc, font ); @@ -3054,12 +3054,12 @@ static void draw_text_2( HDC hdc, const BITMAPINFO *bmi, BYTE *bits, BOOL aa ) for(i = 0; i < dib_size; i++) bits[i] = vals[i % 4]; - if (bmi->bmiHeader.biBitCount <= 8) aa = FALSE; + if (bmi->bmiHeader.biBitCount <= 8) expected_aa = FALSE; text_color = GetTextColor( hdc ); for (i = 0; i < strlen(str); i++) { - DWORD ggo_flags = aa ? GGO_GRAY4_BITMAP : GGO_BITMAP; + DWORD ggo_flags = expected_aa ? GGO_GRAY4_BITMAP : GGO_BITMAP; ret = GetGlyphOutlineA( hdc, str[i], ggo_flags, &gm, 0, NULL, &identity ); @@ -3075,7 +3075,7 @@ static void draw_text_2( HDC hdc, const BITMAPINFO *bmi, BYTE *bits, BOOL aa ) if (!ret) continue; - if (aa) + if (expected_aa) { stride = (gm.gmBlackBoxX + 3) & ~3; @@ -3114,7 +3114,7 @@ static void draw_text_2( HDC hdc, const BITMAPINFO *bmi, BYTE *bits, BOOL aa ) } diy_hash = hash_dib( hdc, bmi, bits ); - ok( !strcmp( eto_hash, diy_hash ), "hash mismatch - aa %d\n", aa ); + ok( !strcmp( eto_hash, diy_hash ), "hash mismatch - quality %#x, expected_aa %d\n", quality, expected_aa ); HeapFree( GetProcessHeap(), 0, diy_hash ); HeapFree( GetProcessHeap(), 0, eto_hash ); @@ -3125,14 +3125,43 @@ static void draw_text_2( HDC hdc, const BITMAPINFO *bmi, BYTE *bits, BOOL aa ) static void draw_text( HDC hdc, const BITMAPINFO *bmi, BYTE *bits ) { - draw_text_2( hdc, bmi, bits, FALSE ); + UINT smoothing, type; + BOOL ret; + + draw_text_2( hdc, bmi, bits, NONANTIALIASED_QUALITY, FALSE ); + + ret = SystemParametersInfoA(SPI_GETFONTSMOOTHING, 0, &smoothing, 0); + ok(ret, "SystemParametersInfoA failed, GetLastError() %u.\n", GetLastError()); + + ret = SystemParametersInfoA(SPI_SETFONTSMOOTHING, 0, NULL, 0); + ok(ret, "SystemParametersInfoA failed, GetLastError() %u.\n", GetLastError()); + draw_text_2( hdc, bmi, bits, DEFAULT_QUALITY, FALSE ); /* Rounding errors make these cases hard to test */ if ((bmi->bmiHeader.biCompression == BI_BITFIELDS && ((DWORD*)bmi->bmiColors)[0] == 0x3f000) || (bmi->bmiHeader.biBitCount == 16)) + { + ret = SystemParametersInfoA(SPI_SETFONTSMOOTHING, smoothing, NULL, 0); + ok(ret, "SystemParametersInfoA failed, GetLastError() %u.\n", GetLastError()); return; + } + + ret = SystemParametersInfoA(SPI_SETFONTSMOOTHING, 1, NULL, 0); + ok(ret, "SystemParametersInfoA failed, GetLastError() %u.\n", GetLastError()); + ret = SystemParametersInfoA(SPI_GETFONTSMOOTHINGTYPE, 0, &type, 0); + ok(ret, "SystemParametersInfoA failed, GetLastError() %u.\n", GetLastError()); + ret = SystemParametersInfoA(SPI_SETFONTSMOOTHINGTYPE, 0, (void *)FE_FONTSMOOTHINGSTANDARD, 0); + ok(ret, "SystemParametersInfoA failed, GetLastError() %u.\n", GetLastError()); + + draw_text_2( hdc, bmi, bits, DEFAULT_QUALITY, TRUE ); + + ret = SystemParametersInfoA(SPI_SETFONTSMOOTHINGTYPE, 0, (void *)(ULONG_PTR)type, 0); + ok(ret, "SystemParametersInfoA failed, GetLastError() %u.\n", GetLastError()); + + ret = SystemParametersInfoA(SPI_SETFONTSMOOTHING, smoothing, NULL, 0); + ok(ret, "SystemParametersInfoA failed, GetLastError() %u.\n", GetLastError()); - draw_text_2( hdc, bmi, bits, TRUE ); + draw_text_2( hdc, bmi, bits, ANTIALIASED_QUALITY, TRUE ); } static void test_simple_graphics(void) -- 2.28.0

Dec. 1, 2020

[PATCH v2 5/6] gdi32: Update default font AA parameters on system parameters update.

by Paul Gofman

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45857 Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/gdi32/font.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index c545274c46e..c393599eeed 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -42,6 +42,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(font); static HKEY wine_fonts_key; static HKEY wine_fonts_cache_key; +static HKEY volatile_parameters_key; +static HANDLE volatile_parameters_changed_event; struct font_physdev { @@ -97,6 +99,8 @@ static struct font_gamma_ramp font_gamma_ramp; static void add_face_to_cache( struct gdi_font_face *face ); static void remove_face_from_cache( struct gdi_font_face *face ); +static void update_font_options(void); + static inline WCHAR facename_tolower( WCHAR c ) { if (c >= 'A' && c <= 'Z') return c - 'A' + 'a'; @@ -3739,6 +3743,8 @@ static HFONT CDECL font_SelectFont( PHYSDEV dev, HFONT hfont, UINT *aa_flags ) *aa_flags = font->aa_flags; if (!*aa_flags) { + update_font_options(); + if (lf.lfQuality == CLEARTYPE_QUALITY || lf.lfQuality == CLEARTYPE_NATURAL_QUALITY) *aa_flags = subpixel_orientation; else @@ -3919,6 +3925,9 @@ static void init_font_options(void) antialias_fakes = (wcschr(L"yYtT1", buffer[0]) != NULL); } + font_smoothing = 0; + subpixel_orientation = 0; + if (!RegOpenKeyW( HKEY_CURRENT_USER, L"Control Panel\\Desktop", &key )) { RegOpenKeyW( HKEY_CURRENT_USER, L"Software\\Wine\\Temporary System Parameters\\Control Panel\\Desktop", @@ -3967,6 +3976,30 @@ static void init_font_options(void) TRACE("gamma %d\n", font_gamma_ramp.gamma); } +static void update_font_options(void) +{ + EnterCriticalSection( &font_cs ); + if (!volatile_parameters_key) + { + if (RegOpenKeyW( HKEY_CURRENT_USER, L"Software\\Wine\\Temporary System Parameters\\Control Panel\\Desktop", + &volatile_parameters_key )) + goto done; + volatile_parameters_changed_event = CreateEventA( NULL, FALSE, TRUE, NULL ); + } + if (WaitForSingleObject( volatile_parameters_changed_event, 0 ) == WAIT_OBJECT_0) + { + if (RegNotifyChangeKeyValue( volatile_parameters_key, FALSE, + REG_NOTIFY_CHANGE_NAME | REG_NOTIFY_CHANGE_LAST_SET | REG_NOTIFY_THREAD_AGNOSTIC, + volatile_parameters_changed_event, TRUE)) + ERR("Error registering registry change notification.\n"); + + init_font_options(); + } + +done: + LeaveCriticalSection( &font_cs ); +} + static void FONT_LogFontAToW( const LOGFONTA *fontA, LPLOGFONTW fontW ) { -- 2.28.0

Dec. 1, 2020

[PATCH v2 4/6] winex11.drv: Do not set AA flags for font default AA in xrender backend.

by Paul Gofman

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/winex11.drv/xrender.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index 14ce9e73975..f4f1ab64401 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -856,17 +856,6 @@ static UINT get_xft_aa_flags( const LOGFONTW *lf ) case NONANTIALIASED_QUALITY: case ANTIALIASED_QUALITY: break; - default: - if (!(value = XGetDefault( gdi_display, "Xft", "antialias" ))) break; - TRACE( "got antialias '%s'\n", value ); - if (tolower(value[0]) == 'f' || tolower(value[0]) == 'n' || - value[0] == '0' || !_strnicmp( value, "off", -1 )) - { - ret = GGO_BITMAP; - break; - } - ret = GGO_GRAY4_BITMAP; - /* fall through */ case CLEARTYPE_QUALITY: case CLEARTYPE_NATURAL_QUALITY: if (!(value = XGetDefault( gdi_display, "Xft", "rgba" ))) break; -- 2.28.0

Dec. 1, 2020

[PATCH v2 3/6] gdi32: Handle Wine specific vertical orientations in init_font_options().

by Paul Gofman

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/gdi32/font.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index cb170c0b862..c545274c46e 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -3909,7 +3909,7 @@ static DWORD get_key_value( HKEY key1, HKEY key2, const WCHAR *name, DWORD *valu static void init_font_options(void) { HKEY key, volatile_key = NULL; - DWORD i, type, size, val, gamma = 1400; + DWORD i, type, size, val, gamma = 1400, vertical = 0; WCHAR buffer[20]; size = sizeof(buffer); @@ -3923,16 +3923,18 @@ static void init_font_options(void) { RegOpenKeyW( HKEY_CURRENT_USER, L"Software\\Wine\\Temporary System Parameters\\Control Panel\\Desktop", &volatile_key ); - /* FIXME: handle vertical orientations even though Windows doesn't */ + + get_key_value( volatile_key, key, L"FontSmoothingVertical", &vertical ); + if (!get_key_value( volatile_key, key, L"FontSmoothingOrientation", &val )) { switch (val) { case 0: /* FE_FONTSMOOTHINGORIENTATIONBGR */ - subpixel_orientation = WINE_GGO_HBGR_BITMAP; + subpixel_orientation = vertical ? WINE_GGO_VBGR_BITMAP : WINE_GGO_HBGR_BITMAP; break; case 1: /* FE_FONTSMOOTHINGORIENTATIONRGB */ - subpixel_orientation = WINE_GGO_HRGB_BITMAP; + subpixel_orientation = vertical ? WINE_GGO_VRGB_BITMAP : WINE_GGO_HRGB_BITMAP; break; } } -- 2.28.0

Dec. 1, 2020

[PATCH v2 2/6] winex11.drv: Init font smoothing system default parameters in X11DRV_XRender_Init().

by Paul Gofman

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/winex11.drv/xrender.c | 61 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index 3376cee517d..14ce9e73975 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -32,6 +32,7 @@ #include "windef.h" #include "winbase.h" +#include "winreg.h" #include "x11drv.h" #include "winternl.h" #include "wine/unicode.h" @@ -314,6 +315,64 @@ static int load_xrender_formats(void) return count; } +static void set_default_font_smoothing(void) +{ + DWORD smoothing_type, orientation, vertical; + BOOL smoothing; + HKEY sysparam_key; + char *value; + + if ((value = XGetDefault( gdi_display, "Xft", "antialias" ))) + { + TRACE( "got antialias '%s'.\n", value ); + smoothing = !(tolower(value[0]) == 'f' || tolower(value[0]) == 'n' || + value[0] == '0' || !_strnicmp( value, "off", -1 )); + SystemParametersInfoA(SPI_SETFONTSMOOTHING, smoothing, NULL, 0); + } + else + { + if (!SystemParametersInfoA(SPI_GETFONTSMOOTHING, 0, &smoothing, 0)) + smoothing = FALSE; + } + + if ((value = XGetDefault( gdi_display, "Xft", "rgba" ))) + { + TRACE( "got rgba '%s'.\n", value ); + + vertical = 0; + orientation = smoothing_type = ~0u; + if (!strcmp( value, "rgb" ) || (vertical = !strcmp( value, "vrgb" ))) + { + smoothing_type = FE_FONTSMOOTHINGCLEARTYPE; + orientation = FE_FONTSMOOTHINGORIENTATIONRGB; + } + else if (!strcmp( value, "bgr" ) || (vertical = !strcmp( value, "vbgr" ))) + { + smoothing_type = FE_FONTSMOOTHINGCLEARTYPE; + orientation = FE_FONTSMOOTHINGORIENTATIONBGR; + } + else if (!strcmp( value, "none" )) + { + smoothing_type = FE_FONTSMOOTHINGSTANDARD; + } + + if (smoothing) + { + if (smoothing_type != ~0u) + SystemParametersInfoA(SPI_SETFONTSMOOTHINGTYPE, 0, (void *)(ULONG_PTR)smoothing_type, 0); + if (orientation != ~0u) + SystemParametersInfoA(SPI_SETFONTSMOOTHINGORIENTATION, 0, (void *)(ULONG_PTR)orientation, 0); + } + + if (smoothing_type != ~0u && !RegOpenKeyA( HKEY_CURRENT_USER, + "Software\\Wine\\Temporary System Parameters\\Control Panel\\Desktop", &sysparam_key )) + { + RegSetValueExA( sysparam_key, "FontSmoothingVertical", 0, REG_DWORD, (BYTE *)&vertical, sizeof(vertical) ); + RegCloseKey( sysparam_key ); + } + } +} + /*********************************************************************** * X11DRV_XRender_Init * @@ -379,6 +438,8 @@ const struct gdi_dc_funcs *X11DRV_XRender_Init(void) } glyphsetCache[i-1].next = -1; + set_default_font_smoothing(); + return &xrender_funcs; } -- 2.28.0

Dec. 1, 2020

[PATCH v2 1/6] gdi32: Mind temporary system parameters in init_font_options().

by Paul Gofman

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/gdi32/font.c | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index db87a283b13..cb170c0b862 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -3891,23 +3891,24 @@ const struct gdi_dc_funcs font_driver = GDI_PRIORITY_FONT_DRV /* priority */ }; -static DWORD get_key_value( HKEY key, const WCHAR *name, DWORD *value ) +static DWORD get_key_value( HKEY key1, HKEY key2, const WCHAR *name, DWORD *value ) { WCHAR buf[12]; DWORD count = sizeof(buf), type, err; - err = RegQueryValueExW( key, name, NULL, &type, (BYTE *)buf, &count ); - if (!err) - { - if (type == REG_DWORD) memcpy( value, buf, sizeof(*value) ); - else *value = wcstol( buf, NULL, 10 ); - } - return err; + if ((err = RegQueryValueExW( key1, name, NULL, &type, (BYTE *)buf, &count )) + && (err = RegQueryValueExW( key2, name, NULL, &type, (BYTE *)buf, &count ))) + return err; + + if (type == REG_DWORD) memcpy( value, buf, sizeof(*value) ); + else *value = wcstol( buf, NULL, 10 ); + + return 0; } static void init_font_options(void) { - HKEY key; + HKEY key, volatile_key = NULL; DWORD i, type, size, val, gamma = 1400; WCHAR buffer[20]; @@ -3920,8 +3921,10 @@ static void init_font_options(void) if (!RegOpenKeyW( HKEY_CURRENT_USER, L"Control Panel\\Desktop", &key )) { + RegOpenKeyW( HKEY_CURRENT_USER, L"Software\\Wine\\Temporary System Parameters\\Control Panel\\Desktop", + &volatile_key ); /* FIXME: handle vertical orientations even though Windows doesn't */ - if (!get_key_value( key, L"FontSmoothingOrientation", &val )) + if (!get_key_value( volatile_key, key, L"FontSmoothingOrientation", &val )) { switch (val) { @@ -3933,18 +3936,20 @@ static void init_font_options(void) break; } } - if (!get_key_value( key, L"FontSmoothing", &val ) && val /* enabled */) + if (!get_key_value( volatile_key, key, L"FontSmoothing", &val ) && val /* enabled */) { - if (!get_key_value( key, L"FontSmoothingType", &val ) && val == 2 /* FE_FONTSMOOTHINGCLEARTYPE */) + if (!get_key_value( volatile_key, key, L"FontSmoothingType", &val ) && val == 2 /* FE_FONTSMOOTHINGCLEARTYPE */) font_smoothing = subpixel_orientation; else font_smoothing = GGO_GRAY4_BITMAP; } - if (!get_key_value( key, L"FontSmoothingGamma", &val ) && val) + if (!get_key_value( volatile_key, key, L"FontSmoothingGamma", &val ) && val) { gamma = min( max( val, 1000 ), 2200 ); } RegCloseKey( key ); + if (volatile_key) + RegCloseKey( volatile_key ); } /* Calibrating the difference between the registry value and the Wine gamma value. -- 2.28.0

Dec. 1, 2020

[PATCH 7/7] mf/topoloader: Add copier transform automatically for D3D-aware outputs.

by Nikolay Sivov

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/copier.c | 8 +++ dlls/mf/mf_private.h | 2 + dlls/mf/tests/mf.c | 2 +- dlls/mf/topology.c | 115 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 126 insertions(+), 1 deletion(-) diff --git a/dlls/mf/copier.c b/dlls/mf/copier.c index ba8e316f7e9..cbdac97292b 100644 --- a/dlls/mf/copier.c +++ b/dlls/mf/copier.c @@ -561,6 +561,14 @@ static const IMFTransformVtbl sample_copier_transform_vtbl = sample_copier_transform_ProcessOutput, }; +BOOL mf_is_sample_copier_transform(IUnknown *transform) +{ + return transform->lpVtbl == (IUnknownVtbl *)&sample_copier_transform_vtbl; +} + +/*********************************************************************** + * MFCreateSampleCopierMFT (mf.@) + */ HRESULT WINAPI MFCreateSampleCopierMFT(IMFTransform **transform) { struct sample_copier *object; diff --git a/dlls/mf/mf_private.h b/dlls/mf/mf_private.h index 66d970dfce5..0c4dde0c4fc 100644 --- a/dlls/mf/mf_private.h +++ b/dlls/mf/mf_private.h @@ -79,3 +79,5 @@ static inline const char *debugstr_time(LONGLONG time) return wine_dbg_sprintf("%s", rev); } + +extern BOOL mf_is_sample_copier_transform(IUnknown *transform) DECLSPEC_HIDDEN; diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index b2cb45668cb..a5b23e35773 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -2139,6 +2139,7 @@ static void test_topology_loader_evr(void) UINT64 value64; HWND window; HRESULT hr; + GUID guid; hr = CoInitialize(NULL); ok(hr == S_OK, "Failed to initialize, hr %#x.\n", hr); @@ -2213,7 +2214,6 @@ static void test_topology_loader_evr(void) hr = IMFTopology_GetNodeCount(full_topology, &node_count); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); -todo_wine ok(node_count == 3, "Unexpected node count %u.\n", node_count); for (i = 0; i < node_count; ++i) diff --git a/dlls/mf/topology.c b/dlls/mf/topology.c index 825b9d538f3..e33dbc2efc7 100644 --- a/dlls/mf/topology.c +++ b/dlls/mf/topology.c @@ -2364,6 +2364,119 @@ static HRESULT topology_loader_resolve_nodes(struct topoloader_context *context, return hr; } +static BOOL topology_loader_is_node_d3d_aware(IMFTopologyNode *node) +{ + IMFAttributes *attributes; + unsigned int d3d_aware = 0; + IUnknown *object = NULL; + + if (FAILED(IMFTopologyNode_GetObject(node, &object))) + return FALSE; + + if (SUCCEEDED(IUnknown_QueryInterface(object, &IID_IMFAttributes, (void **)&attributes))) + { + IMFAttributes_GetUINT32(attributes, &MF_SA_D3D_AWARE, &d3d_aware); + IMFAttributes_Release(attributes); + } + + if (!d3d_aware) + d3d_aware = mf_is_sample_copier_transform(object); + + IUnknown_Release(object); + + return !!d3d_aware; +} + +static HRESULT topology_loader_create_copier(IMFTopologyNode *upstream_node, unsigned int upstream_output, + IMFTopologyNode *downstream_node, unsigned int downstream_input, IMFTransform **copier) +{ + IMFMediaType *input_type = NULL, *output_type = NULL; + IMFTransform *transform; + HRESULT hr; + + if (FAILED(hr = MFCreateSampleCopierMFT(&transform))) + return hr; + + if (FAILED(hr = MFGetTopoNodeCurrentType(upstream_node, upstream_output, TRUE, &input_type))) + WARN("Failed to get upstream media type hr %#x.\n", hr); + + if (SUCCEEDED(hr) && FAILED(hr = MFGetTopoNodeCurrentType(downstream_node, downstream_input, FALSE, &output_type))) + WARN("Failed to get downstream media type hr %#x.\n", hr); + + if (SUCCEEDED(hr) && FAILED(hr = IMFTransform_SetInputType(transform, 0, input_type, 0))) + WARN("Input type wasn't accepted, hr %#x.\n", hr); + + if (SUCCEEDED(hr) && FAILED(hr = IMFTransform_SetOutputType(transform, 0, output_type, 0))) + WARN("Output type wasn't accepted, hr %#x.\n", hr); + + if (SUCCEEDED(hr)) + { + *copier = transform; + IMFTransform_AddRef(*copier); + } + + if (input_type) + IMFMediaType_Release(input_type); + if (output_type) + IMFMediaType_Release(output_type); + + IMFTransform_Release(transform); + + return hr; +} + +static HRESULT topology_loader_connect_copier(struct topoloader_context *context, IMFTopologyNode *upstream_node, + unsigned int upstream_output, IMFTopologyNode *downstream_node, unsigned int downstream_input, IMFTransform *copier) +{ + IMFTopologyNode *copier_node; + HRESULT hr; + + if (FAILED(hr = MFCreateTopologyNode(MF_TOPOLOGY_TRANSFORM_NODE, &copier_node))) + return hr; + + IMFTopologyNode_SetObject(copier_node, (IUnknown *)copier); + IMFTopology_AddNode(context->output_topology, copier_node); + IMFTopologyNode_ConnectOutput(upstream_node, upstream_output, copier_node, 0); + IMFTopologyNode_ConnectOutput(copier_node, 0, downstream_node, downstream_input); + + IMFTopologyNode_Release(copier_node); + + return S_OK; +} + +/* Right now this should be used for output nodes only. */ +static HRESULT topology_loader_connect_d3d_aware_input(struct topoloader_context *context, + IMFTopologyNode *node) +{ + IMFTopologyNode *upstream_node; + unsigned int upstream_output; + IMFStreamSink *stream_sink; + IMFTransform *copier = NULL; + HRESULT hr = S_OK; + + IMFTopologyNode_GetObject(node, (IUnknown **)&stream_sink); + + if (topology_loader_is_node_d3d_aware(node)) + { + if (SUCCEEDED(IMFTopologyNode_GetInput(node, 0, &upstream_node, &upstream_output))) + { + if (!topology_loader_is_node_d3d_aware(upstream_node)) + { + if (SUCCEEDED(hr = topology_loader_create_copier(upstream_node, upstream_output, node, 0, &copier))) + { + hr = topology_loader_connect_copier(context, upstream_node, upstream_output, node, 0, copier); + IMFTransform_Release(copier); + } + } + IMFTopologyNode_Release(upstream_node); + } + } + + IMFStreamSink_Release(stream_sink); + + return hr; +} + static void topology_loader_resolve_complete(struct topoloader_context *context) { MF_TOPOLOGY_TYPE node_type; @@ -2383,6 +2496,8 @@ static void topology_loader_resolve_complete(struct topoloader_context *context) /* Set MF_TOPONODE_STREAMID for all outputs. */ if (FAILED(IMFTopologyNode_GetItem(node, &MF_TOPONODE_STREAMID, NULL))) IMFTopologyNode_SetUINT32(node, &MF_TOPONODE_STREAMID, 0); + + topology_loader_connect_d3d_aware_input(context, node); } else if (node_type == MF_TOPOLOGY_SOURCESTREAM_NODE) { -- 2.29.2

Dec. 1, 2020

[PATCH 6/7] mf/topoloader: Set MF_TOPONODE_MEDIASTART for all source nodes.

by Nikolay Sivov

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/tests/mf.c | 8 ++++++++ dlls/mf/topology.c | 8 +++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index c36a76d83bb..b2cb45668cb 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -2136,6 +2136,7 @@ static void test_topology_loader_evr(void) IMFTopoLoader *loader; IMFMediaSink *sink; WORD node_count; + UINT64 value64; HWND window; HRESULT hr; @@ -2232,6 +2233,13 @@ todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(!value, "Unexpected stream id %u.\n", value); } + else if (node_type == MF_TOPOLOGY_SOURCESTREAM_NODE) + { + value64 = 1; + hr = IMFTopologyNode_GetUINT64(node, &MF_TOPONODE_MEDIASTART, &value64); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!value64, "Unexpected value.\n"); + } } IMFTopology_Release(full_topology); diff --git a/dlls/mf/topology.c b/dlls/mf/topology.c index 6f73bb859cd..825b9d538f3 100644 --- a/dlls/mf/topology.c +++ b/dlls/mf/topology.c @@ -2380,10 +2380,16 @@ static void topology_loader_resolve_complete(struct topoloader_context *context) if (node_type == MF_TOPOLOGY_OUTPUT_NODE) { - /* Make sure MF_TOPONODE_STREAMID is set for all outputs. */ + /* Set MF_TOPONODE_STREAMID for all outputs. */ if (FAILED(IMFTopologyNode_GetItem(node, &MF_TOPONODE_STREAMID, NULL))) IMFTopologyNode_SetUINT32(node, &MF_TOPONODE_STREAMID, 0); } + else if (node_type == MF_TOPOLOGY_SOURCESTREAM_NODE) + { + /* Set MF_TOPONODE_MEDIASTART for all sources. */ + if (FAILED(IMFTopologyNode_GetItem(node, &MF_TOPONODE_MEDIASTART, NULL))) + IMFTopologyNode_SetUINT64(node, &MF_TOPONODE_MEDIASTART, 0); + } IMFTopologyNode_Release(node); } -- 2.29.2

Dec. 1, 2020