From b549ae11fbbe02564417e4029baa789bffe9d5aa Mon Sep 17 00:00:00 2001
From: Santino Mazza <smazza@codeweavers.com>
Date: Tue, 28 Nov 2023 17:29:21 -0300
Subject: [PATCH] mlang: Fix bug with codepage priority in GetStrCodePages.

---
 dlls/mlang/mlang.c       | 9 +++------
 dlls/mlang/tests/mlang.c | 2 +-
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c
index 55e6f6edaa5..c7e7f360f0b 100644
--- a/dlls/mlang/mlang.c
+++ b/dlls/mlang/mlang.c
@@ -3336,23 +3336,20 @@ static HRESULT WINAPI fnIMLangFontLink2_GetStrCodePages( IMLangFontLink2* iface,
 
     for (i = 0; i < src_len; i++)
     {
-        DWORD cp, next_cp = 0;
+        DWORD cp = 0;
         HRESULT ret;
 
         ret = IMLangFontLink2_GetCharCodePages(iface, src[i], &cp);
-        if (i + 1 < src_len)
-            ret = IMLangFontLink2_GetCharCodePages(iface, src[i + 1], &next_cp);
         if (ret != S_OK) return E_FAIL;
 
         if (!cps) cps = cp;
-        else if ((cps & cp) != 0) cps &= cp;
+        else if ((cps & cp) != 0 &&
+                 !((priority_cp & cps) ^ (priority_cp & cp))) cps &= cp;
         else
         {
             i--;
             break;
         }
-
-        if ((priority_cp & cps) && !(priority_cp & next_cp)) break;
     }
 
     if (codepages) *codepages = cps;
diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c
index f8e37565115..6bb973dc285 100644
--- a/dlls/mlang/tests/mlang.c
+++ b/dlls/mlang/tests/mlang.c
@@ -1330,7 +1330,7 @@ static void IMLangFontLink_Test(IMLangFontLink* iMLFL)
     ret = IMLangFontLink_GetStrCodePages(iMLFL, L"\uff90a", 2, FS_LATIN1, &dwCodePages, &processed);
     ok(ret == S_OK, "IMLangFontLink_GetStrCodePages error %lx\n", ret);
     ok(dwCodePages == dwCmpCodePages, "expected %lx, got %lx\n", dwCmpCodePages, dwCodePages);
-    todo_wine ok(processed == 1, "expected 1, got %ld\n", processed);
+    ok(processed == 1, "expected 1, got %ld\n", processed);
 
     dwCodePages = 0xffff;
     processed = -1;