ReceiveTempSMS/Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mscms: GetColorDirectory: fixed incorrect A -> W conversions.

Browse Source
This commit is contained in:
Eric Pouech 2006-11-08 21:46:59 +01:00 committed by Alexandre Julliard
parent f2ee10aed7
commit 4b88fd842a
2 changed files with 16 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
dlls/mscms/profile.c
View File

@ -91,14 +91,13 @@ BOOL WINAPI GetColorDirectoryA( PCSTR machine, PSTR buffer, PDWORD size )
if (bufferW) if (bufferW)
{ {
ret = GetColorDirectoryW( NULL, bufferW, &sizeW ); if ((ret = GetColorDirectoryW( NULL, bufferW, &sizeW )))
*size = WideCharToMultiByte( CP_ACP, 0, bufferW, -1, NULL, 0, NULL, NULL );
if (ret)
{ {
len = WideCharToMultiByte( CP_ACP, 0, bufferW, *size, buffer, *size, NULL, NULL ); *size = WideCharToMultiByte( CP_ACP, 0, bufferW, -1, NULL, 0, NULL, NULL );
len = WideCharToMultiByte( CP_ACP, 0, bufferW, -1, buffer, *size, NULL, NULL );
if (!len) ret = FALSE; if (!len) ret = FALSE;
} }
else *size = sizeW / sizeof(WCHAR);
HeapFree( GetProcessHeap(), 0, bufferW ); HeapFree( GetProcessHeap(), 0, bufferW );
} }
@ -132,13 +131,14 @@ BOOL WINAPI GetColorDirectoryW( PCWSTR machine, PWSTR buffer, PDWORD size )
len = lstrlenW( colordir ) * sizeof(WCHAR); len = lstrlenW( colordir ) * sizeof(WCHAR);
if (len <= *size && buffer) if (buffer && len <= *size)
{ {
lstrcpyW( buffer, colordir ); lstrcpyW( buffer, colordir );
*size = len; *size = len;
return TRUE; return TRUE;
} }
SetLastError( ERROR_MORE_DATA );
*size = len; *size = len;
return FALSE; return FALSE;
} }
@ -389,14 +389,13 @@ BOOL WINAPI GetStandardColorSpaceProfileA( PCSTR machine, DWORD id, PSTR profile
if (profileW) if (profileW)
{ {
ret = GetStandardColorSpaceProfileW( NULL, id, profileW, &sizeW ); if ((ret = GetStandardColorSpaceProfileW( NULL, id, profileW, &sizeW )))
*size = WideCharToMultiByte( CP_ACP, 0, profileW, -1, NULL, 0, NULL, NULL );
if (ret)
{ {
len = WideCharToMultiByte( CP_ACP, 0, profileW, *size, profile, *size, NULL, NULL ); *size = WideCharToMultiByte( CP_ACP, 0, profileW, -1, NULL, 0, NULL, NULL );
len = WideCharToMultiByte( CP_ACP, 0, profileW, -1, profile, *size, NULL, NULL );
if (!len) ret = FALSE; if (!len) ret = FALSE;
} }
else *size = sizeW / sizeof(WCHAR);
HeapFree( GetProcessHeap(), 0, profileW ); HeapFree( GetProcessHeap(), 0, profileW );
} }
@ -451,20 +450,22 @@ BOOL WINAPI GetStandardColorSpaceProfileW( PCWSTR machine, DWORD id, PWSTR profi
switch (id) switch (id)
{ {
case 0x52474220: /* 'RGB ' */ case SPACE_RGB: /* 'RGB ' */
lstrcatW( rgbprofile, rgbprofilefile ); lstrcatW( rgbprofile, rgbprofilefile );
len = lstrlenW( rgbprofile ) * sizeof(WCHAR); len = lstrlenW( rgbprofile ) * sizeof(WCHAR);
if (*size < len || !profile) if (*size < len || !profile)
{ {
*size = len; *size = len;
return TRUE; SetLastError( ERROR_MORE_DATA );
return FALSE;
} }
lstrcpyW( profile, rgbprofile ); lstrcpyW( profile, rgbprofile );
break; break;
default: default:
SetLastError( ERROR_FILE_NOT_FOUND );
return FALSE; return FALSE;
} }
return TRUE; return TRUE;

10
dlls/mscms/tests/profile.c
View File

@ -597,7 +597,6 @@ static void test_GetStandardColorSpaceProfileA(void)
SetLastError(0xfaceabee); /* 2nd param, */ SetLastError(0xfaceabee); /* 2nd param, */
ret = pGetStandardColorSpaceProfileA(NULL, (DWORD)-1, newprofile, &sizeP); ret = pGetStandardColorSpaceProfileA(NULL, (DWORD)-1, newprofile, &sizeP);
todo_wine
ok( !ret && GetLastError() == ERROR_FILE_NOT_FOUND, "GetStandardColorSpaceProfileA() returns %d (GLE=%d)\n", ret, GetLastError() ); ok( !ret && GetLastError() == ERROR_FILE_NOT_FOUND, "GetStandardColorSpaceProfileA() returns %d (GLE=%d)\n", ret, GetLastError() );
SetLastError(0xfaceabee); /* 4th param, */ SetLastError(0xfaceabee); /* 4th param, */
@ -612,17 +611,14 @@ static void test_GetStandardColorSpaceProfileA(void)
SetLastError(0xfaceabee); /* dereferenced 4th param, */ SetLastError(0xfaceabee); /* dereferenced 4th param, */
ret = pGetStandardColorSpaceProfileA(NULL, SPACE_RGB, newprofile, &zero); ret = pGetStandardColorSpaceProfileA(NULL, SPACE_RGB, newprofile, &zero);
todo_wine
ok( !ret && (GetLastError() == ERROR_MORE_DATA || GetLastError() == ERROR_INSUFFICIENT_BUFFER), "GetStandardColorSpaceProfileA() returns %d (GLE=%d)\n", ret, GetLastError() ); ok( !ret && (GetLastError() == ERROR_MORE_DATA || GetLastError() == ERROR_INSUFFICIENT_BUFFER), "GetStandardColorSpaceProfileA() returns %d (GLE=%d)\n", ret, GetLastError() );
} else { } else {
SetLastError(0xfaceabee); /* 3rd param, */ SetLastError(0xfaceabee); /* 3rd param, */
ret = pGetStandardColorSpaceProfileA(NULL, SPACE_RGB, NULL, &sizeP); ret = pGetStandardColorSpaceProfileA(NULL, SPACE_RGB, NULL, &sizeP);
todo_wine
ok( !ret && GetLastError() == ERROR_FILE_NOT_FOUND, "GetStandardColorSpaceProfileA() returns %d (GLE=%d)\n", ret, GetLastError() ); ok( !ret && GetLastError() == ERROR_FILE_NOT_FOUND, "GetStandardColorSpaceProfileA() returns %d (GLE=%d)\n", ret, GetLastError() );
SetLastError(0xfaceabee); /* dereferenced 4th param. */ SetLastError(0xfaceabee); /* dereferenced 4th param. */
ret = pGetStandardColorSpaceProfileA(NULL, SPACE_RGB, newprofile, &sizeP); ret = pGetStandardColorSpaceProfileA(NULL, SPACE_RGB, newprofile, &sizeP);
todo_wine
ok( !ret && GetLastError() == ERROR_FILE_NOT_FOUND, "GetStandardColorSpaceProfileA() returns %d (GLE=%d)\n", ret, GetLastError() ); ok( !ret && GetLastError() == ERROR_FILE_NOT_FOUND, "GetStandardColorSpaceProfileA() returns %d (GLE=%d)\n", ret, GetLastError() );
} }
@ -642,7 +638,7 @@ static void test_GetStandardColorSpaceProfileA(void)
SetLastError(0xfaceabee); /* maybe 2nd param. */ SetLastError(0xfaceabee); /* maybe 2nd param. */
ret = pGetStandardColorSpaceProfileA(NULL, 0, newprofile, &sizeP); ret = pGetStandardColorSpaceProfileA(NULL, 0, newprofile, &sizeP);
if (!ret) todo_wine ok( GetLastError() == ERROR_FILE_NOT_FOUND, "GetStandardColorSpaceProfileA() returns %d (GLE=%d)\n", ret, GetLastError() ); if (!ret) ok( GetLastError() == ERROR_FILE_NOT_FOUND, "GetStandardColorSpaceProfileA() returns %d (GLE=%d)\n", ret, GetLastError() );
else ok( !lstrcmpiA( newprofile, emptyA ) && GetLastError() == 0xfaceabee, "GetStandardColorSpaceProfileA() returns %d (GLE=%d)\n", ret, GetLastError() ); else ok( !lstrcmpiA( newprofile, emptyA ) && GetLastError() == 0xfaceabee, "GetStandardColorSpaceProfileA() returns %d (GLE=%d)\n", ret, GetLastError() );
/* Functional checks */ /* Functional checks */
@ -689,7 +685,6 @@ static void test_GetStandardColorSpaceProfileW(void)
SetLastError(0xfaceabee); /* 2nd param, */ SetLastError(0xfaceabee); /* 2nd param, */
ret = pGetStandardColorSpaceProfileW(NULL, (DWORD)-1, newprofile, &sizeP); ret = pGetStandardColorSpaceProfileW(NULL, (DWORD)-1, newprofile, &sizeP);
todo_wine
ok( !ret && GetLastError() == ERROR_FILE_NOT_FOUND, "GetStandardColorSpaceProfileW() returns %d (GLE=%d)\n", ret, GetLastError() ); ok( !ret && GetLastError() == ERROR_FILE_NOT_FOUND, "GetStandardColorSpaceProfileW() returns %d (GLE=%d)\n", ret, GetLastError() );
SetLastError(0xfaceabee); /* 3th param, */ SetLastError(0xfaceabee); /* 3th param, */
@ -702,7 +697,6 @@ static void test_GetStandardColorSpaceProfileW(void)
SetLastError(0xfaceabee); /* dereferenced 4th param. */ SetLastError(0xfaceabee); /* dereferenced 4th param. */
ret = pGetStandardColorSpaceProfileW(NULL, SPACE_RGB, newprofile, &zero); ret = pGetStandardColorSpaceProfileW(NULL, SPACE_RGB, newprofile, &zero);
todo_wine
ok( !ret && (GetLastError() == ERROR_MORE_DATA || GetLastError() == ERROR_INSUFFICIENT_BUFFER), "GetStandardColorSpaceProfileW() returns %d (GLE=%d)\n", ret, GetLastError() ); ok( !ret && (GetLastError() == ERROR_MORE_DATA || GetLastError() == ERROR_INSUFFICIENT_BUFFER), "GetStandardColorSpaceProfileW() returns %d (GLE=%d)\n", ret, GetLastError() );
/* Several invalid parameter checks: */ /* Several invalid parameter checks: */
@ -721,7 +715,7 @@ static void test_GetStandardColorSpaceProfileW(void)
SetLastError(0xfaceabee); /* maybe 2nd param. */ SetLastError(0xfaceabee); /* maybe 2nd param. */
ret = pGetStandardColorSpaceProfileW(NULL, 0, newprofile, &sizeP); ret = pGetStandardColorSpaceProfileW(NULL, 0, newprofile, &sizeP);
if (!ret) todo_wine ok( GetLastError() == ERROR_FILE_NOT_FOUND, "GetStandardColorSpaceProfileW() returns %d (GLE=%d)\n", ret, GetLastError() ); if (!ret) ok( GetLastError() == ERROR_FILE_NOT_FOUND, "GetStandardColorSpaceProfileW() returns %d (GLE=%d)\n", ret, GetLastError() );
else ok( !lstrcmpiW( newprofile, emptyW ) && GetLastError() == 0xfaceabee, "GetStandardColorSpaceProfileW() returns %d (GLE=%d)\n", ret, GetLastError() ); else ok( !lstrcmpiW( newprofile, emptyW ) && GetLastError() == 0xfaceabee, "GetStandardColorSpaceProfileW() returns %d (GLE=%d)\n", ret, GetLastError() );
/* Functional checks */ /* Functional checks */