November 2012 - Wine-commits

Daniel Lehman : msvcrt: Return value from MSVCRT____mb_cur_max_func instead of pointer.
by Alexandre Julliard 01 Nov '12

01 Nov '12

Module: wine Branch: master Commit: ffa7ac73317f3e89c05d2a07d8e63cdf037bd17e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffa7ac73317f3e89c05d2a07d… Author: Daniel Lehman <dlehman(a)esri.com> Date: Wed Oct 31 16:20:16 2012 -0700 msvcrt: Return value from MSVCRT____mb_cur_max_func instead of pointer. --- dlls/msvcrt/mbcs.c | 12 ++++++++++-- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/tests/locale.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 55 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 9623653..3c575e9 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -174,13 +174,21 @@ unsigned char* CDECL __p__mbctype(void) } /********************************************************************* - * ___mb_cur_max_func(MSVCRT.@) + * __p___mb_cur_max(MSVCRT.@) */ -int* CDECL MSVCRT____mb_cur_max_func(void) +int* CDECL __p___mb_cur_max(void) { return &get_locinfo()->mb_cur_max; } +/********************************************************************* + * ___mb_cur_max_func(MSVCRT.@) + */ +int CDECL MSVCRT____mb_cur_max_func(void) +{ + return get_locinfo()->mb_cur_max; +} + /* ___mb_cur_max_l_func - not exported in native msvcrt */ int* CDECL ___mb_cur_max_l_func(MSVCRT__locale_t locale) { diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 03181c0..f5cad22 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -221,7 +221,7 @@ @ cdecl __p___argc() @ cdecl __p___argv() @ cdecl __p___initenv() -@ cdecl __p___mb_cur_max() MSVCRT____mb_cur_max_func +@ cdecl __p___mb_cur_max() @ cdecl __p___wargv() @ cdecl __p___winitenv() @ cdecl __p__acmdln() diff --git a/dlls/msvcrt/tests/locale.c b/dlls/msvcrt/tests/locale.c index 225cbb9..73eeb91 100644 --- a/dlls/msvcrt/tests/locale.c +++ b/dlls/msvcrt/tests/locale.c @@ -25,6 +25,8 @@ static BOOL (__cdecl *p__crtGetStringTypeW)(DWORD, DWORD, const wchar_t*, int, WORD*); static int (__cdecl *pmemcpy_s)(void *, size_t, void*, size_t); +static int (__cdecl *p___mb_cur_max_func)(void); +static int *(__cdecl *p__p___mb_cur_max)(void); void* __cdecl _Gettnames(void); static void init(void) @@ -33,6 +35,8 @@ static void init(void) p__crtGetStringTypeW = (void*)GetProcAddress(hmod, "__crtGetStringTypeW"); pmemcpy_s = (void*)GetProcAddress(hmod, "memcpy_s"); + p___mb_cur_max_func = (void*)GetProcAddress(hmod, "___mb_cur_max_func"); + p__p___mb_cur_max = (void*)GetProcAddress(hmod, "__p___mb_cur_max"); } static void test_setlocale(void) @@ -738,6 +742,45 @@ static void test__Gettnames(void) setlocale(LC_ALL, "C"); } +static void test___mb_cur_max_func(void) +{ + int mb_cur_max; + + /* for newer Windows */ + if(!p___mb_cur_max_func) + win_skip("Skipping ___mb_cur_max_func tests\n"); + else { + mb_cur_max = p___mb_cur_max_func(); + ok(mb_cur_max == 1, "mb_cur_max = %d, expected 1\n", mb_cur_max); + + /* some old Windows don't set chinese */ + if (!setlocale(LC_ALL, "chinese")) + win_skip("Skipping test with chinese locale\n"); + else { + mb_cur_max = p___mb_cur_max_func(); + ok(mb_cur_max == 2, "mb_cur_max = %d, expected 2\n", mb_cur_max); + setlocale(LC_ALL, "C"); + } + } + + /* for older Windows */ + if (!p__p___mb_cur_max) + win_skip("Skipping __p___mb_cur_max tests\n"); + else { + mb_cur_max = *p__p___mb_cur_max(); + ok(mb_cur_max == 1, "mb_cur_max = %d, expected 1\n", mb_cur_max); + + /* some old Windows don't set chinese */ + if (!setlocale(LC_ALL, "chinese")) + win_skip("Skipping test with chinese locale\n"); + else { + mb_cur_max = *p__p___mb_cur_max(); + ok(mb_cur_max == 2, "mb_cur_max = %d, expected 2\n", mb_cur_max); + setlocale(LC_ALL, "C"); + } + } +} + START_TEST(locale) { init(); @@ -745,4 +788,5 @@ START_TEST(locale) test_crtGetStringTypeW(); test_setlocale(); test__Gettnames(); + test___mb_cur_max_func(); }

