[PATCH 0/1] MR6095: dwrite: Return correct rendering and gridfit modes from ::GetRecommendedRenderingMode().

[Dmitry Timoshkov (＠dmitry)]

This patch fixes a copy/paste error introduced in 75635053fc810ecd2eaa12a6cd6418d04b301118.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/6095

[PATCH 1/1] dwrite: Return correct rendering and gridfit modes from ::GetRecommendedRenderingMode().

[Dmitry Timoshkov]

From: Dmitry Timoshkov <dmitry(a)baikal.ru>

This patch fixes a copy/paste error introduced in 75635053fc810ecd2eaa12a6cd6418d04b301118.

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru>
---
 dlls/dwrite/font.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c
index 83a293e57fe..b34244238a2 100644
--- a/dlls/dwrite/font.c
+++ b/dlls/dwrite/font.c
@@ -1820,8 +1820,8 @@ static HRESULT WINAPI dwritefontface3_GetRecommendedRenderingMode(IDWriteFontFac
 
         hr = IDWriteRenderingParams_QueryInterface(params, &IID_IDWriteRenderingParams3, (void**)¶ms3);
         if (hr == S_OK) {
-            *rendering_mode = IDWriteRenderingParams3_GetRenderingMode1(params3);
-            mode = IDWriteRenderingParams3_GetGridFitMode(params3);
+            mode = IDWriteRenderingParams3_GetRenderingMode1(params3);
+            *gridfit_mode = IDWriteRenderingParams3_GetGridFitMode(params3);
             IDWriteRenderingParams3_Release(params3);
         }
         else
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/6095

[PATCH 1/1] dwrite: Return correct rendering and gridfit modes from ::GetRecommendedRenderingMode().

[Marvin]

Hi,

It looks like your patch introduced the new failures shown below.
Please investigate and fix them before resubmitting your patch.
If they are not new, fixing them anyway would help a lot. Otherwise
please ask for the known failures list to be updated.

The tests also ran into some preexisting test failures. If you know how
to fix them that would be helpful. See the TestBot job for the details:

The full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=147151

Your paranoid android.


=== debian11b (64 bit WoW report) ===

ddraw:
ddraw1.c:3645: Test failed: Expected (0,0)-(640,480), got (-32000,-32000)-(-31840,-31969).

[PATCH 0/1] MR6095: dwrite: Return correct rendering and gridfit modes from ::GetRecommendedRenderingMode(). - approved

[Nikolay Sivov (＠nsivov)]

This merge request was approved by Nikolay Sivov.
-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/6095