Module: wine Branch: master Commit: d82255575b8be0fc8068a5572f9077a965103f2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d82255575b8be0fc8068a5572f...
Author: Matteo Bruni matteo.mystral@gmail.com Date: Fri Sep 3 15:25:23 2010 +0200
d3dx9: Fix D3DXAssembleShader tests.
---
dlls/d3dx9_36/tests/asm.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/dlls/d3dx9_36/tests/asm.c b/dlls/d3dx9_36/tests/asm.c index 19907aa..4d319ed 100644 --- a/dlls/d3dx9_36/tests/asm.c +++ b/dlls/d3dx9_36/tests/asm.c @@ -115,6 +115,7 @@ static void assembleshader_test(void) { "#include "incl4.vsh"\n" }; const char testincl4_ok[] = { + "#define REGISTER r0\n" "vs.1.1\n" }; const char testincl4_wrong[] = { @@ -208,9 +209,9 @@ static void assembleshader_test(void) { } if(shader) ID3DXBuffer_Release(shader);
- shader_vsh_res = create_file("shader.vsh", testshader, sizeof(testshader)); + shader_vsh_res = create_file("shader.vsh", testshader, sizeof(testshader) - 1); if(SUCCEEDED(shader_vsh_res)) { - create_file("incl.vsh", testincl, sizeof(testincl)); + create_file("incl.vsh", testincl, sizeof(testincl) - 1);
/* D3DXAssembleShaderFromFile + #include test */ shader = NULL; @@ -238,11 +239,11 @@ static void assembleshader_test(void) { } if(shader) ID3DXBuffer_Release(shader);
- create_file("shader3.vsh", testshader3, sizeof(testshader3)); - create_file("incl4.vsh", testincl4_wrong, sizeof(testincl4_wrong)); + create_file("shader3.vsh", testshader3, sizeof(testshader3) - 1); + create_file("incl4.vsh", testincl4_wrong, sizeof(testincl4_wrong) - 1); if(CreateDirectoryA("include", NULL)) { - create_file("include/incl3.vsh", testincl3, sizeof(testincl3)); - create_file("include/incl4.vsh", testincl4_ok, sizeof(testincl4_ok)); + create_file("include/incl3.vsh", testincl3, sizeof(testincl3) - 1); + create_file("include/incl4.vsh", testincl4_ok, sizeof(testincl4_ok) - 1);
/* path search #include test */ shader = NULL;