September 2011 - Wine-commits

Matteo Bruni : d3d8/tests: Test creating shaders with wrong type or version .
by Alexandre Julliard 26 Sep '11

26 Sep '11

Module: wine Branch: master Commit: dffce5c01a32b83cea49c9b2fc41bbf58eb18667 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dffce5c01a32b83cea49c9b2f… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Sep 23 17:03:21 2011 +0200 d3d8/tests: Test creating shaders with wrong type or version. --- dlls/d3d8/tests/device.c | 83 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 83 insertions(+), 0 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 524ce2b..42726aa 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -2701,6 +2701,88 @@ done: DestroyWindow(focus_window); } +static void test_wrong_shader(void) +{ + HRESULT hr; + HWND hwnd = NULL; + IDirect3D8 *d3d = NULL; + IDirect3DDevice8 *device = NULL; + D3DPRESENT_PARAMETERS d3dpp; + D3DDISPLAYMODE d3ddm; + DWORD vs, ps; + + static const DWORD vs_2_0[] = + { + 0xfffe0200, /* vs_2_0 */ + 0x0200001f, 0x80000000, 0x900f0000, /* dcl_position v0 */ + 0x02000001, 0x800f0001, 0xa0e40001, /* mov r1, c1 */ + 0x03000002, 0xd00f0000, 0x80e40001, 0xa0e40002, /* add oD0, r1, c2 */ + 0x02000001, 0xc00f0000, 0x90e40000, /* mov oPos, v0 */ + 0x0000ffff /* end */ + }; + static const DWORD ps_2_0[] = + { + 0xffff0200, /* ps_2_0 */ + 0x02000001, 0x800f0001, 0xa0e40001, /* mov r1, c1 */ + 0x03000002, 0x800f0000, 0x80e40001, 0xa0e40002, /* add r0, r1, c2 */ + 0x02000001, 0x800f0800, 0x80e40000, /* mov oC0, r0 */ + 0x0000ffff /* end */ + }; + + static const DWORD decl[] = + { + D3DVSD_STREAM(0), + D3DVSD_REG(D3DVSDE_POSITION, D3DVSDT_FLOAT3), + D3DVSD_END() + }; + + d3d = pDirect3DCreate8(D3D_SDK_VERSION); + ok(d3d != NULL, "Failed to create IDirect3D8 object\n"); + hwnd = CreateWindow("d3d8_test_wc", "d3d8_test", WS_OVERLAPPEDWINDOW, 100, 100, 160, 160, NULL, NULL, NULL, NULL); + ok(hwnd != NULL, "Failed to create window\n"); + if (!d3d || !hwnd) + goto cleanup; + + IDirect3D8_GetAdapterDisplayMode(d3d, D3DADAPTER_DEFAULT, &d3ddm); + ZeroMemory(&d3dpp, sizeof(d3dpp)); + d3dpp.Windowed = TRUE; + d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; + d3dpp.BackBufferWidth = 800; + d3dpp.BackBufferHeight = 600; + d3dpp.BackBufferFormat = d3ddm.Format; + + hr = IDirect3D8_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, hwnd, + D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &device); + ok(hr == D3D_OK || hr == D3DERR_INVALIDCALL || broken(hr == D3DERR_NOTAVAILABLE), "IDirect3D8_CreateDevice failed with %#08x\n", hr); + if (!device) + { + skip("could not create device, IDirect3D8_CreateDevice returned %#08x\n", hr); + goto cleanup; + } + + hr = IDirect3DDevice8_CreateVertexShader(device, decl, simple_ps, &vs, 0); + ok(hr == D3DERR_INVALIDCALL, "IDirect3DDevice8_CreateVertexShader returned %#08x\n", hr); + + hr = IDirect3DDevice8_CreatePixelShader(device, simple_vs, &ps); + ok(hr == D3DERR_INVALIDCALL, "IDirect3DDevice8_CreatePixelShader returned %#08x\n", hr); + + hr = IDirect3DDevice8_CreateVertexShader(device, decl, vs_2_0, &vs, 0); + ok(hr == D3DERR_INVALIDCALL, "IDirect3DDevice8_CreateVertexShader returned %#08x\n", hr); + + hr = IDirect3DDevice8_CreatePixelShader(device, ps_2_0, &ps); + ok(hr == D3DERR_INVALIDCALL, "IDirect3DDevice8_CreatePixelShader returned %#08x\n", hr); + +cleanup: + if (device) + { + UINT refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + } + if (d3d) + IDirect3D8_Release(d3d); + DestroyWindow(hwnd); +} + START_TEST(device) { HMODULE d3d8_handle = LoadLibraryA( "d3d8.dll" ); @@ -2751,6 +2833,7 @@ START_TEST(device) test_wndproc_windowed(); test_depth_stencil_size(); test_window_style(); + test_wrong_shader(); } UnregisterClassA("d3d8_test_wc", GetModuleHandleA(NULL)); }

1 0

Matteo Bruni : d3d9/tests: Test creating shaders with wrong type or version .
by Alexandre Julliard 26 Sep '11

26 Sep '11

