October 2018 - Wine-Devel - list.winehq.org

[PATCH] gdiplus/tests: Don't fail if fonts are missing
by Alex Henrie Oct. 16, 2018

Oct. 16, 2018

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- This should fix the test failures on Debian. --- dlls/gdiplus/tests/font.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c index 961d8459cb..bbddcce345 100644 --- a/dlls/gdiplus/tests/font.c +++ b/dlls/gdiplus/tests/font.c @@ -430,28 +430,34 @@ static void test_getgenerics (void) int missingfonts = 0; stat = GdipGetGenericFontFamilySansSerif(&family); - expect (Ok, stat); if (stat == FontFamilyNotFound) missingfonts = 1; else + { + expect(Ok, stat); check_family("Sans Serif", family, sansname); + } stat = GdipGetGenericFontFamilySerif(&family); - expect (Ok, stat); if (stat == FontFamilyNotFound) missingfonts = 1; else + { + expect(Ok, stat); check_family("Serif", family, serifname); + } stat = GdipGetGenericFontFamilyMonospace(&family); - expect (Ok, stat); if (stat == FontFamilyNotFound) missingfonts = 1; else + { + expect(Ok, stat); check_family("Monospace", family, mononame); + } - if (missingfonts && strcmp(winetest_platform, "wine") == 0) - trace("You may need to install either the Microsoft Web Fonts or the Liberation Fonts\n"); + if (missingfonts) + skip("You may need to install either the Microsoft Web Fonts or the Liberation Fonts\n"); /* Check that the family names are all different */ ok(lstrcmpiW(sansname, serifname) != 0, "Sans Serif and Serif families should be different: %s\n", wine_dbgstr_w(sansname)); -- 2.18.0

3 4

[PATCH 3/3] rpcrt4/tests: Add a test of client reconnecting on send failure.
by Jacek Caban Oct. 16, 2018

Oct. 16, 2018

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/rpcrt4/tests/server.c | 157 ++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 142 insertions(+), 15 deletions(-)

2 1

[PATCH 2/3] rpcrt4: Try reconnecting when to server in IRpcSend on broken connection.
by Jacek Caban Oct. 16, 2018

Oct. 16, 2018

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/rpcrt4/rpc_assoc.c | 12 +++++++++--- dlls/rpcrt4/rpc_assoc.h | 2 +- dlls/rpcrt4/rpc_binding.c | 4 ++-- dlls/rpcrt4/rpc_binding.h | 3 ++- dlls/rpcrt4/rpc_message.c | 42 ++++++++++++++++++++++++++++-------------- 5 files changed, 42 insertions(+), 21 deletions(-)

1 0

[PATCH 1/3] rpcrt4: Reset assoc_group_id on associations with no active connection.
by Jacek Caban Oct. 16, 2018

Oct. 16, 2018

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/rpcrt4/rpc_assoc.c | 11 +++++++++++ dlls/rpcrt4/rpc_assoc.h | 2 ++ dlls/rpcrt4/rpc_transport.c | 1 + 3 files changed, 14 insertions(+)

1 0

[PATCH 1/3] rpcrt4: Discriminants can't be int3264.
by Zebediah Figura Oct. 16, 2018