1 0

André Hentschel : winspool: Avoid memory leaks ( coverity).
by Alexandre Julliard 01 Nov '12

01 Nov '12

Module: wine Branch: master Commit: 2cefbaab97ef4536b58b2bf21192c4a2fdf042d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cefbaab97ef4536b58b2bf21… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Nov 1 16:08:29 2012 +0100 winspool: Avoid memory leaks (coverity). --- dlls/winspool.drv/info.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 7509a8e..af336cb 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -944,7 +944,11 @@ static BOOL CUPS_LoadPrinters(void) unlink_ppd( ppd ); } HeapFree( GetProcessHeap(), 0, ppd ); - if (!added_driver) continue; + if (!added_driver) + { + HeapFree( GetProcessHeap(), 0, port ); + continue; + } memset(&pi2, 0, sizeof(PRINTER_INFO_2W)); pi2.pPrinterName = nameW; @@ -2374,7 +2378,7 @@ LONG WINAPI DocumentPropertiesW(HWND hWnd, HANDLE hPrinter, { LPSTR pDeviceNameA = strdupWtoA(pDeviceName); - LPDEVMODEA pDevModeInputA = DEVMODEdupWtoA(pDevModeInput); + LPDEVMODEA pDevModeInputA; LPDEVMODEA pDevModeOutputA = NULL; LONG ret; @@ -2386,6 +2390,7 @@ LONG WINAPI DocumentPropertiesW(HWND hWnd, HANDLE hPrinter, if(ret < 0) return ret; pDevModeOutputA = HeapAlloc(GetProcessHeap(), 0, ret); } + pDevModeInputA = DEVMODEdupWtoA(pDevModeInput); ret = DocumentPropertiesA(hWnd, hPrinter, pDeviceNameA, pDevModeOutputA, pDevModeInputA, fMode); if(pDevModeOutput) {

1 0

Hiroshi Miura : wininet: Add a TLS fallback mechanism.
by Alexandre Julliard 01 Nov '12

01 Nov '12

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 01 Nov '12

01 Nov '12

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

Vincent Povirk : gdiplus: Add tests for drawing recorded metafiles.
by Alexandre Julliard 01 Nov '12

01 Nov '12

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

Vincent Povirk : gdiplus: Implement drawing metafiles with an emf handle.
by Alexandre Julliard 01 Nov '12

01 Nov '12

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

Vincent Povirk : gdiplus: Implement GdipCloneImage for metafiles with a handle.
by Alexandre Julliard 01 Nov '12

01 Nov '12

Module: wine Branch: master Commit: d8a855305f177ad2315a9c4840a6f174c5f90805 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8a855305f177ad2315a9c484… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Oct 31 14:33:50 2012 -0500 gdiplus: Implement GdipCloneImage for metafiles with a handle. --- dlls/gdiplus/image.c | 34 ++++++++++++++++++++++++++++++++-- dlls/gdiplus/tests/metafile.c | 24 ++++++++++++++++++++++++ 2 files changed, 56 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 3ee024c..3918301 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -1382,10 +1382,40 @@ GpStatus WINGDIPAPI GdipCloneImage(GpImage *image, GpImage **cloneImage) return stat; } + else if (image->type == ImageTypeMetafile && ((GpMetafile*)image)->hemf) + { + GpMetafile *result, *metafile; + + metafile = (GpMetafile*)image; + + result = GdipAlloc(sizeof(*result)); + if (!result) + return OutOfMemory; + + result->image.type = ImageTypeMetafile; + result->image.format = image->format; + result->image.flags = image->flags; + result->image.frame_count = 1; + result->image.xres = image->xres; + result->image.yres = image->yres; + result->bounds = metafile->bounds; + result->unit = metafile->unit; + result->metafile_type = metafile->metafile_type; + result->hemf = CopyEnhMetaFileW(metafile->hemf, NULL); + + if (!result->hemf) + { + GdipFree(result); + return OutOfMemory; + } + + *cloneImage = &result->image; + return Ok; + } else { - ERR("GpImage with no IPicture or bitmap?!\n"); - return NotImplemented; + WARN("GpImage with no image data (metafile in wrong state?)\n"); + return InvalidParameter; } } diff --git a/dlls/gdiplus/tests/metafile.c b/dlls/gdiplus/tests/metafile.c index f283c06..3366f0e 100644 --- a/dlls/gdiplus/tests/metafile.c +++ b/dlls/gdiplus/tests/metafile.c @@ -474,6 +474,7 @@ static void test_emfonly(void) { GpStatus stat; GpMetafile *metafile; + GpImage *clone; GpGraphics *graphics; HDC hdc, metafile_dc; HENHMETAFILE hemf; @@ -560,6 +561,29 @@ static void test_emfonly(void) expect(Ok, stat); expect(0xff0000ff, color); + stat = GdipCloneImage((GpImage*)metafile, &clone); + expect(Ok, stat); + + if (stat == Ok) + { + stat = GdipBitmapSetPixel(bitmap, 50, 50, 0); + expect(Ok, stat); + + stat = GdipDrawImagePointsRect(graphics, clone, dst_points, 3, + 0.0, 0.0, 100.0, 100.0, UnitPixel, NULL, NULL, NULL); + expect(Ok, stat); + + stat = GdipBitmapGetPixel(bitmap, 15, 15, &color); + expect(Ok, stat); + expect(0, color); + + stat = GdipBitmapGetPixel(bitmap, 50, 50, &color); + expect(Ok, stat); + expect(0xff0000ff, color); + + GdipDisposeImage(clone); + } + stat = GdipDeleteGraphics(graphics); expect(Ok, stat);

1 0

Vincent Povirk : gdiplus: Reimplement GdipCreateMetafileFromEmf without using IPicture.
by Alexandre Julliard 01 Nov '12

01 Nov '12

Module: wine Branch: master Commit: 91a3e5fc10b7fb0faae5498ae8bfb0d83478514b URL: http://source.winehq.org/git/wine.git/?a=commit;h=91a3e5fc10b7fb0faae5498ae… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Oct 31 15:37:16 2012 -0500 gdiplus: Reimplement GdipCreateMetafileFromEmf without using IPicture. --- dlls/gdiplus/gdiplus_private.h | 2 + dlls/gdiplus/graphics.c | 70 ++++++++++++++++------------------------ dlls/gdiplus/image.c | 3 +- dlls/gdiplus/metafile.c | 38 +++++++++++++++++++++ 4 files changed, 70 insertions(+), 43 deletions(-) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 53f978c..13a63e6 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -58,6 +58,7 @@ extern GpStatus METAFILE_GetGraphicsContext(GpMetafile* metafile, GpGraphics **r extern GpStatus METAFILE_GetDC(GpMetafile* metafile, HDC *hdc) DECLSPEC_HIDDEN; extern GpStatus METAFILE_ReleaseDC(GpMetafile* metafile, HDC hdc) DECLSPEC_HIDDEN; extern GpStatus METAFILE_GraphicsDeleted(GpMetafile* metafile) DECLSPEC_HIDDEN; +extern MetafileType METAFILE_GetEmfType(HENHMETAFILE hemf) DECLSPEC_HIDDEN; extern void calc_curve_bezier(CONST GpPointF *pts, REAL tension, REAL *x1, REAL *y1, REAL *x2, REAL *y2) DECLSPEC_HIDDEN; @@ -280,6 +281,7 @@ struct GpMetafile{ GpUnit unit; MetafileType metafile_type; HENHMETAFILE hemf; + int preserve_hemf; /* if true, hemf belongs to the app and should not be deleted */ /* recording */ HDC record_dc; diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 7380c5d..b3eaa86d 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2350,62 +2350,43 @@ GpStatus WINGDIPAPI GdipCreateFromHWNDICM(HWND hwnd, GpGraphics **graphics) GpStatus WINGDIPAPI GdipCreateMetafileFromEmf(HENHMETAFILE hemf, BOOL delete, GpMetafile **metafile) { - IStream *stream = NULL; - UINT read; - ENHMETAHEADER *copy; - GpStatus retval = Ok; + ENHMETAHEADER header; + MetafileType metafile_type; TRACE("(%p,%i,%p)\n", hemf, delete, metafile); if(!hemf || !metafile) return InvalidParameter; - read = GetEnhMetaFileBits(hemf, 0, NULL); - copy = GdipAlloc(read); - GetEnhMetaFileBits(hemf, read, (BYTE *)copy); - - if(CreateStreamOnHGlobal(copy, TRUE, &stream) != S_OK){ - ERR("could not make stream\n"); - GdipFree(copy); - retval = GenericError; - goto err; - } + if (GetEnhMetaFileHeader(hemf, sizeof(header), &header) == 0) + return GenericError; - *metafile = GdipAlloc(sizeof(GpMetafile)); - if(!*metafile){ - retval = OutOfMemory; - goto err; - } + metafile_type = METAFILE_GetEmfType(hemf); - if(OleLoadPicture(stream, 0, FALSE, &IID_IPicture, - (LPVOID*) &((*metafile)->image.picture)) != S_OK) - { - retval = GenericError; - goto err; - } + if (metafile_type == MetafileTypeInvalid) + return GenericError; + *metafile = GdipAlloc(sizeof(GpMetafile)); + if (!*metafile) + return OutOfMemory; (*metafile)->image.type = ImageTypeMetafile; - memcpy(&(*metafile)->image.format, &ImageFormatWMF, sizeof(GUID)); - (*metafile)->image.palette = NULL; - (*metafile)->image.xres = (REAL)copy->szlDevice.cx; - (*metafile)->image.yres = (REAL)copy->szlDevice.cy; - (*metafile)->bounds.X = (REAL)copy->rclBounds.left; - (*metafile)->bounds.Y = (REAL)copy->rclBounds.top; - (*metafile)->bounds.Width = (REAL)(copy->rclBounds.right - copy->rclBounds.left); - (*metafile)->bounds.Height = (REAL)(copy->rclBounds.bottom - copy->rclBounds.top); + (*metafile)->image.format = ImageFormatEMF; + (*metafile)->image.frame_count = 1; + (*metafile)->image.xres = (REAL)header.szlDevice.cx; + (*metafile)->image.yres = (REAL)header.szlDevice.cy; + (*metafile)->bounds.X = (REAL)header.rclBounds.left; + (*metafile)->bounds.Y = (REAL)header.rclBounds.top; + (*metafile)->bounds.Width = (REAL)(header.rclBounds.right - header.rclBounds.left); + (*metafile)->bounds.Height = (REAL)(header.rclBounds.bottom - header.rclBounds.top); (*metafile)->unit = UnitPixel; - - if(delete) - DeleteEnhMetaFile(hemf); + (*metafile)->metafile_type = metafile_type; + (*metafile)->hemf = hemf; + (*metafile)->preserve_hemf = !delete; TRACE("<-- %p\n", *metafile); -err: - if (retval != Ok) - GdipFree(*metafile); - IStream_Release(stream); - return retval; + return Ok; } GpStatus WINGDIPAPI GdipCreateMetafileFromWmf(HMETAFILE hwmf, BOOL delete, @@ -2431,7 +2412,8 @@ GpStatus WINGDIPAPI GdipCreateMetafileFromWmf(HMETAFILE hwmf, BOOL delete, hemf = SetWinMetaFileBits(read, copy, NULL, NULL); GdipFree(copy); - retval = GdipCreateMetafileFromEmf(hemf, FALSE, metafile); + /* FIXME: We should store and use hwmf instead of converting to hemf */ + retval = GdipCreateMetafileFromEmf(hemf, TRUE, metafile); if (retval == Ok) { @@ -2443,9 +2425,13 @@ GpStatus WINGDIPAPI GdipCreateMetafileFromWmf(HMETAFILE hwmf, BOOL delete, placeable->BoundingBox.Left); (*metafile)->bounds.Height = (REAL)(placeable->BoundingBox.Bottom - placeable->BoundingBox.Top); + (*metafile)->metafile_type = MetafileTypeWmfPlaceable; + (*metafile)->image.format = ImageFormatWMF; if (delete) DeleteMetaFile(hwmf); } + else + DeleteEnhMetaFile(hemf); return retval; } diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 3918301..73f08b9 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -2189,7 +2189,8 @@ static GpStatus free_image_data(GpImage *image) GpMetafile *metafile = (GpMetafile*)image; GdipFree(metafile->comment_data); DeleteEnhMetaFile(CloseEnhMetaFile(metafile->record_dc)); - DeleteEnhMetaFile(metafile->hemf); + if (!metafile->preserve_hemf) + DeleteEnhMetaFile(metafile->hemf); if (metafile->record_graphics) { WARN("metafile closed while recording\n"); diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 030b2a2..4345ece 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -548,3 +548,41 @@ GpStatus WINGDIPAPI GdipEnumerateMetafileSrcRectDestPoints(GpGraphics *graphics, return stat; } + +static int CALLBACK get_metafile_type_proc(HDC hDC, HANDLETABLE *lpHTable, const ENHMETARECORD *lpEMFR, + int nObj, LPARAM lpData) +{ + MetafileType *result = (MetafileType*)lpData; + + if (lpEMFR->iType == EMR_GDICOMMENT) + { + const EMRGDICOMMENT *comment = (const EMRGDICOMMENT*)lpEMFR; + + if (comment->cbData >= 4 && memcmp(comment->Data, "EMF+", 4) == 0) + { + const EmfPlusRecordHeader *header = (const EmfPlusRecordHeader*)&comment->Data[4]; + + if (4 + sizeof(EmfPlusRecordHeader) <= comment->cbData && + header->Type == EmfPlusRecordTypeHeader) + { + if ((header->Flags & 1) == 1) + *result = MetafileTypeEmfPlusDual; + else + *result = MetafileTypeEmfPlusOnly; + } + } + else + *result = MetafileTypeEmf; + } + else + *result = MetafileTypeEmf; + + return FALSE; +} + +MetafileType METAFILE_GetEmfType(HENHMETAFILE hemf) +{ + MetafileType result = MetafileTypeInvalid; + EnumEnhMetaFile(NULL, hemf, get_metafile_type_proc, &result, NULL); + return result; +}

1 0

Nikolay Sivov : dwrite: Support nine more script ranges up to code point 0x0bff.
by Alexandre Julliard 01 Nov '12

01 Nov '12

Module: wine Branch: master Commit: 4d2164c936d5d0a0c162761a5f25a24ffc48ec01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d2164c936d5d0a0c162761a5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 1 09:16:43 2012 -0400 dwrite: Support nine more script ranges up to code point 0x0bff. --- dlls/dwrite/analyzer.c | 29 +++++++++++++++++++ dlls/dwrite/tests/analyzer.c | 64 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 93 insertions(+), 0 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 0a0642a..6794c10 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -30,12 +30,21 @@ WINE_DEFAULT_DEBUG_CHANNEL(dwrite); enum scriptcode { Script_Arabic = 0, Script_Armenian = 1, + Script_Bengali = 3, Script_C1Controls = 12, Script_Coptic = 13, Script_Cyrillic = 16, + Script_Devanagari = 18, Script_Greek = 23, + Script_Gujarati = 24, + Script_Gurmukhi = 25, Script_Hebrew = 29, Script_Latin = 38, + Script_NKo = 48, + Script_Oriya = 53, + Script_Syriac = 64, + Script_Tamil = 68, + Script_Thaana = 70, Script_Symbol = 77, Script_Unknown = (UINT16)-1 }; @@ -87,6 +96,26 @@ static const struct script_range script_ranges[] = { { Script_Hebrew, 0x590, 0x5ff }, /* Arabic: U+0600–U+06FF */ { Script_Arabic, 0x600, 0x6ff }, + /* Syriac: U+0600–U+06FF */ + { Script_Syriac, 0x700, 0x74f }, + /* Arabic Supplement: U+0750–U+077F */ + { Script_Arabic, 0x750, 0x77f }, + /* Thaana: U+0780–U+07BF */ + { Script_Thaana, 0x780, 0x7bf }, + /* N'Ko: U+07C0–U+07FF */ + { Script_NKo, 0x7c0, 0x7ff }, + /* Devanagari: U+0900–U+097F */ + { Script_Devanagari, 0x900, 0x97f }, + /* Bengali: U+0980–U+09FF */ + { Script_Bengali, 0x980, 0x9ff }, + /* Gurmukhi: U+0A00–U+0A7F */ + { Script_Gurmukhi, 0xa00, 0xa7f }, + /* Gujarati: U+0A80–U+0AFF */ + { Script_Gujarati, 0xa80, 0xaff }, + /* Oriya: U+0B00–U+0B7F */ + { Script_Oriya, 0xb00, 0xb7f }, + /* Tamil: U+0B80–U+0BFF */ + { Script_Tamil, 0xb80, 0xbff }, /* unsupported range */ { Script_Unknown } }; diff --git a/dlls/dwrite/tests/analyzer.c b/dlls/dwrite/tests/analyzer.c index 648759f..dbd0307 100644 --- a/dlls/dwrite/tests/analyzer.c +++ b/dlls/dwrite/tests/analyzer.c @@ -399,12 +399,21 @@ struct sa_test { enum scriptcode { Script_Arabic = 0, Script_Armenian = 1, + Script_Bengali = 3, Script_C1Controls = 12, Script_Coptic = 13, Script_Cyrillic = 16, + Script_Devanagari = 18, Script_Greek = 23, + Script_Gujarati = 24, + Script_Gurmukhi = 25, Script_Hebrew = 29, Script_Latin = 38, + Script_NKo = 48, + Script_Oriya = 53, + Script_Syriac = 64, + Script_Tamil = 68, + Script_Thaana = 70, Script_Symbol = 77 }; @@ -532,6 +541,61 @@ static struct sa_test sa_tests[] = { { 9, 10, { Script_Hebrew, DWRITE_SCRIPT_SHAPES_DEFAULT } }, { 19, 10, { Script_Latin, DWRITE_SCRIPT_SHAPES_DEFAULT } }} }, + { + /* Syriac */ + {0x710,0x712,0x712,0x714,'.',0}, 1, + { { 0, 5, { Script_Syriac, DWRITE_SCRIPT_SHAPES_DEFAULT } }} + }, + { + /* Arabic Supplement */ + {0x750,0x760,0x76d,'.',0}, 1, + { { 0, 4, { Script_Arabic, DWRITE_SCRIPT_SHAPES_DEFAULT } }} + }, + { + /* Thaana */ + {0x780,0x78e,0x798,0x7a6,0x7b0,'.',0}, 1, + { { 0, 6, { Script_Thaana, DWRITE_SCRIPT_SHAPES_DEFAULT } }} + }, + { + /* N'Ko */ + {0x7c0,0x7ca,0x7e8,0x7eb,0x7f6,'.',0}, 1, + { { 0, 6, { Script_NKo, DWRITE_SCRIPT_SHAPES_DEFAULT } }} + }, + { + /* Thaana */ + {0x780,0x798,0x7a5,0x7a6,0x7b0,'.',0}, 1, + { { 0, 6, { Script_Thaana, DWRITE_SCRIPT_SHAPES_DEFAULT } }} + }, + { + /* Devanagari */ + {0x926,0x947,0x935,0x928,0x93e,0x917,0x930,0x940,'.',0}, 1, + { { 0, 9, { Script_Devanagari, DWRITE_SCRIPT_SHAPES_DEFAULT } }} + }, + { + /* Bengali */ + {0x9ac,0x9be,0x982,0x9b2,0x9be,'.',0}, 1, + { { 0, 6, { Script_Bengali, DWRITE_SCRIPT_SHAPES_DEFAULT } }} + }, + { + /* Gurmukhi */ + {0xa17,0xa41,0xa30,0xa2e,0xa41,0xa16,0xa40,'.',0}, 1, + { { 0, 8, { Script_Gurmukhi, DWRITE_SCRIPT_SHAPES_DEFAULT } }} + }, + { + /* Gujarati */ + {0xa97,0xac1,0xa9c,0xab0,0xabe,0xaa4,0xac0,'.',0}, 1, + { { 0, 8, { Script_Gujarati, DWRITE_SCRIPT_SHAPES_DEFAULT } }} + }, + { + /* Oriya */ + {0xb13,0xb21,0xb3c,0xb3f,0xb06,'.',0}, 1, + { { 0, 6, { Script_Oriya, DWRITE_SCRIPT_SHAPES_DEFAULT } }} + }, + { + /* Tamil */ + {0xba4,0xbae,0xbbf,0xbb4,0xbcd,'.',0}, 1, + { { 0, 6, { Script_Tamil, DWRITE_SCRIPT_SHAPES_DEFAULT } }} + }, /* keep this as end marker */ { {0} } };

1 0

Nikolay Sivov : msxml3: Fix indexed access to schema collection namespace uris.
by Alexandre Julliard 01 Nov '12

01 Nov '12

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