Skip to content

W
wine-cw
Commit 8550e69a authored by Henri Verbeet's avatar Henri Verbeet Committed by Alexandre Julliard
Browse files
Options

d3drm: Avoid LPDIRECT3DRMDEVICEARRAY.

parent 13a38e8d
Show whitespace changes
Inline Side-by-side
Showing with 9 additions and 17 deletions
dlls/d3drm/d3drm.c
View file @ 8550e69a
...@@ -374,11 +374,9 @@ static HRESULT WINAPI IDirect3DRMImpl_SetDefaultTextureShades(IDirect3DRM* iface ...@@ -374,11 +374,9 @@ static HRESULT WINAPI IDirect3DRMImpl_SetDefaultTextureShades(IDirect3DRM* iface
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI IDirect3DRMImpl_GetDevices(IDirect3DRM* iface, LPDIRECT3DRMDEVICEARRAY * ppDeviceArray) static HRESULT WINAPI IDirect3DRMImpl_GetDevices(IDirect3DRM *iface, IDirect3DRMDeviceArray **array)
{ {
IDirect3DRMImpl *This = impl_from_IDirect3DRM(iface); FIXME("iface %p, array %p stub!\n", iface, array);
FIXME("(%p/%p)->(%p): stub\n", iface, This, ppDeviceArray);
return E_NOTIMPL; return E_NOTIMPL;
} }
...@@ -747,12 +745,9 @@ static HRESULT WINAPI IDirect3DRM2Impl_SetDefaultTextureShades(IDirect3DRM2* ifa ...@@ -747,12 +745,9 @@ static HRESULT WINAPI IDirect3DRM2Impl_SetDefaultTextureShades(IDirect3DRM2* ifa
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI IDirect3DRM2Impl_GetDevices(IDirect3DRM2* iface, static HRESULT WINAPI IDirect3DRM2Impl_GetDevices(IDirect3DRM2 *iface, IDirect3DRMDeviceArray **array)
LPDIRECT3DRMDEVICEARRAY * ppDeviceArray)
{ {
IDirect3DRMImpl *This = impl_from_IDirect3DRM2(iface); FIXME("iface %p, array %p stub!\n", iface, array);
FIXME("(%p/%p)->(%p): stub\n", iface, This, ppDeviceArray);
return E_NOTIMPL; return E_NOTIMPL;
} }
...@@ -1141,12 +1136,9 @@ static HRESULT WINAPI IDirect3DRM3Impl_SetDefaultTextureShades(IDirect3DRM3* ifa ...@@ -1141,12 +1136,9 @@ static HRESULT WINAPI IDirect3DRM3Impl_SetDefaultTextureShades(IDirect3DRM3* ifa
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI IDirect3DRM3Impl_GetDevices(IDirect3DRM3* iface, static HRESULT WINAPI IDirect3DRM3Impl_GetDevices(IDirect3DRM3 *iface, IDirect3DRMDeviceArray **array)
LPDIRECT3DRMDEVICEARRAY* DeviceArray)
{ {
IDirect3DRMImpl *This = impl_from_IDirect3DRM3(iface); FIXME("iface %p, array %p stub!\n", iface, array);
FIXME("(%p/%p)->(%p): stub\n", iface, This, DeviceArray);
return E_NOTIMPL; return E_NOTIMPL;
} }
......
include/d3drm.h
View file @ 8550e69a
...@@ -94,7 +94,7 @@ DECLARE_INTERFACE_(IDirect3DRM,IUnknown) ...@@ -94,7 +94,7 @@ DECLARE_INTERFACE_(IDirect3DRM,IUnknown)
STDMETHOD(GetSearchPath)(THIS_ DWORD *size_return, LPSTR path_return) PURE; STDMETHOD(GetSearchPath)(THIS_ DWORD *size_return, LPSTR path_return) PURE;
STDMETHOD(SetDefaultTextureColors)(THIS_ DWORD) PURE; STDMETHOD(SetDefaultTextureColors)(THIS_ DWORD) PURE;
STDMETHOD(SetDefaultTextureShades)(THIS_ DWORD) PURE; STDMETHOD(SetDefaultTextureShades)(THIS_ DWORD) PURE;
STDMETHOD(GetDevices)(THIS_ LPDIRECT3DRMDEVICEARRAY *) PURE; STDMETHOD(GetDevices)(THIS_ IDirect3DRMDeviceArray **array) PURE;
STDMETHOD(GetNamedObject)(THIS_ const char *name, IDirect3DRMObject **object) PURE; STDMETHOD(GetNamedObject)(THIS_ const char *name, IDirect3DRMObject **object) PURE;
STDMETHOD(EnumerateObjects)(THIS_ D3DRMOBJECTCALLBACK, LPVOID) PURE; STDMETHOD(EnumerateObjects)(THIS_ D3DRMOBJECTCALLBACK, LPVOID) PURE;
STDMETHOD(Load)(THIS_ void *source, void *object_id, IID **iids, DWORD iid_count, D3DRMLOADOPTIONS flags, STDMETHOD(Load)(THIS_ void *source, void *object_id, IID **iids, DWORD iid_count, D3DRMLOADOPTIONS flags,
...@@ -234,7 +234,7 @@ DECLARE_INTERFACE_(IDirect3DRM2,IUnknown) ...@@ -234,7 +234,7 @@ DECLARE_INTERFACE_(IDirect3DRM2,IUnknown)
STDMETHOD(GetSearchPath)(THIS_ DWORD *size_return, LPSTR path_return) PURE; STDMETHOD(GetSearchPath)(THIS_ DWORD *size_return, LPSTR path_return) PURE;
STDMETHOD(SetDefaultTextureColors)(THIS_ DWORD) PURE; STDMETHOD(SetDefaultTextureColors)(THIS_ DWORD) PURE;
STDMETHOD(SetDefaultTextureShades)(THIS_ DWORD) PURE; STDMETHOD(SetDefaultTextureShades)(THIS_ DWORD) PURE;
STDMETHOD(GetDevices)(THIS_ LPDIRECT3DRMDEVICEARRAY *) PURE; STDMETHOD(GetDevices)(THIS_ IDirect3DRMDeviceArray **array) PURE;
STDMETHOD(GetNamedObject)(THIS_ const char *name, IDirect3DRMObject **object) PURE; STDMETHOD(GetNamedObject)(THIS_ const char *name, IDirect3DRMObject **object) PURE;
STDMETHOD(EnumerateObjects)(THIS_ D3DRMOBJECTCALLBACK, LPVOID) PURE; STDMETHOD(EnumerateObjects)(THIS_ D3DRMOBJECTCALLBACK, LPVOID) PURE;
STDMETHOD(Load)(THIS_ void *source, void *object_id, IID **iids, DWORD iid_count, D3DRMLOADOPTIONS flags, STDMETHOD(Load)(THIS_ void *source, void *object_id, IID **iids, DWORD iid_count, D3DRMLOADOPTIONS flags,
...@@ -377,7 +377,7 @@ DECLARE_INTERFACE_(IDirect3DRM3,IUnknown) ...@@ -377,7 +377,7 @@ DECLARE_INTERFACE_(IDirect3DRM3,IUnknown)
STDMETHOD(GetSearchPath)(THIS_ DWORD *size_return, LPSTR path_return) PURE; STDMETHOD(GetSearchPath)(THIS_ DWORD *size_return, LPSTR path_return) PURE;
STDMETHOD(SetDefaultTextureColors)(THIS_ DWORD) PURE; STDMETHOD(SetDefaultTextureColors)(THIS_ DWORD) PURE;
STDMETHOD(SetDefaultTextureShades)(THIS_ DWORD) PURE; STDMETHOD(SetDefaultTextureShades)(THIS_ DWORD) PURE;
STDMETHOD(GetDevices)(THIS_ LPDIRECT3DRMDEVICEARRAY *) PURE; STDMETHOD(GetDevices)(THIS_ IDirect3DRMDeviceArray **array) PURE;
STDMETHOD(GetNamedObject)(THIS_ const char *name, IDirect3DRMObject **object) PURE; STDMETHOD(GetNamedObject)(THIS_ const char *name, IDirect3DRMObject **object) PURE;
STDMETHOD(EnumerateObjects)(THIS_ D3DRMOBJECTCALLBACK, LPVOID) PURE; STDMETHOD(EnumerateObjects)(THIS_ D3DRMOBJECTCALLBACK, LPVOID) PURE;
STDMETHOD(Load)(THIS_ void *source, void *object_id, IID **iids, DWORD iid_count, D3DRMLOADOPTIONS flags, STDMETHOD(Load)(THIS_ void *source, void *object_id, IID **iids, DWORD iid_count, D3DRMLOADOPTIONS flags,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment