vkd3d-shader/preproc: Treat CR as whitespace.

Approved-by: Henri Verbeet (@hverbeet)
Approved-by: Elizabeth Figura (@zfigura)
Approved-by: Alexandre Julliard (@julliard)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/879

libs/vkd3d-shader/preproc.l

@@ -65,7 +65,7 @@ static void update_location(struct preproc_ctx *ctx);
 %s LINE
 
 NEWLINE         \r?\n
-WS              [ \t]
+WS              [ \t\r]
 IDENTIFIER      [A-Za-z_][A-Za-z0-9_]*
 INT_SUFFIX      [uUlL]{0,2}
 

tests/hlsl_d3d12.c

@@ -379,6 +379,18 @@ static void test_preprocess(void)
             "pass",
             "fail",
         },
+
+        /* CRs are treated as whitespace. */
+        {
+            "#define\rKEY(a,\rb)\ra##b\r\n"
+            "KEY(pa,\rss)\r\n"
+            "#ifndef\rKEY\r\n"
+            "fail\r\n"
+            "#endif\r\n",
+
+            "pass",
+            "fail",
+        }
     };
 
     for (i = 0; i < ARRAY_SIZE(tests); ++i)