Mesa (master): graw/gdi: do not depend on UNICODE macro

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Sat Jun 20 07:11:56 UTC 2020


Module: Mesa
Branch: master
Commit: e6fa8ed96854f56abfae92f69b85644289ba6aa4
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=e6fa8ed96854f56abfae92f69b85644289ba6aa4

Author: Erik Faye-Lund <erik.faye-lund at collabora.com>
Date:   Mon Jun  1 17:45:23 2020 +0200

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 at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5497>

---

 src/gallium/targets/graw-gdi/graw_gdi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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);



More information about the mesa-commit mailing list