August 2015 - Wine-commits - list.winehq.org

Sebastian Lackner : vcomp/tests: Add tests for dynamic work scheduling.
by Alexandre Julliard 06 Aug '15

06 Aug '15

Module: wine Branch: master Commit: d3c8055b483323bb81c93125be68ac583038e7f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3c8055b483323bb81c93125b… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Aug 6 09:31:05 2015 +0200 vcomp/tests: Add tests for dynamic work scheduling. --- dlls/vcomp/tests/vcomp.c | 248 +++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 242 insertions(+), 6 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d3c8055b483323bb81c93…

1 0

Akihiro Sagawa : user.exe: Release the Win16 lock due to loading 32-bit dlls in CreateWindow.
by Alexandre Julliard 06 Aug '15

06 Aug '15

Module: wine Branch: master Commit: 9ac7bca209e1b11af898d1b393d13c8dc92c66e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ac7bca209e1b11af898d1b39… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Aug 3 23:48:47 2015 +0900 user.exe: Release the Win16 lock due to loading 32-bit dlls in CreateWindow. --- dlls/user.exe16/message.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/user.exe16/message.c b/dlls/user.exe16/message.c index 935b025..b5d9225 100644 --- a/dlls/user.exe16/message.c +++ b/dlls/user.exe16/message.c @@ -2648,11 +2648,17 @@ static DWORD wait_message16( DWORD count, const HANDLE *handles, DWORD timeout, */ HWND create_window16( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE instance, BOOL unicode ) { + DWORD lock; + HWND ret; + /* map to module handle */ if (instance && !((ULONG_PTR)instance >> 16)) instance = HINSTANCE_32( GetExePtr( HINSTANCE_16(instance) )); - return wow_handlers32.create_window( cs, className, instance, unicode ); + ReleaseThunkLock( &lock ); + ret = wow_handlers32.create_window( cs, className, instance, unicode ); + RestoreThunkLock( lock ); + return ret; }

1 0

Charles Davis : ws2_32: Implement setting the keep-alive idle timeout and interval on Mac OS.
by Alexandre Julliard 06 Aug '15

06 Aug '15

Module: wine Branch: master Commit: 4829989c19de47b7c64fb8f5deb9877d96602442 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4829989c19de47b7c64fb8f5d… Author: Charles Davis <cdavis5x(a)gmail.com> Date: Sun Aug 2 17:54:42 2015 -0600 ws2_32: Implement setting the keep-alive idle timeout and interval on Mac OS. --- dlls/ws2_32/socket.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index b06d7e7..79aaaf9 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -172,6 +172,11 @@ #define INADDR_NONE ~0UL #endif +#if !defined(TCP_KEEPIDLE) && defined(TCP_KEEPALIVE) +/* TCP_KEEPALIVE is the Mac OS name for TCP_KEEPIDLE */ +#define TCP_KEEPIDLE TCP_KEEPALIVE +#endif + WINE_DEFAULT_DEBUG_CHANNEL(winsock); WINE_DECLARE_DEBUG_CHANNEL(winediag); @@ -4459,14 +4464,23 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID fd = get_sock_fd(s, 0, NULL); if (setsockopt(fd, SOL_SOCKET, SO_KEEPALIVE, (void *)&keepalive, sizeof(int)) == -1) status = WSAEINVAL; -#if defined(TCP_KEEPIDLE) && defined(TCP_KEEPINTVL) +#if defined(TCP_KEEPIDLE) || defined(TCP_KEEPINTVL) /* these values need to be set only if SO_KEEPALIVE is enabled */ else if(keepalive) { +#ifndef TCP_KEEPIDLE + FIXME("ignoring keepalive timeout\n"); +#else if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPIDLE, (void *)&keepidle, sizeof(int)) == -1) status = WSAEINVAL; - else if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPINTVL, (void *)&keepintvl, sizeof(int)) == -1) + else +#endif +#ifdef TCP_KEEPINTVL + if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPINTVL, (void *)&keepintvl, sizeof(int)) == -1) status = WSAEINVAL; +#else + FIXME("ignoring keepalive interval\n"); +#endif } #else else

1 0

Piotr Caban : msvcp120: Fix tr2::sys:: _Copy_file test failures on non-ntfs file system.
by Alexandre Julliard 06 Aug '15

06 Aug '15

Module: wine Branch: master Commit: 47a3719f22ef870acc7a869a96d0612923c4c013 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47a3719f22ef870acc7a869a9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Aug 6 12:07:22 2015 +0200 msvcp120: Fix tr2::sys::_Copy_file test failures on non-ntfs file system. --- dlls/msvcp120/tests/msvcp120.c | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index 84eb096..762a261 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -558,18 +558,20 @@ static void test_tr2_sys__Copy_file(void) char const *dest; MSVCP_bool fail_if_exists; int last_error; + int last_error2; MSVCP_bool is_todo; } tests[] = { - { "f1", "f1_copy", TRUE, ERROR_SUCCESS, FALSE }, - { "f1", "tr2_test_dir\\f1_copy", TRUE, ERROR_SUCCESS, FALSE }, - { "f1", "tr2_test_dir\\f1_copy", TRUE, ERROR_FILE_EXISTS, FALSE }, - { "f1", "tr2_test_dir\\f1_copy", FALSE, ERROR_SUCCESS, FALSE }, - { "tr2_test_dir", "f1", TRUE, ERROR_ACCESS_DENIED, FALSE }, - { "tr2_test_dir", "tr2_test_dir_copy", TRUE, ERROR_ACCESS_DENIED, FALSE }, - { NULL, "f1", TRUE, ERROR_INVALID_PARAMETER, TRUE }, - { "f1", NULL, TRUE, ERROR_INVALID_PARAMETER, TRUE }, - { "not_exist", "tr2_test_dir", TRUE, ERROR_FILE_NOT_FOUND, FALSE }, - { "f1", "not_exist_dir\\f1_copy", TRUE, ERROR_PATH_NOT_FOUND, FALSE } + { "f1", "f1_copy", TRUE, ERROR_SUCCESS, ERROR_SUCCESS, FALSE }, + { "f1", "tr2_test_dir\\f1_copy", TRUE, ERROR_SUCCESS, ERROR_SUCCESS, FALSE }, + { "f1", "tr2_test_dir\\f1_copy", TRUE, ERROR_FILE_EXISTS, ERROR_FILE_EXISTS, FALSE }, + { "f1", "tr2_test_dir\\f1_copy", FALSE, ERROR_SUCCESS, ERROR_SUCCESS, FALSE }, + { "tr2_test_dir", "f1", TRUE, ERROR_ACCESS_DENIED, ERROR_ACCESS_DENIED, FALSE }, + { "tr2_test_dir", "tr2_test_dir_copy", TRUE, ERROR_ACCESS_DENIED, ERROR_ACCESS_DENIED, FALSE }, + { NULL, "f1", TRUE, ERROR_INVALID_PARAMETER, ERROR_INVALID_PARAMETER, TRUE }, + { "f1", NULL, TRUE, ERROR_INVALID_PARAMETER, ERROR_INVALID_PARAMETER, TRUE }, + { "not_exist", "tr2_test_dir", TRUE, ERROR_FILE_NOT_FOUND, ERROR_FILE_NOT_FOUND, FALSE }, + { "f1", "not_exist_dir\\f1_copy", TRUE, ERROR_PATH_NOT_FOUND, ERROR_FILE_NOT_FOUND, FALSE }, + { "f1", "tr2_test_dir", TRUE, ERROR_ACCESS_DENIED, ERROR_FILE_EXISTS, FALSE } }; ret = p_tr2_sys__Make_dir("tr2_test_dir"); @@ -585,17 +587,18 @@ static void test_tr2_sys__Copy_file(void) errno = 0xdeadbeef; ret = p_tr2_sys__Copy_file(tests[i].source, tests[i].dest, tests[i].fail_if_exists); if(tests[i].is_todo) - todo_wine ok(ret == tests[i].last_error, "test_tr2_sys__Copy_file(): test %d expect: %d, got %d\n", i+1, tests[i].last_error, ret); + todo_wine ok(ret == tests[i].last_error || ret == tests[i].last_error2, + "test_tr2_sys__Copy_file(): test %d expect: %d, got %d\n", + i+1, tests[i].last_error, ret); else - ok(ret == tests[i].last_error, "test_tr2_sys__Copy_file(): test %d expect: %d, got %d\n", i+1, tests[i].last_error, ret); + ok(ret == tests[i].last_error || ret == tests[i].last_error2, + "test_tr2_sys__Copy_file(): test %d expect: %d, got %d\n", + i+1, tests[i].last_error, ret); ok(errno == 0xdeadbeef, "test_tr2_sys__Copy_file(): test %d errno expect 0xdeadbeef, got %d\n", i+1, errno); if(ret == ERROR_SUCCESS) ok(p_tr2_sys__File_size(tests[i].source) == p_tr2_sys__File_size(tests[i].dest), "test_tr2_sys__Copy_file(): test %d failed, two files' size are not equal\n", i+1); } - ret = p_tr2_sys__Copy_file("f1", "tr2_test_dir", TRUE); - ok(ret==ERROR_ACCESS_DENIED || ret==ERROR_FILE_EXISTS, - "test_tr2_sys__Copy_file(): expect: ERROR_ACCESS_DENIED or ERROR_FILE_EXISTS, got %d\n", ret); ok(DeleteFileA("f1"), "expect f1 to exist\n"); ok(DeleteFileA("f1_copy"), "expect f1_copy to exist\n");

