Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-22 16:36:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

[WINESYNC] d3dx9/tests: Use wide-char string literals.

Browse source 
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id bffe111672972cb26c319c029ca469520742c720 by Michael Stefaniuc <mstefani@winehq.org>
This commit is contained in:
winesync 2021-01-05 13:16:35 +01:00 committed by Jérôme Gardou
parent 868f57e6b2
commit fe25fbb5fe
3 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
modules/rostests/winetests/d3dx9_36/asm.c
View file

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

8
modules/rostests/winetests/d3dx9_36/effect.c
View file

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

2
sdk/tools/winesync/d3dx9.cfg
View file

@ -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