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

Jacek Caban : winhttp: Merge netconn_create and netconn_connect implementations.
by Alexandre Julliard July 18, 2017

July 18, 2017

Module: wine Branch: master Commit: d1d65c9b211fc79d43fbe1c3f9c61899720807c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1d65c9b211fc79d43fbe1c3f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 18 00:25:06 2017 +0200 winhttp: Merge netconn_create and netconn_connect implementations. 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 | 62 ++++++++++++++++++++---------------------- dlls/winhttp/request.c | 8 +----- dlls/winhttp/winhttp_private.h | 3 +- 3 files changed, 32 insertions(+), 41 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index 76e49da..32d3624 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -299,9 +299,14 @@ void netconn_unload( void ) #endif } -netconn_t *netconn_create( const struct sockaddr_storage *sockaddr ) +netconn_t *netconn_create( const struct sockaddr_storage *sockaddr, int timeout ) { netconn_t *conn; + unsigned int addr_len; + BOOL ret = FALSE; + int res; + ULONG state; + conn = heap_alloc_zero(sizeof(*conn)); if (!conn) return NULL; conn->sockaddr = *sockaddr; @@ -312,36 +317,6 @@ netconn_t *netconn_create( const struct sockaddr_storage *sockaddr ) heap_free(conn); return NULL; } - return conn; -} - -BOOL netconn_close( netconn_t *conn ) -{ - int res; - - if (conn->secure) - { - heap_free( conn->peek_msg_mem ); - heap_free(conn->ssl_buf); - heap_free(conn->extra_buf); - DeleteSecurityContext(&conn->ssl_ctx); - } - res = closesocket( conn->socket ); - heap_free(conn); - if (res == -1) - { - set_last_error( sock_get_error( errno ) ); - return FALSE; - } - return TRUE; -} - -BOOL netconn_connect( netconn_t *conn, int timeout ) -{ - unsigned int addr_len; - BOOL ret = FALSE; - int res; - ULONG state; switch (conn->sockaddr.ss_family) { @@ -405,8 +380,31 @@ BOOL netconn_connect( netconn_t *conn, int timeout ) { WARN("unable to connect to host (%d)\n", res); set_last_error( res ); + netconn_close( conn ); + return NULL; } - return ret; + return conn; +} + +BOOL netconn_close( netconn_t *conn ) +{ + int res; + + if (conn->secure) + { + heap_free( conn->peek_msg_mem ); + heap_free(conn->ssl_buf); + heap_free(conn->extra_buf); + DeleteSecurityContext(&conn->ssl_ctx); + } + res = closesocket( conn->socket ); + heap_free(conn); + if (res == -1) + { + set_last_error( sock_get_error( errno ) ); + return FALSE; + } + return TRUE; } BOOL netconn_secure_connect( netconn_t *conn, WCHAR *hostname, DWORD security_flags ) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 5076935..5afc768 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -1021,19 +1021,13 @@ static BOOL open_connection( request_t *request ) send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_CONNECTING_TO_SERVER, addressW, 0 ); - if (!(netconn = netconn_create( &connect->sockaddr ))) + if (!(netconn = netconn_create( &connect->sockaddr, request->connect_timeout ))) { heap_free( addressW ); return FALSE; } netconn_set_timeout( netconn, TRUE, request->send_timeout ); netconn_set_timeout( netconn, FALSE, request->recv_timeout ); - if (!netconn_connect( netconn, request->connect_timeout )) - { - netconn_close( netconn ); - heap_free( addressW ); - return FALSE; - } if (request->hdr.flags & WINHTTP_FLAG_SECURE) { if (connect->session->proxy_server && diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index 480311b..611dc43 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -283,8 +283,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; -BOOL netconn_connect( netconn_t *, int ) DECLSPEC_HIDDEN; -netconn_t *netconn_create( const struct sockaddr_storage * ) DECLSPEC_HIDDEN; +netconn_t *netconn_create( 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;

1 0

Jacek Caban : winhttp: Store socked address in netconn_t.
by Alexandre Julliard July 18, 2017

July 18, 2017

Module: wine Branch: master Commit: 3e602416778ebb31cf2ed5a9ecf01569644b0be4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e602416778ebb31cf2ed5a9e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 18 00:24:59 2017 +0200 winhttp: Store socked address 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 | 11 ++++++----- dlls/winhttp/request.c | 4 ++-- dlls/winhttp/winhttp_private.h | 5 +++-- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index a03be0c..76e49da 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -299,12 +299,13 @@ void netconn_unload( void ) #endif } -netconn_t *netconn_create( int domain, int type, int protocol ) +netconn_t *netconn_create( const struct sockaddr_storage *sockaddr ) { netconn_t *conn; conn = heap_alloc_zero(sizeof(*conn)); if (!conn) return NULL; - if ((conn->socket = socket( domain, type, protocol )) == -1) + conn->sockaddr = *sockaddr; + if ((conn->socket = socket( sockaddr->ss_family, SOCK_STREAM, 0 )) == -1) { WARN("unable to create socket (%s)\n", strerror(errno)); set_last_error( sock_get_error( errno ) ); @@ -335,14 +336,14 @@ BOOL netconn_close( netconn_t *conn ) return TRUE; } -BOOL netconn_connect( netconn_t *conn, const struct sockaddr_storage *sockaddr, int timeout ) +BOOL netconn_connect( netconn_t *conn, int timeout ) { unsigned int addr_len; BOOL ret = FALSE; int res; ULONG state; - switch (sockaddr->ss_family) + switch (conn->sockaddr.ss_family) { case AF_INET: addr_len = sizeof(struct sockaddr_in); @@ -363,7 +364,7 @@ BOOL netconn_connect( netconn_t *conn, const struct sockaddr_storage *sockaddr, for (;;) { res = 0; - if (connect( conn->socket, (const struct sockaddr *)sockaddr, addr_len ) < 0) + if (connect( conn->socket, (const struct sockaddr *)&conn->sockaddr, addr_len ) < 0) { res = sock_get_error( errno ); if (res == WSAEWOULDBLOCK || res == WSAEINPROGRESS) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index ce4e39c..5076935 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -1021,14 +1021,14 @@ static BOOL open_connection( request_t *request ) send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_CONNECTING_TO_SERVER, addressW, 0 ); - if (!(netconn = netconn_create( connect->sockaddr.ss_family, SOCK_STREAM, 0 ))) + if (!(netconn = netconn_create( &connect->sockaddr ))) { heap_free( addressW ); return FALSE; } netconn_set_timeout( netconn, TRUE, request->send_timeout ); netconn_set_timeout( netconn, FALSE, request->recv_timeout ); - if (!netconn_connect( netconn, &connect->sockaddr, request->connect_timeout )) + if (!netconn_connect( netconn, request->connect_timeout )) { netconn_close( netconn ); heap_free( addressW ); diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index d5cf3d5..480311b 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -130,6 +130,7 @@ typedef struct typedef struct { int socket; + struct sockaddr_storage sockaddr; BOOL secure; /* SSL active on connection? */ CtxtHandle ssl_ctx; SecPkgContext_StreamSizes ssl_sizes; @@ -282,8 +283,8 @@ 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; -BOOL netconn_connect( netconn_t *, const struct sockaddr_storage *, int ) DECLSPEC_HIDDEN; -netconn_t *netconn_create( int, int, int ) DECLSPEC_HIDDEN; +BOOL netconn_connect( netconn_t *, int ) DECLSPEC_HIDDEN; +netconn_t *netconn_create( const struct sockaddr_storage * ) 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;

