diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index b8b139b59a3..cf74df15cfd 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -329,20 +329,16 @@ static HRESULT WINAPI IDirect3DRMImpl_LoadTextureFromResource(IDirect3DRM *iface return Direct3DRMTexture_create(&IID_IDirect3DRMTexture, (IUnknown **)texture); } -static HRESULT WINAPI IDirect3DRMImpl_SetSearchPath(IDirect3DRM* iface, LPCSTR path) +static HRESULT WINAPI IDirect3DRMImpl_SetSearchPath(IDirect3DRM *iface, const char *path) { - IDirect3DRMImpl *This = impl_from_IDirect3DRM(iface); - - FIXME("(%p/%p)->(%s): stub\n", iface, This, path); + FIXME("iface %p, path %s stub!\n", iface, debugstr_a(path)); return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRMImpl_AddSearchPath(IDirect3DRM* iface, LPCSTR path) +static HRESULT WINAPI IDirect3DRMImpl_AddSearchPath(IDirect3DRM *iface, const char *path) { - IDirect3DRMImpl *This = impl_from_IDirect3DRM(iface); - - FIXME("(%p/%p)->(%s): stub\n", iface, This, path); + FIXME("iface %p, path %s stub!\n", iface, debugstr_a(path)); return E_NOTIMPL; } @@ -696,20 +692,16 @@ static HRESULT WINAPI IDirect3DRM2Impl_LoadTextureFromResource(IDirect3DRM2 *ifa return Direct3DRMTexture_create(&IID_IDirect3DRMTexture2, (IUnknown **)texture); } -static HRESULT WINAPI IDirect3DRM2Impl_SetSearchPath(IDirect3DRM2* iface, LPCSTR path) +static HRESULT WINAPI IDirect3DRM2Impl_SetSearchPath(IDirect3DRM2 *iface, const char *path) { - IDirect3DRMImpl *This = impl_from_IDirect3DRM2(iface); - - FIXME("(%p/%p)->(%s): stub\n", iface, This, path); + FIXME("iface %p, path %s stub!\n", iface, debugstr_a(path)); return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRM2Impl_AddSearchPath(IDirect3DRM2* iface, LPCSTR path) +static HRESULT WINAPI IDirect3DRM2Impl_AddSearchPath(IDirect3DRM2 *iface, const char *path) { - IDirect3DRMImpl *This = impl_from_IDirect3DRM2(iface); - - FIXME("(%p/%p)->(%s): stub\n", iface, This, path); + FIXME("iface %p, path %s stub!\n", iface, debugstr_a(path)); return E_NOTIMPL; } @@ -1082,20 +1074,16 @@ static HRESULT WINAPI IDirect3DRM3Impl_LoadTextureFromResource(IDirect3DRM3 *ifa return Direct3DRMTexture_create(&IID_IDirect3DRMTexture3, (IUnknown **)texture); } -static HRESULT WINAPI IDirect3DRM3Impl_SetSearchPath(IDirect3DRM3* iface, LPCSTR path) +static HRESULT WINAPI IDirect3DRM3Impl_SetSearchPath(IDirect3DRM3 *iface, const char *path) { - IDirect3DRMImpl *This = impl_from_IDirect3DRM3(iface); - - FIXME("(%p/%p)->(%s): stub\n", iface, This, path); + FIXME("iface %p, path %s stub!\n", iface, debugstr_a(path)); return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRM3Impl_AddSearchPath(IDirect3DRM3* iface, LPCSTR path) +static HRESULT WINAPI IDirect3DRM3Impl_AddSearchPath(IDirect3DRM3* iface, const char *path) { - IDirect3DRMImpl *This = impl_from_IDirect3DRM3(iface); - - FIXME("(%p/%p)->(%s): stub\n", iface, This, path); + FIXME("iface %p, path %s stub!\n", iface, debugstr_a(path)); return E_NOTIMPL; } diff --git a/dlls/d3drm/device.c b/dlls/d3drm/device.c index 661dcf5fd8a..b54042d5082 100644 --- a/dlls/d3drm/device.c +++ b/dlls/d3drm/device.c @@ -168,11 +168,9 @@ static DWORD WINAPI IDirect3DRMDevice2Impl_GetAppData(IDirect3DRMDevice2* iface) return 0; } -static HRESULT WINAPI IDirect3DRMDevice2Impl_SetName(IDirect3DRMDevice2* iface, LPCSTR name) +static HRESULT WINAPI IDirect3DRMDevice2Impl_SetName(IDirect3DRMDevice2 *iface, const char *name) { - IDirect3DRMDeviceImpl *This = impl_from_IDirect3DRMDevice2(iface); - - FIXME("(%p/%p)->(%s): stub\n", iface, This, name); + FIXME("iface %p, name %s stub!\n", iface, debugstr_a(name)); return E_NOTIMPL; } @@ -580,11 +578,9 @@ static DWORD WINAPI IDirect3DRMDevice3Impl_GetAppData(IDirect3DRMDevice3* iface) return 0; } -static HRESULT WINAPI IDirect3DRMDevice3Impl_SetName(IDirect3DRMDevice3* iface, LPCSTR name) +static HRESULT WINAPI IDirect3DRMDevice3Impl_SetName(IDirect3DRMDevice3 *iface, const char *name) { - IDirect3DRMDeviceImpl *This = impl_from_IDirect3DRMDevice3(iface); - - FIXME("(%p/%p)->(%s): stub\n", iface, This, name); + FIXME("iface %p, name %s stub!\n", iface, debugstr_a(name)); return E_NOTIMPL; } @@ -1070,11 +1066,9 @@ static DWORD WINAPI IDirect3DRMWinDeviceImpl_GetAppData(IDirect3DRMWinDevice* if return 0; } -static HRESULT WINAPI IDirect3DRMWinDeviceImpl_SetName(IDirect3DRMWinDevice* iface, LPCSTR name) +static HRESULT WINAPI IDirect3DRMWinDeviceImpl_SetName(IDirect3DRMWinDevice *iface, const char *name) { - IDirect3DRMDeviceImpl *This = impl_from_IDirect3DRMWinDevice(iface); - - FIXME("(%p/%p)->(%s): stub\n", iface, This, name); + FIXME("iface %p, name %s stub!\n", iface, debugstr_a(name)); return E_NOTIMPL; } diff --git a/dlls/d3drm/face.c b/dlls/d3drm/face.c index 3c376010af6..8ae278fa86e 100644 --- a/dlls/d3drm/face.c +++ b/dlls/d3drm/face.c @@ -150,11 +150,9 @@ static DWORD WINAPI IDirect3DRMFaceImpl_GetAppData(IDirect3DRMFace* iface) return 0; } -static HRESULT WINAPI IDirect3DRMFaceImpl_SetName(IDirect3DRMFace* iface, LPCSTR name) +static HRESULT WINAPI IDirect3DRMFaceImpl_SetName(IDirect3DRMFace *iface, const char *name) { - IDirect3DRMFaceImpl *This = impl_from_IDirect3DRMFace(iface); - - FIXME("(%p/%p)->(%s): stub\n", iface, This, name); + FIXME("iface %p, name %s stub!\n", iface, debugstr_a(name)); return E_NOTIMPL; } @@ -472,11 +470,9 @@ static DWORD WINAPI IDirect3DRMFace2Impl_GetAppData(IDirect3DRMFace2* iface) return 0; } -static HRESULT WINAPI IDirect3DRMFace2Impl_SetName(IDirect3DRMFace2* iface, LPCSTR name) +static HRESULT WINAPI IDirect3DRMFace2Impl_SetName(IDirect3DRMFace2 *iface, const char *name) { - IDirect3DRMFaceImpl *This = impl_from_IDirect3DRMFace2(iface); - - FIXME("(%p/%p)->(%s): stub\n", iface, This, name); + FIXME("iface %p, name %s stub!\n", iface, debugstr_a(name)); return E_NOTIMPL; } diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index 12138c6f9bb..280b6276787 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -561,11 +561,9 @@ static DWORD WINAPI IDirect3DRMFrame2Impl_GetAppData(IDirect3DRMFrame2* iface) return 0; } -static HRESULT WINAPI IDirect3DRMFrame2Impl_SetName(IDirect3DRMFrame2* iface, LPCSTR name) +static HRESULT WINAPI IDirect3DRMFrame2Impl_SetName(IDirect3DRMFrame2 *iface, const char *name) { - IDirect3DRMFrameImpl *This = impl_from_IDirect3DRMFrame2(iface); - - FIXME("(%p/%p)->(%s): stub\n", iface, This, name); + FIXME("iface %p, name %s stub!\n", iface, debugstr_a(name)); return E_NOTIMPL; } @@ -1419,11 +1417,9 @@ static DWORD WINAPI IDirect3DRMFrame3Impl_GetAppData(IDirect3DRMFrame3* iface) return 0; } -static HRESULT WINAPI IDirect3DRMFrame3Impl_SetName(IDirect3DRMFrame3* iface, LPCSTR name) +static HRESULT WINAPI IDirect3DRMFrame3Impl_SetName(IDirect3DRMFrame3 *iface, const char *name) { - IDirect3DRMFrameImpl *This = impl_from_IDirect3DRMFrame3(iface); - - FIXME("(%p/%p)->(%s): stub\n", iface, This, name); + FIXME("iface %p, name %s stub!\n", iface, debugstr_a(name)); return E_NOTIMPL; } @@ -2356,13 +2352,11 @@ static HRESULT WINAPI IDirect3DRMFrame3Impl_RayPick(IDirect3DRMFrame3 *iface, ID return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRMFrame3Impl_Save(IDirect3DRMFrame3* iface, LPCSTR filename, - D3DRMXOFFORMAT d3dFormat, - D3DRMSAVEOPTIONS d3dSaveFlags) +static HRESULT WINAPI IDirect3DRMFrame3Impl_Save(IDirect3DRMFrame3 *iface, + const char *filename, D3DRMXOFFORMAT format, D3DRMSAVEOPTIONS flags) { - IDirect3DRMFrameImpl *This = impl_from_IDirect3DRMFrame3(iface); - - FIXME("(%p/%p)->(%p,%u,%u): stub\n", iface, This, filename, d3dFormat, d3dSaveFlags); + FIXME("iface %p, filename %s, format %#x, flags %#x stub!\n", + iface, debugstr_a(filename), format, flags); return E_NOTIMPL; } diff --git a/dlls/d3drm/light.c b/dlls/d3drm/light.c index e797bd3ddc4..9e615cc9137 100644 --- a/dlls/d3drm/light.c +++ b/dlls/d3drm/light.c @@ -145,11 +145,9 @@ static DWORD WINAPI IDirect3DRMLightImpl_GetAppData(IDirect3DRMLight* iface) return 0; } -static HRESULT WINAPI IDirect3DRMLightImpl_SetName(IDirect3DRMLight* iface, LPCSTR name) +static HRESULT WINAPI IDirect3DRMLightImpl_SetName(IDirect3DRMLight *iface, const char *name) { - IDirect3DRMLightImpl *This = impl_from_IDirect3DRMLight(iface); - - FIXME("(%p/%p)->(%s): stub\n", iface, This, name); + FIXME("iface %p, name %s stub!\n", iface, debugstr_a(name)); return E_NOTIMPL; } diff --git a/dlls/d3drm/material.c b/dlls/d3drm/material.c index 2305401d158..68d859f4143 100644 --- a/dlls/d3drm/material.c +++ b/dlls/d3drm/material.c @@ -141,9 +141,9 @@ static DWORD WINAPI IDirect3DRMMaterial2Impl_GetAppData(IDirect3DRMMaterial2* if return 0; } -static HRESULT WINAPI IDirect3DRMMaterial2Impl_SetName(IDirect3DRMMaterial2* iface, LPCSTR name) +static HRESULT WINAPI IDirect3DRMMaterial2Impl_SetName(IDirect3DRMMaterial2 *iface, const char *name) { - FIXME("(%p)->(%s): stub\n", iface, name); + FIXME("iface %p, name %s stub!\n", iface, debugstr_a(name)); return E_NOTIMPL; } diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index 3bcfc646e40..9060e869872 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -464,14 +464,13 @@ static DWORD WINAPI IDirect3DRMMeshBuilder2Impl_GetAppData(IDirect3DRMMeshBuilde return 0; } -static HRESULT WINAPI IDirect3DRMMeshBuilder2Impl_SetName(IDirect3DRMMeshBuilder2* iface, - LPCSTR name) +static HRESULT WINAPI IDirect3DRMMeshBuilder2Impl_SetName(IDirect3DRMMeshBuilder2 *iface, const char *name) { - IDirect3DRMMeshBuilderImpl *This = impl_from_IDirect3DRMMeshBuilder2(iface); + IDirect3DRMMeshBuilderImpl *mesh_builder = impl_from_IDirect3DRMMeshBuilder2(iface); - TRACE("(%p)->(%s)\n", This, debugstr_a(name)); + TRACE("iface %p, name %s.\n", iface, debugstr_a(name)); - return IDirect3DRMMeshBuilder3_SetName(&This->IDirect3DRMMeshBuilder3_iface, name); + return IDirect3DRMMeshBuilder3_SetName(&mesh_builder->IDirect3DRMMeshBuilder3_iface, name); } static HRESULT WINAPI IDirect3DRMMeshBuilder2Impl_GetName(IDirect3DRMMeshBuilder2* iface, @@ -1049,13 +1048,12 @@ static DWORD WINAPI IDirect3DRMMeshBuilder3Impl_GetAppData(IDirect3DRMMeshBuilde return 0; } -static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_SetName(IDirect3DRMMeshBuilder3* iface, - LPCSTR name) +static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_SetName(IDirect3DRMMeshBuilder3 *iface, const char *name) { - IDirect3DRMMeshBuilderImpl *This = impl_from_IDirect3DRMMeshBuilder3(iface); + IDirect3DRMMeshBuilderImpl *mesh_builder = impl_from_IDirect3DRMMeshBuilder3(iface); char *string = NULL; - TRACE("(%p)->(%s)\n", This, debugstr_a(name)); + TRACE("iface %p, name %s.\n", iface, debugstr_a(name)); if (name) { @@ -1063,8 +1061,8 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_SetName(IDirect3DRMMeshBuilder if (!string) return E_OUTOFMEMORY; strcpy(string, name); } - HeapFree(GetProcessHeap(), 0, This->name); - This->name = string; + HeapFree(GetProcessHeap(), 0, mesh_builder->name); + mesh_builder->name = string; return D3DRM_OK; } @@ -2589,12 +2587,9 @@ static DWORD WINAPI IDirect3DRMMeshImpl_GetAppData(IDirect3DRMMesh* iface) return 0; } -static HRESULT WINAPI IDirect3DRMMeshImpl_SetName(IDirect3DRMMesh* iface, - LPCSTR pName) +static HRESULT WINAPI IDirect3DRMMeshImpl_SetName(IDirect3DRMMesh *iface, const char *name) { - IDirect3DRMMeshImpl *This = impl_from_IDirect3DRMMesh(iface); - - FIXME("(%p)->(%s): stub\n", This, pName); + FIXME("iface %p, name %s stub!\n", iface, debugstr_a(name)); return E_NOTIMPL; } diff --git a/dlls/d3drm/texture.c b/dlls/d3drm/texture.c index 87d46af74f1..b63b7be2147 100644 --- a/dlls/d3drm/texture.c +++ b/dlls/d3drm/texture.c @@ -146,9 +146,9 @@ static DWORD WINAPI IDirect3DRMTexture2Impl_GetAppData(IDirect3DRMTexture2* ifac return IDirect3DRMTexture3_GetAppData(&This->IDirect3DRMTexture3_iface); } -static HRESULT WINAPI IDirect3DRMTexture2Impl_SetName(IDirect3DRMTexture2* iface, LPCSTR name) +static HRESULT WINAPI IDirect3DRMTexture2Impl_SetName(IDirect3DRMTexture2 *iface, const char *name) { - FIXME("(%p)->(%s): stub\n", iface, name); + FIXME("iface %p, name %s stub!\n", iface, debugstr_a(name)); return E_NOTIMPL; } @@ -354,12 +354,11 @@ static HRESULT WINAPI IDirect3DRMTexture2Impl_InitFromImage(IDirect3DRMTexture2 return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRMTexture2Impl_InitFromResource2(IDirect3DRMTexture2* iface, HMODULE module, - LPCSTR /* LPCTSTR */ name, LPCSTR /* LPCTSTR */ type) +static HRESULT WINAPI IDirect3DRMTexture2Impl_InitFromResource2(IDirect3DRMTexture2 *iface, + HMODULE module, const char *name, const char *type) { - IDirect3DRMTextureImpl *This = impl_from_IDirect3DRMTexture2(iface); - - FIXME("(%p/%p)->(%p, %s, %s): stub\n", iface, This, module, debugstr_a(name), debugstr_a(type)); + FIXME("iface %p, module %p, name %s, type %s stub!\n", + iface, module, debugstr_a(name), debugstr_a(type)); return E_NOTIMPL; } @@ -516,9 +515,9 @@ static DWORD WINAPI IDirect3DRMTexture3Impl_GetAppData(IDirect3DRMTexture3* ifac return This->app_data; } -static HRESULT WINAPI IDirect3DRMTexture3Impl_SetName(IDirect3DRMTexture3* iface, LPCSTR name) +static HRESULT WINAPI IDirect3DRMTexture3Impl_SetName(IDirect3DRMTexture3 *iface, const char *name) { - FIXME("(%p)->(%s): stub\n", iface, name); + FIXME("iface %p, name %s stub!\n", iface, debugstr_a(name)); return E_NOTIMPL; } @@ -729,12 +728,11 @@ static HRESULT WINAPI IDirect3DRMTexture3Impl_InitFromImage(IDirect3DRMTexture3 return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRMTexture3Impl_InitFromResource2(IDirect3DRMTexture3* iface, HMODULE module, - LPCSTR /* LPCTSTR */ name, LPCSTR /* LPCTSTR */ type) +static HRESULT WINAPI IDirect3DRMTexture3Impl_InitFromResource2(IDirect3DRMTexture3 *iface, + HMODULE module, const char *name, const char *type) { - IDirect3DRMTextureImpl *This = impl_from_IDirect3DRMTexture3(iface); - - FIXME("(%p/%p)->(%p, %s, %s): stub\n", iface, This, module, debugstr_a(name), debugstr_a(type)); + FIXME("iface %p, module %p, name %s, type %s stub!\n", + iface, module, debugstr_a(name), debugstr_a(type)); return E_NOTIMPL; } diff --git a/dlls/d3drm/viewport.c b/dlls/d3drm/viewport.c index d805ef996ae..86d87ecbe72 100644 --- a/dlls/d3drm/viewport.c +++ b/dlls/d3drm/viewport.c @@ -154,11 +154,9 @@ static DWORD WINAPI IDirect3DRMViewportImpl_GetAppData(IDirect3DRMViewport* ifac return 0; } -static HRESULT WINAPI IDirect3DRMViewportImpl_SetName(IDirect3DRMViewport* iface, LPCSTR name) +static HRESULT WINAPI IDirect3DRMViewportImpl_SetName(IDirect3DRMViewport *iface, const char *name) { - IDirect3DRMViewportImpl *This = impl_from_IDirect3DRMViewport(iface); - - FIXME("(%p/%p)->(%s): stub\n", iface, This, name); + FIXME("iface %p, name %s stub!\n", iface, debugstr_a(name)); return E_NOTIMPL; } @@ -554,11 +552,9 @@ static DWORD WINAPI IDirect3DRMViewport2Impl_GetAppData(IDirect3DRMViewport2* if return 0; } -static HRESULT WINAPI IDirect3DRMViewport2Impl_SetName(IDirect3DRMViewport2* iface, LPCSTR name) +static HRESULT WINAPI IDirect3DRMViewport2Impl_SetName(IDirect3DRMViewport2 *iface, const char *name) { - IDirect3DRMViewportImpl *This = impl_from_IDirect3DRMViewport2(iface); - - FIXME("(%p/%p)->(%s): stub\n", iface, This, name); + FIXME("iface %p, name %s stub!\n", iface, debugstr_a(name)); return E_NOTIMPL; } diff --git a/include/d3drm.h b/include/d3drm.h index 1d18154b4db..504d46ca309 100644 --- a/include/d3drm.h +++ b/include/d3drm.h @@ -89,8 +89,8 @@ DECLARE_INTERFACE_(IDirect3DRM,IUnknown) STDMETHOD(CreateUserVisual)(THIS_ D3DRMUSERVISUALCALLBACK cb, void *ctx, IDirect3DRMUserVisual **visual) PURE; STDMETHOD(LoadTexture)(THIS_ const char *filename, IDirect3DRMTexture **texture) PURE; STDMETHOD(LoadTextureFromResource)(THIS_ HRSRC resource, IDirect3DRMTexture **texture) PURE; - STDMETHOD(SetSearchPath)(THIS_ LPCSTR) PURE; - STDMETHOD(AddSearchPath)(THIS_ LPCSTR) 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(SetDefaultTextureColors)(THIS_ DWORD) PURE; STDMETHOD(SetDefaultTextureShades)(THIS_ DWORD) PURE; @@ -229,8 +229,8 @@ DECLARE_INTERFACE_(IDirect3DRM2,IUnknown) STDMETHOD(LoadTexture)(THIS_ const char *filename, IDirect3DRMTexture2 **texture) PURE; STDMETHOD(LoadTextureFromResource)(THIS_ HMODULE module, const char *resource_name, const char *resource_type, IDirect3DRMTexture2 **texture) PURE; - STDMETHOD(SetSearchPath)(THIS_ LPCSTR) PURE; - STDMETHOD(AddSearchPath)(THIS_ LPCSTR) 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(SetDefaultTextureColors)(THIS_ DWORD) PURE; STDMETHOD(SetDefaultTextureShades)(THIS_ DWORD) PURE; @@ -372,8 +372,8 @@ DECLARE_INTERFACE_(IDirect3DRM3,IUnknown) STDMETHOD(LoadTexture)(THIS_ const char *filename, IDirect3DRMTexture3 **texture) PURE; STDMETHOD(LoadTextureFromResource)(THIS_ HMODULE module, const char *resource_name, const char *resource_type, IDirect3DRMTexture3 **texture) PURE; - STDMETHOD(SetSearchPath)(THIS_ LPCSTR) PURE; - STDMETHOD(AddSearchPath)(THIS_ LPCSTR) 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(SetDefaultTextureColors)(THIS_ DWORD) PURE; STDMETHOD(SetDefaultTextureShades)(THIS_ DWORD) PURE; diff --git a/include/d3drmdef.h b/include/d3drmdef.h index b9030263463..cd95b11d293 100644 --- a/include/d3drmdef.h +++ b/include/d3drmdef.h @@ -354,10 +354,11 @@ typedef DWORD D3DRMLOADOPTIONS; #define D3DRMLOAD_ASYNCHRONOUS __MSABI_LONG(0x400) -typedef struct _D3DRMLOADRESOURCE { +typedef struct _D3DRMLOADRESOURCE +{ HMODULE hModule; - LPCSTR /*LPCTSTR*/ lpName; - LPCSTR /*LPCTSTR*/ lpType; + const char *lpName; + const char *lpType; } D3DRMLOADRESOURCE, *LPD3DRMLOADRESOURCE; typedef struct _D3DRMLOADMEMORY { diff --git a/include/d3drmobj.h b/include/d3drmobj.h index 7d600464798..04dd38af51a 100644 --- a/include/d3drmobj.h +++ b/include/d3drmobj.h @@ -207,7 +207,7 @@ DECLARE_INTERFACE_(IDirect3DRMObject,IUnknown) STDMETHOD(DeleteDestroyCallback)(THIS_ D3DRMOBJECTCALLBACK, LPVOID argument) PURE; STDMETHOD(SetAppData)(THIS_ DWORD data) PURE; STDMETHOD_(DWORD, GetAppData)(THIS) PURE; - STDMETHOD(SetName)(THIS_ LPCSTR) PURE; + STDMETHOD(SetName)(THIS_ const char *name) PURE; STDMETHOD(GetName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; STDMETHOD(GetClassName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; }; @@ -264,7 +264,7 @@ DECLARE_INTERFACE_(IDirect3DRMObject2,IUnknown) STDMETHOD(GetDirect3DRM)(THIS_ struct IDirect3DRM **d3drm) PURE; STDMETHOD(GetName)(THIS_ LPDWORD pSize, LPSTR pName) PURE; STDMETHOD(SetClientData)(THIS_ DWORD id, LPVOID pData, DWORD flags) PURE; - STDMETHOD(SetName)(THIS_ LPCSTR pName) PURE; + STDMETHOD(SetName)(THIS_ const char *name) PURE; STDMETHOD(GetAge)(THIS_ DWORD flags, LPDWORD pAge) PURE; }; #undef INTERFACE @@ -317,7 +317,7 @@ DECLARE_INTERFACE_(IDirect3DRMVisual,IDirect3DRMObject) STDMETHOD(DeleteDestroyCallback)(THIS_ D3DRMOBJECTCALLBACK, LPVOID argument) PURE; STDMETHOD(SetAppData)(THIS_ DWORD data) PURE; STDMETHOD_(DWORD, GetAppData)(THIS) PURE; - STDMETHOD(SetName)(THIS_ LPCSTR) PURE; + STDMETHOD(SetName)(THIS_ const char *name) PURE; STDMETHOD(GetName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; STDMETHOD(GetClassName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; }; @@ -372,7 +372,7 @@ DECLARE_INTERFACE_(IDirect3DRMDevice,IUnknown) STDMETHOD(DeleteDestroyCallback)(THIS_ D3DRMOBJECTCALLBACK pFunc, LPVOID pArg) PURE; STDMETHOD(SetAppData)(THIS_ DWORD data) PURE; STDMETHOD_(DWORD, GetAppData)(THIS) PURE; - STDMETHOD(SetName)(THIS_ LPCSTR) PURE; + STDMETHOD(SetName)(THIS_ const char *name) PURE; STDMETHOD(GetName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; STDMETHOD(GetClassName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; /*** IDirect3DRMDevice methods ***/ @@ -499,7 +499,7 @@ DECLARE_INTERFACE_(IDirect3DRMDevice2,IDirect3DRMDevice) STDMETHOD(DeleteDestroyCallback)(THIS_ D3DRMOBJECTCALLBACK pFunc, LPVOID pArg) PURE; STDMETHOD(SetAppData)(THIS_ DWORD data) PURE; STDMETHOD_(DWORD, GetAppData)(THIS) PURE; - STDMETHOD(SetName)(THIS_ LPCSTR) PURE; + STDMETHOD(SetName)(THIS_ const char *name) PURE; STDMETHOD(GetName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; STDMETHOD(GetClassName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; /*** IDirect3DRMDevice methods ***/ @@ -644,7 +644,7 @@ DECLARE_INTERFACE_(IDirect3DRMDevice3,IDirect3DRMObject) STDMETHOD(DeleteDestroyCallback)(THIS_ D3DRMOBJECTCALLBACK pFunc, LPVOID pArg) PURE; STDMETHOD(SetAppData)(THIS_ DWORD data) PURE; STDMETHOD_(DWORD, GetAppData)(THIS) PURE; - STDMETHOD(SetName)(THIS_ LPCSTR) PURE; + STDMETHOD(SetName)(THIS_ const char *name) PURE; STDMETHOD(GetName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; STDMETHOD(GetClassName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; /*** IDirect3DRMDevice methods ***/ @@ -804,7 +804,7 @@ DECLARE_INTERFACE_(IDirect3DRMViewport,IDirect3DRMObject) STDMETHOD(DeleteDestroyCallback)(THIS_ D3DRMOBJECTCALLBACK, LPVOID argument) PURE; STDMETHOD(SetAppData)(THIS_ DWORD data) PURE; STDMETHOD_(DWORD, GetAppData)(THIS) PURE; - STDMETHOD(SetName)(THIS_ LPCSTR) PURE; + STDMETHOD(SetName)(THIS_ const char *name) PURE; STDMETHOD(GetName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; STDMETHOD(GetClassName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; /*** IDirect3DRMViewport methods ***/ @@ -944,7 +944,7 @@ DECLARE_INTERFACE_(IDirect3DRMViewport2,IDirect3DRMObject) STDMETHOD(DeleteDestroyCallback)(THIS_ D3DRMOBJECTCALLBACK, LPVOID argument) PURE; STDMETHOD(SetAppData)(THIS_ DWORD data) PURE; STDMETHOD_(DWORD, GetAppData)(THIS) PURE; - STDMETHOD(SetName)(THIS_ LPCSTR) PURE; + STDMETHOD(SetName)(THIS_ const char *name) PURE; STDMETHOD(GetName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; STDMETHOD(GetClassName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; /*** IDirect3DRMViewport2 methods ***/ @@ -1092,7 +1092,7 @@ DECLARE_INTERFACE_(IDirect3DRMFrame,IDirect3DRMVisual) STDMETHOD(DeleteDestroyCallback)(THIS_ D3DRMOBJECTCALLBACK, LPVOID argument) PURE; STDMETHOD(SetAppData)(THIS_ DWORD data) PURE; STDMETHOD_(DWORD, GetAppData)(THIS) PURE; - STDMETHOD(SetName)(THIS_ LPCSTR) PURE; + STDMETHOD(SetName)(THIS_ const char *name) PURE; STDMETHOD(GetName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; STDMETHOD(GetClassName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; /*** IDirect3DRMFrame methods ***/ @@ -1325,7 +1325,7 @@ DECLARE_INTERFACE_(IDirect3DRMFrame2,IDirect3DRMFrame) STDMETHOD(DeleteDestroyCallback)(THIS_ D3DRMOBJECTCALLBACK, LPVOID argument) PURE; STDMETHOD(SetAppData)(THIS_ DWORD data) PURE; STDMETHOD_(DWORD, GetAppData)(THIS) PURE; - STDMETHOD(SetName)(THIS_ LPCSTR) PURE; + STDMETHOD(SetName)(THIS_ const char *name) PURE; STDMETHOD(GetName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; STDMETHOD(GetClassName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; /*** IDirect3DRMFrame methods ***/ @@ -1407,7 +1407,7 @@ DECLARE_INTERFACE_(IDirect3DRMFrame2,IDirect3DRMFrame) STDMETHOD(SetQuaternion)(THIS_ IDirect3DRMFrame *reference, D3DRMQUATERNION *q) PURE; STDMETHOD(RayPick)(THIS_ IDirect3DRMFrame *reference, D3DRMRAY *ray, DWORD flags, struct IDirect3DRMPicked2Array **return_visuals) PURE; - STDMETHOD(Save)(THIS_ LPCSTR filename, D3DRMXOFFORMAT d3dFormat, D3DRMSAVEOPTIONS d3dSaveFlags); + STDMETHOD(Save)(THIS_ const char *filename, D3DRMXOFFORMAT format, D3DRMSAVEOPTIONS flags); }; #undef INTERFACE @@ -1607,7 +1607,7 @@ DECLARE_INTERFACE_(IDirect3DRMFrame3,IDirect3DRMVisual) STDMETHOD(DeleteDestroyCallback)(THIS_ D3DRMOBJECTCALLBACK, LPVOID argument) PURE; STDMETHOD(SetAppData)(THIS_ DWORD data) PURE; STDMETHOD_(DWORD, GetAppData)(THIS) PURE; - STDMETHOD(SetName)(THIS_ LPCSTR) PURE; + STDMETHOD(SetName)(THIS_ const char *name) PURE; STDMETHOD(GetName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; STDMETHOD(GetClassName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; /*** IDirect3DRMFrame3 methods ***/ @@ -1687,7 +1687,7 @@ DECLARE_INTERFACE_(IDirect3DRMFrame3,IDirect3DRMVisual) STDMETHOD(SetQuaternion)(THIS_ IDirect3DRMFrame3 *reference, D3DRMQUATERNION *q) PURE; STDMETHOD(RayPick)(THIS_ IDirect3DRMFrame3 *reference, D3DRMRAY *ray, DWORD flags, struct IDirect3DRMPicked2Array **return_visuals) PURE; - STDMETHOD(Save)(THIS_ LPCSTR filename, D3DRMXOFFORMAT d3dFormat, D3DRMSAVEOPTIONS d3dSaveFlags); + STDMETHOD(Save)(THIS_ const char *filename, D3DRMXOFFORMAT format, D3DRMSAVEOPTIONS flags); STDMETHOD(TransformVectors)(THIS_ IDirect3DRMFrame3 *reference, DWORD vector_count, D3DVECTOR *dst_vectors, D3DVECTOR *src_vectors) PURE; STDMETHOD(InverseTransformVectors)(THIS_ IDirect3DRMFrame3 *reference, DWORD vector_count, @@ -1905,7 +1905,7 @@ DECLARE_INTERFACE_(IDirect3DRMMesh,IDirect3DRMVisual) STDMETHOD(DeleteDestroyCallback)(THIS_ D3DRMOBJECTCALLBACK, LPVOID argument) PURE; STDMETHOD(SetAppData)(THIS_ DWORD data) PURE; STDMETHOD_(DWORD, GetAppData)(THIS) PURE; - STDMETHOD(SetName)(THIS_ LPCSTR) PURE; + STDMETHOD(SetName)(THIS_ const char *name) PURE; STDMETHOD(GetName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; STDMETHOD(GetClassName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; /*** IDirect3DRMMesh methods ***/ @@ -2020,7 +2020,7 @@ DECLARE_INTERFACE_(IDirect3DRMProgressiveMesh,IDirect3DRMVisual) STDMETHOD(DeleteDestroyCallback)(THIS_ D3DRMOBJECTCALLBACK, LPVOID argument) PURE; STDMETHOD(SetAppData)(THIS_ DWORD data) PURE; STDMETHOD_(DWORD, GetAppData)(THIS) PURE; - STDMETHOD(SetName)(THIS_ LPCSTR) PURE; + STDMETHOD(SetName)(THIS_ const char *name) PURE; STDMETHOD(GetName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; STDMETHOD(GetClassName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; /*** IDirect3DRMProgressiveMesh methods ***/ @@ -2130,7 +2130,7 @@ DECLARE_INTERFACE_(IDirect3DRMShadow,IDirect3DRMVisual) STDMETHOD(DeleteDestroyCallback)(THIS_ D3DRMOBJECTCALLBACK, LPVOID argument) PURE; STDMETHOD(SetAppData)(THIS_ DWORD data) PURE; STDMETHOD_(DWORD, GetAppData)(THIS) PURE; - STDMETHOD(SetName)(THIS_ LPCSTR) PURE; + STDMETHOD(SetName)(THIS_ const char *name) PURE; STDMETHOD(GetName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; STDMETHOD(GetClassName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; /*** IDirect3DRMShadow methods ***/ @@ -2189,7 +2189,7 @@ DECLARE_INTERFACE_(IDirect3DRMShadow2,IDirect3DRMVisual) STDMETHOD(DeleteDestroyCallback)(THIS_ D3DRMOBJECTCALLBACK, LPVOID argument) PURE; STDMETHOD(SetAppData)(THIS_ DWORD data) PURE; STDMETHOD_(DWORD, GetAppData)(THIS) PURE; - STDMETHOD(SetName)(THIS_ LPCSTR) PURE; + STDMETHOD(SetName)(THIS_ const char *name) PURE; STDMETHOD(GetName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; STDMETHOD(GetClassName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; /*** IDirect3DRMShadow methods ***/ @@ -2277,7 +2277,7 @@ DECLARE_INTERFACE_(IDirect3DRMFace,IDirect3DRMObject) STDMETHOD(DeleteDestroyCallback)(THIS_ D3DRMOBJECTCALLBACK, LPVOID argument) PURE; STDMETHOD(SetAppData)(THIS_ DWORD data) PURE; STDMETHOD_(DWORD, GetAppData)(THIS) PURE; - STDMETHOD(SetName)(THIS_ LPCSTR) PURE; + STDMETHOD(SetName)(THIS_ const char *name) PURE; STDMETHOD(GetName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; STDMETHOD(GetClassName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; /*** IDirect3DRMFace methods ***/ @@ -2387,7 +2387,7 @@ DECLARE_INTERFACE_(IDirect3DRMFace2,IDirect3DRMObject) STDMETHOD(DeleteDestroyCallback)(THIS_ D3DRMOBJECTCALLBACK, LPVOID argument) PURE; STDMETHOD(SetAppData)(THIS_ DWORD data) PURE; STDMETHOD_(DWORD, GetAppData)(THIS) PURE; - STDMETHOD(SetName)(THIS_ LPCSTR) PURE; + STDMETHOD(SetName)(THIS_ const char *name) PURE; STDMETHOD(GetName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; STDMETHOD(GetClassName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; /*** IDirect3DRMFace methods ***/ @@ -2497,7 +2497,7 @@ DECLARE_INTERFACE_(IDirect3DRMMeshBuilder,IDirect3DRMVisual) STDMETHOD(DeleteDestroyCallback)(THIS_ D3DRMOBJECTCALLBACK, LPVOID argument) PURE; STDMETHOD(SetAppData)(THIS_ DWORD data) PURE; STDMETHOD_(DWORD, GetAppData)(THIS) PURE; - STDMETHOD(SetName)(THIS_ LPCSTR) PURE; + STDMETHOD(SetName)(THIS_ const char *name) PURE; STDMETHOD(GetName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; STDMETHOD(GetClassName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; /*** IDirect3DRMMeshBuilder methods ***/ @@ -2668,7 +2668,7 @@ DECLARE_INTERFACE_(IDirect3DRMMeshBuilder2,IDirect3DRMMeshBuilder) STDMETHOD(DeleteDestroyCallback)(THIS_ D3DRMOBJECTCALLBACK, LPVOID argument) PURE; STDMETHOD(SetAppData)(THIS_ DWORD data) PURE; STDMETHOD_(DWORD, GetAppData)(THIS) PURE; - STDMETHOD(SetName)(THIS_ LPCSTR) PURE; + STDMETHOD(SetName)(THIS_ const char *name) PURE; STDMETHOD(GetName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; STDMETHOD(GetClassName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; /*** IDirect3DRMMeshBuilder methods ***/ @@ -2848,7 +2848,7 @@ DECLARE_INTERFACE_(IDirect3DRMMeshBuilder3,IDirect3DRMVisual) STDMETHOD(DeleteDestroyCallback)(THIS_ D3DRMOBJECTCALLBACK, LPVOID argument) PURE; STDMETHOD(SetAppData)(THIS_ DWORD data) PURE; STDMETHOD_(DWORD, GetAppData)(THIS) PURE; - STDMETHOD(SetName)(THIS_ LPCSTR) PURE; + STDMETHOD(SetName)(THIS_ const char *name) PURE; STDMETHOD(GetName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; STDMETHOD(GetClassName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; /*** IDirect3DRMMeshBuilder3 methods ***/ @@ -3084,7 +3084,7 @@ DECLARE_INTERFACE_(IDirect3DRMLight,IDirect3DRMObject) STDMETHOD(DeleteDestroyCallback)(THIS_ D3DRMOBJECTCALLBACK, LPVOID argument) PURE; STDMETHOD(SetAppData)(THIS_ DWORD data) PURE; STDMETHOD_(DWORD, GetAppData)(THIS) PURE; - STDMETHOD(SetName)(THIS_ LPCSTR) PURE; + STDMETHOD(SetName)(THIS_ const char *name) PURE; STDMETHOD(GetName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; STDMETHOD(GetClassName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; /*** IDirect3DRMLight methods ***/ @@ -3196,7 +3196,7 @@ DECLARE_INTERFACE_(IDirect3DRMTexture, IDirect3DRMVisual) STDMETHOD(DeleteDestroyCallback)(THIS_ D3DRMOBJECTCALLBACK, LPVOID argument) PURE; STDMETHOD(SetAppData)(THIS_ DWORD data) PURE; STDMETHOD_(DWORD, GetAppData)(THIS) PURE; - STDMETHOD(SetName)(THIS_ LPCSTR) PURE; + STDMETHOD(SetName)(THIS_ const char *name) PURE; STDMETHOD(GetName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; STDMETHOD(GetClassName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; /*** IDirect3DRMTexture methods ***/ @@ -3308,7 +3308,7 @@ DECLARE_INTERFACE_(IDirect3DRMTexture2, IDirect3DRMTexture) STDMETHOD(DeleteDestroyCallback)(THIS_ D3DRMOBJECTCALLBACK, LPVOID argument) PURE; STDMETHOD(SetAppData)(THIS_ DWORD data) PURE; STDMETHOD_(DWORD, GetAppData)(THIS) PURE; - STDMETHOD(SetName)(THIS_ LPCSTR) PURE; + STDMETHOD(SetName)(THIS_ const char *name) PURE; STDMETHOD(GetName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; STDMETHOD(GetClassName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; /*** IDirect3DRMTexture methods ***/ @@ -3333,7 +3333,7 @@ DECLARE_INTERFACE_(IDirect3DRMTexture2, IDirect3DRMTexture) STDMETHOD_(D3DCOLOR, GetDecalTransparentColor)(THIS) PURE; /*** IDirect3DRMTexture2 methods ***/ STDMETHOD(InitFromImage)(THIS_ D3DRMIMAGE *image) PURE; - STDMETHOD(InitFromResource2)(THIS_ HMODULE hModule, LPCSTR /* LPCTSTR */ strName, LPCSTR /* LPCTSTR */ strType) PURE; + STDMETHOD(InitFromResource2)(THIS_ HMODULE module, const char *name, const char *type) PURE; STDMETHOD(GenerateMIPMap)(THIS_ DWORD) PURE; }; #undef INTERFACE @@ -3432,7 +3432,7 @@ DECLARE_INTERFACE_(IDirect3DRMTexture3, IDirect3DRMVisual) STDMETHOD(DeleteDestroyCallback)(THIS_ D3DRMOBJECTCALLBACK, LPVOID argument) PURE; STDMETHOD(SetAppData)(THIS_ DWORD data) PURE; STDMETHOD_(DWORD, GetAppData)(THIS) PURE; - STDMETHOD(SetName)(THIS_ LPCSTR) PURE; + STDMETHOD(SetName)(THIS_ const char *name) PURE; STDMETHOD(GetName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; STDMETHOD(GetClassName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; /*** IDirect3DRMTexture3 methods ***/ @@ -3456,7 +3456,7 @@ DECLARE_INTERFACE_(IDirect3DRMTexture3, IDirect3DRMVisual) STDMETHOD_(BOOL, GetDecalTransparency)(THIS) PURE; STDMETHOD_(D3DCOLOR, GetDecalTransparentColor)(THIS) PURE; STDMETHOD(InitFromImage)(THIS_ D3DRMIMAGE *image) PURE; - STDMETHOD(InitFromResource2)(THIS_ HMODULE hModule, LPCSTR /* LPCTSTR */ strName, LPCSTR /* LPCTSTR */ strType) PURE; + STDMETHOD(InitFromResource2)(THIS_ HMODULE module, const char *name, const char *type) PURE; STDMETHOD(GenerateMIPMap)(THIS_ DWORD) PURE; STDMETHOD(GetSurface)(THIS_ DWORD flags, IDirectDrawSurface **surface) PURE; STDMETHOD(SetCacheOptions)(THIS_ LONG lImportance, DWORD dwFlags) PURE; @@ -3568,7 +3568,7 @@ DECLARE_INTERFACE_(IDirect3DRMWrap, IDirect3DRMObject) STDMETHOD(DeleteDestroyCallback)(THIS_ D3DRMOBJECTCALLBACK, LPVOID argument) PURE; STDMETHOD(SetAppData)(THIS_ DWORD data) PURE; STDMETHOD_(DWORD, GetAppData)(THIS) PURE; - STDMETHOD(SetName)(THIS_ LPCSTR) PURE; + STDMETHOD(SetName)(THIS_ const char *name) PURE; STDMETHOD(GetName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; STDMETHOD(GetClassName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; /*** IDirect3DRMWrap methods ***/ @@ -3634,7 +3634,7 @@ DECLARE_INTERFACE_(IDirect3DRMMaterial, IDirect3DRMObject) STDMETHOD(DeleteDestroyCallback)(THIS_ D3DRMOBJECTCALLBACK, LPVOID argument) PURE; STDMETHOD(SetAppData)(THIS_ DWORD data) PURE; STDMETHOD_(DWORD, GetAppData)(THIS) PURE; - STDMETHOD(SetName)(THIS_ LPCSTR) PURE; + STDMETHOD(SetName)(THIS_ const char *name) PURE; STDMETHOD(GetName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; STDMETHOD(GetClassName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; /*** IDirect3DRMMaterial methods ***/ @@ -3707,7 +3707,7 @@ DECLARE_INTERFACE_(IDirect3DRMMaterial2, IDirect3DRMObject) STDMETHOD(DeleteDestroyCallback)(THIS_ D3DRMOBJECTCALLBACK, LPVOID argument) PURE; STDMETHOD(SetAppData)(THIS_ DWORD data) PURE; STDMETHOD_(DWORD, GetAppData)(THIS) PURE; - STDMETHOD(SetName)(THIS_ LPCSTR) PURE; + STDMETHOD(SetName)(THIS_ const char *name) PURE; STDMETHOD(GetName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; STDMETHOD(GetClassName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; /*** IDirect3DRMMaterial2 methods ***/ @@ -3786,7 +3786,7 @@ DECLARE_INTERFACE_(IDirect3DRMAnimation, IDirect3DRMObject) STDMETHOD(DeleteDestroyCallback)(THIS_ D3DRMOBJECTCALLBACK, LPVOID argument) PURE; STDMETHOD(SetAppData)(THIS_ DWORD data) PURE; STDMETHOD_(DWORD, GetAppData)(THIS) PURE; - STDMETHOD(SetName)(THIS_ LPCSTR) PURE; + STDMETHOD(SetName)(THIS_ const char *name) PURE; STDMETHOD(GetName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; STDMETHOD(GetClassName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; /*** IDirect3DRMAnimation methods ***/ @@ -3865,7 +3865,7 @@ DECLARE_INTERFACE_(IDirect3DRMAnimation2, IDirect3DRMObject) STDMETHOD(DeleteDestroyCallback)(THIS_ D3DRMOBJECTCALLBACK, LPVOID argument) PURE; STDMETHOD(SetAppData)(THIS_ DWORD data) PURE; STDMETHOD_(DWORD, GetAppData)(THIS) PURE; - STDMETHOD(SetName)(THIS_ LPCSTR) PURE; + STDMETHOD(SetName)(THIS_ const char *name) PURE; STDMETHOD(GetName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; STDMETHOD(GetClassName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; /*** IDirect3DRMAnimation2 methods ***/ @@ -3959,7 +3959,7 @@ DECLARE_INTERFACE_(IDirect3DRMAnimationSet, IDirect3DRMObject) STDMETHOD(DeleteDestroyCallback)(THIS_ D3DRMOBJECTCALLBACK, LPVOID argument) PURE; STDMETHOD(SetAppData)(THIS_ DWORD data) PURE; STDMETHOD_(DWORD, GetAppData)(THIS) PURE; - STDMETHOD(SetName)(THIS_ LPCSTR) PURE; + STDMETHOD(SetName)(THIS_ const char *name) PURE; STDMETHOD(GetName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; STDMETHOD(GetClassName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; /*** IDirect3DRMAnimationSet methods ***/ @@ -4027,7 +4027,7 @@ DECLARE_INTERFACE_(IDirect3DRMAnimationSet2, IDirect3DRMObject) STDMETHOD(DeleteDestroyCallback)(THIS_ D3DRMOBJECTCALLBACK, LPVOID argument) PURE; STDMETHOD(SetAppData)(THIS_ DWORD data) PURE; STDMETHOD_(DWORD, GetAppData)(THIS) PURE; - STDMETHOD(SetName)(THIS_ LPCSTR) PURE; + STDMETHOD(SetName)(THIS_ const char *name) PURE; STDMETHOD(GetName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; STDMETHOD(GetClassName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; /*** IDirect3DRMAnimationSet2 methods ***/ @@ -4098,7 +4098,7 @@ DECLARE_INTERFACE_(IDirect3DRMUserVisual, IDirect3DRMVisual) STDMETHOD(DeleteDestroyCallback)(THIS_ D3DRMOBJECTCALLBACK, LPVOID argument) PURE; STDMETHOD(SetAppData)(THIS_ DWORD data) PURE; STDMETHOD_(DWORD, GetAppData)(THIS) PURE; - STDMETHOD(SetName)(THIS_ LPCSTR) PURE; + STDMETHOD(SetName)(THIS_ const char *name) PURE; STDMETHOD(GetName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; STDMETHOD(GetClassName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; /*** IDirect3DRMUserVisual methods ***/ @@ -4559,7 +4559,7 @@ DECLARE_INTERFACE_(IDirect3DRMInterpolator, IDirect3DRMObject) STDMETHOD(DeleteDestroyCallback)(THIS_ D3DRMOBJECTCALLBACK, LPVOID argument) PURE; STDMETHOD(SetAppData)(THIS_ DWORD data) PURE; STDMETHOD_(DWORD, GetAppData)(THIS) PURE; - STDMETHOD(SetName)(THIS_ LPCSTR) PURE; + STDMETHOD(SetName)(THIS_ const char *name) PURE; STDMETHOD(GetName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; STDMETHOD(GetClassName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; /*** IDirect3DRMInterpolator methods ***/ @@ -4632,7 +4632,7 @@ DECLARE_INTERFACE_(IDirect3DRMClippedVisual, IDirect3DRMVisual) STDMETHOD(DeleteDestroyCallback)(THIS_ D3DRMOBJECTCALLBACK, LPVOID argument) PURE; STDMETHOD(SetAppData)(THIS_ DWORD data) PURE; STDMETHOD_(DWORD, GetAppData)(THIS) PURE; - STDMETHOD(SetName)(THIS_ LPCSTR) PURE; + STDMETHOD(SetName)(THIS_ const char *name) PURE; STDMETHOD(GetName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; STDMETHOD(GetClassName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; /*** IDirect3DRMClippedVisual methods ***/ diff --git a/include/d3drmwin.h b/include/d3drmwin.h index d9ed873a747..772fc2cbfe2 100644 --- a/include/d3drmwin.h +++ b/include/d3drmwin.h @@ -51,7 +51,7 @@ DECLARE_INTERFACE_(IDirect3DRMWinDevice,IDirect3DRMObject) STDMETHOD(DeleteDestroyCallback)(THIS_ D3DRMOBJECTCALLBACK, LPVOID argument) PURE; STDMETHOD(SetAppData)(THIS_ DWORD data) PURE; STDMETHOD_(DWORD, GetAppData)(THIS) PURE; - STDMETHOD(SetName)(THIS_ LPCSTR) PURE; + STDMETHOD(SetName)(THIS_ const char *name) PURE; STDMETHOD(GetName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; STDMETHOD(GetClassName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; /*** IDirect3DRMWinDevice methods ***/