From: Jeff Smith Subject: Re: [PATCH 1/2] gdiplus: Don't test font face of DEFAULT_GUI_FONT. Message-Id: Date: Sun, 22 Mar 2020 20:14:21 -0500 In-Reply-To: <20200322194617.3994-1-vincent@codeweavers.com> References: <20200322194617.3994-1-vincent@codeweavers.com> On Sun, Mar 22, 2020, 2:46 PM Esme wrote: > From: Vincent Povirk > > Wine-bug: https://bugs.winehq.org/show_bug.cgi?id=47872 > Signed-off-by: Vincent Povirk > --- > dlls/gdiplus/tests/font.c | 14 +++----------- > 1 file changed, 3 insertions(+), 11 deletions(-) > > diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c > index 9abb80faaf5..7f4b1e876e5 100644 > --- a/dlls/gdiplus/tests/font.c > +++ b/dlls/gdiplus/tests/font.c > @@ -808,29 +808,21 @@ static void test_font_metrics(void) > > static void test_font_substitution(void) > { > - WCHAR ms_shell_dlg[LF_FACESIZE]; > + const WCHAR ms_shell_dlg[] = {'M','S',' ','S','h','e','l','l',' > ','D','l','g',0}; Especially for tests, is there any reason now to avoid using L””-style literals for wchar strings? If not, you could get rid of ms_shell_dlg completely and substitute L"MS Shell Dlg" for the one remaining place ms_shell_dlg is used.


On Sun, Mar 22, 2020, 2:46 PM Esme <vincent@codeweavers.com> wrote:
From: Vincent Povirk <vincent@codeweavers.com>

Wine-bug: https://bugs.winehq.org/show_bug.cgi?id=47872
Signed-off-by: Vincent Povirk <vincent@codeweavers.com>
---
 dlls/gdiplus/tests/font.c | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c
index 9abb80faaf5..7f4b1e876e5 100644
--- a/dlls/gdiplus/tests/font.c
+++ b/dlls/gdiplus/tests/font.c
@@ -808,29 +808,21 @@ static void test_font_metrics(void)

 static void test_font_substitution(void)
 {
-    WCHAR ms_shell_dlg[LF_FACESIZE];
+    const WCHAR ms_shell_dlg[] = {'M','S',' ','S','h','e','l','l',' ','D','l','g',0};

Especially for tests, is there any reason now to avoid using L””-style literals for wchar strings?

If not, you could get rid of ms_shell_dlg completely and substitute L"MS Shell Dlg" for the one remaining place ms_shell_dlg is used.