[ros-diffs] [reactos] 197/218: [WINESYNC] d3dx9/tests: Use wide-char string literals.

[winesync]

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

commit fe25fbb5fec3db8a896d53398af259cda70612fe
Author:     winesync <ros-dev(a)reactos.org>
AuthorDate: Tue Jan 5 13:16:35 2021 +0100
Commit:     Jérôme Gardou <jerome.gardou(a)reactos.org>
CommitDate: Thu Feb 4 16:37:07 2021 +0100

    [WINESYNC] d3dx9/tests: Use wide-char string literals.
    
    Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org>
    Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com>
    Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
    
    wine commit id bffe111672972cb26c319c029ca469520742c720 by Michael Stefaniuc
<mstefani(a)winehq.org>
---
 modules/rostests/winetests/d3dx9_36/asm.c    | 6 ++----
 modules/rostests/winetests/d3dx9_36/effect.c | 8 +++-----
 sdk/tools/winesync/d3dx9.cfg                 | 2 +-
 3 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/modules/rostests/winetests/d3dx9_36/asm.c
b/modules/rostests/winetests/d3dx9_36/asm.c
index 4087bd89b09..9b4e82f218a 100644
--- a/modules/rostests/winetests/d3dx9_36/asm.c
+++ b/modules/rostests/winetests/d3dx9_36/asm.c
@@ -195,7 +195,6 @@ static void assembleshader_test(void)
     };
     struct D3DXIncludeImpl include;
     char shader_vsh_path[MAX_PATH], shader3_vsh_path[MAX_PATH];
-    static const WCHAR shader_filename_w[] =
{'s','h','a','d','e','r','.','v','s','h',0};
 
     /* pDefines test */
     shader = NULL;
@@ -356,7 +355,7 @@ static void assembleshader_test(void)
 
         shader = NULL;
         messages = NULL;
-        hr = D3DXAssembleShaderFromFileW(shader_filename_w, NULL,
&include.ID3DXInclude_iface,
+        hr = D3DXAssembleShaderFromFileW(L"shader.vsh", NULL,
&include.ID3DXInclude_iface,
                 D3DXSHADER_SKIPVALIDATION, &shader, &messages);
         ok(hr == D3D_OK, "D3DXAssembleShaderFromFile + pInclude main shader test
failed with error 0x%x - %d\n",
                 hr, hr & 0x0000ffff);
@@ -445,7 +444,6 @@ static void d3dxpreprocess_test(void)
     ID3DXBuffer *shader, *messages;
     char shader_vsh_path[MAX_PATH], shader3_vsh_path[MAX_PATH];
     static struct D3DXIncludeImpl include = {{&D3DXInclude_Vtbl}};
-    static const WCHAR shader_filename_w[] =
{'s','h','a','d','e','r','.','v','s','h',0};
 
     if (create_file("shader.vsh", testshader, sizeof(testshader) - 1,
shader_vsh_path))
     {
@@ -520,7 +518,7 @@ static void d3dxpreprocess_test(void)
 
         shader = NULL;
         messages = NULL;
-        hr = D3DXPreprocessShaderFromFileW(shader_filename_w, NULL,
&include.ID3DXInclude_iface,
+        hr = D3DXPreprocessShaderFromFileW(L"shader.vsh", NULL,
&include.ID3DXInclude_iface,
                 &shader, &messages);
         ok(hr == D3D_OK, "D3DXPreprocessShaderFromFile + pInclude main shader test
failed with error 0x%x - %d\n",
                 hr, hr & 0x0000ffff);
diff --git a/modules/rostests/winetests/d3dx9_36/effect.c
b/modules/rostests/winetests/d3dx9_36/effect.c
index 3455071c1b2..d96f70351ec 100644
--- a/modules/rostests/winetests/d3dx9_36/effect.c
+++ b/modules/rostests/winetests/d3dx9_36/effect.c
@@ -7755,8 +7755,6 @@ static void test_create_effect_from_file(void)
         "        VertexShader = compile vs_2_0 vs_main();\n"
         "    }\n"
         "}\n";
-    static const WCHAR effect1_filename_w[] =
{'e','f','f','e','c','t','1','.','f','x',0};
-    static const WCHAR effect2_filename_w[] =
{'e','f','f','e','c','t','2','.','f','x',0};
     WCHAR effect_path_w[MAX_PATH], filename_w[MAX_PATH];
     char effect_path[MAX_PATH], filename[MAX_PATH];
     D3DPRESENT_PARAMETERS present_parameters = {0};
@@ -7813,7 +7811,7 @@ static void test_create_effect_from_file(void)
     create_file("include1.h", include1_wrong, sizeof(include1_wrong) - 1,
NULL);
 
     lstrcpyW(filename_w, effect_path_w);
-    lstrcatW(filename_w, effect1_filename_w);
+    lstrcatW(filename_w, L"effect1.fx");
     effect = NULL;
     messages = NULL;
     hr = D3DXCreateEffectFromFileExW(device, filename_w, NULL, NULL, NULL,
@@ -7828,7 +7826,7 @@ static void test_create_effect_from_file(void)
         effect->lpVtbl->Release(effect);
 
     lstrcpyW(filename_w, effect_path_w);
-    lstrcatW(filename_w, effect2_filename_w);
+    lstrcatW(filename_w, L"effect2.fx");
     effect = NULL;
     messages = NULL;
     /* This is apparently broken on native, it ends up using the wrong include. */
@@ -7850,7 +7848,7 @@ static void test_create_effect_from_file(void)
     delete_file("include2.h");
     delete_directory("include");
 
-    lstrcpyW(filename_w, effect2_filename_w);
+    lstrcpyW(filename_w, L"effect2.fx");
     effect = NULL;
     messages = NULL;
     include.ID3DXInclude_iface.lpVtbl = &d3dxinclude_vtbl;
diff --git a/sdk/tools/winesync/d3dx9.cfg b/sdk/tools/winesync/d3dx9.cfg
index 5af2cd084a9..cfedea25e50 100644
--- a/sdk/tools/winesync/d3dx9.cfg
+++ b/sdk/tools/winesync/d3dx9.cfg
@@ -34,4 +34,4 @@ files:
   include/d3dx9tex.h: sdk/include/dxsdk/d3dx9tex.h
   include/d3dx9xof.h: sdk/include/dxsdk/d3dx9xof.h
 tags:
-  wine: 1dcc3ab292151cd91ea4202b92107c3a91527c7a
+  wine: bffe111672972cb26c319c029ca469520742c720