[reactos] 01/01: [D3DCOMPILER_43] Sync with Wine Staging 4.0. CORE-15682

[Amine Khaldi]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6971090559bfb966ac3f9…

commit 6971090559bfb966ac3f9f5ea618bde1db01f1d9
Author:     Amine Khaldi <amine.khaldi(a)reactos.org>
AuthorDate: Fri Jan 25 13:08:25 2019 +0100
Commit:     Amine Khaldi <amine.khaldi(a)reactos.org>
CommitDate: Fri Jan 25 13:08:25 2019 +0100

    [D3DCOMPILER_43] Sync with Wine Staging 4.0. CORE-15682
---
 dll/directx/wine/d3dcompiler_43/utils.c | 7 +++++--
 media/doc/README.WINE                   | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/dll/directx/wine/d3dcompiler_43/utils.c
b/dll/directx/wine/d3dcompiler_43/utils.c
index be0adbbf2c..95a1dbd3d5 100644
--- a/dll/directx/wine/d3dcompiler_43/utils.c
+++ b/dll/directx/wine/d3dcompiler_43/utils.c
@@ -2138,9 +2138,12 @@ static void debug_dump_ir_constructor(const struct
hlsl_ir_constructor *construc
 
 static const char *debug_writemask(DWORD writemask)
 {
-    char string[5], components[] = {'x', 'y', 'z', 'w'};
+    static const char components[] = {'x', 'y', 'z',
'w'};
+    char string[5];
     unsigned int i = 0, pos = 0;
 
+    assert(!(writemask & ~BWRITERSP_WRITEMASK_ALL));
+
     while (writemask)
     {
         if (writemask & 1)
@@ -2176,7 +2179,7 @@ static void debug_dump_ir_swizzle(const struct hlsl_ir_swizzle
*swizzle)
     }
     else
     {
-        char c[] = {'x', 'y', 'z', 'w'};
+        static const char c[] = {'x', 'y', 'z', 'w'};
 
         for (i = 0; i < swizzle->node.data_type->dimx; ++i)
             TRACE("%c", c[(swizzle->swizzle >> i * 2) & 0x3]);
diff --git a/media/doc/README.WINE b/media/doc/README.WINE
index 9494440bff..3a225d4992 100644
--- a/media/doc/README.WINE
+++ b/media/doc/README.WINE
@@ -24,7 +24,7 @@ The following libraries are shared with Wine.
 reactos/dll/directx/wine/amstream       # Synced to WineStaging-3.9
 reactos/dll/directx/wine/d3d8           # Synced to WineStaging-3.9
 reactos/dll/directx/wine/d3d9           # Synced to WineStaging-3.9
-reactos/dll/directx/wine/d3dcompiler_43 # Synced to WineStaging-3.17
+reactos/dll/directx/wine/d3dcompiler_43 # Synced to WineStaging-4.0
 reactos/dll/directx/wine/d3drm          # Synced to WineStaging-3.9
 reactos/dll/directx/wine/d3dx9_24 => 43 # Synced to WineStaging-3.17
 reactos/dll/directx/wine/d3dxof         # Synced to WineStaging-3.17