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

[PATCH v2] xaudio2: Don't return XAudio28 interface for XAudio2[0..7] objects in QueryInterface()
by Roger Zoellner 15 Oct '18

15 Oct '18

Supercedes: https://source.winehq.org/patches/data/152523 Includes a test case. Signed-off-by: Roger Zoellner <zoellner.roger(a)gmail.com> --- dlls/xaudio2_7/tests/xaudio2.c | 3 +++ dlls/xaudio2_7/xaudio_dll.c | 2 ++ 2 files changed, 5 insertions(+) diff --git a/dlls/xaudio2_7/tests/xaudio2.c b/dlls/xaudio2_7/tests/xaudio2.c index 66097532c5..0c1d9a7805 100644 --- a/dlls/xaudio2_7/tests/xaudio2.c +++ b/dlls/xaudio2_7/tests/xaudio2.c @@ -1273,6 +1273,9 @@ START_TEST(xaudio2) if(hr == S_OK){ xaudio27 = TRUE; + hr = IXAudio27_QueryInterface(xa27, &IID_IXAudio28, (void**) &xa); + ok(hr != S_OK, "QueryInterface with IID_IXAudio28 on IXAudio27 object returned success. Expected to fail\n"); + hr = IXAudio27_Initialize(xa27, 0, XAUDIO2_ANY_PROCESSOR); ok(hr == S_OK, "Initialize failed: %08x\n", hr); diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index 28cf98565b..461ac56ffe 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -1262,7 +1262,9 @@ static HRESULT WINAPI IXAudio2Impl_QueryInterface(IXAudio2 *iface, REFIID riid, TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid), ppvObject); if(IsEqualGUID(riid, &IID_IUnknown) || +#if XAUDIO2_VER == 8 IsEqualGUID(riid, &IID_IXAudio28) || +#endif IsEqualGUID(riid, &IID_IXAudio2)) *ppvObject = &This->IXAudio2_iface; else if(IsEqualGUID(riid, &IID_IXAudio27)){ -- 2.19.0

2 1

[PATCH] ddraw: Allow GPU access to D3DVBCAPS_SYSTEMMEMORY vertex buffers.
by Matteo Bruni 15 Oct '18

15 Oct '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45279 Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- The original Deus Ex uses a D3DVBCAPS_SYSTEMMEMORY buffer with DrawPrimitiveVB() and expects it to work. It should also help with bug 45279 and 45486. The device is probably created with D3DCREATE_SOFTWARE_VERTEXPROCESSING, which would explain why this is accepted on Windows. With core profile we need to create a VBO anyway so I think this is the correct fix in practice. This is an alternative to https://source.winehq.org/patches/data/152581, main difference is fixing the issue in ddraw instead of wined3d. dlls/ddraw/vertexbuffer.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ddraw/vertexbuffer.c b/dlls/ddraw/vertexbuffer.c index 3ad8f7e1bdd..6a1f010bd31 100644 --- a/dlls/ddraw/vertexbuffer.c +++ b/dlls/ddraw/vertexbuffer.c @@ -125,7 +125,8 @@ static HRESULT d3d_vertex_buffer_create_wined3d_buffer(struct d3d_vertex_buffer desc.usage |= WINED3DUSAGE_DYNAMIC; desc.bind_flags = WINED3D_BIND_VERTEX_BUFFER; if (buffer->Caps & D3DVBCAPS_SYSTEMMEMORY) - desc.access = WINED3D_RESOURCE_ACCESS_CPU | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; + desc.access = WINED3D_RESOURCE_ACCESS_CPU | WINED3D_RESOURCE_ACCESS_GPU + | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; else desc.access = WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; desc.misc_flags = 0; -- 2.18.1

3 2

[PATCH v2 1/2] wined3d: Add sync object after query buffer issue.
by Andrew Wesie 15 Oct '18

