October 2010 - Wine-commits

Rico Schüller : d3dcompiler/tests: Add D3DGetBlobPart( ) test.
by Alexandre Julliard 15 Oct '10

15 Oct '10

Module: wine Branch: master Commit: 6628944b7f82d31fe1cbf1300d2ff0dd2ab9c4de URL: http://source.winehq.org/git/wine.git/?a=commit;h=6628944b7f82d31fe1cbf1300… Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Oct 14 21:03:19 2010 +0200 d3dcompiler/tests: Add D3DGetBlobPart() test. --- dlls/d3dcompiler_43/tests/blob.c | 91 ++++++++++++++++++++++++++++++++++++++ 1 files changed, 91 insertions(+), 0 deletions(-) diff --git a/dlls/d3dcompiler_43/tests/blob.c b/dlls/d3dcompiler_43/tests/blob.c index a9eee7f..c4295c5 100644 --- a/dlls/d3dcompiler_43/tests/blob.c +++ b/dlls/d3dcompiler_43/tests/blob.c @@ -52,7 +52,98 @@ static void test_create_blob(void) ok(!refcount, "ID3DBlob has %u references left\n", refcount); } +static const D3D_BLOB_PART parts[] = +{ + D3D_BLOB_INPUT_SIGNATURE_BLOB, D3D_BLOB_OUTPUT_SIGNATURE_BLOB, D3D_BLOB_INPUT_AND_OUTPUT_SIGNATURE_BLOB, + D3D_BLOB_PATCH_CONSTANT_SIGNATURE_BLOB, D3D_BLOB_ALL_SIGNATURE_BLOB, D3D_BLOB_DEBUG_INFO, + D3D_BLOB_LEGACY_SHADER, D3D_BLOB_XNA_PREPASS_SHADER, D3D_BLOB_XNA_SHADER, + D3D_BLOB_TEST_ALTERNATE_SHADER, D3D_BLOB_TEST_COMPILE_DETAILS, D3D_BLOB_TEST_COMPILE_PERF +}; + +/* + * test_blob_part - fxc.exe /E VS /Tvs_4_0_level_9_0 /Fx + */ +#if 0 +float4 VS(float4 position : POSITION, float4 pos : SV_POSITION) : SV_POSITION +{ + return position; +} +#endif +static DWORD test_blob_part[] = { +0x43425844, 0x0ef2a70f, 0x6a548011, 0x91ff9409, 0x9973a43d, 0x00000001, 0x000002e0, 0x00000008, +0x00000040, 0x0000008c, 0x000000d8, 0x0000013c, 0x00000180, 0x000001fc, 0x00000254, 0x000002ac, +0x53414e58, 0x00000044, 0x00000044, 0xfffe0200, 0x00000020, 0x00000024, 0x00240000, 0x00240000, +0x00240000, 0x00240000, 0x00240000, 0xfffe0200, 0x0200001f, 0x80000005, 0x900f0000, 0x02000001, +0xc00f0000, 0x80e40000, 0x0000ffff, 0x50414e58, 0x00000044, 0x00000044, 0xfffe0200, 0x00000020, +0x00000024, 0x00240000, 0x00240000, 0x00240000, 0x00240000, 0x00240000, 0xfffe0200, 0x0200001f, +0x80000005, 0x900f0000, 0x02000001, 0xc00f0000, 0x80e40000, 0x0000ffff, 0x396e6f41, 0x0000005c, +0x0000005c, 0xfffe0200, 0x00000034, 0x00000028, 0x00240000, 0x00240000, 0x00240000, 0x00240000, +0x00240001, 0x00000000, 0xfffe0200, 0x0200001f, 0x80000005, 0x900f0000, 0x04000004, 0xc0030000, +0x90ff0000, 0xa0e40000, 0x90e40000, 0x02000001, 0xc00c0000, 0x90e40000, 0x0000ffff, 0x52444853, +0x0000003c, 0x00010040, 0x0000000f, 0x0300005f, 0x001010f2, 0x00000000, 0x04000067, 0x001020f2, +0x00000000, 0x00000001, 0x05000036, 0x001020f2, 0x00000000, 0x00101e46, 0x00000000, 0x0100003e, +0x54415453, 0x00000074, 0x00000002, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000000, +0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, +0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, +0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x46454452, +0x00000050, 0x00000000, 0x00000000, 0x00000000, 0x0000001c, 0xfffe0400, 0x00000100, 0x0000001c, +0x7263694d, 0x666f736f, 0x52282074, 0x4c482029, 0x53204c53, 0x65646168, 0x6f432072, 0x6c69706d, +0x39207265, 0x2e39322e, 0x2e323539, 0x31313133, 0xababab00, 0x4e475349, 0x00000050, 0x00000002, +0x00000008, 0x00000038, 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000f0f, 0x00000041, +0x00000000, 0x00000000, 0x00000003, 0x00000001, 0x0000000f, 0x49534f50, 0x4e4f4954, 0x5f565300, +0x49534f50, 0x4e4f4954, 0xababab00, 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, +0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x505f5653, 0x5449534f, 0x004e4f49, +}; + +static void test_get_blob_part(void) +{ + ID3DBlob *blob, *blob2; + HRESULT hr; + ULONG refcount; + + hr = D3DCreateBlob(1, &blob2); + ok(hr == S_OK, "D3DCreateBlob failed with %x\n", hr); + blob = blob2; + + /* invalid cases */ + hr = D3DGetBlobPart(NULL, test_blob_part[6], D3D_BLOB_INPUT_SIGNATURE_BLOB, 0, &blob); + ok(hr == D3DERR_INVALIDCALL, "D3DGetBlobPart failed with %x\n", hr); + ok(blob2 == blob, "D3DGetBlobPart failed got %p, expected %p\n", blob, blob2); + + hr = D3DGetBlobPart(NULL, 0, D3D_BLOB_INPUT_SIGNATURE_BLOB, 0, &blob); + ok(hr == D3DERR_INVALIDCALL, "D3DGetBlobPart failed with %x\n", hr); + ok(blob2 == blob, "D3DGetBlobPart failed got %p, expected %p\n", blob, blob2); + + hr = D3DGetBlobPart(NULL, test_blob_part[6], D3D_BLOB_INPUT_SIGNATURE_BLOB, 0, NULL); + ok(hr == D3DERR_INVALIDCALL, "D3DGetBlobPart failed with %x\n", hr); + + hr = D3DGetBlobPart(NULL, 0, D3D_BLOB_INPUT_SIGNATURE_BLOB, 0, NULL); + ok(hr == D3DERR_INVALIDCALL, "D3DGetBlobPart failed with %x\n", hr); + + hr = D3DGetBlobPart(test_blob_part, 0, D3D_BLOB_INPUT_SIGNATURE_BLOB, 0, &blob); + ok(hr == D3DERR_INVALIDCALL, "D3DGetBlobPart failed with %x\n", hr); + ok(blob2 == blob, "D3DGetBlobPart failed got %p, expected %p\n", blob, blob2); + + hr = D3DGetBlobPart(test_blob_part, test_blob_part[6], D3D_BLOB_INPUT_SIGNATURE_BLOB, 0, NULL); + ok(hr == D3DERR_INVALIDCALL, "D3DGetBlobPart failed with %x\n", hr); + + hr = D3DGetBlobPart(test_blob_part, 0, D3D_BLOB_INPUT_SIGNATURE_BLOB, 0, NULL); + ok(hr == D3DERR_INVALIDCALL, "D3DGetBlobPart failed with %x\n", hr); + + hr = D3DGetBlobPart(test_blob_part, test_blob_part[6], D3D_BLOB_INPUT_SIGNATURE_BLOB, 1, &blob); + ok(hr == D3DERR_INVALIDCALL, "D3DGetBlobPart failed with %x\n", hr); + ok(blob2 == blob, "D3DGetBlobPart failed got %p, expected %p\n", blob, blob2); + + hr = D3DGetBlobPart(test_blob_part, test_blob_part[6], 0xffffffff, 0, &blob); + ok(hr == D3DERR_INVALIDCALL, "D3DGetBlobPart failed with %x\n", hr); + ok(blob2 == blob, "D3DGetBlobPart failed got %p, expected %p\n", blob, blob2); + + refcount = ID3D10Blob_Release(blob2); + ok(!refcount, "ID3DBlob has %u references left\n", refcount); +} + START_TEST(blob) { test_create_blob(); + test_get_blob_part(); }

1 0

Rico Schüller : d3dcompiler/tests: Add D3D_BLOB_INPUT_SIGNATURE_BLOB test.
by Alexandre Julliard 15 Oct '10

15 Oct '10

Module: wine Branch: master Commit: 1c26d22dc38fc8782a6216b553b12449e9dbc2f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c26d22dc38fc8782a6216b55… Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Oct 14 21:03:27 2010 +0200 d3dcompiler/tests: Add D3D_BLOB_INPUT_SIGNATURE_BLOB test. --- dlls/d3dcompiler_43/tests/blob.c | 40 ++++++++++++++++++++++++++++++++++++++ 1 files changed, 40 insertions(+), 0 deletions(-) diff --git a/dlls/d3dcompiler_43/tests/blob.c b/dlls/d3dcompiler_43/tests/blob.c index c4295c5..ff4dfa2 100644 --- a/dlls/d3dcompiler_43/tests/blob.c +++ b/dlls/d3dcompiler_43/tests/blob.c @@ -33,6 +33,12 @@ */ #define D3DERR_INVALIDCALL 0x8876086c +#define MAKE_TAG(ch0, ch1, ch2, ch3) \ + ((DWORD)(ch0) | ((DWORD)(ch1) << 8) | \ + ((DWORD)(ch2) << 16) | ((DWORD)(ch3) << 24 )) +#define TAG_DXBC MAKE_TAG('D', 'X', 'B', 'C') +#define TAG_ISGN MAKE_TAG('I', 'S', 'G', 'N') + static void test_create_blob(void) { ID3D10Blob *blob; @@ -100,6 +106,9 @@ static void test_get_blob_part(void) ID3DBlob *blob, *blob2; HRESULT hr; ULONG refcount; + DWORD *dword; + SIZE_T size; + UINT i; hr = D3DCreateBlob(1, &blob2); ok(hr == S_OK, "D3DCreateBlob failed with %x\n", hr); @@ -140,6 +149,37 @@ static void test_get_blob_part(void) refcount = ID3D10Blob_Release(blob2); ok(!refcount, "ID3DBlob has %u references left\n", refcount); + + /* D3D_BLOB_INPUT_SIGNATURE_BLOB */ + hr = D3DGetBlobPart(test_blob_part, test_blob_part[6], D3D_BLOB_INPUT_SIGNATURE_BLOB, 0, &blob); + ok(hr == S_OK, "D3DGetBlobPart failed, got %x, expected %x\n", hr, S_OK); + + size = ID3D10Blob_GetBufferSize(blob); + ok(size == 124, "GetBufferSize failed, got %lu, expected %u\n", size, 124); + + dword = ((DWORD*)ID3D10Blob_GetBufferPointer(blob)); + ok(TAG_DXBC == *dword, "DXBC got %#x, expected %#x.\n", *dword, TAG_DXBC); + ok(TAG_ISGN == *(dword+9), "ISGN got %#x, expected %#x.\n", *(dword+9), TAG_ISGN); + + for (i = 0; i < sizeof(parts) / sizeof(parts[0]); i++) + { + hr = D3DGetBlobPart(dword, size, parts[i], 0, &blob2); + + if (parts[i] == D3D_BLOB_INPUT_SIGNATURE_BLOB) + { + ok(hr == S_OK, "D3DGetBlobPart failed, got %x, expected %x\n", hr, S_OK); + + refcount = ID3D10Blob_Release(blob2); + ok(!refcount, "ID3DBlob has %u references left\n", refcount); + } + else + { + ok(hr == E_FAIL, "D3DGetBlobPart failed, got %x, expected %x\n", hr, E_FAIL); + } + } + + refcount = ID3D10Blob_Release(blob); + ok(!refcount, "ID3DBlob has %u references left\n", refcount); } START_TEST(blob)

