[PATCH v5 4/6] mlang: Fix bug with codepage priority in GetStrCodePages.

[Santino Mazza]

From: Santino Mazza

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

diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c
index 1a6a2ed5dc6..cc797ecac6b 100644
--- a/dlls/mlang/mlang.c
+++ b/dlls/mlang/mlang.c
@@ -3344,7 +3344,8 @@ static HRESULT WINAPI fnIMLangFontLink2_GetStrCodePages( IMLangFontLink2* iface,
         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--;
diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c
index 9241ebead87..06a288419db 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;