From a9f3bc43e54b765f1e320d974540c964e489a433 Mon Sep 17 00:00:00 2001 From: Henri Verbeet Date: Mon, 9 Sep 2013 10:26:20 +0200 Subject: [PATCH] d3drm: Avoid LPSTR. --- dlls/d3drm/d3drm.c | 20 ++---- dlls/d3drm/device.c | 46 +++++--------- dlls/d3drm/face.c | 29 +++------ dlls/d3drm/frame.c | 30 +++------ dlls/d3drm/light.c | 14 ++-- dlls/d3drm/material.c | 10 ++- dlls/d3drm/meshbuilder.c | 57 +++++++---------- dlls/d3drm/texture.c | 26 +++----- dlls/d3drm/viewport.c | 30 +++------ include/d3drm.h | 6 +- include/d3drmobj.h | 134 +++++++++++++++++++-------------------- include/d3drmwin.h | 4 +- 12 files changed, 166 insertions(+), 240 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index cf74df15cfd..59e4f1cb932 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -343,11 +343,9 @@ static HRESULT WINAPI IDirect3DRMImpl_AddSearchPath(IDirect3DRM *iface, const ch return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRMImpl_GetSearchPath(IDirect3DRM* iface, DWORD *size_return, LPSTR path_return) +static HRESULT WINAPI IDirect3DRMImpl_GetSearchPath(IDirect3DRM *iface, DWORD *size, char *path) { - IDirect3DRMImpl *This = impl_from_IDirect3DRM(iface); - - FIXME("(%p/%p)->(%p,%s): stub\n", iface, This, size_return, path_return); + FIXME("iface %p, size %p, path %p stub!\n", iface, size, path); return E_NOTIMPL; } @@ -706,12 +704,9 @@ static HRESULT WINAPI IDirect3DRM2Impl_AddSearchPath(IDirect3DRM2 *iface, const return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRM2Impl_GetSearchPath(IDirect3DRM2* iface, DWORD *size_return, - LPSTR path_return) +static HRESULT WINAPI IDirect3DRM2Impl_GetSearchPath(IDirect3DRM2 *iface, DWORD *size, char *path) { - IDirect3DRMImpl *This = impl_from_IDirect3DRM2(iface); - - FIXME("(%p/%p)->(%p,%s): stub\n", iface, This, size_return, path_return); + FIXME("iface %p, size %p, path %p stub!\n", iface, size, path); return E_NOTIMPL; } @@ -1088,12 +1083,9 @@ static HRESULT WINAPI IDirect3DRM3Impl_AddSearchPath(IDirect3DRM3* iface, const return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRM3Impl_GetSearchPath(IDirect3DRM3* iface, DWORD* size_return, - LPSTR path_return) +static HRESULT WINAPI IDirect3DRM3Impl_GetSearchPath(IDirect3DRM3 *iface, DWORD *size, char *path) { - IDirect3DRMImpl *This = impl_from_IDirect3DRM3(iface); - - FIXME("(%p/%p)->(%p,%s): stub\n", iface, This, size_return, path_return); + FIXME("iface %p, size %p, path %p stub!\n", iface, size, path); return E_NOTIMPL; } diff --git a/dlls/d3drm/device.c b/dlls/d3drm/device.c index b54042d5082..5112e0075c3 100644 --- a/dlls/d3drm/device.c +++ b/dlls/d3drm/device.c @@ -175,24 +175,20 @@ static HRESULT WINAPI IDirect3DRMDevice2Impl_SetName(IDirect3DRMDevice2 *iface, return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRMDevice2Impl_GetName(IDirect3DRMDevice2* iface, - LPDWORD size, LPSTR name) +static HRESULT WINAPI IDirect3DRMDevice2Impl_GetName(IDirect3DRMDevice2 *iface, DWORD *size, char *name) { - IDirect3DRMDeviceImpl *This = impl_from_IDirect3DRMDevice2(iface); - - FIXME("(%p/%p)->(%p, %p): stub\n", iface, This, size, name); + FIXME("iface %p, size %p, name %p stub!\n", iface, size, name); return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRMDevice2Impl_GetClassName(IDirect3DRMDevice2* iface, - LPDWORD size, LPSTR name) +static HRESULT WINAPI IDirect3DRMDevice2Impl_GetClassName(IDirect3DRMDevice2 *iface, DWORD *size, char *name) { - IDirect3DRMDeviceImpl *This = impl_from_IDirect3DRMDevice2(iface); + IDirect3DRMDeviceImpl *device = impl_from_IDirect3DRMDevice2(iface); - TRACE("(%p/%p)->(%p, %p)\n", iface, This, size, name); + TRACE("iface %p, size %p, name %p.\n", iface, size, name); - return IDirect3DRMDevice3_GetClassName(&This->IDirect3DRMDevice3_iface, size, name); + return IDirect3DRMDevice3_GetClassName(&device->IDirect3DRMDevice3_iface, size, name); } /*** IDirect3DRMDevice methods ***/ @@ -585,22 +581,16 @@ static HRESULT WINAPI IDirect3DRMDevice3Impl_SetName(IDirect3DRMDevice3 *iface, return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRMDevice3Impl_GetName(IDirect3DRMDevice3* iface, - LPDWORD size, LPSTR name) +static HRESULT WINAPI IDirect3DRMDevice3Impl_GetName(IDirect3DRMDevice3 *iface, DWORD *size, char *name) { - IDirect3DRMDeviceImpl *This = impl_from_IDirect3DRMDevice3(iface); - - FIXME("(%p/%p)->(%p, %p): stub\n", iface, This, size, name); + FIXME("iface %p, size %p, name %p stub!\n", iface, size, name); return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRMDevice3Impl_GetClassName(IDirect3DRMDevice3* iface, - LPDWORD size, LPSTR name) +static HRESULT WINAPI IDirect3DRMDevice3Impl_GetClassName(IDirect3DRMDevice3 *iface, DWORD *size, char *name) { - IDirect3DRMDeviceImpl *This = impl_from_IDirect3DRMDevice3(iface); - - TRACE("(%p/%p)->(%p, %p)\n", iface, This, size, name); + TRACE("iface %p, size %p, name %p.\n", iface, size, name); if (!size || *size < strlen("Device") || !name) return E_INVALIDARG; @@ -1073,24 +1063,20 @@ static HRESULT WINAPI IDirect3DRMWinDeviceImpl_SetName(IDirect3DRMWinDevice *ifa return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRMWinDeviceImpl_GetName(IDirect3DRMWinDevice* iface, - LPDWORD size, LPSTR name) +static HRESULT WINAPI IDirect3DRMWinDeviceImpl_GetName(IDirect3DRMWinDevice *iface, DWORD *size, char *name) { - IDirect3DRMDeviceImpl *This = impl_from_IDirect3DRMWinDevice(iface); - - FIXME("(%p/%p)->(%p, %p): stub\n", iface, This, size, name); + FIXME("iface %p, size %p, name %p stub!\n", iface, size, name); return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRMWinDeviceImpl_GetClassName(IDirect3DRMWinDevice* iface, - LPDWORD size, LPSTR name) +static HRESULT WINAPI IDirect3DRMWinDeviceImpl_GetClassName(IDirect3DRMWinDevice *iface, DWORD *size, char *name) { - IDirect3DRMDeviceImpl *This = impl_from_IDirect3DRMWinDevice(iface); + IDirect3DRMDeviceImpl *device = impl_from_IDirect3DRMWinDevice(iface); - TRACE("(%p/%p)->(%p, %p)\n", iface, This, size, name); + TRACE("iface %p, size %p, name %p.\n", iface, size, name); - return IDirect3DRMDevice3_GetClassName(&This->IDirect3DRMDevice3_iface, size, name); + return IDirect3DRMDevice3_GetClassName(&device->IDirect3DRMDevice3_iface, size, name); } /*** IDirect3DRMWinDevice methods ***/ diff --git a/dlls/d3drm/face.c b/dlls/d3drm/face.c index 8ae278fa86e..730cafa214a 100644 --- a/dlls/d3drm/face.c +++ b/dlls/d3drm/face.c @@ -157,23 +157,20 @@ static HRESULT WINAPI IDirect3DRMFaceImpl_SetName(IDirect3DRMFace *iface, const return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRMFaceImpl_GetName(IDirect3DRMFace* iface, LPDWORD size, LPSTR name) +static HRESULT WINAPI IDirect3DRMFaceImpl_GetName(IDirect3DRMFace *iface, DWORD *size, char *name) { - IDirect3DRMFaceImpl *This = impl_from_IDirect3DRMFace(iface); - - FIXME("(%p/%p)->(%p, %p): stub\n", iface, This, size, name); + FIXME("iface %p, size %p, name %p stub!\n", iface, size, name); return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRMFaceImpl_GetClassName(IDirect3DRMFace* iface, - LPDWORD size, LPSTR name) +static HRESULT WINAPI IDirect3DRMFaceImpl_GetClassName(IDirect3DRMFace *iface, DWORD *size, char *name) { - IDirect3DRMFaceImpl *This = impl_from_IDirect3DRMFace(iface); + IDirect3DRMFaceImpl *face = impl_from_IDirect3DRMFace(iface); - TRACE("(%p/%p)->(%p, %p)\n", iface, This, size, name); + TRACE("iface %p, size %p, name %p.\n", iface, size, name); - return IDirect3DRMFace2_GetClassName(&This->IDirect3DRMFace2_iface, size, name); + return IDirect3DRMFace2_GetClassName(&face->IDirect3DRMFace2_iface, size, name); } /*** IDirect3DRMFace methods ***/ @@ -477,22 +474,16 @@ static HRESULT WINAPI IDirect3DRMFace2Impl_SetName(IDirect3DRMFace2 *iface, cons return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRMFace2Impl_GetName(IDirect3DRMFace2* iface, - LPDWORD size, LPSTR name) +static HRESULT WINAPI IDirect3DRMFace2Impl_GetName(IDirect3DRMFace2 *iface, DWORD *size, char *name) { - IDirect3DRMFaceImpl *This = impl_from_IDirect3DRMFace2(iface); - - FIXME("(%p/%p)->(%p, %p): stub\n", iface, This, size, name); + FIXME("iface %p, size %p, name %p stub!\n", iface, size, name); return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRMFace2Impl_GetClassName(IDirect3DRMFace2* iface, - LPDWORD size, LPSTR name) +static HRESULT WINAPI IDirect3DRMFace2Impl_GetClassName(IDirect3DRMFace2 *iface, DWORD *size, char *name) { - IDirect3DRMFaceImpl *This = impl_from_IDirect3DRMFace2(iface); - - TRACE("(%p/%p)->(%p, %p)\n", iface, This, size, name); + TRACE("iface %p, size %p, name %p.\n", iface, size, name); if (!size || *size < strlen("Face") || !name) return E_INVALIDARG; diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index 280b6276787..a4a615d414c 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -568,24 +568,20 @@ static HRESULT WINAPI IDirect3DRMFrame2Impl_SetName(IDirect3DRMFrame2 *iface, co return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRMFrame2Impl_GetName(IDirect3DRMFrame2* iface, - LPDWORD size, LPSTR name) +static HRESULT WINAPI IDirect3DRMFrame2Impl_GetName(IDirect3DRMFrame2 *iface, DWORD *size, char *name) { - IDirect3DRMFrameImpl *This = impl_from_IDirect3DRMFrame2(iface); - - FIXME("(%p/%p)->(%p, %p): stub\n", iface, This, size, name); + FIXME("iface %p, size %p, name %p stub!\n", iface, size, name); return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRMFrame2Impl_GetClassName(IDirect3DRMFrame2* iface, - LPDWORD size, LPSTR name) +static HRESULT WINAPI IDirect3DRMFrame2Impl_GetClassName(IDirect3DRMFrame2 *iface, DWORD *size, char *name) { - IDirect3DRMFrameImpl *This = impl_from_IDirect3DRMFrame2(iface); + IDirect3DRMFrameImpl *frame = impl_from_IDirect3DRMFrame2(iface); - TRACE("(%p/%p)->(%p, %p)\n", iface, This, size, name); + TRACE("iface %p, size %p, name %p.\n", iface, size, name); - return IDirect3DRMFrame3_GetClassName(&This->IDirect3DRMFrame3_iface, size, name); + return IDirect3DRMFrame3_GetClassName(&frame->IDirect3DRMFrame3_iface, size, name); } /*** IDirect3DRMFrame methods ***/ @@ -1424,22 +1420,16 @@ static HRESULT WINAPI IDirect3DRMFrame3Impl_SetName(IDirect3DRMFrame3 *iface, co return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRMFrame3Impl_GetName(IDirect3DRMFrame3* iface, - LPDWORD size, LPSTR name) +static HRESULT WINAPI IDirect3DRMFrame3Impl_GetName(IDirect3DRMFrame3 *iface, DWORD *size, char *name) { - IDirect3DRMFrameImpl *This = impl_from_IDirect3DRMFrame3(iface); - - FIXME("(%p/%p)->(%p, %p): stub\n", iface, This, size, name); + FIXME("iface %p, size %p, name %p stub!\n", iface, size, name); return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRMFrame3Impl_GetClassName(IDirect3DRMFrame3* iface, - LPDWORD size, LPSTR name) +static HRESULT WINAPI IDirect3DRMFrame3Impl_GetClassName(IDirect3DRMFrame3 *iface, DWORD *size, char *name) { - IDirect3DRMFrameImpl *This = impl_from_IDirect3DRMFrame3(iface); - - TRACE("(%p/%p)->(%p, %p)\n", iface, This, size, name); + TRACE("iface %p, size %p, name %p.\n", iface, size, name); if (!size || *size < strlen("Frame") || !name) return E_INVALIDARG; diff --git a/dlls/d3drm/light.c b/dlls/d3drm/light.c index 9e615cc9137..2bdc7faae9a 100644 --- a/dlls/d3drm/light.c +++ b/dlls/d3drm/light.c @@ -152,22 +152,16 @@ static HRESULT WINAPI IDirect3DRMLightImpl_SetName(IDirect3DRMLight *iface, cons return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRMLightImpl_GetName(IDirect3DRMLight* iface, - LPDWORD size, LPSTR name) +static HRESULT WINAPI IDirect3DRMLightImpl_GetName(IDirect3DRMLight *iface, DWORD *size, char *name) { - IDirect3DRMLightImpl *This = impl_from_IDirect3DRMLight(iface); - - FIXME("(%p/%p)->(%p, %p): stub\n", iface, This, size, name); + FIXME("iface %p, size %p, name %p stub!\n", iface, size, name); return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRMLightImpl_GetClassName(IDirect3DRMLight* iface, - LPDWORD size, LPSTR name) +static HRESULT WINAPI IDirect3DRMLightImpl_GetClassName(IDirect3DRMLight *iface, DWORD *size, char *name) { - IDirect3DRMLightImpl *This = impl_from_IDirect3DRMLight(iface); - - TRACE("(%p/%p)->(%p, %p)\n", iface, This, size, name); + TRACE("iface %p, size %p, name %p.\n", iface, size, name); if (!size || *size < strlen("Light") || !name) return E_INVALIDARG; diff --git a/dlls/d3drm/material.c b/dlls/d3drm/material.c index 68d859f4143..47edc086b39 100644 --- a/dlls/d3drm/material.c +++ b/dlls/d3drm/material.c @@ -148,18 +148,16 @@ static HRESULT WINAPI IDirect3DRMMaterial2Impl_SetName(IDirect3DRMMaterial2 *ifa return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRMMaterial2Impl_GetName(IDirect3DRMMaterial2* iface, - LPDWORD size, LPSTR name) +static HRESULT WINAPI IDirect3DRMMaterial2Impl_GetName(IDirect3DRMMaterial2 *iface, DWORD *size, char *name) { - FIXME("(%p)->(%p, %p): stub\n", iface, size, name); + FIXME("iface %p, size %p, name %p stub!\n", iface, size, name); return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRMMaterial2Impl_GetClassName(IDirect3DRMMaterial2* iface, - LPDWORD size, LPSTR name) +static HRESULT WINAPI IDirect3DRMMaterial2Impl_GetClassName(IDirect3DRMMaterial2 *iface, DWORD *size, char *name) { - TRACE("(%p)->(%p, %p)\n", iface, size, name); + TRACE("iface %p, size %p, name %p.\n", iface, size, name); if (!size || *size < strlen("Material") || !name) return E_INVALIDARG; diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index 9060e869872..7813ce5c054 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -473,24 +473,23 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder2Impl_SetName(IDirect3DRMMeshBuilder return IDirect3DRMMeshBuilder3_SetName(&mesh_builder->IDirect3DRMMeshBuilder3_iface, name); } -static HRESULT WINAPI IDirect3DRMMeshBuilder2Impl_GetName(IDirect3DRMMeshBuilder2* iface, - LPDWORD size, LPSTR name) +static HRESULT WINAPI IDirect3DRMMeshBuilder2Impl_GetName(IDirect3DRMMeshBuilder2 *iface, DWORD *size, char *name) { - IDirect3DRMMeshBuilderImpl *This = impl_from_IDirect3DRMMeshBuilder2(iface); + IDirect3DRMMeshBuilderImpl *mesh_builder = impl_from_IDirect3DRMMeshBuilder2(iface); - TRACE("(%p)->(%p,%p)\n", This, size, name); + TRACE("iface %p, size %p, name %p.\n", iface, size, name); - return IDirect3DRMMeshBuilder3_GetName(&This->IDirect3DRMMeshBuilder3_iface, size, name); + return IDirect3DRMMeshBuilder3_GetName(&mesh_builder->IDirect3DRMMeshBuilder3_iface, size, name); } -static HRESULT WINAPI IDirect3DRMMeshBuilder2Impl_GetClassName(IDirect3DRMMeshBuilder2* iface, - LPDWORD size, LPSTR name) +static HRESULT WINAPI IDirect3DRMMeshBuilder2Impl_GetClassName(IDirect3DRMMeshBuilder2 *iface, + DWORD *size, char *name) { - IDirect3DRMMeshBuilderImpl *This = impl_from_IDirect3DRMMeshBuilder2(iface); + IDirect3DRMMeshBuilderImpl *mesh_builder = impl_from_IDirect3DRMMeshBuilder2(iface); - TRACE("(%p)->(%p, %p)\n", This, size, name); + TRACE("iface %p, size %p, name %p.\n", iface, size, name); - return IDirect3DRMMeshBuilder3_GetClassName(&This->IDirect3DRMMeshBuilder3_iface, size, name); + return IDirect3DRMMeshBuilder3_GetClassName(&mesh_builder->IDirect3DRMMeshBuilder3_iface, size, name); } /*** IDirect3DRMMeshBuilder2 methods ***/ @@ -1067,37 +1066,35 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_SetName(IDirect3DRMMeshBuilder return D3DRM_OK; } -static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_GetName(IDirect3DRMMeshBuilder3* iface, - LPDWORD size, LPSTR name) +static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_GetName(IDirect3DRMMeshBuilder3 *iface, + DWORD *size, char *name) { - IDirect3DRMMeshBuilderImpl *This = impl_from_IDirect3DRMMeshBuilder3(iface); + IDirect3DRMMeshBuilderImpl *mesh_builder = impl_from_IDirect3DRMMeshBuilder3(iface); - TRACE("(%p)->(%p,%p)\n", This, size, name); + TRACE("iface %p, size %p, name %p.\n", iface, size, name); if (!size) return E_POINTER; - if (!This->name) + if (!mesh_builder->name) { *size = 0; return D3DRM_OK; } - if (*size < (strlen(This->name) + 1)) + if (*size < (strlen(mesh_builder->name) + 1)) return E_INVALIDARG; - strcpy(name, This->name); - *size = strlen(This->name) + 1; + strcpy(name, mesh_builder->name); + *size = strlen(mesh_builder->name) + 1; return D3DRM_OK; } -static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_GetClassName(IDirect3DRMMeshBuilder3* iface, - LPDWORD size, LPSTR name) +static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_GetClassName(IDirect3DRMMeshBuilder3 *iface, + DWORD *size, char *name) { - IDirect3DRMMeshBuilderImpl *This = impl_from_IDirect3DRMMeshBuilder3(iface); - - TRACE("(%p)->(%p, %p)\n", This, size, name); + TRACE("iface %p, size %p, name %p.\n", iface, size, name); if (!size || *size < strlen("Builder") || !name) return E_INVALIDARG; @@ -2594,22 +2591,16 @@ static HRESULT WINAPI IDirect3DRMMeshImpl_SetName(IDirect3DRMMesh *iface, const return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRMMeshImpl_GetName(IDirect3DRMMesh* iface, - LPDWORD lpdwSize, LPSTR lpName) +static HRESULT WINAPI IDirect3DRMMeshImpl_GetName(IDirect3DRMMesh *iface, DWORD *size, char *name) { - IDirect3DRMMeshImpl *This = impl_from_IDirect3DRMMesh(iface); - - FIXME("(%p)->(%p,%p): stub\n", This, lpdwSize, lpName); + FIXME("iface %p, size %p, name %p stub!\n", iface, size, name); return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRMMeshImpl_GetClassName(IDirect3DRMMesh* iface, - LPDWORD size, LPSTR name) +static HRESULT WINAPI IDirect3DRMMeshImpl_GetClassName(IDirect3DRMMesh *iface, DWORD *size, char *name) { - IDirect3DRMMeshImpl *This = impl_from_IDirect3DRMMesh(iface); - - TRACE("(%p)->(%p, %p)\n", This, size, name); + TRACE("iface %p, size %p, name %p.\n", iface, size, name); if (!size || *size < strlen("Mesh") || !name) return E_INVALIDARG; diff --git a/dlls/d3drm/texture.c b/dlls/d3drm/texture.c index b63b7be2147..ec0ff36abf5 100644 --- a/dlls/d3drm/texture.c +++ b/dlls/d3drm/texture.c @@ -153,22 +153,20 @@ static HRESULT WINAPI IDirect3DRMTexture2Impl_SetName(IDirect3DRMTexture2 *iface return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRMTexture2Impl_GetName(IDirect3DRMTexture2* iface, - LPDWORD size, LPSTR name) +static HRESULT WINAPI IDirect3DRMTexture2Impl_GetName(IDirect3DRMTexture2 *iface, DWORD *size, char *name) { - FIXME("(%p)->(%p, %p): stub\n", iface, size, name); + FIXME("iface %p, size %p, name %p stub!\n", iface, size, name); return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRMTexture2Impl_GetClassName(IDirect3DRMTexture2* iface, - LPDWORD size, LPSTR name) +static HRESULT WINAPI IDirect3DRMTexture2Impl_GetClassName(IDirect3DRMTexture2 *iface, DWORD *size, char *name) { - IDirect3DRMTextureImpl *This = impl_from_IDirect3DRMTexture2(iface); + IDirect3DRMTextureImpl *texture = impl_from_IDirect3DRMTexture2(iface); - TRACE("(%p/%p)->(%p, %p)\n", iface, This, size, name); + TRACE("iface %p, size %p, name %p.\n", iface, size, name); - return IDirect3DRMTexture3_GetClassName(&This->IDirect3DRMTexture3_iface, size, name); + return IDirect3DRMTexture3_GetClassName(&texture->IDirect3DRMTexture3_iface, size, name); } /*** IDirect3DRMTexture3 methods ***/ @@ -522,20 +520,16 @@ static HRESULT WINAPI IDirect3DRMTexture3Impl_SetName(IDirect3DRMTexture3 *iface return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRMTexture3Impl_GetName(IDirect3DRMTexture3* iface, - LPDWORD size, LPSTR name) +static HRESULT WINAPI IDirect3DRMTexture3Impl_GetName(IDirect3DRMTexture3 *iface, DWORD *size, char *name) { - FIXME("(%p)->(%p, %p): stub\n", iface, size, name); + FIXME("iface %p, size %p, name %p stub!\n", iface, size, name); return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRMTexture3Impl_GetClassName(IDirect3DRMTexture3* iface, - LPDWORD size, LPSTR name) +static HRESULT WINAPI IDirect3DRMTexture3Impl_GetClassName(IDirect3DRMTexture3 *iface, DWORD *size, char *name) { - IDirect3DRMTextureImpl *This = impl_from_IDirect3DRMTexture3(iface); - - TRACE("(%p/%p)->(%p, %p)\n", iface, This, size, name); + TRACE("iface %p, size %p, name %p.\n", iface, size, name); if (!size || *size < strlen("Texture") || !name) return E_INVALIDARG; diff --git a/dlls/d3drm/viewport.c b/dlls/d3drm/viewport.c index 86d87ecbe72..ff0aaceab9f 100644 --- a/dlls/d3drm/viewport.c +++ b/dlls/d3drm/viewport.c @@ -161,24 +161,20 @@ static HRESULT WINAPI IDirect3DRMViewportImpl_SetName(IDirect3DRMViewport *iface return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRMViewportImpl_GetName(IDirect3DRMViewport* iface, - LPDWORD size, LPSTR name) +static HRESULT WINAPI IDirect3DRMViewportImpl_GetName(IDirect3DRMViewport *iface, DWORD *size, char *name) { - IDirect3DRMViewportImpl *This = impl_from_IDirect3DRMViewport(iface); - - FIXME("(%p/%p)->(%p, %p): stub\n", iface, This, size, name); + FIXME("iface %p, size %p, name %p stub!\n", iface, size, name); return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRMViewportImpl_GetClassName(IDirect3DRMViewport* iface, - LPDWORD size, LPSTR name) +static HRESULT WINAPI IDirect3DRMViewportImpl_GetClassName(IDirect3DRMViewport *iface, DWORD *size, char *name) { - IDirect3DRMViewportImpl *This = impl_from_IDirect3DRMViewport(iface); + IDirect3DRMViewportImpl *viewport = impl_from_IDirect3DRMViewport(iface); - TRACE("(%p/%p)->(%p, %p)\n", iface, This, size, name); + TRACE("iface %p, size %p, name %p.\n", iface, size, name); - return IDirect3DRMViewport2_GetClassName(&This->IDirect3DRMViewport2_iface, size, name); + return IDirect3DRMViewport2_GetClassName(&viewport->IDirect3DRMViewport2_iface, size, name); } /*** IDirect3DRMViewport methods ***/ @@ -559,22 +555,16 @@ static HRESULT WINAPI IDirect3DRMViewport2Impl_SetName(IDirect3DRMViewport2 *ifa return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRMViewport2Impl_GetName(IDirect3DRMViewport2* iface, - LPDWORD size, LPSTR name) +static HRESULT WINAPI IDirect3DRMViewport2Impl_GetName(IDirect3DRMViewport2 *iface, DWORD *size, char *name) { - IDirect3DRMViewportImpl *This = impl_from_IDirect3DRMViewport2(iface); - - FIXME("(%p/%p)->(%p, %p): stub\n", iface, This, size, name); + FIXME("iface %p, size %p, name %p stub!\n", iface, size, name); return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRMViewport2Impl_GetClassName(IDirect3DRMViewport2* iface, - LPDWORD size, LPSTR name) +static HRESULT WINAPI IDirect3DRMViewport2Impl_GetClassName(IDirect3DRMViewport2 *iface, DWORD *size, char *name) { - IDirect3DRMViewportImpl *This = impl_from_IDirect3DRMViewport2(iface); - - TRACE("(%p/%p)->(%p, %p)\n", iface, This, size, name); + TRACE("iface %p, size %p, name %p.\n", iface, size, name); if (!size || *size < strlen("Viewport") || !name) return E_INVALIDARG; diff --git a/include/d3drm.h b/include/d3drm.h index 504d46ca309..b14469c871c 100644 --- a/include/d3drm.h +++ b/include/d3drm.h @@ -91,7 +91,7 @@ DECLARE_INTERFACE_(IDirect3DRM,IUnknown) STDMETHOD(LoadTextureFromResource)(THIS_ HRSRC resource, IDirect3DRMTexture **texture) PURE; STDMETHOD(SetSearchPath)(THIS_ const char *path) PURE; STDMETHOD(AddSearchPath)(THIS_ const char *path) PURE; - STDMETHOD(GetSearchPath)(THIS_ DWORD *size_return, LPSTR path_return) PURE; + STDMETHOD(GetSearchPath)(THIS_ DWORD *size, char *path) PURE; STDMETHOD(SetDefaultTextureColors)(THIS_ DWORD) PURE; STDMETHOD(SetDefaultTextureShades)(THIS_ DWORD) PURE; STDMETHOD(GetDevices)(THIS_ IDirect3DRMDeviceArray **array) PURE; @@ -231,7 +231,7 @@ DECLARE_INTERFACE_(IDirect3DRM2,IUnknown) const char *resource_type, IDirect3DRMTexture2 **texture) PURE; STDMETHOD(SetSearchPath)(THIS_ const char *path) PURE; STDMETHOD(AddSearchPath)(THIS_ const char *path) PURE; - STDMETHOD(GetSearchPath)(THIS_ DWORD *size_return, LPSTR path_return) PURE; + STDMETHOD(GetSearchPath)(THIS_ DWORD *size, char *path) PURE; STDMETHOD(SetDefaultTextureColors)(THIS_ DWORD) PURE; STDMETHOD(SetDefaultTextureShades)(THIS_ DWORD) PURE; STDMETHOD(GetDevices)(THIS_ IDirect3DRMDeviceArray **array) PURE; @@ -374,7 +374,7 @@ DECLARE_INTERFACE_(IDirect3DRM3,IUnknown) const char *resource_type, IDirect3DRMTexture3 **texture) PURE; STDMETHOD(SetSearchPath)(THIS_ const char *path) PURE; STDMETHOD(AddSearchPath)(THIS_ const char *path) PURE; - STDMETHOD(GetSearchPath)(THIS_ DWORD *size_return, LPSTR path_return) PURE; + STDMETHOD(GetSearchPath)(THIS_ DWORD *size, char *path) PURE; STDMETHOD(SetDefaultTextureColors)(THIS_ DWORD) PURE; STDMETHOD(SetDefaultTextureShades)(THIS_ DWORD) PURE; STDMETHOD(GetDevices)(THIS_ IDirect3DRMDeviceArray **array) PURE; diff --git a/include/d3drmobj.h b/include/d3drmobj.h index 04dd38af51a..8d1473eb10b 100644 --- a/include/d3drmobj.h +++ b/include/d3drmobj.h @@ -208,8 +208,8 @@ DECLARE_INTERFACE_(IDirect3DRMObject,IUnknown) STDMETHOD(SetAppData)(THIS_ DWORD data) PURE; STDMETHOD_(DWORD, GetAppData)(THIS) PURE; STDMETHOD(SetName)(THIS_ const char *name) PURE; - STDMETHOD(GetName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; - STDMETHOD(GetClassName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; + STDMETHOD(GetName)(THIS_ DWORD *size, char *name) PURE; + STDMETHOD(GetClassName)(THIS_ DWORD *size, char *name) PURE; }; #undef INTERFACE @@ -262,7 +262,7 @@ DECLARE_INTERFACE_(IDirect3DRMObject2,IUnknown) STDMETHOD(DeleteDestroyCallback)(THIS_ D3DRMOBJECTCALLBACK pFunc, LPVOID pArg) PURE; STDMETHOD(GetClientData)(THIS_ DWORD id, LPVOID* ppData) PURE; STDMETHOD(GetDirect3DRM)(THIS_ struct IDirect3DRM **d3drm) PURE; - STDMETHOD(GetName)(THIS_ LPDWORD pSize, LPSTR pName) PURE; + STDMETHOD(GetName)(THIS_ DWORD *size, char *name) PURE; STDMETHOD(SetClientData)(THIS_ DWORD id, LPVOID pData, DWORD flags) PURE; STDMETHOD(SetName)(THIS_ const char *name) PURE; STDMETHOD(GetAge)(THIS_ DWORD flags, LPDWORD pAge) PURE; @@ -318,8 +318,8 @@ DECLARE_INTERFACE_(IDirect3DRMVisual,IDirect3DRMObject) STDMETHOD(SetAppData)(THIS_ DWORD data) PURE; STDMETHOD_(DWORD, GetAppData)(THIS) PURE; STDMETHOD(SetName)(THIS_ const char *name) PURE; - STDMETHOD(GetName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; - STDMETHOD(GetClassName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; + STDMETHOD(GetName)(THIS_ DWORD *size, char *name) PURE; + STDMETHOD(GetClassName)(THIS_ DWORD *size, char *name) PURE; }; #undef INTERFACE @@ -373,8 +373,8 @@ DECLARE_INTERFACE_(IDirect3DRMDevice,IUnknown) STDMETHOD(SetAppData)(THIS_ DWORD data) PURE; STDMETHOD_(DWORD, GetAppData)(THIS) PURE; STDMETHOD(SetName)(THIS_ const char *name) PURE; - STDMETHOD(GetName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; - STDMETHOD(GetClassName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; + STDMETHOD(GetName)(THIS_ DWORD *size, char *name) PURE; + STDMETHOD(GetClassName)(THIS_ DWORD *size, char *name) PURE; /*** IDirect3DRMDevice methods ***/ STDMETHOD(Init)(THIS_ ULONG width, ULONG height) PURE; STDMETHOD(InitFromD3D)(THIS_ IDirect3D *d3d, IDirect3DDevice *d3d_device) PURE; @@ -500,8 +500,8 @@ DECLARE_INTERFACE_(IDirect3DRMDevice2,IDirect3DRMDevice) STDMETHOD(SetAppData)(THIS_ DWORD data) PURE; STDMETHOD_(DWORD, GetAppData)(THIS) PURE; STDMETHOD(SetName)(THIS_ const char *name) PURE; - STDMETHOD(GetName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; - STDMETHOD(GetClassName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; + STDMETHOD(GetName)(THIS_ DWORD *size, char *name) PURE; + STDMETHOD(GetClassName)(THIS_ DWORD *size, char *name) PURE; /*** IDirect3DRMDevice methods ***/ STDMETHOD(Init)(THIS_ ULONG width, ULONG height) PURE; STDMETHOD(InitFromD3D)(THIS_ IDirect3D *d3d, IDirect3DDevice *d3d_device) PURE; @@ -645,8 +645,8 @@ DECLARE_INTERFACE_(IDirect3DRMDevice3,IDirect3DRMObject) STDMETHOD(SetAppData)(THIS_ DWORD data) PURE; STDMETHOD_(DWORD, GetAppData)(THIS) PURE; STDMETHOD(SetName)(THIS_ const char *name) PURE; - STDMETHOD(GetName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; - STDMETHOD(GetClassName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; + STDMETHOD(GetName)(THIS_ DWORD *size, char *name) PURE; + STDMETHOD(GetClassName)(THIS_ DWORD *size, char *name) PURE; /*** IDirect3DRMDevice methods ***/ STDMETHOD(Init)(THIS_ ULONG width, ULONG height) PURE; STDMETHOD(InitFromD3D)(THIS_ IDirect3D *d3d, IDirect3DDevice *d3d_device) PURE; @@ -805,8 +805,8 @@ DECLARE_INTERFACE_(IDirect3DRMViewport,IDirect3DRMObject) STDMETHOD(SetAppData)(THIS_ DWORD data) PURE; STDMETHOD_(DWORD, GetAppData)(THIS) PURE; STDMETHOD(SetName)(THIS_ const char *name) PURE; - STDMETHOD(GetName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; - STDMETHOD(GetClassName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; + STDMETHOD(GetName)(THIS_ DWORD *size, char *name) PURE; + STDMETHOD(GetClassName)(THIS_ DWORD *size, char *name) PURE; /*** IDirect3DRMViewport methods ***/ STDMETHOD(Init) (THIS_ IDirect3DRMDevice *device, struct IDirect3DRMFrame *camera, DWORD x, DWORD y, DWORD width, DWORD height) PURE; @@ -945,8 +945,8 @@ DECLARE_INTERFACE_(IDirect3DRMViewport2,IDirect3DRMObject) STDMETHOD(SetAppData)(THIS_ DWORD data) PURE; STDMETHOD_(DWORD, GetAppData)(THIS) PURE; STDMETHOD(SetName)(THIS_ const char *name) PURE; - STDMETHOD(GetName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; - STDMETHOD(GetClassName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; + STDMETHOD(GetName)(THIS_ DWORD *size, char *name) PURE; + STDMETHOD(GetClassName)(THIS_ DWORD *size, char *name) PURE; /*** IDirect3DRMViewport2 methods ***/ STDMETHOD(Init) (THIS_ IDirect3DRMDevice3 *device, struct IDirect3DRMFrame3 *camera, DWORD x, DWORD y, DWORD width, DWORD height) PURE; @@ -1093,8 +1093,8 @@ DECLARE_INTERFACE_(IDirect3DRMFrame,IDirect3DRMVisual) STDMETHOD(SetAppData)(THIS_ DWORD data) PURE; STDMETHOD_(DWORD, GetAppData)(THIS) PURE; STDMETHOD(SetName)(THIS_ const char *name) PURE; - STDMETHOD(GetName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; - STDMETHOD(GetClassName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; + STDMETHOD(GetName)(THIS_ DWORD *size, char *name) PURE; + STDMETHOD(GetClassName)(THIS_ DWORD *size, char *name) PURE; /*** IDirect3DRMFrame methods ***/ STDMETHOD(AddChild)(THIS_ IDirect3DRMFrame *child) PURE; STDMETHOD(AddLight)(THIS_ struct IDirect3DRMLight *light) PURE; @@ -1326,8 +1326,8 @@ DECLARE_INTERFACE_(IDirect3DRMFrame2,IDirect3DRMFrame) STDMETHOD(SetAppData)(THIS_ DWORD data) PURE; STDMETHOD_(DWORD, GetAppData)(THIS) PURE; STDMETHOD(SetName)(THIS_ const char *name) PURE; - STDMETHOD(GetName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; - STDMETHOD(GetClassName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; + STDMETHOD(GetName)(THIS_ DWORD *size, char *name) PURE; + STDMETHOD(GetClassName)(THIS_ DWORD *size, char *name) PURE; /*** IDirect3DRMFrame methods ***/ STDMETHOD(AddChild)(THIS_ IDirect3DRMFrame *child) PURE; STDMETHOD(AddLight)(THIS_ struct IDirect3DRMLight *light) PURE; @@ -1608,8 +1608,8 @@ DECLARE_INTERFACE_(IDirect3DRMFrame3,IDirect3DRMVisual) STDMETHOD(SetAppData)(THIS_ DWORD data) PURE; STDMETHOD_(DWORD, GetAppData)(THIS) PURE; STDMETHOD(SetName)(THIS_ const char *name) PURE; - STDMETHOD(GetName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; - STDMETHOD(GetClassName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; + STDMETHOD(GetName)(THIS_ DWORD *size, char *name) PURE; + STDMETHOD(GetClassName)(THIS_ DWORD *size, char *name) PURE; /*** IDirect3DRMFrame3 methods ***/ STDMETHOD(AddChild)(THIS_ IDirect3DRMFrame3 *child) PURE; STDMETHOD(AddLight)(THIS_ struct IDirect3DRMLight *light) PURE; @@ -1906,8 +1906,8 @@ DECLARE_INTERFACE_(IDirect3DRMMesh,IDirect3DRMVisual) STDMETHOD(SetAppData)(THIS_ DWORD data) PURE; STDMETHOD_(DWORD, GetAppData)(THIS) PURE; STDMETHOD(SetName)(THIS_ const char *name) PURE; - STDMETHOD(GetName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; - STDMETHOD(GetClassName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; + STDMETHOD(GetName)(THIS_ DWORD *size, char *name) PURE; + STDMETHOD(GetClassName)(THIS_ DWORD *size, char *name) PURE; /*** IDirect3DRMMesh methods ***/ STDMETHOD(Scale)(THIS_ D3DVALUE sx, D3DVALUE sy, D3DVALUE sz) PURE; STDMETHOD(Translate)(THIS_ D3DVALUE tx, D3DVALUE ty, D3DVALUE tz) PURE; @@ -2021,8 +2021,8 @@ DECLARE_INTERFACE_(IDirect3DRMProgressiveMesh,IDirect3DRMVisual) STDMETHOD(SetAppData)(THIS_ DWORD data) PURE; STDMETHOD_(DWORD, GetAppData)(THIS) PURE; STDMETHOD(SetName)(THIS_ const char *name) PURE; - STDMETHOD(GetName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; - STDMETHOD(GetClassName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; + STDMETHOD(GetName)(THIS_ DWORD *size, char *name) PURE; + STDMETHOD(GetClassName)(THIS_ DWORD *size, char *name) PURE; /*** IDirect3DRMProgressiveMesh methods ***/ STDMETHOD(Load) (THIS_ LPVOID pObjLocation, LPVOID pObjId, D3DRMLOADOPTIONS dloLoadflags, D3DRMLOADTEXTURECALLBACK pCallback, LPVOID lpArg) PURE; @@ -2131,8 +2131,8 @@ DECLARE_INTERFACE_(IDirect3DRMShadow,IDirect3DRMVisual) STDMETHOD(SetAppData)(THIS_ DWORD data) PURE; STDMETHOD_(DWORD, GetAppData)(THIS) PURE; STDMETHOD(SetName)(THIS_ const char *name) PURE; - STDMETHOD(GetName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; - STDMETHOD(GetClassName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; + STDMETHOD(GetName)(THIS_ DWORD *size, char *name) PURE; + STDMETHOD(GetClassName)(THIS_ DWORD *size, char *name) PURE; /*** IDirect3DRMShadow methods ***/ STDMETHOD(Init)(THIS_ IDirect3DRMVisual *visual, struct IDirect3DRMLight *light, D3DVALUE px, D3DVALUE py, D3DVALUE pz, D3DVALUE nx, D3DVALUE ny, D3DVALUE nz) PURE; @@ -2190,8 +2190,8 @@ DECLARE_INTERFACE_(IDirect3DRMShadow2,IDirect3DRMVisual) STDMETHOD(SetAppData)(THIS_ DWORD data) PURE; STDMETHOD_(DWORD, GetAppData)(THIS) PURE; STDMETHOD(SetName)(THIS_ const char *name) PURE; - STDMETHOD(GetName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; - STDMETHOD(GetClassName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; + STDMETHOD(GetName)(THIS_ DWORD *size, char *name) PURE; + STDMETHOD(GetClassName)(THIS_ DWORD *size, char *name) PURE; /*** IDirect3DRMShadow methods ***/ STDMETHOD(Init)(THIS_ IUnknown *object, struct IDirect3DRMLight *light, D3DVALUE px, D3DVALUE py, D3DVALUE pz, D3DVALUE nx, D3DVALUE ny, D3DVALUE nz) PURE; @@ -2278,8 +2278,8 @@ DECLARE_INTERFACE_(IDirect3DRMFace,IDirect3DRMObject) STDMETHOD(SetAppData)(THIS_ DWORD data) PURE; STDMETHOD_(DWORD, GetAppData)(THIS) PURE; STDMETHOD(SetName)(THIS_ const char *name) PURE; - STDMETHOD(GetName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; - STDMETHOD(GetClassName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; + STDMETHOD(GetName)(THIS_ DWORD *size, char *name) PURE; + STDMETHOD(GetClassName)(THIS_ DWORD *size, char *name) PURE; /*** IDirect3DRMFace methods ***/ STDMETHOD(AddVertex)(THIS_ D3DVALUE x, D3DVALUE y, D3DVALUE z) PURE; STDMETHOD(AddVertexAndNormalIndexed)(THIS_ DWORD vertex, DWORD normal) PURE; @@ -2388,8 +2388,8 @@ DECLARE_INTERFACE_(IDirect3DRMFace2,IDirect3DRMObject) STDMETHOD(SetAppData)(THIS_ DWORD data) PURE; STDMETHOD_(DWORD, GetAppData)(THIS) PURE; STDMETHOD(SetName)(THIS_ const char *name) PURE; - STDMETHOD(GetName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; - STDMETHOD(GetClassName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; + STDMETHOD(GetName)(THIS_ DWORD *size, char *name) PURE; + STDMETHOD(GetClassName)(THIS_ DWORD *size, char *name) PURE; /*** IDirect3DRMFace methods ***/ STDMETHOD(AddVertex)(THIS_ D3DVALUE x, D3DVALUE y, D3DVALUE z) PURE; STDMETHOD(AddVertexAndNormalIndexed)(THIS_ DWORD vertex, DWORD normal) PURE; @@ -2498,8 +2498,8 @@ DECLARE_INTERFACE_(IDirect3DRMMeshBuilder,IDirect3DRMVisual) STDMETHOD(SetAppData)(THIS_ DWORD data) PURE; STDMETHOD_(DWORD, GetAppData)(THIS) PURE; STDMETHOD(SetName)(THIS_ const char *name) PURE; - STDMETHOD(GetName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; - STDMETHOD(GetClassName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; + STDMETHOD(GetName)(THIS_ DWORD *size, char *name) PURE; + STDMETHOD(GetClassName)(THIS_ DWORD *size, char *name) PURE; /*** IDirect3DRMMeshBuilder methods ***/ STDMETHOD(Load)(THIS_ LPVOID filename, LPVOID name, D3DRMLOADOPTIONS loadflags, D3DRMLOADTEXTURECALLBACK, LPVOID pArg) PURE; STDMETHOD(Save)(THIS_ const char *filename, D3DRMXOFFORMAT, D3DRMSAVEOPTIONS save) PURE; @@ -2669,8 +2669,8 @@ DECLARE_INTERFACE_(IDirect3DRMMeshBuilder2,IDirect3DRMMeshBuilder) STDMETHOD(SetAppData)(THIS_ DWORD data) PURE; STDMETHOD_(DWORD, GetAppData)(THIS) PURE; STDMETHOD(SetName)(THIS_ const char *name) PURE; - STDMETHOD(GetName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; - STDMETHOD(GetClassName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; + STDMETHOD(GetName)(THIS_ DWORD *size, char *name) PURE; + STDMETHOD(GetClassName)(THIS_ DWORD *size, char *name) PURE; /*** IDirect3DRMMeshBuilder methods ***/ STDMETHOD(Load)(THIS_ LPVOID filename, LPVOID name, D3DRMLOADOPTIONS loadflags, D3DRMLOADTEXTURECALLBACK, LPVOID pArg) PURE; STDMETHOD(Save)(THIS_ const char *filename, D3DRMXOFFORMAT, D3DRMSAVEOPTIONS save) PURE; @@ -2849,8 +2849,8 @@ DECLARE_INTERFACE_(IDirect3DRMMeshBuilder3,IDirect3DRMVisual) STDMETHOD(SetAppData)(THIS_ DWORD data) PURE; STDMETHOD_(DWORD, GetAppData)(THIS) PURE; STDMETHOD(SetName)(THIS_ const char *name) PURE; - STDMETHOD(GetName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; - STDMETHOD(GetClassName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; + STDMETHOD(GetName)(THIS_ DWORD *size, char *name) PURE; + STDMETHOD(GetClassName)(THIS_ DWORD *size, char *name) PURE; /*** IDirect3DRMMeshBuilder3 methods ***/ STDMETHOD(Load)(THIS_ LPVOID filename, LPVOID name, D3DRMLOADOPTIONS loadflags, D3DRMLOADTEXTURE3CALLBACK, LPVOID pArg) PURE; STDMETHOD(Save)(THIS_ const char *filename, D3DRMXOFFORMAT, D3DRMSAVEOPTIONS save) PURE; @@ -3085,8 +3085,8 @@ DECLARE_INTERFACE_(IDirect3DRMLight,IDirect3DRMObject) STDMETHOD(SetAppData)(THIS_ DWORD data) PURE; STDMETHOD_(DWORD, GetAppData)(THIS) PURE; STDMETHOD(SetName)(THIS_ const char *name) PURE; - STDMETHOD(GetName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; - STDMETHOD(GetClassName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; + STDMETHOD(GetName)(THIS_ DWORD *size, char *name) PURE; + STDMETHOD(GetClassName)(THIS_ DWORD *size, char *name) PURE; /*** IDirect3DRMLight methods ***/ STDMETHOD(SetType)(THIS_ D3DRMLIGHTTYPE) PURE; STDMETHOD(SetColor)(THIS_ D3DCOLOR) PURE; @@ -3197,8 +3197,8 @@ DECLARE_INTERFACE_(IDirect3DRMTexture, IDirect3DRMVisual) STDMETHOD(SetAppData)(THIS_ DWORD data) PURE; STDMETHOD_(DWORD, GetAppData)(THIS) PURE; STDMETHOD(SetName)(THIS_ const char *name) PURE; - STDMETHOD(GetName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; - STDMETHOD(GetClassName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; + STDMETHOD(GetName)(THIS_ DWORD *size, char *name) PURE; + STDMETHOD(GetClassName)(THIS_ DWORD *size, char *name) PURE; /*** IDirect3DRMTexture methods ***/ STDMETHOD(InitFromFile)(THIS_ const char *filename) PURE; STDMETHOD(InitFromSurface)(THIS_ IDirectDrawSurface *surface) PURE; @@ -3309,8 +3309,8 @@ DECLARE_INTERFACE_(IDirect3DRMTexture2, IDirect3DRMTexture) STDMETHOD(SetAppData)(THIS_ DWORD data) PURE; STDMETHOD_(DWORD, GetAppData)(THIS) PURE; STDMETHOD(SetName)(THIS_ const char *name) PURE; - STDMETHOD(GetName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; - STDMETHOD(GetClassName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; + STDMETHOD(GetName)(THIS_ DWORD *size, char *name) PURE; + STDMETHOD(GetClassName)(THIS_ DWORD *size, char *name) PURE; /*** IDirect3DRMTexture methods ***/ STDMETHOD(InitFromFile)(THIS_ const char *filename) PURE; STDMETHOD(InitFromSurface)(THIS_ IDirectDrawSurface *surface) PURE; @@ -3433,8 +3433,8 @@ DECLARE_INTERFACE_(IDirect3DRMTexture3, IDirect3DRMVisual) STDMETHOD(SetAppData)(THIS_ DWORD data) PURE; STDMETHOD_(DWORD, GetAppData)(THIS) PURE; STDMETHOD(SetName)(THIS_ const char *name) PURE; - STDMETHOD(GetName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; - STDMETHOD(GetClassName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; + STDMETHOD(GetName)(THIS_ DWORD *size, char *name) PURE; + STDMETHOD(GetClassName)(THIS_ DWORD *size, char *name) PURE; /*** IDirect3DRMTexture3 methods ***/ STDMETHOD(InitFromFile)(THIS_ const char *filename) PURE; STDMETHOD(InitFromSurface)(THIS_ IDirectDrawSurface *surface) PURE; @@ -3569,8 +3569,8 @@ DECLARE_INTERFACE_(IDirect3DRMWrap, IDirect3DRMObject) STDMETHOD(SetAppData)(THIS_ DWORD data) PURE; STDMETHOD_(DWORD, GetAppData)(THIS) PURE; STDMETHOD(SetName)(THIS_ const char *name) PURE; - STDMETHOD(GetName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; - STDMETHOD(GetClassName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; + STDMETHOD(GetName)(THIS_ DWORD *size, char *name) PURE; + STDMETHOD(GetClassName)(THIS_ DWORD *size, char *name) PURE; /*** IDirect3DRMWrap methods ***/ STDMETHOD(Init)(THIS_ D3DRMWRAPTYPE type, IDirect3DRMFrame *reference, D3DVALUE ox, D3DVALUE oy, D3DVALUE oz, D3DVALUE dx, D3DVALUE dy, D3DVALUE dz, D3DVALUE ux, D3DVALUE uy, D3DVALUE uz, @@ -3635,8 +3635,8 @@ DECLARE_INTERFACE_(IDirect3DRMMaterial, IDirect3DRMObject) STDMETHOD(SetAppData)(THIS_ DWORD data) PURE; STDMETHOD_(DWORD, GetAppData)(THIS) PURE; STDMETHOD(SetName)(THIS_ const char *name) PURE; - STDMETHOD(GetName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; - STDMETHOD(GetClassName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; + STDMETHOD(GetName)(THIS_ DWORD *size, char *name) PURE; + STDMETHOD(GetClassName)(THIS_ DWORD *size, char *name) PURE; /*** IDirect3DRMMaterial methods ***/ STDMETHOD(SetPower)(THIS_ D3DVALUE power) PURE; STDMETHOD(SetSpecular)(THIS_ D3DVALUE r, D3DVALUE g, D3DVALUE b) PURE; @@ -3708,8 +3708,8 @@ DECLARE_INTERFACE_(IDirect3DRMMaterial2, IDirect3DRMObject) STDMETHOD(SetAppData)(THIS_ DWORD data) PURE; STDMETHOD_(DWORD, GetAppData)(THIS) PURE; STDMETHOD(SetName)(THIS_ const char *name) PURE; - STDMETHOD(GetName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; - STDMETHOD(GetClassName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; + STDMETHOD(GetName)(THIS_ DWORD *size, char *name) PURE; + STDMETHOD(GetClassName)(THIS_ DWORD *size, char *name) PURE; /*** IDirect3DRMMaterial2 methods ***/ STDMETHOD(SetPower)(THIS_ D3DVALUE power) PURE; STDMETHOD(SetSpecular)(THIS_ D3DVALUE r, D3DVALUE g, D3DVALUE b) PURE; @@ -3787,8 +3787,8 @@ DECLARE_INTERFACE_(IDirect3DRMAnimation, IDirect3DRMObject) STDMETHOD(SetAppData)(THIS_ DWORD data) PURE; STDMETHOD_(DWORD, GetAppData)(THIS) PURE; STDMETHOD(SetName)(THIS_ const char *name) PURE; - STDMETHOD(GetName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; - STDMETHOD(GetClassName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; + STDMETHOD(GetName)(THIS_ DWORD *size, char *name) PURE; + STDMETHOD(GetClassName)(THIS_ DWORD *size, char *name) PURE; /*** IDirect3DRMAnimation methods ***/ STDMETHOD(SetOptions)(THIS_ D3DRMANIMATIONOPTIONS flags) PURE; STDMETHOD(AddRotateKey)(THIS_ D3DVALUE time, D3DRMQUATERNION *q) PURE; @@ -3866,8 +3866,8 @@ DECLARE_INTERFACE_(IDirect3DRMAnimation2, IDirect3DRMObject) STDMETHOD(SetAppData)(THIS_ DWORD data) PURE; STDMETHOD_(DWORD, GetAppData)(THIS) PURE; STDMETHOD(SetName)(THIS_ const char *name) PURE; - STDMETHOD(GetName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; - STDMETHOD(GetClassName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; + STDMETHOD(GetName)(THIS_ DWORD *size, char *name) PURE; + STDMETHOD(GetClassName)(THIS_ DWORD *size, char *name) PURE; /*** IDirect3DRMAnimation2 methods ***/ STDMETHOD(SetOptions)(THIS_ D3DRMANIMATIONOPTIONS flags) PURE; STDMETHOD(AddRotateKey)(THIS_ D3DVALUE time, D3DRMQUATERNION *q) PURE; @@ -3960,8 +3960,8 @@ DECLARE_INTERFACE_(IDirect3DRMAnimationSet, IDirect3DRMObject) STDMETHOD(SetAppData)(THIS_ DWORD data) PURE; STDMETHOD_(DWORD, GetAppData)(THIS) PURE; STDMETHOD(SetName)(THIS_ const char *name) PURE; - STDMETHOD(GetName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; - STDMETHOD(GetClassName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; + STDMETHOD(GetName)(THIS_ DWORD *size, char *name) PURE; + STDMETHOD(GetClassName)(THIS_ DWORD *size, char *name) PURE; /*** IDirect3DRMAnimationSet methods ***/ STDMETHOD(AddAnimation)(THIS_ IDirect3DRMAnimation *animation) PURE; STDMETHOD(Load)(THIS_ void *filename, void *name, D3DRMLOADOPTIONS flags, @@ -4028,8 +4028,8 @@ DECLARE_INTERFACE_(IDirect3DRMAnimationSet2, IDirect3DRMObject) STDMETHOD(SetAppData)(THIS_ DWORD data) PURE; STDMETHOD_(DWORD, GetAppData)(THIS) PURE; STDMETHOD(SetName)(THIS_ const char *name) PURE; - STDMETHOD(GetName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; - STDMETHOD(GetClassName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; + STDMETHOD(GetName)(THIS_ DWORD *size, char *name) PURE; + STDMETHOD(GetClassName)(THIS_ DWORD *size, char *name) PURE; /*** IDirect3DRMAnimationSet2 methods ***/ STDMETHOD(AddAnimation)(THIS_ IDirect3DRMAnimation2 *animation) PURE; STDMETHOD(Load)(THIS_ void *source, void *object_id, D3DRMLOADOPTIONS flags, @@ -4099,8 +4099,8 @@ DECLARE_INTERFACE_(IDirect3DRMUserVisual, IDirect3DRMVisual) STDMETHOD(SetAppData)(THIS_ DWORD data) PURE; STDMETHOD_(DWORD, GetAppData)(THIS) PURE; STDMETHOD(SetName)(THIS_ const char *name) PURE; - STDMETHOD(GetName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; - STDMETHOD(GetClassName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; + STDMETHOD(GetName)(THIS_ DWORD *size, char *name) PURE; + STDMETHOD(GetClassName)(THIS_ DWORD *size, char *name) PURE; /*** IDirect3DRMUserVisual methods ***/ STDMETHOD(Init)(THIS_ D3DRMUSERVISUALCALLBACK fn, void *arg) PURE; }; @@ -4560,8 +4560,8 @@ DECLARE_INTERFACE_(IDirect3DRMInterpolator, IDirect3DRMObject) STDMETHOD(SetAppData)(THIS_ DWORD data) PURE; STDMETHOD_(DWORD, GetAppData)(THIS) PURE; STDMETHOD(SetName)(THIS_ const char *name) PURE; - STDMETHOD(GetName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; - STDMETHOD(GetClassName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; + STDMETHOD(GetName)(THIS_ DWORD *size, char *name) PURE; + STDMETHOD(GetClassName)(THIS_ DWORD *size, char *name) PURE; /*** IDirect3DRMInterpolator methods ***/ STDMETHOD(AttachObject)(THIS_ IDirect3DRMObject *object) PURE; STDMETHOD(GetAttachedObjects)(THIS_ IDirect3DRMObjectArray **array) PURE; @@ -4633,8 +4633,8 @@ DECLARE_INTERFACE_(IDirect3DRMClippedVisual, IDirect3DRMVisual) STDMETHOD(SetAppData)(THIS_ DWORD data) PURE; STDMETHOD_(DWORD, GetAppData)(THIS) PURE; STDMETHOD(SetName)(THIS_ const char *name) PURE; - STDMETHOD(GetName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; - STDMETHOD(GetClassName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; + STDMETHOD(GetName)(THIS_ DWORD *size, char *name) PURE; + STDMETHOD(GetClassName)(THIS_ DWORD *size, char *name) PURE; /*** IDirect3DRMClippedVisual methods ***/ STDMETHOD(Init) (THIS_ IDirect3DRMVisual *visual) PURE; STDMETHOD(AddPlane) (THIS_ IDirect3DRMFrame3 *reference, D3DVECTOR *point, diff --git a/include/d3drmwin.h b/include/d3drmwin.h index 772fc2cbfe2..002ee5256a7 100644 --- a/include/d3drmwin.h +++ b/include/d3drmwin.h @@ -52,8 +52,8 @@ DECLARE_INTERFACE_(IDirect3DRMWinDevice,IDirect3DRMObject) STDMETHOD(SetAppData)(THIS_ DWORD data) PURE; STDMETHOD_(DWORD, GetAppData)(THIS) PURE; STDMETHOD(SetName)(THIS_ const char *name) PURE; - STDMETHOD(GetName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; - STDMETHOD(GetClassName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; + STDMETHOD(GetName)(THIS_ DWORD *size, char *name) PURE; + STDMETHOD(GetClassName)(THIS_ DWORD *size, char *name) PURE; /*** IDirect3DRMWinDevice methods ***/ STDMETHOD(HandlePaint)(THIS_ HDC) PURE; STDMETHOD(HandleActivate)(THIS_ WORD) PURE;