Re: MSCMS/tests: asciify tests

[Robert Shearman]

Saulius Krasuckas wrote:
> Log message:
>    Saulius Krasuckas 
>    Don't call unicode function of file API as they fail on Win9x.
>
> ? dlls/mscms/tests/mscms_test.dsp
> Index: dlls/mscms/tests/profile.c
> ===================================================================
> RCS file: /home/wine/wine/dlls/mscms/tests/profile.c,v
> retrieving revision 1.17
> diff -p -u -r1.17 profile.c
> --- dlls/mscms/tests/profile.c	18 Jul 2005 09:08:43 -0000	1.17
> +++ dlls/mscms/tests/profile.c	16 Nov 2005 22:26:32 -0000
> @@ -971,9 +971,11 @@ static void test_UninstallColorProfileW(
>     if (testprofileW)
>     {
>         WCHAR dest[MAX_PATH], base[MAX_PATH];
> -
>    char destA[MAX_PATH];
>   DWORD size = sizeof(dest);
>   WCHAR slash[] = { '\\', 0 };
>   HANDLE handle;
> -
>    int szA, szW;
>
>   ret = pInstallColorProfileW( NULL, testprofileW );
>   ok( ret, "InstallColorProfileW() failed (%ld)\n", GetLastError() );
>
> @@ -989,8 +991,12 @@ static void test_UninstallColorProfileW(
>         ret = pUninstallColorProfileW( NULL, dest, TRUE );
>         ok( ret, "UninstallColorProfileW() failed (%ld)\n", GetLastError() );
> -
>    WideCharToMultiByte(CP_ACP, 0, dest, -1, destA, MAX_PATH, NULL, NULL);
> -
>    szA = lstrlenA(destA);
> -
>    szW = lstrlenW(dest);
> -
>    ok( szA == szW, "profile name conversion wasn't successfull: %d chars vs %d chars\n", szA, szW);
>   /* Check if the profile is really gone */

This looks incorrect. Think about this case: "e" and the acute accent in 
separate characters -> "é"

MSCMS/tests: asciify tests

[Saulius Krasuckas]

* On Wed, 16 Nov 2005, Robert Shearman wrote:
> - Saulius Krasuckas wrote:
> > -
> >    WideCharToMultiByte(CP_ACP, 0, dest, -1, destA, MAX_PATH, NULL, NULL);
> > -
> >    szA = lstrlenA(destA);
> > -
> >    szW = lstrlenW(dest);
> > -
> >    ok( szA == szW, "profile name conversion wasn't successfull: %d chars vs %d chars\n", szA, szW);
> >   /* Check if the profile is really gone */
>
> This looks incorrect. Think about this case: "e" and the acute accent in 
> separate characters -> "é"

Thanks, Rob.
I was too lazy to dig into unicode stuff and just made such assumption. :)
Lets go back and check ret value of WideCharToMultiByte().