November 2013 - Wine-commits

Henri Verbeet : d3d9/tests: Get rid of some unused test data in pretransformed_varying_test().
by Alexandre Julliard 01 Nov '13

01 Nov '13

Module: wine Branch: master Commit: 88971aa17d22ab7aac8df01a3b9c58a17206e0df URL: http://source.winehq.org/git/wine.git/?a=commit;h=88971aa17d22ab7aac8df01a3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Nov 1 09:41:00 2013 +0100 d3d9/tests: Get rid of some unused test data in pretransformed_varying_test(). --- dlls/d3d9/tests/visual.c | 73 +++++++++++++++++++++------------------------ 1 files changed, 34 insertions(+), 39 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 44755ec..f134067 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -6295,15 +6295,6 @@ static void nested_loop_test(IDirect3DDevice9 *device) IDirect3DVertexShader9_Release(vshader); } -struct varying_test_struct -{ - const DWORD *shader_code; - IDirect3DPixelShader9 *shader; - DWORD color, color_rhw; - const char *name; - BOOL todo, todo_rhw; -}; - struct hugeVertex { float pos_x, pos_y, pos_z, rhw; @@ -6396,18 +6387,25 @@ static void pretransformed_varying_test(IDirect3DDevice9 *device) }; /* sample: fails */ - struct varying_test_struct tests[] = { - {blendweight_code, NULL, 0x00000000, 0x00191919, "blendweight" , FALSE, TRUE }, - {blendindices_code, NULL, 0x00000000, 0x00333333, "blendindices" , FALSE, TRUE }, - {normal_code, NULL, 0x00000000, 0x004c4c4c, "normal" , FALSE, TRUE }, - /* Why does dx not forward the texcoord? */ - {texcoord0_code, NULL, 0x00000000, 0x00808c8c, "texcoord0" , FALSE, FALSE }, - {tangent_code, NULL, 0x00000000, 0x00999999, "tangent" , FALSE, TRUE }, - {binormal_code, NULL, 0x00000000, 0x00b2b2b2, "binormal" , FALSE, TRUE }, - {color_code, NULL, 0x00e6e6e6, 0x00e6e6e6, "color" , FALSE, FALSE }, - {fog_code, NULL, 0x00000000, 0x00666666, "fog" , FALSE, TRUE }, - {depth_code, NULL, 0x00000000, 0x00cccccc, "depth" , FALSE, TRUE }, - {specular_code, NULL, 0x004488ff, 0x004488ff, "specular" , FALSE, FALSE } + static const struct + { + const char *name; + const DWORD *shader_code; + DWORD color; + BOOL todo; + } + tests[] = + { + {"blendweight", blendweight_code, 0x00191919, TRUE }, + {"blendindices", blendindices_code, 0x00333333, TRUE }, + {"normal", normal_code, 0x004c4c4c, TRUE }, + {"texcoord0", texcoord0_code, 0x00808c8c, FALSE}, + {"tangent", tangent_code, 0x00999999, TRUE }, + {"binormal", binormal_code, 0x00b2b2b2, TRUE }, + {"color", color_code, 0x00e6e6e6, FALSE}, + {"fog", fog_code, 0x00666666, TRUE }, + {"depth", depth_code, 0x00cccccc, TRUE }, + {"specular", specular_code, 0x004488ff, FALSE}, }; /* Declare a monster vertex type :-) */ static const D3DVERTEXELEMENT9 decl_elements[] = { @@ -6495,21 +6493,19 @@ static void pretransformed_varying_test(IDirect3DDevice9 *device) hr = IDirect3DDevice9_SetVertexDeclaration(device, decl); ok(hr == D3D_OK, "IDirect3DDevice9_SetVertexDeclaration returned %08x\n", hr); - for(i = 0; i < sizeof(tests) / sizeof(tests[0]); i++) - { - hr = IDirect3DDevice9_CreatePixelShader(device, tests[i].shader_code, &tests[i].shader); - ok(hr == D3D_OK, "IDirect3DDevice9_CreatePixelShader failed for shader %s, hr = %08x\n", - tests[i].name, hr); - } - hr = IDirect3DDevice9_SetVertexDeclaration(device, decl); ok(hr == D3D_OK, "IDirect3DDevice9_SetVertexDeclaration returned %08x\n", hr); - for(i = 0; i < sizeof(tests) / sizeof(tests[0]); i++) + for (i = 0; i < sizeof(tests) / sizeof(*tests); ++i) { + IDirect3DPixelShader9 *shader; + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffffff, 0.0, 0); ok(hr == D3D_OK, "IDirect3DDevice9_Clear returned %08x\n", hr); - hr = IDirect3DDevice9_SetPixelShader(device, tests[i].shader); + hr = IDirect3DDevice9_CreatePixelShader(device, tests[i].shader_code, &shader); + ok(SUCCEEDED(hr), "Failed to create pixel shader for test %s, hr %#x.\n", tests[i].name, hr); + + hr = IDirect3DDevice9_SetPixelShader(device, shader); ok(hr == D3D_OK, "IDirect3DDevice9_SetPixelShader returned %08x\n", hr); hr = IDirect3DDevice9_BeginScene(device); @@ -6525,24 +6521,23 @@ static void pretransformed_varying_test(IDirect3DDevice9 *device) /* This isn't a weekend's job to fix, ignore the problem for now. * Needs a replacement pipeline. */ color = getPixelColor(device, 360, 240); - if (tests[i].todo_rhw) - todo_wine ok(color_match(color, tests[i].color_rhw, 1) + if (tests[i].todo) + todo_wine ok(color_match(color, tests[i].color, 1) || broken(color_match(color, 0x00000000, 1) && tests[i].shader_code == blendindices_code), "Test %s returned color 0x%08x, expected 0x%08x (todo).\n", - tests[i].name, color, tests[i].color_rhw); + tests[i].name, color, tests[i].color); else - ok(color_match(color, tests[i].color_rhw, 1), + ok(color_match(color, tests[i].color, 1), "Test %s returned color 0x%08x, expected 0x%08x.\n", - tests[i].name, color, tests[i].color_rhw); + tests[i].name, color, tests[i].color); hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(hr == D3D_OK, "IDirect3DDevice9_Present failed with %08x\n", hr); - } - for(i = 0; i < sizeof(tests) / sizeof(tests[0]); i++) - { - IDirect3DPixelShader9_Release(tests[i].shader); + hr = IDirect3DDevice9_SetPixelShader(device, NULL); + ok(SUCCEEDED(hr), "Failed to set pixel shader for test %s, hr %#x.\n", tests[i].name, hr); + IDirect3DPixelShader9_Release(shader); } IDirect3DVertexDeclaration9_Release(decl);