15 Oct '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45932 Signed-off-by: Andrew Wesie <awesie(a)gmail.com> --- Notes: As a side effect, fixes a NVIDIA driver bug with many in-flight query buffer objects. dlls/wined3d/query.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 26c32b1f13..4239fc08b3 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -76,6 +76,7 @@ static void wined3d_query_destroy_buffer_object(struct wined3d_context *context, static BOOL wined3d_query_buffer_queue_result(struct wined3d_context *context, struct wined3d_query *query, GLuint id) { const struct wined3d_gl_info *gl_info = context->gl_info; + GLsync tmp_sync; if (!gl_info->supported[ARB_QUERY_BUFFER_OBJECT] || !gl_info->supported[ARB_BUFFER_STORAGE]) return FALSE; @@ -104,6 +105,14 @@ static BOOL wined3d_query_buffer_queue_result(struct wined3d_context *context, s GL_EXTCALL(glBindBuffer(GL_QUERY_BUFFER, 0)); checkGLcall("queue query result"); + /* ARB_buffer_storage requires the client to call FenceSync with + * SYNC_GPU_COMMANDS_COMPLETE after the server does a write. This behavior + * is not enforced by Mesa. + */ + tmp_sync = GL_EXTCALL(glFenceSync(GL_SYNC_GPU_COMMANDS_COMPLETE, 0)); + GL_EXTCALL(glDeleteSync(tmp_sync)); + checkGLcall("query buffer sync"); + return TRUE; } -- 2.17.1

3 4

[PATCH 1/8] ddraw/tests: Look for more messages when losing focus.
by Stefan Dösinger 15 Oct '18

