From: Erik Faye-Lund <erik.faye-lund@collabora.com>
Date: Mon, 1 Jun 2020 15:45:23 +0000 (+0200)
Subject: graw/gdi: do not depend on UNICODE macro
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e6fa8ed96854f56abfae92f69b85644289ba6aa4;p=mesa.git

graw/gdi: do not depend on UNICODE macro

Similar to the previous patch, we currently depend on the UNICODE macro
not being set, but it sometimes ends up getting set after all.

Unlike the previous patch, the easier thing to do here, is to lean into
the Unicode wrappers, and use the TEXT()-macro to define a Unicode
or ASCII literal, depending on the setting of the UNICODE macro.

Acked-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5497>
---

diff --git a/src/gallium/targets/graw-gdi/graw_gdi.c b/src/gallium/targets/graw-gdi/graw_gdi.c
index aa75c73b980..a24841c8fd6 100644
--- a/src/gallium/targets/graw-gdi/graw_gdi.c
+++ b/src/gallium/targets/graw-gdi/graw_gdi.c
@@ -87,7 +87,7 @@ graw_create_window_and_screen(int x,
    wc.cbSize = sizeof wc;
    wc.style = CS_OWNDC | CS_HREDRAW | CS_VREDRAW;
    wc.lpfnWndProc = window_proc;
-   wc.lpszClassName = "graw-gdi";
+   wc.lpszClassName = TEXT("graw-gdi");
    wc.hInstance = GetModuleHandle(NULL);
    wc.hIcon = LoadIcon(NULL, IDI_APPLICATION);
    wc.hCursor = LoadCursor(NULL, IDC_ARROW);