1 0

Jacek Caban : winhttp: Pass socket address as sockaddr_storage to netconn_connect.
by Alexandre Julliard July 18, 2017

July 18, 2017

Module: wine Branch: master Commit: e129023eb7d3c8931e74c7f3de56577b67e75ab0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e129023eb7d3c8931e74c7f3d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 18 00:24:53 2017 +0200 winhttp: Pass socket address as sockaddr_storage to netconn_connect. 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 | 47 ++++++++++++++++++++---------------------- dlls/winhttp/request.c | 22 ++++++++------------ dlls/winhttp/winhttp_private.h | 4 ++-- 3 files changed, 33 insertions(+), 40 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index d9f81de..a03be0c 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -335,12 +335,25 @@ BOOL netconn_close( netconn_t *conn ) return TRUE; } -BOOL netconn_connect( netconn_t *conn, const struct sockaddr *sockaddr, unsigned int addr_len, int timeout ) +BOOL netconn_connect( netconn_t *conn, const struct sockaddr_storage *sockaddr, int timeout ) { + unsigned int addr_len; BOOL ret = FALSE; int res; ULONG state; + switch (sockaddr->ss_family) + { + case AF_INET: + addr_len = sizeof(struct sockaddr_in); + break; + case AF_INET6: + addr_len = sizeof(struct sockaddr_in6); + break; + default: + assert(0); + } + if (timeout > 0) { state = 1; @@ -350,7 +363,7 @@ BOOL netconn_connect( netconn_t *conn, const struct sockaddr *sockaddr, unsigned for (;;) { res = 0; - if (connect( conn->socket, sockaddr, addr_len ) < 0) + if (connect( conn->socket, (const struct sockaddr *)sockaddr, addr_len ) < 0) { res = sock_get_error( errno ); if (res == WSAEWOULDBLOCK || res == WSAEINPROGRESS) @@ -758,7 +771,7 @@ DWORD netconn_set_timeout( netconn_t *netconn, BOOL send, int value ) return ERROR_SUCCESS; } -static DWORD resolve_hostname( const WCHAR *hostnameW, INTERNET_PORT port, struct sockaddr *sa, socklen_t *sa_len ) +static DWORD resolve_hostname( const WCHAR *hostnameW, INTERNET_PORT port, struct sockaddr_storage *sa ) { char *hostname; #ifdef HAVE_GETADDRINFO @@ -792,13 +805,6 @@ static DWORD resolve_hostname( const WCHAR *hostnameW, INTERNET_PORT port, struc } } heap_free( hostname ); - if (*sa_len < res->ai_addrlen) - { - WARN("address too small\n"); - freeaddrinfo( res ); - return ERROR_WINHTTP_NAME_NOT_RESOLVED; - } - *sa_len = res->ai_addrlen; memcpy( sa, res->ai_addr, res->ai_addrlen ); /* Copy port */ switch (res->ai_family) @@ -824,13 +830,6 @@ static DWORD resolve_hostname( const WCHAR *hostnameW, INTERNET_PORT port, struc LeaveCriticalSection( &cs_gethostbyname ); return ERROR_WINHTTP_NAME_NOT_RESOLVED; } - if (*sa_len < sizeof(struct sockaddr_in)) - { - WARN("address too small\n"); - LeaveCriticalSection( &cs_gethostbyname ); - return ERROR_WINHTTP_NAME_NOT_RESOLVED; - } - *sa_len = sizeof(struct sockaddr_in); memset( sa, 0, sizeof(struct sockaddr_in) ); memcpy( &sin->sin_addr, he->h_addr, he->h_length ); sin->sin_family = he->h_addrtype; @@ -843,19 +842,18 @@ static DWORD resolve_hostname( const WCHAR *hostnameW, INTERNET_PORT port, struc struct resolve_args { - const WCHAR *hostname; - INTERNET_PORT port; - struct sockaddr *sa; - socklen_t *sa_len; + const WCHAR *hostname; + INTERNET_PORT port; + struct sockaddr_storage *sa; }; static DWORD CALLBACK resolve_proc( LPVOID arg ) { struct resolve_args *ra = arg; - return resolve_hostname( ra->hostname, ra->port, ra->sa, ra->sa_len ); + return resolve_hostname( ra->hostname, ra->port, ra->sa ); } -BOOL netconn_resolve( WCHAR *hostname, INTERNET_PORT port, struct sockaddr *sa, socklen_t *sa_len, int timeout ) +BOOL netconn_resolve( WCHAR *hostname, INTERNET_PORT port, struct sockaddr_storage *sa, int timeout ) { DWORD ret; @@ -868,7 +866,6 @@ BOOL netconn_resolve( WCHAR *hostname, INTERNET_PORT port, struct sockaddr *sa, ra.hostname = hostname; ra.port = port; ra.sa = sa; - ra.sa_len = sa_len; thread = CreateThread( NULL, 0, resolve_proc, &ra, 0, NULL ); if (!thread) return FALSE; @@ -878,7 +875,7 @@ BOOL netconn_resolve( WCHAR *hostname, INTERNET_PORT port, struct sockaddr *sa, else ret = ERROR_WINHTTP_TIMEOUT; CloseHandle( thread ); } - else ret = resolve_hostname( hostname, port, sa, sa_len ); + else ret = resolve_hostname( hostname, port, sa ); if (ret) { diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 087f7ee..ce4e39c 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -970,12 +970,12 @@ static BOOL secure_proxy_connect( request_t *request ) #define INET6_ADDRSTRLEN 46 #endif -static WCHAR *addr_to_str( struct sockaddr *addr ) +static WCHAR *addr_to_str( struct sockaddr_storage *addr ) { char buf[INET6_ADDRSTRLEN]; void *src; - switch (addr->sa_family) + switch (addr->ss_family) { case AF_INET: src = &((struct sockaddr_in *)addr)->sin_addr; @@ -984,10 +984,10 @@ static WCHAR *addr_to_str( struct sockaddr *addr ) src = &((struct sockaddr_in6 *)addr)->sin6_addr; break; default: - WARN("unsupported address family %d\n", addr->sa_family); + WARN("unsupported address family %d\n", addr->ss_family); return NULL; } - if (!inet_ntop( addr->sa_family, src, buf, sizeof(buf) )) return NULL; + if (!inet_ntop( addr->ss_family, src, buf, sizeof(buf) )) return NULL; return strdupAW( buf ); } @@ -997,42 +997,38 @@ static BOOL open_connection( request_t *request ) connect_t *connect; WCHAR *addressW = NULL; INTERNET_PORT port; - socklen_t slen; - struct sockaddr *saddr; DWORD len; if (request->netconn) goto done; connect = request->connect; port = connect->serverport ? connect->serverport : (request->hdr.flags & WINHTTP_FLAG_SECURE ? 443 : 80); - saddr = (struct sockaddr *)&connect->sockaddr; - slen = sizeof(struct sockaddr); if (!connect->resolved) { len = strlenW( connect->servername ) + 1; send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_RESOLVING_NAME, connect->servername, len ); - if (!netconn_resolve( connect->servername, port, saddr, &slen, request->resolve_timeout )) return FALSE; + if (!netconn_resolve( connect->servername, port, &connect->sockaddr, request->resolve_timeout )) return FALSE; connect->resolved = TRUE; - if (!(addressW = addr_to_str( saddr ))) return FALSE; + if (!(addressW = addr_to_str( &connect->sockaddr ))) return FALSE; len = strlenW( addressW ) + 1; send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_NAME_RESOLVED, addressW, len ); } - if (!addressW && !(addressW = addr_to_str( saddr ))) return FALSE; + if (!addressW && !(addressW = addr_to_str( &connect->sockaddr ))) 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( saddr->sa_family, SOCK_STREAM, 0 ))) + if (!(netconn = netconn_create( connect->sockaddr.ss_family, SOCK_STREAM, 0 ))) { heap_free( addressW ); return FALSE; } netconn_set_timeout( netconn, TRUE, request->send_timeout ); netconn_set_timeout( netconn, FALSE, request->recv_timeout ); - if (!netconn_connect( netconn, saddr, slen, request->connect_timeout )) + if (!netconn_connect( netconn, &connect->sockaddr, request->connect_timeout )) { netconn_close( netconn ); heap_free( addressW ); diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index 636bae9..d5cf3d5 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -282,12 +282,12 @@ 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; -BOOL netconn_connect( netconn_t *, const struct sockaddr *, unsigned int, int ) DECLSPEC_HIDDEN; +BOOL netconn_connect( netconn_t *, const struct sockaddr_storage *, int ) DECLSPEC_HIDDEN; netconn_t *netconn_create( int, int, 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; -BOOL netconn_resolve( WCHAR *, INTERNET_PORT, struct sockaddr *, socklen_t *, int ) DECLSPEC_HIDDEN; +BOOL netconn_resolve( WCHAR *, INTERNET_PORT, struct sockaddr_storage *, int ) DECLSPEC_HIDDEN; BOOL netconn_secure_connect( netconn_t *, WCHAR *, DWORD ) DECLSPEC_HIDDEN; BOOL netconn_send( netconn_t *, const void *, size_t, int * ) DECLSPEC_HIDDEN; DWORD netconn_set_timeout( netconn_t *, BOOL, int ) DECLSPEC_HIDDEN;

1 0

Nikolay Sivov : dwrite: Trace user-provided OpenType feature set.
by Alexandre Julliard July 18, 2017

July 18, 2017

Module: wine Branch: master Commit: d1199995bfd82264d909cf2e812b84cacbd4e56c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1199995bfd82264d909cf2e8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jul 18 09:47:24 2017 +0300 dwrite: Trace user-provided OpenType feature set. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 30 ++++++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index ede2e6d..3a820e7 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -1096,11 +1096,27 @@ static DWRITE_NUMBER_SUBSTITUTION_METHOD get_number_substitutes(IDWriteNumberSub return method; } +static void analyzer_dump_user_features(DWRITE_TYPOGRAPHIC_FEATURES const **features, + UINT32 const *feature_range_lengths, UINT32 feature_ranges) +{ + UINT32 i, j, start; + + if (!TRACE_ON(dwrite) || !features) + return; + + for (i = 0, start = 0; i < feature_ranges; i++, start += feature_range_lengths[i]) { + TRACE("feature range [%u,%u)\n", start, start + feature_range_lengths[i]); + for (j = 0; j < features[i]->featureCount; j++) + TRACE("feature %s, parameter %u\n", debugstr_an((char *)&features[i]->features[j].nameTag, 4), + features[i]->features[j].parameter); + } +} + static HRESULT WINAPI dwritetextanalyzer_GetGlyphs(IDWriteTextAnalyzer2 *iface, WCHAR const* text, UINT32 length, IDWriteFontFace* fontface, BOOL is_sideways, BOOL is_rtl, DWRITE_SCRIPT_ANALYSIS const* analysis, WCHAR const* locale, IDWriteNumberSubstitution* substitution, DWRITE_TYPOGRAPHIC_FEATURES const** features, - UINT32 const* feature_range_len, UINT32 feature_ranges, UINT32 max_glyph_count, + UINT32 const* feature_range_lengths, UINT32 feature_ranges, UINT32 max_glyph_count, UINT16* clustermap, DWRITE_SHAPING_TEXT_PROPERTIES* text_props, UINT16* glyph_indices, DWRITE_SHAPING_GLYPH_PROPERTIES* glyph_props, UINT32* actual_glyph_count) { @@ -1118,9 +1134,11 @@ static HRESULT WINAPI dwritetextanalyzer_GetGlyphs(IDWriteTextAnalyzer2 *iface, TRACE("(%s:%u %p %d %d %s %s %p %p %p %u %u %p %p %p %p %p)\n", debugstr_wn(text, length), length, fontface, is_sideways, is_rtl, debugstr_sa_script(analysis->script), debugstr_w(locale), substitution, - features, feature_range_len, feature_ranges, max_glyph_count, clustermap, text_props, glyph_indices, + features, feature_range_lengths, feature_ranges, max_glyph_count, clustermap, text_props, glyph_indices, glyph_props, actual_glyph_count); + analyzer_dump_user_features(features, feature_range_lengths, feature_ranges); + script = analysis->script > Script_LastId ? Script_Unknown : analysis->script; if (max_glyph_count < length) @@ -1252,7 +1270,7 @@ static HRESULT WINAPI dwritetextanalyzer_GetGlyphPlacements(IDWriteTextAnalyzer2 UINT32 text_len, UINT16 const* glyphs, DWRITE_SHAPING_GLYPH_PROPERTIES const* glyph_props, UINT32 glyph_count, IDWriteFontFace *fontface, FLOAT emSize, BOOL is_sideways, BOOL is_rtl, DWRITE_SCRIPT_ANALYSIS const* analysis, WCHAR const* locale, DWRITE_TYPOGRAPHIC_FEATURES const** features, - UINT32 const* feature_range_len, UINT32 feature_ranges, FLOAT *advances, DWRITE_GLYPH_OFFSET *offsets) + UINT32 const* feature_range_lengths, UINT32 feature_ranges, FLOAT *advances, DWRITE_GLYPH_OFFSET *offsets) { DWRITE_FONT_METRICS metrics; IDWriteFontFace1 *fontface1; @@ -1261,9 +1279,11 @@ static HRESULT WINAPI dwritetextanalyzer_GetGlyphPlacements(IDWriteTextAnalyzer2 TRACE("(%s %p %p %u %p %p %u %p %.2f %d %d %s %s %p %p %u %p %p)\n", debugstr_wn(text, text_len), clustermap, props, text_len, glyphs, glyph_props, glyph_count, fontface, emSize, is_sideways, - is_rtl, debugstr_sa_script(analysis->script), debugstr_w(locale), features, feature_range_len, + is_rtl, debugstr_sa_script(analysis->script), debugstr_w(locale), features, feature_range_lengths, feature_ranges, advances, offsets); + analyzer_dump_user_features(features, feature_range_lengths, feature_ranges); + if (glyph_count == 0) return S_OK; @@ -1313,6 +1333,8 @@ static HRESULT WINAPI dwritetextanalyzer_GetGdiCompatibleGlyphPlacements(IDWrite transform, use_gdi_natural, is_sideways, is_rtl, debugstr_sa_script(analysis->script), debugstr_w(locale), features, feature_range_lengths, feature_ranges, advances, offsets); + analyzer_dump_user_features(features, feature_range_lengths, feature_ranges); + if (glyph_count == 0) return S_OK;

1 0

Alexandre Julliard : opengl32: Add some tests for last error with an invalid DC.
by Alexandre Julliard July 18, 2017

July 18, 2017

Module: wine Branch: master Commit: 02eda5ccb98d72813ac9a4a05af4197e8227a2d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02eda5ccb98d72813ac9a4a05… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 18 08:56:29 2017 +0200 opengl32: Add some tests for last error with an invalid DC. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opengl32/tests/opengl.c | 29 +++++++++++++++++++++++++++-- dlls/opengl32/wgl.c | 9 +++++++-- 2 files changed, 34 insertions(+), 4 deletions(-) diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c index 5d3a245..2810eee 100644 --- a/dlls/opengl32/tests/opengl.c +++ b/dlls/opengl32/tests/opengl.c @@ -397,6 +397,30 @@ static void test_setpixelformat(HDC winhdc) ok( i == pf, "GetPixelFormat returned wrong format %d/%d\n", i, pf ); ReleaseDC( hwnd, hdc ); DestroyWindow( hwnd ); + /* check various calls with invalid hdc */ + SetLastError( 0xdeadbeef ); + i = GetPixelFormat( hdc ); + ok( i == 0, "GetPixelFormat succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_PIXEL_FORMAT, "wrong error %u\n", GetLastError() ); + SetLastError( 0xdeadbeef ); + res = SetPixelFormat( hdc, pf, &pfd ); + ok( i == 0, "SetPixelFormat succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_HANDLE, "wrong error %u\n", GetLastError() ); + SetLastError( 0xdeadbeef ); + res = DescribePixelFormat( hdc, 0, 0, NULL ); + ok( !res, "DescribePixelFormat succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_HANDLE, "wrong error %u\n", GetLastError() ); + SetLastError( 0xdeadbeef ); + pf = ChoosePixelFormat( hdc, &pfd ); + ok( !pf, "ChoosePixelFormat succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_HANDLE, "wrong error %u\n", GetLastError() ); + SetLastError( 0xdeadbeef ); + res = SwapBuffers( hdc ); + ok( !res, "SwapBuffers succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_HANDLE, "wrong error %u\n", GetLastError() ); + SetLastError( 0xdeadbeef ); + ok( !wglCreateContext( hdc ), "CreateContext succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_HANDLE, "wrong error %u\n", GetLastError() ); } hwnd = CreateWindowA("static", "Title", WS_OVERLAPPEDWINDOW, 10, 10, 200, 200, NULL, NULL, @@ -986,7 +1010,8 @@ static void test_opengl3(HDC hdc) gl3Ctx = pwglCreateContextAttribsARB((HDC)0xdeadbeef, 0, 0); ok(gl3Ctx == 0, "pwglCreateContextAttribsARB using an invalid HDC passed\n"); error = GetLastError(); - ok(error == ERROR_DC_NOT_FOUND || + ok(error == ERROR_DC_NOT_FOUND || error == ERROR_INVALID_HANDLE || + broken(error == ERROR_DS_GENERIC_ERROR) || broken(error == NVIDIA_HRESULT_FROM_WIN32(ERROR_INVALID_DATA)), /* Nvidia Vista + Win7 */ "Expected ERROR_DC_NOT_FOUND, got error=%x\n", error); wglDeleteContext(gl3Ctx); @@ -1001,7 +1026,7 @@ static void test_opengl3(HDC hdc) ok(gl3Ctx == 0, "pwglCreateContextAttribsARB using an invalid shareList passed\n"); error = GetLastError(); /* The Nvidia implementation seems to return hresults instead of win32 error codes */ - ok(error == ERROR_INVALID_OPERATION || + ok(error == ERROR_INVALID_OPERATION || error == ERROR_INVALID_DATA || error == NVIDIA_HRESULT_FROM_WIN32(ERROR_INVALID_OPERATION), "Expected ERROR_INVALID_OPERATION, got error=%x\n", error); wglDeleteContext(gl3Ctx); } diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index dafafb6..dacf0b3 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -98,7 +98,8 @@ static const MAT2 identity = { {0,1},{0,0},{0,0},{0,1} }; static inline struct opengl_funcs *get_dc_funcs( HDC hdc ) { struct opengl_funcs *funcs = __wine_get_wgl_driver( hdc, WINE_WGL_DRIVER_VERSION ); - if (funcs == (void *)-1) funcs = &null_opengl_funcs; + if (!funcs) SetLastError( ERROR_INVALID_HANDLE ); + else if (funcs == (void *)-1) funcs = &null_opengl_funcs; return funcs; } @@ -619,7 +620,11 @@ INT WINAPI wglChoosePixelFormat(HDC hdc, const PIXELFORMATDESCRIPTOR* ppfd) INT WINAPI wglGetPixelFormat(HDC hdc) { struct opengl_funcs *funcs = get_dc_funcs( hdc ); - if (!funcs) return 0; + if (!funcs) + { + SetLastError( ERROR_INVALID_PIXEL_FORMAT ); + return 0; + } return funcs->wgl.p_wglGetPixelFormat( hdc ); }

1 0

Alexandre Julliard : user32: Also disable the DC if the window is destroyed without a ReleaseDC.
by Alexandre Julliard July 18, 2017

July 18, 2017

Module: wine Branch: master Commit: 2999123fedeefe4e41c67216969b512ddd33100b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2999123fedeefe4e41c672169… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 18 08:56:59 2017 +0200 user32: Also disable the DC if the window is destroyed without a ReleaseDC. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/painting.c | 10 +++++++--- dlls/user32/tests/dce.c | 10 +++++----- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/dlls/user32/painting.c b/dlls/user32/painting.c index 3c7f220..8448355 100644 --- a/dlls/user32/painting.c +++ b/dlls/user32/painting.c @@ -367,9 +367,13 @@ void free_dce( struct dce *dce, HWND hwnd ) if (dce->hwnd != hwnd) continue; if (!(dce->flags & DCX_CACHE)) break; - if (dce->count) WARN( "GetDC() without ReleaseDC() for window %p\n", hwnd ); - dce->count = 0; release_dce( dce ); + if (dce->count) + { + WARN( "GetDC() without ReleaseDC() for window %p\n", hwnd ); + dce->count = 0; + SetHookFlags( dce->hdc, DCHF_DISABLEDC ); + } } } @@ -472,7 +476,7 @@ static INT release_dc( HWND hwnd, HDC hdc, BOOL end_paint ) USER_Lock(); dce = (struct dce *)GetDCHook( hdc, NULL ); - if (dce && dce->count) + if (dce && dce->count && dce->hwnd) { if (!(dce->flags & DCX_NORESETATTRS)) SetHookFlags( dce->hdc, DCHF_RESETDC ); if (end_paint || (dce->flags & DCX_CACHE)) delete_clip_rgn( dce ); diff --git a/dlls/user32/tests/dce.c b/dlls/user32/tests/dce.c index 25b0153..587f36f 100644 --- a/dlls/user32/tests/dce.c +++ b/dlls/user32/tests/dce.c @@ -623,7 +623,7 @@ static void test_destroyed_window(void) DestroyWindow( hwnd_cache ); rop = GetROP2( dc ); - todo_wine ok( rop == 0, "wrong ROP2 %d\n", rop ); + ok( rop == 0, "wrong ROP2 %d\n", rop ); ok( WindowFromDC( dc ) == 0, "wrong window\n" ); ok( !ReleaseDC( hwnd_cache, dc ), "ReleaseDC succeeded\n" ); dc = GetDC( hwnd_cache ); @@ -654,21 +654,21 @@ static void test_destroyed_window(void) rop = GetROP2( dc ); ok( rop == R2_WHITE, "wrong ROP2 %d\n", rop ); ok( WindowFromDC( dc ) == 0, "wrong window\n" ); - todo_wine ok( !ReleaseDC( hwnd_classdc2, dc ), "ReleaseDC succeeded\n" ); + ok( !ReleaseDC( hwnd_classdc2, dc ), "ReleaseDC succeeded\n" ); dc = GetDC( hwnd_classdc2 ); ok( !dc, "Got a non-NULL DC (%p) for a destroyed window\n", dc ); dc = GetDC( hwnd_classdc ); ok( dc != 0, "Got NULL DC\n" ); rop = GetROP2( dc ); - todo_wine ok( rop == R2_WHITE, "wrong ROP2 %d\n", rop ); + ok( rop == R2_WHITE, "wrong ROP2 %d\n", rop ); ok( WindowFromDC( dc ) == hwnd_classdc, "wrong window\n" ); DestroyWindow( hwnd_classdc ); rop = GetROP2( dc ); - todo_wine ok( rop == R2_WHITE, "wrong ROP2 %d\n", rop ); + ok( rop == R2_WHITE, "wrong ROP2 %d\n", rop ); ok( WindowFromDC( dc ) == 0, "wrong window\n" ); - todo_wine ok( !ReleaseDC( hwnd_classdc, dc ), "ReleaseDC succeeded\n" ); + ok( !ReleaseDC( hwnd_classdc, dc ), "ReleaseDC succeeded\n" ); dc = GetDC( hwnd_classdc ); ok( !dc, "Got a non-NULL DC (%p) for a destroyed window\n", dc );

1 0

Piotr Caban : gdiplus: Add support for creating image object containing metafile.
by Alexandre Julliard July 17, 2017

July 17, 2017

Module: wine Branch: master Commit: 8498aa3dfab65aac046abe7d1446b0298498c0b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8498aa3dfab65aac046abe7d1… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Jul 15 17:29:58 2017 +0200 gdiplus: Add support for creating image object containing metafile. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/metafile.c | 38 +++++++++++++++++++++++++++++++++++--- 1 file changed, 35 insertions(+), 3 deletions(-) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index a1db09b..cff5197 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -2482,6 +2482,10 @@ static GpStatus METAFILE_FillEmfPlusBitmap(EmfPlusBitmap *record, IStream *strea static GpStatus METAFILE_AddImageObject(GpMetafile *metafile, GpImage *image, DWORD *id) { + EmfPlusObject *object_record; + GpStatus stat; + DWORD size; + *id = -1; if (metafile->metafile_type != MetafileTypeEmfPlusOnly && metafile->metafile_type != MetafileTypeEmfPlusDual) @@ -2489,10 +2493,8 @@ static GpStatus METAFILE_AddImageObject(GpMetafile *metafile, GpImage *image, DW if (image->type == ImageTypeBitmap) { - EmfPlusObject *object_record; IStream *stream; - DWORD size, aligned_size; - GpStatus stat; + DWORD aligned_size; stat = METAFILE_CreateCompressedImageStream(image, &stream, &size); if (stat != Ok) return stat; @@ -2519,6 +2521,36 @@ static GpStatus METAFILE_AddImageObject(GpMetafile *metafile, GpImage *image, DW if (stat != Ok) METAFILE_RemoveLastRecord(metafile, &object_record->Header); return stat; } + else if (image->type == ImageTypeMetafile) + { + HENHMETAFILE hemf = ((GpMetafile*)image)->hemf; + EmfPlusMetafile *metafile_record; + + if (!hemf) return InvalidParameter; + + size = GetEnhMetaFileBits(hemf, 0, NULL); + if (!size) return GenericError; + + stat = METAFILE_AllocateRecord(metafile, + FIELD_OFFSET(EmfPlusObject, ObjectData.image.ImageData.metafile.MetafileData[size]), + (void**)&object_record); + if (stat != Ok) return stat; + + *id = METAFILE_AddObjectId(metafile); + object_record->Header.Type = EmfPlusRecordTypeObject; + object_record->Header.Flags = *id | ObjectTypeImage << 8; + object_record->ObjectData.image.Version = 0xDBC01002; + object_record->ObjectData.image.Type = ImageDataTypeMetafile; + metafile_record = &object_record->ObjectData.image.ImageData.metafile; + metafile_record->Type = ((GpMetafile*)image)->metafile_type; + metafile_record->MetafileDataSize = size; + if (GetEnhMetaFileBits(hemf, size, metafile_record->MetafileData) != size) + { + METAFILE_RemoveLastRecord(metafile, &object_record->Header); + return GenericError; + } + return Ok; + } else { FIXME("not supported image type (%d)\n", image->type);

1 0

Piotr Caban : gdiplus/tests: Test drawing metafile image to emf+ file.
by Alexandre Julliard July 17, 2017

July 17, 2017

Module: wine Branch: master Commit: 9c20a1130ed78c5422e8df9febdb1d2dfd251b86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c20a1130ed78c5422e8df9fe… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Jul 15 17:30:04 2017 +0200 gdiplus/tests: Test drawing metafile image to emf+ file. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/metafile.c | 130 ++++++++++++++++++++++++++++++++++++++---- 1 file changed, 119 insertions(+), 11 deletions(-) diff --git a/dlls/gdiplus/tests/metafile.c b/dlls/gdiplus/tests/metafile.c index 28881f8..aa32276 100644 --- a/dlls/gdiplus/tests/metafile.c +++ b/dlls/gdiplus/tests/metafile.c @@ -64,6 +64,39 @@ typedef struct EmfPlusRecordHeader DWORD DataSize; } EmfPlusRecordHeader; +typedef enum +{ + ObjectTypeInvalid, + ObjectTypeBrush, + ObjectTypePen, + ObjectTypePath, + ObjectTypeRegion, + ObjectTypeImage, + ObjectTypeFont, + ObjectTypeStringFormat, + ObjectTypeImageAttributes, + ObjectTypeCustomLineCap, +} ObjectType; + +typedef enum +{ + ImageDataTypeUnknown, + ImageDataTypeBitmap, + ImageDataTypeMetafile, +} ImageDataType; + +typedef struct +{ + EmfPlusRecordHeader Header; + /* EmfPlusImage */ + DWORD Version; + ImageDataType Type; + /* EmfPlusMetafile */ + DWORD MetafileType; + DWORD MetafileDataSize; + BYTE MetafileData[1]; +} MetafileImageObject; + static int CALLBACK enum_emf_proc(HDC hDC, HANDLETABLE *lpHTable, const ENHMETARECORD *lpEMFR, int nObj, LPARAM lpData) { @@ -97,14 +130,30 @@ static int CALLBACK enum_emf_proc(HDC hDC, HANDLETABLE *lpHTable, const ENHMETAR actual.record_type = record->Type; check_record(state->count, state->desc, &state->expected[state->count], &actual); - state->count++; + + if (state->expected[state->count-1].todo && state->expected[state->count-1].record_type != actual.record_type) + continue; } else { ok(0, "%s: Unexpected EMF+ 0x%x record\n", state->desc, record->Type); } + if ((record->Flags >> 8) == ObjectTypeImage && record->Type == EmfPlusRecordTypeObject) + { + const MetafileImageObject *image = (const MetafileImageObject*)record; + + if (image->Type == ImageDataTypeMetafile) + { + HENHMETAFILE hemf = SetEnhMetaFileBits(image->MetafileDataSize, image->MetafileData); + ok(hemf != NULL, "%s: SetEnhMetaFileBits failed\n", state->desc); + + EnumEnhMetaFile(0, hemf, enum_emf_proc, state, NULL); + DeleteEnhMetaFile(hemf); + } + } + offset += record->Size; } @@ -2337,7 +2386,26 @@ static void test_gditransform(void) expect(Ok, stat); } -static const emfplus_record draw_image_records[] = { +static const emfplus_record draw_image_bitmap_records[] = { + {0, EMR_HEADER}, + {0, EmfPlusRecordTypeHeader}, + {0, EmfPlusRecordTypeObject}, + {0, EmfPlusRecordTypeObject}, + {0, EmfPlusRecordTypeDrawImagePoints}, + {1, EMR_SAVEDC}, + {1, EMR_SETICMMODE}, + {1, EMR_BITBLT}, + {1, EMR_RESTOREDC}, + {0, EmfPlusRecordTypeEndOfFile}, + {0, EMR_EOF}, + {0} +}; + +static const emfplus_record draw_image_metafile_records[] = { + {0, EMR_HEADER}, + {0, EmfPlusRecordTypeHeader}, + {0, EmfPlusRecordTypeObject}, + /* metafile object */ {0, EMR_HEADER}, {0, EmfPlusRecordTypeHeader}, {0, EmfPlusRecordTypeObject}, @@ -2349,13 +2417,21 @@ static const emfplus_record draw_image_records[] = { {1, EMR_RESTOREDC}, {0, EmfPlusRecordTypeEndOfFile}, {0, EMR_EOF}, + /* end of metafile object */ + {0, EmfPlusRecordTypeDrawImagePoints}, + {1, EMR_SAVEDC}, + {1, EMR_SETICMMODE}, + {1, EMR_BITBLT}, + {1, EMR_RESTOREDC}, + {0, EmfPlusRecordTypeEndOfFile}, + {0, EMR_EOF}, {0} }; static void test_drawimage(void) { static const WCHAR description[] = {'w','i','n','e','t','e','s','t',0}; - static const GpPointF dst_points[3] = {{10.0,10.0},{25.0,15.0},{10.0,20.0}}; + static const GpPointF dst_points[3] = {{10.0,10.0},{85.0,15.0},{10.0,80.0}}; static const GpRectF frame = {0.0, 0.0, 100.0, 100.0}; const ColorMatrix double_red = {{ {2.0,0.0,0.0,0.0,0.0}, @@ -2371,14 +2447,12 @@ static void test_drawimage(void) GpStatus stat; BITMAPINFO info; BYTE buff[400]; - GpBitmap *bm; + GpImage *image; HDC hdc; - memset(buff, 0x80, sizeof(buff)); hdc = CreateCompatibleDC(0); stat = GdipRecordMetafile(hdc, EmfTypeEmfPlusOnly, &frame, MetafileFrameUnitPixel, description, &metafile); expect(Ok, stat); - DeleteDC(hdc); stat = GdipGetImageGraphicsContext((GpImage*)metafile, &graphics); expect(Ok, stat); @@ -2390,7 +2464,8 @@ static void test_drawimage(void) info.bmiHeader.biPlanes = 1; info.bmiHeader.biBitCount = 32; info.bmiHeader.biCompression = BI_RGB; - stat = GdipCreateBitmapFromGdiDib(&info, buff, &bm); + memset(buff, 0x80, sizeof(buff)); + stat = GdipCreateBitmapFromGdiDib(&info, buff, (GpBitmap**)&image); expect(Ok, stat); stat = GdipCreateImageAttributes(&imageattr); @@ -2400,23 +2475,56 @@ static void test_drawimage(void) TRUE, &double_red, NULL, ColorMatrixFlagsDefault); expect(Ok, stat); - stat = GdipDrawImagePointsRect(graphics, (GpImage*)bm, dst_points, 3, + stat = GdipDrawImagePointsRect(graphics, image, dst_points, 3, 0.0, 0.0, 10.0, 10.0, UnitPixel, imageattr, NULL, NULL); GdipDisposeImageAttributes(imageattr); expect(Ok, stat); - GdipDisposeImage((GpImage*)bm); + GdipDisposeImage(image); + + stat = GdipDeleteGraphics(graphics); + expect(Ok, stat); + sync_metafile(&metafile, "draw_image_bitmap.emf"); + + stat = GdipGetHemfFromMetafile(metafile, &hemf); + expect(Ok, stat); + + check_emfplus(hemf, draw_image_bitmap_records, "draw image bitmap"); + + /* test drawing metafile */ + stat = GdipRecordMetafile(hdc, EmfTypeEmfPlusOnly, &frame, MetafileFrameUnitPixel, description, &metafile); + expect(Ok, stat); + + stat = GdipGetImageGraphicsContext((GpImage*)metafile, &graphics); + expect(Ok, stat); + + stat = GdipCreateMetafileFromEmf(hemf, TRUE, (GpMetafile**)&image); + expect(Ok, stat); + + stat = GdipDrawImagePointsRect(graphics, image, dst_points, 3, + 0.0, 0.0, 100.0, 100.0, UnitPixel, NULL, NULL, NULL); + expect(Ok, stat); + + GdipDisposeImage(image); stat = GdipDeleteGraphics(graphics); expect(Ok, stat); - sync_metafile(&metafile, "draw_image.emf"); + sync_metafile(&metafile, "draw_image_metafile.emf"); stat = GdipGetHemfFromMetafile(metafile, &hemf); expect(Ok, stat); - check_emfplus(hemf, draw_image_records, "draw image"); + if (GetProcAddress(GetModuleHandleA("gdiplus.dll"), "GdipConvertToEmfPlus")) + { + check_emfplus(hemf, draw_image_metafile_records, "draw image metafile"); + } + else + { + win_skip("draw image metafile records tests skipped\n"); + } DeleteEnhMetaFile(hemf); + DeleteDC(hdc); stat = GdipDisposeImage((GpImage*)metafile); expect(Ok, stat); }

1 0

Piotr Caban : gdiplus: Use VERSION_MAGIC2 constant in metafiles functions.
by Alexandre Julliard July 17, 2017

July 17, 2017

Module: wine Branch: master Commit: a8b5fdda3214e4fd52682aefaa093cd45766580e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8b5fdda3214e4fd52682aefa… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Jul 15 17:30:08 2017 +0200 gdiplus: Use VERSION_MAGIC2 constant in metafiles functions. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/metafile.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index cff5197..d53c85f 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -447,7 +447,7 @@ static GpStatus METAFILE_WriteHeader(GpMetafile *metafile, HDC hdc) else header->Header.Flags = 0; - header->Version = 0xDBC01002; + header->Version = VERSION_MAGIC2; if (GetDeviceCaps(hdc, TECHNOLOGY) == DT_RASDISPLAY) header->EmfPlusFlags = 1; @@ -2057,7 +2057,7 @@ GpStatus WINGDIPAPI GdipGetMetafileHeaderFromMetafile(GpMetafile * metafile, else { memset(header, 0, sizeof(*header)); - header->Version = 0xdbc01002; + header->Version = VERSION_MAGIC2; } header->Type = metafile->metafile_type; @@ -2513,7 +2513,7 @@ static GpStatus METAFILE_AddImageObject(GpMetafile *metafile, GpImage *image, DW *id = METAFILE_AddObjectId(metafile); object_record->Header.Type = EmfPlusRecordTypeObject; object_record->Header.Flags = *id | ObjectTypeImage << 8; - object_record->ObjectData.image.Version = 0xDBC01002; + object_record->ObjectData.image.Version = VERSION_MAGIC2; object_record->ObjectData.image.Type = ImageDataTypeBitmap; stat = METAFILE_FillEmfPlusBitmap(&object_record->ObjectData.image.ImageData.bitmap, stream, size); @@ -2539,7 +2539,7 @@ static GpStatus METAFILE_AddImageObject(GpMetafile *metafile, GpImage *image, DW *id = METAFILE_AddObjectId(metafile); object_record->Header.Type = EmfPlusRecordTypeObject; object_record->Header.Flags = *id | ObjectTypeImage << 8; - object_record->ObjectData.image.Version = 0xDBC01002; + object_record->ObjectData.image.Version = VERSION_MAGIC2; object_record->ObjectData.image.Type = ImageDataTypeMetafile; metafile_record = &object_record->ObjectData.image.ImageData.metafile; metafile_record->Type = ((GpMetafile*)image)->metafile_type; @@ -2581,7 +2581,7 @@ static GpStatus METAFILE_AddImageAttributesObject(GpMetafile *metafile, const Gp object_record->Header.Type = EmfPlusRecordTypeObject; object_record->Header.Flags = *id | (ObjectTypeImageAttributes << 8); attrs_record = &object_record->ObjectData.image_attributes; - attrs_record->Version = 0xDBC01002; + attrs_record->Version = VERSION_MAGIC2; attrs_record->Reserved1 = 0; attrs_record->WrapMode = attrs->wrap; attrs_record->ClampColor.Blue = attrs->outside_color & 0xff; @@ -2755,7 +2755,7 @@ static void METAFILE_FillBrushData(GpBrush *brush, EmfPlusBrush *data) { GpSolidFill *solid = (GpSolidFill*)brush; - data->Version = 0xDBC01002; + data->Version = VERSION_MAGIC2; data->Type = solid->brush.bt; data->BrushData.solid.SolidColor.Blue = solid->color & 0xff; data->BrushData.solid.SolidColor.Green = (solid->color >> 8) & 0xff; @@ -2848,7 +2848,7 @@ static GpStatus METAFILE_AddPenObject(GpMetafile *metafile, GpPen *pen, DWORD *i *id = METAFILE_AddObjectId(metafile); object_record->Header.Type = EmfPlusRecordTypeObject; object_record->Header.Flags = *id | ObjectTypePen << 8; - object_record->ObjectData.pen.Version = 0xDBC01002; + object_record->ObjectData.pen.Version = VERSION_MAGIC2; object_record->ObjectData.pen.Type = 0; pen_data = (EmfPlusPenData*)object_record->ObjectData.pen.data;

1 0

Nikolay Sivov : dwrite: Explicitly check rendering parameters pointer passed to DrawGlyphRun().
by Alexandre Julliard July 17, 2017

July 17, 2017

Module: wine Branch: master Commit: cef8a52deae6afd83c6d10ced727929bc199101c URL: http://source.winehq.org/git/wine.git/?a=commit;h=cef8a52deae6afd83c6d10ced… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jul 17 23:18:45 2017 +0300 dwrite: Explicitly check rendering parameters pointer passed to DrawGlyphRun(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/gdiinterop.c | 3 +++ dlls/dwrite/tests/font.c | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/dwrite/gdiinterop.c b/dlls/dwrite/gdiinterop.c index aa2e3a6..84921e6 100644 --- a/dlls/dwrite/gdiinterop.c +++ b/dlls/dwrite/gdiinterop.c @@ -328,6 +328,9 @@ static HRESULT WINAPI rendertarget_DrawGlyphRun(IDWriteBitmapRenderTarget1 *ifac if (!This->dib.ptr) return S_OK; + if (!params) + return E_INVALIDARG; + if (FAILED(hr = IDWriteFontFace_QueryInterface(run->fontFace, &IID_IDWriteFontFace2, (void **)&fontface2))) { WARN("Failed to get IDWriteFontFace2 interface, hr %#x.\n", hr); return hr; diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 52ce9f0..fe2d802 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -1337,7 +1337,6 @@ static void test_CreateBitmapRenderTarget(void) hr = IDWriteBitmapRenderTarget_DrawGlyphRun(target, 0.0f, 0.0f, DWRITE_MEASURING_MODE_NATURAL, &run, NULL, RGB(255, 0, 0), NULL); -todo_wine ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); hr = IDWriteBitmapRenderTarget_DrawGlyphRun(target, 0.0f, 0.0f, DWRITE_MEASURING_MODE_GDI_NATURAL + 1,

1 0