graw/gdi: do not depend on UNICODE macro
authorErik Faye-Lund <erik.faye-lund@collabora.com>
Mon, 1 Jun 2020 15:45:23 +0000 (17:45 +0200)
committerMarge Bot <eric+marge@anholt.net>
Sat, 20 Jun 2020 06:51:54 +0000 (06:51 +0000)
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>

src/gallium/targets/graw-gdi/graw_gdi.c

index aa75c73b98039dc82ccd7f67dce97a4235535107..a24841c8fd600ca1e938a9dbd472bfb0a7c90ceb 100644 (file)
@@ -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);