Zhao Yi : mscms: Return the correct value for bmformat.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 148c708bdaebaba50ab7c115f5fbe711a61ea8ec
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=148c708bdaebaba50ab7c115f5fbe711a61ea8ec

Author: Zhao Yi <zhaoyi at uniontech.com>
Date:   Mon May 30 15:55:42 2022 +0200

mscms: Return the correct value for bmformat.

Signed-off-by: Zhao Yi <zhaoyi at uniontech.com>
Signed-off-by: Hans Leidekker <hans at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/mscms/tests/profile.c |  8 ++++----
 dlls/mscms/transform.c     | 10 +++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/dlls/mscms/tests/profile.c b/dlls/mscms/tests/profile.c
index 025b1531796..e5f924fb2da 100644
--- a/dlls/mscms/tests/profile.c
+++ b/dlls/mscms/tests/profile.c
@@ -1396,22 +1396,22 @@ static void test_TranslateBitmapBits( char *standardprofile, char *testprofile )
     memset( destbits, 0, sizeof(destbits) );
     ret = pTranslateBitmapBits( transform, srcbits, BM_RGBTRIPLETS, 1, 1, 3, destbits, BM_xBGRQUADS, 4, NULL, 0 );
     ok( ret, "got %lu\n", GetLastError() );
-    todo_wine ok( !memcmp(expect_destbits, destbits, sizeof(expect_destbits)), "unexpected destbits\n" );
+    ok( !memcmp(expect_destbits, destbits, sizeof(expect_destbits)), "unexpected destbits\n" );
 
     memset( destbits, 0, sizeof(destbits) );
     ret = pTranslateBitmapBits( transform, srcbits, BM_RGBTRIPLETS, 1, 1, 3, destbits, BM_xRGBQUADS, 4, NULL, 0 );
     ok( ret, "got %lu\n", GetLastError() );
-    todo_wine ok( !memcmp(expect_destbits2, destbits, sizeof(expect_destbits2)), "unexpected destbits\n" );
+    ok( !memcmp(expect_destbits2, destbits, sizeof(expect_destbits2)), "unexpected destbits\n" );
 
     memset( destbits, 0, sizeof(destbits) );
     ret = pTranslateBitmapBits( transform, srcbits2, BM_xRGBQUADS, 1, 1, 4, destbits, BM_RGBTRIPLETS, 3, NULL, 0 );
     ok( ret, "got %lu\n", GetLastError() );
-    todo_wine ok( !memcmp(expect_destbits3, destbits, sizeof(expect_destbits3)), "unexpected destbits\n" );
+    ok( !memcmp(expect_destbits3, destbits, sizeof(expect_destbits3)), "unexpected destbits\n" );
 
     memset( destbits, 0, sizeof(destbits) );
     ret = pTranslateBitmapBits( transform, srcbits2, BM_xRGBQUADS, 1, 1, 4, destbits, BM_BGRTRIPLETS, 3, NULL, 0 );
     ok( ret, "got %lu\n", GetLastError() );
-    todo_wine ok( !memcmp(expect_destbits4, destbits, sizeof(expect_destbits4)), "unexpected destbits\n" );
+    ok( !memcmp(expect_destbits4, destbits, sizeof(expect_destbits4)), "unexpected destbits\n" );
 
     pDeleteColorTransform( transform );
     pCloseColorProfile( handle[0] );
diff --git a/dlls/mscms/transform.c b/dlls/mscms/transform.c
index 0d48e217d66..22901ad721c 100644
--- a/dlls/mscms/transform.c
+++ b/dlls/mscms/transform.c
@@ -39,12 +39,12 @@ static DWORD from_bmformat( BMFORMAT format )
 
     switch (format)
     {
-    case BM_RGBTRIPLETS: ret = TYPE_RGB_8; break;
-    case BM_BGRTRIPLETS: ret = TYPE_BGR_8; break;
+    case BM_RGBTRIPLETS: ret = TYPE_BGR_8; break;
+    case BM_BGRTRIPLETS: ret = TYPE_RGB_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;
-    case BM_KYMCQUADS:   ret = TYPE_KYMC_8; break;
+    case BM_xRGBQUADS:   ret = TYPE_BGRA_8; break;
+    case BM_xBGRQUADS:   ret = TYPE_RGBA_8; break;
+    case BM_KYMCQUADS:   ret = TYPE_CMYK_8; break;
     default:
         if (!quietfixme)
         {