1 0

Rico Schüller : d3dcompiler/tests: Add D3D_BLOB_OUTPUT_SIGNATURE_BLOB test.
by Alexandre Julliard 15 Oct '10

15 Oct '10

Module: wine Branch: master Commit: 87344c6726ff4fa4cfde956f524424f8b3c41b0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=87344c6726ff4fa4cfde956f5… Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Oct 14 21:03:31 2010 +0200 d3dcompiler/tests: Add D3D_BLOB_OUTPUT_SIGNATURE_BLOB test. --- dlls/d3dcompiler_43/tests/blob.c | 32 ++++++++++++++++++++++++++++++++ 1 files changed, 32 insertions(+), 0 deletions(-) diff --git a/dlls/d3dcompiler_43/tests/blob.c b/dlls/d3dcompiler_43/tests/blob.c index ff4dfa2..be7146d 100644 --- a/dlls/d3dcompiler_43/tests/blob.c +++ b/dlls/d3dcompiler_43/tests/blob.c @@ -38,6 +38,7 @@ ((DWORD)(ch2) << 16) | ((DWORD)(ch3) << 24 )) #define TAG_DXBC MAKE_TAG('D', 'X', 'B', 'C') #define TAG_ISGN MAKE_TAG('I', 'S', 'G', 'N') +#define TAG_OSGN MAKE_TAG('O', 'S', 'G', 'N') static void test_create_blob(void) { @@ -180,6 +181,37 @@ static void test_get_blob_part(void) refcount = ID3D10Blob_Release(blob); ok(!refcount, "ID3DBlob has %u references left\n", refcount); + + /* D3D_BLOB_OUTPUT_SIGNATURE_BLOB */ + hr = D3DGetBlobPart(test_blob_part, test_blob_part[6], D3D_BLOB_OUTPUT_SIGNATURE_BLOB, 0, &blob); + ok(hr == S_OK, "D3DGetBlobPart failed, got %x, expected %x\n", hr, S_OK); + + size = ID3D10Blob_GetBufferSize(blob); + ok(size == 88, "GetBufferSize failed, got %lu, expected %u\n", size, 88); + + dword = ((DWORD*)ID3D10Blob_GetBufferPointer(blob)); + ok(TAG_DXBC == *dword, "DXBC got %#x, expected %#x.\n", *dword, TAG_DXBC); + ok(TAG_OSGN == *(dword+9), "OSGN got %#x, expected %#x.\n", *(dword+9), TAG_OSGN); + + for (i = 0; i < sizeof(parts) / sizeof(parts[0]); i++) + { + hr = D3DGetBlobPart(dword, size, parts[i], 0, &blob2); + + if (parts[i] == D3D_BLOB_OUTPUT_SIGNATURE_BLOB) + { + ok(hr == S_OK, "D3DGetBlobPart failed, got %x, expected %x\n", hr, S_OK); + + refcount = ID3D10Blob_Release(blob2); + ok(!refcount, "ID3DBlob has %u references left\n", refcount); + } + else + { + ok(hr == E_FAIL, "D3DGetBlobPart failed, got %x, expected %x\n", hr, E_FAIL); + } + } + + refcount = ID3D10Blob_Release(blob); + ok(!refcount, "ID3DBlob has %u references left\n", refcount); } START_TEST(blob)

1 0

Rico Schüller : d3dcompiler/tests: Add D3D_BLOB_INPUT_AND_OUTPUT_SIGNATURE_BLOB test.
by Alexandre Julliard 15 Oct '10

15 Oct '10

Module: wine Branch: master Commit: 7d87a4d42badb443ef83383ce74c308097ee9feb URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d87a4d42badb443ef83383ce… Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Oct 14 21:03:34 2010 +0200 d3dcompiler/tests: Add D3D_BLOB_INPUT_AND_OUTPUT_SIGNATURE_BLOB test. --- dlls/d3dcompiler_43/tests/blob.c | 34 ++++++++++++++++++++++++++++++++++ 1 files changed, 34 insertions(+), 0 deletions(-) diff --git a/dlls/d3dcompiler_43/tests/blob.c b/dlls/d3dcompiler_43/tests/blob.c index be7146d..4e27a1f 100644 --- a/dlls/d3dcompiler_43/tests/blob.c +++ b/dlls/d3dcompiler_43/tests/blob.c @@ -212,6 +212,40 @@ static void test_get_blob_part(void) refcount = ID3D10Blob_Release(blob); ok(!refcount, "ID3DBlob has %u references left\n", refcount); + + /* D3D_BLOB_INPUT_AND_OUTPUT_SIGNATURE_BLOB */ + hr = D3DGetBlobPart(test_blob_part, test_blob_part[6], D3D_BLOB_INPUT_AND_OUTPUT_SIGNATURE_BLOB, 0, &blob); + ok(hr == S_OK, "D3DGetBlobPart failed, got %x, expected %x\n", hr, S_OK); + + size = ID3D10Blob_GetBufferSize(blob); + ok(size == 180, "GetBufferSize failed, got %lu, expected %u\n", size, 180); + + dword = ((DWORD*)ID3D10Blob_GetBufferPointer(blob)); + ok(TAG_DXBC == *dword, "DXBC got %#x, expected %#x.\n", *dword, TAG_DXBC); + ok(TAG_ISGN == *(dword+10), "ISGN got %#x, expected %#x.\n", *(dword+10), TAG_ISGN); + ok(TAG_OSGN == *(dword+32), "OSGN got %#x, expected %#x.\n", *(dword+32), TAG_OSGN); + + for (i = 0; i < sizeof(parts) / sizeof(parts[0]); i++) + { + hr = D3DGetBlobPart(dword, size, parts[i], 0, &blob2); + + if (parts[i] == D3D_BLOB_INPUT_AND_OUTPUT_SIGNATURE_BLOB + || parts[i] == D3D_BLOB_INPUT_SIGNATURE_BLOB + || parts[i] == D3D_BLOB_OUTPUT_SIGNATURE_BLOB) + { + ok(hr == S_OK, "D3DGetBlobPart failed, got %x, expected %x\n", hr, S_OK); + + refcount = ID3D10Blob_Release(blob2); + ok(!refcount, "ID3DBlob has %u references left\n", refcount); + } + else + { + ok(hr == E_FAIL, "D3DGetBlobPart failed, got %x, expected %x\n", hr, E_FAIL); + } + } + + refcount = ID3D10Blob_Release(blob); + ok(!refcount, "ID3DBlob has %u references left\n", refcount); } START_TEST(blob)