1 0

Hans Leidekker : mscms: Check the return value of a couple of liblcms2 calls.
by Alexandre Julliard 06 Aug '15

06 Aug '15

Module: wine Branch: master Commit: ee849808957773e8ad8b21c86b1f4b347b2f0cbf URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee849808957773e8ad8b21c86… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Aug 6 14:46:15 2015 +0200 mscms: Check the return value of a couple of liblcms2 calls. --- dlls/mscms/profile.c | 15 ++++++++++++--- dlls/mscms/transform.c | 22 ++++++++++++++++++---- 2 files changed, 30 insertions(+), 7 deletions(-) diff --git a/dlls/mscms/profile.c b/dlls/mscms/profile.c index eb9b4d0..f0c4087 100644 --- a/dlls/mscms/profile.c +++ b/dlls/mscms/profile.c @@ -1152,7 +1152,7 @@ BOOL WINAPI IsColorProfileTagPresent( HPROFILE handle, TAGTYPE type, PBOOL prese release_profile( profile ); return FALSE; } - *present = cmsIsTag( profile->cmsprofile, type ); + *present = (cmsIsTag( profile->cmsprofile, type ) != 0); release_profile( profile ); ret = TRUE; @@ -1406,7 +1406,11 @@ HPROFILE WINAPI OpenColorProfileW( PPROFILE profile, DWORD access, DWORD sharing if (!(data = HeapAlloc( GetProcessHeap(), 0, profile->cbDataSize ))) return NULL; memcpy( data, profile->pProfileData, profile->cbDataSize ); - cmsprofile = cmsOpenProfileFromMem( data, profile->cbDataSize ); + if (!(cmsprofile = cmsOpenProfileFromMem( data, profile->cbDataSize ))) + { + HeapFree( GetProcessHeap(), 0, data ); + return FALSE; + } size = profile->cbDataSize; } else if (profile->dwType == PROFILE_FILENAME) @@ -1464,7 +1468,12 @@ HPROFILE WINAPI OpenColorProfileW( PPROFILE profile, DWORD access, DWORD sharing HeapFree( GetProcessHeap(), 0, data ); return NULL; } - cmsprofile = cmsOpenProfileFromMem( data, size ); + if (!(cmsprofile = cmsOpenProfileFromMem( data, size ))) + { + CloseHandle( handle ); + HeapFree( GetProcessHeap(), 0, data ); + return NULL; + } } else { diff --git a/dlls/mscms/transform.c b/dlls/mscms/transform.c index aed7011..058cffa 100644 --- a/dlls/mscms/transform.c +++ b/dlls/mscms/transform.c @@ -175,6 +175,12 @@ HTRANSFORM WINAPI CreateColorTransformW( LPLOGCOLORSPACEW space, HPROFILE dest, cmsoutput = dst->cmsprofile; transform.cmstransform = cmsCreateProofingTransform(cmsinput, in_format, cmsoutput, out_format, cmstarget, intent, INTENT_ABSOLUTE_COLORIMETRIC, proofing); + if (!transform.cmstransform) + { + if (tgt) release_profile( tgt ); + release_profile( dst ); + return FALSE; + } ret = create_transform( &transform ); @@ -254,9 +260,15 @@ HTRANSFORM WINAPI CreateMultiProfileTransform( PHPROFILE profiles, DWORD nprofil { cmsprofiles[1] = profile1->cmsprofile; } - transform.cmstransform = cmsCreateMultiprofileTransform( cmsprofiles, nprofiles, in_format, out_format, *intents, 0 ); - + transform.cmstransform = cmsCreateMultiprofileTransform( cmsprofiles, nprofiles, in_format, + out_format, *intents, 0 ); HeapFree( GetProcessHeap(), 0, cmsprofiles ); + if (!transform.cmstransform) + { + release_profile( profile0 ); + release_profile( profile1 ); + return FALSE; + } ret = create_transform( &transform ); } @@ -327,7 +339,8 @@ BOOL WINAPI TranslateBitmapBits( HTRANSFORM handle, PVOID srcbits, BMFORMAT inpu outputstride, callback, data ); if (!transform) return FALSE; - cmsChangeBuffersFormat( transform->cmstransform, from_bmformat(input), from_bmformat(output) ); + if (!cmsChangeBuffersFormat( transform->cmstransform, from_bmformat(input), from_bmformat(output) )) + return FALSE; cmsDoTransform( transform->cmstransform, srcbits, destbits, width * height ); release_transform( transform ); @@ -368,7 +381,8 @@ BOOL WINAPI TranslateColors( HTRANSFORM handle, PCOLOR in, DWORD count, if (!transform) return FALSE; xfrm = transform->cmstransform; - cmsChangeBuffersFormat( xfrm, from_type(input_type), from_type(output_type) ); + if (!cmsChangeBuffersFormat( xfrm, from_type(input_type), from_type(output_type) )) + return FALSE; switch (input_type) {

1 0

Hans Leidekker : mscms: Let liblcms2 determine input and output format for transform profiles.
by Alexandre Julliard 06 Aug '15

06 Aug '15

Module: wine Branch: master Commit: d2c9e5560a2aa13319e2ea3e8ea8899e5aea1f55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2c9e5560a2aa13319e2ea3e8… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Aug 6 14:46:34 2015 +0200 mscms: Let liblcms2 determine input and output format for transform profiles. --- dlls/mscms/tests/profile.c | 37 ++++++++++++++++ dlls/mscms/transform.c | 102 +++++++++++++++------------------------------ 2 files changed, 71 insertions(+), 68 deletions(-) diff --git a/dlls/mscms/tests/profile.c b/dlls/mscms/tests/profile.c index 012a7dc..f3ebe03 100644 --- a/dlls/mscms/tests/profile.c +++ b/dlls/mscms/tests/profile.c @@ -35,6 +35,8 @@ static HMODULE huser32; static BOOL (WINAPI *pAssociateColorProfileWithDeviceA)(PCSTR,PCSTR,PCSTR); static BOOL (WINAPI *pCloseColorProfile)(HPROFILE); +static HTRANSFORM (WINAPI *pCreateMultiProfileTransform)(PHPROFILE,DWORD,PDWORD,DWORD,DWORD,DWORD); +static BOOL (WINAPI *pDeleteColorTransform)(HTRANSFORM); static BOOL (WINAPI *pDisassociateColorProfileFromDeviceA)(PCSTR,PCSTR,PCSTR); static BOOL (WINAPI *pGetColorDirectoryA)(PCHAR,PCHAR,PDWORD); static BOOL (WINAPI *pGetColorDirectoryW)(PWCHAR,PWCHAR,PDWORD); @@ -68,6 +70,8 @@ static BOOL init_function_ptrs( void ) { GETFUNCPTR( AssociateColorProfileWithDeviceA ) GETFUNCPTR( CloseColorProfile ) + GETFUNCPTR( CreateMultiProfileTransform ) + GETFUNCPTR( DeleteColorTransform ) GETFUNCPTR( DisassociateColorProfileFromDeviceA ) GETFUNCPTR( GetColorDirectoryA ) GETFUNCPTR( GetColorDirectoryW ) @@ -1334,6 +1338,38 @@ static BOOL have_profile(void) return TRUE; } +static void test_CreateMultiProfileTransform( char *standardprofile, char *testprofile ) +{ + PROFILE profile; + HPROFILE handle[2]; + HTRANSFORM transform; + DWORD intents[2] = { INTENT_PERCEPTUAL, INTENT_PERCEPTUAL }; + + if (testprofile) + { + profile.dwType = PROFILE_FILENAME; + profile.pProfileData = standardprofile; + profile.cbDataSize = strlen(standardprofile); + + handle[0] = pOpenColorProfileA( &profile, PROFILE_READ, 0, OPEN_EXISTING ); + ok( handle[0] != NULL, "got %u\n", GetLastError() ); + + profile.dwType = PROFILE_FILENAME; + profile.pProfileData = testprofile; + profile.cbDataSize = strlen(testprofile); + + handle[1] = pOpenColorProfileA( &profile, PROFILE_READ, 0, OPEN_EXISTING ); + ok( handle[1] != NULL, "got %u\n", GetLastError() ); + + transform = pCreateMultiProfileTransform( handle, 2, intents, 2, 0, 0 ); + ok( transform != NULL, "got %u\n", GetLastError() ); + + pDeleteColorTransform( transform ); + pCloseColorProfile( handle[0] ); + pCloseColorProfile( handle[1] ); + } +} + START_TEST(profile) { UINT len; @@ -1443,6 +1479,7 @@ START_TEST(profile) test_UninstallColorProfileW( testprofileW ); test_AssociateColorProfileWithDeviceA( testprofile ); + test_CreateMultiProfileTransform( standardprofile, testprofile ); if (testprofile) DeleteFileA( testprofile ); FreeLibrary( huser32 ); diff --git a/dlls/mscms/transform.c b/dlls/mscms/transform.c index 058cffa..cada332 100644 --- a/dlls/mscms/transform.c +++ b/dlls/mscms/transform.c @@ -36,64 +36,51 @@ WINE_DEFAULT_DEBUG_CHANNEL(mscms); #ifdef HAVE_LCMS2 -static DWORD from_profile( HPROFILE profile ) -{ - PROFILEHEADER header; - - GetColorProfileHeader( profile, &header ); - TRACE( "color space: 0x%08x %s\n", header.phDataColorSpace, dbgstr_tag( header.phDataColorSpace ) ); - - switch (header.phDataColorSpace) - { - case 0x434d594b: return TYPE_CMYK_16; /* 'CMYK' */ - case 0x47524159: return TYPE_GRAY_16; /* 'GRAY' */ - case 0x4c616220: return TYPE_Lab_16; /* 'Lab ' */ - case 0x52474220: return TYPE_RGB_16; /* 'RGB ' */ - case 0x58595a20: return TYPE_XYZ_16; /* 'XYZ ' */ - default: - WARN("unhandled format\n"); - return TYPE_RGB_16; - } -} - static DWORD from_bmformat( BMFORMAT format ) { static BOOL quietfixme = FALSE; - TRACE( "bitmap format: 0x%08x\n", format ); + DWORD ret; switch (format) { - case BM_RGBTRIPLETS: return TYPE_RGB_8; - case BM_BGRTRIPLETS: return TYPE_BGR_8; - case BM_GRAY: return TYPE_GRAY_8; - case BM_xRGBQUADS: return TYPE_ARGB_8; - case BM_xBGRQUADS: return TYPE_ABGR_8; + case BM_RGBTRIPLETS: ret = TYPE_RGB_8; break; + case BM_BGRTRIPLETS: ret = TYPE_BGR_8; break; + case BM_GRAY: ret = TYPE_GRAY_8; break; + case BM_xRGBQUADS: ret = TYPE_ARGB_8; break; + case BM_xBGRQUADS: ret = TYPE_ABGR_8; break; default: if (!quietfixme) { - FIXME("unhandled bitmap format 0x%x\n", format); + FIXME( "unhandled bitmap format %08x\n", format ); quietfixme = TRUE; } - return TYPE_RGB_8; + ret = TYPE_RGB_8; + break; } + TRACE( "color space: %08x -> %08x\n", format, ret ); + return ret; } static DWORD from_type( COLORTYPE type ) { - TRACE( "color type: 0x%08x\n", type ); + DWORD ret; switch (type) { - case COLOR_GRAY: return TYPE_GRAY_16; - case COLOR_RGB: return TYPE_RGB_16; - case COLOR_XYZ: return TYPE_XYZ_16; - case COLOR_Yxy: return TYPE_Yxy_16; - case COLOR_Lab: return TYPE_Lab_16; - case COLOR_CMYK: return TYPE_CMYK_16; + case COLOR_GRAY: ret = TYPE_GRAY_16; break; + case COLOR_RGB: ret = TYPE_RGB_16; break; + case COLOR_XYZ: ret = TYPE_XYZ_16; break; + case COLOR_Yxy: ret = TYPE_Yxy_16; break; + case COLOR_Lab: ret = TYPE_Lab_16; break; + case COLOR_CMYK: ret = TYPE_CMYK_16; break; default: - FIXME("unhandled color type\n"); - return TYPE_RGB_16; + FIXME( "unhandled color type %08x\n", type ); + ret = TYPE_RGB_16; + break; } + + TRACE( "color type: %08x -> %08x\n", type, ret ); + return ret; } #endif /* HAVE_LCMS2 */ @@ -145,7 +132,7 @@ HTRANSFORM WINAPI CreateColorTransformW( LPLOGCOLORSPACEW space, HPROFILE dest, struct transform transform; struct profile *dst, *tgt = NULL; cmsHPROFILE cmsinput, cmsoutput, cmstarget = NULL; - DWORD in_format, out_format, proofing = 0; + DWORD proofing = 0; int intent; TRACE( "( %p, %p, %p, 0x%08x )\n", space, dest, target, flags ); @@ -163,9 +150,6 @@ HTRANSFORM WINAPI CreateColorTransformW( LPLOGCOLORSPACEW space, HPROFILE dest, TRACE( "lcsCSType: %s\n", dbgstr_tag( space->lcsCSType ) ); TRACE( "lcsFilename: %s\n", debugstr_w( space->lcsFilename ) ); - in_format = TYPE_RGB_16; - out_format = from_profile( dest ); - cmsinput = cmsCreate_sRGBProfile(); /* FIXME: create from supplied color space */ if (target) { @@ -173,8 +157,9 @@ HTRANSFORM WINAPI CreateColorTransformW( LPLOGCOLORSPACEW space, HPROFILE dest, cmstarget = tgt->cmsprofile; } cmsoutput = dst->cmsprofile; - transform.cmstransform = cmsCreateProofingTransform(cmsinput, in_format, cmsoutput, out_format, cmstarget, - intent, INTENT_ABSOLUTE_COLORIMETRIC, proofing); + transform.cmstransform = cmsCreateProofingTransform(cmsinput, 0, cmsoutput, 0, cmstarget, + intent, INTENT_ABSOLUTE_COLORIMETRIC, + proofing); if (!transform.cmstransform) { if (tgt) release_profile( tgt ); @@ -212,10 +197,9 @@ HTRANSFORM WINAPI CreateMultiProfileTransform( PHPROFILE profiles, DWORD nprofil { HTRANSFORM ret = NULL; #ifdef HAVE_LCMS2 - cmsHPROFILE *cmsprofiles, cmsconvert = NULL; + cmsHPROFILE *cmsprofiles; struct transform transform; struct profile *profile0, *profile1; - DWORD in_format, out_format; TRACE( "( %p, 0x%08x, %p, 0x%08x, 0x%08x, 0x%08x )\n", profiles, nprofiles, intents, nintents, flags, cmm ); @@ -236,32 +220,14 @@ HTRANSFORM WINAPI CreateMultiProfileTransform( PHPROFILE profiles, DWORD nprofil release_profile( profile0 ); return NULL; } - in_format = from_profile( profiles[0] ); - out_format = from_profile( profiles[nprofiles - 1] ); - - if (in_format != out_format) - { - /* insert a conversion profile for pairings that lcms doesn't handle */ - if (out_format == TYPE_RGB_16) cmsconvert = cmsCreate_sRGBProfile(); - if (out_format == TYPE_Lab_16) cmsconvert = cmsCreateLab2Profile( NULL ); - } - cmsprofiles = HeapAlloc( GetProcessHeap(), 0, (nprofiles + 1) * sizeof(cmsHPROFILE) ); - if (cmsprofiles) + if ((cmsprofiles = HeapAlloc( GetProcessHeap(), 0, (nprofiles + 1) * sizeof(cmsHPROFILE) ))) { cmsprofiles[0] = profile0->cmsprofile; - if (cmsconvert) - { - cmsprofiles[1] = cmsconvert; - cmsprofiles[2] = profile1->cmsprofile; - nprofiles++; - } - else - { - cmsprofiles[1] = profile1->cmsprofile; - } - transform.cmstransform = cmsCreateMultiprofileTransform( cmsprofiles, nprofiles, in_format, - out_format, *intents, 0 ); + cmsprofiles[1] = profile1->cmsprofile; + + transform.cmstransform = cmsCreateMultiprofileTransform( cmsprofiles, nprofiles, 0, + 0, *intents, 0 ); HeapFree( GetProcessHeap(), 0, cmsprofiles ); if (!transform.cmstransform) {

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard 06 Aug '15

06 Aug '15

Module: wine Branch: master Commit: 864105b66d9739d0f58e201600563f0f09c87746 URL: http://source.winehq.org/git/wine.git/?a=commit;h=864105b66d9739d0f58e20160… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Thu Aug 6 16:45:04 2015 +0300 po: Update Finnish translation. --- po/fi.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/fi.po b/po/fi.po index 1b86d7a..dfae62f 100644 --- a/po/fi.po +++ b/po/fi.po @@ -9934,8 +9934,7 @@ msgid "" "redirected). No check is made that the file is readable text.\n" msgstr "" "TYPE <tiedostonimi> kopioi tiedoston <tiedostonimi> konsolilaitteeseen (tai\n" -"muualle, jos ohjataan muualle). Sitä, onko tiedosto luettavissa, ei\n" -"tarkisteta.\n" +"uudelleenohjattuna muualle). Tiedoston tekstimuotoisuutta ei tarkisteta.\n" #: cmd.rc:253 msgid ""

1 0

Nikolay Sivov : dwrite: Properly initialize LOGFONT returned from ConvertFontToLOGFONT().
by Alexandre Julliard 06 Aug '15

06 Aug '15

Module: wine Branch: master Commit: 7540fa5a1a0a5f98f1443e31598221f6af42e7fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=7540fa5a1a0a5f98f1443e315… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 6 17:57:26 2015 +0300 dwrite: Properly initialize LOGFONT returned from ConvertFontToLOGFONT(). --- dlls/dwrite/gdiinterop.c | 2 ++ dlls/dwrite/tests/font.c | 34 +++++++++++++++++++++++++++++++++- 2 files changed, 35 insertions(+), 1 deletion(-) diff --git a/dlls/dwrite/gdiinterop.c b/dlls/dwrite/gdiinterop.c index 86778df..8248431 100644 --- a/dlls/dwrite/gdiinterop.c +++ b/dlls/dwrite/gdiinterop.c @@ -504,6 +504,8 @@ static HRESULT WINAPI gdiinterop_ConvertFontToLOGFONT(IDWriteGdiInterop *iface, *is_systemfont = FALSE; + memset(logfont, 0, sizeof(*logfont)); + if (!font) return E_INVALIDARG; diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 0eca7f4..327a29f 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -2731,16 +2731,48 @@ if (0) { /* crashes on native */ IDWriteGdiInterop_ConvertFontToLOGFONT(interop, NULL, &logfont, NULL); IDWriteGdiInterop_ConvertFontToLOGFONT(interop, font, NULL, &system); } + + memset(&logfont, 0xcc, sizeof(logfont)); system = TRUE; hr = IDWriteGdiInterop_ConvertFontToLOGFONT(interop, NULL, &logfont, &system); ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); ok(!system, "got %d\n", system); + ok(logfont.lfFaceName[0] == 0, "got face name %s\n", wine_dbgstr_w(logfont.lfFaceName)); system = FALSE; - memset(&logfont, 0, sizeof(logfont)); + + logfont.lfHeight = 10; + logfont.lfWidth = 11; + logfont.lfEscapement = 10; + logfont.lfOrientation = 10; + logfont.lfWeight = 0; + logfont.lfItalic = 1; + logfont.lfUnderline = 1; + logfont.lfStrikeOut = 1; + logfont.lfCharSet = 0; + logfont.lfOutPrecision = 0; + logfont.lfClipPrecision = 0; + logfont.lfQuality = 0; + logfont.lfPitchAndFamily = 0; + logfont.lfFaceName[0] = 0; + hr = IDWriteGdiInterop_ConvertFontToLOGFONT(interop, font, &logfont, &system); ok(hr == S_OK, "got 0x%08x\n", hr); ok(system, "got %d\n", system); + + ok(logfont.lfHeight == 0, "got %d\n", logfont.lfHeight); + ok(logfont.lfWidth == 0, "got %d\n", logfont.lfWidth); + ok(logfont.lfEscapement == 0, "got %d\n", logfont.lfEscapement); + ok(logfont.lfOrientation == 0, "got %d\n", logfont.lfOrientation); + ok(logfont.lfWeight > 0, "got %d\n", logfont.lfWeight); + ok(logfont.lfItalic == 0, "got %d\n", logfont.lfItalic); + ok(logfont.lfUnderline == 0, "got %d\n", logfont.lfUnderline); + ok(logfont.lfStrikeOut == 0, "got %d\n", logfont.lfStrikeOut); + ok(logfont.lfCharSet == DEFAULT_CHARSET, "got %d\n", logfont.lfCharSet); + ok(logfont.lfOutPrecision == OUT_OUTLINE_PRECIS, "got %d\n", logfont.lfOutPrecision); + ok(logfont.lfClipPrecision == 0, "got %d\n", logfont.lfClipPrecision); + ok(logfont.lfQuality == 0, "got %d\n", logfont.lfQuality); + ok(logfont.lfPitchAndFamily == 0, "got %d\n", logfont.lfPitchAndFamily); ok(logfont.lfFaceName[0] != 0, "got face name %s\n", wine_dbgstr_w(logfont.lfFaceName)); IDWriteFactory_Release(factory2);

1 0

Nikolay Sivov : dwrite: Implement IsSymbolFont().
by Alexandre Julliard 06 Aug '15

06 Aug '15

Module: wine Branch: master Commit: ab7c65ae436fa5027846184c5b4fb6b56aee9ab8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab7c65ae436fa5027846184c5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 6 18:02:43 2015 +0300 dwrite: Implement IsSymbolFont(). --- dlls/dwrite/dwrite_private.h | 1 + dlls/dwrite/font.c | 7 +++++-- dlls/dwrite/freetype.c | 43 ++++++++++++++++++++++++++++++++++++++++++ dlls/dwrite/tests/font.c | 45 ++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 94 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 75098cf..cee49df 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -195,6 +195,7 @@ extern BOOL freetype_has_kerning_pairs(IDWriteFontFace2*) DECLSPEC_HIDDEN; extern INT32 freetype_get_kerning_pair_adjustment(IDWriteFontFace2*,UINT16,UINT16) DECLSPEC_HIDDEN; extern void freetype_get_glyph_bbox(IDWriteFontFace2*,FLOAT,UINT16,BOOL,RECT*) DECLSPEC_HIDDEN; extern void freetype_get_glyph_bitmap(IDWriteFontFace2*,FLOAT,UINT16,const RECT*,BYTE*) DECLSPEC_HIDDEN; +extern INT freetype_get_charmap_index(IDWriteFontFace2*,BOOL*) DECLSPEC_HIDDEN; /* Glyph shaping */ enum SCRIPT_JUSTIFY diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index aaa0f42..a4ed575 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -148,6 +148,8 @@ struct dwrite_fontface { DWRITE_FONT_FACE_TYPE type; DWRITE_FONT_METRICS1 metrics; DWRITE_CARET_METRICS caret; + INT charmap; + BOOL is_symbol; struct dwrite_fonttable cmap; struct dwrite_fonttable vdmx; @@ -401,8 +403,8 @@ static DWRITE_FONT_SIMULATIONS WINAPI dwritefontface_GetSimulations(IDWriteFontF static BOOL WINAPI dwritefontface_IsSymbolFont(IDWriteFontFace2 *iface) { struct dwrite_fontface *This = impl_from_IDWriteFontFace2(iface); - FIXME("(%p): stub\n", This); - return FALSE; + TRACE("(%p)\n", This); + return This->is_symbol; } static void WINAPI dwritefontface_GetMetrics(IDWriteFontFace2 *iface, DWRITE_FONT_METRICS *metrics) @@ -2500,6 +2502,7 @@ HRESULT create_fontface(DWRITE_FONT_FACE_TYPE facetype, UINT32 files_number, IDW fontface->caret.slopeRun = fontface->caret.slopeRise / 3; } } + fontface->charmap = freetype_get_charmap_index(&fontface->IDWriteFontFace2_iface, &fontface->is_symbol); *ret = &fontface->IDWriteFontFace2_iface; return S_OK; diff --git a/dlls/dwrite/freetype.c b/dlls/dwrite/freetype.c index 2c02b26..e693f9a 100644 --- a/dlls/dwrite/freetype.c +++ b/dlls/dwrite/freetype.c @@ -28,6 +28,7 @@ #include FT_CACHE_H #include FT_FREETYPE_H #include FT_OUTLINE_H +#include FT_TRUETYPE_TABLES_H #endif /* HAVE_FT2BUILD_H */ #include "windef.h" @@ -64,7 +65,9 @@ typedef struct #define MAKE_FUNCPTR(f) static typeof(f) * p##f = NULL MAKE_FUNCPTR(FT_Done_FreeType); +MAKE_FUNCPTR(FT_Get_First_Char); MAKE_FUNCPTR(FT_Get_Kerning); +MAKE_FUNCPTR(FT_Get_Sfnt_Table); MAKE_FUNCPTR(FT_Glyph_Get_CBox); MAKE_FUNCPTR(FT_Init_FreeType); MAKE_FUNCPTR(FT_Library_Version); @@ -145,7 +148,9 @@ BOOL init_freetype(void) #define LOAD_FUNCPTR(f) if((p##f = wine_dlsym(ft_handle, #f, NULL, 0)) == NULL){WARN("Can't find symbol %s\n", #f); goto sym_not_found;} LOAD_FUNCPTR(FT_Done_FreeType) + LOAD_FUNCPTR(FT_Get_First_Char) LOAD_FUNCPTR(FT_Get_Kerning) + LOAD_FUNCPTR(FT_Get_Sfnt_Table) LOAD_FUNCPTR(FT_Glyph_Get_CBox) LOAD_FUNCPTR(FT_Init_FreeType) LOAD_FUNCPTR(FT_Library_Version) @@ -554,6 +559,38 @@ void freetype_get_glyph_bitmap(IDWriteFontFace2 *fontface, FLOAT emSize, UINT16 LeaveCriticalSection(&freetype_cs); } +INT freetype_get_charmap_index(IDWriteFontFace2 *fontface, BOOL *is_symbol) +{ + INT charmap_index = -1; + FT_Face face; + + *is_symbol = FALSE; + + EnterCriticalSection(&freetype_cs); + if (pFTC_Manager_LookupFace(cache_manager, fontface, &face) == 0) { + TT_OS2 *os2 = pFT_Get_Sfnt_Table(face, ft_sfnt_os2); + FT_Int i; + + if (os2) { + FT_UInt dummy; + if (os2->version == 0) + *is_symbol = pFT_Get_First_Char(face, &dummy) >= 0x100; + else + *is_symbol = os2->ulCodePageRange1 & FS_SYMBOL; + } + + for (i = 0; i < face->num_charmaps; i++) + if (face->charmaps[i]->encoding == FT_ENCODING_MS_SYMBOL) { + *is_symbol = TRUE; + charmap_index = i; + break; + } + } + LeaveCriticalSection(&freetype_cs); + + return charmap_index; +} + #else /* HAVE_FREETYPE */ BOOL init_freetype(void) @@ -616,4 +653,10 @@ void freetype_get_glyph_bitmap(IDWriteFontFace2 *fontface, FLOAT emSize, UINT16 memset(buf, 0, size); } +INT freetype_get_charmap_index(IDWriteFontFace2 *fontface, BOOL *is_symbol) +{ + *is_symbol = FALSE; + return -1; +} + #endif /* HAVE_FREETYPE */ diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 327a29f..9a75abc 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -4710,6 +4710,50 @@ static void test_CreateAlphaTexture(void) IDWriteFactory_Release(factory); } +static void test_IsSymbolFont(void) +{ + static const WCHAR symbolW[] = {'S','y','m','b','o','l',0}; + IDWriteFontCollection *collection; + IDWriteFontFace *fontface; + IDWriteFactory *factory; + IDWriteFont *font; + HRESULT hr; + BOOL ret; + + factory = create_factory(); + + /* Tahoma */ + fontface = create_fontface(factory); + ret = IDWriteFontFace_IsSymbolFont(fontface); + ok(!ret, "got %d\n", ret); + + hr = IDWriteFactory_GetSystemFontCollection(factory, &collection, FALSE); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFontCollection_GetFontFromFontFace(collection, fontface, &font); + ok(hr == S_OK, "got 0x%08x\n", hr); + + ret = IDWriteFont_IsSymbolFont(font); + ok(!ret, "got %d\n", ret); + + IDWriteFontCollection_Release(collection); + IDWriteFont_Release(font); + IDWriteFontFace_Release(fontface); + + /* Symbol */ + font = get_font(factory, symbolW, DWRITE_FONT_STYLE_NORMAL); + ret = IDWriteFont_IsSymbolFont(font); + ok(ret, "got %d\n", ret); + + hr = IDWriteFont_CreateFontFace(font, &fontface); + ok(hr == S_OK, "got 0x%08x\n", hr); + ret = IDWriteFontFace_IsSymbolFont(fontface); + ok(ret, "got %d\n", ret); + IDWriteFont_Release(font); + + IDWriteFactory_Release(factory); +} + START_TEST(font) { IDWriteFactory *factory; @@ -4759,6 +4803,7 @@ START_TEST(font) test_GetRecommendedRenderingMode(); test_GetAlphaBlendParams(); test_CreateAlphaTexture(); + test_IsSymbolFont(); IDWriteFactory_Release(factory); }

1 0

Nikolay Sivov : dwrite: Use right charmap for symbol encoding.
by Alexandre Julliard 06 Aug '15

06 Aug '15

Module: wine Branch: master Commit: 813368481679a5848bc715d1e181782de157485f URL: http://source.winehq.org/git/wine.git/?a=commit;h=813368481679a5848bc715d1e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 6 18:03:12 2015 +0300 dwrite: Use right charmap for symbol encoding. --- dlls/dwrite/dwrite_private.h | 2 +- dlls/dwrite/font.c | 2 +- dlls/dwrite/freetype.c | 14 +++++++++++--- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index cee49df..4418c92 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -190,7 +190,7 @@ extern void freetype_notify_cacheremove(IDWriteFontFace2*) DECLSPEC_HIDDEN; extern BOOL freetype_is_monospaced(IDWriteFontFace2*) DECLSPEC_HIDDEN; extern HRESULT freetype_get_glyph_outline(IDWriteFontFace2*,FLOAT,UINT16,USHORT,struct glyph_outline**) DECLSPEC_HIDDEN; extern UINT16 freetype_get_glyphcount(IDWriteFontFace2*) DECLSPEC_HIDDEN; -extern UINT16 freetype_get_glyphindex(IDWriteFontFace2*,UINT32) DECLSPEC_HIDDEN; +extern UINT16 freetype_get_glyphindex(IDWriteFontFace2*,UINT32,INT) DECLSPEC_HIDDEN; extern BOOL freetype_has_kerning_pairs(IDWriteFontFace2*) DECLSPEC_HIDDEN; extern INT32 freetype_get_kerning_pair_adjustment(IDWriteFontFace2*,UINT16,UINT16) DECLSPEC_HIDDEN; extern void freetype_get_glyph_bbox(IDWriteFontFace2*,FLOAT,UINT16,BOOL,RECT*) DECLSPEC_HIDDEN; diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index a4ed575..56a3655 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -469,7 +469,7 @@ static HRESULT WINAPI dwritefontface_GetGlyphIndices(IDWriteFontFace2 *iface, UI } for (i = 0; i < count; i++) - glyph_indices[i] = freetype_get_glyphindex(iface, codepoints[i]); + glyph_indices[i] = freetype_get_glyphindex(iface, codepoints[i], This->charmap); return S_OK; } diff --git a/dlls/dwrite/freetype.c b/dlls/dwrite/freetype.c index e693f9a..3290243 100644 --- a/dlls/dwrite/freetype.c +++ b/dlls/dwrite/freetype.c @@ -437,12 +437,20 @@ UINT16 freetype_get_glyphcount(IDWriteFontFace2 *fontface) return count; } -UINT16 freetype_get_glyphindex(IDWriteFontFace2 *fontface, UINT32 codepoint) +UINT16 freetype_get_glyphindex(IDWriteFontFace2 *fontface, UINT32 codepoint, INT charmap) { UINT16 glyph; EnterCriticalSection(&freetype_cs); - glyph = pFTC_CMapCache_Lookup(cmap_cache, fontface, -1, codepoint); + if (charmap == -1) + glyph = pFTC_CMapCache_Lookup(cmap_cache, fontface, charmap, codepoint); + else { + /* special handling for symbol fonts */ + if (codepoint < 0x100) codepoint += 0xf000; + glyph = pFTC_CMapCache_Lookup(cmap_cache, fontface, charmap, codepoint); + if (!glyph) + glyph = pFTC_CMapCache_Lookup(cmap_cache, fontface, charmap, codepoint - 0xf000); + } LeaveCriticalSection(&freetype_cs); return glyph; @@ -627,7 +635,7 @@ UINT16 freetype_get_glyphcount(IDWriteFontFace2 *fontface) return 0; } -UINT16 freetype_get_glyphindex(IDWriteFontFace2 *fontface, UINT32 codepoint) +UINT16 freetype_get_glyphindex(IDWriteFontFace2 *fontface, UINT32 codepoint, INT charmap) { return 0; }

1 0