August 2009 - Wine-Commits - list.winehq.org

Francois Gouget : d3drm/tests: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard Aug. 31, 2009

Aug. 31, 2009

Module: wine Branch: master Commit: 1fab15a72f8dd01b4c283f9525fc2d78a57c41ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fab15a72f8dd01b4c283f952… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Aug 31 11:52:50 2009 +0200 d3drm/tests: Fix compilation on systems that don't support nameless unions. --- dlls/d3drm/tests/vector.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/d3drm/tests/vector.c b/dlls/d3drm/tests/vector.c index b063d21..fbc8cc1 100644 --- a/dlls/d3drm/tests/vector.c +++ b/dlls/d3drm/tests/vector.c @@ -141,7 +141,7 @@ static void VectorTest(void) U1(e).x=6.0f; U2(e).y=6.0f; U3(e).z=1.0f; expect_vec(e,r); - U1(self).x=9.0f; U1(self).y=18.0f; U3(self).z=27.0f; + U1(self).x=9.0f; U2(self).y=18.0f; U3(self).z=27.0f; pD3DRMVectorAdd(&self,&self,&u); U1(e).x=11.0f; U2(e).y=20.0f; U3(e).z=28.0f; expect_vec(e,self); @@ -151,7 +151,7 @@ static void VectorTest(void) U1(e).x=-2.0f; U2(e).y=-2.0f; U3(e).z=1.0f; expect_vec(e,r); - U1(self).x=9.0f; U1(self).y=18.0f; U3(self).z=27.0f; + U1(self).x=9.0f; U2(self).y=18.0f; U3(self).z=27.0f; pD3DRMVectorSubtract(&self,&self,&u); U1(e).x=7.0f; U2(e).y=16.0f; U3(e).z=26.0f; expect_vec(e,self); @@ -161,7 +161,7 @@ static void VectorTest(void) U1(e).x=-4.0f; U2(e).y=4.0f; U3(e).z=0.0f; expect_vec(e,r); - U1(self).x=9.0f; U1(self).y=18.0f; U3(self).z=27.0f; + U1(self).x=9.0f; U2(self).y=18.0f; U3(self).z=27.0f; pD3DRMVectorCrossProduct(&self,&self,&u); U1(e).x=-36.0f; U2(e).y=45.0f; U3(e).z=-18.0f; expect_vec(e,self); @@ -218,7 +218,7 @@ static void VectorTest(void) U1(e).x=10.0f; U2(e).y=10.0f; U3(e).z=0.0f; expect_vec(e,r); - U1(self).x=9.0f; U1(self).y=18.0f; U3(self).z=27.0f; + U1(self).x=9.0f; U2(self).y=18.0f; U3(self).z=27.0f; pD3DRMVectorScale(&self,&self,2); U1(e).x=18.0f; U2(e).y=36.0f; U3(e).z=54.0f; expect_vec(e,self);

1 0

Francois Gouget : ddraw/tests: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard Aug. 31, 2009

Aug. 31, 2009