Module: wine Branch: master Commit: f87483c307a66804a7aa43f748920518f4b1357f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f87483c307a66804a7aa43f74… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Sep 23 17:03:22 2011 +0200 d3d9/tests: Test creating shaders with wrong type or version. --- dlls/d3d9/tests/shader.c | 69 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 69 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/shader.c b/dlls/d3d9/tests/shader.c index 3795943..f5a2bcb 100644 --- a/dlls/d3d9/tests/shader.c +++ b/dlls/d3d9/tests/shader.c @@ -209,6 +209,73 @@ static void test_pixel_shader_constant(IDirect3DDevice9 *device_ptr) ok(hr == D3DERR_INVALIDCALL, "IDirect3DDevice9_SetPixelShaderConstantF returned 0x%08x\n", hr); } +static void test_wrong_shader(IDirect3DDevice9 *device_ptr) +{ + static const DWORD simple_vs[] = + { + 0xfffe0101, /* vs_1_1 */ + 0x0000001f, 0x80000000, 0x900f0000, /* dcl_position0 v0 */ + 0x00000009, 0xc0010000, 0x90e40000, 0xa0e40000, /* dp4 oPos.x, v0, c0 */ + 0x00000009, 0xc0020000, 0x90e40000, 0xa0e40001, /* dp4 oPos.y, v0, c1 */ + 0x00000009, 0xc0040000, 0x90e40000, 0xa0e40002, /* dp4 oPos.z, v0, c2 */ + 0x00000009, 0xc0080000, 0x90e40000, 0xa0e40003, /* dp4 oPos.w, v0, c3 */ + 0x0000ffff /* END */ + }; + + static const DWORD simple_ps[] = + { + 0xffff0101, /* ps_1_1 */ + 0x00000051, 0xa00f0001, 0x3f800000, 0x00000000, 0x00000000, 0x00000000, /* def c1 = 1.0, 0.0, 0.0, 0.0 */ + 0x00000042, 0xb00f0000, /* tex t0 */ + 0x00000008, 0x800f0000, 0xa0e40001, 0xa0e40000, /* dp3 r0, c1, c0 */ + 0x00000005, 0x800f0000, 0x90e40000, 0x80e40000, /* mul r0, v0, r0 */ + 0x00000005, 0x800f0000, 0xb0e40000, 0x80e40000, /* mul r0, t0, r0 */ + 0x0000ffff /* END */ + }; + +#if 0 +float4 main(const float4 color : COLOR) : SV_TARGET +{ + float4 o; + + o = color; + + return o; +} +#endif + static const DWORD ps_4_0[] = + { + 0x43425844, 0x4da9446f, 0xfbe1f259, 0x3fdb3009, 0x517521fa, 0x00000001, 0x000001ac, + 0x00000005, 0x00000034, 0x0000008c, 0x000000bc, 0x000000f0, 0x00000130, 0x46454452, + 0x00000050, 0x00000000, 0x00000000, 0x00000000, 0x0000001c, 0xffff0400, 0x00000100, + 0x0000001c, 0x7263694d, 0x666f736f, 0x52282074, 0x4c482029, 0x53204c53, 0x65646168, + 0x6f432072, 0x6c69706d, 0x39207265, 0x2e39322e, 0x2e323539, 0x31313133, 0xababab00, + 0x4e475349, 0x00000028, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, + 0x00000003, 0x00000000, 0x00000f0f, 0x4f4c4f43, 0xabab0052, 0x4e47534f, 0x0000002c, + 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, + 0x0000000f, 0x545f5653, 0x45475241, 0xabab0054, 0x52444853, 0x00000038, 0x00000040, + 0x0000000e, 0x03001062, 0x001010f2, 0x00000000, 0x03000065, 0x001020f2, 0x00000000, + 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, + }; + + IDirect3DVertexShader9 *vs; + IDirect3DPixelShader9 *ps; + HRESULT hret; + + hret = IDirect3DDevice9_CreateVertexShader(device_ptr, simple_ps, &vs); + ok(hret == D3DERR_INVALIDCALL, "CreateVertexShader returned: hret 0x%x, shader_ptr %p.\n", hret, vs); + hret = IDirect3DDevice9_CreatePixelShader(device_ptr, simple_vs, &ps); + ok(hret == D3DERR_INVALIDCALL, "CreatePixelShader returned: hret 0x%x, shader_ptr %p.\n", hret, ps); + + hret = IDirect3DDevice9_CreatePixelShader(device_ptr, ps_4_0, &ps); + ok(hret == D3DERR_INVALIDCALL, "CreatePixelShader returned: hret 0x%x, shader_ptr %p.\n", hret, ps); +} + START_TEST(shader) { D3DCAPS9 caps; @@ -239,6 +306,8 @@ START_TEST(shader) test_get_set_pixel_shader(device_ptr); /* No max pixel shader constant value??? */ test_pixel_shader_constant(device_ptr); + if (caps.VertexShaderVersion & 0xffff) + test_wrong_shader(device_ptr); } else skip("No pixel shader support\n");

1 0

Matteo Bruni : d3d10core/tests: Add some shader creation tests.
by Alexandre Julliard 26 Sep '11

26 Sep '11

Module: wine Branch: master Commit: 7c65ab91ad6245f022aa2a1e0218b78819722502 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c65ab91ad6245f022aa2a1e0… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Sep 23 17:03:23 2011 +0200 d3d10core/tests: Add some shader creation tests. --- dlls/d3d10core/tests/device.c | 134 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 134 insertions(+), 0 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index ce3d03c..b0907ba 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -237,6 +237,139 @@ static void test_create_rendertarget_view(ID3D10Device *device) ID3D10Texture2D_Release(texture); } +static void test_create_shader(ID3D10Device *device) +{ +#if 0 +float4 light; +float4x4 mat; + +struct input +{ + float4 position : POSITION; + float3 normal : NORMAL; +}; + +struct output +{ + float4 position : POSITION; + float4 diffuse : COLOR; +}; + +output main(const input v) +{ + output o; + + o.position = mul(v.position, mat); + o.diffuse = dot((float3)light, v.normal); + + return o; +} +#endif + static const DWORD vs_4_0[] = + { + 0x43425844, 0x3ae813ca, 0x0f034b91, 0x790f3226, 0x6b4a718a, 0x00000001, 0x000001c0, + 0x00000003, 0x0000002c, 0x0000007c, 0x000000cc, 0x4e475349, 0x00000048, 0x00000002, + 0x00000008, 0x00000038, 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000f0f, + 0x00000041, 0x00000000, 0x00000000, 0x00000003, 0x00000001, 0x00000707, 0x49534f50, + 0x4e4f4954, 0x524f4e00, 0x004c414d, 0x4e47534f, 0x00000048, 0x00000002, 0x00000008, + 0x00000038, 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x0000000f, 0x00000041, + 0x00000000, 0x00000000, 0x00000003, 0x00000001, 0x0000000f, 0x49534f50, 0x4e4f4954, + 0x4c4f4300, 0xab00524f, 0x52444853, 0x000000ec, 0x00010040, 0x0000003b, 0x04000059, + 0x00208e46, 0x00000000, 0x00000005, 0x0300005f, 0x001010f2, 0x00000000, 0x0300005f, + 0x00101072, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x03000065, 0x001020f2, + 0x00000001, 0x08000011, 0x00102012, 0x00000000, 0x00101e46, 0x00000000, 0x00208e46, + 0x00000000, 0x00000001, 0x08000011, 0x00102022, 0x00000000, 0x00101e46, 0x00000000, + 0x00208e46, 0x00000000, 0x00000002, 0x08000011, 0x00102042, 0x00000000, 0x00101e46, + 0x00000000, 0x00208e46, 0x00000000, 0x00000003, 0x08000011, 0x00102082, 0x00000000, + 0x00101e46, 0x00000000, 0x00208e46, 0x00000000, 0x00000004, 0x08000010, 0x001020f2, + 0x00000001, 0x00208246, 0x00000000, 0x00000000, 0x00101246, 0x00000001, 0x0100003e, + }; + + static const DWORD vs_2_0[] = + { + 0xfffe0200, 0x002bfffe, 0x42415443, 0x0000001c, 0x00000077, 0xfffe0200, 0x00000002, + 0x0000001c, 0x00000100, 0x00000070, 0x00000044, 0x00040002, 0x00000001, 0x0000004c, + 0x00000000, 0x0000005c, 0x00000002, 0x00000004, 0x00000060, 0x00000000, 0x6867696c, + 0xabab0074, 0x00030001, 0x00040001, 0x00000001, 0x00000000, 0x0074616d, 0x00030003, + 0x00040004, 0x00000001, 0x00000000, 0x325f7376, 0x4d00305f, 0x6f726369, 0x74666f73, + 0x29522820, 0x534c4820, 0x6853204c, 0x72656461, 0x6d6f4320, 0x656c6970, 0x2e392072, + 0x392e3932, 0x332e3235, 0x00313131, 0x0200001f, 0x80000000, 0x900f0000, 0x0200001f, + 0x80000003, 0x900f0001, 0x03000009, 0xc0010000, 0x90e40000, 0xa0e40000, 0x03000009, + 0xc0020000, 0x90e40000, 0xa0e40001, 0x03000009, 0xc0040000, 0x90e40000, 0xa0e40002, + 0x03000009, 0xc0080000, 0x90e40000, 0xa0e40003, 0x03000008, 0xd00f0000, 0xa0e40004, + 0x90e40001, 0x0000ffff, + }; + + static const DWORD vs_3_0[] = + { + 0xfffe0300, 0x002bfffe, 0x42415443, 0x0000001c, 0x00000077, 0xfffe0300, 0x00000002, + 0x0000001c, 0x00000100, 0x00000070, 0x00000044, 0x00040002, 0x00000001, 0x0000004c, + 0x00000000, 0x0000005c, 0x00000002, 0x00000004, 0x00000060, 0x00000000, 0x6867696c, + 0xabab0074, 0x00030001, 0x00040001, 0x00000001, 0x00000000, 0x0074616d, 0x00030003, + 0x00040004, 0x00000001, 0x00000000, 0x335f7376, 0x4d00305f, 0x6f726369, 0x74666f73, + 0x29522820, 0x534c4820, 0x6853204c, 0x72656461, 0x6d6f4320, 0x656c6970, 0x2e392072, + 0x392e3932, 0x332e3235, 0x00313131, 0x0200001f, 0x80000000, 0x900f0000, 0x0200001f, + 0x80000003, 0x900f0001, 0x0200001f, 0x80000000, 0xe00f0000, 0x0200001f, 0x8000000a, + 0xe00f0001, 0x03000009, 0xe0010000, 0x90e40000, 0xa0e40000, 0x03000009, 0xe0020000, + 0x90e40000, 0xa0e40001, 0x03000009, 0xe0040000, 0x90e40000, 0xa0e40002, 0x03000009, + 0xe0080000, 0x90e40000, 0xa0e40003, 0x03000008, 0xe00f0001, 0xa0e40004, 0x90e40001, + 0x0000ffff, + }; + +#if 0 +float4 main(const float4 color : COLOR) : SV_TARGET +{ + float4 o; + + o = color; + + return o; +} +#endif + static const DWORD ps_4_0[] = + { + 0x43425844, 0x4da9446f, 0xfbe1f259, 0x3fdb3009, 0x517521fa, 0x00000001, 0x000001ac, + 0x00000005, 0x00000034, 0x0000008c, 0x000000bc, 0x000000f0, 0x00000130, 0x46454452, + 0x00000050, 0x00000000, 0x00000000, 0x00000000, 0x0000001c, 0xffff0400, 0x00000100, + 0x0000001c, 0x7263694d, 0x666f736f, 0x52282074, 0x4c482029, 0x53204c53, 0x65646168, + 0x6f432072, 0x6c69706d, 0x39207265, 0x2e39322e, 0x2e323539, 0x31313133, 0xababab00, + 0x4e475349, 0x00000028, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, + 0x00000003, 0x00000000, 0x00000f0f, 0x4f4c4f43, 0xabab0052, 0x4e47534f, 0x0000002c, + 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, + 0x0000000f, 0x545f5653, 0x45475241, 0xabab0054, 0x52444853, 0x00000038, 0x00000040, + 0x0000000e, 0x03001062, 0x001010f2, 0x00000000, 0x03000065, 0x001020f2, 0x00000000, + 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, + }; + + ID3D10VertexShader *vs = NULL; + ID3D10PixelShader *ps = NULL; + HRESULT hr; + + hr = ID3D10Device_CreateVertexShader(device, vs_4_0, sizeof(vs_4_0), &vs); + ok(SUCCEEDED(hr), "Failed to create SM4 vertex shader, hr %#x\n", hr); + if (vs) + ID3D10VertexShader_Release(vs); + + hr = ID3D10Device_CreateVertexShader(device, vs_2_0, sizeof(vs_2_0), &vs); + ok(hr == E_INVALIDARG, "Created a SM2 vertex shader, hr %#x\n", hr); + + hr = ID3D10Device_CreateVertexShader(device, vs_3_0, sizeof(vs_3_0), &vs); + ok(hr == E_INVALIDARG, "Created a SM3 vertex shader, hr %#x\n", hr); + + hr = ID3D10Device_CreateVertexShader(device, ps_4_0, sizeof(ps_4_0), &vs); + ok(hr == E_INVALIDARG, "Created a SM4 vertex shader from a pixel shader source, hr %#x\n", hr); + + hr = ID3D10Device_CreatePixelShader(device, ps_4_0, sizeof(ps_4_0), &ps); + ok(SUCCEEDED(hr), "Failed to create SM4 vertex shader, hr %#x\n", hr); + if (ps) + ID3D10VertexShader_Release(ps); +} + START_TEST(device) { ID3D10Device *device; @@ -253,6 +386,7 @@ START_TEST(device) test_create_texture2d(device); test_create_texture3d(device); test_create_rendertarget_view(device); + test_create_shader(device); refcount = ID3D10Device_Release(device); ok(!refcount, "Device has %u references left\n", refcount);

1 0

Louis Lenders : dpnet: Fill the DPN_SP_CAPS structure in IDirectPlay8Peer_GetSPCaps with some sane values + tests .
by Alexandre Julliard 26 Sep '11

26 Sep '11

Module: wine Branch: master Commit: fed06a562e1557a61dd8c70a038006976b48fd7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=fed06a562e1557a61dd8c70a0… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Fri Sep 23 23:17:58 2011 +0200 dpnet: Fill the DPN_SP_CAPS structure in IDirectPlay8Peer_GetSPCaps with some sane values + tests. --- dlls/dpnet/peer.c | 19 +++++++++++++++++-- dlls/dpnet/tests/peer.c | 27 +++++++++++++++++++++++++++ 2 files changed, 44 insertions(+), 2 deletions(-) diff --git a/dlls/dpnet/peer.c b/dlls/dpnet/peer.c index 307b306..5b89fb4 100644 --- a/dlls/dpnet/peer.c +++ b/dlls/dpnet/peer.c @@ -389,9 +389,24 @@ static HRESULT WINAPI IDirectPlay8PeerImpl_SetSPCaps(IDirectPlay8Peer *iface, co static HRESULT WINAPI IDirectPlay8PeerImpl_GetSPCaps(IDirectPlay8Peer *iface, const GUID * const pguidSP, DPN_SP_CAPS * const pdpspCaps, const DWORD dwFlags) { - FIXME("(%p)->(%p,%p,%x): stub\n", iface, pguidSP, pdpspCaps, dwFlags); + TRACE("(%p)->(%p,%p,%x)\n", iface, pguidSP, pdpspCaps, dwFlags); - return DPNERR_GENERIC; + if(pdpspCaps->dwSize != sizeof(DPN_SP_CAPS)) + { + return DPNERR_INVALIDPARAM; + } + + pdpspCaps->dwFlags = DPNSPCAPS_SUPPORTSDPNSRV | DPNSPCAPS_SUPPORTSBROADCAST | + DPNSPCAPS_SUPPORTSALLADAPTERS | DPNSPCAPS_SUPPORTSTHREADPOOL; + pdpspCaps->dwNumThreads = 3; + pdpspCaps->dwDefaultEnumCount = 5; + pdpspCaps->dwDefaultEnumRetryInterval = 1500; + pdpspCaps->dwDefaultEnumTimeout = 1500; + pdpspCaps->dwMaxEnumPayloadSize = 983; + pdpspCaps->dwBuffersPerThread = 1; + pdpspCaps->dwSystemBufferSize = 8192; + + return DPN_OK; } static HRESULT WINAPI IDirectPlay8PeerImpl_GetConnectionInfo(IDirectPlay8Peer *iface, const DPNID dpnid, diff --git a/dlls/dpnet/tests/peer.c b/dlls/dpnet/tests/peer.c index 67e0ace..dd0b408 100644 --- a/dlls/dpnet/tests/peer.c +++ b/dlls/dpnet/tests/peer.c @@ -115,6 +115,32 @@ static void test_enum_service_providers(void) ok(HeapFree(GetProcessHeap(), 0, serv_prov_info), "Failed freeing server provider info\n"); } +static void test_get_sp_caps(void) +{ + DPN_SP_CAPS caps; + HRESULT hr; + + memset(&caps, 0, sizeof(DPN_SP_CAPS)); + + hr = IDirectPlay8Peer_GetSPCaps(peer, &CLSID_DP8SP_TCPIP, &caps, 0); + ok(hr == DPNERR_INVALIDPARAM, "GetSPCaps unexpectedly returned %x\n", hr); + + caps.dwSize = sizeof(DPN_SP_CAPS); + + hr = IDirectPlay8Peer_GetSPCaps(peer, &CLSID_DP8SP_TCPIP, &caps, 0); + ok(hr == DPN_OK, "GetSPCaps failed with %x\n", hr); + + ok(caps.dwFlags == (DPNSPCAPS_SUPPORTSDPNSRV | DPNSPCAPS_SUPPORTSBROADCAST | DPNSPCAPS_SUPPORTSALLADAPTERS | + DPNSPCAPS_SUPPORTSTHREADPOOL), "provider unexpectedly misses some capability flags\n"); + ok(caps.dwNumThreads == 3, "expected 3, got %d\n", caps.dwNumThreads); + ok(caps.dwDefaultEnumCount == 5, "expected 5, got %d\n", caps.dwDefaultEnumCount); + ok(caps.dwDefaultEnumRetryInterval == 1500, "expected 1500, got %d\n", caps.dwDefaultEnumRetryInterval); + ok(caps.dwDefaultEnumTimeout == 1500, "expected 1500, got %d\n", caps.dwDefaultEnumTimeout); + ok(caps.dwMaxEnumPayloadSize == 983, "expected 983, got %d\n", caps.dwMaxEnumPayloadSize); + ok(caps.dwBuffersPerThread == 1, "expected 1, got %d\n", caps.dwBuffersPerThread); + ok(caps.dwSystemBufferSize == 8192, "expected 8192, got %d\n", caps.dwSystemBufferSize); +} + static void test_cleanup_dp(void) { HRESULT hr; @@ -132,5 +158,6 @@ START_TEST(peer) { test_init_dp(); test_enum_service_providers(); + test_get_sp_caps(); test_cleanup_dp(); }

1 0

Marcus Meissner : dpnet: Fixed bad pointer addition (Coverity).
by Alexandre Julliard 26 Sep '11

26 Sep '11

Module: wine Branch: master Commit: 000258a007f51431cd1692d42799b0b1a8a7a9f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=000258a007f51431cd1692d42… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Sep 24 10:42:04 2011 +0200 dpnet: Fixed bad pointer addition (Coverity). --- dlls/dpnet/peer.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dpnet/peer.c b/dlls/dpnet/peer.c index 5b89fb4..b3eb9cd 100644 --- a/dlls/dpnet/peer.c +++ b/dlls/dpnet/peer.c @@ -127,7 +127,7 @@ static HRESULT WINAPI IDirectPlay8PeerImpl_EnumServiceProviders(IDirectPlay8Peer return DPNERR_BUFFERTOOSMALL; } - pSPInfoBuffer->pwszName = (LPWSTR)(pSPInfoBuffer + sizeof(DPN_SERVICE_PROVIDER_INFO)); + pSPInfoBuffer->pwszName = (LPWSTR)(pSPInfoBuffer + 1); if(!pguidServiceProvider) {

1 0

Stefan Dösinger : ddraw/tests: Use sizeof instead of a magic number.
by Alexandre Julliard 26 Sep '11

26 Sep '11

Module: wine Branch: master Commit: 6e0d056e9a4f1a13aa3493044f8735673d2fe27c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e0d056e9a4f1a13aa3493044… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Sep 22 13:24:07 2011 +0200 ddraw/tests: Use sizeof instead of a magic number. --- dlls/ddraw/tests/visual.c | 30 +++++++++++++++--------------- 1 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/ddraw/tests/visual.c b/dlls/ddraw/tests/visual.c index 96c940f..e0ba7bd 100644 --- a/dlls/ddraw/tests/visual.c +++ b/dlls/ddraw/tests/visual.c @@ -1453,7 +1453,7 @@ static void D3D1_TextureMapBlendTest(void) memcpy(exdesc.lpData, test1_quads, sizeof(test1_quads)); - exe_buffer_ptr = 256 + (char*)exdesc.lpData; + exe_buffer_ptr = sizeof(test1_quads) + (char*)exdesc.lpData; EXEBUF_PUT_PROCESSVERTICES(8, exe_buffer_ptr); @@ -1478,7 +1478,7 @@ static void D3D1_TextureMapBlendTest(void) EXEBUF_END(exe_buffer_ptr); - exe_length = ((char*)exe_buffer_ptr - (char*)exdesc.lpData) - 256; + exe_length = ((char*)exe_buffer_ptr - (char*)exdesc.lpData) - sizeof(test1_quads); hr = IDirect3DExecuteBuffer_Unlock(ExecuteBuffer); if (FAILED(hr)) { @@ -1488,7 +1488,7 @@ static void D3D1_TextureMapBlendTest(void) memset(&exdata, 0, sizeof(D3DEXECUTEDATA)); exdata.dwSize = sizeof(D3DEXECUTEDATA); exdata.dwVertexCount = 8; - exdata.dwInstructionOffset = 256; + exdata.dwInstructionOffset = sizeof(test1_quads); exdata.dwInstructionLength = exe_length; hr = IDirect3DExecuteBuffer_SetExecuteData(ExecuteBuffer, &exdata); ok(hr == D3D_OK, "IDirect3DExecuteBuffer_SetExecuteData failed with %08x\n", hr); @@ -1585,7 +1585,7 @@ static void D3D1_TextureMapBlendTest(void) memcpy(exdesc.lpData, test1_quads, sizeof(test1_quads)); - exe_buffer_ptr = 256 + (char*)exdesc.lpData; + exe_buffer_ptr = sizeof(test1_quads) + (char*)exdesc.lpData; EXEBUF_PUT_PROCESSVERTICES(8, exe_buffer_ptr); @@ -1599,7 +1599,7 @@ static void D3D1_TextureMapBlendTest(void) EXEBUF_END(exe_buffer_ptr); - exe_length = ((char*)exe_buffer_ptr - (char*)exdesc.lpData) - 256; + exe_length = ((char*)exe_buffer_ptr - (char*)exdesc.lpData) - sizeof(test1_quads); hr = IDirect3DExecuteBuffer_Unlock(ExecuteBuffer); if (FAILED(hr)) { @@ -1609,7 +1609,7 @@ static void D3D1_TextureMapBlendTest(void) memset(&exdata, 0, sizeof(D3DEXECUTEDATA)); exdata.dwSize = sizeof(D3DEXECUTEDATA); exdata.dwVertexCount = 8; - exdata.dwInstructionOffset = 256; + exdata.dwInstructionOffset = sizeof(test1_quads); exdata.dwInstructionLength = exe_length; hr = IDirect3DExecuteBuffer_SetExecuteData(ExecuteBuffer, &exdata); ok(hr == D3D_OK, "IDirect3DExecuteBuffer_SetExecuteData failed with %08x\n", hr); @@ -1706,7 +1706,7 @@ static void D3D1_TextureMapBlendTest(void) memcpy(exdesc.lpData, test2_quads, sizeof(test2_quads)); - exe_buffer_ptr = 256 + (char*)exdesc.lpData; + exe_buffer_ptr = sizeof(test2_quads) + (char*)exdesc.lpData; EXEBUF_PUT_PROCESSVERTICES(8, exe_buffer_ptr); @@ -1721,7 +1721,7 @@ static void D3D1_TextureMapBlendTest(void) EXEBUF_END(exe_buffer_ptr); - exe_length = ((char*)exe_buffer_ptr - (char*)exdesc.lpData) - 256; + exe_length = ((char*)exe_buffer_ptr - (char*)exdesc.lpData) - sizeof(test2_quads); hr = IDirect3DExecuteBuffer_Unlock(ExecuteBuffer); if (FAILED(hr)) { @@ -1731,7 +1731,7 @@ static void D3D1_TextureMapBlendTest(void) memset(&exdata, 0, sizeof(D3DEXECUTEDATA)); exdata.dwSize = sizeof(D3DEXECUTEDATA); exdata.dwVertexCount = 8; - exdata.dwInstructionOffset = 256; + exdata.dwInstructionOffset = sizeof(test2_quads); exdata.dwInstructionLength = exe_length; hr = IDirect3DExecuteBuffer_SetExecuteData(ExecuteBuffer, &exdata); ok(hr == D3D_OK, "IDirect3DExecuteBuffer_SetExecuteData failed with %08x\n", hr); @@ -1832,7 +1832,7 @@ static void D3D1_TextureMapBlendTest(void) memcpy(exdesc.lpData, test1_quads, sizeof(test1_quads)); - exe_buffer_ptr = 256 + (char*)exdesc.lpData; + exe_buffer_ptr = sizeof(test1_quads) + (char*)exdesc.lpData; EXEBUF_PUT_PROCESSVERTICES(8, exe_buffer_ptr); @@ -1847,7 +1847,7 @@ static void D3D1_TextureMapBlendTest(void) EXEBUF_END(exe_buffer_ptr); - exe_length = ((char*)exe_buffer_ptr - (char*)exdesc.lpData) - 256; + exe_length = ((char*)exe_buffer_ptr - (char*)exdesc.lpData) - sizeof(test1_quads); hr = IDirect3DExecuteBuffer_Unlock(ExecuteBuffer); if (FAILED(hr)) { @@ -1857,7 +1857,7 @@ static void D3D1_TextureMapBlendTest(void) memset(&exdata, 0, sizeof(D3DEXECUTEDATA)); exdata.dwSize = sizeof(D3DEXECUTEDATA); exdata.dwVertexCount = 8; - exdata.dwInstructionOffset = 256; + exdata.dwInstructionOffset = sizeof(test1_quads); exdata.dwInstructionLength = exe_length; hr = IDirect3DExecuteBuffer_SetExecuteData(ExecuteBuffer, &exdata); ok(hr == D3D_OK, "IDirect3DExecuteBuffer_SetExecuteData failed with %08x\n", hr); @@ -1970,7 +1970,7 @@ static void D3D1_TextureMapBlendTest(void) memcpy(exdesc.lpData, test1_quads, sizeof(test1_quads)); - exe_buffer_ptr = 256 + (char*)exdesc.lpData; + exe_buffer_ptr = sizeof(test1_quads) + (char*)exdesc.lpData; EXEBUF_PUT_PROCESSVERTICES(8, exe_buffer_ptr); @@ -1985,7 +1985,7 @@ static void D3D1_TextureMapBlendTest(void) EXEBUF_END(exe_buffer_ptr); - exe_length = ((char*)exe_buffer_ptr - (char*)exdesc.lpData) - 256; + exe_length = ((char*)exe_buffer_ptr - (char*)exdesc.lpData) - sizeof(test1_quads); hr = IDirect3DExecuteBuffer_Unlock(ExecuteBuffer); if (FAILED(hr)) { @@ -1995,7 +1995,7 @@ static void D3D1_TextureMapBlendTest(void) memset(&exdata, 0, sizeof(D3DEXECUTEDATA)); exdata.dwSize = sizeof(D3DEXECUTEDATA); exdata.dwVertexCount = 8; - exdata.dwInstructionOffset = 256; + exdata.dwInstructionOffset = sizeof(test1_quads); exdata.dwInstructionLength = exe_length; hr = IDirect3DExecuteBuffer_SetExecuteData(ExecuteBuffer, &exdata); ok(hr == D3D_OK, "IDirect3DExecuteBuffer_SetExecuteData failed with %08x\n", hr);

1 0

Stefan Dösinger : ddraw/tests: Use the variable instead of the type in sizeof().
by Alexandre Julliard 26 Sep '11

26 Sep '11

Module: wine Branch: master Commit: 35f2e91fcd0b529924203febf7c6ed8df6bf4247 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35f2e91fcd0b529924203febf… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Sep 22 13:40:01 2011 +0200 ddraw/tests: Use the variable instead of the type in sizeof(). --- dlls/ddraw/tests/visual.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/ddraw/tests/visual.c b/dlls/ddraw/tests/visual.c index e0ba7bd..2fdfe73 100644 --- a/dlls/ddraw/tests/visual.c +++ b/dlls/ddraw/tests/visual.c @@ -1485,8 +1485,8 @@ static void D3D1_TextureMapBlendTest(void) trace("IDirect3DExecuteBuffer_Unlock failed with %08x\n", hr); } - memset(&exdata, 0, sizeof(D3DEXECUTEDATA)); - exdata.dwSize = sizeof(D3DEXECUTEDATA); + memset(&exdata, 0, sizeof(exdata)); + exdata.dwSize = sizeof(exdata); exdata.dwVertexCount = 8; exdata.dwInstructionOffset = sizeof(test1_quads); exdata.dwInstructionLength = exe_length; @@ -1606,8 +1606,8 @@ static void D3D1_TextureMapBlendTest(void) trace("IDirect3DExecuteBuffer_Unlock failed with %08x\n", hr); } - memset(&exdata, 0, sizeof(D3DEXECUTEDATA)); - exdata.dwSize = sizeof(D3DEXECUTEDATA); + memset(&exdata, 0, sizeof(exdata)); + exdata.dwSize = sizeof(exdata); exdata.dwVertexCount = 8; exdata.dwInstructionOffset = sizeof(test1_quads); exdata.dwInstructionLength = exe_length; @@ -1728,8 +1728,8 @@ static void D3D1_TextureMapBlendTest(void) trace("IDirect3DExecuteBuffer_Unlock failed with %08x\n", hr); } - memset(&exdata, 0, sizeof(D3DEXECUTEDATA)); - exdata.dwSize = sizeof(D3DEXECUTEDATA); + memset(&exdata, 0, sizeof(exdata)); + exdata.dwSize = sizeof(exdata); exdata.dwVertexCount = 8; exdata.dwInstructionOffset = sizeof(test2_quads); exdata.dwInstructionLength = exe_length; @@ -1854,8 +1854,8 @@ static void D3D1_TextureMapBlendTest(void) trace("IDirect3DExecuteBuffer_Unlock failed with %08x\n", hr); } - memset(&exdata, 0, sizeof(D3DEXECUTEDATA)); - exdata.dwSize = sizeof(D3DEXECUTEDATA); + memset(&exdata, 0, sizeof(exdata)); + exdata.dwSize = sizeof(exdata); exdata.dwVertexCount = 8; exdata.dwInstructionOffset = sizeof(test1_quads); exdata.dwInstructionLength = exe_length; @@ -1992,8 +1992,8 @@ static void D3D1_TextureMapBlendTest(void) trace("IDirect3DExecuteBuffer_Unlock failed with %08x\n", hr); } - memset(&exdata, 0, sizeof(D3DEXECUTEDATA)); - exdata.dwSize = sizeof(D3DEXECUTEDATA); + memset(&exdata, 0, sizeof(exdata)); + exdata.dwSize = sizeof(exdata); exdata.dwVertexCount = 8; exdata.dwInstructionOffset = sizeof(test1_quads); exdata.dwInstructionLength = exe_length;

1 0

Francois Gouget : winecfg: Separate the file filters with a semi-colon and a space.
by Alexandre Julliard 26 Sep '11

26 Sep '11

1 0

Francois Gouget : wordpad: Use a lowercase extension in a file filter.
by Alexandre Julliard 26 Sep '11

26 Sep '11

1 0

Alexandre Julliard : winex11: Force the alpha channel to zero for mono-> color blits.
by Alexandre Julliard 26 Sep '11

26 Sep '11

Module: wine Branch: master Commit: 922d9f5cf7520c7e4e9abd457da27e69f6d40138 URL: http://source.winehq.org/git/wine.git/?a=commit;h=922d9f5cf7520c7e4e9abd457… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 26 15:25:05 2011 +0200 winex11: Force the alpha channel to zero for mono->color blits. --- dlls/gdi32/tests/bitmap.c | 43 +++++++++++++++++++++++++++++++++++++++++++ dlls/winex11.drv/xrender.c | 38 +++++++++++++++++++++++++++++++++++++- 2 files changed, 80 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index 78c79c0..ccca315 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -2761,6 +2761,7 @@ static void test_StretchBlt(void) HBRUSH hBrush, hOldBrush; BITMAPINFO biDst, biSrc; UINT32 expected[256]; + RGBQUAD colors[2]; memset(&biDst, 0, sizeof(BITMAPINFO)); biDst.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); @@ -3007,6 +3008,48 @@ todo_wine SelectObject(hdcSrc, oldSrc); DeleteObject(bmpSrc); + + biSrc.bmiHeader.biBitCount = 1; + bmpSrc = CreateDIBSection(hdcScreen, &biSrc, DIB_RGB_COLORS, (void**)&srcBuffer, NULL, 0); + oldSrc = SelectObject(hdcSrc, bmpSrc); + *((DWORD *)colors + 0) = 0x123456; + *((DWORD *)colors + 1) = 0x335577; + SetDIBColorTable( hdcSrc, 0, 2, colors ); + srcBuffer[0] = 0x55555555; + memset(dstBuffer, 0xcc, 4 * sizeof(*dstBuffer)); + SetTextColor( hdcDst, 0 ); + SetBkColor( hdcDst, 0 ); + StretchBlt(hdcDst, 0, 0, 4, 1, hdcSrc, 0, 0, 4, 1, SRCCOPY ); + expected[0] = expected[2] = 0x00123456; + expected[1] = expected[3] = 0x00335577; + ok(!memcmp(dstBuffer, expected, 16), + "StretchBlt expected { %08X, %08X, %08X, %08X } got { %08X, %08X, %08X, %08X }\n", + expected[0], expected[1], expected[2], expected[3], + dstBuffer[0], dstBuffer[1], dstBuffer[2], dstBuffer[3] ); + + SelectObject(hdcSrc, oldSrc); + DeleteObject(bmpSrc); + + bmpSrc = CreateBitmap( 16, 16, 1, 1, 0 ); + oldSrc = SelectObject(hdcSrc, bmpSrc); + SetPixel( hdcSrc, 0, 0, 0 ); + SetPixel( hdcSrc, 1, 0, 0xffffff ); + SetPixel( hdcSrc, 2, 0, 0xffffff ); + SetPixel( hdcSrc, 3, 0, 0 ); + memset(dstBuffer, 0xcc, 4 * sizeof(*dstBuffer)); + SetTextColor( hdcDst, RGB(0x22,0x44,0x66) ); + SetBkColor( hdcDst, RGB(0x65,0x43,0x21) ); + StretchBlt(hdcDst, 0, 0, 4, 1, hdcSrc, 0, 0, 4, 1, SRCCOPY ); + expected[0] = expected[3] = 0x00224466; + expected[1] = expected[2] = 0x00654321; + ok(!memcmp(dstBuffer, expected, 16), + "StretchBlt expected { %08X, %08X, %08X, %08X } got { %08X, %08X, %08X, %08X }\n", + expected[0], expected[1], expected[2], expected[3], + dstBuffer[0], dstBuffer[1], dstBuffer[2], dstBuffer[3] ); + + SelectObject(hdcSrc, oldSrc); + DeleteObject(bmpSrc); + DeleteDC(hdcSrc); SelectObject(hdcDst, oldDst); diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index e3fa09a..c8322ce 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -2278,6 +2278,35 @@ done_unlock: return retv; } +/* multiply the alpha channel of a picture */ +static void multiply_alpha( Picture pict, XRenderPictFormat *format, int alpha, + int x, int y, int width, int height ) +{ + XRenderPictureAttributes pa; + Pixmap src_pixmap, mask_pixmap; + Picture src_pict, mask_pict; + XRenderColor color; + + wine_tsx11_lock(); + src_pixmap = XCreatePixmap( gdi_display, root_window, 1, 1, format->depth ); + mask_pixmap = XCreatePixmap( gdi_display, root_window, 1, 1, format->depth ); + pa.repeat = RepeatNormal; + src_pict = pXRenderCreatePicture( gdi_display, src_pixmap, format, CPRepeat, &pa ); + pa.component_alpha = True; + mask_pict = pXRenderCreatePicture( gdi_display, mask_pixmap, format, CPRepeat|CPComponentAlpha, &pa ); + color.red = color.green = color.blue = color.alpha = 0xffff; + pXRenderFillRectangle( gdi_display, PictOpSrc, src_pict, &color, 0, 0, 1, 1 ); + color.alpha = alpha; + pXRenderFillRectangle( gdi_display, PictOpSrc, mask_pict, &color, 0, 0, 1, 1 ); + pXRenderComposite( gdi_display, PictOpInReverse, src_pict, mask_pict, pict, + 0, 0, 0, 0, x, y, width, height ); + pXRenderFreePicture( gdi_display, src_pict ); + pXRenderFreePicture( gdi_display, mask_pict ); + XFreePixmap( gdi_display, src_pixmap ); + XFreePixmap( gdi_display, mask_pixmap ); + wine_tsx11_unlock(); +} + /* Helper function for (stretched) blitting using xrender */ static void xrender_blit( int op, Picture src_pict, Picture mask_pict, Picture dst_pict, int x_src, int y_src, int x_dst, int y_dst, @@ -2317,13 +2346,16 @@ static void xrender_mono_blit( Picture src_pict, Picture dst_pict, { Picture tile_pict; int x_offset, y_offset; + XRenderColor color; /* When doing a mono->color blit, the source data is used as mask, and the source picture * contains a 1x1 picture for tiling. The source data effectively acts as an alpha channel to * the tile data. */ EnterCriticalSection( &xrender_cs ); - tile_pict = get_tile_pict( dst_format, bg ); + color = *bg; + color.alpha = 0xffff; /* tile pict needs 100% alpha */ + tile_pict = get_tile_pict( dst_format, &color ); wine_tsx11_lock(); pXRenderFillRectangle( gdi_display, PictOpSrc, dst_pict, fg, x_dst, y_dst, width, height ); @@ -2347,6 +2379,10 @@ static void xrender_mono_blit( Picture src_pict, Picture dst_pict, 0, 0, x_offset, y_offset, x_dst, y_dst, width, height ); wine_tsx11_unlock(); LeaveCriticalSection( &xrender_cs ); + + /* force the alpha channel for background pixels, it has been set to 100% by the tile */ + if (bg->alpha != 0xffff && (dst_format == WXR_FORMAT_A8R8G8B8 || dst_format == WXR_FORMAT_B8G8R8A8)) + multiply_alpha( dst_pict, pict_formats[dst_format], bg->alpha, x_dst, y_dst, width, height ); } static void get_colors( struct xrender_physdev *physdev_src, struct xrender_physdev *physdev_dst,

1 0