1 0

Henri Verbeet : d3drm: Get rid of the IDirect3DRMTextureImpl typedef.
by Alexandre Julliard 01 Nov '13

01 Nov '13

Module: wine Branch: master Commit: 08eef6dad2fef87d697cabe847709552a1327ef4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08eef6dad2fef87d697cabe84… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Nov 1 09:41:01 2013 +0100 d3drm: Get rid of the IDirect3DRMTextureImpl typedef. --- dlls/d3drm/texture.c | 632 +++++++++++++++++++++----------------------------- 1 files changed, 262 insertions(+), 370 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=08eef6dad2fef87d697ca…

1 0

Henri Verbeet : d3drm: Get rid of the IDirect3DRMViewportImpl typedef.
by Alexandre Julliard 01 Nov '13

01 Nov '13

Module: wine Branch: master Commit: 59dd66df2e89f1b7937ebc028ae91cb1be04bee3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=59dd66df2e89f1b7937ebc028… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Nov 1 09:41:02 2013 +0100 d3drm: Get rid of the IDirect3DRMViewportImpl typedef. --- dlls/d3drm/viewport.c | 713 ++++++++++++++++++++++--------------------------- 1 files changed, 314 insertions(+), 399 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=59dd66df2e89f1b7937eb…

1 0

Francois Gouget : kernel32/tests: Fix some module tests on Windows 8.
by Alexandre Julliard 01 Nov '13

01 Nov '13

