[PATCH 0/1] MR4138: gdiplus: Reset the installedFontCollection.count field to zero upon release.

[kingjinni (＠kingjinni)]

The application crashes when attempting to load fonts internally, especially those with watermark functionalities. Reset the installedFontCollection.count field to zero upon release.

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

[PATCH 1/1] gdiplus: Reset the installedFontCollection.count field to zero upon release.

[kingjinni]

From: kingjinni <kingtin0419(a)qq.com>

---
 dlls/gdiplus/font.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c
index 081fddf7c5d..da5dc311ce7 100644
--- a/dlls/gdiplus/font.c
+++ b/dlls/gdiplus/font.c
@@ -1565,6 +1565,7 @@ void free_installed_fonts(void)
 
     installedFontCollection.FontFamilies = NULL;
     installedFontCollection.allocated = 0;
+    installedFontCollection.count = 0;
 }
 
 static INT CALLBACK add_font_proc(const LOGFONTW *lfw, const TEXTMETRICW *ntm,
-- 
GitLab

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

[PATCH 1/1] gdiplus: Reset the installedFontCollection.count field to zero upon release.

[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=138882

Your paranoid android.


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

user32:
input.c:1291: Test failed: Unexpected vkCode 0xa4, expected 0xe7.

[Esme Povirk (＠madewokherd)]

Technically a correct change, but GdipNewInstalledFontCollection shouldn't fail. I'd prefer for the failure to be fixed if possible or skipped if not.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/4138#note_49462

[PATCH 0/1] MR4138: gdiplus: Reset the installedFontCollection.count field to zero upon release. - approved

[Esme Povirk (＠madewokherd)]

This merge request was approved by Esme Povirk.
-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/4138