[PATCH 0/1] MR8219: gdiplus/tests: Use correctly formatted description.

[Yuxuan Shui (＠yshui)]

According to a comment in emf_create, description is expected to be "App name\0Title\0\0". But in
the test cases we only ever passed "winetest\0", so emf_create reads out-of-bound trying to find the
title.

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

[PATCH 1/1] gdiplus/tests: Use correctly formatted description.

[Yuxuan Shui]

From: Yuxuan Shui <yshui(a)codeweavers.com>

According to a comment in emf_create, description is expected to be "App name\0Title\0\0". But in
the test cases we only ever passed "winetest\0", so emf_create reads out-of-bound trying to find the
title.
---
 dlls/gdiplus/tests/metafile.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/dlls/gdiplus/tests/metafile.c b/dlls/gdiplus/tests/metafile.c
index eda5760c0fa..401b3ea6bac 100644
--- a/dlls/gdiplus/tests/metafile.c
+++ b/dlls/gdiplus/tests/metafile.c
@@ -36,7 +36,7 @@ static inline void expect_(unsigned line, DWORD expected, DWORD got)
 static BOOL save_metafiles;
 static BOOL load_metafiles;
 
-static const WCHAR description[] = L"winetest";
+static const WCHAR description[] = L"winetest\0\0";
 
 typedef struct emfplus_record
 {
@@ -2932,7 +2932,7 @@ static void test_restoredc(void)
     hdc = CreateCompatibleDC(0);
 
     stat = GdipRecordMetafile(hdc, EmfTypeEmfOnly, &frame, MetafileFrameUnitPixel,
-        L"winetest", &metafile);
+        description, &metafile);
     expect(Ok, stat);
 
     DeleteDC(hdc);
@@ -3059,7 +3059,7 @@ static void test_drawdriverstring(void)
     expect(Ok, stat);
 
     stat = GdipRecordMetafile(hdc, EmfTypeEmfPlusOnly, &frame, MetafileFrameUnitPixel,
-        L"winetest", &metafile);
+        description, &metafile);
     expect(Ok, stat);
 
     DeleteDC(hdc);
@@ -3188,7 +3188,7 @@ static void test_unknownfontdecode(void)
     /* Start metafile recording. */
     hdc = CreateCompatibleDC(0);
     stat = GdipRecordMetafile(hdc, EmfTypeEmfPlusOnly, &frame, MetafileFrameUnitPixel,
-        L"winetest", &metafile);
+        description, &metafile);
     expect(Ok, stat);
     DeleteDC(hdc);
     hdc = NULL;
@@ -3263,7 +3263,7 @@ static void test_fillregion(void)
 
     hdc = CreateCompatibleDC(0);
     stat = GdipRecordMetafile(hdc, EmfTypeEmfPlusOnly, &frame, MetafileFrameUnitPixel,
-        L"winetest", &metafile);
+        description, &metafile);
     expect(Ok, stat);
     DeleteDC(hdc);
     hdc = NULL;
@@ -3367,7 +3367,7 @@ static void test_lineargradient(void)
 
     hdc = CreateCompatibleDC(0);
     stat = GdipRecordMetafile(hdc, EmfTypeEmfPlusOnly, &frame, MetafileFrameUnitPixel,
-        L"winetest", &metafile);
+        description, &metafile);
     expect(Ok, stat);
     DeleteDC(hdc);
     hdc = NULL;
@@ -3536,7 +3536,7 @@ static void test_printer_dc(void)
         return;
     }
 
-    status = GdipRecordMetafile(hdc, EmfTypeEmfPlusOnly, &frame, MetafileFrameUnitInch, L"winetest", &metafile);
+    status = GdipRecordMetafile(hdc, EmfTypeEmfPlusOnly, &frame, MetafileFrameUnitInch, description, &metafile);
     expect(Ok, status);
 
     status = GdipGetImageGraphicsContext((GpImage *)metafile, &graphics);
-- 
GitLab

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

[PATCH 0/1] MR8219: gdiplus/tests: Use correctly formatted description. - approved

[Esme Povirk (＠madewokherd)]

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