1 0

Rico Schüller : d3dcompiler/tests: Add D3D_BLOB_PATCH_CONSTANT_SIGNATURE_BLOB test.
by Alexandre Julliard 15 Oct '10

15 Oct '10

Module: wine Branch: master Commit: 291a3b98a58a51f4b8d0d4faaa46e4add476bcfa URL: http://source.winehq.org/git/wine.git/?a=commit;h=291a3b98a58a51f4b8d0d4faa… Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Oct 14 21:03:37 2010 +0200 d3dcompiler/tests: Add D3D_BLOB_PATCH_CONSTANT_SIGNATURE_BLOB test. --- dlls/d3dcompiler_43/tests/blob.c | 233 ++++++++++++++++++++++++++++++++++++++ 1 files changed, 233 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=291a3b98a58a51f4b8d0d…

1 0

Rico Schüller : d3dcompiler/tests: Add D3D_BLOB_ALL_SIGNATURE_BLOB test.
by Alexandre Julliard 15 Oct '10

15 Oct '10

Module: wine Branch: master Commit: ed6c221942924f2ea8da4a6e502201e07b4098bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed6c221942924f2ea8da4a6e5… Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Oct 14 21:03:41 2010 +0200 d3dcompiler/tests: Add D3D_BLOB_ALL_SIGNATURE_BLOB test. --- dlls/d3dcompiler_43/tests/blob.c | 41 ++++++++++++++++++++++++++++++++++++++ 1 files changed, 41 insertions(+), 0 deletions(-) diff --git a/dlls/d3dcompiler_43/tests/blob.c b/dlls/d3dcompiler_43/tests/blob.c index 95982be..1c89238 100644 --- a/dlls/d3dcompiler_43/tests/blob.c +++ b/dlls/d3dcompiler_43/tests/blob.c @@ -251,6 +251,10 @@ static void test_get_blob_part(void) /* D3D_BLOB_PATCH_CONSTANT_SIGNATURE_BLOB */ hr = D3DGetBlobPart(test_blob_part, test_blob_part[6], D3D_BLOB_PATCH_CONSTANT_SIGNATURE_BLOB, 0, &blob); ok(hr == E_FAIL, "D3DGetBlobPart failed, got %x, expected %x\n", hr, E_FAIL); + + /* D3D_BLOB_ALL_SIGNATURE_BLOB */ + hr = D3DGetBlobPart(test_blob_part, test_blob_part[6], D3D_BLOB_ALL_SIGNATURE_BLOB, 0, &blob); + ok(hr == E_FAIL, "D3DGetBlobPart failed, got %x, expected %x\n", hr, E_FAIL); } /* @@ -478,6 +482,43 @@ static void test_get_blob_part2(void) refcount = ID3D10Blob_Release(blob); ok(!refcount, "ID3DBlob has %u references left\n", refcount); + + /* D3D_BLOB_ALL_SIGNATURE_BLOB */ + hr = D3DGetBlobPart(test_blob_part2, test_blob_part2[6], D3D_BLOB_ALL_SIGNATURE_BLOB, 0, &blob); + ok(hr == S_OK, "D3DGetBlobPart failed, got %x, expected %x\n", hr, S_OK); + + size = ID3D10Blob_GetBufferSize(blob); + ok(size == 344, "GetBufferSize failed, got %lu, expected %u\n", size, 344); + + dword = ((DWORD*)ID3D10Blob_GetBufferPointer(blob)); + ok(TAG_DXBC == *dword, "DXBC got %#x, expected %#x.\n", *dword, TAG_DXBC); + ok(TAG_ISGN == *(dword+11), "ISGN got %#x, expected %#x.\n", *(dword+11), TAG_ISGN); + ok(TAG_OSGN == *(dword+24), "OSGN got %#x, expected %#x.\n", *(dword+24), TAG_OSGN); + ok(TAG_PCSG == *(dword+37), "PCSG got %#x, expected %#x.\n", *(dword+37), TAG_PCSG); + + for (i = 0; i < sizeof(parts) / sizeof(parts[0]); i++) + { + hr = D3DGetBlobPart(dword, size, parts[i], 0, &blob2); + + if (parts[i] == D3D_BLOB_ALL_SIGNATURE_BLOB + || parts[i] == D3D_BLOB_PATCH_CONSTANT_SIGNATURE_BLOB + || parts[i] == D3D_BLOB_INPUT_AND_OUTPUT_SIGNATURE_BLOB + || parts[i] == D3D_BLOB_INPUT_SIGNATURE_BLOB + || parts[i] == D3D_BLOB_OUTPUT_SIGNATURE_BLOB) + { + ok(hr == S_OK, "D3DGetBlobPart failed, got %x, expected %x\n", hr, S_OK); + + refcount = ID3D10Blob_Release(blob2); + ok(!refcount, "ID3DBlob has %u references left\n", refcount); + } + else + { + ok(hr == E_FAIL, "D3DGetBlobPart failed, got %x, expected %x\n", hr, E_FAIL); + } + } + + refcount = ID3D10Blob_Release(blob); + ok(!refcount, "ID3DBlob has %u references left\n", refcount); } START_TEST(blob)

1 0

Juan Lang : crypt32: Use A functions for debug string that' s only used as an ASCII string.
by Alexandre Julliard 15 Oct '10