Module: wine Branch: master Commit: e168876d8fb6d9381a64a575bb4ab9c660fdfeb0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e168876d8fb6d9381a64a575b… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Aug 31 11:52:36 2009 +0200 ddraw/tests: Fix compilation on systems that don't support nameless unions. --- dlls/ddraw/tests/d3d.c | 72 ++++++++++++++++++++++++------------------------ 1 files changed, 36 insertions(+), 36 deletions(-) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index f4cd07b..2d7d8d0 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -2815,9 +2815,9 @@ static void ComputeSphereVisibility(void) IDirect3DDevice7_SetTransform(lpD3DDevice, D3DTRANSFORMSTATE_VIEW , &view); IDirect3DDevice7_SetTransform(lpD3DDevice, D3DTRANSFORMSTATE_PROJECTION, &proj); - center[0].x=11.461533; - center[0].y=-4.761727; - center[0].z=-1.171646; + U1(center[0]).x=11.461533; + U2(center[0]).y=-4.761727; + U3(center[0]).z=-1.171646; radius[0]=38.252632; @@ -2826,11 +2826,11 @@ static void ComputeSphereVisibility(void) ok(rc == D3D_OK, "Expected D3D_OK, received %x\n", rc); ok(result[0] == 0x3f, "Expected 0x3f, got %x\n", result[0]); - center[0].x=-3.515620; center[0].y=-1.560661; center[0].z=-12.464638; + U1(center[0]).x=-3.515620; U2(center[0]).y=-1.560661; U3(center[0]).z=-12.464638; radius[0]=4.354097; - center[1].x=14.290396; center[1].y=-2.981143; center[1].z=-24.311312; + U1(center[1]).x=14.290396; U2(center[1]).y=-2.981143; U3(center[1]).z=-24.311312; radius[1]=12.500704; - center[2].x=1.461626; center[2].y=-6.093709, center[2].z=-13.901010; + U1(center[2]).x=1.461626; U2(center[2]).y=-6.093709; U3(center[2]).z=-13.901010; radius[2]=17.251318; rc = IDirect3DDevice7_ComputeSphereVisibility(lpD3DDevice, center, radius, 3, 0, result); @@ -2852,9 +2852,9 @@ static void ComputeSphereVisibility(void) proj._31=0.0; proj._32=0.0; proj._33=10.0, proj._34=0.0; proj._41=0.0; proj._42=0.0; proj._43=0.0; proj._44=1.0; - center[0].x=0.0; - center[0].y=0.0; - center[0].z=0.05; + U1(center[0]).x=0.0; + U2(center[0]).y=0.0; + U3(center[0]).z=0.05; radius[0]=0.04; @@ -2873,9 +2873,9 @@ static void ComputeSphereVisibility(void) IDirect3DDevice7_SetTransform(lpD3DDevice, D3DTRANSFORMSTATE_PROJECTION, &proj); - center[0].x=0.0; - center[0].y=0.0; - center[0].z=0.5; + U1(center[0]).x=0.0; + U2(center[0]).y=0.0; + U3(center[0]).z=0.5; radius[0]=0.5; @@ -2884,9 +2884,9 @@ static void ComputeSphereVisibility(void) ok(rc == D3D_OK, "Expected D3D_OK, received %x\n", rc); ok(result[0] == 0x0, "Expected 0x0, got %x\n", result[0]); - center[0].x=0.0; - center[0].y=0.0; - center[0].z=0.0; + U1(center[0]).x=0.0; + U2(center[0]).y=0.0; + U3(center[0]).z=0.0; radius[0]=0.0; @@ -2895,9 +2895,9 @@ static void ComputeSphereVisibility(void) ok(rc == D3D_OK, "Expected D3D_OK, received %x\n", rc); ok(result[0] == 0x0, "Expected 0x0, got %x\n", result[0]); - center[0].x=-1.0; - center[0].y=-1.0; - center[0].z=0.50; + U1(center[0]).x=-1.0; + U2(center[0]).y=-1.0; + U3(center[0]).z=0.50; radius[0]=0.25; @@ -2906,9 +2906,9 @@ static void ComputeSphereVisibility(void) ok(rc == D3D_OK, "Expected D3D_OK, received %x\n", rc); ok(result[0] == 0x9, "Expected 0x9, got %x\n", result[0]); - center[0].x=-20.0; - center[0].y=0.0; - center[0].z=0.50; + U1(center[0]).x=-20.0; + U2(center[0]).y=0.0; + U3(center[0]).z=0.50; radius[0]=3.0; @@ -2917,9 +2917,9 @@ static void ComputeSphereVisibility(void) ok(rc == D3D_OK, "Expected D3D_OK, received %x\n", rc); ok(result[0] == 0x103d, "Expected 0x103d, got %x\n", result[0]); - center[0].x=20.0; - center[0].y=0.0; - center[0].z=0.50; + U1(center[0]).x=20.0; + U2(center[0]).y=0.0; + U3(center[0]).z=0.50; radius[0]=3.0f; @@ -2928,9 +2928,9 @@ static void ComputeSphereVisibility(void) ok(rc == D3D_OK, "Expected D3D_OK, received %x\n", rc); ok(result[0] == 0x203e, "Expected 0x203e, got %x\n", result[0]); - center[0].x=0.0; - center[0].y=-20.0; - center[0].z=0.50; + U1(center[0]).x=0.0; + U2(center[0]).y=-20.0; + U3(center[0]).z=0.50; radius[0]=3.0; @@ -2939,9 +2939,9 @@ static void ComputeSphereVisibility(void) ok(rc == D3D_OK, "Expected D3D_OK, received %x\n", rc); ok(result[0] == 0x803b, "Expected 0x803b, got %x\n", result[0]); - center[0].x=0.0; - center[0].y=20.0; - center[0].z=0.5; + U1(center[0]).x=0.0; + U2(center[0]).y=20.0; + U3(center[0]).z=0.5; radius[0]=3.0; @@ -2950,9 +2950,9 @@ static void ComputeSphereVisibility(void) ok(rc == D3D_OK, "Expected D3D_OK, received %x\n", rc); ok(result[0] == 0x4037, "Expected 0x4037, got %x\n", result[0]); - center[0].x=0.0; - center[0].y=0.0; - center[0].z=-20; + U1(center[0]).x=0.0; + U2(center[0]).y=0.0; + U3(center[0]).z=-20; radius[0]=3.0; @@ -2961,9 +2961,9 @@ static void ComputeSphereVisibility(void) ok(rc == D3D_OK, "Expected D3D_OK, received %x\n", rc); ok(result[0] == 0x1001f, "Expected 0x1001f, got %x\n", result[0]); - center[0].x=0.0; - center[0].y=0.0; - center[0].z=20.0; + U1(center[0]).x=0.0; + U2(center[0]).y=0.0; + U3(center[0]).z=20.0; radius[0]=3.0;

1 0

Francois Gouget : rpcrt4/tests: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard Aug. 31, 2009

Aug. 31, 2009