Module: wine Branch: master Commit: f399e903060c5acc5341b8c2211a50b235984206 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f399e903060c5acc5341b8c22… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Nov 1 10:14:44 2013 +0100 kernel32/tests: Fix some module tests on Windows 8. Windows 8 and 8.1 return some different error codes and GetDllDirectory() handles buffer termination a bit differently. --- dlls/kernel32/tests/module.c | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/tests/module.c b/dlls/kernel32/tests/module.c index 6e9ad13..992f0ec 100644 --- a/dlls/kernel32/tests/module.c +++ b/dlls/kernel32/tests/module.c @@ -261,7 +261,8 @@ static void testLoadLibraryEx(void) hmodule = LoadLibraryExA("", NULL, 0); ok(hmodule == 0, "Expected 0, got %p\n", hmodule); ok(GetLastError() == ERROR_MOD_NOT_FOUND || - GetLastError() == ERROR_DLL_NOT_FOUND, /* win9x */ + GetLastError() == ERROR_DLL_NOT_FOUND /* win9x */ || + GetLastError() == ERROR_INVALID_PARAMETER /* win8 */, "Expected ERROR_MOD_NOT_FOUND or ERROR_DLL_NOT_FOUND, got %d\n", GetLastError()); @@ -438,7 +439,8 @@ static void testGetDllDirectory(void) bufferA[length] = 'A'; bufferA[length + 1] = 'A'; ret = pGetDllDirectoryA(length + 1, bufferA); - ok(ret == length, "i=%d, Expected %u, got %u\n", i, length, ret); + ok(ret == length || broken(ret + 1 == length) /* win8 */, + "i=%d, Expected %u(+1), got %u\n", i, length, ret); ok(bufferA[length + 1] == 'A', "i=%d, Buffer overflow\n", i); ok(strcmp(bufferA, dll_directories[i]) == 0, "i=%d, Wrong path returned: '%s'\n", i, bufferA); @@ -450,13 +452,11 @@ static void testGetDllDirectory(void) ok(cmpStrAW(dll_directories[i], bufferW, length, length), "i=%d, Wrong path returned: %s\n", i, wine_dbgstr_w(bufferW)); - /* zero size buffer - * the A version always null-terminates the buffer, - * the W version doesn't do it on some platforms */ + /* Zero size buffer. The buffer may or may not be terminated depending + * on the Windows version and whether the A or W API is called. */ bufferA[0] = 'A'; ret = pGetDllDirectoryA(0, bufferA); ok(ret == length + 1, "i=%d, Expected %u, got %u\n", i, length + 1, ret); - ok(bufferA[0] == 0, "i=%d, Buffer not null terminated\n", i); bufferW[0] = 'A'; ret = pGetDllDirectoryW(0, bufferW); @@ -468,7 +468,8 @@ static void testGetDllDirectory(void) bufferA[0] = 'A'; ret = pGetDllDirectoryA(length, bufferA); ok(ret == length + 1, "i=%d, Expected %u, got %u\n", i, length + 1, ret); - ok(bufferA[0] == 0, "i=%d, Buffer not null terminated\n", i); + if (length != 0) + ok(bufferA[0] == 0, "i=%d, Buffer not null terminated\n", i); bufferW[0] = 'A'; ret = pGetDllDirectoryW(length, bufferW);

1 0

Francois Gouget : kernel32/tests: Windows 8 returns different error codes.
by Alexandre Julliard 01 Nov '13

01 Nov '13

Module: wine Branch: master Commit: 18a9aba058df1225ed8b88722ebecd8010348b1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=18a9aba058df1225ed8b88722… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Nov 1 10:17:16 2013 +0100 kernel32/tests: Windows 8 returns different error codes. --- dlls/kernel32/tests/console.c | 110 +++++++++++++++++++++-------------------- 1 files changed, 56 insertions(+), 54 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=18a9aba058df1225ed8b8…

1 0

Francois Gouget : user32/tests: When EnumDisplaySettings() fails unexpectedly, trace how many calls were made.
by Alexandre Julliard 01 Nov '13

01 Nov '13

Module: wine Branch: master Commit: 790d2e8b21b0c5c97c010941f161d4b1f9b3b3fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=790d2e8b21b0c5c97c010941f… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Nov 1 10:19:16 2013 +0100 user32/tests: When EnumDisplaySettings() fails unexpectedly, trace how many calls were made. --- dlls/user32/tests/sysparams.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index 32432f5..59225fe 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -2865,13 +2865,14 @@ static void test_EnumDisplaySettings(void) num = 1; while (1) { SetLastError (0xdeadbeef); - if (!EnumDisplaySettingsA(NULL, num++, &devmode)) { + if (!EnumDisplaySettingsA(NULL, num, &devmode)) { DWORD le = GetLastError(); ok(le == ERROR_NO_MORE_FILES || le == 0xdeadbeef, /* XP, 2003 */ - "Expected ERROR_NO_MORE_FILES or 0xdeadbeef, got %d\n", le); + "Expected ERROR_NO_MORE_FILES or 0xdeadbeef, got %d for %d\n", le, num); break; } + num++; } }

1 0

Francois Gouget : Assorted spelling fixes.
by Alexandre Julliard 01 Nov '13

01 Nov '13

