marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

d3drm: Avoid LPDIRECT3DRMVISUALARRAY.

oldstable
Henri Verbeet 2013-06-06 10:51:50 +02:00 committed by Alexandre Julliard
parent 0330ae84a7
commit 861b1053e2
3 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dlls/d3drm/frame.c
View File

@ -819,8 +819,7 @@ static HRESULT WINAPI IDirect3DRMFrame2Impl_GetOrientation(IDirect3DRMFrame2 *if
return E_NOTIMPL;
}
static HRESULT WINAPI IDirect3DRMFrame2Impl_GetVisuals(IDirect3DRMFrame2* iface,
LPDIRECT3DRMVISUALARRAY *visuals)
static HRESULT WINAPI IDirect3DRMFrame2Impl_GetVisuals(IDirect3DRMFrame2 *iface, IDirect3DRMVisualArray **visuals)
{
IDirect3DRMFrameImpl *This = impl_from_IDirect3DRMFrame2(iface);
IDirect3DRMVisualArrayImpl* obj;

14
dlls/d3drm/tests/d3drm.c
View File

@ -915,7 +915,7 @@ static void test_Frame(void)
IDirect3DRMMeshBuilder *mesh_builder;
IDirect3DRMVisual *visual1;
IDirect3DRMVisual *visual_tmp;
LPDIRECT3DRMVISUALARRAY pVisualArray;
IDirect3DRMVisualArray *visual_array;
IDirect3DRMLight *light1;
IDirect3DRMLight *light_tmp;
LPDIRECT3DRMLIGHTARRAY pLightArray;
@ -1154,18 +1154,18 @@ static void test_Frame(void)
CHECK_REFCOUNT(pFrameP1, 3);
CHECK_REFCOUNT(visual1, 2);
pVisualArray = NULL;
hr = IDirect3DRMFrame_GetVisuals(pFrameP1, &pVisualArray);
visual_array = NULL;
hr = IDirect3DRMFrame_GetVisuals(pFrameP1, &visual_array);
ok(hr == D3DRM_OK, "Cannot get visuals (hr = %x)\n", hr);
if (pVisualArray)
if (visual_array)
{
count = IDirect3DRMVisualArray_GetSize(pVisualArray);
count = IDirect3DRMVisualArray_GetSize(visual_array);
ok(count == 1, "count = %u\n", count);
hr = IDirect3DRMVisualArray_GetElement(pVisualArray, 0, &visual_tmp);
hr = IDirect3DRMVisualArray_GetElement(visual_array, 0, &visual_tmp);
ok(hr == D3DRM_OK, "Cannot get element (hr = %x)\n", hr);
ok(visual_tmp == visual1, "visual_tmp = %p\n", visual_tmp);
IDirect3DRMVisual_Release(visual_tmp);
IDirect3DRMVisualArray_Release(pVisualArray);
IDirect3DRMVisualArray_Release(visual_array);
}
/* Delete Visual */

4
include/d3drmobj.h
View File

@ -1117,7 +1117,7 @@ DECLARE_INTERFACE_(IDirect3DRMFrame,IDirect3DRMVisual)
STDMETHOD(GetTransform)(THIS_ D3DRMMATRIX4D return_matrix) PURE;
STDMETHOD(GetVelocity)(THIS_ IDirect3DRMFrame *reference, D3DVECTOR *return_velocity, BOOL with_rotation) PURE;
STDMETHOD(GetOrientation)(THIS_ IDirect3DRMFrame *reference, D3DVECTOR *dir, D3DVECTOR *up) PURE;
STDMETHOD(GetVisuals)(THIS_ LPDIRECT3DRMVISUALARRAY *visuals) PURE;
STDMETHOD(GetVisuals)(THIS_ struct IDirect3DRMVisualArray **visuals) PURE;
STDMETHOD(GetTextureTopology)(THIS_ BOOL *wrap_u, BOOL *wrap_v) PURE;
STDMETHOD(InverseTransform)(THIS_ D3DVECTOR *d, D3DVECTOR *s) PURE;
STDMETHOD(Load)(THIS_ LPVOID filename, LPVOID name, D3DRMLOADOPTIONS loadflags, D3DRMLOADTEXTURECALLBACK,
@ -1350,7 +1350,7 @@ DECLARE_INTERFACE_(IDirect3DRMFrame2,IDirect3DRMFrame)
STDMETHOD(GetTransform)(THIS_ D3DRMMATRIX4D return_matrix) PURE;
STDMETHOD(GetVelocity)(THIS_ IDirect3DRMFrame *reference, D3DVECTOR *return_velocity, BOOL with_rotation) PURE;
STDMETHOD(GetOrientation)(THIS_ IDirect3DRMFrame *reference, D3DVECTOR *dir, D3DVECTOR *up) PURE;
STDMETHOD(GetVisuals)(THIS_ LPDIRECT3DRMVISUALARRAY *visuals) PURE;
STDMETHOD(GetVisuals)(THIS_ struct IDirect3DRMVisualArray **visuals) PURE;
STDMETHOD(GetTextureTopology)(THIS_ BOOL *wrap_u, BOOL *wrap_v) PURE;
STDMETHOD(InverseTransform)(THIS_ D3DVECTOR *d, D3DVECTOR *s) PURE;
STDMETHOD(Load)(THIS_ LPVOID filename, LPVOID name, D3DRMLOADOPTIONS loadflags, D3DRMLOADTEXTURECALLBACK,