Module: wine Branch: master Commit: ee7902b283ac6535f906a4e041a1fb04d8376bab URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee7902b283ac6535f906a4e04… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Aug 31 11:52:17 2009 +0200 rpcrt4/tests: Fix compilation on systems that don't support nameless unions. Also omit the nameless union macros from the error messages for clarity. --- dlls/rpcrt4/tests/ndr_marshall.c | 126 +++++++++++++++++++------------------- 1 files changed, 63 insertions(+), 63 deletions(-) diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c index 2aa8146..f4ef592 100644 --- a/dlls/rpcrt4/tests/ndr_marshall.c +++ b/dlls/rpcrt4/tests/ndr_marshall.c @@ -2063,21 +2063,21 @@ static void test_NdrGetUserMarshalInfo(void) ok( umi.InformationLevel == 1, "umi.InformationLevel was %u instead of 1\n", umi.InformationLevel); - ok( U(umi.Level1).Buffer == buffer + 15, - "U(umi.Level1).Buffer was %p instead of %p\n", - U(umi.Level1).Buffer, buffer); - ok( U(umi.Level1).BufferSize == 1, - "U(umi.Level1).BufferSize was %u instead of 1\n", - U(umi.Level1).BufferSize); - ok( U(umi.Level1).pfnAllocate == my_alloc, - "U(umi.Level1).pfnAllocate was %p instead of %p\n", - U(umi.Level1).pfnAllocate, my_alloc); - ok( U(umi.Level1).pfnFree == my_free, - "U(umi.Level1).pfnFree was %p instead of %p\n", - U(umi.Level1).pfnFree, my_free); - ok( U(umi.Level1).pRpcChannelBuffer == rpc_channel_buffer, - "U(umi.Level1).pRpcChannelBuffer was %p instead of %p\n", - U(umi.Level1).pRpcChannelBuffer, rpc_channel_buffer); + ok( U1(umi).Level1.Buffer == buffer + 15, + "umi.Level1.Buffer was %p instead of %p\n", + U1(umi).Level1.Buffer, buffer); + ok( U1(umi).Level1.BufferSize == 1, + "umi.Level1.BufferSize was %u instead of 1\n", + U1(umi).Level1.BufferSize); + ok( U1(umi).Level1.pfnAllocate == my_alloc, + "umi.Level1.pfnAllocate was %p instead of %p\n", + U1(umi).Level1.pfnAllocate, my_alloc); + ok( U1(umi).Level1.pfnFree == my_free, + "umi.Level1.pfnFree was %p instead of %p\n", + U1(umi).Level1.pfnFree, my_free); + ok( U1(umi).Level1.pRpcChannelBuffer == rpc_channel_buffer, + "umi.Level1.pRpcChannelBuffer was %p instead of %p\n", + U1(umi).Level1.pRpcChannelBuffer, rpc_channel_buffer); /* buffer size */ @@ -2097,21 +2097,21 @@ static void test_NdrGetUserMarshalInfo(void) ok( umi.InformationLevel == 1, "umi.InformationLevel was %u instead of 1\n", umi.InformationLevel); - ok( U(umi.Level1).Buffer == NULL, - "U(umi.Level1).Buffer was %p instead of NULL\n", - U(umi.Level1).Buffer); - ok( U(umi.Level1).BufferSize == 0, - "U(umi.Level1).BufferSize was %u instead of 0\n", - U(umi.Level1).BufferSize); - ok( U(umi.Level1).pfnAllocate == my_alloc, - "U(umi.Level1).pfnAllocate was %p instead of %p\n", - U(umi.Level1).pfnAllocate, my_alloc); - ok( U(umi.Level1).pfnFree == my_free, - "U(umi.Level1).pfnFree was %p instead of %p\n", - U(umi.Level1).pfnFree, my_free); - ok( U(umi.Level1).pRpcChannelBuffer == rpc_channel_buffer, - "U(umi.Level1).pRpcChannelBuffer was %p instead of %p\n", - U(umi.Level1).pRpcChannelBuffer, rpc_channel_buffer); + ok( U1(umi).Level1.Buffer == NULL, + "umi.Level1.Buffer was %p instead of NULL\n", + U1(umi).Level1.Buffer); + ok( U1(umi).Level1.BufferSize == 0, + "umi.Level1.BufferSize was %u instead of 0\n", + U1(umi).Level1.BufferSize); + ok( U1(umi).Level1.pfnAllocate == my_alloc, + "umi.Level1.pfnAllocate was %p instead of %p\n", + U1(umi).Level1.pfnAllocate, my_alloc); + ok( U1(umi).Level1.pfnFree == my_free, + "umi.Level1.pfnFree was %p instead of %p\n", + U1(umi).Level1.pfnFree, my_free); + ok( U1(umi).Level1.pRpcChannelBuffer == rpc_channel_buffer, + "umi.Level1.pRpcChannelBuffer was %p instead of %p\n", + U1(umi).Level1.pRpcChannelBuffer, rpc_channel_buffer); /* marshall */ @@ -2131,21 +2131,21 @@ static void test_NdrGetUserMarshalInfo(void) ok( umi.InformationLevel == 1, "umi.InformationLevel was %u instead of 1\n", umi.InformationLevel); - ok( U(umi.Level1).Buffer == buffer + 15, - "U(umi.Level1).Buffer was %p instead of %p\n", - U(umi.Level1).Buffer, buffer); - ok( U(umi.Level1).BufferSize == 1, - "U(umi.Level1).BufferSize was %u instead of 1\n", - U(umi.Level1).BufferSize); - ok( U(umi.Level1).pfnAllocate == my_alloc, - "U(umi.Level1).pfnAllocate was %p instead of %p\n", - U(umi.Level1).pfnAllocate, my_alloc); - ok( U(umi.Level1).pfnFree == my_free, - "U(umi.Level1).pfnFree was %p instead of %p\n", - U(umi.Level1).pfnFree, my_free); - ok( U(umi.Level1).pRpcChannelBuffer == rpc_channel_buffer, - "U(umi.Level1).pRpcChannelBuffer was %p instead of %p\n", - U(umi.Level1).pRpcChannelBuffer, rpc_channel_buffer); + ok( U1(umi).Level1.Buffer == buffer + 15, + "umi.Level1.Buffer was %p instead of %p\n", + U1(umi).Level1.Buffer, buffer); + ok( U1(umi).Level1.BufferSize == 1, + "umi.Level1.BufferSize was %u instead of 1\n", + U1(umi).Level1.BufferSize); + ok( U1(umi).Level1.pfnAllocate == my_alloc, + "umi.Level1.pfnAllocate was %p instead of %p\n", + U1(umi).Level1.pfnAllocate, my_alloc); + ok( U1(umi).Level1.pfnFree == my_free, + "umi.Level1.pfnFree was %p instead of %p\n", + U1(umi).Level1.pfnFree, my_free); + ok( U1(umi).Level1.pRpcChannelBuffer == rpc_channel_buffer, + "umi.Level1.pRpcChannelBuffer was %p instead of %p\n", + U1(umi).Level1.pRpcChannelBuffer, rpc_channel_buffer); /* free */ @@ -2165,21 +2165,21 @@ static void test_NdrGetUserMarshalInfo(void) ok( umi.InformationLevel == 1, "umi.InformationLevel was %u instead of 1\n", umi.InformationLevel); - ok( U(umi.Level1).Buffer == NULL, - "U(umi.Level1).Buffer was %p instead of NULL\n", - U(umi.Level1).Buffer); - ok( U(umi.Level1).BufferSize == 0, - "U(umi.Level1).BufferSize was %u instead of 0\n", - U(umi.Level1).BufferSize); - ok( U(umi.Level1).pfnAllocate == my_alloc, - "U(umi.Level1).pfnAllocate was %p instead of %p\n", - U(umi.Level1).pfnAllocate, my_alloc); - ok( U(umi.Level1).pfnFree == my_free, - "U(umi.Level1).pfnFree was %p instead of %p\n", - U(umi.Level1).pfnFree, my_free); - ok( U(umi.Level1).pRpcChannelBuffer == rpc_channel_buffer, - "U(umi.Level1).pRpcChannelBuffer was %p instead of %p\n", - U(umi.Level1).pRpcChannelBuffer, rpc_channel_buffer); + ok( U1(umi).Level1.Buffer == NULL, + "umi.Level1.Buffer was %p instead of NULL\n", + U1(umi).Level1.Buffer); + ok( U1(umi).Level1.BufferSize == 0, + "umi.Level1.BufferSize was %u instead of 0\n", + U1(umi).Level1.BufferSize); + ok( U1(umi).Level1.pfnAllocate == my_alloc, + "umi.Level1.pfnAllocate was %p instead of %p\n", + U1(umi).Level1.pfnAllocate, my_alloc); + ok( U1(umi).Level1.pfnFree == my_free, + "umi.Level1.pfnFree was %p instead of %p\n", + U1(umi).Level1.pfnFree, my_free); + ok( U1(umi).Level1.pRpcChannelBuffer == rpc_channel_buffer, + "umi.Level1.pRpcChannelBuffer was %p instead of %p\n", + U1(umi).Level1.pRpcChannelBuffer, rpc_channel_buffer); /* boundary test */ @@ -2194,9 +2194,9 @@ static void test_NdrGetUserMarshalInfo(void) status = pNdrGetUserMarshalInfo(&umcb.Flags, 1, &umi); ok(status == RPC_S_OK, "NdrGetUserMarshalInfo failed with error %d\n", status); - ok( U(umi.Level1).BufferSize == 0, - "U(umi.Level1).BufferSize was %u instead of 0\n", - U(umi.Level1).BufferSize); + ok( U1(umi).Level1.BufferSize == 0, + "umi.Level1.BufferSize was %u instead of 0\n", + U1(umi).Level1.BufferSize); /* error conditions */

