August 2014 - Wine-commits - list.winehq.org

Gerald Pfeifer : jscript: Remove unused propertyIsEnumerableW and isPrototypeOfW.
by Alexandre Julliard 25 Aug '14

25 Aug '14

Module: wine Branch: master Commit: 2d56e775370489352518ec990302a348cf764343 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d56e775370489352518ec990… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Aug 23 19:09:34 2014 +0200 jscript: Remove unused propertyIsEnumerableW and isPrototypeOfW. --- dlls/jscript/date.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/jscript/date.c b/dlls/jscript/date.c index d40d80f..81b714f 100644 --- a/dlls/jscript/date.c +++ b/dlls/jscript/date.c @@ -48,9 +48,6 @@ typedef struct { static const WCHAR toStringW[] = {'t','o','S','t','r','i','n','g',0}; static const WCHAR toLocaleStringW[] = {'t','o','L','o','c','a','l','e','S','t','r','i','n','g',0}; -static const WCHAR propertyIsEnumerableW[] = - {'p','r','o','p','e','r','t','y','I','s','E','n','u','m','e','r','a','b','l','e',0}; -static const WCHAR isPrototypeOfW[] = {'i','s','P','r','o','t','o','t','y','p','e','O','f',0}; static const WCHAR valueOfW[] = {'v','a','l','u','e','O','f',0}; static const WCHAR toUTCStringW[] = {'t','o','U','T','C','S','t','r','i','n','g',0}; static const WCHAR toGMTStringW[] = {'t','o','G','M','T','S','t','r','i','n','g',0};

1 0

Gerald Pfeifer : crypt32: Remove elementStatus29, simpleStatus29, andnoMatchingNameBrokenStatus.
by Alexandre Julliard 25 Aug '14

25 Aug '14

Module: wine Branch: master Commit: fdfd6b6342fb0f3d2cc29fe9f30e8e73d4c73ea3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdfd6b6342fb0f3d2cc29fe9f… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Aug 23 19:14:55 2014 +0200 crypt32: Remove elementStatus29, simpleStatus29, andnoMatchingNameBrokenStatus. --- dlls/crypt32/tests/chain.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index bf02ca0..36fc16a 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -3347,14 +3347,6 @@ static CONST_DATA_BLOB chain29[] = { { sizeof(chain0_0), chain0_0 }, { sizeof(chain29_1), chain29_1 }, }; -static const CERT_TRUST_STATUS elementStatus29[] = { - { CERT_TRUST_NO_ERROR, CERT_TRUST_HAS_NAME_MATCH_ISSUER }, - { CERT_TRUST_IS_UNTRUSTED_ROOT | CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT, - CERT_TRUST_IS_SELF_SIGNED | CERT_TRUST_HAS_NAME_MATCH_ISSUER }, -}; -static const SimpleChainStatusCheck simpleStatus29[] = { - { sizeof(elementStatus29) / sizeof(elementStatus29[0]), elementStatus29 }, -}; static CONST_DATA_BLOB chain30[] = { { sizeof(chain0_0), chain0_0 }, { sizeof(chain30_1), chain30_1 }, @@ -4228,10 +4220,6 @@ static const ChainPolicyCheck googlePolicyCheckWithMatchingName = { { 0, 0, -1, -1, NULL}, &expiredStatus, 0 }; -/* Windows NT 4 has a different error code when the name doesn't match. */ -static const CERT_CHAIN_POLICY_STATUS noMatchingNameBrokenStatus = - { 0, CERT_E_ROLE, 0, 0, NULL }; - /* Win98 does not trust the root of the OpenSSL chain or the Stanford chain */ static const CERT_CHAIN_POLICY_STATUS untrustedRootStatus = { 0, CERT_E_UNTRUSTEDROOT, 0, 0, NULL };

1 0

Gerald Pfeifer : crypt32: Remove unused bin58.
by Alexandre Julliard 25 Aug '14

25 Aug '14

Module: wine Branch: master Commit: f9de50ac8a1012c51a38a7717e9c5565903a5774 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9de50ac8a1012c51a38a7717… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Aug 23 19:18:15 2014 +0200 crypt32: Remove unused bin58. --- dlls/crypt32/tests/encode.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index 532c322..16b3532 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -2055,7 +2055,6 @@ static const unsigned char bin54[] = { 0x03,0x03,0x01,0xff,0xfe }; static const unsigned char bin55[] = { 0xff,0xfe }; static const unsigned char bin56[] = { 0x03,0x02,0x01,0xfe }; static const unsigned char bin57[] = { 0xfe }; -static const unsigned char bin58[] = { 0x03,0x01,0x00 }; static const struct encodedBits bits[] = { /* normal test cases */

1 0

Gerald Pfeifer : gdiplus: Remove three unused constants.
by Alexandre Julliard 25 Aug '14

25 Aug '14

Module: wine Branch: master Commit: 42afdebc430a1ffe28888ff5dd75179955086a78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42afdebc430a1ffe28888ff5d… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Aug 23 23:05:47 2014 +0200 gdiplus: Remove three unused constants. --- dlls/gdiplus/tests/font.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c index b826ba6..932b5ed 100644 --- a/dlls/gdiplus/tests/font.c +++ b/dlls/gdiplus/tests/font.c @@ -32,11 +32,8 @@ static const WCHAR nonexistent[] = {'T','h','i','s','F','o','n','t','s','h','o','u','l','d','N','o','t','E','x','i','s','t','\0'}; static const WCHAR MSSansSerif[] = {'M','S',' ','S','a','n','s',' ','S','e','r','i','f','\0'}; -static const WCHAR MicrosoftSansSerif[] = {'M','i','c','r','o','s','o','f','t',' ','S','a','n','s',' ','S','e','r','i','f','\0'}; static const WCHAR TimesNewRoman[] = {'T','i','m','e','s',' ','N','e','w',' ','R','o','m','a','n','\0'}; -static const WCHAR CourierNew[] = {'C','o','u','r','i','e','r',' ','N','e','w','\0'}; static const WCHAR Tahoma[] = {'T','a','h','o','m','a',0}; -static const WCHAR LiberationSerif[] = {'L','i','b','e','r','a','t','i','o','n',' ','S','e','r','i','f',0}; static void set_rect_empty(RectF *rc) {

1 0

Gerald Pfeifer : winedbg: Avoid a compiler warning about " use of uninitialized" in in types_extract_as_longlong.
by Alexandre Julliard 25 Aug '14

25 Aug '14

Module: wine Branch: master Commit: ab8e9d23a08b5bf69d88fa48d9e62d96dffe38ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab8e9d23a08b5bf69d88fa48d… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun Aug 24 00:40:56 2014 +0200 winedbg: Avoid a compiler warning about "use of uninitialized" in in types_extract_as_longlong. --- programs/winedbg/types.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/winedbg/types.c b/programs/winedbg/types.c index 03c69ab..de790c7 100644 --- a/programs/winedbg/types.c +++ b/programs/winedbg/types.c @@ -123,7 +123,7 @@ LONGLONG types_extract_as_longlong(const struct dbg_lvalue* lvalue, default: WINE_FIXME("Unsupported tag %u\n", tag); RaiseException(DEBUG_STATUS_NOT_AN_INTEGER, 0, 0, NULL); - break; + rtn = 0; } return rtn;

1 0

Matteo Bruni : d3dx9: Properly evaluate fallbacks for luminance texture formats in D3DXCheckTextureRequirements.
by Alexandre Julliard 25 Aug '14

25 Aug '14

Module: wine Branch: master Commit: 770eaec561c8920b64c07b5152611c55a7038eb9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=770eaec561c8920b64c07b515… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Aug 25 20:36:50 2014 +0200 d3dx9: Properly evaluate fallbacks for luminance texture formats in D3DXCheckTextureRequirements. --- dlls/d3dx9_36/tests/texture.c | 22 ++++++++++++++++++++++ dlls/d3dx9_36/texture.c | 29 +++++++++++++++++++++++++---- 2 files changed, 47 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c index 6322c70..61132bb 100644 --- a/dlls/d3dx9_36/tests/texture.c +++ b/dlls/d3dx9_36/tests/texture.c @@ -340,6 +340,28 @@ static void test_D3DXCheckTextureRequirements(IDirect3DDevice9 *device) ok(hr == D3D_OK, "D3DXCheckTextureRequirements returned %#x, expected %#x\n", hr, D3D_OK); ok(format == expected, "Returned format %u, expected %u\n", format, expected); + if(SUCCEEDED(IDirect3D9_CheckDeviceFormat(d3d, params.AdapterOrdinal, params.DeviceType, + mode.Format, D3DUSAGE_RENDERTARGET, D3DRTYPE_TEXTURE, D3DFMT_L8))) + expected = D3DFMT_L8; + else + expected = D3DFMT_X8R8G8B8; + + format = D3DFMT_L8; + hr = D3DXCheckTextureRequirements(device, NULL, NULL, NULL, D3DUSAGE_RENDERTARGET, &format, D3DPOOL_DEFAULT); + ok(hr == D3D_OK, "D3DXCheckTextureRequirements returned %#x, expected %#x\n", hr, D3D_OK); + ok(format == expected, "Returned format %u, expected %u\n", format, expected); + + if(SUCCEEDED(IDirect3D9_CheckDeviceFormat(d3d, params.AdapterOrdinal, params.DeviceType, + mode.Format, D3DUSAGE_RENDERTARGET, D3DRTYPE_TEXTURE, D3DFMT_L16))) + expected = D3DFMT_L16; + else + expected = D3DFMT_A16B16G16R16; + + format = D3DFMT_L16; + hr = D3DXCheckTextureRequirements(device, NULL, NULL, NULL, D3DUSAGE_RENDERTARGET, &format, D3DPOOL_DEFAULT); + ok(hr == D3D_OK, "D3DXCheckTextureRequirements returned %#x, expected %#x\n", hr, D3D_OK); + ok(format == expected, "Returned format %u, expected %u\n", format, expected); + /* Block-based texture formats and size < block size. */ if (has_2d_dxt5) { diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c index 32415a2..47c3c1d 100644 --- a/dlls/d3dx9_36/texture.c +++ b/dlls/d3dx9_36/texture.c @@ -184,6 +184,27 @@ HRESULT WINAPI D3DXFilterTexture(IDirect3DBaseTexture9 *texture, } } +static D3DFORMAT get_luminance_replacement_format(D3DFORMAT format) +{ + static const struct + { + D3DFORMAT luminance_format; + D3DFORMAT replacement_format; + } luminance_replacements[] = + { + {D3DFMT_L8, D3DFMT_X8R8G8B8}, + {D3DFMT_A8L8, D3DFMT_A8R8G8B8}, + {D3DFMT_A4L4, D3DFMT_A4R4G4B4}, + {D3DFMT_L16, D3DFMT_A16B16G16R16} + }; + unsigned int i; + + for (i = 0; i < sizeof(luminance_replacements) / sizeof(luminance_replacements[0]); ++i) + if (format == luminance_replacements[i].luminance_format) + return luminance_replacements[i].replacement_format; + return format; +} + HRESULT WINAPI D3DXCheckTextureRequirements(struct IDirect3DDevice9 *device, UINT *width, UINT *height, UINT *miplevels, DWORD usage, D3DFORMAT *format, D3DPOOL pool) { @@ -255,16 +276,16 @@ HRESULT WINAPI D3DXCheckTextureRequirements(struct IDirect3DDevice9 *device, UIN FIXME("Pixel format %x not handled\n", usedformat); goto cleanup; } + fmt = get_format_info(get_luminance_replacement_format(usedformat)); allow_24bits = fmt->bytes_per_pixel == 3; - channels = (fmt->bits[0] ? 1 : 0) + (fmt->bits[1] ? 1 : 0) - + (fmt->bits[2] ? 1 : 0) + (fmt->bits[3] ? 1 : 0); + channels = !!fmt->bits[0] + !!fmt->bits[1] + !!fmt->bits[2] + !!fmt->bits[3]; usedformat = D3DFMT_UNKNOWN; while ((curfmt = get_format_info_idx(i))) { - unsigned int curchannels = (curfmt->bits[0] ? 1 : 0) + (curfmt->bits[1] ? 1 : 0) - + (curfmt->bits[2] ? 1 : 0) + (curfmt->bits[3] ? 1 : 0); + unsigned int curchannels = !!curfmt->bits[0] + !!curfmt->bits[1] + + !!curfmt->bits[2] + !!curfmt->bits[3]; int score; i++;

1 0

Matteo Bruni : d3dx9: Account for include paths mixing '/' and '\'.
by Alexandre Julliard 25 Aug '14

25 Aug '14

Module: wine Branch: master Commit: ec364eaa4f70e35466d0f4eb85a28eca08b04c66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec364eaa4f70e35466d0f4eb8… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Aug 25 20:36:51 2014 +0200 d3dx9: Account for include paths mixing '/' and '\'. Include pathnames are passed unchanged to ID3DInclude objects so e.g. if a file is included as "path/file.h" the full pathname will have mixed slashes. --- dlls/d3dx9_36/shader.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index b36e7bb..5ea3d13 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -242,7 +242,7 @@ static HRESULT WINAPI d3dincludefromfile_open(ID3DXInclude *iface, D3DXINCLUDE_T const char *filename, const void *parent_data, const void **data, UINT *bytes) { const char *p, *parent_name = ""; - char *pathname = NULL; + char *pathname = NULL, *ptr; char **buffer = NULL; HANDLE file; UINT size; @@ -259,14 +259,23 @@ static HRESULT WINAPI d3dincludefromfile_open(ID3DXInclude *iface, D3DXINCLUDE_T TRACE("Looking up for include file %s, parent %s\n", debugstr_a(filename), debugstr_a(parent_name)); - if ((p = strrchr(parent_name, '\\')) || (p = strrchr(parent_name, '/'))) p++; - else p = parent_name; + if ((p = strrchr(parent_name, '\\'))) + ++p; + else + p = parent_name; pathname = HeapAlloc(GetProcessHeap(), 0, (p - parent_name) + strlen(filename) + 1); if(!pathname) return HRESULT_FROM_WIN32(GetLastError()); memcpy(pathname, parent_name, p - parent_name); strcpy(pathname + (p - parent_name), filename); + ptr = pathname + (p - parent_name); + while (*ptr) + { + if (*ptr == '/') + *ptr = '\\'; + ++ptr; + } file = CreateFileA(pathname, GENERIC_READ, FILE_SHARE_READ, 0, OPEN_EXISTING, 0, 0); if(file == INVALID_HANDLE_VALUE)

1 0

Matteo Bruni : d3dx9/tests: Add a test for an include path containing '/'.
by Alexandre Julliard 25 Aug '14

25 Aug '14

Module: wine Branch: master Commit: bc8d913199e870c6de2bdbc43f74b2806a508b5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc8d913199e870c6de2bdbc43… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Aug 25 20:36:52 2014 +0200 d3dx9/tests: Add a test for an include path containing '/'. --- dlls/d3dx9_36/tests/asm.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/dlls/d3dx9_36/tests/asm.c b/dlls/d3dx9_36/tests/asm.c index 5bda4d0..3ee501e 100644 --- a/dlls/d3dx9_36/tests/asm.c +++ b/dlls/d3dx9_36/tests/asm.c @@ -86,6 +86,13 @@ static HRESULT WINAPI testD3DXInclude_open(ID3DXInclude *iface, D3DXINCLUDE_TYPE /* Also check for the correct parent_data content */ ok(parent_data != NULL && !strncmp(include2, parent_data, strlen(include2)), "wrong parent_data value\n"); } + else if (!strcmp(filename, "include/incl3.vsh")) + { + buffer = HeapAlloc(GetProcessHeap(), 0, sizeof(include)); + memcpy(buffer, include, sizeof(include)); + *bytes = sizeof(include); + ok(!parent_data, "wrong parent_data value\n"); + } else { ok(0, "Unexpected #include for file %s.\n", filename); @@ -221,6 +228,20 @@ static void assembleshader_test(void) } if(shader) ID3DXBuffer_Release(shader); + /* #include with a path. */ + shader = NULL; + messages = NULL; + hr = D3DXAssembleShader(testshader3, strlen(testshader3), NULL, &include.ID3DXInclude_iface, + D3DXSHADER_SKIPVALIDATION, &shader, &messages); + ok(hr == D3D_OK, "D3DXAssembleShader test failed with error 0x%x - %d\n", hr, hr & 0x0000ffff); + if (messages) + { + trace("Path search D3DXAssembleShader messages:\n%s", (char *)ID3DXBuffer_GetBufferPointer(messages)); + ID3DXBuffer_Release(messages); + } + if (shader) + ID3DXBuffer_Release(shader); + shader_vsh_res = create_file("shader.vsh", testshader, sizeof(testshader) - 1); if(SUCCEEDED(shader_vsh_res)) { create_file("incl.vsh", testincl, sizeof(testincl) - 1);

1 0

Matteo Bruni : d3dcompiler/tests: Add a test for an include path containing '/'.
by Alexandre Julliard 25 Aug '14

25 Aug '14

Module: wine Branch: master Commit: 67a6caa1c1e6fd8c88c8cae9ef50af17731a52f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67a6caa1c1e6fd8c88c8cae9e… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Aug 25 20:36:53 2014 +0200 d3dcompiler/tests: Add a test for an include path containing '/'. --- dlls/d3dcompiler_43/tests/asm.c | 39 ++++++++++++++++++++++++++------------- 1 file changed, 26 insertions(+), 13 deletions(-) diff --git a/dlls/d3dcompiler_43/tests/asm.c b/dlls/d3dcompiler_43/tests/asm.c index 618a541..69dca59 100644 --- a/dlls/d3dcompiler_43/tests/asm.c +++ b/dlls/d3dcompiler_43/tests/asm.c @@ -1432,11 +1432,11 @@ static void failure_test(void) { static HRESULT WINAPI testD3DInclude_open(ID3DInclude *iface, D3D_INCLUDE_TYPE include_type, const char *filename, const void *parent_data, const void **data, UINT *bytes) { + static const char include[] = "#define REGISTER r0\nvs.1.1\n"; + static const char include2[] = "#include \"incl3.vsh\"\n"; + static const char include3[] = "vs.1.1\n"; + static const char include4[] = "#include <incl3.vsh>\n"; char *buffer; - char include[] = "#define REGISTER r0\nvs.1.1\n"; - char include2[] = "#include \"incl3.vsh\"\n"; - char include3[] = "vs.1.1\n"; - char include4[] = "#include <incl3.vsh>\n"; trace("include_type = %d, filename %s\n", include_type, filename); trace("parent_data (%p) -> %s\n", parent_data, parent_data ? (char *)parent_data : "(null)"); @@ -1475,6 +1475,13 @@ static HRESULT WINAPI testD3DInclude_open(ID3DInclude *iface, D3D_INCLUDE_TYPE i ok(parent_data == NULL, "Wrong parent_data value.\n"); ok(include_type == D3D_INCLUDE_SYSTEM, "Wrong include type %d.\n", include_type); } + else if (!strcmp(filename, "includes/incl.vsh")) + { + buffer = HeapAlloc(GetProcessHeap(), 0, sizeof(include)); + CopyMemory(buffer, include, sizeof(include)); + *bytes = sizeof(include); + ok(!parent_data, "Wrong parent_data value.\n"); + } else { ok(FALSE, "Unexpected file %s included.\n", filename); @@ -1503,17 +1510,18 @@ struct D3DIncludeImpl { }; static void assembleshader_test(void) { - const char test1[] = { + static const char test1[] = + { "vs.1.1\n" "mov DEF2, v0\n" }; - const char testshader[] = { + static const char testshader[] = + { "#include \"incl.vsh\"\n" "mov REGISTER, v0\n" }; - HRESULT hr; - LPD3DBLOB shader, messages; - D3D_SHADER_MACRO defines[] = { + static const D3D_SHADER_MACRO defines[] = + { { "DEF1", "10 + 15" }, @@ -1524,6 +1532,8 @@ static void assembleshader_test(void) { NULL, NULL } }; + HRESULT hr; + LPD3DBLOB shader, messages; struct D3DIncludeImpl include; /* defines test */ @@ -1587,19 +1597,19 @@ static void assembleshader_test(void) { static void d3dpreprocess_test(void) { - const char test1[] = + static const char test1[] = { "vs.1.1\n" "mov DEF2, v0\n" }; - const char quotation_marks_test[] = + static const char quotation_marks_test[] = { "vs.1.1\n" "; ' comment\n" "; \" comment\n" "mov 0, v0\n" }; - const char *include_test_shaders[] = + static const char *include_test_shaders[] = { "#include \"incl.vsh\"\n" "mov REGISTER, v0\n", @@ -1612,10 +1622,13 @@ static void d3dpreprocess_test(void) "#include <incl4.vsh>\n" "mov REGISTER, v0\n", + + "#include \"includes/incl.vsh\"\n" + "mov REGISTER, v0\n" }; HRESULT hr; ID3DBlob *shader, *messages; - D3D_SHADER_MACRO defines[] = + static const D3D_SHADER_MACRO defines[] = { { "DEF1", "10 + 15"

1 0

Matteo Bruni : d3dx9/tests: Create the asm shader test files under the temporary files directory.
by Alexandre Julliard 25 Aug '14

25 Aug '14

Module: wine Branch: master Commit: c87901d3f8cebfb7d28b42718c1c78035730d6ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=c87901d3f8cebfb7d28b42718… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Aug 25 20:36:54 2014 +0200 d3dx9/tests: Create the asm shader test files under the temporary files directory. --- dlls/d3dx9_36/tests/asm.c | 127 ++++++++++++++++++++++++++++++---------------- 1 file changed, 84 insertions(+), 43 deletions(-) diff --git a/dlls/d3dx9_36/tests/asm.c b/dlls/d3dx9_36/tests/asm.c index 3ee501e..4087bd8 100644 --- a/dlls/d3dx9_36/tests/asm.c +++ b/dlls/d3dx9_36/tests/asm.c @@ -24,22 +24,61 @@ #include "resources.h" -static HRESULT create_file(const char *filename, const char *data, const unsigned int size) +static char temp_path[MAX_PATH]; + +static BOOL create_file(const char *filename, const char *data, const unsigned int size, char *out_path) { - DWORD received; + DWORD written; HANDLE hfile; + char path[MAX_PATH]; + + if (!*temp_path) + GetTempPathA(sizeof(temp_path), temp_path); - hfile = CreateFileA(filename, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, 0); - if(hfile == INVALID_HANDLE_VALUE) return HRESULT_FROM_WIN32(GetLastError()); + strcpy(path, temp_path); + strcat(path, filename); + hfile = CreateFileA(path, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, 0); + if (hfile == INVALID_HANDLE_VALUE) + return FALSE; - if(WriteFile(hfile, data, size, &received, NULL)) + if (WriteFile(hfile, data, size, &written, NULL)) { CloseHandle(hfile); - return D3D_OK; + + if (out_path) + strcpy(out_path, path); + return TRUE; } CloseHandle(hfile); - return D3DERR_INVALIDCALL; + return FALSE; +} + +static void delete_file(const char *filename) +{ + char path[MAX_PATH]; + + strcpy(path, temp_path); + strcat(path, filename); + DeleteFileA(path); +} + +static BOOL create_directory(const char *name) +{ + char path[MAX_PATH]; + + strcpy(path, temp_path); + strcat(path, name); + return CreateDirectoryA(path, NULL); +} + +static void delete_directory(const char *name) +{ + char path[MAX_PATH]; + + strcpy(path, temp_path); + strcat(path, name); + RemoveDirectoryA(path); } static HRESULT WINAPI testD3DXInclude_open(ID3DXInclude *iface, D3DXINCLUDE_TYPE include_type, @@ -155,7 +194,7 @@ static void assembleshader_test(void) } }; struct D3DXIncludeImpl include; - HRESULT shader_vsh_res; + 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 */ @@ -242,14 +281,14 @@ static void assembleshader_test(void) if (shader) ID3DXBuffer_Release(shader); - shader_vsh_res = create_file("shader.vsh", testshader, sizeof(testshader) - 1); - if(SUCCEEDED(shader_vsh_res)) { - create_file("incl.vsh", testincl, sizeof(testincl) - 1); + if (create_file("shader.vsh", testshader, sizeof(testshader) - 1, shader_vsh_path)) + { + create_file("incl.vsh", testincl, sizeof(testincl) - 1, NULL); /* D3DXAssembleShaderFromFile + #include test */ shader = NULL; messages = NULL; - hr = D3DXAssembleShaderFromFileA("shader.vsh", + hr = D3DXAssembleShaderFromFileA(shader_vsh_path, NULL, NULL, D3DXSHADER_SKIPVALIDATION, &shader, &messages); ok(hr == D3D_OK, "D3DXAssembleShaderFromFile test failed with error 0x%x - %d\n", hr, hr & 0x0000FFFF); @@ -271,16 +310,17 @@ static void assembleshader_test(void) } if(shader) ID3DXBuffer_Release(shader); - 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) - 1); - create_file("include/incl4.vsh", testincl4_ok, sizeof(testincl4_ok) - 1); + create_file("shader3.vsh", testshader3, sizeof(testshader3) - 1, shader3_vsh_path); + create_file("incl4.vsh", testincl4_wrong, sizeof(testincl4_wrong) - 1, NULL); + if (create_directory("include")) + { + create_file("include\\incl3.vsh", testincl3, sizeof(testincl3) - 1, NULL); + create_file("include\\incl4.vsh", testincl4_ok, sizeof(testincl4_ok) - 1, NULL); /* path search #include test */ shader = NULL; messages = NULL; - hr = D3DXAssembleShaderFromFileA("shader3.vsh", NULL, NULL, + hr = D3DXAssembleShaderFromFileA(shader3_vsh_path, NULL, NULL, D3DXSHADER_SKIPVALIDATION, &shader, &messages); ok(hr == D3D_OK, "D3DXAssembleShaderFromFile path search test failed with error 0x%x - %d\n", hr, hr & 0x0000FFFF); @@ -291,13 +331,13 @@ static void assembleshader_test(void) if(shader) ID3DXBuffer_Release(shader); } else skip("Couldn't create \"include\" directory\n"); - DeleteFileA("shader.vsh"); - DeleteFileA("incl.vsh"); - DeleteFileA("shader3.vsh"); - DeleteFileA("incl4.vsh"); - DeleteFileA("include/incl3.vsh"); - DeleteFileA("include/incl4.vsh"); - RemoveDirectoryA("include"); + delete_file("shader.vsh"); + delete_file("incl.vsh"); + delete_file("shader3.vsh"); + delete_file("incl4.vsh"); + delete_file("include\\incl3.vsh"); + delete_file("include\\incl4.vsh"); + delete_directory("include"); /* The main shader is also to be loaded through the ID3DXInclude object. */ shader = NULL; @@ -403,23 +443,24 @@ static void d3dxpreprocess_test(void) "#error \"wrong include\"\n"; HRESULT hr; ID3DXBuffer *shader, *messages; - HRESULT shader_vsh_res; + 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}; - shader_vsh_res = create_file("shader.vsh", testshader, sizeof(testshader) - 1); - if(SUCCEEDED(shader_vsh_res)) { - create_file("incl.vsh", testincl, sizeof(testincl) - 1); - 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) - 1); - create_file("include/incl4.vsh", testincl4_ok, sizeof(testincl4_ok) - 1); + if (create_file("shader.vsh", testshader, sizeof(testshader) - 1, shader_vsh_path)) + { + create_file("incl.vsh", testincl, sizeof(testincl) - 1, NULL); + create_file("shader3.vsh", testshader3, sizeof(testshader3) - 1, shader3_vsh_path); + create_file("incl4.vsh", testincl4_wrong, sizeof(testincl4_wrong) - 1, NULL); + if (create_directory("include")) + { + create_file("include\\incl3.vsh", testincl3, sizeof(testincl3) - 1, NULL); + create_file("include\\incl4.vsh", testincl4_ok, sizeof(testincl4_ok) - 1, NULL); /* path search #include test */ shader = NULL; messages = NULL; - hr = D3DXPreprocessShaderFromFileA("shader3.vsh", NULL, NULL, + hr = D3DXPreprocessShaderFromFileA(shader3_vsh_path, NULL, NULL, &shader, &messages); ok(hr == D3D_OK, "D3DXPreprocessShaderFromFile path search test failed with error 0x%x - %d\n", hr, hr & 0x0000FFFF); if(messages) { @@ -432,7 +473,7 @@ static void d3dxpreprocess_test(void) /* D3DXPreprocessShaderFromFile + #include test */ shader = NULL; messages = NULL; - hr = D3DXPreprocessShaderFromFileA("shader.vsh", + hr = D3DXPreprocessShaderFromFileA(shader_vsh_path, NULL, NULL, &shader, &messages); ok(hr == D3D_OK, "D3DXPreprocessShaderFromFile test failed with error 0x%x - %d\n", hr, hr & 0x0000FFFF); @@ -454,13 +495,13 @@ static void d3dxpreprocess_test(void) } if(shader) ID3DXBuffer_Release(shader); - DeleteFileA("shader.vsh"); - DeleteFileA("incl.vsh"); - DeleteFileA("shader3.vsh"); - DeleteFileA("incl4.vsh"); - DeleteFileA("include/incl3.vsh"); - DeleteFileA("include/incl4.vsh"); - RemoveDirectoryA("include"); + delete_file("shader.vsh"); + delete_file("incl.vsh"); + delete_file("shader3.vsh"); + delete_file("incl4.vsh"); + delete_file("include\\incl3.vsh"); + delete_file("include\\incl4.vsh"); + delete_directory("include"); /* The main shader is also to be loaded through the ID3DXInclude object. */ shader = NULL;

1 0