November 2012 - Wine-Commits

Piotr Caban : comctl32: Fixed RBBS_BREAK flag unsetting in REBAR_HandleUDDrag.
by Alexandre Julliard Nov. 1, 2012

Nov. 1, 2012

Module: wine Branch: master Commit: b6b7eb050fb357b8bc8499d1d1c27b73aa991345 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6b7eb050fb357b8bc8499d1d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Nov 1 15:28:18 2012 +0100 comctl32: Fixed RBBS_BREAK flag unsetting in REBAR_HandleUDDrag. --- dlls/comctl32/rebar.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c index 105363c..0ae69ef 100644 --- a/dlls/comctl32/rebar.c +++ b/dlls/comctl32/rebar.c @@ -2139,7 +2139,7 @@ REBAR_HandleUDDrag (REBAR_INFO *infoPtr, const POINT *ptsmove) if(iHitBand==0 && (infoPtr->uNumBands==1 || REBAR_GetBand(infoPtr, 1)->fStyle&RBBS_BREAK)) return; DPA_DeletePtr(infoPtr->bands, iHitBand); - hitBand->fStyle &= RBBS_BREAK; + hitBand->fStyle &= ~RBBS_BREAK; REBAR_GetBand(infoPtr, 0)->fStyle |= RBBS_BREAK; infoPtr->iGrabbedBand = DPA_InsertPtr( infoPtr->bands, 0, hitBand);

1 0

Frédéric Delanoy : cmd: Fix some leaks (coverity) .
by Alexandre Julliard Nov. 1, 2012

Nov. 1, 2012