15 Oct '10

Module: wine Branch: master Commit: b6cd08f4367bba9d7d63b5317f7ea441bfad3589 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6cd08f4367bba9d7d63b5317… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Oct 8 11:14:06 2010 -0700 crypt32: Use A functions for debug string that's only used as an ASCII string. --- dlls/crypt32/chain.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index 056838b..b41412b 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -1662,18 +1662,18 @@ static void dump_extension(const CERT_EXTENSION *ext) dump_netscape_cert_type(ext); } -static LPCWSTR filetime_to_str(const FILETIME *time) +static LPCSTR filetime_to_str(const FILETIME *time) { - static WCHAR date[80]; - WCHAR dateFmt[80]; /* sufficient for all versions of LOCALE_SSHORTDATE */ + static char date[80]; + char dateFmt[80]; /* sufficient for all versions of LOCALE_SSHORTDATE */ SYSTEMTIME sysTime; if (!time) return NULL; - GetLocaleInfoW(LOCALE_SYSTEM_DEFAULT, LOCALE_SSHORTDATE, dateFmt, + GetLocaleInfoA(LOCALE_SYSTEM_DEFAULT, LOCALE_SSHORTDATE, dateFmt, sizeof(dateFmt) / sizeof(dateFmt[0])); FileTimeToSystemTime(time, &sysTime); - GetDateFormatW(LOCALE_SYSTEM_DEFAULT, 0, &sysTime, dateFmt, date, + GetDateFormatA(LOCALE_SYSTEM_DEFAULT, 0, &sysTime, dateFmt, date, sizeof(date) / sizeof(date[0])); return date; } @@ -1705,8 +1705,8 @@ static void dump_element(PCCERT_CONTEXT cert) CryptMemFree(name); } TRACE_(chain)("valid from %s to %s\n", - debugstr_w(filetime_to_str(&cert->pCertInfo->NotBefore)), - debugstr_w(filetime_to_str(&cert->pCertInfo->NotAfter))); + filetime_to_str(&cert->pCertInfo->NotBefore), + filetime_to_str(&cert->pCertInfo->NotAfter)); TRACE_(chain)("%d extensions\n", cert->pCertInfo->cExtension); for (i = 0; i < cert->pCertInfo->cExtension; i++) dump_extension(&cert->pCertInfo->rgExtension[i]); @@ -1893,7 +1893,7 @@ static void CRYPT_CheckSimpleChain(PCertificateChainEngine engine, CERT_BASIC_CONSTRAINTS2_INFO constraints = { FALSE, FALSE, 0 }; TRACE_(chain)("checking chain with %d elements for time %s\n", - chain->cElement, debugstr_w(filetime_to_str(time))); + chain->cElement, filetime_to_str(time)); for (i = chain->cElement - 1; i >= 0; i--) { BOOL isRoot;

1 0

Juan Lang : crypt32: Trace time value in addition to address of time value.
by Alexandre Julliard 15 Oct '10

15 Oct '10

