ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

d3dcompiler/tests: Add a couple more checks for parent data values.

This commit is contained in:
Matteo Bruni 2014-06-24 22:25:30 +02:00 committed by Alexandre Julliard
parent efcaad3911
commit 342eec7f7d
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dlls/d3dcompiler_43/compiler.c
View File

@ -145,11 +145,12 @@ static void wpp_warning(const char *file, int line, int col, const char *near,
static char *wpp_lookup_mem(const char *filename, int type, const char *parent_name, static char *wpp_lookup_mem(const char *filename, int type, const char *parent_name,
char **include_path, int include_path_count) char **include_path, int include_path_count)
{ {
/* Here we return always ok. We will maybe fail on the next wpp_open_mem */ /* We don't check for file existence here. We will potentially fail on
* the following wpp_open_mem(). */
char *path; char *path;
int i; int i;
TRACE("Looking for include %s.\n", debugstr_a(filename)); TRACE("Looking for include %s, parent %s.\n", debugstr_a(filename), debugstr_a(parent_name));
parent_include = NULL; parent_include = NULL;
if (strcmp(parent_name, initial_filename)) if (strcmp(parent_name, initial_filename))

2
dlls/d3dcompiler_43/tests/asm.c
View File

@ -1446,12 +1446,14 @@ static HRESULT WINAPI testD3DInclude_open(ID3DInclude *iface, D3D_INCLUDE_TYPE i
buffer = HeapAlloc(GetProcessHeap(), 0, sizeof(include)); buffer = HeapAlloc(GetProcessHeap(), 0, sizeof(include));
CopyMemory(buffer, include, sizeof(include)); CopyMemory(buffer, include, sizeof(include));
*bytes = sizeof(include); *bytes = sizeof(include);
ok(!parent_data, "Wrong parent_data value.\n");
} }
else if (!strcmp(filename, "incl2.vsh")) else if (!strcmp(filename, "incl2.vsh"))
{ {
buffer = HeapAlloc(GetProcessHeap(), 0, sizeof(include2)); buffer = HeapAlloc(GetProcessHeap(), 0, sizeof(include2));
CopyMemory(buffer, include2, sizeof(include2)); CopyMemory(buffer, include2, sizeof(include2));
*bytes = sizeof(include2); *bytes = sizeof(include2);
ok(!parent_data, "Wrong parent_data value.\n");
ok(include_type == D3D_INCLUDE_LOCAL, "Wrong include type %d.\n", include_type); ok(include_type == D3D_INCLUDE_LOCAL, "Wrong include type %d.\n", include_type);
} }
else if (!strcmp(filename, "incl3.vsh")) else if (!strcmp(filename, "incl3.vsh"))