Module: wine Branch: master Commit: ee28dd80ea2ec52847f176519c2cc7f8dd08324e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee28dd80ea2ec52847f176519… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Nov 1 10:19:40 2013 +0100 Assorted spelling fixes. --- dlls/quartz/tests/filtergraph.c | 7 ++++--- dlls/xmllite/reader.c | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 68ac884..7a6dd5a 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -1559,9 +1559,10 @@ static void test_render_filter_priority(void) static const WCHAR wszFilterInstanceName4[] = {'T', 'e', 's', 't', 'f', 'i', 'l', 't', 'e', 'r', 'I', 'n', 's', 't', 'a', 'n', 'c', 'e', '4', 0 }; - /* Test which renderer of two already added to the graph will be chosen (one is "exact" match, other is - "wildcard" match. Seems to very by order in which filters are added to the graph, thus indicating - no preference given to exact match. */ + /* Test which renderer of two already added to the graph will be chosen + * (one is "exact" match, other is "wildcard" match. Seems to depend + * on the order in which filters are added to the graph, thus indicating + * no preference given to exact match. */ hr = CoCreateInstance(&CLSID_FilterGraph, NULL, CLSCTX_INPROC_SERVER, &IID_IFilterGraph2, (LPVOID*)&pgraph2); ok(hr == S_OK, "CoCreateInstance failed with %08x\n", hr); if (!pgraph2) return; diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index dffe226..9ca7370 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -421,7 +421,7 @@ static inline const char* debug_strval(const xmlreader *reader, const strval *v) return debugstr_wn(reader_get_strptr(reader, v), v->len); } -/* used to initalize from constant string */ +/* used to initialize from constant string */ static inline void reader_init_cstrvalue(WCHAR *str, UINT len, strval *v) { v->start = 0;

1 0

Francois Gouget : kernel32/tests: On Windows 8 DATE_LONGDATE does not output a leading 0 for the day.
by Alexandre Julliard 01 Nov '13

01 Nov '13

Module: wine Branch: master Commit: c0dbfebe04bc0c4d1739bea07756325dfcd87085 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0dbfebe04bc0c4d1739bea07… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Nov 1 10:21:15 2013 +0100 kernel32/tests: On Windows 8 DATE_LONGDATE does not output a leading 0 for the day. --- dlls/kernel32/tests/locale.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index bbb7d23..918a664 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -662,10 +662,12 @@ static void test_GetDateFormatA(void) if (strncmp(buffer, Expected, strlen(Expected)) && strncmp(buffer, "5/4/02", strlen(Expected)) != 0) ok (0, "Expected '%s' or '5/4/02', got '%s'\n", Expected, buffer); - STRINGSA("ddd',' MMM dd ''''yy", "Saturday, May 04, 2002"); /* DATE_LONGDATE */ + SetLastError(0xdeadbeef); buffer[0] = '\0'; /* DATE_LONGDATE */ ret = GetDateFormatA(lcid, NUO|DATE_LONGDATE, &curtime, NULL, buffer, COUNTOF(buffer)); ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); - EXPECT_LENA; EXPECT_EQA; + ok(strcmp(buffer, "Saturday, May 04, 2002") == 0 || + strcmp(buffer, "Saturday, May 4, 2002") == 0 /* Win 8 */, + "got an unexpected date string '%s'\n", buffer); /* test for expected DATE_YEARMONTH behavior with null format */ /* NT4 returns ERROR_INVALID_FLAGS for DATE_YEARMONTH */

1 0

Francois Gouget : crypt32: Remove WINAPI on static functions where not needed.
by Alexandre Julliard 01 Nov '13

01 Nov '13

Module: wine Branch: master Commit: 62122b660ff55df1a9db16c04ed51e9b40b11ea0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62122b660ff55df1a9db16c04… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Nov 1 10:29:15 2013 +0100 crypt32: Remove WINAPI on static functions where not needed. --- dlls/crypt32/cert.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index bc0f26d..0f14ffb 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -162,7 +162,7 @@ static const context_vtbl_t cert_vtbl = { Cert_clone }; -static BOOL WINAPI add_cert_to_store(WINECRYPT_CERTSTORE *store, const CERT_CONTEXT *cert, +static BOOL add_cert_to_store(WINECRYPT_CERTSTORE *store, const CERT_CONTEXT *cert, DWORD add_disposition, BOOL use_link, PCCERT_CONTEXT *ret_context) { const CERT_CONTEXT *existing = NULL;

1 0

Francois Gouget : kernel32/tests: On Windows 8 IdnToNameprepUnicode() returns a different error for invalid parameters.
by Alexandre Julliard 01 Nov '13

01 Nov '13

Module: wine Branch: master Commit: 62ddaf8f6a0bd9c283e232a1448ba12d9e0dc75c URL: http://source.winehq.org/git/wine.git/?a=commit;h=62ddaf8f6a0bd9c283e232a14… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Nov 1 10:34:01 2013 +0100 kernel32/tests: On Windows 8 IdnToNameprepUnicode() returns a different error for invalid parameters. --- dlls/kernel32/tests/locale.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 918a664..60dea78 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -3244,7 +3244,8 @@ static void test_IdnToNameprepUnicode(void) ret = pIdnToNameprepUnicode(4, NULL, 0, NULL, 0); err = GetLastError(); ok(ret == 0, "ret = %d\n", ret); - ok(err == ERROR_INVALID_FLAGS, "err = %d\n", err); + ok(err == ERROR_INVALID_FLAGS || err == ERROR_INVALID_PARAMETER /* Win8 */, + "err = %d\n", err); for (i=0; i<sizeof(test_data)/sizeof(*test_data); i++) {

1 0