Module: wine Branch: master Commit: 63a05db41cbd19127f9353f5008fcf9f922c0ca7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=63a05db41cbd19127f9353f50… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Oct 14 14:42:38 2010 -0700 crypt32: Trace time value in addition to address of time value. --- dlls/crypt32/chain.c | 17 +++++++++++++---- 1 files changed, 13 insertions(+), 4 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index b41412b..a813b64 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -2149,6 +2149,13 @@ static BOOL CRYPT_BuildSimpleChain(const CertificateChainEngine *engine, return ret; } +static LPCSTR debugstr_filetime(LPFILETIME pTime) +{ + if (!pTime) + return "(nil)"; + return wine_dbg_sprintf("%p (%s)", pTime, filetime_to_str(pTime)); +} + static BOOL CRYPT_GetSimpleChainForCert(PCertificateChainEngine engine, HCERTSTORE world, PCCERT_CONTEXT cert, LPFILETIME pTime, PCERT_SIMPLE_CHAIN *ppChain) @@ -2156,7 +2163,7 @@ static BOOL CRYPT_GetSimpleChainForCert(PCertificateChainEngine engine, BOOL ret = FALSE; PCERT_SIMPLE_CHAIN chain; - TRACE("(%p, %p, %p, %p)\n", engine, world, cert, pTime); + TRACE("(%p, %p, %p, %s)\n", engine, world, cert, debugstr_filetime(pTime)); chain = CryptMemAlloc(sizeof(CERT_SIMPLE_CHAIN)); if (chain) @@ -2377,7 +2384,8 @@ static PCertificateChain CRYPT_BuildAlternateContextFromChain( PCertificateChainEngine engine = (PCertificateChainEngine)hChainEngine; PCertificateChain alternate; - TRACE("(%p, %p, %p, %p)\n", hChainEngine, pTime, hAdditionalStore, chain); + TRACE("(%p, %s, %p, %p)\n", hChainEngine, debugstr_filetime(pTime), + hAdditionalStore, chain); /* Always start with the last "lower quality" chain to ensure a consistent * order of alternate creation: @@ -2803,8 +2811,9 @@ BOOL WINAPI CertGetCertificateChain(HCERTCHAINENGINE hChainEngine, BOOL ret; PCertificateChain chain = NULL; - TRACE("(%p, %p, %p, %p, %p, %08x, %p, %p)\n", hChainEngine, pCertContext, - pTime, hAdditionalStore, pChainPara, dwFlags, pvReserved, ppChainContext); + TRACE("(%p, %p, %s, %p, %p, %08x, %p, %p)\n", hChainEngine, pCertContext, + debugstr_filetime(pTime), hAdditionalStore, pChainPara, dwFlags, + pvReserved, ppChainContext); if (ppChainContext) *ppChainContext = NULL;

1 0

Piotr Caban : jscript: Added more safety options flags handling to create_activex_object.
by Alexandre Julliard 15 Oct '10

15 Oct '10

Module: wine Branch: master Commit: f793d2cf049b38d81addc3fdc91cf6dcb3e8f776 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f793d2cf049b38d81addc3fdc… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Oct 14 23:55:38 2010 +0200 jscript: Added more safety options flags handling to create_activex_object. --- dlls/jscript/activex.c | 49 ++++++++++++++++++--------------- dlls/jscript/tests/activex.c | 62 +++++++++++++++++++++++++---------------- 2 files changed, 65 insertions(+), 46 deletions(-) diff --git a/dlls/jscript/activex.c b/dlls/jscript/activex.c index b532bd4..07a9dcc 100644 --- a/dlls/jscript/activex.c +++ b/dlls/jscript/activex.c @@ -58,7 +58,7 @@ static IInternetHostSecurityManager *get_sec_mgr(script_ctx_t *ctx) static IUnknown *create_activex_object(script_ctx_t *ctx, const WCHAR *progid) { - IInternetHostSecurityManager *secmgr; + IInternetHostSecurityManager *secmgr = NULL; IObjectWithSite *obj_site; struct CONFIRMSAFETY cs; IClassFactoryEx *cfex; @@ -76,15 +76,17 @@ static IUnknown *create_activex_object(script_ctx_t *ctx, const WCHAR *progid) TRACE("GUID %s\n", debugstr_guid(&guid)); - secmgr = get_sec_mgr(ctx); - if(!secmgr) - return NULL; + if(ctx->safeopt & INTERFACE_USES_SECURITY_MANAGER) { + secmgr = get_sec_mgr(ctx); + if(!secmgr) + return NULL; - policy = 0; - hres = IInternetHostSecurityManager_ProcessUrlAction(secmgr, URLACTION_ACTIVEX_RUN, (BYTE*)&policy, sizeof(policy), - (BYTE*)&guid, sizeof(GUID), 0, 0); - if(FAILED(hres) || policy != URLPOLICY_ALLOW) - return NULL; + policy = 0; + hres = IInternetHostSecurityManager_ProcessUrlAction(secmgr, URLACTION_ACTIVEX_RUN, + (BYTE*)&policy, sizeof(policy), (BYTE*)&guid, sizeof(GUID), 0, 0); + if(FAILED(hres) || policy != URLPOLICY_ALLOW) + return NULL; + } hres = CoGetClassObject(&guid, CLSCTX_INPROC_SERVER|CLSCTX_LOCAL_SERVER, NULL, &IID_IClassFactory, (void**)&cf); if(FAILED(hres)) @@ -100,19 +102,21 @@ static IUnknown *create_activex_object(script_ctx_t *ctx, const WCHAR *progid) if(FAILED(hres)) return NULL; - cs.clsid = guid; - cs.pUnk = obj; - cs.dwFlags = 0; - hres = IInternetHostSecurityManager_QueryCustomPolicy(secmgr, &GUID_CUSTOM_CONFIRMOBJECTSAFETY, &bpolicy, &policy_size, - (BYTE*)&cs, sizeof(cs), 0); - if(SUCCEEDED(hres)) { - policy = policy_size >= sizeof(DWORD) ? *(DWORD*)bpolicy : URLPOLICY_DISALLOW; - CoTaskMemFree(bpolicy); - } + if(secmgr) { + cs.clsid = guid; + cs.pUnk = obj; + cs.dwFlags = 0; + hres = IInternetHostSecurityManager_QueryCustomPolicy(secmgr, &GUID_CUSTOM_CONFIRMOBJECTSAFETY, + &bpolicy, &policy_size, (BYTE*)&cs, sizeof(cs), 0); + if(SUCCEEDED(hres)) { + policy = policy_size >= sizeof(DWORD) ? *(DWORD*)bpolicy : URLPOLICY_DISALLOW; + CoTaskMemFree(bpolicy); + } - if(FAILED(hres) || policy != URLPOLICY_ALLOW) { - IUnknown_Release(obj); - return NULL; + if(FAILED(hres) || policy != URLPOLICY_ALLOW) { + IUnknown_Release(obj); + return NULL; + } } hres = IUnknown_QueryInterface(obj, &IID_IObjectWithSite, (void**)&obj_site); @@ -150,7 +154,8 @@ static HRESULT ActiveXObject_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flag return E_NOTIMPL; } - if(ctx->safeopt != (INTERFACESAFE_FOR_UNTRUSTED_DATA|INTERFACE_USES_DISPEX|INTERFACE_USES_SECURITY_MANAGER)) { + if(ctx->safeopt != (INTERFACESAFE_FOR_UNTRUSTED_DATA|INTERFACE_USES_DISPEX|INTERFACE_USES_SECURITY_MANAGER) + && ctx->safeopt != INTERFACE_USES_DISPEX) { FIXME("Unsupported safeopt %x\n", ctx->safeopt); return E_NOTIMPL; } diff --git a/dlls/jscript/tests/activex.c b/dlls/jscript/tests/activex.c index faf73d3..c6080b0 100644 --- a/dlls/jscript/tests/activex.c +++ b/dlls/jscript/tests/activex.c @@ -188,8 +188,8 @@ static HRESULT WINAPI DispatchEx_QueryInterface(IDispatchEx *iface, REFIID riid, }else if(IsEqualGUID(&IID_IObjectWithSite, riid)) { CHECK_EXPECT(QI_IObjectWithSite); *ppv = object_with_site; - }else { - return E_NOINTERFACE; + }else if(IsEqualGUID(&IID_IObjectSafety, riid)) { + ok(0, "Unexpected IID_IObjectSafety query\n"); } return *ppv ? S_OK : E_NOINTERFACE; @@ -662,10 +662,10 @@ static const IActiveScriptSiteVtbl ActiveScriptSiteVtbl = { static IActiveScriptSite ActiveScriptSite = { &ActiveScriptSiteVtbl }; -static void set_safety_options(IUnknown *unk) +static void set_safety_options(IUnknown *unk, BOOL use_sec_mgr) { IObjectSafety *safety; - DWORD supported, enabled; + DWORD supported, enabled, options_all, options_set; HRESULT hres; hres = IUnknown_QueryInterface(unk, &IID_IObjectSafety, (void**)&safety); @@ -673,18 +673,20 @@ static void set_safety_options(IUnknown *unk) if(FAILED(hres)) return; - hres = IObjectSafety_SetInterfaceSafetyOptions(safety, &IID_IActiveScriptParse, - INTERFACESAFE_FOR_UNTRUSTED_DATA|INTERFACE_USES_DISPEX|INTERFACE_USES_SECURITY_MANAGER, - INTERFACESAFE_FOR_UNTRUSTED_DATA|INTERFACE_USES_DISPEX|INTERFACE_USES_SECURITY_MANAGER); + options_all = INTERFACESAFE_FOR_UNTRUSTED_DATA|INTERFACE_USES_DISPEX|INTERFACE_USES_SECURITY_MANAGER; + if(use_sec_mgr) + options_set = options_all; + else + options_set = INTERFACE_USES_DISPEX; + + hres = IObjectSafety_SetInterfaceSafetyOptions(safety, &IID_IActiveScriptParse, options_all, options_set); ok(hres == S_OK, "SetInterfaceSafetyOptions failed: %08x\n", hres); supported = enabled = 0xdeadbeef; hres = IObjectSafety_GetInterfaceSafetyOptions(safety, &IID_IActiveScriptParse, &supported, &enabled); ok(hres == S_OK, "GetInterfaceSafetyOptions failed: %08x\n", hres); - ok(supported == (INTERFACESAFE_FOR_UNTRUSTED_DATA|INTERFACE_USES_DISPEX|INTERFACE_USES_SECURITY_MANAGER), - "supported=%x\n", supported); - ok(enabled == (INTERFACESAFE_FOR_UNTRUSTED_DATA|INTERFACE_USES_DISPEX|INTERFACE_USES_SECURITY_MANAGER), - "enabled=%x\n", enabled); + ok(supported == options_all, "supported=%x, expected %x\n", supported, options_all); + ok(enabled == options_set, "enabled=%x, expected %x\n", enabled, options_set); IObjectSafety_Release(safety); } @@ -701,7 +703,7 @@ static void _parse_script_a(unsigned line, IActiveScriptParse *parser, const cha ok_(__FILE__,line)(hres == S_OK, "ParseScriptText failed: %08x\n", hres); } -static IActiveScriptParse *create_script(BOOL skip_tests) +static IActiveScriptParse *create_script(BOOL skip_tests, BOOL use_sec_mgr) { IActiveScriptParse *parser; IActiveScript *script; @@ -725,7 +727,7 @@ static IActiveScriptParse *create_script(BOOL skip_tests) return NULL; if(!skip_tests) - set_safety_options((IUnknown*)script); + set_safety_options((IUnknown*)script, use_sec_mgr); hres = IActiveScript_QueryInterface(script, &IID_IActiveScriptParse, (void**)&parser); ok(hres == S_OK, "Could not get IActiveScriptParse: %08x\n", hres); @@ -804,7 +806,7 @@ static void test_ActiveXObject(void) IActiveScriptParse *parser; IDispatchEx *proc; - parser = create_script(FALSE); + parser = create_script(FALSE, TRUE); SET_EXPECT(Host_QS_SecMgr); SET_EXPECT(ProcessUrlAction); @@ -849,7 +851,7 @@ static void test_ActiveXObject(void) IDispatchEx_Release(proc); IUnknown_Release(parser); - parser = create_script(FALSE); + parser = create_script(FALSE, TRUE); proc = parse_procedure_a(parser, "(new ActiveXObject('Wine.Test')).reportSuccess();"); SET_EXPECT(Host_QS_SecMgr); @@ -871,7 +873,7 @@ static void test_ActiveXObject(void) IDispatchEx_Release(proc); IUnknown_Release(parser); - parser = create_script(FALSE); + parser = create_script(FALSE, TRUE); QS_SecMgr_hres = E_NOINTERFACE; SET_EXPECT(Host_QS_SecMgr); @@ -880,7 +882,7 @@ static void test_ActiveXObject(void) IUnknown_Release(parser); - parser = create_script(FALSE); + parser = create_script(FALSE, TRUE); ProcessUrlAction_hres = E_FAIL; SET_EXPECT(Host_QS_SecMgr); @@ -891,7 +893,7 @@ static void test_ActiveXObject(void) IUnknown_Release(parser); - parser = create_script(FALSE); + parser = create_script(FALSE, TRUE); ProcessUrlAction_policy = URLPOLICY_DISALLOW; SET_EXPECT(Host_QS_SecMgr); @@ -902,7 +904,7 @@ static void test_ActiveXObject(void) IUnknown_Release(parser); - parser = create_script(FALSE); + parser = create_script(FALSE, TRUE); CreateInstance_hres = E_FAIL; SET_EXPECT(Host_QS_SecMgr); @@ -915,7 +917,7 @@ static void test_ActiveXObject(void) IUnknown_Release(parser); - parser = create_script(FALSE); + parser = create_script(FALSE, TRUE); QueryCustomPolicy_hres = E_FAIL; SET_EXPECT(Host_QS_SecMgr); @@ -930,7 +932,7 @@ static void test_ActiveXObject(void) IUnknown_Release(parser); - parser = create_script(FALSE); + parser = create_script(FALSE, TRUE); QueryCustomPolicy_psize = 6; SET_EXPECT(Host_QS_SecMgr); @@ -949,7 +951,7 @@ static void test_ActiveXObject(void) IUnknown_Release(parser); - parser = create_script(FALSE); + parser = create_script(FALSE, TRUE); QueryCustomPolicy_policy = URLPOLICY_DISALLOW; SET_EXPECT(Host_QS_SecMgr); @@ -985,7 +987,19 @@ static void test_ActiveXObject(void) IUnknown_Release(parser); - parser = create_script(FALSE); + parser = create_script(FALSE, FALSE); + + SET_EXPECT(CreateInstance); + SET_EXPECT(QI_IObjectWithSite); + SET_EXPECT(reportSuccess); + parse_script_a(parser, "(new ActiveXObject('Wine.Test')).reportSuccess();"); + CHECK_CALLED(CreateInstance); + CHECK_CALLED(QI_IObjectWithSite); + CHECK_CALLED(reportSuccess); + + IUnknown_Release(parser); + + parser = create_script(FALSE, TRUE); object_with_site = &ObjectWithSite; SET_EXPECT(Host_QS_SecMgr); @@ -1071,7 +1085,7 @@ static BOOL check_jscript(void) BSTR str; HRESULT hres; - parser = create_script(TRUE); + parser = create_script(TRUE, TRUE); if(!parser) return FALSE;

1 0

Austin Lund : comctl32/tests: Fix ImageList tests for different device color depths.
by Alexandre Julliard 15 Oct '10

15 Oct '10

Module: wine Branch: master Commit: 23b00490c081f476f124e1857a07c4fc5f709ed5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23b00490c081f476f124e1857… Author: Austin Lund <austin.lund(a)gmail.com> Date: Fri Oct 15 12:35:18 2010 +1000 comctl32/tests: Fix ImageList tests for different device color depths. --- dlls/comctl32/tests/imagelist.c | 17 +++++++++++------ 1 files changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index c5ea95f..bbb7d85 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -1209,6 +1209,7 @@ static void test_ImageList_DrawIndirect(void) int iImage = -1, iAlphaImage = -1, iTransparentImage = -1; UINT32 *bits = 0; UINT32 maskBits = 0x00000000, inverseMaskBits = 0xFFFFFFFF; + int bpp, broken_value; BITMAPINFO bitmapInfo = {{sizeof(BITMAPINFOHEADER), 2, 1, 1, 32, BI_RGB, 0, 0, 0, 0, 0}}; @@ -1217,6 +1218,7 @@ static void test_ImageList_DrawIndirect(void) ok(hdcDst != 0, "CreateCompatibleDC(0) failed to return a valid DC\n"); if (!hdcDst) return; + bpp = GetDeviceCaps(hdcDst, BITSPIXEL); hbmMask = CreateBitmap(2, 1, 1, 1, &maskBits); ok(hbmMask != 0, "CreateBitmap failed\n"); @@ -1265,19 +1267,22 @@ static void test_ImageList_DrawIndirect(void) check_ImageList_DrawIndirect_fStyle(hdcDst, himl, bits, iImage, ILD_NORMAL, 0x00ABCDEF, __LINE__); check_ImageList_DrawIndirect_fStyle(hdcDst, himl, bits, iImage, ILD_TRANSPARENT, 0x00ABCDEF, __LINE__); todo_wine check_ImageList_DrawIndirect_broken(hdcDst, himl, bits, iAlphaImage, ILD_BLEND25, ILS_NORMAL, 0, 0x00E8F1FA, 0x00D4D9DD, __LINE__); - todo_wine check_ImageList_DrawIndirect_broken(hdcDst, himl, bits, iAlphaImage, ILD_BLEND50, ILS_NORMAL, 0, 0x00E8F1FA, 0x00B4BDC4, __LINE__); + if (bpp == 16 || bpp == 24) broken_value = 0x00D4D9DD; + else broken_value = 0x00B4BDC4; + todo_wine check_ImageList_DrawIndirect_broken(hdcDst, himl, bits, iAlphaImage, ILD_BLEND50, ILS_NORMAL, 0, 0x00E8F1FA, broken_value, __LINE__); check_ImageList_DrawIndirect_fStyle(hdcDst, himl, bits, iImage, ILD_MASK, 0x00ABCDEF, __LINE__); check_ImageList_DrawIndirect_fStyle(hdcDst, himl, bits, iImage, ILD_IMAGE, 0x00ABCDEF, __LINE__); check_ImageList_DrawIndirect_fStyle(hdcDst, himl, bits, iImage, ILD_PRESERVEALPHA, 0x00ABCDEF, __LINE__); check_ImageList_DrawIndirect_fStyle(hdcDst, himl, bits, iAlphaImage, ILD_NORMAL, 0x00D3E5F7, __LINE__); check_ImageList_DrawIndirect_fStyle(hdcDst, himl, bits, iAlphaImage, ILD_TRANSPARENT, 0x00D3E5F7, __LINE__); - todo_wine - { - check_ImageList_DrawIndirect_broken(hdcDst, himl, bits, iAlphaImage, ILD_BLEND25, ILS_NORMAL, 0, 0x00E8F1FA, 0x009DA8B1, __LINE__); - check_ImageList_DrawIndirect_broken(hdcDst, himl, bits, iAlphaImage, ILD_BLEND50, ILS_NORMAL, 0, 0x00E8F1FA, 0x008C99A3, __LINE__); - } + if (bpp == 16 || bpp == 24) broken_value = 0x00D4D9DD; + else broken_value = 0x009DA8B1; + todo_wine check_ImageList_DrawIndirect_broken(hdcDst, himl, bits, iAlphaImage, ILD_BLEND25, ILS_NORMAL, 0, 0x00E8F1FA, broken_value, __LINE__); + if (bpp == 16 || bpp == 24) broken_value = 0x00D4D9DD; + else broken_value = 0x008C99A3; + todo_wine check_ImageList_DrawIndirect_broken(hdcDst, himl, bits, iAlphaImage, ILD_BLEND50, ILS_NORMAL, 0, 0x00E8F1FA, broken_value, __LINE__); check_ImageList_DrawIndirect_fStyle(hdcDst, himl, bits, iAlphaImage, ILD_MASK, 0x00D3E5F7, __LINE__); check_ImageList_DrawIndirect_fStyle(hdcDst, himl, bits, iAlphaImage, ILD_IMAGE, 0x00D3E5F7, __LINE__); todo_wine check_ImageList_DrawIndirect_fStyle(hdcDst, himl, bits, iAlphaImage, ILD_PRESERVEALPHA, 0x005D6F81, __LINE__);

1 0