1 0

Francois Gouget : windowscodecs/tests: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard Aug. 31, 2009

Aug. 31, 2009

Module: wine Branch: master Commit: b83774593581a98cc203cfae79e4055034e48242 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b83774593581a98cc203cfae7… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Aug 31 11:51:46 2009 +0200 windowscodecs/tests: Fix compilation on systems that don't support nameless unions. --- dlls/windowscodecs/tests/stream.c | 48 ++++++++++++++++++------------------ 1 files changed, 24 insertions(+), 24 deletions(-) diff --git a/dlls/windowscodecs/tests/stream.c b/dlls/windowscodecs/tests/stream.c index dd66edc..25459aa 100644 --- a/dlls/windowscodecs/tests/stream.c +++ b/dlls/windowscodecs/tests/stream.c @@ -80,37 +80,37 @@ static void test_StreamOnMemory(void) /* Seek */ hr = IWICStream_Seek(pStream, LargeNull, STREAM_SEEK_SET, &uNewPos); ok(hr == S_OK, "Seek returned with %#x, expected %#x\n", hr, S_OK); - ok(uNewPos.HighPart == 0 && uNewPos.LowPart == 0, "Seek cursor moved to position (%u;%u), expected (%u;%u)\n", uNewPos.HighPart, uNewPos.LowPart, 0, 0); + ok(uNewPos.u.HighPart == 0 && uNewPos.u.LowPart == 0, "Seek cursor moved to position (%u;%u), expected (%u;%u)\n", uNewPos.u.HighPart, uNewPos.u.LowPart, 0, 0); hr = IWICStream_Seek(pStream, LargeNull, STREAM_SEEK_SET, NULL); ok(hr == S_OK, "Seek returned with %#x, expected %#x\n", hr, S_OK); - LargeInt.HighPart = 1; - LargeInt.LowPart = 0; + LargeInt.u.HighPart = 1; + LargeInt.u.LowPart = 0; hr = IWICStream_Seek(pStream, LargeInt, STREAM_SEEK_SET, &uNewPos); ok(hr == HRESULT_FROM_WIN32(ERROR_ARITHMETIC_OVERFLOW), "Seek returned with %#x, expected %#x\n", hr, HRESULT_FROM_WIN32(ERROR_ARITHMETIC_OVERFLOW)); - ok(uNewPos.HighPart == 0 && uNewPos.LowPart == 0, "Seek cursor moved to position (%u;%u), expected (%u;%u)\n", uNewPos.HighPart, uNewPos.LowPart, 0, 0); + ok(uNewPos.u.HighPart == 0 && uNewPos.u.LowPart == 0, "Seek cursor moved to position (%u;%u), expected (%u;%u)\n", uNewPos.u.HighPart, uNewPos.u.LowPart, 0, 0); LargeInt.QuadPart = sizeof(Memory) + 10; hr = IWICStream_Seek(pStream, LargeInt, STREAM_SEEK_SET, &uNewPos); ok(hr == E_INVALIDARG, "Seek returned with %#x, expected %#x\n", hr, E_INVALIDARG); - ok(uNewPos.HighPart == 0 && uNewPos.LowPart == 0, "Seek cursor moved to position (%u;%u), expected (%u;%u)\n", uNewPos.HighPart, uNewPos.LowPart, 0, 0); + ok(uNewPos.u.HighPart == 0 && uNewPos.u.LowPart == 0, "Seek cursor moved to position (%u;%u), expected (%u;%u)\n", uNewPos.u.HighPart, uNewPos.u.LowPart, 0, 0); LargeInt.QuadPart = 1; hr = IWICStream_Seek(pStream, LargeInt, STREAM_SEEK_END, &uNewPos); ok(hr == E_INVALIDARG, "Seek returned with %#x, expected %#x\n", hr, E_INVALIDARG); - ok(uNewPos.HighPart == 0 && uNewPos.LowPart == 0, "Seek cursor moved to position (%u;%u), expected (%u;%u)\n", uNewPos.HighPart, uNewPos.LowPart, 0, 0); + ok(uNewPos.u.HighPart == 0 && uNewPos.u.LowPart == 0, "Seek cursor moved to position (%u;%u), expected (%u;%u)\n", uNewPos.u.HighPart, uNewPos.u.LowPart, 0, 0); LargeInt.QuadPart = -1; hr = IWICStream_Seek(pStream, LargeInt, STREAM_SEEK_END, &uNewPos); ok(hr == S_OK, "Seek returned with %#x, expected %#x\n", hr, S_OK); - ok(uNewPos.HighPart == 0 && uNewPos.LowPart == sizeof(Memory) - 1, "bSeek cursor moved to position (%u;%u), expected (%u;%u)\n", uNewPos.HighPart, uNewPos.LowPart, 0, sizeof(Memory) - 1); + ok(uNewPos.u.HighPart == 0 && uNewPos.u.LowPart == sizeof(Memory) - 1, "bSeek cursor moved to position (%u;%u), expected (%u;%u)\n", uNewPos.u.HighPart, uNewPos.u.LowPart, 0, sizeof(Memory) - 1); IWICStream_Seek(pStream, LargeNull, STREAM_SEEK_SET, &uNewPos); /* reset seek pointer */ LargeInt.QuadPart = -sizeof(Memory) - 5; hr = IWICStream_Seek(pStream, LargeInt, STREAM_SEEK_END, &uNewPos); ok(hr == E_INVALIDARG, "Seek returned with %#x, expected %#x\n", hr, E_INVALIDARG); - ok(uNewPos.HighPart == 0 && uNewPos.LowPart == 0, "bSeek cursor moved to position (%u;%u), expected (%u;%u)\n", uNewPos.HighPart, uNewPos.LowPart, 0, 0); /* remains unchanged */ + ok(uNewPos.u.HighPart == 0 && uNewPos.u.LowPart == 0, "bSeek cursor moved to position (%u;%u), expected (%u;%u)\n", uNewPos.u.HighPart, uNewPos.u.LowPart, 0, 0); /* remains unchanged */ IWICStream_Seek(pStream, LargeNull, STREAM_SEEK_SET, NULL); @@ -123,7 +123,7 @@ static void test_StreamOnMemory(void) /* check whether the seek pointer has moved correctly */ IWICStream_Seek(pStream, LargeNull, STREAM_SEEK_CUR, &uNewPos); - ok(uNewPos.HighPart == 0 && uNewPos.LowPart == uBytesRead, "Seek cursor moved to position (%u;%u), expected (%u;%u)\n", uNewPos.HighPart, uNewPos.LowPart, 0, uBytesRead); + ok(uNewPos.u.HighPart == 0 && uNewPos.u.LowPart == uBytesRead, "Seek cursor moved to position (%u;%u), expected (%u;%u)\n", uNewPos.u.HighPart, uNewPos.u.LowPart, 0, uBytesRead); } IWICStream_Seek(pStream, LargeNull, STREAM_SEEK_SET, NULL); @@ -182,7 +182,7 @@ static void test_StreamOnMemory(void) /* check whether the seek pointer has moved correctly */ IWICStream_Seek(pStream, LargeNull, STREAM_SEEK_CUR, &uNewPos); - ok(uNewPos.HighPart == 0 && uNewPos.LowPart == uBytesWritten, "Seek cursor moved to position (%u;%u), expected (%u;%u)\n", uNewPos.HighPart, uNewPos.LowPart, 0, uBytesWritten); + ok(uNewPos.u.HighPart == 0 && uNewPos.u.LowPart == uBytesWritten, "Seek cursor moved to position (%u;%u), expected (%u;%u)\n", uNewPos.u.HighPart, uNewPos.u.LowPart, 0, uBytesWritten); } IWICStream_Seek(pStream, LargeNull, STREAM_SEEK_SET, NULL); @@ -193,40 +193,40 @@ static void test_StreamOnMemory(void) ok(hr == E_INVALIDARG, "Write returned with %#x, expected %#x\n", hr, E_INVALIDARG); ok(uBytesWritten == 0, "Wrote %u bytes, expected %u\n", uBytesWritten, 0); IWICStream_Seek(pStream, LargeNull, STREAM_SEEK_CUR, &uNewPos); - ok(uNewPos.HighPart == 0 && uNewPos.LowPart == 0, "Seek cursor moved to position (%u;%u), expected (%u;%u)\n", uNewPos.HighPart, uNewPos.LowPart, 0, 0); + ok(uNewPos.u.HighPart == 0 && uNewPos.u.LowPart == 0, "Seek cursor moved to position (%u;%u), expected (%u;%u)\n", uNewPos.u.HighPart, uNewPos.u.LowPart, 0, 0); hr = IWICStream_Write(pStream, NULL, 0, &uBytesWritten); ok(hr == E_INVALIDARG, "Write returned with %#x, expected %#x\n", hr, E_INVALIDARG); ok(uBytesWritten == 0, "Wrote %u bytes, expected %u\n", uBytesWritten, 0); IWICStream_Seek(pStream, LargeNull, STREAM_SEEK_CUR, &uNewPos); - ok(uNewPos.HighPart == 0 && uNewPos.LowPart == 0, "Seek cursor moved to position (%u;%u), expected (%u;%u)\n", uNewPos.HighPart, uNewPos.LowPart, 0, 0); + ok(uNewPos.u.HighPart == 0 && uNewPos.u.LowPart == 0, "Seek cursor moved to position (%u;%u), expected (%u;%u)\n", uNewPos.u.HighPart, uNewPos.u.LowPart, 0, 0); hr = IWICStream_Write(pStream, CmpMem, sizeof(Memory) + 10, &uBytesWritten); ok(hr == STG_E_MEDIUMFULL, "Write returned with %#x, expected %#x\n", hr, STG_E_MEDIUMFULL); ok(uBytesWritten == 0, "Wrote %u bytes, expected %u\n", uBytesWritten, 0); IWICStream_Seek(pStream, LargeNull, STREAM_SEEK_CUR, &uNewPos); - ok(uNewPos.HighPart == 0 && uNewPos.LowPart == uBytesWritten, "Seek cursor moved to position (%u;%u), expected (%u;%u)\n", uNewPos.HighPart, uNewPos.LowPart, 0, uBytesWritten); + ok(uNewPos.u.HighPart == 0 && uNewPos.u.LowPart == uBytesWritten, "Seek cursor moved to position (%u;%u), expected (%u;%u)\n", uNewPos.u.HighPart, uNewPos.u.LowPart, 0, uBytesWritten); IWICStream_Seek(pStream, LargeNull, STREAM_SEEK_SET, NULL); /* SetSize */ - uNewPos.HighPart = 0; - uNewPos.LowPart = sizeof(Memory) + 10; + uNewPos.u.HighPart = 0; + uNewPos.u.LowPart = sizeof(Memory) + 10; hr = IWICStream_SetSize(pStream, uNewPos); ok(hr == E_NOTIMPL, "SetSize returned %#x, expected %#x\n", hr, E_NOTIMPL); - uNewPos.HighPart = 0; - uNewPos.LowPart = sizeof(Memory); + uNewPos.u.HighPart = 0; + uNewPos.u.LowPart = sizeof(Memory); hr = IWICStream_SetSize(pStream, uNewPos); ok(hr == E_NOTIMPL, "SetSize returned %#x, expected %#x\n", hr, E_NOTIMPL); - uNewPos.HighPart = 0; - uNewPos.LowPart = sizeof(Memory) - 10; + uNewPos.u.HighPart = 0; + uNewPos.u.LowPart = sizeof(Memory) - 10; hr = IWICStream_SetSize(pStream, uNewPos); ok(hr == E_NOTIMPL, "SetSize returned %#x, expected %#x\n", hr, E_NOTIMPL); - uNewPos.HighPart = 0; - uNewPos.LowPart = 0; + uNewPos.u.HighPart = 0; + uNewPos.u.LowPart = 0; hr = IWICStream_SetSize(pStream, uNewPos); ok(hr == E_NOTIMPL, "SetSize returned %#x, expected %#x\n", hr, E_NOTIMPL); @@ -236,8 +236,8 @@ static void test_StreamOnMemory(void) /* CopyTo */ - uNewPos.HighPart = 0; - uNewPos.LowPart = 5; + uNewPos.u.HighPart = 0; + uNewPos.u.LowPart = 5; hr = IWICStream_CopyTo(pStream, NULL, uNewPos, NULL, NULL); ok(hr == E_NOTIMPL, "CopyTo returned %#x, expected %#x\n", hr, E_NOTIMPL); @@ -292,7 +292,7 @@ static void test_StreamOnMemory(void) ok(hr == S_OK, "Stat returned %#x, expected %#x\n", hr, S_OK); ok(Stats.pwcsName == NULL, "Stat returned name %p, expected %p\n", Stats.pwcsName, NULL); ok(Stats.type == STGTY_STREAM, "Stat returned type %d, expected %d\n", Stats.type, STGTY_STREAM); - ok(Stats.cbSize.HighPart == 0 && Stats.cbSize.LowPart == sizeof(Memory), "Stat returned size (%u;%u), expected (%u;%u)\n", Stats.cbSize.HighPart, Stats.cbSize.LowPart, 0, sizeof(Memory)); + ok(Stats.cbSize.u.HighPart == 0 && Stats.cbSize.u.LowPart == sizeof(Memory), "Stat returned size (%u;%u), expected (%u;%u)\n", Stats.cbSize.u.HighPart, Stats.cbSize.u.LowPart, 0, sizeof(Memory)); ok(Stats.mtime.dwHighDateTime == 0 && Stats.mtime.dwLowDateTime == 0, "Stat returned mtime (%u;%u), expected (%u;%u)\n", Stats.mtime.dwHighDateTime, Stats.mtime.dwLowDateTime, 0, 0); ok(Stats.ctime.dwHighDateTime == 0 && Stats.ctime.dwLowDateTime == 0, "Stat returned ctime (%u;%u), expected (%u;%u)\n", Stats.ctime.dwHighDateTime, Stats.ctime.dwLowDateTime, 0, 0); ok(Stats.atime.dwHighDateTime == 0 && Stats.atime.dwLowDateTime == 0, "Stat returned atime (%u;%u), expected (%u;%u)\n", Stats.atime.dwHighDateTime, Stats.atime.dwLowDateTime, 0, 0);