Oct. 16, 2018

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/rpcrt4/ndr_marshall.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 52e2716..58f0108 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -2762,8 +2762,6 @@ static ULONG EmbeddedComplexSize(MIDL_STUB_MESSAGE *pStubMsg, case FC_LONG: case FC_ULONG: case FC_ENUM32: - case FC_INT3264: - case FC_UINT3264: return sizeof(ULONG); case FC_FLOAT: return sizeof(float); @@ -5642,9 +5640,6 @@ static ULONG get_discriminant(unsigned char fc, const unsigned char *pMemory) case FC_ULONG: case FC_ENUM32: return *(const ULONG *)pMemory; - case FC_INT3264: - case FC_UINT3264: - return *(const ULONG_PTR *)pMemory; default: FIXME("Unhandled base type: 0x%02x\n", fc); return 0; -- 2.7.4

2 8

[PATCH] wbemprox: Support specifying server and namespace in WbemServices functions
by Piotr Caban Oct. 16, 2018

Oct. 16, 2018

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/wbemprox/services.c | 35 +++++++++++++++++++++++++++++++++-- dlls/wbemprox/tests/query.c | 27 ++++++++++++++++++++++----- 2 files changed, 55 insertions(+), 7 deletions(-)

2 1

[PATCH] include : Add missing XINPUT_CAPS_ defines
by Alistair Leslie-Hughes Oct. 15, 2018

Oct. 15, 2018

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/xinput.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/xinput.h b/include/xinput.h index dae8cad..73b8c92 100644 --- a/include/xinput.h +++ b/include/xinput.h @@ -157,6 +157,9 @@ #define XUSER_INDEX_ANY 0x000000FF #define XINPUT_CAPS_FFB_SUPPORTED 0x0001 +#define XINPUT_CAPS_WIRELESS 0x0002 +#define XINPUT_CAPS_PMD_SUPPORTED 0x0008 +#define XINPUT_CAPS_NO_NAVIGATION 0x0010 /* * Defines the structure of an xbox 360 joystick. -- 1.9.1

1 0

[PATCH 2/2] shell32: Properly fail when a data object cannot be created.
by Alistair Leslie-Hughes Oct. 15, 2018

Oct. 15, 2018

Based of patch by Mark Jansen Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/shell32/shlexec.c | 15 +++++++-------- dlls/shell32/tests/shlexec.c | 8 ++++---- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index 0b794b0..1e795ac 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -1165,13 +1165,12 @@ static HKEY ShellExecute_GetClassKey( const SHELLEXECUTEINFOW *sei ) return hkey; } -static IDataObject *shellex_get_dataobj( LPSHELLEXECUTEINFOW sei ) +static HRESULT shellex_get_dataobj( LPSHELLEXECUTEINFOW sei, IDataObject **dataobj ) { LPCITEMIDLIST pidllast = NULL; - IDataObject *dataobj = NULL; IShellFolder *shf = NULL; LPITEMIDLIST pidl = NULL; - HRESULT r; + HRESULT r = SE_ERR_DLLNOTFOUND; if (sei->fMask & SEE_MASK_CLASSALL) pidl = sei->lpIDList; @@ -1192,15 +1191,15 @@ static IDataObject *shellex_get_dataobj( LPSHELLEXECUTEINFOW sei ) if ( FAILED( r ) ) goto end; - IShellFolder_GetUIObjectOf( shf, NULL, 1, &pidllast, - &IID_IDataObject, NULL, (LPVOID*) &dataobj ); + r = IShellFolder_GetUIObjectOf( shf, NULL, 1, &pidllast, + &IID_IDataObject, NULL, (void**)dataobj ); end: if ( pidl != sei->lpIDList ) ILFree( pidl ); if ( shf ) IShellFolder_Release( shf ); - return dataobj; + return r; } static HRESULT shellex_run_context_menu_default( IShellExtInit *obj, @@ -1295,8 +1294,8 @@ static HRESULT shellex_load_object_and_run( HKEY hkey, LPCGUID guid, LPSHELLEXEC goto end; } - dataobj = shellex_get_dataobj( sei ); - if ( !dataobj ) + r = shellex_get_dataobj( sei, &dataobj ); + if ( FAILED( r ) ) { ERR("failed to get data object\n"); goto end; diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index bb2b842..9dff9f8 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -1780,7 +1780,7 @@ static fileurl_tests_t fileurl_tests[]= {"file:///", "%%TMPDIR%%\\test file.shlexec", 0, 0}, /* Test shortcuts vs. URLs */ - {"file://///", "%s\\test_shortcut_shlexec.lnk", 0, 0x1d}, + {"file://///", "%s\\test_shortcut_shlexec.lnk", 0, 0x1c}, /* Confuse things by mixing protocols */ {"file://", "shlproto://foo/bar", USE_COLON, 0}, @@ -1926,11 +1926,11 @@ static void test_urls(void) } /* A .lnk ending does not turn a URL into a shortcut */ - todo_wait rc = shell_execute(NULL, "shlproto://foo/bar.lnk", NULL, NULL); + rc = shell_execute(NULL, "shlproto://foo/bar.lnk", NULL, NULL); ok(rc > 32, "%s failed: rc=%lu\n", shell_call, rc); okChildInt("argcA", 5); - todo_wine okChildString("argvA3", "URL"); - todo_wine okChildString("argvA4", "shlproto://foo/bar.lnk"); + okChildString("argvA3", "URL"); + okChildString("argvA4", "shlproto://foo/bar.lnk"); /* Neither does a .exe extension */ rc = shell_execute(NULL, "shlproto://foo/bar.exe", NULL, NULL); -- 1.9.1

1 0

[PATCH 1/2] shell32: Expand environment strings in ShellExecute
by Alistair Leslie-Hughes Oct. 15, 2018

Oct. 15, 2018

From: Mark Jansen <learn0more+wine(a)gmail.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/shell32/shlexec.c | 47 +++++++++++++++++++++++++++++++++++++++++++- dlls/shell32/tests/shlexec.c | 6 +++--- 2 files changed, 49 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index 40306d6..0b794b0 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -1557,6 +1557,26 @@ static void do_error_dialog( UINT_PTR retval, HWND hwnd ) MessageBoxW(hwnd, msg, NULL, MB_ICONERROR); } +static WCHAR *expand_environment( const WCHAR *str ) +{ + WCHAR *buf; + DWORD len; + + len = ExpandEnvironmentStringsW(str, NULL, 0); + if (!len) return NULL; + + buf = heap_alloc(len * sizeof(WCHAR)); + if (!buf) return NULL; + + len = ExpandEnvironmentStringsW(str, buf, len); + if (!len) + { + heap_free(buf); + return NULL; + } + return buf; +} + /************************************************************************* * SHELL_execute [Internal] */ @@ -1570,7 +1590,7 @@ static BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc ) SEE_MASK_UNICODE | SEE_MASK_ASYNCOK | SEE_MASK_HMONITOR; WCHAR parametersBuffer[1024], dirBuffer[MAX_PATH], wcmdBuffer[1024]; - WCHAR *wszApplicationName, *wszParameters, *wszDir, *wcmd; + WCHAR *wszApplicationName, *wszParameters, *wszDir, *wcmd = NULL; DWORD dwApplicationNameLen = MAX_PATH+2; DWORD parametersLen = ARRAY_SIZE(parametersBuffer); DWORD wcmdLen = ARRAY_SIZE(wcmdBuffer); @@ -1676,6 +1696,30 @@ static BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc ) TRACE("-- idlist=%p (%s)\n", sei_tmp.lpIDList, debugstr_w(wszApplicationName)); } + if (sei_tmp.fMask & SEE_MASK_DOENVSUBST) + { + WCHAR *tmp; + + tmp = expand_environment(sei_tmp.lpFile); + if (!tmp) + { + retval = SE_ERR_OOM; + goto end; + } + heap_free(wszApplicationName); + sei_tmp.lpFile = wszApplicationName = tmp; + + tmp = expand_environment(sei_tmp.lpDirectory); + if (!tmp) + { + retval = SE_ERR_OOM; + goto end; + } + if (wszDir != dirBuffer) + heap_free(wszDir); + sei_tmp.lpDirectory = wszDir = tmp; + } + if ( ERROR_SUCCESS == ShellExecute_FromContextMenu( &sei_tmp ) ) { sei->hInstApp = (HINSTANCE) 33; @@ -1846,6 +1890,7 @@ static BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc ) retval = (UINT_PTR)ShellExecuteW(sei_tmp.hwnd, sei_tmp.lpVerb, lpstrTmpFile, NULL, NULL, 0); } +end: TRACE("retval %lu\n", retval); heap_free(wszApplicationName); diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index ab77fa1..bb2b842 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -2133,13 +2133,13 @@ static void test_lnks(void) get_long_path_name(params, filename, sizeof(filename)); okChildPath("argvA4", filename); - todo_wait rc=shell_execute_ex(SEE_MASK_NOZONECHECKS|SEE_MASK_DOENVSUBST, NULL, "%TMPDIR%\\test_shortcut_shlexec.lnk", NULL, NULL, NULL); + rc=shell_execute_ex(SEE_MASK_NOZONECHECKS|SEE_MASK_DOENVSUBST, NULL, "%TMPDIR%\\test_shortcut_shlexec.lnk", NULL, NULL, NULL); okShell(rc > 32, "failed: rc=%lu err=%u\n", rc, GetLastError()); okChildInt("argcA", 5); - todo_wine okChildString("argvA3", "Open"); + okChildString("argvA3", "Open"); sprintf(params, "%s\\test file.shlexec", tmpdir); get_long_path_name(params, filename, sizeof(filename)); - todo_wine okChildPath("argvA4", filename); + okChildPath("argvA4", filename); } /* Should just run our executable */ -- 1.9.1

