July 2017 - Wine-Commits - list.winehq.org

Paul Gofman : d3dx9: Support skip_constants parameter for effect.
by Alexandre Julliard July 18, 2017

July 18, 2017

Module: wine Branch: master Commit: 4b11a991084cbe1f14acc261c2acd4c9d0611ece URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b11a991084cbe1f14acc261c… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Tue Jul 11 14:26:59 2017 +0300 d3dx9: Support skip_constants parameter for effect. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/d3dx9_private.h | 4 +- dlls/d3dx9_36/effect.c | 155 ++++++++++++++++++++++++++++++++++++------ dlls/d3dx9_36/preshader.c | 95 +++++++++++++++++--------- dlls/d3dx9_36/shader.c | 1 + dlls/d3dx9_36/tests/effect.c | 12 +--- 5 files changed, 202 insertions(+), 65 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4b11a991084cbe1f14acc…

1 0

Andrey Gusev : winealsa.drv: Fix uninitialized variable warning.
by Alexandre Julliard July 18, 2017

July 18, 2017

Module: wine Branch: master Commit: f4131cbe9775976d5d301e9139b52124d20b3bc5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4131cbe9775976d5d301e913… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Tue Jul 18 19:20:54 2017 +0300 winealsa.drv: Fix uninitialized variable warning. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winealsa.drv/mmdevdrv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 2ecb111..b285705 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -359,7 +359,7 @@ static WCHAR *construct_device_id(EDataFlow flow, const WCHAR *chunk1, const cha { WCHAR *ret; const WCHAR *prefix; - DWORD len_wchars = 0, chunk1_len, copied = 0, prefix_len; + DWORD len_wchars = 0, chunk1_len = 0, copied = 0, prefix_len; static const WCHAR dashW[] = {' ','-',' ',0}; static const size_t dashW_len = (sizeof(dashW) / sizeof(*dashW)) - 1;

1 0

Alex Henrie : msvcr120: Add log1p.
by Alexandre Julliard July 18, 2017

July 18, 2017

Module: wine Branch: master Commit: 31b835d0e0124d6f6e3e4f6fc9ad53de6182dee1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=31b835d0e0124d6f6e3e4f6fc… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Jul 17 22:33:51 2017 -0600 msvcr120: Add log1p. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 2 ++ .../api-ms-win-crt-math-l1-1-0.spec | 6 ++-- dlls/msvcr120/msvcr120.spec | 6 ++-- dlls/msvcr120_app/msvcr120_app.spec | 6 ++-- dlls/msvcrt/math.c | 36 ++++++++++++++++++++++ dlls/ucrtbase/ucrtbase.spec | 6 ++-- include/config.h.in | 6 ++++ 8 files changed, 58 insertions(+), 12 deletions(-) diff --git a/configure b/configure index f1b9549..58d5929 100755 --- a/configure +++ b/configure @@ -17429,6 +17429,8 @@ for ac_func in \ llrintf \ llround \ llroundf \ + log1p \ + log1pf \ log2 \ log2f \ lrint \ diff --git a/configure.ac b/configure.ac index 0362826..ab4203c 100644 --- a/configure.ac +++ b/configure.ac @@ -2616,6 +2616,8 @@ AC_CHECK_FUNCS(\ llrintf \ llround \ llroundf \ + log1p \ + log1pf \ log2 \ log2f \ lrint \ diff --git a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec index 9ed215f..7a6a8ed 100644 --- a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec +++ b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec @@ -270,9 +270,9 @@ @ cdecl log(double) ucrtbase.log @ cdecl log10(double) ucrtbase.log10 @ cdecl -arch=arm,x86_64 log10f(float) ucrtbase.log10f -@ stub log1p -@ stub log1pf -@ stub log1pl +@ cdecl log1p(double) ucrtbase.log1p +@ cdecl log1pf(float) ucrtbase.log1pf +@ cdecl log1pl(double) ucrtbase.log1pl @ cdecl log2(double) ucrtbase.log2 @ cdecl log2f(float) ucrtbase.log2f @ cdecl log2l(double) ucrtbase.log2l diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 407c86c..9da3f49 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2259,9 +2259,9 @@ @ cdecl -arch=arm,x86_64 logf(float) MSVCRT_logf @ cdecl log10(double) MSVCRT_log10 @ cdecl -arch=arm,x86_64 log10f(float) MSVCRT_log10f -@ stub log1p -@ stub log1pf -@ stub log1pl +@ cdecl log1p(double) MSVCR120_log1p +@ cdecl log1pf(float) MSVCR120_log1pf +@ cdecl log1pl(double) MSVCR120_log1pl @ cdecl log2(double) MSVCR120_log2 @ cdecl log2f(float) MSVCR120_log2f @ cdecl log2l(double) MSVCR120_log2l diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 8858f43..41acbbd 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1922,9 +1922,9 @@ @ cdecl -arch=arm,x86_64 logf(float) msvcr120.logf @ cdecl log10(double) msvcr120.log10 @ cdecl -arch=arm,x86_64 log10f(float) msvcr120.log10f -@ stub log1p -@ stub log1pf -@ stub log1pl +@ cdecl log1p(double) msvcr120.log1p +@ cdecl log1pf(float) msvcr120.log1pf +@ cdecl log1pl(double) msvcr120.log1pl @ cdecl log2(double) msvcr120.log2 @ cdecl log2f(float) msvcr120.log2f @ cdecl log2l(double) msvcr120.log2l diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index ec8e38b..b12ce8b 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -2448,6 +2448,42 @@ LDOUBLE CDECL MSVCR120_expm1l(LDOUBLE x) } /********************************************************************* + * log1p (MSVCR120.@) + */ +double CDECL MSVCR120_log1p(double x) +{ + if (x < -1) *MSVCRT__errno() = MSVCRT_EDOM; + else if (x == -1) *MSVCRT__errno() = MSVCRT_ERANGE; +#ifdef HAVE_LOG1P + return log1p(x); +#else + return log(1 + x); +#endif +} + +/********************************************************************* + * log1pf (MSVCR120.@) + */ +float CDECL MSVCR120_log1pf(float x) +{ + if (x < -1) *MSVCRT__errno() = MSVCRT_EDOM; + else if (x == -1) *MSVCRT__errno() = MSVCRT_ERANGE; +#ifdef HAVE_LOG1PF + return log1pf(x); +#else + return log(1 + x); +#endif +} + +/********************************************************************* + * log1pl (MSVCR120.@) + */ +LDOUBLE CDECL MSVCR120_log1pl(LDOUBLE x) +{ + return MSVCR120_log1p(x); +} + +/********************************************************************* * log2 (MSVCR120.@) */ double CDECL MSVCR120_log2(double x) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 0d799fd..ff11028 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2392,9 +2392,9 @@ @ cdecl log(double) MSVCRT_log @ cdecl log10(double) MSVCRT_log10 @ cdecl -arch=arm,x86_64 log10f(float) MSVCRT_log10f -@ stub log1p -@ stub log1pf -@ stub log1pl +@ cdecl log1p(double) MSVCR120_log1p +@ cdecl log1pf(float) MSVCR120_log1pf +@ cdecl log1pl(double) MSVCR120_log1pl @ cdecl log2(double) MSVCR120_log2 @ cdecl log2f(float) MSVCR120_log2f @ cdecl log2l(double) MSVCR120_log2l diff --git a/include/config.h.in b/include/config.h.in index 5ab518c..c27fa80 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -522,6 +522,12 @@ /* Define to 1 if you have the `llroundf' function. */ #undef HAVE_LLROUNDF +/* Define to 1 if you have the `log1p' function. */ +#undef HAVE_LOG1P + +/* Define to 1 if you have the `log1pf' function. */ +#undef HAVE_LOG1PF + /* Define to 1 if you have the `log2' function. */ #undef HAVE_LOG2

1 0

Józef Kucia : wined3d: Translate ld_{raw, structured} instructions more carefully.
by Alexandre Julliard July 18, 2017

July 18, 2017

Module: wine Branch: master Commit: 5151b80b2dab66f9ae59f3c6742b3d262cfad068 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5151b80b2dab66f9ae59f3c67… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jul 18 00:17:18 2017 +0200 wined3d: Translate ld_{raw, structured} instructions more carefully. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index ac4dfda..f96f48d 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -5569,6 +5569,14 @@ static void shader_glsl_ld_raw_structured(const struct wined3d_shader_instructio shader_addline(address, "%s / 4", offset.param_str); dst = ins->dst[0]; + if (shader_glsl_get_write_mask_size(dst.write_mask) > 1) + { + /* The instruction is split into multiple lines. The first lines may + * overwrite source parameters of the following lines. */ + shader_addline(buffer, "tmp0.x = intBitsToFloat(%s);\n", address->buffer); + string_buffer_sprintf(address, "floatBitsToInt(tmp0.x)"); + } + for (i = 0; i < 4; ++i) { dst.write_mask = ins->dst[0].write_mask & (WINED3DSP_WRITEMASK_0 << i);

1 0

Jacek Caban : winhttp/tests: Added persistent connection tests.
by Alexandre Julliard July 18, 2017

July 18, 2017

Module: wine Branch: master Commit: fa2cc9868b7db7a4cbf7d01a48500cb3f31e109a URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa2cc9868b7db7a4cbf7d01a4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 18 00:25:27 2017 +0200 winhttp/tests: Added persistent connection tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/tests/notification.c | 429 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 429 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fa2cc9868b7db7a4cbf7d…

1 0

Jacek Caban : winhttp: Introduce global connected hosts store and keep reference to host in netconn_t.
by Alexandre Julliard July 18, 2017

July 18, 2017

Module: wine Branch: master Commit: e0e8a3ff77466b66880df30cbf0fe3619a9ba880 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0e8a3ff77466b66880df30cb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 18 00:25:10 2017 +0200 winhttp: Introduce global connected hosts store and keep reference to host in netconn_t. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/net.c | 4 +- dlls/winhttp/request.c | 88 +++++++++++++++++++++++++++++++++++++++--- dlls/winhttp/winhttp_private.h | 13 ++++++- 3 files changed, 97 insertions(+), 8 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index 32d3624..c57d3af 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -299,7 +299,7 @@ void netconn_unload( void ) #endif } -netconn_t *netconn_create( const struct sockaddr_storage *sockaddr, int timeout ) +netconn_t *netconn_create( host_t *host, const struct sockaddr_storage *sockaddr, int timeout ) { netconn_t *conn; unsigned int addr_len; @@ -309,6 +309,7 @@ netconn_t *netconn_create( const struct sockaddr_storage *sockaddr, int timeout conn = heap_alloc_zero(sizeof(*conn)); if (!conn) return NULL; + conn->host = host; conn->sockaddr = *sockaddr; if ((conn->socket = socket( sockaddr->ss_family, SOCK_STREAM, 0 )) == -1) { @@ -398,6 +399,7 @@ BOOL netconn_close( netconn_t *conn ) DeleteSecurityContext(&conn->ssl_ctx); } res = closesocket( conn->socket ); + release_host( conn->host ); heap_free(conn); if (res == -1) { diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 5afc768..97e4ce0 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -991,8 +991,34 @@ static WCHAR *addr_to_str( struct sockaddr_storage *addr ) return strdupAW( buf ); } +static CRITICAL_SECTION connection_pool_cs; +static CRITICAL_SECTION_DEBUG connection_pool_debug = +{ + 0, 0, &connection_pool_cs, + { &connection_pool_debug.ProcessLocksList, &connection_pool_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": connection_pool_cs") } +}; +static CRITICAL_SECTION connection_pool_cs = { &connection_pool_debug, -1, 0, 0, 0, 0 }; + +static struct list connection_pool = LIST_INIT( connection_pool ); + +void release_host( host_t *host ) +{ + LONG ref; + + EnterCriticalSection( &connection_pool_cs ); + if (!(ref = --host->ref)) list_remove( &host->entry ); + LeaveCriticalSection( &connection_pool_cs ); + if (ref) return; + + heap_free( host->hostname ); + heap_free( host ); +} + static BOOL open_connection( request_t *request ) { + BOOL is_secure = request->hdr.flags & WINHTTP_FLAG_SECURE; + host_t *host = NULL, *iter; netconn_t *netconn; connect_t *connect; WCHAR *addressW = NULL; @@ -1004,25 +1030,74 @@ static BOOL open_connection( request_t *request ) connect = request->connect; port = connect->serverport ? connect->serverport : (request->hdr.flags & WINHTTP_FLAG_SECURE ? 443 : 80); + EnterCriticalSection( &connection_pool_cs ); + + LIST_FOR_EACH_ENTRY( iter, &connection_pool, host_t, entry ) + { + if (iter->port == port && !strcmpW( connect->servername, iter->hostname ) && !is_secure == !iter->secure) + { + host = iter; + host->ref++; + break; + } + } + + if (!host) + { + if (!(host = heap_alloc( sizeof(*host) ))) return FALSE; + host->ref = 1; + host->secure = is_secure; + host->port = port; + if ((host->hostname = strdupW( connect->servername ))) + { + list_add_head( &connection_pool, &host->entry ); + } + else + { + heap_free( host ); + host = NULL; + } + } + + LeaveCriticalSection( &connection_pool_cs ); + + if (!host) return FALSE; + if (!connect->resolved) { - len = strlenW( connect->servername ) + 1; - send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_RESOLVING_NAME, connect->servername, len ); + len = strlenW( host->hostname ) + 1; + send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_RESOLVING_NAME, host->hostname, len ); - if (!netconn_resolve( connect->servername, port, &connect->sockaddr, request->resolve_timeout )) return FALSE; + if (!netconn_resolve( host->hostname, port, &connect->sockaddr, request->resolve_timeout )) + { + release_host( host ); + return FALSE; + } connect->resolved = TRUE; - if (!(addressW = addr_to_str( &connect->sockaddr ))) return FALSE; + if (!(addressW = addr_to_str( &connect->sockaddr ))) + { + release_host( host ); + return FALSE; + } len = strlenW( addressW ) + 1; send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_NAME_RESOLVED, addressW, len ); } - if (!addressW && !(addressW = addr_to_str( &connect->sockaddr ))) return FALSE; + + if (!addressW && !(addressW = addr_to_str( &connect->sockaddr ))) + { + release_host( host ); + return FALSE; + } + TRACE("connecting to %s:%u\n", debugstr_w(addressW), port); send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_CONNECTING_TO_SERVER, addressW, 0 ); - if (!(netconn = netconn_create( &connect->sockaddr, request->connect_timeout ))) + netconn = netconn_create( host, &connect->sockaddr, request->connect_timeout ); + if (!netconn) { + release_host( host ); heap_free( addressW ); return FALSE; } @@ -1036,6 +1111,7 @@ static BOOL open_connection( request_t *request ) if (!secure_proxy_connect( request )) { heap_free( addressW ); + netconn_close( netconn ); return FALSE; } } diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index 611dc43..2b171bf 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -96,6 +96,14 @@ typedef struct WCHAR *path; } cookie_t; +typedef struct { + struct list entry; + LONG ref; + WCHAR *hostname; + INTERNET_PORT port; + BOOL secure; +} host_t; + typedef struct { object_header_t hdr; @@ -132,6 +140,7 @@ typedef struct int socket; struct sockaddr_storage sockaddr; BOOL secure; /* SSL active on connection? */ + host_t *host; CtxtHandle ssl_ctx; SecPkgContext_StreamSizes ssl_sizes; char *ssl_buf; @@ -283,7 +292,7 @@ void send_callback( object_header_t *, DWORD, LPVOID, DWORD ) DECLSPEC_HIDDEN; void close_connection( request_t * ) DECLSPEC_HIDDEN; BOOL netconn_close( netconn_t * ) DECLSPEC_HIDDEN; -netconn_t *netconn_create( const struct sockaddr_storage *, int ) DECLSPEC_HIDDEN; +netconn_t *netconn_create( host_t *, const struct sockaddr_storage *, int ) DECLSPEC_HIDDEN; void netconn_unload( void ) DECLSPEC_HIDDEN; ULONG netconn_query_data_available( netconn_t * ) DECLSPEC_HIDDEN; BOOL netconn_recv( netconn_t *, void *, size_t, int, int * ) DECLSPEC_HIDDEN; @@ -301,6 +310,8 @@ void delete_domain( domain_t * ) DECLSPEC_HIDDEN; BOOL set_server_for_hostname( connect_t *, LPCWSTR, INTERNET_PORT ) DECLSPEC_HIDDEN; void destroy_authinfo( struct authinfo * ) DECLSPEC_HIDDEN; +void release_host( host_t *host ) DECLSPEC_HIDDEN; + extern HRESULT WinHttpRequest_create( void ** ) DECLSPEC_HIDDEN; void release_typelib( void ) DECLSPEC_HIDDEN;

1 0

Nikolay Sivov : d2d1: Force appropriate antialiasing mode when drawing text elements using 2D primitives.
by Alexandre Julliard July 18, 2017

July 18, 2017

Module: wine Branch: master Commit: 977f8cc64da69884eb96dad962996b3bd5126fa9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=977f8cc64da69884eb96dad96… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jul 18 09:46:17 2017 +0300 d2d1: Force appropriate antialiasing mode when drawing text elements using 2D primitives. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/render_target.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index efe12ce..cf559c1 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -1042,10 +1042,19 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_DrawTextLayout(ID2D1RenderTa FIXME("Failed to draw text layout, hr %#x.\n", hr); } +static D2D1_ANTIALIAS_MODE d2d_d3d_render_target_set_aa_mode_from_text_aa_mode(struct d2d_d3d_render_target *rt) +{ + D2D1_ANTIALIAS_MODE prev_antialias_mode = rt->drawing_state.antialiasMode; + rt->drawing_state.antialiasMode = rt->drawing_state.textAntialiasMode == D2D1_TEXT_ANTIALIAS_MODE_ALIASED ? + D2D1_ANTIALIAS_MODE_ALIASED : D2D1_ANTIALIAS_MODE_PER_PRIMITIVE; + return prev_antialias_mode; +} + static void d2d_rt_draw_glyph_run_outline(struct d2d_d3d_render_target *render_target, D2D1_POINT_2F baseline_origin, const DWRITE_GLYPH_RUN *glyph_run, ID2D1Brush *brush) { D2D1_MATRIX_3X2_F *transform, prev_transform; + D2D1_ANTIALIAS_MODE prev_antialias_mode; ID2D1PathGeometry *geometry; ID2D1GeometrySink *sink; HRESULT hr; @@ -1081,8 +1090,10 @@ static void d2d_rt_draw_glyph_run_outline(struct d2d_d3d_render_target *render_t prev_transform = *transform; transform->_31 += baseline_origin.x * transform->_11 + baseline_origin.y * transform->_21; transform->_32 += baseline_origin.x * transform->_12 + baseline_origin.y * transform->_22; + prev_antialias_mode = d2d_d3d_render_target_set_aa_mode_from_text_aa_mode(render_target); d2d_rt_fill_geometry(render_target, unsafe_impl_from_ID2D1Geometry((ID2D1Geometry *)geometry), unsafe_impl_from_ID2D1Brush(brush), NULL); + render_target->drawing_state.antialiasMode = prev_antialias_mode; *transform = prev_transform; ID2D1PathGeometry_Release(geometry); @@ -1908,6 +1919,7 @@ static HRESULT STDMETHODCALLTYPE d2d_text_renderer_DrawUnderline(IDWriteTextRend struct d2d_d3d_render_target *render_target = impl_from_IDWriteTextRenderer(iface); const D2D1_MATRIX_3X2_F *m = &render_target->drawing_state.transform; struct d2d_draw_text_layout_ctx *context = ctx; + D2D1_ANTIALIAS_MODE prev_antialias_mode; D2D1_POINT_2F start, end; ID2D1Brush *brush; float thickness; @@ -1925,7 +1937,9 @@ static HRESULT STDMETHODCALLTYPE d2d_text_renderer_DrawUnderline(IDWriteTextRend start.y = baseline_origin_y + underline->offset + thickness / 2.0f; end.x = start.x + underline->width; end.y = start.y; + prev_antialias_mode = d2d_d3d_render_target_set_aa_mode_from_text_aa_mode(render_target); d2d_d3d_render_target_DrawLine(&render_target->ID2D1RenderTarget_iface, start, end, brush, thickness, NULL); + render_target->drawing_state.antialiasMode = prev_antialias_mode; ID2D1Brush_Release(brush); @@ -1938,6 +1952,7 @@ static HRESULT STDMETHODCALLTYPE d2d_text_renderer_DrawStrikethrough(IDWriteText struct d2d_d3d_render_target *render_target = impl_from_IDWriteTextRenderer(iface); const D2D1_MATRIX_3X2_F *m = &render_target->drawing_state.transform; struct d2d_draw_text_layout_ctx *context = ctx; + D2D1_ANTIALIAS_MODE prev_antialias_mode; D2D1_POINT_2F start, end; ID2D1Brush *brush; float thickness; @@ -1955,7 +1970,9 @@ static HRESULT STDMETHODCALLTYPE d2d_text_renderer_DrawStrikethrough(IDWriteText start.y = baseline_origin_y + strikethrough->offset + thickness / 2.0f; end.x = start.x + strikethrough->width; end.y = start.y; + prev_antialias_mode = d2d_d3d_render_target_set_aa_mode_from_text_aa_mode(render_target); d2d_d3d_render_target_DrawLine(&render_target->ID2D1RenderTarget_iface, start, end, brush, thickness, NULL); + render_target->drawing_state.antialiasMode = prev_antialias_mode; ID2D1Brush_Release(brush);

1 0

Nikolay Sivov : d2d1: Enforce text antialias mode vs text rendering mode consistency.
by Alexandre Julliard July 18, 2017

July 18, 2017

Module: wine Branch: master Commit: c2257c072b24d31b46234f9f7d95b1743c1880d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2257c072b24d31b46234f9f7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jul 18 09:46:16 2017 +0300 d2d1: Enforce text antialias mode vs text rendering mode consistency. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/render_target.c | 34 ++++++++++++++++++++++++++--- dlls/d2d1/tests/d2d1.c | 54 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 85 insertions(+), 3 deletions(-) diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index 86a73f5..efe12ce 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -1230,12 +1230,40 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_DrawGlyphRun(ID2D1RenderTarg TRACE("iface %p, baseline_origin {%.8e, %.8e}, glyph_run %p, brush %p, measuring_mode %#x.\n", iface, baseline_origin.x, baseline_origin.y, glyph_run, brush, measuring_mode); - if (FAILED(render_target->error.code)) - return; - rendering_params = render_target->text_rendering_params ? render_target->text_rendering_params : render_target->default_text_rendering_params; + rendering_mode = IDWriteRenderingParams_GetRenderingMode(rendering_params); + + switch (render_target->drawing_state.textAntialiasMode) + { + case D2D1_TEXT_ANTIALIAS_MODE_ALIASED: + if (rendering_mode == DWRITE_RENDERING_MODE_CLEARTYPE_NATURAL + || rendering_mode == DWRITE_RENDERING_MODE_CLEARTYPE_NATURAL_SYMMETRIC + || rendering_mode == DWRITE_RENDERING_MODE_CLEARTYPE_GDI_NATURAL + || rendering_mode == DWRITE_RENDERING_MODE_CLEARTYPE_GDI_CLASSIC) + { + render_target->error.code = E_INVALIDARG; + } + break; + case D2D1_TEXT_ANTIALIAS_MODE_CLEARTYPE: + if (rendering_mode == DWRITE_RENDERING_MODE_ALIASED + || rendering_mode == DWRITE_RENDERING_MODE_OUTLINE) + { + render_target->error.code = E_INVALIDARG; + } + break; + case D2D1_TEXT_ANTIALIAS_MODE_GRAYSCALE: + if (rendering_mode == DWRITE_RENDERING_MODE_ALIASED) + render_target->error.code = E_INVALIDARG; + break; + default: + ; + } + + if (FAILED(render_target->error.code)) + return; + rendering_mode = DWRITE_RENDERING_MODE_DEFAULT; switch (render_target->drawing_state.textAntialiasMode) { diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index e9e73d8..2bb13bb 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -3765,6 +3765,37 @@ static void test_create_target(void) static void test_draw_text_layout(void) { + static const struct + { + D2D1_TEXT_ANTIALIAS_MODE aa_mode; + DWRITE_RENDERING_MODE rendering_mode; + HRESULT hr; + } + antialias_mode_tests[] = + { + { D2D1_TEXT_ANTIALIAS_MODE_DEFAULT, DWRITE_RENDERING_MODE_ALIASED }, + { D2D1_TEXT_ANTIALIAS_MODE_ALIASED, DWRITE_RENDERING_MODE_ALIASED }, + { D2D1_TEXT_ANTIALIAS_MODE_ALIASED, DWRITE_RENDERING_MODE_DEFAULT }, + { D2D1_TEXT_ANTIALIAS_MODE_ALIASED, DWRITE_RENDERING_MODE_OUTLINE }, + { D2D1_TEXT_ANTIALIAS_MODE_GRAYSCALE, DWRITE_RENDERING_MODE_DEFAULT }, + { D2D1_TEXT_ANTIALIAS_MODE_GRAYSCALE, DWRITE_RENDERING_MODE_OUTLINE }, + { D2D1_TEXT_ANTIALIAS_MODE_GRAYSCALE, DWRITE_RENDERING_MODE_CLEARTYPE_NATURAL }, + { D2D1_TEXT_ANTIALIAS_MODE_GRAYSCALE, DWRITE_RENDERING_MODE_CLEARTYPE_NATURAL_SYMMETRIC }, + { D2D1_TEXT_ANTIALIAS_MODE_GRAYSCALE, DWRITE_RENDERING_MODE_CLEARTYPE_GDI_NATURAL }, + { D2D1_TEXT_ANTIALIAS_MODE_GRAYSCALE, DWRITE_RENDERING_MODE_CLEARTYPE_GDI_CLASSIC }, + { D2D1_TEXT_ANTIALIAS_MODE_CLEARTYPE, DWRITE_RENDERING_MODE_DEFAULT }, + { D2D1_TEXT_ANTIALIAS_MODE_CLEARTYPE, DWRITE_RENDERING_MODE_CLEARTYPE_NATURAL }, + { D2D1_TEXT_ANTIALIAS_MODE_CLEARTYPE, DWRITE_RENDERING_MODE_CLEARTYPE_NATURAL_SYMMETRIC }, + { D2D1_TEXT_ANTIALIAS_MODE_CLEARTYPE, DWRITE_RENDERING_MODE_CLEARTYPE_GDI_NATURAL }, + { D2D1_TEXT_ANTIALIAS_MODE_CLEARTYPE, DWRITE_RENDERING_MODE_CLEARTYPE_GDI_CLASSIC }, + { D2D1_TEXT_ANTIALIAS_MODE_CLEARTYPE, DWRITE_RENDERING_MODE_OUTLINE, E_INVALIDARG }, + { D2D1_TEXT_ANTIALIAS_MODE_GRAYSCALE, DWRITE_RENDERING_MODE_ALIASED, E_INVALIDARG }, + { D2D1_TEXT_ANTIALIAS_MODE_CLEARTYPE, DWRITE_RENDERING_MODE_ALIASED, E_INVALIDARG }, + { D2D1_TEXT_ANTIALIAS_MODE_ALIASED, DWRITE_RENDERING_MODE_CLEARTYPE_NATURAL, E_INVALIDARG }, + { D2D1_TEXT_ANTIALIAS_MODE_ALIASED, DWRITE_RENDERING_MODE_CLEARTYPE_NATURAL_SYMMETRIC, E_INVALIDARG }, + { D2D1_TEXT_ANTIALIAS_MODE_ALIASED, DWRITE_RENDERING_MODE_CLEARTYPE_GDI_NATURAL, E_INVALIDARG }, + { D2D1_TEXT_ANTIALIAS_MODE_ALIASED, DWRITE_RENDERING_MODE_CLEARTYPE_GDI_CLASSIC, E_INVALIDARG }, + }; static const WCHAR tahomaW[] = {'T','a','h','o','m','a',0}; static const WCHAR textW[] = {'t','e','x','t',0}; static const WCHAR emptyW[] = {0}; @@ -3785,6 +3816,7 @@ static void test_draw_text_layout(void) ID2D1SolidColorBrush *brush, *brush2; ID2D1RectangleGeometry *geometry; D2D1_RECT_F rect; + unsigned int i; if (!(device = create_device())) { @@ -3868,6 +3900,28 @@ todo_wine hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL); ok(hr == S_OK, "EndDraw failure expected, hr %#x.\n", hr); + for (i = 0; i < sizeof(antialias_mode_tests)/sizeof(*antialias_mode_tests); i++) + { + IDWriteRenderingParams *rendering_params; + + ID2D1RenderTarget_SetTextAntialiasMode(rt, antialias_mode_tests[i].aa_mode); + + hr = IDWriteFactory_CreateCustomRenderingParams(dwrite_factory, 2.0f, 1.0f, 0.0f, DWRITE_PIXEL_GEOMETRY_FLAT, + antialias_mode_tests[i].rendering_mode, &rendering_params); + ok(SUCCEEDED(hr), "Failed to create custom rendering params, hr %#x.\n", hr); + + ID2D1RenderTarget_SetTextRenderingParams(rt, rendering_params); + + ID2D1RenderTarget_BeginDraw(rt); + + ID2D1RenderTarget_DrawTextLayout(rt, origin, text_layout, (ID2D1Brush *)brush, D2D1_DRAW_TEXT_OPTIONS_NONE); + + hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL); + ok(hr == antialias_mode_tests[i].hr, "%u: unexpected hr %#x.\n", i, hr); + + IDWriteRenderingParams_Release(rendering_params); + } + IDWriteTextFormat_Release(text_format); IDWriteTextLayout_Release(text_layout); IDWriteFactory_Release(dwrite_factory);

1 0

Nikolay Sivov : d2d1: Pass current text antialias mode down to IDWriteGlyphRunAnalysis.
by Alexandre Julliard July 18, 2017

July 18, 2017

Module: wine Branch: master Commit: 1ec12ec7c5aa82508778050ec37e088e44f63d9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ec12ec7c5aa82508778050ec… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jul 18 09:46:15 2017 +0300 d2d1: Pass current text antialias mode down to IDWriteGlyphRunAnalysis. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/render_target.c | 54 ++++++++++++++++++++++++++++++++++------------- 1 file changed, 39 insertions(+), 15 deletions(-) diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index 71eaf3d..86a73f5 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -1090,7 +1090,8 @@ static void d2d_rt_draw_glyph_run_outline(struct d2d_d3d_render_target *render_t static void d2d_rt_draw_glyph_run_bitmap(struct d2d_d3d_render_target *render_target, D2D1_POINT_2F baseline_origin, const DWRITE_GLYPH_RUN *glyph_run, ID2D1Brush *brush, - float ppd, DWRITE_RENDERING_MODE rendering_mode, DWRITE_MEASURING_MODE measuring_mode) + float ppd, DWRITE_RENDERING_MODE rendering_mode, DWRITE_MEASURING_MODE measuring_mode, + DWRITE_TEXT_ANTIALIAS_MODE antialias_mode) { D2D1_MATRIX_3X2_F prev_transform, *transform; ID2D1RectangleGeometry *geometry = NULL; @@ -1100,7 +1101,8 @@ static void d2d_rt_draw_glyph_run_bitmap(struct d2d_d3d_render_target *render_ta IDWriteGlyphRunAnalysis *analysis; DWRITE_TEXTURE_TYPE texture_type; D2D1_BRUSH_PROPERTIES brush_desc; - IDWriteFactory *dwrite_factory; + IDWriteFactory2 *dwrite_factory; + DWRITE_GLYPH_RUN scaled_run; void *opacity_values = NULL; size_t opacity_values_size; D2D1_SIZE_U bitmap_size; @@ -1109,16 +1111,19 @@ static void d2d_rt_draw_glyph_run_bitmap(struct d2d_d3d_render_target *render_ta HRESULT hr; if (FAILED(hr = DWriteCreateFactory(DWRITE_FACTORY_TYPE_SHARED, - &IID_IDWriteFactory, (IUnknown **)&dwrite_factory))) + &IID_IDWriteFactory2, (IUnknown **)&dwrite_factory))) { ERR("Failed to create dwrite factory, hr %#x.\n", hr); return; } - hr = IDWriteFactory_CreateGlyphRunAnalysis(dwrite_factory, glyph_run, ppd, + scaled_run = *glyph_run; + scaled_run.fontEmSize *= ppd; + hr = IDWriteFactory2_CreateGlyphRunAnalysis(dwrite_factory, &scaled_run, (DWRITE_MATRIX *)&render_target->drawing_state.transform, rendering_mode, measuring_mode, - baseline_origin.x, baseline_origin.y, &analysis); - IDWriteFactory_Release(dwrite_factory); + DWRITE_GRID_FIT_MODE_DEFAULT, antialias_mode, baseline_origin.x, + baseline_origin.y, &analysis); + IDWriteFactory2_Release(dwrite_factory); if (FAILED(hr)) { ERR("Failed to create glyph run analysis, hr %#x.\n", hr); @@ -1216,6 +1221,7 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_DrawGlyphRun(ID2D1RenderTarg DWRITE_MEASURING_MODE measuring_mode) { struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + DWRITE_TEXT_ANTIALIAS_MODE antialias_mode = DWRITE_TEXT_ANTIALIAS_MODE_GRAYSCALE; IDWriteRenderingParams *rendering_params; DWRITE_RENDERING_MODE rendering_mode; HRESULT hr; @@ -1227,24 +1233,42 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_DrawGlyphRun(ID2D1RenderTarg if (FAILED(render_target->error.code)) return; - if (render_target->drawing_state.textAntialiasMode != D2D1_TEXT_ANTIALIAS_MODE_DEFAULT) - FIXME("Ignoring text antialiasing mode %#x.\n", render_target->drawing_state.textAntialiasMode); - - ppd = max(render_target->desc.dpiX, render_target->desc.dpiY) / 96.0f; rendering_params = render_target->text_rendering_params ? render_target->text_rendering_params : render_target->default_text_rendering_params; - if (FAILED(hr = IDWriteFontFace_GetRecommendedRenderingMode(glyph_run->fontFace, glyph_run->fontEmSize, - ppd, measuring_mode, rendering_params, &rendering_mode))) + + rendering_mode = DWRITE_RENDERING_MODE_DEFAULT; + switch (render_target->drawing_state.textAntialiasMode) { - ERR("Failed to get recommended rendering mode, hr %#x.\n", hr); - rendering_mode = DWRITE_RENDERING_MODE_OUTLINE; + case D2D1_TEXT_ANTIALIAS_MODE_DEFAULT: + if (IDWriteRenderingParams_GetClearTypeLevel(rendering_params) > 0.0f) + antialias_mode = DWRITE_TEXT_ANTIALIAS_MODE_CLEARTYPE; + break; + case D2D1_TEXT_ANTIALIAS_MODE_CLEARTYPE: + antialias_mode = DWRITE_TEXT_ANTIALIAS_MODE_CLEARTYPE; + break; + case D2D1_TEXT_ANTIALIAS_MODE_ALIASED: + rendering_mode = DWRITE_RENDERING_MODE_ALIASED; + break; + default: + ; + } + + ppd = max(render_target->desc.dpiX, render_target->desc.dpiY) / 96.0f; + if (rendering_mode == DWRITE_RENDERING_MODE_DEFAULT) + { + if (FAILED(hr = IDWriteFontFace_GetRecommendedRenderingMode(glyph_run->fontFace, glyph_run->fontEmSize, + ppd, measuring_mode, rendering_params, &rendering_mode))) + { + ERR("Failed to get recommended rendering mode, hr %#x.\n", hr); + rendering_mode = DWRITE_RENDERING_MODE_OUTLINE; + } } if (rendering_mode == DWRITE_RENDERING_MODE_OUTLINE) d2d_rt_draw_glyph_run_outline(render_target, baseline_origin, glyph_run, brush); else d2d_rt_draw_glyph_run_bitmap(render_target, baseline_origin, glyph_run, brush, - ppd, rendering_mode, measuring_mode); + ppd, rendering_mode, measuring_mode, antialias_mode); } static void STDMETHODCALLTYPE d2d_d3d_render_target_SetTransform(ID2D1RenderTarget *iface,

1 0

Józef Kucia : d3d11: Handle D3D11_MAP_WRITE map type.
by Alexandre Julliard July 18, 2017

July 18, 2017

Module: wine Branch: master Commit: dfc1b36afe561bdf8690380fe59b663029717840 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfc1b36afe561bdf8690380fe… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jul 18 00:17:20 2017 +0200 d3d11: Handle D3D11_MAP_WRITE map type. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/utils.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/d3d11/utils.c b/dlls/d3d11/utils.c index b49177c..e919c58 100644 --- a/dlls/d3d11/utils.c +++ b/dlls/d3d11/utils.c @@ -647,6 +647,7 @@ DWORD wined3d_map_flags_from_d3d11_map_type(D3D11_MAP map_type) { switch (map_type) { + case D3D11_MAP_WRITE: case D3D11_MAP_READ_WRITE: return 0;

1 0