[PATCH 4/5] d3d10: Avoid LPCSTR.
Henri Verbeet
hverbeet at codeweavers.com
Wed Sep 18 03:57:12 CDT 2013
---
dlls/d3d10/d3d10_main.c | 6 +--
dlls/d3d10/effect.c | 111 +++++++++++++++++++++---------------------
dlls/d3d10/shader.c | 4 +-
include/d3d10.idl | 10 ++--
include/d3d10_1shader.h | 6 +--
include/d3d10effect.h | 122 +++++++++++++++++++++++------------------------
include/d3d10shader.h | 30 ++++++------
include/d3dcommon.idl | 4 +-
8 files changed, 148 insertions(+), 145 deletions(-)
diff --git a/dlls/d3d10/d3d10_main.c b/dlls/d3d10/d3d10_main.c
index 5c3eec8..ac3eee5 100644
--- a/dlls/d3d10/d3d10_main.c
+++ b/dlls/d3d10/d3d10_main.c
@@ -261,21 +261,21 @@ HRESULT WINAPI D3D10CompileEffectFromMemory(void *data, SIZE_T data_size, const
}
-LPCSTR WINAPI D3D10GetVertexShaderProfile(ID3D10Device *device)
+const char * WINAPI D3D10GetVertexShaderProfile(ID3D10Device *device)
{
FIXME("device %p stub!\n", device);
return "vs_4_0";
}
-LPCSTR WINAPI D3D10GetGeometryShaderProfile(ID3D10Device *device)
+const char * WINAPI D3D10GetGeometryShaderProfile(ID3D10Device *device)
{
FIXME("device %p stub!\n", device);
return "gs_4_0";
}
-LPCSTR WINAPI D3D10GetPixelShaderProfile(ID3D10Device *device)
+const char * WINAPI D3D10GetPixelShaderProfile(ID3D10Device *device)
{
FIXME("device %p stub!\n", device);
diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c
index c465c43..cda9bbd 100644
--- a/dlls/d3d10/effect.c
+++ b/dlls/d3d10/effect.c
@@ -2577,7 +2577,7 @@ static struct ID3D10EffectConstantBuffer * STDMETHODCALLTYPE d3d10_effect_GetCon
}
static struct ID3D10EffectConstantBuffer * STDMETHODCALLTYPE d3d10_effect_GetConstantBufferByName(ID3D10Effect *iface,
- LPCSTR name)
+ const char *name)
{
struct d3d10_effect *This = impl_from_ID3D10Effect(iface);
unsigned int i;
@@ -2634,7 +2634,8 @@ static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_GetVariableB
return &null_variable.ID3D10EffectVariable_iface;
}
-static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_GetVariableByName(ID3D10Effect *iface, LPCSTR name)
+static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_GetVariableByName(ID3D10Effect *iface,
+ const char *name)
{
struct d3d10_effect *This = impl_from_ID3D10Effect(iface);
unsigned int i;
@@ -2681,7 +2682,7 @@ static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_GetVariableB
}
static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_GetVariableBySemantic(ID3D10Effect *iface,
- LPCSTR semantic)
+ const char *semantic)
{
struct d3d10_effect *This = impl_from_ID3D10Effect(iface);
unsigned int i;
@@ -2749,7 +2750,7 @@ static struct ID3D10EffectTechnique * STDMETHODCALLTYPE d3d10_effect_GetTechniqu
}
static struct ID3D10EffectTechnique * STDMETHODCALLTYPE d3d10_effect_GetTechniqueByName(ID3D10Effect *iface,
- LPCSTR name)
+ const char *name)
{
struct d3d10_effect *This = impl_from_ID3D10Effect(iface);
unsigned int i;
@@ -2877,7 +2878,7 @@ static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_technique_Ge
}
static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_technique_GetAnnotationByName(
- ID3D10EffectTechnique *iface, LPCSTR name)
+ ID3D10EffectTechnique *iface, const char *name)
{
struct d3d10_effect_technique *This = impl_from_ID3D10EffectTechnique(iface);
unsigned int i;
@@ -2921,7 +2922,7 @@ static struct ID3D10EffectPass * STDMETHODCALLTYPE d3d10_effect_technique_GetPas
}
static struct ID3D10EffectPass * STDMETHODCALLTYPE d3d10_effect_technique_GetPassByName(ID3D10EffectTechnique *iface,
- LPCSTR name)
+ const char *name)
{
struct d3d10_effect_technique *This = impl_from_ID3D10EffectTechnique(iface);
unsigned int i;
@@ -3109,7 +3110,7 @@ static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_pass_GetAnno
}
static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_pass_GetAnnotationByName(ID3D10EffectPass *iface,
- LPCSTR name)
+ const char *name)
{
struct d3d10_effect_pass *This = impl_from_ID3D10EffectPass(iface);
unsigned int i;
@@ -3247,7 +3248,7 @@ static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_variable_Get
}
static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_variable_GetAnnotationByName(
- ID3D10EffectVariable *iface, LPCSTR name)
+ ID3D10EffectVariable *iface, const char *name)
{
struct d3d10_effect_variable *This = impl_from_ID3D10EffectVariable(iface);
unsigned int i;
@@ -3291,7 +3292,7 @@ static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_variable_Get
}
static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_variable_GetMemberByName(
- ID3D10EffectVariable *iface, LPCSTR name)
+ ID3D10EffectVariable *iface, const char *name)
{
struct d3d10_effect_variable *This = impl_from_ID3D10EffectVariable(iface);
unsigned int i;
@@ -3324,7 +3325,7 @@ static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_variable_Get
}
static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_variable_GetMemberBySemantic(
- ID3D10EffectVariable *iface, LPCSTR semantic)
+ ID3D10EffectVariable *iface, const char *semantic)
{
struct d3d10_effect_variable *This = impl_from_ID3D10EffectVariable(iface);
unsigned int i;
@@ -3627,7 +3628,7 @@ static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_constant_buf
}
static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_constant_buffer_GetAnnotationByName(
- ID3D10EffectConstantBuffer *iface, LPCSTR name)
+ ID3D10EffectConstantBuffer *iface, const char *name)
{
return d3d10_effect_variable_GetAnnotationByName((ID3D10EffectVariable *)iface, name);
}
@@ -3639,13 +3640,13 @@ static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_constant_buf
}
static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_constant_buffer_GetMemberByName(
- ID3D10EffectConstantBuffer *iface, LPCSTR name)
+ ID3D10EffectConstantBuffer *iface, const char *name)
{
return d3d10_effect_variable_GetMemberByName((ID3D10EffectVariable *)iface, name);
}
static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_constant_buffer_GetMemberBySemantic(
- ID3D10EffectConstantBuffer *iface, LPCSTR semantic)
+ ID3D10EffectConstantBuffer *iface, const char *semantic)
{
return d3d10_effect_variable_GetMemberBySemantic((ID3D10EffectVariable *)iface, semantic);
}
@@ -3847,7 +3848,7 @@ static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_scalar_varia
}
static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_scalar_variable_GetAnnotationByName(
- ID3D10EffectScalarVariable *iface, LPCSTR name)
+ ID3D10EffectScalarVariable *iface, const char *name)
{
return d3d10_effect_variable_GetAnnotationByName((ID3D10EffectVariable *)iface, name);
}
@@ -3859,13 +3860,13 @@ static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_scalar_varia
}
static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_scalar_variable_GetMemberByName(
- ID3D10EffectScalarVariable *iface, LPCSTR name)
+ ID3D10EffectScalarVariable *iface, const char *name)
{
return d3d10_effect_variable_GetMemberByName((ID3D10EffectVariable *)iface, name);
}
static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_scalar_variable_GetMemberBySemantic(
- ID3D10EffectScalarVariable *iface, LPCSTR semantic)
+ ID3D10EffectScalarVariable *iface, const char *semantic)
{
return d3d10_effect_variable_GetMemberBySemantic((ID3D10EffectVariable *)iface, semantic);
}
@@ -4141,7 +4142,7 @@ static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_vector_varia
}
static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_vector_variable_GetAnnotationByName(
- ID3D10EffectVectorVariable *iface, LPCSTR name)
+ ID3D10EffectVectorVariable *iface, const char *name)
{
return d3d10_effect_variable_GetAnnotationByName((ID3D10EffectVariable *)iface, name);
}
@@ -4153,13 +4154,13 @@ static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_vector_varia
}
static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_vector_variable_GetMemberByName(
- ID3D10EffectVectorVariable *iface, LPCSTR name)
+ ID3D10EffectVectorVariable *iface, const char *name)
{
return d3d10_effect_variable_GetMemberByName((ID3D10EffectVariable *)iface, name);
}
static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_vector_variable_GetMemberBySemantic(
- ID3D10EffectVectorVariable *iface, LPCSTR semantic)
+ ID3D10EffectVectorVariable *iface, const char *semantic)
{
return d3d10_effect_variable_GetMemberBySemantic((ID3D10EffectVariable *)iface, semantic);
}
@@ -4435,7 +4436,7 @@ static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_matrix_varia
}
static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_matrix_variable_GetAnnotationByName(
- ID3D10EffectMatrixVariable *iface, LPCSTR name)
+ ID3D10EffectMatrixVariable *iface, const char *name)
{
return d3d10_effect_variable_GetAnnotationByName((ID3D10EffectVariable *)iface, name);
}
@@ -4447,13 +4448,13 @@ static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_matrix_varia
}
static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_matrix_variable_GetMemberByName(
- ID3D10EffectMatrixVariable *iface, LPCSTR name)
+ ID3D10EffectMatrixVariable *iface, const char *name)
{
return d3d10_effect_variable_GetMemberByName((ID3D10EffectVariable *)iface, name);
}
static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_matrix_variable_GetMemberBySemantic(
- ID3D10EffectMatrixVariable *iface, LPCSTR semantic)
+ ID3D10EffectMatrixVariable *iface, const char *semantic)
{
return d3d10_effect_variable_GetMemberBySemantic((ID3D10EffectVariable *)iface, semantic);
}
@@ -4694,7 +4695,7 @@ static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_string_varia
}
static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_string_variable_GetAnnotationByName(
- ID3D10EffectStringVariable *iface, LPCSTR name)
+ ID3D10EffectStringVariable *iface, const char *name)
{
return d3d10_effect_variable_GetAnnotationByName((ID3D10EffectVariable *)iface, name);
}
@@ -4706,13 +4707,13 @@ static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_string_varia
}
static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_string_variable_GetMemberByName(
- ID3D10EffectStringVariable *iface, LPCSTR name)
+ ID3D10EffectStringVariable *iface, const char *name)
{
return d3d10_effect_variable_GetMemberByName((ID3D10EffectVariable *)iface, name);
}
static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_string_variable_GetMemberBySemantic(
- ID3D10EffectStringVariable *iface, LPCSTR semantic)
+ ID3D10EffectStringVariable *iface, const char *semantic)
{
return d3d10_effect_variable_GetMemberBySemantic((ID3D10EffectVariable *)iface, semantic);
}
@@ -4822,7 +4823,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_string_variable_GetRawValue(ID3D10
/* ID3D10EffectStringVariable methods */
static HRESULT STDMETHODCALLTYPE d3d10_effect_string_variable_GetString(ID3D10EffectStringVariable *iface,
- LPCSTR *str)
+ const char **str)
{
FIXME("iface %p, str %p stub!\n", iface, str);
@@ -4830,7 +4831,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_string_variable_GetString(ID3D10Ef
}
static HRESULT STDMETHODCALLTYPE d3d10_effect_string_variable_GetStringArray(ID3D10EffectStringVariable *iface,
- LPCSTR *strs, UINT offset, UINT count)
+ const char **strs, UINT offset, UINT count)
{
FIXME("iface %p, strs %p, offset %u, count %u stub!\n", iface, strs, offset, count);
@@ -4899,7 +4900,7 @@ static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_shader_resou
}
static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_shader_resource_variable_GetAnnotationByName(
- ID3D10EffectShaderResourceVariable *iface, LPCSTR name)
+ ID3D10EffectShaderResourceVariable *iface, const char *name)
{
return d3d10_effect_variable_GetAnnotationByName((ID3D10EffectVariable *)iface, name);
}
@@ -4911,13 +4912,13 @@ static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_shader_resou
}
static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_shader_resource_variable_GetMemberByName(
- ID3D10EffectShaderResourceVariable *iface, LPCSTR name)
+ ID3D10EffectShaderResourceVariable *iface, const char *name)
{
return d3d10_effect_variable_GetMemberByName((ID3D10EffectVariable *)iface, name);
}
static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_shader_resource_variable_GetMemberBySemantic(
- ID3D10EffectShaderResourceVariable *iface, LPCSTR semantic)
+ ID3D10EffectShaderResourceVariable *iface, const char *semantic)
{
return d3d10_effect_variable_GetMemberBySemantic((ID3D10EffectVariable *)iface, semantic);
}
@@ -5123,7 +5124,7 @@ static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_render_targe
}
static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_render_target_view_variable_GetAnnotationByName(
- ID3D10EffectRenderTargetViewVariable *iface, LPCSTR name)
+ ID3D10EffectRenderTargetViewVariable *iface, const char *name)
{
return d3d10_effect_variable_GetAnnotationByName((ID3D10EffectVariable *)iface, name);
}
@@ -5135,13 +5136,13 @@ static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_render_targe
}
static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_render_target_view_variable_GetMemberByName(
- ID3D10EffectRenderTargetViewVariable *iface, LPCSTR name)
+ ID3D10EffectRenderTargetViewVariable *iface, const char *name)
{
return d3d10_effect_variable_GetMemberByName((ID3D10EffectVariable *)iface, name);
}
static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_render_target_view_variable_GetMemberBySemantic(
- ID3D10EffectRenderTargetViewVariable *iface, LPCSTR semantic)
+ ID3D10EffectRenderTargetViewVariable *iface, const char *semantic)
{
return d3d10_effect_variable_GetMemberBySemantic((ID3D10EffectVariable *)iface, semantic);
}
@@ -5347,7 +5348,7 @@ static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_depth_stenci
}
static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_depth_stencil_view_variable_GetAnnotationByName(
- ID3D10EffectDepthStencilViewVariable *iface, LPCSTR name)
+ ID3D10EffectDepthStencilViewVariable *iface, const char *name)
{
return d3d10_effect_variable_GetAnnotationByName((ID3D10EffectVariable *)iface, name);
}
@@ -5359,13 +5360,13 @@ static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_depth_stenci
}
static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_depth_stencil_view_variable_GetMemberByName(
- ID3D10EffectDepthStencilViewVariable *iface, LPCSTR name)
+ ID3D10EffectDepthStencilViewVariable *iface, const char *name)
{
return d3d10_effect_variable_GetMemberByName((ID3D10EffectVariable *)iface, name);
}
static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_depth_stencil_view_variable_GetMemberBySemantic(
- ID3D10EffectDepthStencilViewVariable *iface, LPCSTR semantic)
+ ID3D10EffectDepthStencilViewVariable *iface, const char *semantic)
{
return d3d10_effect_variable_GetMemberBySemantic((ID3D10EffectVariable *)iface, semantic);
}
@@ -5570,7 +5571,7 @@ static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_shader_varia
}
static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_shader_variable_GetAnnotationByName(
- ID3D10EffectShaderVariable *iface, LPCSTR name)
+ ID3D10EffectShaderVariable *iface, const char *name)
{
return d3d10_effect_variable_GetAnnotationByName((ID3D10EffectVariable *)iface, name);
}
@@ -5582,13 +5583,13 @@ static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_shader_varia
}
static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_shader_variable_GetMemberByName(
- ID3D10EffectShaderVariable *iface, LPCSTR name)
+ ID3D10EffectShaderVariable *iface, const char *name)
{
return d3d10_effect_variable_GetMemberByName((ID3D10EffectVariable *)iface, name);
}
static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_shader_variable_GetMemberBySemantic(
- ID3D10EffectShaderVariable *iface, LPCSTR semantic)
+ ID3D10EffectShaderVariable *iface, const char *semantic)
{
return d3d10_effect_variable_GetMemberBySemantic((ID3D10EffectVariable *)iface, semantic);
}
@@ -5949,7 +5950,7 @@ static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_blend_variab
}
static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_blend_variable_GetAnnotationByName(
- ID3D10EffectBlendVariable *iface, LPCSTR name)
+ ID3D10EffectBlendVariable *iface, const char *name)
{
return d3d10_effect_variable_GetAnnotationByName((ID3D10EffectVariable *)iface, name);
}
@@ -5961,13 +5962,13 @@ static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_blend_variab
}
static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_blend_variable_GetMemberByName(
- ID3D10EffectBlendVariable *iface, LPCSTR name)
+ ID3D10EffectBlendVariable *iface, const char *name)
{
return d3d10_effect_variable_GetMemberByName((ID3D10EffectVariable *)iface, name);
}
static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_blend_variable_GetMemberBySemantic(
- ID3D10EffectBlendVariable *iface, LPCSTR semantic)
+ ID3D10EffectBlendVariable *iface, const char *semantic)
{
return d3d10_effect_variable_GetMemberBySemantic((ID3D10EffectVariable *)iface, semantic);
}
@@ -6183,7 +6184,7 @@ static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_depth_stenci
}
static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_depth_stencil_variable_GetAnnotationByName(
- ID3D10EffectDepthStencilVariable *iface, LPCSTR name)
+ ID3D10EffectDepthStencilVariable *iface, const char *name)
{
return d3d10_effect_variable_GetAnnotationByName((ID3D10EffectVariable *)iface, name);
}
@@ -6195,13 +6196,13 @@ static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_depth_stenci
}
static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_depth_stencil_variable_GetMemberByName(
- ID3D10EffectDepthStencilVariable *iface, LPCSTR name)
+ ID3D10EffectDepthStencilVariable *iface, const char *name)
{
return d3d10_effect_variable_GetMemberByName((ID3D10EffectVariable *)iface, name);
}
static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_depth_stencil_variable_GetMemberBySemantic(
- ID3D10EffectDepthStencilVariable *iface, LPCSTR semantic)
+ ID3D10EffectDepthStencilVariable *iface, const char *semantic)
{
return d3d10_effect_variable_GetMemberBySemantic((ID3D10EffectVariable *)iface, semantic);
}
@@ -6417,7 +6418,7 @@ static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_rasterizer_v
}
static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_rasterizer_variable_GetAnnotationByName(
- ID3D10EffectRasterizerVariable *iface, LPCSTR name)
+ ID3D10EffectRasterizerVariable *iface, const char *name)
{
return d3d10_effect_variable_GetAnnotationByName((ID3D10EffectVariable *)iface, name);
}
@@ -6429,13 +6430,13 @@ static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_rasterizer_v
}
static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_rasterizer_variable_GetMemberByName(
- ID3D10EffectRasterizerVariable *iface, LPCSTR name)
+ ID3D10EffectRasterizerVariable *iface, const char *name)
{
return d3d10_effect_variable_GetMemberByName((ID3D10EffectVariable *)iface, name);
}
static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_rasterizer_variable_GetMemberBySemantic(
- ID3D10EffectRasterizerVariable *iface, LPCSTR semantic)
+ ID3D10EffectRasterizerVariable *iface, const char *semantic)
{
return d3d10_effect_variable_GetMemberBySemantic((ID3D10EffectVariable *)iface, semantic);
}
@@ -6651,7 +6652,7 @@ static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_sampler_vari
}
static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_sampler_variable_GetAnnotationByName(
- ID3D10EffectSamplerVariable *iface, LPCSTR name)
+ ID3D10EffectSamplerVariable *iface, const char *name)
{
return d3d10_effect_variable_GetAnnotationByName((ID3D10EffectVariable *)iface, name);
}
@@ -6663,13 +6664,13 @@ static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_sampler_vari
}
static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_sampler_variable_GetMemberByName(
- ID3D10EffectSamplerVariable *iface, LPCSTR name)
+ ID3D10EffectSamplerVariable *iface, const char *name)
{
return d3d10_effect_variable_GetMemberByName((ID3D10EffectVariable *)iface, name);
}
static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_sampler_variable_GetMemberBySemantic(
- ID3D10EffectSamplerVariable *iface, LPCSTR semantic)
+ ID3D10EffectSamplerVariable *iface, const char *semantic)
{
return d3d10_effect_variable_GetMemberBySemantic((ID3D10EffectVariable *)iface, semantic);
}
@@ -6927,7 +6928,7 @@ static struct ID3D10EffectType * STDMETHODCALLTYPE d3d10_effect_type_GetMemberTy
}
static struct ID3D10EffectType * STDMETHODCALLTYPE d3d10_effect_type_GetMemberTypeByName(ID3D10EffectType *iface,
- LPCSTR name)
+ const char *name)
{
struct d3d10_effect_type *This = impl_from_ID3D10EffectType(iface);
unsigned int i;
@@ -6960,7 +6961,7 @@ static struct ID3D10EffectType * STDMETHODCALLTYPE d3d10_effect_type_GetMemberTy
}
static struct ID3D10EffectType * STDMETHODCALLTYPE d3d10_effect_type_GetMemberTypeBySemantic(ID3D10EffectType *iface,
- LPCSTR semantic)
+ const char *semantic)
{
struct d3d10_effect_type *This = impl_from_ID3D10EffectType(iface);
unsigned int i;
@@ -6992,7 +6993,7 @@ static struct ID3D10EffectType * STDMETHODCALLTYPE d3d10_effect_type_GetMemberTy
return &null_type.ID3D10EffectType_iface;
}
-static LPCSTR STDMETHODCALLTYPE d3d10_effect_type_GetMemberName(ID3D10EffectType *iface, UINT index)
+static const char * STDMETHODCALLTYPE d3d10_effect_type_GetMemberName(ID3D10EffectType *iface, UINT index)
{
struct d3d10_effect_type *This = impl_from_ID3D10EffectType(iface);
struct d3d10_effect_type_member *typem;
@@ -7012,7 +7013,7 @@ static LPCSTR STDMETHODCALLTYPE d3d10_effect_type_GetMemberName(ID3D10EffectType
return typem->name;
}
-static LPCSTR STDMETHODCALLTYPE d3d10_effect_type_GetMemberSemantic(ID3D10EffectType *iface, UINT index)
+static const char * STDMETHODCALLTYPE d3d10_effect_type_GetMemberSemantic(ID3D10EffectType *iface, UINT index)
{
struct d3d10_effect_type *This = impl_from_ID3D10EffectType(iface);
struct d3d10_effect_type_member *typem;
diff --git a/dlls/d3d10/shader.c b/dlls/d3d10/shader.c
index 864f21f..19ca5b4 100644
--- a/dlls/d3d10/shader.c
+++ b/dlls/d3d10/shader.c
@@ -93,9 +93,9 @@ static struct ID3D10ShaderReflectionConstantBuffer * STDMETHODCALLTYPE d3d10_sha
}
static struct ID3D10ShaderReflectionConstantBuffer * STDMETHODCALLTYPE d3d10_shader_reflection_GetConstantBufferByName(
- ID3D10ShaderReflection *iface, LPCSTR name)
+ ID3D10ShaderReflection *iface, const char *name)
{
- FIXME("iface %p, name \"%s\" stub!\n", iface, name);
+ FIXME("iface %p, name %s stub!\n", iface, debugstr_a(name));
return NULL;
}
diff --git a/include/d3d10.idl b/include/d3d10.idl
index 9f84400..4b058ac 100644
--- a/include/d3d10.idl
+++ b/include/d3d10.idl
@@ -795,8 +795,9 @@ typedef struct D3D10_SUBRESOURCE_DATA {
UINT SysMemSlicePitch;
} D3D10_SUBRESOURCE_DATA;
-typedef struct D3D10_SO_DECLARATION_ENTRY {
- LPCSTR SemanticName;
+typedef struct D3D10_SO_DECLARATION_ENTRY
+{
+ const char *SemanticName;
UINT SemanticIndex;
BYTE StartComponent;
BYTE ComponentCount;
@@ -808,8 +809,9 @@ typedef enum D3D10_INPUT_CLASSIFICATION {
D3D10_INPUT_PER_INSTANCE_DATA,
} D3D10_INPUT_CLASSIFICATION;
-typedef struct D3D10_INPUT_ELEMENT_DESC {
- LPCSTR SemanticName;
+typedef struct D3D10_INPUT_ELEMENT_DESC
+{
+ const char *SemanticName;
UINT SemanticIndex;
DXGI_FORMAT Format;
UINT InputSlot;
diff --git a/include/d3d10_1shader.h b/include/d3d10_1shader.h
index 6eda20c..92f5ebf 100644
--- a/include/d3d10_1shader.h
+++ b/include/d3d10_1shader.h
@@ -33,12 +33,12 @@ DECLARE_INTERFACE_(ID3D10ShaderReflection1, IUnknown)
/* ID3D10ShaderReflection1 methods */
STDMETHOD(GetDesc)(THIS_ D3D10_SHADER_DESC *desc) PURE;
STDMETHOD_(struct ID3D10ShaderReflectionConstantBuffer *, GetConstantBufferByIndex)(THIS_ UINT index) PURE;
- STDMETHOD_(struct ID3D10ShaderReflectionConstantBuffer *, GetConstantBufferByName)(THIS_ LPCSTR name) PURE;
+ STDMETHOD_(struct ID3D10ShaderReflectionConstantBuffer *, GetConstantBufferByName)(THIS_ const char *name) PURE;
STDMETHOD(GetResourceBindingDesc)(THIS_ UINT index, D3D10_SHADER_INPUT_BIND_DESC *desc) PURE;
STDMETHOD(GetInputParameterDesc)(THIS_ UINT index, D3D10_SIGNATURE_PARAMETER_DESC *desc) PURE;
STDMETHOD(GetOutputParameterDesc)(THIS_ UINT index, D3D10_SIGNATURE_PARAMETER_DESC *desc) PURE;
- STDMETHOD_(struct ID3D10ShaderReflectionVariable *, GetVariableByName)(THIS_ LPCSTR name) PURE;
- STDMETHOD(GetResourceBindingDescByName)(THIS_ LPCSTR name, D3D10_SHADER_INPUT_BIND_DESC *desc) PURE;
+ STDMETHOD_(struct ID3D10ShaderReflectionVariable *, GetVariableByName)(THIS_ const char *name) PURE;
+ STDMETHOD(GetResourceBindingDescByName)(THIS_ const char *name, D3D10_SHADER_INPUT_BIND_DESC *desc) PURE;
STDMETHOD(GetMovInstructionCount)(THIS_ UINT *count) PURE;
STDMETHOD(GetMovcInstructionCount)(THIS_ UINT *count) PURE;
STDMETHOD(GetConversionInstructionCount)(THIS_ UINT *count) PURE;
diff --git a/include/d3d10effect.h b/include/d3d10effect.h
index 521cd4b..5af2ef5 100644
--- a/include/d3d10effect.h
+++ b/include/d3d10effect.h
@@ -60,7 +60,7 @@ typedef enum _D3D10_DEVICE_STATE_TYPES
typedef struct _D3D10_EFFECT_TYPE_DESC
{
- LPCSTR TypeName;
+ const char *TypeName;
D3D10_SHADER_VARIABLE_CLASS Class;
D3D10_SHADER_VARIABLE_TYPE Type;
UINT Elements;
@@ -74,8 +74,8 @@ typedef struct _D3D10_EFFECT_TYPE_DESC
typedef struct _D3D10_EFFECT_VARIABLE_DESC
{
- LPCSTR Name;
- LPCSTR Semantic;
+ const char *Name;
+ const char *Semantic;
UINT Flags;
UINT Annotations;
UINT BufferOffset;
@@ -84,7 +84,7 @@ typedef struct _D3D10_EFFECT_VARIABLE_DESC
typedef struct _D3D10_TECHNIQUE_DESC
{
- LPCSTR Name;
+ const char *Name;
UINT Passes;
UINT Annotations;
} D3D10_TECHNIQUE_DESC;
@@ -133,14 +133,14 @@ typedef struct _D3D10_EFFECT_SHADER_DESC
BOOL IsInline;
const BYTE *pBytecode;
UINT BytecodeLength;
- LPCSTR SODecl;
+ const char *SODecl;
UINT NumInputSignatureEntries;
UINT NumOutputSignatureEntries;
} D3D10_EFFECT_SHADER_DESC;
typedef struct _D3D10_PASS_DESC
{
- LPCSTR Name;
+ const char *Name;
UINT Annotations;
BYTE *pIAInputSignature;
SIZE_T IAInputSignatureSize;
@@ -167,10 +167,10 @@ DECLARE_INTERFACE(ID3D10EffectType)
STDMETHOD_(BOOL, IsValid)(THIS) PURE;
STDMETHOD(GetDesc)(THIS_ D3D10_EFFECT_TYPE_DESC *desc) PURE;
STDMETHOD_(struct ID3D10EffectType *, GetMemberTypeByIndex)(THIS_ UINT index) PURE;
- STDMETHOD_(struct ID3D10EffectType *, GetMemberTypeByName)(THIS_ LPCSTR name) PURE;
- STDMETHOD_(struct ID3D10EffectType *, GetMemberTypeBySemantic)(THIS_ LPCSTR semantic) PURE;
- STDMETHOD_(LPCSTR, GetMemberName)(THIS_ UINT index) PURE;
- STDMETHOD_(LPCSTR, GetMemberSemantic)(THIS_ UINT index) PURE;
+ STDMETHOD_(struct ID3D10EffectType *, GetMemberTypeByName)(THIS_ const char *name) PURE;
+ STDMETHOD_(struct ID3D10EffectType *, GetMemberTypeBySemantic)(THIS_ const char *semantic) PURE;
+ STDMETHOD_(const char *, GetMemberName)(THIS_ UINT index) PURE;
+ STDMETHOD_(const char *, GetMemberSemantic)(THIS_ UINT index) PURE;
};
#undef INTERFACE
@@ -183,10 +183,10 @@ DECLARE_INTERFACE(ID3D10EffectVariable)
STDMETHOD_(struct ID3D10EffectType *, GetType)(THIS) PURE;
STDMETHOD(GetDesc)(THIS_ D3D10_EFFECT_VARIABLE_DESC *desc) PURE;
STDMETHOD_(struct ID3D10EffectVariable *, GetAnnotationByIndex)(THIS_ UINT index) PURE;
- STDMETHOD_(struct ID3D10EffectVariable *, GetAnnotationByName)(THIS_ LPCSTR name) PURE;
+ STDMETHOD_(struct ID3D10EffectVariable *, GetAnnotationByName)(THIS_ const char *name) PURE;
STDMETHOD_(struct ID3D10EffectVariable *, GetMemberByIndex)(THIS_ UINT index) PURE;
- STDMETHOD_(struct ID3D10EffectVariable *, GetMemberByName)(THIS_ LPCSTR name) PURE;
- STDMETHOD_(struct ID3D10EffectVariable *, GetMemberBySemantic)(THIS_ LPCSTR semantic) PURE;
+ STDMETHOD_(struct ID3D10EffectVariable *, GetMemberByName)(THIS_ const char *name) PURE;
+ STDMETHOD_(struct ID3D10EffectVariable *, GetMemberBySemantic)(THIS_ const char *semantic) PURE;
STDMETHOD_(struct ID3D10EffectVariable *, GetElement)(THIS_ UINT index) PURE;
STDMETHOD_(struct ID3D10EffectConstantBuffer *, GetParentConstantBuffer)(THIS) PURE;
STDMETHOD_(struct ID3D10EffectScalarVariable *, AsScalar)(THIS) PURE;
@@ -217,10 +217,10 @@ DECLARE_INTERFACE_(ID3D10EffectConstantBuffer, ID3D10EffectVariable)
STDMETHOD_(struct ID3D10EffectType *, GetType)(THIS) PURE;
STDMETHOD(GetDesc)(THIS_ D3D10_EFFECT_VARIABLE_DESC *desc) PURE;
STDMETHOD_(struct ID3D10EffectVariable *, GetAnnotationByIndex)(THIS_ UINT index) PURE;
- STDMETHOD_(struct ID3D10EffectVariable *, GetAnnotationByName)(THIS_ LPCSTR name) PURE;
+ STDMETHOD_(struct ID3D10EffectVariable *, GetAnnotationByName)(THIS_ const char *name) PURE;
STDMETHOD_(struct ID3D10EffectVariable *, GetMemberByIndex)(THIS_ UINT index) PURE;
- STDMETHOD_(struct ID3D10EffectVariable *, GetMemberByName)(THIS_ LPCSTR name) PURE;
- STDMETHOD_(struct ID3D10EffectVariable *, GetMemberBySemantic)(THIS_ LPCSTR semantic) PURE;
+ STDMETHOD_(struct ID3D10EffectVariable *, GetMemberByName)(THIS_ const char *name) PURE;
+ STDMETHOD_(struct ID3D10EffectVariable *, GetMemberBySemantic)(THIS_ const char *semantic) PURE;
STDMETHOD_(struct ID3D10EffectVariable *, GetElement)(THIS_ UINT index) PURE;
STDMETHOD_(struct ID3D10EffectConstantBuffer *, GetParentConstantBuffer)(THIS) PURE;
STDMETHOD_(struct ID3D10EffectScalarVariable *, AsScalar)(THIS) PURE;
@@ -256,10 +256,10 @@ DECLARE_INTERFACE_(ID3D10EffectScalarVariable, ID3D10EffectVariable)
STDMETHOD_(struct ID3D10EffectType *, GetType)(THIS) PURE;
STDMETHOD(GetDesc)(THIS_ D3D10_EFFECT_VARIABLE_DESC *desc) PURE;
STDMETHOD_(struct ID3D10EffectVariable *, GetAnnotationByIndex)(THIS_ UINT index) PURE;
- STDMETHOD_(struct ID3D10EffectVariable *, GetAnnotationByName)(THIS_ LPCSTR name) PURE;
+ STDMETHOD_(struct ID3D10EffectVariable *, GetAnnotationByName)(THIS_ const char *name) PURE;
STDMETHOD_(struct ID3D10EffectVariable *, GetMemberByIndex)(THIS_ UINT index) PURE;
- STDMETHOD_(struct ID3D10EffectVariable *, GetMemberByName)(THIS_ LPCSTR name) PURE;
- STDMETHOD_(struct ID3D10EffectVariable *, GetMemberBySemantic)(THIS_ LPCSTR semantic) PURE;
+ STDMETHOD_(struct ID3D10EffectVariable *, GetMemberByName)(THIS_ const char *name) PURE;
+ STDMETHOD_(struct ID3D10EffectVariable *, GetMemberBySemantic)(THIS_ const char *semantic) PURE;
STDMETHOD_(struct ID3D10EffectVariable *, GetElement)(THIS_ UINT index) PURE;
STDMETHOD_(struct ID3D10EffectConstantBuffer *, GetParentConstantBuffer)(THIS) PURE;
STDMETHOD_(struct ID3D10EffectScalarVariable *, AsScalar)(THIS) PURE;
@@ -303,10 +303,10 @@ DECLARE_INTERFACE_(ID3D10EffectVectorVariable, ID3D10EffectVariable)
STDMETHOD_(struct ID3D10EffectType *, GetType)(THIS) PURE;
STDMETHOD(GetDesc)(THIS_ D3D10_EFFECT_VARIABLE_DESC *desc) PURE;
STDMETHOD_(struct ID3D10EffectVariable *, GetAnnotationByIndex)(THIS_ UINT index) PURE;
- STDMETHOD_(struct ID3D10EffectVariable *, GetAnnotationByName)(THIS_ LPCSTR name) PURE;
+ STDMETHOD_(struct ID3D10EffectVariable *, GetAnnotationByName)(THIS_ const char *name) PURE;
STDMETHOD_(struct ID3D10EffectVariable *, GetMemberByIndex)(THIS_ UINT index) PURE;
- STDMETHOD_(struct ID3D10EffectVariable *, GetMemberByName)(THIS_ LPCSTR name) PURE;
- STDMETHOD_(struct ID3D10EffectVariable *, GetMemberBySemantic)(THIS_ LPCSTR semantic) PURE;
+ STDMETHOD_(struct ID3D10EffectVariable *, GetMemberByName)(THIS_ const char *name) PURE;
+ STDMETHOD_(struct ID3D10EffectVariable *, GetMemberBySemantic)(THIS_ const char *semantic) PURE;
STDMETHOD_(struct ID3D10EffectVariable *, GetElement)(THIS_ UINT index) PURE;
STDMETHOD_(struct ID3D10EffectConstantBuffer *, GetParentConstantBuffer)(THIS) PURE;
STDMETHOD_(struct ID3D10EffectScalarVariable *, AsScalar)(THIS) PURE;
@@ -350,10 +350,10 @@ DECLARE_INTERFACE_(ID3D10EffectMatrixVariable, ID3D10EffectVariable)
STDMETHOD_(struct ID3D10EffectType *, GetType)(THIS) PURE;
STDMETHOD(GetDesc)(THIS_ D3D10_EFFECT_VARIABLE_DESC *desc) PURE;
STDMETHOD_(struct ID3D10EffectVariable *, GetAnnotationByIndex)(THIS_ UINT index) PURE;
- STDMETHOD_(struct ID3D10EffectVariable *, GetAnnotationByName)(THIS_ LPCSTR name) PURE;
+ STDMETHOD_(struct ID3D10EffectVariable *, GetAnnotationByName)(THIS_ const char *name) PURE;
STDMETHOD_(struct ID3D10EffectVariable *, GetMemberByIndex)(THIS_ UINT index) PURE;
- STDMETHOD_(struct ID3D10EffectVariable *, GetMemberByName)(THIS_ LPCSTR name) PURE;
- STDMETHOD_(struct ID3D10EffectVariable *, GetMemberBySemantic)(THIS_ LPCSTR semantic) PURE;
+ STDMETHOD_(struct ID3D10EffectVariable *, GetMemberByName)(THIS_ const char *name) PURE;
+ STDMETHOD_(struct ID3D10EffectVariable *, GetMemberBySemantic)(THIS_ const char *semantic) PURE;
STDMETHOD_(struct ID3D10EffectVariable *, GetElement)(THIS_ UINT index) PURE;
STDMETHOD_(struct ID3D10EffectConstantBuffer *, GetParentConstantBuffer)(THIS) PURE;
STDMETHOD_(struct ID3D10EffectScalarVariable *, AsScalar)(THIS) PURE;
@@ -393,10 +393,10 @@ DECLARE_INTERFACE_(ID3D10EffectStringVariable, ID3D10EffectVariable)
STDMETHOD_(struct ID3D10EffectType *, GetType)(THIS) PURE;
STDMETHOD(GetDesc)(THIS_ D3D10_EFFECT_VARIABLE_DESC *desc) PURE;
STDMETHOD_(struct ID3D10EffectVariable *, GetAnnotationByIndex)(THIS_ UINT index) PURE;
- STDMETHOD_(struct ID3D10EffectVariable *, GetAnnotationByName)(THIS_ LPCSTR name) PURE;
+ STDMETHOD_(struct ID3D10EffectVariable *, GetAnnotationByName)(THIS_ const char *name) PURE;
STDMETHOD_(struct ID3D10EffectVariable *, GetMemberByIndex)(THIS_ UINT index) PURE;
- STDMETHOD_(struct ID3D10EffectVariable *, GetMemberByName)(THIS_ LPCSTR name) PURE;
- STDMETHOD_(struct ID3D10EffectVariable *, GetMemberBySemantic)(THIS_ LPCSTR semantic) PURE;
+ STDMETHOD_(struct ID3D10EffectVariable *, GetMemberByName)(THIS_ const char *name) PURE;
+ STDMETHOD_(struct ID3D10EffectVariable *, GetMemberBySemantic)(THIS_ const char *semantic) PURE;
STDMETHOD_(struct ID3D10EffectVariable *, GetElement)(THIS_ UINT index) PURE;
STDMETHOD_(struct ID3D10EffectConstantBuffer *, GetParentConstantBuffer)(THIS) PURE;
STDMETHOD_(struct ID3D10EffectScalarVariable *, AsScalar)(THIS) PURE;
@@ -415,8 +415,8 @@ DECLARE_INTERFACE_(ID3D10EffectStringVariable, ID3D10EffectVariable)
STDMETHOD(SetRawValue)(THIS_ void *data, UINT offset, UINT count) PURE;
STDMETHOD(GetRawValue)(THIS_ void *data, UINT offset, UINT count) PURE;
/* ID3D10EffectStringVariable methods */
- STDMETHOD(GetString)(THIS_ LPCSTR *str) PURE;
- STDMETHOD(GetStringArray)(THIS_ LPCSTR *strs, UINT offset, UINT count) PURE;
+ STDMETHOD(GetString)(THIS_ const char **str) PURE;
+ STDMETHOD(GetStringArray)(THIS_ const char **strs, UINT offset, UINT count) PURE;
};
#undef INTERFACE
@@ -431,10 +431,10 @@ DECLARE_INTERFACE_(ID3D10EffectShaderResourceVariable, ID3D10EffectVariable)
STDMETHOD_(struct ID3D10EffectType *, GetType)(THIS) PURE;
STDMETHOD(GetDesc)(THIS_ D3D10_EFFECT_VARIABLE_DESC *desc) PURE;
STDMETHOD_(struct ID3D10EffectVariable *, GetAnnotationByIndex)(THIS_ UINT index) PURE;
- STDMETHOD_(struct ID3D10EffectVariable *, GetAnnotationByName)(THIS_ LPCSTR name) PURE;
+ STDMETHOD_(struct ID3D10EffectVariable *, GetAnnotationByName)(THIS_ const char *name) PURE;
STDMETHOD_(struct ID3D10EffectVariable *, GetMemberByIndex)(THIS_ UINT index) PURE;
- STDMETHOD_(struct ID3D10EffectVariable *, GetMemberByName)(THIS_ LPCSTR name) PURE;
- STDMETHOD_(struct ID3D10EffectVariable *, GetMemberBySemantic)(THIS_ LPCSTR semantic) PURE;
+ STDMETHOD_(struct ID3D10EffectVariable *, GetMemberByName)(THIS_ const char *name) PURE;
+ STDMETHOD_(struct ID3D10EffectVariable *, GetMemberBySemantic)(THIS_ const char *semantic) PURE;
STDMETHOD_(struct ID3D10EffectVariable *, GetElement)(THIS_ UINT index) PURE;
STDMETHOD_(struct ID3D10EffectConstantBuffer *, GetParentConstantBuffer)(THIS) PURE;
STDMETHOD_(struct ID3D10EffectScalarVariable *, AsScalar)(THIS) PURE;
@@ -471,10 +471,10 @@ DECLARE_INTERFACE_(ID3D10EffectRenderTargetViewVariable, ID3D10EffectVariable)
STDMETHOD_(struct ID3D10EffectType *, GetType)(THIS) PURE;
STDMETHOD(GetDesc)(THIS_ D3D10_EFFECT_VARIABLE_DESC *desc) PURE;
STDMETHOD_(struct ID3D10EffectVariable *, GetAnnotationByIndex)(THIS_ UINT index) PURE;
- STDMETHOD_(struct ID3D10EffectVariable *, GetAnnotationByName)(THIS_ LPCSTR name) PURE;
+ STDMETHOD_(struct ID3D10EffectVariable *, GetAnnotationByName)(THIS_ const char *name) PURE;
STDMETHOD_(struct ID3D10EffectVariable *, GetMemberByIndex)(THIS_ UINT index) PURE;
- STDMETHOD_(struct ID3D10EffectVariable *, GetMemberByName)(THIS_ LPCSTR name) PURE;
- STDMETHOD_(struct ID3D10EffectVariable *, GetMemberBySemantic)(THIS_ LPCSTR semantic) PURE;
+ STDMETHOD_(struct ID3D10EffectVariable *, GetMemberByName)(THIS_ const char *name) PURE;
+ STDMETHOD_(struct ID3D10EffectVariable *, GetMemberBySemantic)(THIS_ const char *semantic) PURE;
STDMETHOD_(struct ID3D10EffectVariable *, GetElement)(THIS_ UINT index) PURE;
STDMETHOD_(struct ID3D10EffectConstantBuffer *, GetParentConstantBuffer)(THIS) PURE;
STDMETHOD_(struct ID3D10EffectScalarVariable *, AsScalar)(THIS) PURE;
@@ -511,10 +511,10 @@ DECLARE_INTERFACE_(ID3D10EffectDepthStencilViewVariable, ID3D10EffectVariable)
STDMETHOD_(struct ID3D10EffectType *, GetType)(THIS) PURE;
STDMETHOD(GetDesc)(THIS_ D3D10_EFFECT_VARIABLE_DESC *desc) PURE;
STDMETHOD_(struct ID3D10EffectVariable *, GetAnnotationByIndex)(THIS_ UINT index) PURE;
- STDMETHOD_(struct ID3D10EffectVariable *, GetAnnotationByName)(THIS_ LPCSTR name) PURE;
+ STDMETHOD_(struct ID3D10EffectVariable *, GetAnnotationByName)(THIS_ const char *name) PURE;
STDMETHOD_(struct ID3D10EffectVariable *, GetMemberByIndex)(THIS_ UINT index) PURE;
- STDMETHOD_(struct ID3D10EffectVariable *, GetMemberByName)(THIS_ LPCSTR name) PURE;
- STDMETHOD_(struct ID3D10EffectVariable *, GetMemberBySemantic)(THIS_ LPCSTR semantic) PURE;
+ STDMETHOD_(struct ID3D10EffectVariable *, GetMemberByName)(THIS_ const char *name) PURE;
+ STDMETHOD_(struct ID3D10EffectVariable *, GetMemberBySemantic)(THIS_ const char *semantic) PURE;
STDMETHOD_(struct ID3D10EffectVariable *, GetElement)(THIS_ UINT index) PURE;
STDMETHOD_(struct ID3D10EffectConstantBuffer *, GetParentConstantBuffer)(THIS) PURE;
STDMETHOD_(struct ID3D10EffectScalarVariable *, AsScalar)(THIS) PURE;
@@ -550,10 +550,10 @@ DECLARE_INTERFACE_(ID3D10EffectShaderVariable, ID3D10EffectVariable)
STDMETHOD_(struct ID3D10EffectType *, GetType)(THIS) PURE;
STDMETHOD(GetDesc)(THIS_ D3D10_EFFECT_VARIABLE_DESC *desc) PURE;
STDMETHOD_(struct ID3D10EffectVariable *, GetAnnotationByIndex)(THIS_ UINT index) PURE;
- STDMETHOD_(struct ID3D10EffectVariable *, GetAnnotationByName)(THIS_ LPCSTR name) PURE;
+ STDMETHOD_(struct ID3D10EffectVariable *, GetAnnotationByName)(THIS_ const char *name) PURE;
STDMETHOD_(struct ID3D10EffectVariable *, GetMemberByIndex)(THIS_ UINT index) PURE;
- STDMETHOD_(struct ID3D10EffectVariable *, GetMemberByName)(THIS_ LPCSTR name) PURE;
- STDMETHOD_(struct ID3D10EffectVariable *, GetMemberBySemantic)(THIS_ LPCSTR semantic) PURE;
+ STDMETHOD_(struct ID3D10EffectVariable *, GetMemberByName)(THIS_ const char *name) PURE;
+ STDMETHOD_(struct ID3D10EffectVariable *, GetMemberBySemantic)(THIS_ const char *semantic) PURE;
STDMETHOD_(struct ID3D10EffectVariable *, GetElement)(THIS_ UINT index) PURE;
STDMETHOD_(struct ID3D10EffectConstantBuffer *, GetParentConstantBuffer)(THIS) PURE;
STDMETHOD_(struct ID3D10EffectScalarVariable *, AsScalar)(THIS) PURE;
@@ -593,10 +593,10 @@ DECLARE_INTERFACE_(ID3D10EffectBlendVariable, ID3D10EffectVariable)
STDMETHOD_(struct ID3D10EffectType *, GetType)(THIS) PURE;
STDMETHOD(GetDesc)(THIS_ D3D10_EFFECT_VARIABLE_DESC *desc) PURE;
STDMETHOD_(struct ID3D10EffectVariable *, GetAnnotationByIndex)(THIS_ UINT index) PURE;
- STDMETHOD_(struct ID3D10EffectVariable *, GetAnnotationByName)(THIS_ LPCSTR name) PURE;
+ STDMETHOD_(struct ID3D10EffectVariable *, GetAnnotationByName)(THIS_ const char *name) PURE;
STDMETHOD_(struct ID3D10EffectVariable *, GetMemberByIndex)(THIS_ UINT index) PURE;
- STDMETHOD_(struct ID3D10EffectVariable *, GetMemberByName)(THIS_ LPCSTR name) PURE;
- STDMETHOD_(struct ID3D10EffectVariable *, GetMemberBySemantic)(THIS_ LPCSTR semantic) PURE;
+ STDMETHOD_(struct ID3D10EffectVariable *, GetMemberByName)(THIS_ const char *name) PURE;
+ STDMETHOD_(struct ID3D10EffectVariable *, GetMemberBySemantic)(THIS_ const char *semantic) PURE;
STDMETHOD_(struct ID3D10EffectVariable *, GetElement)(THIS_ UINT index) PURE;
STDMETHOD_(struct ID3D10EffectConstantBuffer *, GetParentConstantBuffer)(THIS) PURE;
STDMETHOD_(struct ID3D10EffectScalarVariable *, AsScalar)(THIS) PURE;
@@ -631,10 +631,10 @@ DECLARE_INTERFACE_(ID3D10EffectDepthStencilVariable, ID3D10EffectVariable)
STDMETHOD_(struct ID3D10EffectType *, GetType)(THIS) PURE;
STDMETHOD(GetDesc)(THIS_ D3D10_EFFECT_VARIABLE_DESC *desc) PURE;
STDMETHOD_(struct ID3D10EffectVariable *, GetAnnotationByIndex)(THIS_ UINT index) PURE;
- STDMETHOD_(struct ID3D10EffectVariable *, GetAnnotationByName)(THIS_ LPCSTR name) PURE;
+ STDMETHOD_(struct ID3D10EffectVariable *, GetAnnotationByName)(THIS_ const char *name) PURE;
STDMETHOD_(struct ID3D10EffectVariable *, GetMemberByIndex)(THIS_ UINT index) PURE;
- STDMETHOD_(struct ID3D10EffectVariable *, GetMemberByName)(THIS_ LPCSTR name) PURE;
- STDMETHOD_(struct ID3D10EffectVariable *, GetMemberBySemantic)(THIS_ LPCSTR semantic) PURE;
+ STDMETHOD_(struct ID3D10EffectVariable *, GetMemberByName)(THIS_ const char *name) PURE;
+ STDMETHOD_(struct ID3D10EffectVariable *, GetMemberBySemantic)(THIS_ const char *semantic) PURE;
STDMETHOD_(struct ID3D10EffectVariable *, GetElement)(THIS_ UINT index) PURE;
STDMETHOD_(struct ID3D10EffectConstantBuffer *, GetParentConstantBuffer)(THIS) PURE;
STDMETHOD_(struct ID3D10EffectScalarVariable *, AsScalar)(THIS) PURE;
@@ -669,10 +669,10 @@ DECLARE_INTERFACE_(ID3D10EffectRasterizerVariable, ID3D10EffectVariable)
STDMETHOD_(struct ID3D10EffectType *, GetType)(THIS) PURE;
STDMETHOD(GetDesc)(THIS_ D3D10_EFFECT_VARIABLE_DESC *desc) PURE;
STDMETHOD_(struct ID3D10EffectVariable *, GetAnnotationByIndex)(THIS_ UINT index) PURE;
- STDMETHOD_(struct ID3D10EffectVariable *, GetAnnotationByName)(THIS_ LPCSTR name) PURE;
+ STDMETHOD_(struct ID3D10EffectVariable *, GetAnnotationByName)(THIS_ const char *name) PURE;
STDMETHOD_(struct ID3D10EffectVariable *, GetMemberByIndex)(THIS_ UINT index) PURE;
- STDMETHOD_(struct ID3D10EffectVariable *, GetMemberByName)(THIS_ LPCSTR name) PURE;
- STDMETHOD_(struct ID3D10EffectVariable *, GetMemberBySemantic)(THIS_ LPCSTR semantic) PURE;
+ STDMETHOD_(struct ID3D10EffectVariable *, GetMemberByName)(THIS_ const char *name) PURE;
+ STDMETHOD_(struct ID3D10EffectVariable *, GetMemberBySemantic)(THIS_ const char *semantic) PURE;
STDMETHOD_(struct ID3D10EffectVariable *, GetElement)(THIS_ UINT index) PURE;
STDMETHOD_(struct ID3D10EffectConstantBuffer *, GetParentConstantBuffer)(THIS) PURE;
STDMETHOD_(struct ID3D10EffectScalarVariable *, AsScalar)(THIS) PURE;
@@ -707,10 +707,10 @@ DECLARE_INTERFACE_(ID3D10EffectSamplerVariable, ID3D10EffectVariable)
STDMETHOD_(struct ID3D10EffectType *, GetType)(THIS) PURE;
STDMETHOD(GetDesc)(THIS_ D3D10_EFFECT_VARIABLE_DESC *desc) PURE;
STDMETHOD_(struct ID3D10EffectVariable *, GetAnnotationByIndex)(THIS_ UINT index) PURE;
- STDMETHOD_(struct ID3D10EffectVariable *, GetAnnotationByName)(THIS_ LPCSTR name) PURE;
+ STDMETHOD_(struct ID3D10EffectVariable *, GetAnnotationByName)(THIS_ const char *name) PURE;
STDMETHOD_(struct ID3D10EffectVariable *, GetMemberByIndex)(THIS_ UINT index) PURE;
- STDMETHOD_(struct ID3D10EffectVariable *, GetMemberByName)(THIS_ LPCSTR name) PURE;
- STDMETHOD_(struct ID3D10EffectVariable *, GetMemberBySemantic)(THIS_ LPCSTR semantic) PURE;
+ STDMETHOD_(struct ID3D10EffectVariable *, GetMemberByName)(THIS_ const char *name) PURE;
+ STDMETHOD_(struct ID3D10EffectVariable *, GetMemberBySemantic)(THIS_ const char *semantic) PURE;
STDMETHOD_(struct ID3D10EffectVariable *, GetElement)(THIS_ UINT index) PURE;
STDMETHOD_(struct ID3D10EffectConstantBuffer *, GetParentConstantBuffer)(THIS) PURE;
STDMETHOD_(struct ID3D10EffectScalarVariable *, AsScalar)(THIS) PURE;
@@ -742,9 +742,9 @@ DECLARE_INTERFACE(ID3D10EffectTechnique)
STDMETHOD_(BOOL, IsValid)(THIS) PURE;
STDMETHOD(GetDesc)(THIS_ D3D10_TECHNIQUE_DESC *desc) PURE;
STDMETHOD_(struct ID3D10EffectVariable *, GetAnnotationByIndex)(THIS_ UINT index) PURE;
- STDMETHOD_(struct ID3D10EffectVariable *, GetAnnotationByName)(THIS_ LPCSTR name) PURE;
+ STDMETHOD_(struct ID3D10EffectVariable *, GetAnnotationByName)(THIS_ const char *name) PURE;
STDMETHOD_(struct ID3D10EffectPass *, GetPassByIndex)(THIS_ UINT index) PURE;
- STDMETHOD_(struct ID3D10EffectPass *, GetPassByName)(THIS_ LPCSTR name) PURE;
+ STDMETHOD_(struct ID3D10EffectPass *, GetPassByName)(THIS_ const char *name) PURE;
STDMETHOD(ComputeStateBlockMask)(THIS_ D3D10_STATE_BLOCK_MASK *mask) PURE;
};
#undef INTERFACE
@@ -764,12 +764,12 @@ DECLARE_INTERFACE_(ID3D10Effect, IUnknown)
STDMETHOD(GetDevice)(THIS_ ID3D10Device **device) PURE;
STDMETHOD(GetDesc)(THIS_ D3D10_EFFECT_DESC *desc) PURE;
STDMETHOD_(struct ID3D10EffectConstantBuffer *, GetConstantBufferByIndex)(THIS_ UINT index) PURE;
- STDMETHOD_(struct ID3D10EffectConstantBuffer *, GetConstantBufferByName)(THIS_ LPCSTR name) PURE;
+ STDMETHOD_(struct ID3D10EffectConstantBuffer *, GetConstantBufferByName)(THIS_ const char *name) PURE;
STDMETHOD_(struct ID3D10EffectVariable *, GetVariableByIndex)(THIS_ UINT index) PURE;
- STDMETHOD_(struct ID3D10EffectVariable *, GetVariableByName)(THIS_ LPCSTR name) PURE;
- STDMETHOD_(struct ID3D10EffectVariable *, GetVariableBySemantic)(THIS_ LPCSTR semantic) PURE;
+ STDMETHOD_(struct ID3D10EffectVariable *, GetVariableByName)(THIS_ const char *name) PURE;
+ STDMETHOD_(struct ID3D10EffectVariable *, GetVariableBySemantic)(THIS_ const char *semantic) PURE;
STDMETHOD_(struct ID3D10EffectTechnique *, GetTechniqueByIndex)(THIS_ UINT index) PURE;
- STDMETHOD_(struct ID3D10EffectTechnique *, GetTechniqueByName)(THIS_ LPCSTR name) PURE;
+ STDMETHOD_(struct ID3D10EffectTechnique *, GetTechniqueByName)(THIS_ const char *name) PURE;
STDMETHOD(Optimize)(THIS) PURE;
STDMETHOD_(BOOL, IsOptimized)(THIS) PURE;
};
@@ -800,7 +800,7 @@ DECLARE_INTERFACE(ID3D10EffectPass)
STDMETHOD(GetGeometryShaderDesc)(THIS_ D3D10_PASS_SHADER_DESC *desc) PURE;
STDMETHOD(GetPixelShaderDesc)(THIS_ D3D10_PASS_SHADER_DESC *desc) PURE;
STDMETHOD_(struct ID3D10EffectVariable *, GetAnnotationByIndex)(THIS_ UINT index) PURE;
- STDMETHOD_(struct ID3D10EffectVariable *, GetAnnotationByName)(THIS_ LPCSTR name) PURE;
+ STDMETHOD_(struct ID3D10EffectVariable *, GetAnnotationByName)(THIS_ const char *name) PURE;
STDMETHOD(Apply)(THIS_ UINT flags) PURE;
STDMETHOD(ComputeStateBlockMask)(THIS_ D3D10_STATE_BLOCK_MASK *mask) PURE;
};
diff --git a/include/d3d10shader.h b/include/d3d10shader.h
index 06b4c3e..894b833 100644
--- a/include/d3d10shader.h
+++ b/include/d3d10shader.h
@@ -72,7 +72,7 @@ typedef ID3DInclude *LPD3D10INCLUDE;
typedef struct _D3D10_SHADER_INPUT_BIND_DESC
{
- LPCSTR Name;
+ const char *Name;
D3D10_SHADER_INPUT_TYPE Type;
UINT BindPoint;
UINT BindCount;
@@ -84,7 +84,7 @@ typedef struct _D3D10_SHADER_INPUT_BIND_DESC
typedef struct _D3D10_SIGNATURE_PARAMETER_DESC
{
- LPCSTR SemanticName;
+ const char *SemanticName;
UINT SemanticIndex;
UINT Register;
D3D10_NAME SystemValueType;
@@ -96,7 +96,7 @@ typedef struct _D3D10_SIGNATURE_PARAMETER_DESC
typedef struct _D3D10_SHADER_DESC
{
UINT Version;
- LPCSTR Creator;
+ const char *Creator;
UINT Flags;
UINT ConstantBuffers;
UINT BoundResources;
@@ -127,7 +127,7 @@ typedef struct _D3D10_SHADER_DESC
typedef struct _D3D10_SHADER_BUFFER_DESC
{
- LPCSTR Name;
+ const char *Name;
D3D10_CBUFFER_TYPE Type;
UINT Variables;
UINT Size;
@@ -136,7 +136,7 @@ typedef struct _D3D10_SHADER_BUFFER_DESC
typedef struct _D3D10_SHADER_VARIABLE_DESC
{
- LPCSTR Name;
+ const char *Name;
UINT StartOffset;
UINT Size;
UINT uFlags;
@@ -161,8 +161,8 @@ DECLARE_INTERFACE(ID3D10ShaderReflectionType)
{
STDMETHOD(GetDesc)(THIS_ D3D10_SHADER_TYPE_DESC *desc) PURE;
STDMETHOD_(struct ID3D10ShaderReflectionType *, GetMemberTypeByIndex)(THIS_ UINT index) PURE;
- STDMETHOD_(struct ID3D10ShaderReflectionType *, GetMemberTypeByName)(THIS_ LPCSTR name) PURE;
- STDMETHOD_(LPCSTR, GetMemberTypeName)(THIS_ UINT index) PURE;
+ STDMETHOD_(struct ID3D10ShaderReflectionType *, GetMemberTypeByName)(THIS_ const char *name) PURE;
+ STDMETHOD_(const char *, GetMemberTypeName)(THIS_ UINT index) PURE;
};
#undef INTERFACE
@@ -183,7 +183,7 @@ DECLARE_INTERFACE(ID3D10ShaderReflectionConstantBuffer)
{
STDMETHOD(GetDesc)(THIS_ D3D10_SHADER_BUFFER_DESC *desc) PURE;
STDMETHOD_(struct ID3D10ShaderReflectionVariable *, GetVariableByIndex)(THIS_ UINT index) PURE;
- STDMETHOD_(struct ID3D10ShaderReflectionVariable *, GetVariableByName)(THIS_ LPCSTR name) PURE;
+ STDMETHOD_(struct ID3D10ShaderReflectionVariable *, GetVariableByName)(THIS_ const char *name) PURE;
};
#undef INTERFACE
@@ -199,7 +199,7 @@ DECLARE_INTERFACE_(ID3D10ShaderReflection, IUnknown)
/* ID3D10ShaderReflection methods */
STDMETHOD(GetDesc)(THIS_ D3D10_SHADER_DESC *desc) PURE;
STDMETHOD_(struct ID3D10ShaderReflectionConstantBuffer *, GetConstantBufferByIndex)(THIS_ UINT index) PURE;
- STDMETHOD_(struct ID3D10ShaderReflectionConstantBuffer *, GetConstantBufferByName)(THIS_ LPCSTR name) PURE;
+ STDMETHOD_(struct ID3D10ShaderReflectionConstantBuffer *, GetConstantBufferByName)(THIS_ const char *name) PURE;
STDMETHOD(GetResourceBindingDesc)(THIS_ UINT index, D3D10_SHADER_INPUT_BIND_DESC *desc) PURE;
STDMETHOD(GetInputParameterDesc)(THIS_ UINT index, D3D10_SIGNATURE_PARAMETER_DESC *desc) PURE;
STDMETHOD(GetOutputParameterDesc)(THIS_ UINT index, D3D10_SIGNATURE_PARAMETER_DESC *desc) PURE;
@@ -211,14 +211,14 @@ DECLARE_INTERFACE_(ID3D10ShaderReflection, IUnknown)
extern "C" {
#endif
-HRESULT WINAPI D3D10CompileShader(LPCSTR data, SIZE_T data_size, LPCSTR filename,
- const D3D10_SHADER_MACRO *defines, ID3D10Include *include, LPCSTR entrypoint,
- LPCSTR profile, UINT flags, ID3D10Blob **shader, ID3D10Blob **error_messages);
+HRESULT WINAPI D3D10CompileShader(const char *data, SIZE_T data_size, const char *filename,
+ const D3D10_SHADER_MACRO *defines, ID3D10Include *include, const char *entrypoint,
+ const char *profile, UINT flags, ID3D10Blob **shader, ID3D10Blob **error_messages);
HRESULT WINAPI D3D10DisassembleShader(const void *data, SIZE_T data_size,
BOOL color_code, const char *comments, ID3D10Blob **disassembly);
-LPCSTR WINAPI D3D10GetVertexShaderProfile(ID3D10Device *device);
-LPCSTR WINAPI D3D10GetGeometryShaderProfile(ID3D10Device *device);
-LPCSTR WINAPI D3D10GetPixelShaderProfile(ID3D10Device *device);
+const char * WINAPI D3D10GetVertexShaderProfile(ID3D10Device *device);
+const char * WINAPI D3D10GetGeometryShaderProfile(ID3D10Device *device);
+const char * WINAPI D3D10GetPixelShaderProfile(ID3D10Device *device);
HRESULT WINAPI D3D10ReflectShader(const void *data, SIZE_T data_size, ID3D10ShaderReflection **reflector);
HRESULT WINAPI D3D10GetInputSignatureBlob(const void *data, SIZE_T data_size, ID3D10Blob **blob);
diff --git a/include/d3dcommon.idl b/include/d3dcommon.idl
index 3230e80..f8fe203 100644
--- a/include/d3dcommon.idl
+++ b/include/d3dcommon.idl
@@ -21,8 +21,8 @@ import "ocidl.idl";
typedef struct _D3D_SHADER_MACRO
{
- LPCSTR Name;
- LPCSTR Definition;
+ const char *Name;
+ const char *Definition;
} D3D_SHADER_MACRO;
typedef struct _D3D_SHADER_MACRO* LPD3D_SHADER_MACRO;
--
1.7.10.4
More information about the wine-patches
mailing list