1 0

[PATCH v4] gdi32: Support the gamma correction for the subpixel rendering.
by Byeongsik Jeon Oct. 15, 2018

Oct. 15, 2018

By setting the appropriate gamma value, the subpixel rendering color fringing reduced. Signed-off-by: Byeongsik Jeon <bsjeon(a)hanmail.net> --- https://www.freetype.org/freetype2/docs/reference/ft2-base_interface.html#F… v2: Fix the void *, thread safety. v3: Fix the wrong patch send. v4: Fix the memory leaks (dc->font_gamma = NULL; removed ). Use the 'struct font_intensities' instead of 'union font_intensities'. Move the 'struct font_gamma_ramp' to the dibdrv.h. Add the '1000 * gamma / 1400' line. dlls/gdi32/dc.c | 1 + dlls/gdi32/dibdrv/dibdrv.h | 15 ++++++++++- dlls/gdi32/dibdrv/graphics.c | 40 ++++++++++++++++++++++----- dlls/gdi32/dibdrv/primitives.c | 49 +++++++++++++++++++++++++--------- dlls/gdi32/font.c | 30 +++++++++++++++++++++ dlls/gdi32/gdi_private.h | 3 +++ 6 files changed, 118 insertions(+), 20 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 892d3e9744..8ee8a52d94 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -168,6 +168,7 @@ static void free_dc_state( DC *dc ) if (dc->hVisRgn) DeleteObject( dc->hVisRgn ); if (dc->region) DeleteObject( dc->region ); if (dc->path) free_gdi_path( dc->path ); + HeapFree( GetProcessHeap(), 0, dc->font_gamma_ramp ); HeapFree( GetProcessHeap(), 0, dc ); } diff --git a/dlls/gdi32/dibdrv/dibdrv.h b/dlls/gdi32/dibdrv/dibdrv.h index f79f5b0867..65305e5394 100644 --- a/dlls/gdi32/dibdrv/dibdrv.h +++ b/dlls/gdi32/dibdrv/dibdrv.h @@ -85,6 +85,19 @@ struct intensity_range BYTE b_min, b_max; }; +struct font_gamma_ramp +{ + DWORD gamma; + BYTE encode[256]; + BYTE decode[256]; +}; + +struct font_intensities +{ + struct intensity_range aa_ranges[17]; + struct font_gamma_ramp *gamma_ramp; +}; + typedef struct dibdrv_physdev { struct gdi_physdev dev; @@ -192,7 +205,7 @@ typedef struct primitive_funcs void (* draw_glyph)(const dib_info *dst, const RECT *rc, const dib_info *glyph, const POINT *origin, DWORD text_pixel, const struct intensity_range *ranges); void (* draw_subpixel_glyph)(const dib_info *dst, const RECT *rc, const dib_info *glyph, - const POINT *origin, DWORD text_pixel ); + const POINT *origin, DWORD text_pixel, const struct font_gamma_ramp *gamma); DWORD (* get_pixel)(const dib_info *dib, int x, int y); DWORD (* colorref_to_pixel)(const dib_info *dib, COLORREF color); COLORREF (* pixel_to_colorref)(const dib_info *dib, DWORD pixel); diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c index 08f8c3d6d2..0070dae75a 100644 --- a/dlls/gdi32/dibdrv/graphics.c +++ b/dlls/gdi32/dibdrv/graphics.c @@ -520,6 +520,26 @@ static inline void get_aa_ranges( COLORREF col, struct intensity_range intensiti } } +static void update_font_gamma_ramp( DC *dc ) +{ + const DWORD gamma = dc->font_gamma; + struct font_gamma_ramp *ramp = dc->font_gamma_ramp; + int i; + + if ( ramp == NULL ) + ramp = HeapAlloc( GetProcessHeap(), 0, sizeof( struct font_gamma_ramp ) ); + if ( ramp == NULL ) return; + + for ( i = 0; i < 256; i++ ) + { + ramp->encode[i] = pow( i / 255., 1000. / gamma ) * 255. + .5; + ramp->decode[i] = pow( i / 255., gamma / 1000. ) * 255. + .5; + } + ramp->gamma = gamma; + + dc->font_gamma_ramp = ramp; +} + static DWORD font_cache_hash( struct cached_font *font ) { DWORD hash = 0, *ptr, two_chars; @@ -683,7 +703,7 @@ static inline void get_text_bkgnd_masks( DC *dc, const dib_info *dib, rop_mask * static void draw_glyph( dib_info *dib, int x, int y, const GLYPHMETRICS *metrics, const dib_info *glyph_dib, DWORD text_color, - const struct intensity_range *ranges, const struct clipped_rects *clipped_rects, + const struct font_intensities *lut, const struct clipped_rects *clipped_rects, RECT *bounds ) { int i; @@ -705,10 +725,10 @@ static void draw_glyph( dib_info *dib, int x, int y, const GLYPHMETRICS *metrics if (glyph_dib->bit_count == 32) dib->funcs->draw_subpixel_glyph( dib, &clipped_rect, glyph_dib, &src_origin, - text_color ); + text_color, lut->gamma_ramp ); else dib->funcs->draw_glyph( dib, &clipped_rect, glyph_dib, &src_origin, - text_color, ranges ); + text_color, lut->aa_ranges ); } } } @@ -816,7 +836,7 @@ static void render_string( DC *dc, dib_info *dib, struct cached_font *font, INT struct cached_glyph *glyph; dib_info glyph_dib; DWORD text_color; - struct intensity_range ranges[17]; + struct font_intensities lut; glyph_dib.bit_count = get_glyph_depth( font->aa_flags ); glyph_dib.rect.left = 0; @@ -826,8 +846,14 @@ static void render_string( DC *dc, dib_info *dib, struct cached_font *font, INT text_color = get_pixel_color( dc, dib, dc->textColor, TRUE ); - if (glyph_dib.bit_count == 8) - get_aa_ranges( dib->funcs->pixel_to_colorref( dib, text_color ), ranges ); + if ( glyph_dib.bit_count == 32 ) + { + if ( !dc->font_gamma_ramp || dc->font_gamma != dc->font_gamma_ramp->gamma ) + update_font_gamma_ramp( dc ); + lut.gamma_ramp = dc->font_gamma_ramp; + } + else + get_aa_ranges( dib->funcs->pixel_to_colorref( dib, text_color ), lut.aa_ranges ); for (i = 0; i < count; i++) { @@ -841,7 +867,7 @@ static void render_string( DC *dc, dib_info *dib, struct cached_font *font, INT glyph_dib.stride = get_dib_stride( glyph->metrics.gmBlackBoxX, glyph_dib.bit_count ); glyph_dib.bits.ptr = glyph->bits; - draw_glyph( dib, x, y, &glyph->metrics, &glyph_dib, text_color, ranges, clipped_rects, bounds ); + draw_glyph( dib, x, y, &glyph->metrics, &glyph_dib, text_color, &lut, clipped_rects, bounds ); if (dx) { diff --git a/dlls/gdi32/dibdrv/primitives.c b/dlls/gdi32/dibdrv/primitives.c index 0d097b2da6..91b60538f7 100644 --- a/dlls/gdi32/dibdrv/primitives.c +++ b/dlls/gdi32/dibdrv/primitives.c @@ -6272,16 +6272,35 @@ static void draw_glyph_null( const dib_info *dib, const RECT *rect, const dib_in { return; } +static inline BYTE blend_color_gamma( BYTE dst, BYTE text, BYTE alpha, + const struct font_gamma_ramp *gamma_ramp ) +{ + if ( alpha == 0 ) return dst; + if ( alpha == 255 ) return text; + if ( dst == text ) return dst; + + return gamma_ramp->encode[ blend_color( gamma_ramp->decode[dst], + gamma_ramp->decode[text], + alpha) ]; +} -static inline DWORD blend_subpixel( BYTE r, BYTE g, BYTE b, DWORD text, DWORD alpha ) +static inline DWORD blend_subpixel( BYTE r, BYTE g, BYTE b, DWORD text, DWORD alpha, + const struct font_gamma_ramp *gamma_ramp ) { + if ( gamma_ramp != NULL && gamma_ramp->gamma != 1000 ) + { + return blend_color_gamma( r, text >> 16, (BYTE)(alpha >> 16), gamma_ramp ) << 16 | + blend_color_gamma( g, text >> 8, (BYTE)(alpha >> 8), gamma_ramp ) << 8 | + blend_color_gamma( b, text, (BYTE) alpha, gamma_ramp ); + } return blend_color( r, text >> 16, (BYTE)(alpha >> 16) ) << 16 | blend_color( g, text >> 8, (BYTE)(alpha >> 8) ) << 8 | blend_color( b, text, (BYTE) alpha ); } static void draw_subpixel_glyph_8888( const dib_info *dib, const RECT *rect, const dib_info *glyph, - const POINT *origin, DWORD text_pixel ) + const POINT *origin, DWORD text_pixel, + const struct font_gamma_ramp *gamma_ramp ) { DWORD *dst_ptr = get_pixel_ptr_32( dib, rect->left, rect->top ); const DWORD *glyph_ptr = get_pixel_ptr_32( glyph, origin->x, origin->y ); @@ -6292,7 +6311,8 @@ static void draw_subpixel_glyph_8888( const dib_info *dib, const RECT *rect, con for (x = 0; x < rect->right - rect->left; x++) { if (glyph_ptr[x] == 0) continue; - dst_ptr[x] = blend_subpixel( dst_ptr[x] >> 16, dst_ptr[x] >> 8, dst_ptr[x], text_pixel, glyph_ptr[x] ); + dst_ptr[x] = blend_subpixel( dst_ptr[x] >> 16, dst_ptr[x] >> 8, dst_ptr[x], + text_pixel, glyph_ptr[x], gamma_ramp ); } dst_ptr += dib->stride / 4; glyph_ptr += glyph->stride / 4; @@ -6300,7 +6320,8 @@ static void draw_subpixel_glyph_8888( const dib_info *dib, const RECT *rect, con } static void draw_subpixel_glyph_32( const dib_info *dib, const RECT *rect, const dib_info *glyph, - const POINT *origin, DWORD text_pixel ) + const POINT *origin, DWORD text_pixel, + const struct font_gamma_ramp *gamma_ramp ) { DWORD *dst_ptr = get_pixel_ptr_32( dib, rect->left, rect->top ); const DWORD *glyph_ptr = get_pixel_ptr_32( glyph, origin->x, origin->y ); @@ -6319,7 +6340,7 @@ static void draw_subpixel_glyph_32( const dib_info *dib, const RECT *rect, const val = blend_subpixel( get_field(dst_ptr[x], dib->red_shift, dib->red_len), get_field(dst_ptr[x], dib->green_shift, dib->green_len), get_field(dst_ptr[x], dib->blue_shift, dib->blue_len), - text, glyph_ptr[x] ); + text, glyph_ptr[x], gamma_ramp ); dst_ptr[x] = rgb_to_pixel_masks( dib, val >> 16, val >> 8, val ); } dst_ptr += dib->stride / 4; @@ -6328,7 +6349,8 @@ static void draw_subpixel_glyph_32( const dib_info *dib, const RECT *rect, const } static void draw_subpixel_glyph_24( const dib_info *dib, const RECT *rect, const dib_info *glyph, - const POINT *origin, DWORD text_pixel ) + const POINT *origin, DWORD text_pixel, + const struct font_gamma_ramp *gamma_ramp ) { BYTE *dst_ptr = get_pixel_ptr_24( dib, rect->left, rect->top ); const DWORD *glyph_ptr = get_pixel_ptr_32( glyph, origin->x, origin->y ); @@ -6341,7 +6363,7 @@ static void draw_subpixel_glyph_24( const dib_info *dib, const RECT *rect, const { if (glyph_ptr[x] == 0) continue; val = blend_subpixel( dst_ptr[x * 3 + 2], dst_ptr[x * 3 + 1], dst_ptr[x * 3], - text_pixel, glyph_ptr[x] ); + text_pixel, glyph_ptr[x], gamma_ramp ); dst_ptr[x * 3] = val; dst_ptr[x * 3 + 1] = val >> 8; dst_ptr[x * 3 + 2] = val >> 16; @@ -6352,7 +6374,8 @@ static void draw_subpixel_glyph_24( const dib_info *dib, const RECT *rect, const } static void draw_subpixel_glyph_555( const dib_info *dib, const RECT *rect, const dib_info *glyph, - const POINT *origin, DWORD text_pixel ) + const POINT *origin, DWORD text_pixel, + const struct font_gamma_ramp *gamma_ramp ) { WORD *dst_ptr = get_pixel_ptr_16( dib, rect->left, rect->top ); const DWORD *glyph_ptr = get_pixel_ptr_32( glyph, origin->x, origin->y ); @@ -6371,7 +6394,7 @@ static void draw_subpixel_glyph_555( const dib_info *dib, const RECT *rect, cons val = blend_subpixel( ((dst_ptr[x] >> 7) & 0xf8) | ((dst_ptr[x] >> 12) & 0x07), ((dst_ptr[x] >> 2) & 0xf8) | ((dst_ptr[x] >> 7) & 0x07), ((dst_ptr[x] << 3) & 0xf8) | ((dst_ptr[x] >> 2) & 0x07), - text, glyph_ptr[x] ); + text, glyph_ptr[x], NULL ); dst_ptr[x] = ((val >> 9) & 0x7c00) | ((val >> 6) & 0x03e0) | ((val >> 3) & 0x001f); } dst_ptr += dib->stride / 2; @@ -6380,7 +6403,8 @@ static void draw_subpixel_glyph_555( const dib_info *dib, const RECT *rect, cons } static void draw_subpixel_glyph_16( const dib_info *dib, const RECT *rect, const dib_info *glyph, - const POINT *origin, DWORD text_pixel ) + const POINT *origin, DWORD text_pixel, + const struct font_gamma_ramp *gamma_ramp ) { WORD *dst_ptr = get_pixel_ptr_16( dib, rect->left, rect->top ); const DWORD *glyph_ptr = get_pixel_ptr_32( glyph, origin->x, origin->y ); @@ -6399,7 +6423,7 @@ static void draw_subpixel_glyph_16( const dib_info *dib, const RECT *rect, const val = blend_subpixel( get_field(dst_ptr[x], dib->red_shift, dib->red_len), get_field(dst_ptr[x], dib->green_shift, dib->green_len), get_field(dst_ptr[x], dib->blue_shift, dib->blue_len), - text, glyph_ptr[x] ); + text, glyph_ptr[x], NULL ); dst_ptr[x] = rgb_to_pixel_masks( dib, val >> 16, val >> 8, val ); } dst_ptr += dib->stride / 2; @@ -6408,7 +6432,8 @@ static void draw_subpixel_glyph_16( const dib_info *dib, const RECT *rect, const } static void draw_subpixel_glyph_null( const dib_info *dib, const RECT *rect, const dib_info *glyph, - const POINT *origin, DWORD text_pixel ) + const POINT *origin, DWORD text_pixel, + const struct font_gamma_ramp *gamma_ramp ) { return; } diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 5c67d5b518..238eb51717 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -729,6 +729,34 @@ static void update_font_code_page( DC *dc, HANDLE font ) TRACE("charset %d => cp %d\n", charset, dc->font_code_page); } +static DWORD get_font_gamma_value( void ) +{ + static const WCHAR desktopW[] = { 'C','o','n','t','r','o','l',' ','P','a','n','e','l','\\', + 'D','e','s','k','t','o','p',0 }; + static const WCHAR smoothing_gamma[] = {'F','o','n','t','S','m','o','o','t','h','i','n','g', + 'G','a','m','m','a',0}; + const DWORD gamma_default = 1400; + DWORD gamma; + HKEY key; + + gamma = gamma_default; + if ( RegOpenKeyW( HKEY_CURRENT_USER, desktopW, &key ) == ERROR_SUCCESS ) + { + if ( get_key_value( key, smoothing_gamma, &gamma ) || gamma == 0 ) + gamma = gamma_default; + RegCloseKey( key ); + + gamma = min( max( gamma, 1000), 2200 ); + TRACE( "font_gamma %d\n", gamma ); + } + + /* Calibration the difference between the registry value and the Wine gamma value. + This shows a similar looks to the Windows Native for the same registry value.*/ + gamma = 1000 * gamma / 1400; + + return gamma; +} + /*********************************************************************** * FONT_SelectObject */ @@ -754,6 +782,8 @@ static HGDIOBJ FONT_SelectObject( HGDIOBJ handle, HDC hdc ) dc->hFont = handle; dc->aa_flags = aa_flags ? aa_flags : GGO_BITMAP; update_font_code_page( dc, handle ); + if ( dc->font_gamma == 0 ) + dc->font_gamma = get_font_gamma_value(); GDI_dec_ref_count( ret ); } else GDI_dec_ref_count( handle ); diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 5b09b84846..fe88c66a2b 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -99,6 +99,9 @@ typedef struct tagDC struct gdi_path *path; + DWORD font_gamma; + struct font_gamma_ramp *font_gamma_ramp; + UINT font_code_page; WORD ROPmode; WORD polyFillMode; -- 2.19.1

1 0