March 2012 - Wine-commits - list.winehq.org

Christian Costa : d3drm: Remove "partial stub" mention of forwarded methods .
by Alexandre Julliard 16 Mar '12

16 Mar '12

Module: wine Branch: master Commit: c6ce077f413d958186d83d7bc733c7952368a542 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6ce077f413d958186d83d7bc… Author: Christian Costa <titan.costa(a)gmail.com> Date: Fri Mar 16 08:15:53 2012 +0100 d3drm: Remove "partial stub" mention of forwarded methods. --- dlls/d3drm/meshbuilder.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index d8d9ff2..1641a5c 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -438,7 +438,7 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder2Impl_Load(IDirect3DRMMeshBuilder2* { IDirect3DRMMeshBuilderImpl *This = impl_from_IDirect3DRMMeshBuilder2(iface); - TRACE("(%p)->(%p,%p,%x,%p,%p): partial stub\n", This, filename, name, loadflags, cb, arg); + TRACE("(%p)->(%p,%p,%x,%p,%p)\n", This, filename, name, loadflags, cb, arg); return IDirect3DRMMeshBuilder3_Load(&This->IDirect3DRMMeshBuilder3_iface, filename, name, loadflags, (D3DRMLOADTEXTURE3CALLBACK)cb, arg); @@ -745,7 +745,7 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder2Impl_GetTextureCoordinates(IDirect3 { IDirect3DRMMeshBuilderImpl *This = impl_from_IDirect3DRMMeshBuilder2(iface); - TRACE("(%p)->(%d,%p,%p)\n", This, index, u, v); + TRACE("(%p)->(%u,%p,%p)\n", This, index, u, v); return IDirect3DRMMeshBuilder3_GetTextureCoordinates(&This->IDirect3DRMMeshBuilder3_iface, index, u, v);

1 0

Christian Costa : d3drm: Texture callback cannot be passed directly. Texture object argument is different so disable it for now.
by Alexandre Julliard 16 Mar '12

16 Mar '12

Module: wine Branch: master Commit: 549f8796dd0ad40afb2375f6484c46209d333539 URL: http://source.winehq.org/git/wine.git/?a=commit;h=549f8796dd0ad40afb2375f64… Author: Christian Costa <titan.costa(a)gmail.com> Date: Fri Mar 16 08:16:02 2012 +0100 d3drm: Texture callback cannot be passed directly. Texture object argument is different so disable it for now. --- dlls/d3drm/meshbuilder.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index 1641a5c..6f5451b 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -440,8 +440,11 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder2Impl_Load(IDirect3DRMMeshBuilder2* TRACE("(%p)->(%p,%p,%x,%p,%p)\n", This, filename, name, loadflags, cb, arg); + if (cb) + FIXME("Texture callback is not yet supported\n"); + return IDirect3DRMMeshBuilder3_Load(&This->IDirect3DRMMeshBuilder3_iface, filename, name, - loadflags, (D3DRMLOADTEXTURE3CALLBACK)cb, arg); + loadflags, NULL, arg); } static HRESULT WINAPI IDirect3DRMMeshBuilder2Impl_Save(IDirect3DRMMeshBuilder2* iface,

1 0

Christian Costa : d3drm: Add refcount info to AddRef and Release traces.
by Alexandre Julliard 16 Mar '12

16 Mar '12

Module: wine Branch: master Commit: ea532f633c6af03c642537cce2925da22c2fdf9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea532f633c6af03c642537cce… Author: Christian Costa <titan.costa(a)gmail.com> Date: Fri Mar 16 08:16:10 2012 +0100 d3drm: Add refcount info to AddRef and Release traces. --- dlls/d3drm/d3drm.c | 7 ++++--- dlls/d3drm/device.c | 7 ++++--- dlls/d3drm/frame.c | 7 ++++--- dlls/d3drm/meshbuilder.c | 7 ++++--- dlls/d3drm/viewport.c | 7 ++++--- 5 files changed, 20 insertions(+), 15 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index 879d8b0..d140c08 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -87,10 +87,11 @@ static HRESULT WINAPI IDirect3DRMImpl_QueryInterface(IDirect3DRM* iface, REFIID static ULONG WINAPI IDirect3DRMImpl_AddRef(IDirect3DRM* iface) { IDirect3DRMImpl *This = impl_from_IDirect3DRM(iface); + ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p/%p)\n", iface, This); + TRACE("(%p/%p)->(): new ref = %d\n", iface, This, ref); - return InterlockedIncrement(&This->ref); + return ref; } static ULONG WINAPI IDirect3DRMImpl_Release(IDirect3DRM* iface) @@ -98,7 +99,7 @@ static ULONG WINAPI IDirect3DRMImpl_Release(IDirect3DRM* iface) IDirect3DRMImpl *This = impl_from_IDirect3DRM(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p/%p)\n", iface, This); + TRACE("(%p/%p)->(): new ref = %d\n", iface, This, ref); if (!ref) HeapFree(GetProcessHeap(), 0, This); diff --git a/dlls/d3drm/device.c b/dlls/d3drm/device.c index 559128e..e6d1036 100644 --- a/dlls/d3drm/device.c +++ b/dlls/d3drm/device.c @@ -93,10 +93,11 @@ static HRESULT WINAPI IDirect3DRMDevice2Impl_QueryInterface(IDirect3DRMDevice2* static ULONG WINAPI IDirect3DRMDevice2Impl_AddRef(IDirect3DRMDevice2* iface) { IDirect3DRMDeviceImpl *This = impl_from_IDirect3DRMDevice2(iface); + ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p)\n", This); + TRACE("(%p)->(): new ref = %d\n", iface, ref); - return InterlockedIncrement(&This->ref); + return ref; } static ULONG WINAPI IDirect3DRMDevice2Impl_Release(IDirect3DRMDevice2* iface) @@ -104,7 +105,7 @@ static ULONG WINAPI IDirect3DRMDevice2Impl_Release(IDirect3DRMDevice2* iface) IDirect3DRMDeviceImpl *This = impl_from_IDirect3DRMDevice2(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p)\n", This); + TRACE("(%p)->(): new ref = %d\n", iface, ref); if (!ref) HeapFree(GetProcessHeap(), 0, This); diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index d91def8..5d5427f 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -78,10 +78,11 @@ static HRESULT WINAPI IDirect3DRMFrame2Impl_QueryInterface(IDirect3DRMFrame2* if static ULONG WINAPI IDirect3DRMFrame2Impl_AddRef(IDirect3DRMFrame2* iface) { IDirect3DRMFrameImpl *This = impl_from_IDirect3DRMFrame2(iface); + ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p)\n", This); + TRACE("(%p)->(): new ref = %d\n", This, ref); - return InterlockedIncrement(&This->ref); + return ref; } static ULONG WINAPI IDirect3DRMFrame2Impl_Release(IDirect3DRMFrame2* iface) @@ -89,7 +90,7 @@ static ULONG WINAPI IDirect3DRMFrame2Impl_Release(IDirect3DRMFrame2* iface) IDirect3DRMFrameImpl *This = impl_from_IDirect3DRMFrame2(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p)\n", This); + TRACE("(%p)->(): new ref = %d\n", This, ref); if (!ref) HeapFree(GetProcessHeap(), 0, This); diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index 6f5451b..e9d0e67 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -322,10 +322,11 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder2Impl_QueryInterface(IDirect3DRMMesh static ULONG WINAPI IDirect3DRMMeshBuilder2Impl_AddRef(IDirect3DRMMeshBuilder2* iface) { IDirect3DRMMeshBuilderImpl *This = impl_from_IDirect3DRMMeshBuilder2(iface); + ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p)\n", This); + TRACE("(%p)->(): new ref = %d\n", This, ref); - return InterlockedIncrement(&This->ref); + return ref; } static ULONG WINAPI IDirect3DRMMeshBuilder2Impl_Release(IDirect3DRMMeshBuilder2* iface) @@ -333,7 +334,7 @@ static ULONG WINAPI IDirect3DRMMeshBuilder2Impl_Release(IDirect3DRMMeshBuilder2* IDirect3DRMMeshBuilderImpl *This = impl_from_IDirect3DRMMeshBuilder2(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p)\n", This); + TRACE("(%p)->(): new ref = %d\n", This, ref); if (!ref) { diff --git a/dlls/d3drm/viewport.c b/dlls/d3drm/viewport.c index 16e812a..5122140 100644 --- a/dlls/d3drm/viewport.c +++ b/dlls/d3drm/viewport.c @@ -80,10 +80,11 @@ static HRESULT WINAPI IDirect3DRMViewportImpl_QueryInterface(IDirect3DRMViewport static ULONG WINAPI IDirect3DRMViewportImpl_AddRef(IDirect3DRMViewport* iface) { IDirect3DRMViewportImpl *This = impl_from_IDirect3DRMViewport(iface); + ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p)\n", This); + TRACE("(%p)->(): new ref = %d\n", This, ref); - return InterlockedIncrement(&This->ref); + return ref; } static ULONG WINAPI IDirect3DRMViewportImpl_Release(IDirect3DRMViewport* iface) @@ -91,7 +92,7 @@ static ULONG WINAPI IDirect3DRMViewportImpl_Release(IDirect3DRMViewport* iface) IDirect3DRMViewportImpl *This = impl_from_IDirect3DRMViewport(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p)\n", This); + TRACE("(%p)->(): new ref = %d\n", This, ref); if (!ref) HeapFree(GetProcessHeap(), 0, This);

1 0

Christian Costa : d3drm: If there is no texture coordinates in loaded mesh, generate default texture coordinates for each vertex.
by Alexandre Julliard 16 Mar '12

16 Mar '12

Module: wine Branch: master Commit: b89c32b2a12f78572da336d982aa53b8c8bb99d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b89c32b2a12f78572da336d98… Author: Christian Costa <titan.costa(a)gmail.com> Date: Fri Mar 16 08:16:18 2012 +0100 d3drm: If there is no texture coordinates in loaded mesh, generate default texture coordinates for each vertex. --- dlls/d3drm/meshbuilder.c | 14 +++++++++++- dlls/d3drm/tests/d3drm.c | 54 ++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 61 insertions(+), 7 deletions(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index e9d0e67..43ce2d6 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -1272,6 +1272,18 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_Load(IDirect3DRMMeshBuilder3* /* Set size (in number of DWORD) of all faces data */ This->face_data_size = faces_data_size; + /* If there is no texture coordinates, generate default texture coordinates (0.0f, 0.0f) for each vertex */ + if (!This->pCoords2d) + { + This->nb_coords2d = This->nb_vertices; + This->pCoords2d = HeapAlloc(GetProcessHeap(), 0, This->nb_coords2d * sizeof(Coords2d)); + for (i = 0; i < This->nb_coords2d; i++) + { + This->pCoords2d[i].u = 0.0f; + This->pCoords2d[i].v = 0.0f; + } + } + ret = D3DRM_OK; end: @@ -1603,7 +1615,7 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_GetTextureCoordinates(IDirect3 TRACE("(%p)->(%d,%p,%p)\n", This, index, u, v); if (index >= This->nb_coords2d) - return D3DRMERR_NOTFOUND; + return D3DRMERR_BADVALUE; *u = This->pCoords2d[index].u; *v = This->pCoords2d[index].v; diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 1732db6..341519b 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -180,12 +180,33 @@ static void test_MeshBuilder(void) todo_wine ok(val2 == 4, "Wrong number of normals %d (must be 4)\n", val2); ok(val3 == 22, "Wrong number of face data bytes %d (must be 22)\n", val3); + /* Check that Load method generated default texture coordinates (0.0f, 0.0f) for each vertex */ + valu = 1.23f; + valv = 3.21f; + hr = IDirect3DRMMeshBuilder_GetTextureCoordinates(pMeshBuilder, 0, &valu, &valv); + ok(hr == D3DRM_OK, "Cannot get texture coordinates (hr = %x)\n", hr); + ok(valu == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valu); + ok(valv == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valv); valu = 1.23f; valv = 3.21f; hr = IDirect3DRMMeshBuilder_GetTextureCoordinates(pMeshBuilder, 1, &valu, &valv); - todo_wine ok(hr == D3DRM_OK, "Cannot get texture coordinates (hr = %x)\n", hr); - todo_wine ok(valu == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valu); - todo_wine ok(valv == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valv); + ok(hr == D3DRM_OK, "Cannot get texture coordinates (hr = %x)\n", hr); + ok(valu == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valu); + ok(valv == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valv); + valu = 1.23f; + valv = 3.21f; + hr = IDirect3DRMMeshBuilder_GetTextureCoordinates(pMeshBuilder, 2, &valu, &valv); + ok(hr == D3DRM_OK, "Cannot get texture coordinates (hr = %x)\n", hr); + ok(valu == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valu); + ok(valv == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valv); + valu = 1.23f; + valv = 3.21f; + hr = IDirect3DRMMeshBuilder_GetTextureCoordinates(pMeshBuilder, 3, &valu, &valv); + ok(hr == D3DRM_OK, "Cannot get texture coordinates (hr = %x)\n", hr); + ok(valu == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valu); + ok(valv == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valv); + hr = IDirect3DRMMeshBuilder_GetTextureCoordinates(pMeshBuilder, 4, &valu, &valv); + ok(hr == D3DRMERR_BADVALUE, "Should fail and return D3DRM_BADVALUE (hr = %x)\n", hr); valu = 1.23f; valv = 3.21f; @@ -302,12 +323,33 @@ static void test_MeshBuilder3(void) ok(hr == D3DRM_OK, "Cannot get vertices information (hr = %x)\n", hr); ok(val1 == 4, "Wrong number of vertices %d (must be 4)\n", val1); + /* Check that Load method generated default texture coordinates (0.0f, 0.0f) for each vertex */ + valu = 1.23f; + valv = 3.21f; + hr = IDirect3DRMMeshBuilder3_GetTextureCoordinates(pMeshBuilder3, 0, &valu, &valv); + ok(hr == D3DRM_OK, "Cannot get texture coordinates (hr = %x)\n", hr); + ok(valu == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valu); + ok(valv == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valv); valu = 1.23f; valv = 3.21f; hr = IDirect3DRMMeshBuilder3_GetTextureCoordinates(pMeshBuilder3, 1, &valu, &valv); - todo_wine ok(hr == D3DRM_OK, "Cannot get texture coordinates (hr = %x)\n", hr); - todo_wine ok(valu == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valu); - todo_wine ok(valv == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valv); + ok(hr == D3DRM_OK, "Cannot get texture coordinates (hr = %x)\n", hr); + ok(valu == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valu); + ok(valv == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valv); + valu = 1.23f; + valv = 3.21f; + hr = IDirect3DRMMeshBuilder3_GetTextureCoordinates(pMeshBuilder3, 2, &valu, &valv); + ok(hr == D3DRM_OK, "Cannot get texture coordinates (hr = %x)\n", hr); + ok(valu == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valu); + ok(valv == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valv); + valu = 1.23f; + valv = 3.21f; + hr = IDirect3DRMMeshBuilder3_GetTextureCoordinates(pMeshBuilder3, 3, &valu, &valv); + ok(hr == D3DRM_OK, "Cannot get texture coordinates (hr = %x)\n", hr); + ok(valu == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valu); + ok(valv == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valv); + hr = IDirect3DRMMeshBuilder3_GetTextureCoordinates(pMeshBuilder3, 4, &valu, &valv); + ok(hr == D3DRMERR_BADVALUE, "Should fail and return D3DRM_BADVALUE (hr = %x)\n", hr); valu = 1.23f; valv = 3.21f;

1 0

Christian Costa : d3drm: Implement SetTextureCoordinates.
by Alexandre Julliard 16 Mar '12

16 Mar '12

Module: wine Branch: master Commit: 7a320e5ca4afdfc760efcbb31f4ad9774231828b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a320e5ca4afdfc760efcbb31… Author: Christian Costa <titan.costa(a)gmail.com> Date: Fri Mar 16 08:16:26 2012 +0100 d3drm: Implement SetTextureCoordinates. --- dlls/d3drm/meshbuilder.c | 15 +++++++++++---- dlls/d3drm/tests/d3drm.c | 28 ++++++++++++++++------------ 2 files changed, 27 insertions(+), 16 deletions(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index 43ce2d6..b386cbf 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -681,9 +681,10 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder2Impl_SetTextureCoordinates(IDirect3 { IDirect3DRMMeshBuilderImpl *This = impl_from_IDirect3DRMMeshBuilder2(iface); - FIXME("(%p)->(%f,%f): stub\n", This, u, v); + TRACE("(%p)->(%u,%f,%f)\n", This, index, u, v); - return E_NOTIMPL; + return IDirect3DRMMeshBuilder3_SetTextureCoordinates(&This->IDirect3DRMMeshBuilder3_iface, + index, u, v); } static HRESULT WINAPI IDirect3DRMMeshBuilder2Impl_SetVertexColor(IDirect3DRMMeshBuilder2* iface, @@ -1555,9 +1556,15 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_SetTextureCoordinates(IDirect3 { IDirect3DRMMeshBuilderImpl *This = impl_from_IDirect3DRMMeshBuilder3(iface); - FIXME("(%p)->(%f,%f): stub\n", This, u, v); + TRACE("(%p)->(%u,%f,%f)\n", This, index, u, v); - return E_NOTIMPL; + if (index >= This->nb_coords2d) + return D3DRMERR_BADVALUE; + + This->pCoords2d[index].u = u; + This->pCoords2d[index].v = v; + + return D3DRM_OK; } static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_SetVertexColor(IDirect3DRMMeshBuilder3* iface, diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 341519b..454a935 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -210,15 +210,17 @@ static void test_MeshBuilder(void) valu = 1.23f; valv = 3.21f; - hr = IDirect3DRMMeshBuilder_SetTextureCoordinates(pMeshBuilder, 1, valu, valv); - todo_wine ok(hr == D3DRM_OK, "Cannot set texture coordinates (hr = %x)\n", hr); + hr = IDirect3DRMMeshBuilder_SetTextureCoordinates(pMeshBuilder, 0, valu, valv); + ok(hr == D3DRM_OK, "Cannot set texture coordinates (hr = %x)\n", hr); + hr = IDirect3DRMMeshBuilder_SetTextureCoordinates(pMeshBuilder, 4, valu, valv); + ok(hr == D3DRMERR_BADVALUE, "Should fail and return D3DRM_BADVALUE (hr = %x)\n", hr); valu = 0.0f; valv = 0.0f; - hr = IDirect3DRMMeshBuilder_GetTextureCoordinates(pMeshBuilder, 1, &valu, &valv); - todo_wine ok(hr == D3DRM_OK, "Cannot get texture coordinates (hr = %x)\n", hr); - todo_wine ok(valu == 1.23f, "Wrong coordinate %f (must be 1.23)\n", valu); - todo_wine ok(valv == 3.21f, "Wrong coordinate %f (must be 3.21)\n", valv); + hr = IDirect3DRMMeshBuilder_GetTextureCoordinates(pMeshBuilder, 0, &valu, &valv); + ok(hr == D3DRM_OK, "Cannot get texture coordinates (hr = %x)\n", hr); + ok(valu == 1.23f, "Wrong coordinate %f (must be 1.23)\n", valu); + ok(valv == 3.21f, "Wrong coordinate %f (must be 3.21)\n", valv); IDirect3DRMMeshBuilder_Release(pMeshBuilder); @@ -353,15 +355,17 @@ static void test_MeshBuilder3(void) valu = 1.23f; valv = 3.21f; - hr = IDirect3DRMMeshBuilder3_SetTextureCoordinates(pMeshBuilder3, 1, valu, valv); - todo_wine ok(hr == D3DRM_OK, "Cannot set texture coordinates (hr = %x)\n", hr); + hr = IDirect3DRMMeshBuilder3_SetTextureCoordinates(pMeshBuilder3, 0, valu, valv); + ok(hr == D3DRM_OK, "Cannot set texture coordinates (hr = %x)\n", hr); + hr = IDirect3DRMMeshBuilder3_SetTextureCoordinates(pMeshBuilder3, 4, valu, valv); + ok(hr == D3DRMERR_BADVALUE, "Should fail and return D3DRM_BADVALUE (hr = %x)\n", hr); valu = 0.0f; valv = 0.0f; - hr = IDirect3DRMMeshBuilder3_GetTextureCoordinates(pMeshBuilder3, 1, &valu, &valv); - todo_wine ok(hr == D3DRM_OK, "Cannot get texture coordinates (hr = %x)\n", hr); - todo_wine ok(valu == 1.23f, "Wrong coordinate %f (must be 1.23)\n", valu); - todo_wine ok(valv == 3.21f, "Wrong coordinate %f (must be 3.21)\n", valv); + hr = IDirect3DRMMeshBuilder3_GetTextureCoordinates(pMeshBuilder3, 0, &valu, &valv); + ok(hr == D3DRM_OK, "Cannot get texture coordinates (hr = %x)\n", hr); + ok(valu == 1.23f, "Wrong coordinate %f (must be 1.23)\n", valu); + ok(valv == 3.21f, "Wrong coordinate %f (must be 3.21)\n", valv); IDirect3DRMMeshBuilder3_Release(pMeshBuilder3); IDirect3DRM3_Release(pD3DRM3);

1 0

Alexandre Julliard : msvcrt: Create an i386-specific file for exception handling.
by Alexandre Julliard 16 Mar '12

16 Mar '12

Module: wine Branch: master Commit: aba6423b830939ad98f755f2a54104626483db9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=aba6423b830939ad98f755f2a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 13 15:10:15 2012 +0100 msvcrt: Create an i386-specific file for exception handling. --- dlls/msvcrt/Makefile.in | 2 +- dlls/msvcrt/cpp.c | 14 ++++++++++++++ dlls/msvcrt/{cppexcept.c => except_i386.c} | 22 ++++------------------ dlls/msvcrt/msvcrt.spec | 8 ++++---- 4 files changed, 23 insertions(+), 23 deletions(-) diff --git a/dlls/msvcrt/Makefile.in b/dlls/msvcrt/Makefile.in index 1f4860a..ba8cdbb 100644 --- a/dlls/msvcrt/Makefile.in +++ b/dlls/msvcrt/Makefile.in @@ -6,13 +6,13 @@ DELAYIMPORTS = advapi32 user32 C_SRCS = \ console.c \ cpp.c \ - cppexcept.c \ ctype.c \ data.c \ dir.c \ environ.c \ errno.c \ except.c \ + except_i386.c \ exit.c \ file.c \ heap.c \ diff --git a/dlls/msvcrt/cpp.c b/dlls/msvcrt/cpp.c index d5c0c64..dc609c1 100644 --- a/dlls/msvcrt/cpp.c +++ b/dlls/msvcrt/cpp.c @@ -1270,3 +1270,17 @@ void* CDECL MSVCRT___RTCastToVoid(void *cppobj) __ENDTRY return ret; } + + +/********************************************************************* + * _CxxThrowException (MSVCRT.@) + */ +void WINAPI _CxxThrowException( exception *object, const cxx_exception_type *type ) +{ + ULONG_PTR args[3]; + + args[0] = CXX_FRAME_MAGIC_VC6; + args[1] = (ULONG_PTR)object; + args[2] = (ULONG_PTR)type; + RaiseException( CXX_EXCEPTION, EH_NONCONTINUABLE, 3, args ); +} diff --git a/dlls/msvcrt/cppexcept.c b/dlls/msvcrt/except_i386.c similarity index 97% rename from dlls/msvcrt/cppexcept.c rename to dlls/msvcrt/except_i386.c index 18e5aa0..c95f49b 100644 --- a/dlls/msvcrt/cppexcept.c +++ b/dlls/msvcrt/except_i386.c @@ -26,6 +26,8 @@ #include "config.h" #include "wine/port.h" +#ifdef __i386__ + #include <stdarg.h> #include "windef.h" @@ -38,8 +40,6 @@ #include "cppexcept.h" -#ifdef __i386__ /* CxxFrameHandler is not supported on non-i386 */ - WINE_DEFAULT_DEBUG_CHANNEL(seh); DWORD CDECL cxx_frame_handler( PEXCEPTION_RECORD rec, cxx_exception_frame* frame, @@ -455,9 +455,6 @@ void __stdcall __CxxLongjmpUnwind( const struct MSVCRT___JUMP_BUFFER *buf ) cxx_local_unwind( frame, descr, buf->TryLevel ); } -#endif /* __i386__ */ - - /********************************************************************* * __CppXcptFilter (MSVCRT.@) */ @@ -469,19 +466,6 @@ int CDECL __CppXcptFilter(NTSTATUS ex, PEXCEPTION_POINTERS ptr) } /********************************************************************* - * _CxxThrowException (MSVCRT.@) - */ -void WINAPI _CxxThrowException( exception *object, const cxx_exception_type *type ) -{ - ULONG_PTR args[3]; - - args[0] = CXX_FRAME_MAGIC_VC6; - args[1] = (ULONG_PTR)object; - args[2] = (ULONG_PTR)type; - RaiseException( CXX_EXCEPTION, EH_NONCONTINUABLE, 3, args ); -} - -/********************************************************************* * __CxxDetectRethrow (MSVCRT.@) */ BOOL CDECL __CxxDetectRethrow(PEXCEPTION_POINTERS ptrs) @@ -511,3 +495,5 @@ unsigned int CDECL __CxxQueryExceptionSize(void) { return sizeof(cxx_exception_type); } + +#endif /* __i386__ */ diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 1260dfa..c893382 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -145,18 +145,18 @@ @ extern _HUGE MSVCRT__HUGE @ cdecl _Strftime(str long str ptr ptr) @ cdecl _XcptFilter(long ptr) -@ cdecl __CppXcptFilter(long ptr) +@ stdcall -arch=x86_64 __C_specific_handler(ptr long ptr ptr) ntdll.__C_specific_handler +@ cdecl -i386 __CppXcptFilter(long ptr) # stub __CxxCallUnwindDelDtor # stub __CxxCallUnwindDtor # stub __CxxCallUnwindVecDtor -@ cdecl __CxxDetectRethrow(ptr) +@ cdecl -i386 __CxxDetectRethrow(ptr) # stub __CxxExceptionFilter @ cdecl -i386 -norelay __CxxFrameHandler(ptr ptr ptr ptr) @ cdecl -i386 -norelay __CxxFrameHandler2(ptr ptr ptr ptr) __CxxFrameHandler @ cdecl -i386 -norelay __CxxFrameHandler3(ptr ptr ptr ptr) __CxxFrameHandler -@ stdcall -arch=x86_64 __C_specific_handler(ptr long ptr ptr) ntdll.__C_specific_handler @ stdcall -i386 __CxxLongjmpUnwind(ptr) -@ cdecl __CxxQueryExceptionSize() +@ cdecl -i386 __CxxQueryExceptionSize() # stub __CxxRegisterExceptionObject # stub __CxxUnregisterExceptionObject # stub __DestructExceptionObject

1 0

Alexandre Julliard : msvcrt: Move more i386-specific exception code to except_i386.c.
by Alexandre Julliard 16 Mar '12

16 Mar '12

Module: wine Branch: master Commit: 89b2dd08ffb16d92da900f0682fdca81ec79e790 URL: http://source.winehq.org/git/wine.git/?a=commit;h=89b2dd08ffb16d92da900f068… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 13 15:24:18 2012 +0100 msvcrt: Move more i386-specific exception code to except_i386.c. --- dlls/msvcrt/cppexcept.h | 61 +----- dlls/msvcrt/except.c | 489 +----------------------------------------- dlls/msvcrt/except_i386.c | 536 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 542 insertions(+), 544 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=89b2dd08ffb16d92da900…

1 0

Alexandre Julliard : msvcrt: Add a new file for the x86_64 exception handling.
by Alexandre Julliard 16 Mar '12

16 Mar '12

Module: wine Branch: master Commit: b8467c5f69abd9a5f8daef3da5680544d8b30323 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8467c5f69abd9a5f8daef3da… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 13 15:40:27 2012 +0100 msvcrt: Add a new file for the x86_64 exception handling. --- dlls/msvcrt/Makefile.in | 1 + dlls/msvcrt/except.c | 97 ------------------------------- dlls/msvcrt/except_x86_64.c | 135 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 136 insertions(+), 97 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b8467c5f69abd9a5f8dae…

1 0

Alexandre Julliard : msvcrt: Add entry points for the C++ exception functions on x86_64.
by Alexandre Julliard 16 Mar '12

16 Mar '12

Module: wine Branch: master Commit: 881374ee962bd73ba2df71b678983baa0a88610d URL: http://source.winehq.org/git/wine.git/?a=commit;h=881374ee962bd73ba2df71b67… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 13 15:50:40 2012 +0100 msvcrt: Add entry points for the C++ exception functions on x86_64. --- dlls/msvcr100/msvcr100.spec | 12 +++--- dlls/msvcr70/msvcr70.spec | 6 ++-- dlls/msvcr71/msvcr71.spec | 8 ++-- dlls/msvcr80/msvcr80.spec | 12 +++--- dlls/msvcr90/msvcr90.spec | 12 +++--- dlls/msvcrt/except_x86_64.c | 77 +++++++++++++++++++++++++++++++++++++++++++ dlls/msvcrt/msvcrt.spec | 12 +++--- dlls/msvcrt20/msvcrt20.spec | 2 +- dlls/msvcrt40/msvcrt40.spec | 2 +- dlls/msvcrtd/msvcrtd.spec | 2 +- 10 files changed, 111 insertions(+), 34 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=881374ee962bd73ba2df7…

1 0

Henri Verbeet : wined3d: The current WGL DC should never be NULL in wined3d_adapter_init_gl_caps().
by Alexandre Julliard 16 Mar '12

16 Mar '12

Module: wine Branch: master Commit: 02ae22d984b95b0f25ba83821030d37f1a7bd968 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02ae22d984b95b0f25ba83821… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 15 21:49:54 2012 +0100 wined3d: The current WGL DC should never be NULL in wined3d_adapter_init_gl_caps(). --- dlls/wined3d/directx.c | 73 +++++++++++++++++++++++------------------------ 1 files changed, 36 insertions(+), 37 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 5c46d07..92a2298 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2823,49 +2823,48 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter) gl_info->wrap_lookup[WINED3D_TADDRESS_MIRROR_ONCE - WINED3D_TADDRESS_WRAP] = gl_info->supported[ATI_TEXTURE_MIRROR_ONCE] ? GL_MIRROR_CLAMP_TO_EDGE_ATI : GL_REPEAT; - /* Make sure there's an active HDC else the WGL extensions will fail */ hdc = pwglGetCurrentDC(); - if (hdc) { - /* Not all GL drivers might offer WGL extensions e.g. VirtualBox */ - if(GL_EXTCALL(wglGetExtensionsStringARB)) - WGL_Extensions = GL_EXTCALL(wglGetExtensionsStringARB(hdc)); - - if (!WGL_Extensions) - { - ERR(" WGL_Extensions returns NULL\n"); - } - else + /* Not all GL drivers might offer WGL extensions e.g. VirtualBox. */ + if (GL_EXTCALL(wglGetExtensionsStringARB)) + WGL_Extensions = GL_EXTCALL(wglGetExtensionsStringARB(hdc)); + if (!WGL_Extensions) + WARN_(d3d_caps)("WGL extensions not supported.\n"); + else + { + TRACE_(d3d_caps)("WGL_Extensions reported:\n"); + while (*WGL_Extensions) { - TRACE_(d3d_caps)("WGL_Extensions reported:\n"); - while (*WGL_Extensions) - { - const char *Start; - char ThisExtn[256]; + const char *start; + char current_ext[256]; - while (isspace(*WGL_Extensions)) WGL_Extensions++; - Start = WGL_Extensions; - while (!isspace(*WGL_Extensions) && *WGL_Extensions) ++WGL_Extensions; + while (isspace(*WGL_Extensions)) + ++WGL_Extensions; + start = WGL_Extensions; + while (!isspace(*WGL_Extensions) && *WGL_Extensions) + ++WGL_Extensions; - len = WGL_Extensions - Start; - if (!len || len >= sizeof(ThisExtn)) - continue; + len = WGL_Extensions - start; + if (!len || len >= sizeof(current_ext)) + continue; - memcpy(ThisExtn, Start, len); - ThisExtn[len] = '\0'; - TRACE_(d3d_caps)("- %s\n", debugstr_a(ThisExtn)); + memcpy(current_ext, start, len); + current_ext[len] = '\0'; + TRACE_(d3d_caps)("- %s\n", debugstr_a(current_ext)); - if (!strcmp(ThisExtn, "WGL_ARB_pixel_format")) { - gl_info->supported[WGL_ARB_PIXEL_FORMAT] = TRUE; - TRACE_(d3d_caps)("FOUND: WGL_ARB_pixel_format support\n"); - } - if (!strcmp(ThisExtn, "WGL_EXT_swap_control")) { - gl_info->supported[WGL_EXT_SWAP_CONTROL] = TRUE; - TRACE_(d3d_caps)("FOUND: WGL_EXT_swap_control support\n"); - } - if (!strcmp(ThisExtn, "WGL_WINE_pixel_format_passthrough")) { - gl_info->supported[WGL_WINE_PIXEL_FORMAT_PASSTHROUGH] = TRUE; - TRACE_(d3d_caps)("FOUND: WGL_WINE_pixel_format_passthrough support\n"); - } + if (!strcmp(current_ext, "WGL_ARB_pixel_format")) + { + gl_info->supported[WGL_ARB_PIXEL_FORMAT] = TRUE; + TRACE_(d3d_caps)("FOUND: WGL_ARB_pixel_format support\n"); + } + if (!strcmp(current_ext, "WGL_EXT_swap_control")) + { + gl_info->supported[WGL_EXT_SWAP_CONTROL] = TRUE; + TRACE_(d3d_caps)("FOUND: WGL_EXT_swap_control support\n"); + } + if (!strcmp(current_ext, "WGL_WINE_pixel_format_passthrough")) + { + gl_info->supported[WGL_WINE_PIXEL_FORMAT_PASSTHROUGH] = TRUE; + TRACE_(d3d_caps)("FOUND: WGL_WINE_pixel_format_passthrough support\n"); } } }

1 0