Module: wine Branch: master Commit: 5108b189407e3e877ad342d61e0839bf08e5f1c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5108b189407e3e877ad342d61… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Nov 1 04:10:01 2012 +0100 cmd: Fix some leaks (coverity). --- programs/cmd/builtins.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index b3fd422..72d4f43 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -1403,6 +1403,7 @@ void WCMD_echo (const WCHAR *args) && origcommand[0]!=';') { if (echo_mode) WCMD_output (WCMD_LoadMessage(WCMD_ECHOPROMPT), onW); else WCMD_output (WCMD_LoadMessage(WCMD_ECHOPROMPT), offW); + HeapFree(GetProcessHeap(), 0, trimmed); return; } @@ -2930,7 +2931,7 @@ void WCMD_endlocal (void) { /* delete the current environment, totally */ env = GetEnvironmentStringsW (); - old = WCMD_dupenv (GetEnvironmentStringsW ()); + old = WCMD_dupenv (env); len = 0; while (old[len]) { n = strlenW(&old[len]) + 1;

1 0

Hiroshi Miura : wininet: Add a TLS fallback mechanism.
by Alexandre Julliard Nov. 1, 2012

Nov. 1, 2012

Module: wine Branch: master Commit: 923ac2e546e5f86afd319d944a0a249bc1fa1e4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=923ac2e546e5f86afd319d944… Author: Hiroshi Miura <miurahr(a)linux.com> Date: Wed Oct 31 22:29:26 2012 +0900 wininet: Add a TLS fallback mechanism. --- dlls/wininet/netconnection.c | 166 ++++++++++++++++++++++++++++++++---------- 1 files changed, 127 insertions(+), 39 deletions(-) diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index c944ff3..b746b54 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -124,8 +124,10 @@ MAKE_FUNCPTR(SSL_load_error_strings); MAKE_FUNCPTR(SSLv23_method); MAKE_FUNCPTR(SSL_CTX_free); MAKE_FUNCPTR(SSL_CTX_new); +MAKE_FUNCPTR(SSL_CTX_ctrl); MAKE_FUNCPTR(SSL_new); MAKE_FUNCPTR(SSL_free); +MAKE_FUNCPTR(SSL_ctrl); MAKE_FUNCPTR(SSL_set_fd); MAKE_FUNCPTR(SSL_connect); MAKE_FUNCPTR(SSL_shutdown); @@ -446,7 +448,50 @@ static int netconn_secure_verify(int preverify_ok, X509_STORE_CTX *ctx) return ret; } +static long get_tls_option(void) { + long tls_option = SSL_OP_NO_SSLv2; /* disable SSLv2 for security reason, secur32/Schannel(GnuTLS) don't support it */ +#ifdef SSL_OP_NO_TLSv1_2 + DWORD type, val, size; + HKEY hkey,tls12_client,tls11_client; + LONG res; + const WCHAR Schannel_Prot[] = { /* SYSTEM\\CurrentControlSet\\Control\\SecurityProviders\\SCANNEL\\Protocols */ + 'S','Y','S','T','E','M','\\', + 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', + 'C','o','n','t','r','o','l','\\', + 'S','e','c','u','r','i','t','y','P','r','o','v','i','d','e','r','s','\\', + 'S','C','H','A','N','N','E','L','\\', + 'P','r','o','t','o','c','o','l','s',0 }; + const WCHAR TLS12_Client[] = {'T','L','S',' ','1','.','2','\\','C','l','i','e','n','t',0}; + const WCHAR TLS11_Client[] = {'T','L','S',' ','1','.','1','\\','C','l','i','e','n','t',0}; + const WCHAR DisabledByDefault[] = {'D','i','s','a','b','l','e','d','B','y','D','e','f','a','u','l','t',0}; + + res = RegOpenKeyExW(HKEY_LOCAL_MACHINE, + Schannel_Prot, + 0, KEY_READ, &hkey); + if (res != ERROR_SUCCESS) { /* enabled TLSv1.1/1.2 when no registry entry */ + return tls_option; + } + if (RegOpenKeyExW(hkey, TLS12_Client, 0, KEY_READ, &tls12_client) == ERROR_SUCCESS) { + size = sizeof(DWORD); + if (RegQueryValueExW(tls12_client, DisabledByDefault, NULL, &type, (LPBYTE) &val, &size) == ERROR_SUCCESS + && type == REG_DWORD) { + tls_option |= val?SSL_OP_NO_TLSv1_2:0; + } + RegCloseKey(tls12_client); + } + if (RegOpenKeyExW(hkey, TLS11_Client, 0, KEY_READ, &tls11_client) == ERROR_SUCCESS) { + size = sizeof(DWORD); + if (RegQueryValueExW(tls11_client, DisabledByDefault, NULL, &type, (LPBYTE) &val, &size) == ERROR_SUCCESS + && type == REG_DWORD) { + tls_option |= val?SSL_OP_NO_TLSv1_1:0; + } + RegCloseKey(tls11_client); + } + RegCloseKey(hkey); #endif + return tls_option; +} +#endif /* SONAME_LIBSSL */ static CRITICAL_SECTION init_ssl_cs; static CRITICAL_SECTION_DEBUG init_ssl_cs_debug = @@ -491,8 +536,10 @@ static DWORD init_openssl(void) DYNSSL(SSLv23_method); DYNSSL(SSL_CTX_free); DYNSSL(SSL_CTX_new); + DYNSSL(SSL_CTX_ctrl); DYNSSL(SSL_new); DYNSSL(SSL_free); + DYNSSL(SSL_ctrl); DYNSSL(SSL_set_fd); DYNSSL(SSL_connect); DYNSSL(SSL_shutdown); @@ -534,12 +581,18 @@ static DWORD init_openssl(void) DYNCRYPTO(sk_value); #undef DYNCRYPTO +#define pSSL_CTX_set_options(ctx,op) \ + pSSL_CTX_ctrl((ctx),SSL_CTRL_OPTIONS,(op),NULL) +#define pSSL_set_options(ssl,op) \ + pSSL_ctrl((ssl),SSL_CTRL_OPTIONS,(op),NULL) + pSSL_library_init(); pSSL_load_error_strings(); pBIO_new_fp(stderr, BIO_NOCLOSE); /* FIXME: should use winedebug stuff */ meth = pSSLv23_method(); ctx = pSSL_CTX_new(meth); + pSSL_CTX_set_options(ctx, get_tls_option()); if(!pSSL_CTX_set_default_verify_paths(ctx)) { ERR("SSL_CTX_set_default_verify_paths failed: %s\n", pERR_error_string(pERR_get_error(), 0)); @@ -580,33 +633,10 @@ static DWORD init_openssl(void) #endif } -DWORD create_netconn(BOOL useSSL, server_t *server, DWORD security_flags, BOOL mask_errors, DWORD timeout, netconn_t **ret) +static DWORD create_netconn_socket(server_t *server, netconn_t *netconn, DWORD timeout) { - netconn_t *netconn; int result, flag; - if(useSSL) { - DWORD res; - - TRACE("using SSL connection\n"); - - EnterCriticalSection(&init_ssl_cs); - res = init_openssl(); - LeaveCriticalSection(&init_ssl_cs); - if(res != ERROR_SUCCESS) - return res; - } - - netconn = heap_alloc_zero(sizeof(*netconn)); - if(!netconn) - return ERROR_OUTOFMEMORY; - - netconn->useSSL = useSSL; - netconn->socketFD = -1; - netconn->security_flags = security_flags | server->security_flags; - netconn->mask_errors = mask_errors; - list_init(&netconn->pool_entry); - assert(server->addr_len); result = netconn->socketFD = socket(server->addr.ss_family, SOCK_STREAM, 0); if(result != -1) { @@ -656,11 +686,42 @@ DWORD create_netconn(BOOL useSSL, server_t *server, DWORD security_flags, BOOL m WARN("setsockopt(TCP_NODELAY) failed\n"); #endif + return ERROR_SUCCESS; +} + +DWORD create_netconn(BOOL useSSL, server_t *server, DWORD security_flags, BOOL mask_errors, DWORD timeout, netconn_t **ret) +{ + netconn_t *netconn; + int result; + + if(useSSL) { + DWORD res; + + TRACE("using SSL connection\n"); + + EnterCriticalSection(&init_ssl_cs); + res = init_openssl(); + LeaveCriticalSection(&init_ssl_cs); + if(res != ERROR_SUCCESS) + return res; + } + + netconn = heap_alloc_zero(sizeof(*netconn)); + if(!netconn) + return ERROR_OUTOFMEMORY; + + netconn->useSSL = useSSL; + netconn->socketFD = -1; + netconn->security_flags = security_flags | server->security_flags; + netconn->mask_errors = mask_errors; + list_init(&netconn->pool_entry); + + result = create_netconn_socket(server, netconn, timeout); server_addref(server); netconn->server = server; *ret = netconn; - return ERROR_SUCCESS; + return result; } void free_netconn(netconn_t *netconn) @@ -772,24 +833,13 @@ int sock_get_error( int err ) return err; } -/****************************************************************************** - * NETCON_secure_connect - * Initiates a secure connection over an existing plaintext connection. - */ -DWORD NETCON_secure_connect(netconn_t *connection) -{ - DWORD res = ERROR_NOT_SUPPORTED; #ifdef SONAME_LIBSSL +static DWORD netcon_secure_connect_setup(netconn_t *connection, long tls_option) +{ void *ssl_s; + DWORD res; int bits; - /* can't connect if we are already connected */ - if (connection->ssl_s) - { - ERR("already connected\n"); - return ERROR_INTERNET_CANNOT_CONNECT; - } - ssl_s = pSSL_new(ctx); if (!ssl_s) { @@ -798,6 +848,7 @@ DWORD NETCON_secure_connect(netconn_t *connection) return ERROR_OUTOFMEMORY; } + pSSL_set_options(ssl_s, tls_option); if (!pSSL_set_fd(ssl_s, connection->socketFD)) { ERR("SSL_set_fd failed: %s\n", @@ -843,6 +894,43 @@ fail: pSSL_shutdown(ssl_s); pSSL_free(ssl_s); } + return res; +} +#endif + +/****************************************************************************** + * NETCON_secure_connect + * Initiates a secure connection over an existing plaintext connection. + */ +DWORD NETCON_secure_connect(netconn_t *connection) +{ + DWORD res = ERROR_NOT_SUPPORTED; +#ifdef SONAME_LIBSSL + /* can't connect if we are already connected */ + if (connection->ssl_s) + { + ERR("already connected\n"); + return ERROR_INTERNET_CANNOT_CONNECT; + } + + /* connect with given TLS options */ + res = netcon_secure_connect_setup(connection, get_tls_option()); + if (res == ERROR_SUCCESS) + return res; + +#ifdef SSL_OP_NO_TLSv1_2 + /* FIXME: when got version alert and FIN from server */ + /* fallback to connect without TLSv1.1/TLSv1.2 */ + if (res == ERROR_INTERNET_SECURITY_CHANNEL_ERROR) + { + closesocket(connection->socketFD); + pSSL_CTX_set_options(ctx,SSL_OP_NO_TLSv1_1|SSL_OP_NO_TLSv1_2); + res = create_netconn_socket(connection->server, connection, 500); + if (res != ERROR_SUCCESS) + return res; + res = netcon_secure_connect_setup(connection, get_tls_option()|SSL_OP_NO_TLSv1_1|SSL_OP_NO_TLSv1_2); + } +#endif #endif return res; }

1 0

Nozomi Kodama : d3dx9_36: Add tests for D3DXSHRotateZ.
by Alexandre Julliard Nov. 1, 2012

Nov. 1, 2012

Module: wine Branch: master Commit: c59efbed77882fa549b03acd63263456ef581527 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c59efbed77882fa549b03acd6… Author: Nozomi Kodama <nozomi.kodama(a)yahoo.com> Date: Tue Oct 30 18:37:10 2012 -1000 d3dx9_36: Add tests for D3DXSHRotateZ. --- dlls/d3dx9_36/tests/math.c | 138 ++++++++++++++++++++++++++++++++------------ 1 files changed, 100 insertions(+), 38 deletions(-) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index a066ea8..533c6d7 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -2784,49 +2784,111 @@ static void test_D3DXSHRotate(void) static void test_D3DXSHRotateZ(void) { - unsigned int i, j, order, square; - FLOAT angle[] = { D3DX_PI / 3.0f, -D3DX_PI / 3.0f, 4.0f * D3DX_PI / 3.0f, }, expected, in[49], out[49], *received_ptr, table[] = - { /* Angle = D3DX_PI / 3.0f */ - 1.01f, 4.477762f, 3.010000f, 0.264289f, 5.297888f, 9.941864f, 7.010000f, -1.199813f, - -8.843789f, -10.010002f, 7.494040f, 18.138016f, 13.010000, -3.395966f, -17.039942f, - -16.009998f, -30.164297f, -18.010004f, 10.422242f, 29.066219f, 21.010000f, -6.324171f, - -27.968145f, -24.009998f, 2.226099f, -18.180565, -43.824551f, -28.010004f, 14.082493f, - 42.726471f, 31.010000f, -9.984426f, -41.628399f, -34.009995f, 5.886358f, 40.530331f, - /* Angle = D3DX_PI / 3.0f */ - 1.01f, -2.467762f, 3.010000f, 3.745711f, -10.307890f, -3.931864f, 7.010000f, 9.209813f, - -0.166214f, -10.010002f, -18.504044f, -6.128017f, 13.010000f, 17.405966f, 2.029938f, - -16.009998f, 13.154303f, -18.010004f, -29.432247f, -9.056221f, 21.010000f, 28.334169f, - 4.958139f, -24.010002f, -27.236092f, 44.190582f, 16.814558f, -28.009996f, -43.092499f, - -12.716474f, 31.010000f, 41.994423f, 8.618393f, -34.010002f, -40.896347f, -4.520310f, - /* Angle = 4.0f * D3DX_PI / 3.0f */ - 1.01f, -4.477762f, 3.010000f, -0.264289f, 5.297887f, -9.941864f, 7.010000f, 1.199814f, - -8.843788f, 10.010004f, 7.494038f, -18.138016f, 13.010000f, 3.395967f, -17.039940f, - 16.009996f, -30.164293f, 18.010006f, 10.422239f, -29.066219f, 21.010000f, 6.324172f, - -27.968143f, 24.009993f, 2.226105f, 18.180552f, -43.824543f, 28.010008f, 14.082489f, - -42.726471f, 31.010000f, 9.984427f, -41.628399f, 34.009987f, 5.886366f, -40.530327, }; + unsigned int end, i, j, l, order, square; + FLOAT expected, in[49], out[49], *out_temp, *received_ptr; + const FLOAT angle[] = { D3DX_PI / 3.0f, -D3DX_PI / 3.0f, 4.0f * D3DX_PI / 3.0f, }, table[] = + { /* Angle = D3DX_PI / 3.0f */ + 1.01f, 4.477762f, 3.010000f, 0.264289f, 5.297888f, 9.941864f, + 7.010000f, -1.199813f, -8.843789f, -10.010002f, 7.494040f, 18.138016f, + 13.010000, -3.395966f, -17.039942f, -16.009998f, -30.164297f, -18.010004f, + 10.422242f, 29.066219f, 21.010000f, -6.324171f, -27.968145f, -24.009998f, + 2.226099f, -18.180565, -43.824551f, -28.010004f, 14.082493f, 42.726471f, + 31.010000f, -9.984426f, -41.628399f, -34.009995f, 5.886358f, 40.530331f, + + 1.01f, 4.477762f, 0.0f, -5.816784f, 5.297888f, 6.936864f, + 0.0f, -9.011250f, -2.294052f, -10.010002f, 12.999042f, 12.133017f, + 0.0f, -15.761250f, -5.628748f, 0.0f, -30.164297f, 0.0f, + 19.927244f, 19.061220f, 0.0f, -24.761251f, -8.628748f, 0.0f, + -13.061530f, -18.180565f, -30.319553f, 0.0f, 28.587496f, 27.721474f, + 0.0f, -36.011253f, -12.378746f, 0.0f, -13.128758f, -23.617250f, + + 1.010000f, 3.977762f, 3.977762f, 1.114195f, 7.245791f, 10.559759f, + 10.559759f, -0.995160f, -0.467341f, 0.467339f, 12.765371f, 18.515701f, + 18.515701f, -1.797287f, 0.493916f, -0.493916f, -21.412342f, 21.412338f, + 9.221072f, 23.671757f, 23.671757f, 3.850195f, -20.468727f, 20.468723f, + -10.662103f, -36.516628f, -12.061245f, 12.061240f, 22.556875f, 38.999908f, + 38.999908f, -0.034875f, -10.427902f, 10.427900f, -36.838284f, -27.652803f, + /* Angle = -D3DX_PI / 3.0f */ + 1.01f, -2.467762f, 3.010000f, 3.745711f, -10.307890f, -3.931864f, + 7.010000f, 9.209813f, -0.166214f, -10.010002f, -18.504044f, -6.128017f, + 13.010000f, 17.405966f, 2.029938f, -16.009998f, 13.154303f, -18.010004f, + -29.432247f, -9.056221f, 21.010000f, 28.334169f, 4.958139f, -24.010002f, + -27.236092f, 44.190582f, 16.814558f, -28.009996f, -43.092499f, -12.716474f, + 31.010000f, 41.994423f, 8.618393f, -34.010002f, -40.896347f, -4.520310f, + + 1.01f, -2.467762f, 0.0f, -3.205718f, -10.307890f, -6.936864f, + 0.0f, -9.011250f, -4.463446f, -10.009998f, -12.999042f, -12.133017f, + 0.0f, -15.761250f, -5.628748f, 0.0f, 13.154303f, 0.0f, + -19.927244f, -19.061220f, 0.0f, -24.761251f, -8.628748f, 0.0f, + -5.695983f, 44.190582f, 30.319553f, 0.0f, -28.587496f, -27.721474f, + 0.0f, -36.011253f, -12.378746f, 0.0f, -13.128758f, -57.405258f, + + 1.010000f, -2.967762f, -2.967762f, -0.609195f, -7.498291f, -10.686009f, + -10.686009f, -11.836716f, 5.390780f, -5.390779f, -10.303651f, -17.284842f, + -17.284842f, -17.565643f, 4.114273f, -4.114273f, 23.716436f, -23.716433f, + -8.069025f, -23.095732f, -23.095732f, -18.535847f, -11.271107f, 11.271104f, + -2.072484f, 30.149330f, 15.244893f, -15.244888f, -20.965050f, -38.203999f, + -38.203999f, -37.258266f, 5.426677f, -5.426679f, -23.396751f, -9.903559f, + /* Angle = 4.0f * D3DX_PI / 3.0f */ + 1.01f, -4.477762f, 3.010000f, -0.264289f, 5.297887f, -9.941864f, + 7.010000f, 1.199814f, -8.843788f, 10.010004f, 7.494038f, -18.138016f, + 13.010000f, 3.395967f, -17.039940f, 16.009996f, -30.164293f, 18.010006f, + 10.422239f, -29.066219f, 21.010000f, 6.324172f, -27.968143f, 24.009993f, + 2.226105f, 18.180552f, -43.824543f, 28.010008f, 14.082489f, -42.726471f, + 31.010000f, 9.984427f, -41.628399f, 34.009987f, 5.886366f, -40.530327f, + + 1.01f, -4.477762f, 0.0f, -1.938928f, 5.297887f, -6.936864f, + 0.0f, -3.003751f, -2.294051f, 10.010004f, 12.999040f, -12.133017f, + 0.0f, -5.253751f, -5.628747f, 0.0f, -30.164293f, 0.0f, + 19.927242f, -19.061220f, 0.0f, -8.253753f, -8.628746f, 0.0f, + -13.061535f, 18.180552f, -30.319553f, 0.0f, 28.587492f, -27.721474f, + 0.0f, -12.003753f, -12.378742f, 0.0f, -13.128765f, -7.872400f, + + 1.010000f, -3.977762f, -3.977762f, 2.863566f, 6.371104f, -10.122416f, + -10.122416f, 10.578746f, -7.769295f, -7.769290f, 16.883686f, -20.574858f, + -20.574858f, 24.909130f, -5.726166f, -5.726164f, -18.796221f, -18.796211f, + 29.325350f, -33.723892f, -33.723892f, 42.258442f, -4.851232f, -4.851226f, + -2.533393f, 32.452259f, -46.545670f, -46.545654f, 51.860325f, -53.651630f, + -53.651630f, 71.738174f, 4.440616f, 4.440629f, 25.884174f, -10.748116f, }; + + for (l = 0; l < 3; l++) + { + if (l == 0) + out_temp = out; + else + out_temp = &in[l - 1]; - for (i = 0; i < 49; i++) - in[i] = i + 1.01f; + if (l < 2) + end = 49; + else + end = 48; - for (j = 0; j < 3; j++) - { - for (order = 0; order <= D3DXSH_MAXORDER + 1; order++) + for (j = 0; j < 3; j++) { - for (i = 0; i < 49; i++) - out[i] = ( i + 1.0f ) * ( i + 1.0f ); + for (order = 0; order <= D3DXSH_MAXORDER + 1; order++) + { + for (i = 0; i < 49; i++) + { + out[i] = ( i + 1.0f ) * ( i + 1.0f ); + in[i] = i + 1.01f; + } - received_ptr = D3DXSHRotateZ(out, order, angle[j], in); - ok(received_ptr == out, "angle %f, order %u, Expected %p, received %p\n", angle[j], order, out, received_ptr); + received_ptr = D3DXSHRotateZ(out_temp, order, angle[j], in); + ok(received_ptr == out_temp, "angle %f, order %u, expected %p, received %p\n", angle[j], order, out_temp, received_ptr); - for (i = 0; i < 49; i++) - { - /* order = 0 or order = 1 behaves like order = D3DXSH_MINORDER */ - square = ( order <= D3DXSH_MINORDER ) ? D3DXSH_MINORDER * D3DXSH_MINORDER : order * order; - if ( i >= square || ( (order >= D3DXSH_MAXORDER) && ( i >= D3DXSH_MAXORDER * D3DXSH_MAXORDER ) ) ) - expected = ( i + 1.0f ) * ( i + 1.0f ); - else - expected = table[36 * j + i]; - ok(relative_error(out[i], expected) < admitted_error, "angle %f, order %u index %u, Expected %f, received %f\n", angle[j], order, i, expected, out[i]); + for (i = 0; i < end; i++) + { + /* order = 0 or order = 1 behaves like order = D3DXSH_MINORDER */ + square = (order <= D3DXSH_MINORDER) ? D3DXSH_MINORDER * D3DXSH_MINORDER : order * order; + if (i >= square || ((order >= D3DXSH_MAXORDER) && (i >= D3DXSH_MAXORDER * D3DXSH_MAXORDER))) + if (l > 0) + expected = i + l + 0.01f; + else + expected = ( i + 1.0f ) * ( i + 1.0f ); + else + expected = table[36 * (l + 3 * j) + i]; + ok(relative_error(expected, out_temp[i]) < admitted_error, "angle %f, order %u index %u, expected %f, received %f\n", angle[j], order, i, expected, out_temp[i]); + } } } }

1 0

Piotr Caban : msvcrt: Improved parsing precision of doubles in scanf.
by Alexandre Julliard Nov. 1, 2012

Nov. 1, 2012

Module: wine Branch: master Commit: a9c6113c2806bd21d6769812d9aee47889cf6e51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9c6113c2806bd21d6769812d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Nov 1 15:27:29 2012 +0100 msvcrt: Improved parsing precision of doubles in scanf. This code is based on doubles parsing in jscript lexer. --- dlls/msvcrt/scanf.c | 1 + dlls/msvcrt/scanf.h | 141 ++++++++++++++++++++++++++------------------ dlls/msvcrt/tests/scanf.c | 6 ++ 3 files changed, 90 insertions(+), 58 deletions(-) diff --git a/dlls/msvcrt/scanf.c b/dlls/msvcrt/scanf.c index b998400..5dc6915 100644 --- a/dlls/msvcrt/scanf.c +++ b/dlls/msvcrt/scanf.c @@ -25,6 +25,7 @@ #include <stdarg.h> #include <limits.h> +#include <math.h> #include "windef.h" #include "winbase.h" diff --git a/dlls/msvcrt/scanf.h b/dlls/msvcrt/scanf.h index 3d02e8c..89fdac3 100644 --- a/dlls/msvcrt/scanf.h +++ b/dlls/msvcrt/scanf.h @@ -305,84 +305,109 @@ _FUNCTION_ { } } break; - case 'e': - case 'E': - case 'f': - case 'g': + case 'e': + case 'E': + case 'f': + case 'g': case 'G': { /* read a float */ - long double cur = 0; - int negative = 0; + long double cur; + ULONGLONG d, hlp; + int exp = 0, negative = 0; + /* skip initial whitespace */ while ((nch!=_EOF_) && _ISSPACE_(nch)) nch = _GETC_(file); - /* get sign. */ + + /* get sign. */ if (nch == '-' || nch == '+') { - negative = (nch=='-'); - if (width>0) width--; - if (width==0) break; + negative = (nch=='-'); + if (width>0) width--; + if (width==0) break; nch = _GETC_(file); } - /* get first digit. */ - if (*locinfo->lconv->decimal_point != nch) { - if (!_ISDIGIT_(nch)) break; - cur = (nch - '0'); - nch = _GETC_(file); - if (width>0) width--; - /* read until no more digits */ - while (width!=0 && (nch!=_EOF_) && _ISDIGIT_(nch)) { - cur = cur*10 + (nch - '0'); + + /* get first digit. */ + if (*locinfo->lconv->decimal_point != nch) { + if (!_ISDIGIT_(nch)) break; + d = nch - '0'; nch = _GETC_(file); - if (width>0) width--; - } - } else { - cur = 0; /* Fix: .8 -> 0.8 */ - } - /* handle decimals */ + if (width>0) width--; + /* read until no more digits */ + while (width!=0 && (nch!=_EOF_) && _ISDIGIT_(nch)) { + hlp = d*10 + nch - '0'; + nch = _GETC_(file); + if (width>0) width--; + if(d > (ULONGLONG)-1/10 || hlp<d) { + exp++; + break; + } + else + d = hlp; + } + while (width!=0 && (nch!=_EOF_) && _ISDIGIT_(nch)) { + exp++; + nch = _GETC_(file); + if (width>0) width--; + } + } else { + d = 0; /* Fix: .8 -> 0.8 */ + } + + /* handle decimals */ if (width!=0 && nch == *locinfo->lconv->decimal_point) { - long double dec = 1; nch = _GETC_(file); - if (width>0) width--; + if (width>0) width--; + + while (width!=0 && (nch!=_EOF_) && _ISDIGIT_(nch)) { + hlp = d*10 + nch - '0'; + nch = _GETC_(file); + if (width>0) width--; + if(d > (ULONGLONG)-1/10 || hlp<d) + break; + + d = hlp; + exp--; + } while (width!=0 && (nch!=_EOF_) && _ISDIGIT_(nch)) { - dec /= 10; - cur += dec * (nch - '0'); nch = _GETC_(file); - if (width>0) width--; + if (width>0) width--; } } - /* handle exponent */ - if (width!=0 && (nch == 'e' || nch == 'E')) { - int exponent = 0, negexp = 0; - float expcnt; + + /* handle exponent */ + if (width!=0 && (nch == 'e' || nch == 'E')) { + int sign = 1, e = 0; + nch = _GETC_(file); - if (width>0) width--; - /* possible sign on the exponent */ - if (width!=0 && (nch=='+' || nch=='-')) { - negexp = (nch=='-'); + if (width>0) width--; + if (width!=0 && (nch=='+' || nch=='-')) { + if(nch == '-') + sign = -1; nch = _GETC_(file); - if (width>0) width--; - } - /* exponent digits */ - while (width!=0 && (nch!=_EOF_) && _ISDIGIT_(nch)) { - exponent *= 10; - exponent += (nch - '0'); + if (width>0) width--; + } + + /* exponent digits */ + while (width!=0 && (nch!=_EOF_) && _ISDIGIT_(nch)) { + if(e > INT_MAX/10 || (e = e*10 + nch - '0')<0) + e = INT_MAX; nch = _GETC_(file); - if (width>0) width--; + if (width>0) width--; } - /* update 'cur' with this exponent. */ - expcnt = negexp ? .1 : 10; - while (exponent!=0) { - if (exponent&1) - cur*=expcnt; - exponent/=2; - expcnt=expcnt*expcnt; - } - } + e *= sign; + + if(exp<0 && e<0 && e+exp>0) exp = INT_MIN; + else if(exp>0 && e>0 && e+exp<0) exp = INT_MAX; + else exp += e; + } + + cur = (exp>=0 ? d*pow(10, exp) : d/pow(10, -exp)); st = 1; if (!suppress) { - if (L_prefix) _SET_NUMBER_(double); - else if (l_prefix) _SET_NUMBER_(double); - else _SET_NUMBER_(float); - } + if (L_prefix) _SET_NUMBER_(double); + else if (l_prefix) _SET_NUMBER_(double); + else _SET_NUMBER_(float); + } } break; /* According to msdn, diff --git a/dlls/msvcrt/tests/scanf.c b/dlls/msvcrt/tests/scanf.c index 7c9f8d4..b09e7df 100644 --- a/dlls/msvcrt/tests/scanf.c +++ b/dlls/msvcrt/tests/scanf.c @@ -110,6 +110,12 @@ static void test_sscanf( void ) ok(ret == 1, "expected 1, got %u\n", ret); ok(double_res == 32.715, "Got %lf, expected %lf\n", double_res, 32.715); + strcpy(buffer, "1.1e-30"); + ret = sscanf(buffer, "%lf", &double_res); + ok(ret == 1, "expected 1, got %u\n", ret); + ok(double_res >= 1.1e-30-1e-45 && double_res <= 1.1e-30+1e-45, + "Got %.18le, expected %.18le\n", double_res, 1.1e-30); + /* check strings */ ret = sprintf(buffer," %s", pname); ok( ret == 26, "expected 26, got %u\n", ret);

1 0

Vincent Povirk : gdiplus: Implement drawing metafiles with an emf handle.
by Alexandre Julliard Nov. 1, 2012

Nov. 1, 2012

Module: wine Branch: master Commit: 0cbec5508bf66542e1592aed50bbc52783cba27e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cbec5508bf66542e1592aed5… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Oct 31 13:36:00 2012 -0500 gdiplus: Implement drawing metafiles with an emf handle. --- dlls/gdiplus/graphics.c | 23 +++++++++++++++++++++-- dlls/gdiplus/tests/metafile.c | 8 ++++---- 2 files changed, 25 insertions(+), 6 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index c428b6b..7380c5d 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -3085,6 +3085,13 @@ GpStatus WINGDIPAPI GdipDrawImagePointsI(GpGraphics *graphics, GpImage *image, return GdipDrawImagePoints(graphics, image, ptf, count); } +static BOOL CALLBACK play_metafile_proc(EmfPlusRecordType record_type, unsigned int flags, + unsigned int dataSize, const unsigned char *pStr, void *userdata) +{ + GdipPlayMetafileRecord(userdata, record_type, flags, dataSize, pStr); + return TRUE; +} + GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image, GDIPCONST GpPointF *points, INT count, REAL srcx, REAL srcy, REAL srcwidth, REAL srcheight, GpUnit srcUnit, GDIPCONST GpImageAttributes* imageAttributes, @@ -3379,10 +3386,22 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image DeleteObject(hbitmap); } } + else if (image->type == ImageTypeMetafile && ((GpMetafile*)image)->hemf) + { + GpRectF rc; + + rc.X = srcx; + rc.Y = srcy; + rc.Width = srcwidth; + rc.Height = srcheight; + + return GdipEnumerateMetafileSrcRectDestPoints(graphics, (GpMetafile*)image, + points, count, &rc, srcUnit, play_metafile_proc, image, imageAttributes); + } else { - ERR("GpImage with no IPicture or HBITMAP?!\n"); - return NotImplemented; + WARN("GpImage with nothing we can draw (metafile in wrong state?)\n"); + return InvalidParameter; } return Ok; diff --git a/dlls/gdiplus/tests/metafile.c b/dlls/gdiplus/tests/metafile.c index 31374a5..f283c06 100644 --- a/dlls/gdiplus/tests/metafile.c +++ b/dlls/gdiplus/tests/metafile.c @@ -431,7 +431,7 @@ static void test_getdc(void) stat = GdipDrawImagePointsRect(graphics, (GpImage*)metafile, dst_points, 3, 0.0, 0.0, 100.0, 100.0, UnitPixel, NULL, NULL, NULL); - todo_wine expect(Ok, stat); + expect(Ok, stat); stat = GdipBitmapGetPixel(bitmap, 15, 15, &color); expect(Ok, stat); @@ -439,7 +439,7 @@ static void test_getdc(void) stat = GdipBitmapGetPixel(bitmap, 50, 50, &color); expect(Ok, stat); - todo_wine expect(0xff0000ff, color); + expect(0xff0000ff, color); stat = GdipDeleteGraphics(graphics); expect(Ok, stat); @@ -550,7 +550,7 @@ static void test_emfonly(void) stat = GdipDrawImagePointsRect(graphics, (GpImage*)metafile, dst_points, 3, 0.0, 0.0, 100.0, 100.0, UnitPixel, NULL, NULL, NULL); - todo_wine expect(Ok, stat); + expect(Ok, stat); stat = GdipBitmapGetPixel(bitmap, 15, 15, &color); expect(Ok, stat); @@ -558,7 +558,7 @@ static void test_emfonly(void) stat = GdipBitmapGetPixel(bitmap, 50, 50, &color); expect(Ok, stat); - todo_wine expect(0xff0000ff, color); + expect(0xff0000ff, color); stat = GdipDeleteGraphics(graphics); expect(Ok, stat);

1 0

Alexandre Julliard : gdi32: Store the fontconfig anti-aliasing flags for each font.
by Alexandre Julliard Nov. 1, 2012

Nov. 1, 2012

Module: wine Branch: master Commit: a04f73808e4eb707e703a92b68804c9303c4510c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a04f73808e4eb707e703a92b6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 1 12:35:52 2012 +0100 gdi32: Store the fontconfig anti-aliasing flags for each font. --- dlls/gdi32/freetype.c | 60 +++++++++++++++++++++++++++++++++++++----------- 1 files changed, 46 insertions(+), 14 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 183ce81..ca11968 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -191,7 +191,7 @@ static FT_Error (*pFT_Library_SetLcdFilter)(FT_Library, FT_LcdFilter); #ifdef SONAME_LIBFONTCONFIG #include <fontconfig/fontconfig.h> -MAKE_FUNCPTR(FcConfigGetCurrent); +MAKE_FUNCPTR(FcConfigSubstitute); MAKE_FUNCPTR(FcFontList); MAKE_FUNCPTR(FcFontSetDestroy); MAKE_FUNCPTR(FcInit); @@ -201,7 +201,9 @@ MAKE_FUNCPTR(FcObjectSetDestroy); MAKE_FUNCPTR(FcPatternCreate); MAKE_FUNCPTR(FcPatternDestroy); MAKE_FUNCPTR(FcPatternGetBool); +MAKE_FUNCPTR(FcPatternGetInteger); MAKE_FUNCPTR(FcPatternGetString); +MAKE_FUNCPTR(FcPatternPrint); #endif #undef MAKE_FUNCPTR @@ -271,6 +273,7 @@ typedef struct tagFace { BOOL vertical; Bitmap_Size size; /* set if face is a bitmap */ BOOL external; /* TRUE if we should manually add this font to the registry */ + DWORD aa_flags; struct tagFamily *family; /* Cached data for Enum */ struct enum_data *cached_enum_data; @@ -493,6 +496,7 @@ static const WCHAR face_width_value[] = {'W','i','d','t','h',0}; static const WCHAR face_size_value[] = {'S','i','z','e',0}; static const WCHAR face_x_ppem_value[] = {'X','p','p','e','m',0}; static const WCHAR face_y_ppem_value[] = {'Y','p','p','e','m',0}; +static const WCHAR face_aa_value[] = {'A','n','t','i','a','l','i','a','s','i','n','g',0}; static const WCHAR face_internal_leading_value[] = {'I','n','t','e','r','n','a','l',' ','L','e','a','d','i','n','g',0}; static const WCHAR face_font_sig_value[] = {'F','o','n','t',' ','S','i','g','n','a','t','u','r','e',0}; static const WCHAR face_file_name_value[] = {'F','i','l','e',' ','N','a','m','e','\0'}; @@ -1333,6 +1337,7 @@ static void load_face(HKEY hkey_face, WCHAR *face_name, Family *family, void *bu reg_load_dword(hkey_face, face_ntmflags_value, &face->ntmFlags); reg_load_dword(hkey_face, face_version_value, (DWORD*)&face->font_version); reg_load_dword(hkey_face, face_vertical_value, (DWORD*)&face->vertical); + reg_load_dword(hkey_face, face_aa_value, (DWORD*)&face->aa_flags); needed = sizeof(face->fs); RegQueryValueExW(hkey_face, face_font_sig_value, NULL, NULL, (BYTE*)&face->fs, &needed); @@ -1487,7 +1492,8 @@ static void add_face_to_cache(Face *face) reg_save_dword(hkey_face, face_index_value, face->face_index); reg_save_dword(hkey_face, face_ntmflags_value, face->ntmFlags); reg_save_dword(hkey_face, face_version_value, face->font_version); - reg_save_dword(hkey_face, face_vertical_value, face->vertical); + if (face->vertical) reg_save_dword(hkey_face, face_vertical_value, face->vertical); + if (face->aa_flags) reg_save_dword(hkey_face, face_aa_value, face->aa_flags); RegSetValueExW(hkey_face, face_font_sig_value, 0, REG_BINARY, (BYTE*)&face->fs, sizeof(face->fs)); @@ -1679,9 +1685,10 @@ static inline void get_fontsig( FT_Face ft_face, FONTSIGNATURE *fs ) #define ADDFONT_EXTERNAL_FONT 0x01 #define ADDFONT_FORCE_BITMAP 0x02 #define ADDFONT_ADD_TO_CACHE 0x04 +#define ADDFONT_AA_FLAGS(flags) ((flags) << 16) static Face *create_face( FT_Face ft_face, FT_Long face_index, const char *file, void *font_data_ptr, DWORD font_data_size, - DWORD flags, BOOL vertical ) + DWORD flags, BOOL vertical, DWORD aa_flags ) { Face *face = HeapAlloc( GetProcessHeap(), 0, sizeof(*face) ); My_FT_Bitmap_Size *size = (My_FT_Bitmap_Size *)ft_face->available_sizes; @@ -1739,6 +1746,7 @@ static Face *create_face( FT_Face ft_face, FT_Long face_index, const char *file, face->vertical = vertical; face->external = (flags & ADDFONT_EXTERNAL_FONT) != 0; + face->aa_flags = aa_flags; face->family = NULL; face->cached_enum_data = NULL; @@ -1751,12 +1759,12 @@ static Face *create_face( FT_Face ft_face, FT_Long face_index, const char *file, } static void AddFaceToList(FT_Face ft_face, const char *file, void *font_data_ptr, DWORD font_data_size, - FT_Long face_index, DWORD flags, BOOL vertical) + FT_Long face_index, DWORD flags, BOOL vertical, DWORD aa_flags ) { Face *face; Family *family; - face = create_face( ft_face, face_index, file, font_data_ptr, font_data_size, flags, vertical ); + face = create_face( ft_face, face_index, file, font_data_ptr, font_data_size, flags, vertical, aa_flags ); family = get_family( ft_face, vertical ); if (!insert_face_in_family_list( face, family )) { @@ -1852,6 +1860,7 @@ static INT AddFontToList(const char *file, void *font_data_ptr, DWORD font_data_ FT_Face ft_face; FT_Long face_index = 0, num_faces; INT ret = 0; + DWORD aa_flags = HIWORD( flags ); /* we always load external fonts from files - otherwise we would get a crash in update_reg_entries */ assert(file || !(flags & ADDFONT_EXTERNAL_FONT)); @@ -1888,12 +1897,12 @@ static INT AddFontToList(const char *file, void *font_data_ptr, DWORD font_data_ return 0; } - AddFaceToList(ft_face, file, font_data_ptr, font_data_size, face_index, flags, FALSE); + AddFaceToList(ft_face, file, font_data_ptr, font_data_size, face_index, flags, FALSE, aa_flags); ++ret; if (FT_HAS_VERTICAL(ft_face)) { - AddFaceToList(ft_face, file, font_data_ptr, font_data_size, face_index, flags, TRUE); + AddFaceToList(ft_face, file, font_data_ptr, font_data_size, face_index, flags, TRUE, aa_flags); ++ret; } @@ -2329,7 +2338,6 @@ static BOOL ReadFontDir(const char *dirname, BOOL external_fonts) static void load_fontconfig_fonts(void) { void *fc_handle = NULL; - FcConfig *config; FcPattern *pat; FcObjectSet *os; FcFontSet *fontset; @@ -2344,7 +2352,7 @@ static void load_fontconfig_fonts(void) return; } #define LOAD_FUNCPTR(f) if((p##f = wine_dlsym(fc_handle, #f, NULL, 0)) == NULL){WARN("Can't find symbol %s\n", #f); goto sym_not_found;} -LOAD_FUNCPTR(FcConfigGetCurrent); +LOAD_FUNCPTR(FcConfigSubstitute); LOAD_FUNCPTR(FcFontList); LOAD_FUNCPTR(FcFontSetDestroy); LOAD_FUNCPTR(FcInit); @@ -2354,25 +2362,33 @@ LOAD_FUNCPTR(FcObjectSetDestroy); LOAD_FUNCPTR(FcPatternCreate); LOAD_FUNCPTR(FcPatternDestroy); LOAD_FUNCPTR(FcPatternGetBool); +LOAD_FUNCPTR(FcPatternGetInteger); LOAD_FUNCPTR(FcPatternGetString); +LOAD_FUNCPTR(FcPatternPrint); #undef LOAD_FUNCPTR if(!pFcInit()) return; - - config = pFcConfigGetCurrent(); + pat = pFcPatternCreate(); os = pFcObjectSetCreate(); pFcObjectSetAdd(os, FC_FILE); pFcObjectSetAdd(os, FC_SCALABLE); - fontset = pFcFontList(config, pat, os); + pFcObjectSetAdd(os, FC_ANTIALIAS); + pFcObjectSetAdd(os, FC_RGBA); + fontset = pFcFontList(NULL, pat, os); if(!fontset) return; for(i = 0; i < fontset->nfont; i++) { FcBool scalable; + FcBool antialias; + int rgba; + DWORD aa_flags = 0; if(pFcPatternGetString(fontset->fonts[i], FC_FILE, 0, (FcChar8**)&file) != FcResultMatch) continue; TRACE("fontconfig: %s\n", file); + pFcConfigSubstitute( NULL, fontset->fonts[i], FcMatchFont ); + /* We're just interested in OT/TT fonts for now, so this hack just picks up the scalable fonts without extensions .pf[ab] to save time loading every other font */ @@ -2383,11 +2399,27 @@ LOAD_FUNCPTR(FcPatternGetString); continue; } + if (pFcPatternGetBool( fontset->fonts[i], FC_ANTIALIAS, 0, &antialias ) == FcResultMatch) + aa_flags = antialias ? GGO_GRAY4_BITMAP : GGO_BITMAP; + + if (pFcPatternGetInteger( fontset->fonts[i], FC_RGBA, 0, &rgba ) == FcResultMatch) + { + switch (rgba) + { + case FC_RGBA_RGB: aa_flags = WINE_GGO_HRGB_BITMAP; break; + case FC_RGBA_BGR: aa_flags = WINE_GGO_HBGR_BITMAP; break; + case FC_RGBA_VRGB: aa_flags = WINE_GGO_VRGB_BITMAP; break; + case FC_RGBA_VBGR: aa_flags = WINE_GGO_VBGR_BITMAP; break; + case FC_RGBA_NONE: aa_flags = GGO_GRAY4_BITMAP; break; + } + } + len = strlen( file ); if(len < 4) continue; ext = &file[ len - 3 ]; if(strcasecmp(ext, "pfa") && strcasecmp(ext, "pfb")) - AddFontToList(file, NULL, 0, ADDFONT_EXTERNAL_FONT | ADDFONT_ADD_TO_CACHE); + AddFontToList(file, NULL, 0, + ADDFONT_EXTERNAL_FONT | ADDFONT_ADD_TO_CACHE | ADDFONT_AA_FLAGS(aa_flags) ); } pFcFontSetDestroy(fontset); pFcObjectSetDestroy(os); @@ -2907,7 +2939,7 @@ static BOOL get_fontdir( const char *unix_name, struct fontdir *fd ) DWORD type; if (!ft_face) return FALSE; - face = create_face( ft_face, 0, unix_name, NULL, 0, 0, FALSE ); + face = create_face( ft_face, 0, unix_name, NULL, 0, 0, FALSE, 0 ); get_family_names( ft_face, &name, &english_name, FALSE ); family = create_family( name, english_name ); insert_face_in_family_list( face, family );

1 0

Alexandre Julliard : gdi32: Avoid some redundant registry calls while loading the font cache.
by Alexandre Julliard Nov. 1, 2012

Nov. 1, 2012

Module: wine Branch: master Commit: c1f8a0bf619d0100870b693a828e1759ced47db8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1f8a0bf619d0100870b693a8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 1 12:35:32 2012 +0100 gdi32: Avoid some redundant registry calls while loading the font cache. --- dlls/gdi32/freetype.c | 110 ++++++++++++++++++++----------------------------- 1 files changed, 45 insertions(+), 65 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 6af977c..58d3c5d 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1298,11 +1298,15 @@ static Family *create_family( WCHAR *name, WCHAR *english_name ) static LONG reg_load_dword(HKEY hkey, const WCHAR *value, DWORD *data) { - DWORD type, needed; - LONG r = RegQueryValueExW(hkey, value, NULL, &type, NULL, &needed); - if(r != ERROR_SUCCESS) return r; - if(type != REG_DWORD || needed != sizeof(DWORD)) return ERROR_BAD_CONFIGURATION; - return RegQueryValueExW(hkey, value, NULL, &type, (BYTE*)data, &needed); + DWORD type, size = sizeof(DWORD); + + if (RegQueryValueExW(hkey, value, NULL, &type, (BYTE *)data, &size) || + type != REG_DWORD || size != sizeof(DWORD)) + { + *data = 0; + return ERROR_BAD_CONFIGURATION; + } + return ERROR_SUCCESS; } static inline LONG reg_save_dword(HKEY hkey, const WCHAR *value, DWORD data) @@ -1310,30 +1314,26 @@ static inline LONG reg_save_dword(HKEY hkey, const WCHAR *value, DWORD data) return RegSetValueExW(hkey, value, 0, REG_DWORD, (BYTE*)&data, sizeof(DWORD)); } -static void load_face(HKEY hkey_face, WCHAR *face_name, Family *family) +static void load_face(HKEY hkey_face, WCHAR *face_name, Family *family, void *buffer, DWORD buffer_size) { - DWORD needed; - DWORD num_strikes, max_strike_key_len; + DWORD needed, strike_index = 0; + HKEY hkey_strike; /* If we have a File Name key then this is a real font, not just the parent key of a bunch of non-scalable strikes */ - if(RegQueryValueExA(hkey_face, "File Name", NULL, NULL, NULL, &needed) == ERROR_SUCCESS) + needed = buffer_size; + if(RegQueryValueExA(hkey_face, "File Name", NULL, NULL, buffer, &needed) == ERROR_SUCCESS) { Face *face; face = HeapAlloc(GetProcessHeap(), 0, sizeof(*face)); face->cached_enum_data = NULL; - face->file = HeapAlloc(GetProcessHeap(), 0, needed); - RegQueryValueExA(hkey_face, "File Name", NULL, NULL, (BYTE*)face->file, &needed); - + face->file = strdupA( buffer ); face->StyleName = strdupW(face_name); - if(RegQueryValueExW(hkey_face, face_full_name_value, NULL, NULL, NULL, &needed) == ERROR_SUCCESS) - { - WCHAR *fullName = HeapAlloc(GetProcessHeap(), 0, needed); - RegQueryValueExW(hkey_face, face_full_name_value, NULL, NULL, (BYTE*)fullName, &needed); - face->FullName = fullName; - } + needed = buffer_size; + if(RegQueryValueExW(hkey_face, face_full_name_value, NULL, NULL, buffer, &needed) == ERROR_SUCCESS) + face->FullName = strdupW( buffer ); else face->FullName = NULL; @@ -1374,57 +1374,41 @@ static void load_face(HKEY hkey_face, WCHAR *face_name, Family *family) TRACE("Added font %s %s\n", debugstr_w(family->FamilyName), debugstr_w(face->StyleName)); } - /* do we have any bitmap strikes? */ - RegQueryInfoKeyW(hkey_face, NULL, NULL, NULL, &num_strikes, &max_strike_key_len, NULL, NULL, - NULL, NULL, NULL, NULL); - if(num_strikes != 0) - { - WCHAR strike_name[10]; - DWORD strike_index = 0; + /* load bitmap strikes */ - needed = sizeof(strike_name) / sizeof(WCHAR); - while(RegEnumKeyExW(hkey_face, strike_index++, strike_name, &needed, - NULL, NULL, NULL, NULL) == ERROR_SUCCESS) + needed = buffer_size; + while (!RegEnumKeyExW(hkey_face, strike_index++, buffer, &needed, NULL, NULL, NULL, NULL)) + { + if (!RegOpenKeyExW(hkey_face, buffer, 0, KEY_ALL_ACCESS, &hkey_strike)) { - HKEY hkey_strike; - RegOpenKeyExW(hkey_face, strike_name, 0, KEY_ALL_ACCESS, &hkey_strike); - load_face(hkey_strike, face_name, family); + load_face(hkey_strike, face_name, family, buffer, buffer_size); RegCloseKey(hkey_strike); - needed = sizeof(strike_name) / sizeof(WCHAR); } + needed = buffer_size; } } static void load_font_list_from_cache(HKEY hkey_font_cache) { - DWORD max_family_key_len, size; - WCHAR *family_name; - DWORD family_index = 0; + DWORD size, family_index = 0; Family *family; HKEY hkey_family; + WCHAR buffer[4096]; - RegQueryInfoKeyW(hkey_font_cache, NULL, NULL, NULL, NULL, &max_family_key_len, NULL, NULL, - NULL, NULL, NULL, NULL); - family_name = HeapAlloc(GetProcessHeap(), 0, (max_family_key_len + 1) * sizeof(WCHAR)); - - size = max_family_key_len + 1; - while(RegEnumKeyExW(hkey_font_cache, family_index++, family_name, &size, - NULL, NULL, NULL, NULL) == ERROR_SUCCESS) + size = sizeof(buffer); + while (!RegEnumKeyExW(hkey_font_cache, family_index++, buffer, &size, NULL, NULL, NULL, NULL)) { WCHAR *english_family = NULL; + WCHAR *family_name = strdupW( buffer ); DWORD face_index = 0; - WCHAR *face_name; - DWORD max_face_key_len; RegOpenKeyExW(hkey_font_cache, family_name, 0, KEY_ALL_ACCESS, &hkey_family); TRACE("opened family key %s\n", debugstr_w(family_name)); - if(RegQueryValueExW(hkey_family, english_name_value, NULL, NULL, NULL, &size) == ERROR_SUCCESS) - { - english_family = HeapAlloc(GetProcessHeap(), 0, size); - RegQueryValueExW(hkey_family, english_name_value, NULL, NULL, (BYTE*)english_family, &size); - } + size = sizeof(buffer); + if (!RegQueryValueExW(hkey_family, english_name_value, NULL, NULL, (BYTE *)buffer, &size)) + english_family = strdupW( buffer ); - family = create_family(strdupW(family_name), english_family); + family = create_family(family_name, english_family); list_add_tail(&font_list, &family->entry); if(english_family) @@ -1437,27 +1421,23 @@ static void load_font_list_from_cache(HKEY hkey_font_cache) add_font_subst(&font_subst_list, subst, 0); } - RegQueryInfoKeyW(hkey_family, NULL, NULL, NULL, NULL, &max_face_key_len, NULL, NULL, - NULL, NULL, NULL, NULL); - - face_name = HeapAlloc(GetProcessHeap(), 0, (max_face_key_len + 1) * sizeof(WCHAR)); - size = max_face_key_len + 1; - while(RegEnumKeyExW(hkey_family, face_index++, face_name, &size, - NULL, NULL, NULL, NULL) == ERROR_SUCCESS) + size = sizeof(buffer); + while (!RegEnumKeyExW(hkey_family, face_index++, buffer, &size, NULL, NULL, NULL, NULL)) { + WCHAR *face_name = strdupW( buffer ); HKEY hkey_face; - RegOpenKeyExW(hkey_family, face_name, 0, KEY_ALL_ACCESS, &hkey_face); - load_face(hkey_face, face_name, family); - RegCloseKey(hkey_face); - size = max_face_key_len + 1; + if (!RegOpenKeyExW(hkey_family, face_name, 0, KEY_ALL_ACCESS, &hkey_face)) + { + load_face(hkey_face, face_name, family, buffer, sizeof(buffer)); + RegCloseKey(hkey_face); + } + HeapFree( GetProcessHeap(), 0, face_name ); + size = sizeof(buffer); } - HeapFree(GetProcessHeap(), 0, face_name); RegCloseKey(hkey_family); - size = max_family_key_len + 1; + size = sizeof(buffer); } - - HeapFree(GetProcessHeap(), 0, family_name); } static LONG create_font_cache_key(HKEY *hkey, DWORD *disposition)

1 0

Nikolay Sivov : msxml3: Fix indexed access to schema collection namespace uris.
by Alexandre Julliard Nov. 1, 2012

Nov. 1, 2012

Module: wine Branch: master Commit: 3d013afec7aad964224030c3832779185ae599a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d013afec7aad964224030c38… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 1 13:13:02 2012 -0400 msxml3: Fix indexed access to schema collection namespace uris. --- dlls/msxml3/msxml_private.h | 15 ++++++ dlls/msxml3/schema.c | 105 ++++++++++++++++++++++++++++++------------- 2 files changed, 89 insertions(+), 31 deletions(-) diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index 8468e55..503a580 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -404,6 +404,21 @@ static inline xmlChar *xmlchar_from_wchar( const WCHAR *str ) return xmlchar_from_wcharn(str, -1); } +static inline xmlChar *heap_strdupxmlChar(const xmlChar *str) +{ + xmlChar *ret = NULL; + + if(str) { + DWORD size; + + size = (xmlStrlen(str)+1)*sizeof(xmlChar); + ret = heap_alloc(size); + memcpy(ret, str, size); + } + + return ret; +} + #endif static inline HRESULT return_bstr(const WCHAR *value, BSTR *p) diff --git a/dlls/msxml3/schema.c b/dlls/msxml3/schema.c index 5d971f9..5626464 100644 --- a/dlls/msxml3/schema.c +++ b/dlls/msxml3/schema.c @@ -100,6 +100,9 @@ typedef struct MSXML_VERSION version; xmlHashTablePtr cache; + xmlChar **uris; + int allocated; + int count; VARIANT_BOOL validateOnLoad; int read_only; @@ -113,12 +116,6 @@ typedef struct LONG ref; } cache_entry; -typedef struct -{ - LONG index; - BSTR* out; -} cache_index_data; - /* datatypes lookup stuff * generated with help from gperf */ #define DT_MIN_STR_LEN 2 @@ -982,6 +979,55 @@ static void cache_free(void* data, xmlChar* name /* ignored */) cache_entry_release((cache_entry*)data); } +/* returns index or -1 if not found */ +static int cache_free_uri(schema_cache *cache, const xmlChar *uri) +{ + int i; + + for (i = 0; i < cache->count; i++) + if (xmlStrEqual(cache->uris[i], uri)) + { + heap_free(cache->uris[i]); + return i; + } + + return -1; +} + +static void cache_add_entry(schema_cache *cache, const xmlChar *uri, cache_entry *entry) +{ + int i; + + /* meaning no entry found with this name */ + if (xmlHashRemoveEntry(cache->cache, uri, cache_free)) + { + if (cache->count == cache->allocated) + { + cache->allocated *= 2; + cache->uris = heap_realloc(cache->uris, cache->allocated*sizeof(xmlChar*)); + } + i = cache->count++; + } + else + i = cache_free_uri(cache, uri); + + cache->uris[i] = heap_strdupxmlChar(uri); + xmlHashAddEntry(cache->cache, uri, entry); +} + +static void cache_remove_entry(schema_cache *cache, const xmlChar *uri) +{ + /* adjust index if entry was really removed */ + if (xmlHashRemoveEntry(cache->cache, uri, cache_free) == 0) + { + int i = cache_free_uri(cache, uri); + if (i == -1) return; + /* shift array */ + if (i != --cache->count) + memmove(&cache->uris[i], &cache->uris[i+1], (cache->count-i)*sizeof(xmlChar*)); + } +} + /* This one adds all namespaces defined in document to a cache, without anything associated with uri obviously. Unfortunately namespace:: axis implementation in libxml2 differs from what we need, @@ -1030,8 +1076,7 @@ HRESULT cache_from_doc_ns(IXMLDOMSchemaCollection2 *iface, xmlnode *node) entry->schema = NULL; entry->doc = NULL; - xmlHashRemoveEntry(This->cache, ns->href, cache_free); - xmlHashAddEntry(This->cache, ns->href, entry); + cache_add_entry(This, ns->href, entry); } pos++; } @@ -1088,6 +1133,11 @@ static ULONG WINAPI schema_cache_Release(IXMLDOMSchemaCollection2* iface) if (ref == 0) { + int i; + + for (i = 0; i < This->count; i++) + heap_free(This->uris[i]); + heap_free(This->uris); xmlHashFree(This->cache, cache_free); release_dispex(&This->dispex); heap_free(This); @@ -1143,7 +1193,7 @@ static HRESULT WINAPI schema_cache_add(IXMLDOMSchemaCollection2* iface, BSTR uri { case VT_NULL: { - xmlHashRemoveEntry(This->cache, name, cache_free); + cache_remove_entry(This, name); } break; @@ -1161,8 +1211,7 @@ static HRESULT WINAPI schema_cache_add(IXMLDOMSchemaCollection2* iface, BSTR uri return E_FAIL; } - xmlHashRemoveEntry(This->cache, name, cache_free); - xmlHashAddEntry(This->cache, name, entry); + cache_add_entry(This, name, entry); } break; @@ -1211,8 +1260,7 @@ static HRESULT WINAPI schema_cache_add(IXMLDOMSchemaCollection2* iface, BSTR uri return E_FAIL; } - xmlHashRemoveEntry(This->cache, name, cache_free); - xmlHashAddEntry(This->cache, name, entry); + cache_add_entry(This, name, entry); } break; @@ -1260,7 +1308,7 @@ static HRESULT WINAPI schema_cache_remove(IXMLDOMSchemaCollection2* iface, BSTR if (This->version == MSXML6) return E_NOTIMPL; - xmlHashRemoveEntry(This->cache, name, cache_free); + cache_remove_entry(This, name); heap_free(name); return S_OK; } @@ -1272,33 +1320,25 @@ static HRESULT WINAPI schema_cache_get_length(IXMLDOMSchemaCollection2* iface, L if (!length) return E_POINTER; - *length = xmlHashSize(This->cache); - return S_OK; -} -static void cache_index(void* data /* ignored */, void* index, xmlChar* name) -{ - cache_index_data* index_data = (cache_index_data*)index; - - if (index_data->index-- == 0) - *index_data->out = bstr_from_xmlChar(name); + *length = This->count; + return S_OK; } static HRESULT WINAPI schema_cache_get_namespaceURI(IXMLDOMSchemaCollection2* iface, - LONG index, BSTR* len) + LONG index, BSTR* uri) { schema_cache* This = impl_from_IXMLDOMSchemaCollection2(iface); - cache_index_data data = {index, len}; - TRACE("(%p)->(%i %p)\n", This, index, len); - if (!len) + TRACE("(%p)->(%i %p)\n", This, index, uri); + + if (!uri) return E_POINTER; - if (index >= xmlHashSize(This->cache)) + if (index >= This->count) return E_FAIL; - *len = NULL; - xmlHashScan(This->cache, cache_index, &data); + *uri = bstr_from_xmlChar(This->uris[index]); return S_OK; } @@ -1310,7 +1350,7 @@ static void cache_copy(void* data, void* dest, xmlChar* name) if (xmlHashLookup(This->cache, name) == NULL) { cache_entry_add_ref(entry); - xmlHashAddEntry(This->cache, name, entry); + cache_add_entry(This, name, entry); } } @@ -1528,6 +1568,9 @@ HRESULT SchemaCache_create(MSXML_VERSION version, IUnknown* outer, void** obj) This->IXMLDOMSchemaCollection2_iface.lpVtbl = &XMLDOMSchemaCollection2Vtbl; This->cache = xmlHashCreate(DEFAULT_HASHTABLE_SIZE); + This->allocated = 10; + This->count = 0; + This->uris = heap_alloc(This->allocated*sizeof(xmlChar*)); This->ref = 1; This->version = version; This->validateOnLoad = VARIANT_TRUE;

1 0

Vincent Povirk : gdiplus: Add tests for drawing recorded metafiles.
by Alexandre Julliard Nov. 1, 2012

Nov. 1, 2012

Module: wine Branch: master Commit: 954b49382ff2ef46c421ae9cb391a0ed249733fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=954b49382ff2ef46c421ae9cb… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Oct 31 13:24:20 2012 -0500 gdiplus: Add tests for drawing recorded metafiles. --- dlls/gdiplus/tests/metafile.c | 30 ++++++++++++++++++++++++++++++ 1 files changed, 30 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/metafile.c b/dlls/gdiplus/tests/metafile.c index 9530b0c..31374a5 100644 --- a/dlls/gdiplus/tests/metafile.c +++ b/dlls/gdiplus/tests/metafile.c @@ -426,6 +426,21 @@ static void test_getdc(void) expect(Ok, stat); expect(0, color); + stat = GdipBitmapSetPixel(bitmap, 15, 15, 0); + expect(Ok, stat); + + stat = GdipDrawImagePointsRect(graphics, (GpImage*)metafile, dst_points, 3, + 0.0, 0.0, 100.0, 100.0, UnitPixel, NULL, NULL, NULL); + todo_wine expect(Ok, stat); + + stat = GdipBitmapGetPixel(bitmap, 15, 15, &color); + expect(Ok, stat); + expect(0, color); + + stat = GdipBitmapGetPixel(bitmap, 50, 50, &color); + expect(Ok, stat); + todo_wine expect(0xff0000ff, color); + stat = GdipDeleteGraphics(graphics); expect(Ok, stat); @@ -530,6 +545,21 @@ static void test_emfonly(void) expect(Ok, stat); expect(0xff0000ff, color); + stat = GdipBitmapSetPixel(bitmap, 50, 50, 0); + expect(Ok, stat); + + stat = GdipDrawImagePointsRect(graphics, (GpImage*)metafile, dst_points, 3, + 0.0, 0.0, 100.0, 100.0, UnitPixel, NULL, NULL, NULL); + todo_wine expect(Ok, stat); + + stat = GdipBitmapGetPixel(bitmap, 15, 15, &color); + expect(Ok, stat); + expect(0, color); + + stat = GdipBitmapGetPixel(bitmap, 50, 50, &color); + expect(Ok, stat); + todo_wine expect(0xff0000ff, color); + stat = GdipDeleteGraphics(graphics); expect(Ok, stat);

1 0