15 Oct '18

Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> --- The only new bit of information here is the WM_KILLFOCUS message. The rest is already covered by the focus loss test, but it is (a) helpful to make the two window changes explicit and (b) it will serve as a place to check the state of the DirectDraw object during the focus loss sequence. --- dlls/ddraw/tests/ddraw1.c | 6 +++++- dlls/ddraw/tests/ddraw2.c | 6 +++++- dlls/ddraw/tests/ddraw4.c | 6 +++++- dlls/ddraw/tests/ddraw7.c | 6 +++++- 4 files changed, 20 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index ee4fa5bfaab..aad7bbff1f4 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -2447,8 +2447,12 @@ static void test_coop_level_mode_set(void) static const struct message exclusive_focus_loss_messages[] = { {WM_ACTIVATE, TRUE, WA_INACTIVE}, + {WM_WINDOWPOSCHANGING, FALSE, 0}, /* Window resize due to mode change. */ + {WM_WINDOWPOSCHANGED, FALSE, 0}, + {WM_SIZE, TRUE, SIZE_RESTORED}, /* Generated by DefWindowProc. */ {WM_DISPLAYCHANGE, FALSE, 0}, - {WM_WINDOWPOSCHANGING, FALSE, 0}, + {WM_KILLFOCUS, FALSE, 0}, + {WM_WINDOWPOSCHANGING, FALSE, 0}, /* Window minimized. */ /* Like d3d8 and d3d9 ddraw seems to use SW_SHOWMINIMIZED instead of * SW_MINIMIZED, causing a recursive window activation that does not * produce the same result in Wine yet. Ignore the difference for now. diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 9394705330a..29c3c845cb1 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -2572,8 +2572,12 @@ static void test_coop_level_mode_set(void) static const struct message exclusive_focus_loss_messages[] = { {WM_ACTIVATE, TRUE, WA_INACTIVE}, + {WM_WINDOWPOSCHANGING, FALSE, 0}, /* Window resize due to mode change. */ + {WM_WINDOWPOSCHANGED, FALSE, 0}, + {WM_SIZE, TRUE, SIZE_RESTORED}, /* Generated by DefWindowProc. */ {WM_DISPLAYCHANGE, FALSE, 0}, - {WM_WINDOWPOSCHANGING, FALSE, 0}, + {WM_KILLFOCUS, FALSE, 0}, + {WM_WINDOWPOSCHANGING, FALSE, 0}, /* Window minimized. */ /* Like d3d8 and d3d9 ddraw seems to use SW_SHOWMINIMIZED instead of * SW_MINIMIZED, causing a recursive window activation that does not * produce the same result in Wine yet. Ignore the difference for now. diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 6a3630a2c0e..7cf61cea911 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -2713,8 +2713,12 @@ static void test_coop_level_mode_set(void) static const struct message exclusive_focus_loss_messages[] = { {WM_ACTIVATE, TRUE, WA_INACTIVE}, + {WM_WINDOWPOSCHANGING, FALSE, 0}, /* Window resize due to mode change. */ + {WM_WINDOWPOSCHANGED, FALSE, 0}, + {WM_SIZE, TRUE, SIZE_RESTORED}, /* Generated by DefWindowProc. */ {WM_DISPLAYCHANGE, FALSE, 0}, - {WM_WINDOWPOSCHANGING, FALSE, 0}, + {WM_KILLFOCUS, FALSE, 0}, + {WM_WINDOWPOSCHANGING, FALSE, 0}, /* Window minimized. */ /* Like d3d8 and d3d9 ddraw seems to use SW_SHOWMINIMIZED instead of * SW_MINIMIZED, causing a recursive window activation that does not * produce the same result in Wine yet. Ignore the difference for now. diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 5bb2951cee7..6ae4207b34b 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -2442,8 +2442,12 @@ static void test_coop_level_mode_set(void) static const struct message exclusive_focus_loss_messages[] = { {WM_ACTIVATE, TRUE, WA_INACTIVE}, + {WM_WINDOWPOSCHANGING, FALSE, 0}, /* Window resize due to mode change. */ + {WM_WINDOWPOSCHANGED, FALSE, 0}, + {WM_SIZE, TRUE, SIZE_RESTORED}, /* Generated by DefWindowProc. */ {WM_DISPLAYCHANGE, FALSE, 0}, - {WM_WINDOWPOSCHANGING, FALSE, 0}, + {WM_KILLFOCUS, FALSE, 0}, + {WM_WINDOWPOSCHANGING, FALSE, 0}, /* Window minimized. */ /* Like d3d8 and d3d9 ddraw seems to use SW_SHOWMINIMIZED instead of * SW_MINIMIZED, causing a recursive window activation that does not * produce the same result in Wine yet. Ignore the difference for now. -- 2.18.1

3 21

[PATCH 2/2] kernel32: Fix LCMapString buffer calculation with LCMAP_KATAKANA and LCMAP_HALFWIDTH.
by Akihiro Sagawa 15 Oct '18

15 Oct '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45982 Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/kernel32/locale.c | 10 +++++++++- dlls/kernel32/tests/locale.c | 1 - 2 files changed, 9 insertions(+), 2 deletions(-)

1 0

[PATCH 1/2] kernel32/tests: Add LCMapString tests with a voiced consonant Hiragana character.
by Akihiro Sagawa 15 Oct '18

15 Oct '18

We use U+3060 (HIRAGANA LETTER DA) in the test. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/kernel32/tests/locale.c | 36 ++++++++++++++++++++++++++++-------- 1 file changed, 28 insertions(+), 8 deletions(-)

1 0

[PATCH] wined3d: Force VBOs to be GPU accessible.
by Andrew Wesie 15 Oct '18

15 Oct '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45279 Signed-off-by: Andrew Wesie <awesie(a)gmail.com> --- dlls/wined3d/buffer.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index e7b05157cc..247db45bb7 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1399,6 +1399,10 @@ static HRESULT buffer_init(struct wined3d_buffer *buffer, struct wined3d_device * (Half-Life 2 and others.) */ dynamic_buffer_ok = gl_info->supported[APPLE_FLUSH_BUFFER_RANGE] || gl_info->supported[ARB_MAP_BUFFER_RANGE]; + /* We need vertex buffer objects in OpenGL core profiles. Force GPU access. */ + if (bind_flags & WINED3D_BIND_VERTEX_BUFFER) + access |= WINED3D_RESOURCE_ACCESS_GPU; + if (!gl_info->supported[ARB_VERTEX_BUFFER_OBJECT]) { TRACE("Not creating a BO because GL_ARB_vertex_buffer is not supported.\n"); -- 2.17.1

2 1

[PATCH] ntdll: Block SIGTRAP during server calls.
by Huw Davies 15 Oct '18

15 Oct '18

This prevents issues with gdbproxy, where gdb adds breakpoints to the dynamic loader which get triggered on thread destruction. It also allows setting a gdb breakpoint in sigaction(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45070 Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/ntdll/server.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index ec03445..689f0e7 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -1399,6 +1399,9 @@ void server_init_process(void) sigaddset( &server_block_set, SIGUSR1 ); sigaddset( &server_block_set, SIGUSR2 ); sigaddset( &server_block_set, SIGCHLD ); +#ifdef SIGTRAP + sigaddset( &server_block_set, SIGTRAP ); +#endif pthread_sigmask( SIG_BLOCK, &server_block_set, NULL ); /* receive the first thread request fd on the main socket */ -- 2.7.4

1 1

[PATCH] mscms: add stub for WcsEnumColorProfilesSize
by Louis Lenders 15 Oct '18

15 Oct '18

fixes https://bugs.winehq.org/show_bug.cgi?id=45994 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> --- dlls/mscms/mscms.spec | 2 +- dlls/mscms/profile.c | 10 ++++++++++ include/icm.h | 7 +++++++ 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/dlls/mscms/mscms.spec b/dlls/mscms/mscms.spec index 9992bf5d21..f521ac6969 100644 --- a/dlls/mscms/mscms.spec +++ b/dlls/mscms/mscms.spec @@ -89,7 +89,7 @@ @ stub WcsCreateIccProfile @ stub WcsDisassociateColorProfileFromDevice @ stub WcsEnumColorProfiles -@ stub WcsEnumColorProfilesSize +@ stdcall WcsEnumColorProfilesSize(long ptr ptr) @ stub WcsGetCalibrationManagementState @ stub WcsGetDefaultColorProfile @ stub WcsGetDefaultColorProfileSize diff --git a/dlls/mscms/profile.c b/dlls/mscms/profile.c index 53016ef5ce..039a271482 100644 --- a/dlls/mscms/profile.c +++ b/dlls/mscms/profile.c @@ -1535,3 +1535,13 @@ BOOL WINAPI WcsGetUsePerUserProfiles( const WCHAR* name, DWORD class, BOOL* use_ SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); return FALSE; } + +/****************************************************************************** + * WcsEnumColorProfilesSize [MSCMS.@] + */ +BOOL WINAPI WcsEnumColorProfilesSize( WCS_PROFILE_MANAGEMENT_SCOPE scope, ENUMTYPEW *record, DWORD *size ) +{ + FIXME( "%d %p %p\n", scope, record, size ); + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); + return FALSE; +} diff --git a/include/icm.h b/include/icm.h index 8a666fad5c..fbbdede3ed 100644 --- a/include/icm.h +++ b/include/icm.h @@ -176,6 +176,12 @@ typedef enum BM_16b_GRAY, } BMFORMAT, *PBMFORMAT, *LPBMFORMAT; +typedef enum +{ + WCS_PROFILE_MANAGEMENT_SCOPE_SYSTEM_WIDE, + WCS_PROFILE_MANAGEMENT_SCOPE_CURRENT_USER +} WCS_PROFILE_MANAGEMENT_SCOPE; + typedef BOOL (CALLBACK *PBMCALLBACKFN)(ULONG,ULONG,LPARAM); typedef PBMCALLBACKFN LPPBMCALLBACKFN; @@ -403,6 +409,7 @@ BOOL WINAPI UninstallColorProfileW(PCWSTR,PCWSTR,BOOL); BOOL WINAPI UnregisterCMMA(PCSTR,DWORD); BOOL WINAPI UnregisterCMMW(PCWSTR,DWORD); #define UnregisterCMM WINELIB_NAME_AW(UnregisterCMM) +BOOL WINAPI WcsEnumColorProfilesSize(WCS_PROFILE_MANAGEMENT_SCOPE,ENUMTYPEW*,DWORD*); BOOL WINAPI WcsGetUsePerUserProfiles(const WCHAR*,DWORD,BOOL*); #define PROFILE_FILENAME 1 -- 2.17.1

2 1

[PATCH v3 1/2] gdi32: Support the subpixel rendering gamma correction.
by Byeongsik Jeon 15 Oct '18

15 Oct '18

Signed-off-by: Byeongsik Jeon <bsjeon(a)hanmail.net> --- v2: Fix the void *, thread safety. v3: Fix the wrong patch send. dlls/gdi32/dc.c | 2 ++ dlls/gdi32/dibdrv/dibdrv.h | 8 +++++- dlls/gdi32/dibdrv/graphics.c | 19 +++++++++---- dlls/gdi32/dibdrv/primitives.c | 49 +++++++++++++++++++++++++--------- dlls/gdi32/font.c | 38 ++++++++++++++++++++++++++ dlls/gdi32/gdi_private.h | 9 +++++++ 6 files changed, 107 insertions(+), 18 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 892d3e9744..de01bf4d3d 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -86,6 +86,7 @@ static void set_initial_dc_state( DC *dc ) dc->vport_ext.cy = 1; dc->miterLimit = 10.0f; /* 10.0 is the default, from MSDN */ dc->layout = 0; + dc->font_gamma = NULL; dc->font_code_page = CP_ACP; dc->ROPmode = R2_COPYPEN; dc->polyFillMode = ALTERNATE; @@ -168,6 +169,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 ); HeapFree( GetProcessHeap(), 0, dc ); } diff --git a/dlls/gdi32/dibdrv/dibdrv.h b/dlls/gdi32/dibdrv/dibdrv.h index f79f5b0867..5776490bd4 100644 --- a/dlls/gdi32/dibdrv/dibdrv.h +++ b/dlls/gdi32/dibdrv/dibdrv.h @@ -85,6 +85,12 @@ struct intensity_range BYTE b_min, b_max; }; +union font_intensities +{ + struct intensity_range *ranges; + struct font_gamma_table *gamma; +}; + typedef struct dibdrv_physdev { struct gdi_physdev dev; @@ -192,7 +198,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_table *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..a6d108576f 100644 --- a/dlls/gdi32/dibdrv/graphics.c +++ b/dlls/gdi32/dibdrv/graphics.c @@ -683,7 +683,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 union font_intensities lut, const struct clipped_rects *clipped_rects, RECT *bounds ) { int i; @@ -705,10 +705,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 ); else dib->funcs->draw_glyph( dib, &clipped_rect, glyph_dib, &src_origin, - text_color, ranges ); + text_color, lut.ranges ); } } } @@ -817,6 +817,7 @@ static void render_string( DC *dc, dib_info *dib, struct cached_font *font, INT dib_info glyph_dib; DWORD text_color; struct intensity_range ranges[17]; + union font_intensities lut = { NULL }; glyph_dib.bit_count = get_glyph_depth( font->aa_flags ); glyph_dib.rect.left = 0; @@ -826,8 +827,16 @@ 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) + switch ( glyph_dib.bit_count ) + { + case 8: get_aa_ranges( dib->funcs->pixel_to_colorref( dib, text_color ), ranges ); + lut.ranges = ranges; + break; + case 32: + lut.gamma = dc->font_gamma; + break; + } for (i = 0; i < count; i++) { @@ -841,7 +850,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..ca80e4d8f6 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_table *gamma ) +{ + if ( alpha == 0 ) return dst; + if ( alpha == 255 ) return text; + if ( dst == text ) return dst; + + return gamma->encode[ blend_color( gamma->decode[dst], + gamma->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_table *gamma ) { + if ( gamma != NULL && gamma->value != 1000 ) + { + return blend_color_gamma( r, text >> 16, (BYTE)(alpha >> 16), gamma ) << 16 | + blend_color_gamma( g, text >> 8, (BYTE)(alpha >> 8), gamma ) << 8 | + blend_color_gamma( b, text, (BYTE) alpha, gamma ); + } 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_table *gamma ) { 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 ); } 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_table *gamma ) { 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 ); 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_table *gamma ) { 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 ); 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_table *gamma ) { 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_table *gamma ) { 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_table *gamma ) { return; } diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 5c67d5b518..36e65a4cef 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -729,6 +729,42 @@ static void update_font_code_page( DC *dc, HANDLE font ) TRACE("charset %d => cp %d\n", charset, dc->font_code_page); } +static struct font_gamma_table *get_font_gamma_table( 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}; + struct font_gamma_table *font_gamma; + const DWORD gamma_default = 1000; /* FIXME 1400 */ + DWORD i, gamma; + HKEY key; + + font_gamma = HeapAlloc( GetProcessHeap(), 0, sizeof(struct font_gamma_table) ); + if ( font_gamma == NULL ) return NULL; + + 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 ); + } + + for ( i = 0; i < 256; i++ ) + { + font_gamma->encode[i] = pow( i / 255., 1000. / gamma ) * 255. + .5; + font_gamma->decode[i] = pow( i / 255., gamma / 1000. ) * 255. + .5; + } + + font_gamma->value = gamma; + TRACE("font_gamma value %d\n", font_gamma->value); + + return font_gamma; +} + /*********************************************************************** * FONT_SelectObject */ @@ -754,6 +790,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 == NULL ) + dc->font_gamma = get_font_gamma_table(); 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..e5ff467b20 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -48,6 +48,13 @@ typedef struct { /* extra stock object: default 1x1 bitmap for memory DCs */ #define DEFAULT_BITMAP (STOCK_LAST+1) +struct font_gamma_table +{ + DWORD value; + BYTE encode[256]; + BYTE decode[256]; +}; + struct gdi_obj_funcs { HGDIOBJ (*pSelectObject)( HGDIOBJ handle, HDC hdc ); @@ -99,6 +106,8 @@ typedef struct tagDC struct gdi_path *path; + struct font_gamma_table *font_gamma; + UINT font_code_page; WORD ROPmode; WORD polyFillMode; -- 2.19.1

1 1