1 0

Henri Verbeet : d3d8: Remove trailing spaces.
by Alexandre Julliard Aug. 31, 2009

Aug. 31, 2009

Module: wine Branch: master Commit: fecbf7b416a931b2f0e12b686ed4110752059188 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fecbf7b416a931b2f0e12b686… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 31 09:57:52 2009 +0200 d3d8: Remove trailing spaces. --- dlls/d3d8/d3d8_main.c | 10 +++++----- dlls/d3d8/d3d8_private.h | 2 +- dlls/d3d8/device.c | 24 +++++++++++++----------- dlls/d3d8/tests/d3d8_main.c | 2 +- dlls/d3d8/tests/device.c | 10 +++++----- 5 files changed, 25 insertions(+), 23 deletions(-) diff --git a/dlls/d3d8/d3d8_main.c b/dlls/d3d8/d3d8_main.c index 3a2eac2..6300371 100644 --- a/dlls/d3d8/d3d8_main.c +++ b/dlls/d3d8/d3d8_main.c @@ -73,11 +73,11 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) * ValidateVertexShader (D3D8.@) * * I've seen reserved1 and reserved2 always passed as 0's - * bool seems always passed as 0 or 1, but other values work as well.... + * bool seems always passed as 0 or 1, but other values work as well... * toto result? */ HRESULT WINAPI ValidateVertexShader(DWORD* vertexshader, DWORD* reserved1, DWORD* reserved2, BOOL bool, DWORD* toto) -{ +{ HRESULT ret; FIXME("(%p %p %p %d %p): stub\n", vertexshader, reserved1, reserved2, bool, toto); @@ -89,7 +89,7 @@ HRESULT WINAPI ValidateVertexShader(DWORD* vertexshader, DWORD* reserved1, DWORD switch(*vertexshader) { case 0xFFFE0101: - case 0xFFFE0100: + case 0xFFFE0100: ret=S_OK; break; default: @@ -110,12 +110,12 @@ HRESULT WINAPI ValidatePixelShader(DWORD* pixelshader, DWORD* reserved1, BOOL bo { HRESULT ret; FIXME("(%p %p %d %p): stub\n", pixelshader, reserved1, bool, toto); - + if (!pixelshader) return E_FAIL; if (reserved1) - return E_FAIL; + return E_FAIL; switch(*pixelshader) { case 0xFFFF0100: diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index e916f14..52abb84 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -468,7 +468,7 @@ struct IDirect3DVolumeTexture8Impl /* TODO: Generate a valid GUIDs */ /* {83B073CE-6F30-11d9-C687-00046142C14F} */ -DEFINE_GUID(IID_IDirect3DStateBlock8, +DEFINE_GUID(IID_IDirect3DStateBlock8, 0x83b073ce, 0x6f30, 0x11d9, 0xc6, 0x87, 0x0, 0x4, 0x61, 0x42, 0xc1, 0x4f); DEFINE_GUID(IID_IDirect3DVertexDeclaration8, diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index a5658af..675eac1 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -680,7 +680,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_CreateTexture(LPDIRECT3DDEVICE8 iface wined3d_mutex_unlock(); if (FAILED(hrc)) { - /* free up object */ + /* free up object */ FIXME("(%p) call to IWineD3DDevice_CreateTexture failed\n", This); HeapFree(GetProcessHeap(), 0, object); /* *ppTexture = NULL; */ @@ -694,10 +694,10 @@ static HRESULT WINAPI IDirect3DDevice8Impl_CreateTexture(LPDIRECT3DDEVICE8 iface return hrc; } -static HRESULT WINAPI IDirect3DDevice8Impl_CreateVolumeTexture(LPDIRECT3DDEVICE8 iface, - UINT Width, UINT Height, UINT Depth, UINT Levels, DWORD Usage, - D3DFORMAT Format, D3DPOOL Pool, IDirect3DVolumeTexture8** ppVolumeTexture) { - +static HRESULT WINAPI IDirect3DDevice8Impl_CreateVolumeTexture(IDirect3DDevice8 *iface, + UINT Width, UINT Height, UINT Depth, UINT Levels, DWORD Usage, D3DFORMAT Format, + D3DPOOL Pool, IDirect3DVolumeTexture8 **ppVolumeTexture) +{ IDirect3DVolumeTexture8Impl *object; IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; HRESULT hrc = D3D_OK; @@ -736,9 +736,9 @@ static HRESULT WINAPI IDirect3DDevice8Impl_CreateVolumeTexture(LPDIRECT3DDEVICE8 return hrc; } -static HRESULT WINAPI IDirect3DDevice8Impl_CreateCubeTexture(LPDIRECT3DDEVICE8 iface, UINT EdgeLength, UINT Levels, DWORD Usage, - D3DFORMAT Format, D3DPOOL Pool, IDirect3DCubeTexture8** ppCubeTexture) { - +static HRESULT WINAPI IDirect3DDevice8Impl_CreateCubeTexture(IDirect3DDevice8 *iface, UINT EdgeLength, + UINT Levels, DWORD Usage, D3DFORMAT Format, D3DPOOL Pool, IDirect3DCubeTexture8 **ppCubeTexture) +{ IDirect3DCubeTexture8Impl *object; IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; HRESULT hr = D3D_OK; @@ -1238,7 +1238,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_SetLight(LPDIRECT3DDEVICE8 iface, DWO IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; HRESULT hr; TRACE("(%p) Relay\n" , This); - + /* Note: D3DLIGHT8 is compatible with WINED3DLIGHT */ wined3d_mutex_lock(); hr = IWineD3DDevice_SetLight(This->WineD3DDevice, Index, (const WINED3DLIGHT *)pLight); @@ -1701,8 +1701,10 @@ static HRESULT WINAPI IDirect3DDevice8Impl_GetCurrentTexturePalette(LPDIRECT3D return hr; } -static HRESULT WINAPI IDirect3DDevice8Impl_DrawPrimitive(LPDIRECT3DDEVICE8 iface, D3DPRIMITIVETYPE PrimitiveType, UINT StartVertex, UINT PrimitiveCount) { - IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; +static HRESULT WINAPI IDirect3DDevice8Impl_DrawPrimitive(IDirect3DDevice8 *iface, D3DPRIMITIVETYPE PrimitiveType, + UINT StartVertex, UINT PrimitiveCount) +{ + IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; HRESULT hr; TRACE("(%p) Relay\n" , This); diff --git a/dlls/d3d8/tests/d3d8_main.c b/dlls/d3d8/tests/d3d8_main.c index aee7625..fb626f2 100644 --- a/dlls/d3d8/tests/d3d8_main.c +++ b/dlls/d3d8/tests/d3d8_main.c @@ -66,7 +66,7 @@ static void test_ValidateVertexShader(void) } static void test_ValidatePixelShader(void) -{ +{ HRESULT ret; static DWORD simple_ps[] = {0xFFFF0101, /* ps_1_1 */ 0x00000051, 0xA00F0001, 0x3F800000, 0x00000000, 0x00000000, 0x00000000, /* def c1 = 1.0, 0.0, 0.0, 0.0 */ diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index f635713..a869e79 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -96,13 +96,13 @@ static int get_refcount(IUnknown *object) static void check_mipmap_levels(IDirect3DDevice8 *device, UINT width, UINT height, UINT count) { IDirect3DBaseTexture8* texture = NULL; - HRESULT hr = IDirect3DDevice8_CreateTexture( device, width, height, 0, 0, - D3DFMT_X8R8G8B8, D3DPOOL_DEFAULT, (IDirect3DTexture8**) &texture ); - + HRESULT hr = IDirect3DDevice8_CreateTexture( device, width, height, 0, 0, + D3DFMT_X8R8G8B8, D3DPOOL_DEFAULT, (IDirect3DTexture8**) &texture ); + if (SUCCEEDED(hr)) { DWORD levels = IDirect3DBaseTexture8_GetLevelCount(texture); ok(levels == count, "Invalid level count. Expected %d got %u\n", count, levels); - } else + } else trace("CreateTexture failed: %#08x\n", hr); if (texture) IUnknown_Release( texture ); @@ -118,7 +118,7 @@ static void test_mipmap_levels(void) IDirect3DDevice8 *pDevice = NULL; D3DPRESENT_PARAMETERS d3dpp; D3DDISPLAYMODE d3ddm; - + pD3d = pDirect3DCreate8( D3D_SDK_VERSION ); ok(pD3d != NULL, "Failed to create IDirect3D8 object\n"); hwnd = CreateWindow( "static", "d3d8_test", WS_OVERLAPPEDWINDOW, 100, 100, 160, 160, NULL, NULL, NULL, NULL );

1 0

Henri Verbeet : dxdiag: Make the "cmdline" parameter const.
by Alexandre Julliard Aug. 31, 2009

Aug. 31, 2009

Module: wine Branch: master Commit: 89b469cb2f74dd2c66bdcc5be25f2153ecd7d01f URL: http://source.winehq.org/git/wine.git/?a=commit;h=89b469cb2f74dd2c66bdcc5be… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 31 09:57:51 2009 +0200 dxdiag: Make the "cmdline" parameter const. --- programs/dxdiag/main.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/programs/dxdiag/main.c b/programs/dxdiag/main.c index 5334b22..4e73b4b 100644 --- a/programs/dxdiag/main.c +++ b/programs/dxdiag/main.c @@ -33,9 +33,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(dxdiag); quotes are optional around the filename, even if it contains spaces. */ -static BOOL ProcessCommandLine(LPWSTR cmdline) +static BOOL ProcessCommandLine(const WCHAR *s) { - const WCHAR *s = cmdline; WCHAR outfile[MAX_PATH+1]; int opt_t = FALSE; int opt_x = FALSE;

1 0

Henri Verbeet : d3d10: Add the D3D10_REGISTER_COMPONENT_TYPE enum.
by Alexandre Julliard Aug. 31, 2009

Aug. 31, 2009

Module: wine Branch: master Commit: 974ac06f7373169bdd9ca3acb88e4c26a53e98cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=974ac06f7373169bdd9ca3acb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 31 09:57:50 2009 +0200 d3d10: Add the D3D10_REGISTER_COMPONENT_TYPE enum. --- include/d3d10shader.h | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/include/d3d10shader.h b/include/d3d10shader.h index 88091c4..7910057 100644 --- a/include/d3d10shader.h +++ b/include/d3d10shader.h @@ -99,6 +99,14 @@ typedef enum D3D10_NAME D3D10_NAME_DEPTH = 65, } D3D10_NAME; +typedef enum D3D10_REGISTER_COMPONENT_TYPE +{ + D3D10_REGISTER_COMPONENT_UNKNOWN = 0, + D3D10_REGISTER_COMPONENT_UINT32 = 1, + D3D10_REGISTER_COMPONENT_SINT32 = 2, + D3D10_REGISTER_COMPONENT_FLOAT32 = 3, +} D3D10_REGISTER_COMPONENT_TYPE; + typedef struct _D3D10_SHADER_MACRO { LPCSTR Name;

1 0

Henri Verbeet : d3d10: Add the D3D10_NAME enum.
by Alexandre Julliard Aug. 31, 2009

Aug. 31, 2009

Module: wine Branch: master Commit: dd64f9464bcb21e14cb2a105dde92f054d60eade URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd64f9464bcb21e14cb2a105d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 31 09:57:49 2009 +0200 d3d10: Add the D3D10_NAME enum. --- include/d3d10shader.h | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/include/d3d10shader.h b/include/d3d10shader.h index 9e625d9..88091c4 100644 --- a/include/d3d10shader.h +++ b/include/d3d10shader.h @@ -82,6 +82,23 @@ typedef enum _D3D10_SHADER_VARIABLE_TYPE D3D10_SVT_FORCE_DWORD = 0x7fffffff } D3D10_SHADER_VARIABLE_TYPE, *LPD3D10_SHADER_VARIABLE_TYPE; +typedef enum D3D10_NAME +{ + D3D10_NAME_UNDEFINED = 0, + D3D10_NAME_POSITION = 1, + D3D10_NAME_CLIP_DISTANCE = 2, + D3D10_NAME_CULL_DISTANCE = 3, + D3D10_NAME_RENDER_TARGET_ARRAY_INDEX = 4, + D3D10_NAME_VIEWPORT_ARRAY_INDEX = 5, + D3D10_NAME_VERTEX_ID = 6, + D3D10_NAME_PRIMITIVE_ID = 7, + D3D10_NAME_INSTANCE_ID = 8, + D3D10_NAME_IS_FRONT_FACE = 9, + D3D10_NAME_SAMPLE_INDEX = 10, + D3D10_NAME_TARGET = 64, + D3D10_NAME_DEPTH = 65, +} D3D10_NAME; + typedef struct _D3D10_SHADER_MACRO { LPCSTR Name;

1 0

Henri Verbeet : d3d10: Add the _D3D10_EFFECT_SHADER_DESC struct.
by Alexandre Julliard Aug. 31, 2009

Aug. 31, 2009

Module: wine Branch: master Commit: c64287c98122350084691a9a76808099526c62e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c64287c98122350084691a9a7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 31 09:57:48 2009 +0200 d3d10: Add the _D3D10_EFFECT_SHADER_DESC struct. --- include/d3d10effect.h | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/include/d3d10effect.h b/include/d3d10effect.h index c77eefd..645ff39 100644 --- a/include/d3d10effect.h +++ b/include/d3d10effect.h @@ -99,6 +99,17 @@ typedef struct _D3D10_EFFECT_DESC UINT Techniques; } D3D10_EFFECT_DESC; +typedef struct _D3D10_EFFECT_SHADER_DESC +{ + const BYTE *pInputSignature; + BOOL IsInline; + const BYTE *pBytecode; + UINT BytecodeLength; + LPCSTR SODecl; + UINT NumInputSignatureEntries; + UINT NumOutputSignatureEntries; +} D3D10_EFFECT_SHADER_DESC; + typedef struct _D3D10_PASS_DESC { LPCSTR Name;

1 0

Ge van Geldorp : comctl32/tests: Adjust message sequences for Win7 ( trackbar).
by Alexandre Julliard Aug. 31, 2009

Aug. 31, 2009

Module: wine Branch: master Commit: 93140f32a04dfd511efe60692fdf0a8a75c69e84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=93140f32a04dfd511efe60692… Author: Ge van Geldorp <ggeldorp(a)vmware.com> Date: Mon Aug 31 09:14:25 2009 +0200 comctl32/tests: Adjust message sequences for Win7 (trackbar). --- dlls/comctl32/tests/trackbar.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/tests/trackbar.c b/dlls/comctl32/tests/trackbar.c index d94ffe9..9454a5c 100644 --- a/dlls/comctl32/tests/trackbar.c +++ b/dlls/comctl32/tests/trackbar.c @@ -43,7 +43,7 @@ static const struct message create_parent_wnd_seq[] = { { WM_QUERYNEWPALETTE, sent|optional }, { WM_WINDOWPOSCHANGING, sent|wparam, 0 }, { WM_ACTIVATEAPP, sent|wparam, 1 }, - { WM_NCACTIVATE, sent|wparam, 1 }, + { WM_NCACTIVATE, sent }, { WM_ACTIVATE, sent|wparam, 1 }, { WM_IME_SETCONTEXT, sent|wparam|defwinproc|optional, 1 }, { WM_IME_NOTIFY, sent|defwinproc|optional }, @@ -81,12 +81,12 @@ static const struct message parent_create_trackbar_wnd_seq[] = { static const struct message parent_new_window_test_seq[] = { { WM_QUERYNEWPALETTE, sent|optional }, - { WM_WINDOWPOSCHANGING, sent}, - { WM_NCACTIVATE, sent}, - { PBT_APMRESUMECRITICAL, sent}, + { WM_WINDOWPOSCHANGING, sent|optional}, + { WM_NCACTIVATE, sent|optional}, + { PBT_APMRESUMECRITICAL, sent|optional}, { WM_IME_SETCONTEXT, sent|defwinproc|optional}, { WM_IME_NOTIFY, sent|defwinproc|optional}, - { WM_SETFOCUS, sent|defwinproc}, + { WM_SETFOCUS, sent|defwinproc|optional}, { WM_NOTIFYFORMAT, sent}, { WM_QUERYUISTATE, sent|optional}, {0}

1 0