diff --git a/dlls/d3dx9_36/d3dx9_36_private.h b/dlls/d3dx9_36/d3dx9_36_private.h index 451615b43f3..88db3ff93c7 100644 --- a/dlls/d3dx9_36/d3dx9_36_private.h +++ b/dlls/d3dx9_36/d3dx9_36_private.h @@ -105,6 +105,7 @@ const char *debug_d3dxparameter_type(D3DXPARAMETER_TYPE t) DECLSPEC_HIDDEN; const char *debug_d3dxparameter_registerset(D3DXREGISTER_SET r) DECLSPEC_HIDDEN; /* parameter type conversion helpers */ -void set_number(LPVOID outdata, D3DXPARAMETER_TYPE outtype, LPCVOID indata, D3DXPARAMETER_TYPE intype) DECLSPEC_HIDDEN; +void set_number(void *outdata, D3DXPARAMETER_TYPE outtype, + const void *indata, D3DXPARAMETER_TYPE intype) DECLSPEC_HIDDEN; #endif /* __WINE_D3DX9_36_PRIVATE_H */ diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 776c7c6cf2f..ce67771f360 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -3368,11 +3368,11 @@ static HRESULT WINAPI ID3DXEffectImpl_CloneEffect(ID3DXEffect *iface, return E_NOTIMPL; } -static HRESULT WINAPI ID3DXEffectImpl_SetRawValue(ID3DXEffect* iface, D3DXHANDLE parameter, LPCVOID data, UINT byte_offset, UINT bytes) +static HRESULT WINAPI ID3DXEffectImpl_SetRawValue(ID3DXEffect *iface, + D3DXHANDLE parameter, const void *data, UINT byte_offset, UINT bytes) { - struct ID3DXEffectImpl *This = impl_from_ID3DXEffect(iface); - - FIXME("(%p)->(%p, %p, %u, %u): stub\n", This, parameter, data, byte_offset, bytes); + FIXME("iface %p, parameter %p, data %p, byte_offset %u, bytes %u stub!\n", + iface, parameter, data, byte_offset, bytes); return E_NOTIMPL; } diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index a735a35640d..b49e8941bea 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -6872,20 +6872,17 @@ cleanup: * The face re-ordering does not use the vertex cache optimally. * */ -HRESULT WINAPI D3DXOptimizeFaces(LPCVOID indices, - UINT num_faces, - UINT num_vertices, - BOOL indices_are_32bit, - DWORD *face_remap) +HRESULT WINAPI D3DXOptimizeFaces(const void *indices, UINT num_faces, + UINT num_vertices, BOOL indices_are_32bit, DWORD *face_remap) { UINT i; UINT j = num_faces - 1; UINT limit_16_bit = 2 << 15; /* According to MSDN */ HRESULT hr = D3D_OK; - FIXME("(%p, %u, %u, %s, %p): semi-stub. Face order will not be optimal.\n", - indices, num_faces, num_vertices, - indices_are_32bit ? "TRUE" : "FALSE", face_remap); + FIXME("indices %p, num_faces %u, num_vertices %u, indices_are_32bit %#x, face_remap %p semi-stub. " + "Face order will not be optimal.\n", + indices, num_faces, num_vertices, indices_are_32bit, face_remap); if (!indices_are_32bit && num_faces >= limit_16_bit) { diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index 531fed81a90..ef1c55fff0a 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -174,7 +174,7 @@ HRESULT WINAPI D3DXFindShaderComment(const DWORD *byte_code, DWORD fourcc, const if (*(ptr + 1) == fourcc) { UINT ctab_size = (comment_size - 1) * sizeof(DWORD); - LPCVOID ctab_data = ptr + 2; + const void *ctab_data = ptr + 2; if (size) *size = ctab_size; if (data) @@ -264,7 +264,8 @@ error: return HRESULT_FROM_WIN32(GetLastError()); } -static HRESULT WINAPI d3dincludefromfile_close(ID3DXInclude *iface, LPCVOID data) { +static HRESULT WINAPI d3dincludefromfile_close(ID3DXInclude *iface, const void *data) +{ HeapFree(GetProcessHeap(), 0, *((char **)data - 1)); HeapFree(GetProcessHeap(), 0, (char **)data - 1); return S_OK; @@ -1846,8 +1847,8 @@ error: HRESULT WINAPI D3DXGetShaderConstantTableEx(const DWORD *byte_code, DWORD flags, ID3DXConstantTable **constant_table) { struct ID3DXConstantTableImpl *object = NULL; + const void *data; HRESULT hr; - LPCVOID data; UINT size; const D3DXSHADER_CONSTANTTABLE *ctab_header; const D3DXSHADER_CONSTANTINFO *constant_info; diff --git a/dlls/d3dx9_36/skin.c b/dlls/d3dx9_36/skin.c index 65e628ff107..dec8823a33c 100644 --- a/dlls/d3dx9_36/skin.c +++ b/dlls/d3dx9_36/skin.c @@ -378,12 +378,11 @@ static HRESULT WINAPI ID3DXSkinInfoImpl_GetDeclaration(ID3DXSkinInfo *iface, D3D return D3D_OK; } -static HRESULT WINAPI ID3DXSkinInfoImpl_UpdateSkinnedMesh(ID3DXSkinInfo *iface, CONST D3DXMATRIX *bone_transforms, - CONST D3DXMATRIX *bone_inv_transpose_transforms, LPCVOID vertices_src, PVOID vertices_dest) +static HRESULT WINAPI ID3DXSkinInfoImpl_UpdateSkinnedMesh(ID3DXSkinInfo *iface, const D3DXMATRIX *bone_transforms, + const D3DXMATRIX *bone_inv_transpose_transforms, const void *src_vertices, void *dst_vertices) { - ID3DXSkinInfoImpl *This = impl_from_ID3DXSkinInfo(iface); - - FIXME("(%p, %p, %p, %p, %p): stub\n", This, bone_transforms, bone_inv_transpose_transforms, vertices_src, vertices_dest); + FIXME("iface %p, bone_transforms %p, bone_inv_transpose_transforms %p, src_vertices %p, dst_vertices %p stub!\n", + iface, bone_transforms, bone_inv_transpose_transforms, src_vertices, dst_vertices); return E_NOTIMPL; } diff --git a/dlls/d3dx9_36/tests/asm.c b/dlls/d3dx9_36/tests/asm.c index f1b75a016f2..26093bc42cf 100644 --- a/dlls/d3dx9_36/tests/asm.c +++ b/dlls/d3dx9_36/tests/asm.c @@ -76,8 +76,9 @@ static HRESULT WINAPI testD3DXInclude_open(ID3DXInclude *iface, D3DXINCLUDE_TYPE return S_OK; } -static HRESULT WINAPI testD3DXInclude_close(ID3DXInclude *iface, LPCVOID data) { - HeapFree(GetProcessHeap(), 0, (LPVOID)data); +static HRESULT WINAPI testD3DXInclude_close(ID3DXInclude *iface, const void *data) +{ + HeapFree(GetProcessHeap(), 0, (void *)data); return S_OK; } diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index 6c7dccdbe19..fb3647ab405 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -39,7 +39,7 @@ static BOOL compare_float(FLOAT f, FLOAT g, UINT ulps) return TRUE; } -static inline INT get_int(D3DXPARAMETER_TYPE type, LPCVOID data) +static inline INT get_int(D3DXPARAMETER_TYPE type, const void *data) { INT i; @@ -66,9 +66,9 @@ static inline INT get_int(D3DXPARAMETER_TYPE type, LPCVOID data) return i; } -static inline FLOAT get_float(D3DXPARAMETER_TYPE type, LPCVOID data) +static inline float get_float(D3DXPARAMETER_TYPE type, const void *data) { - FLOAT f; + float f; switch (type) { @@ -93,12 +93,12 @@ static inline FLOAT get_float(D3DXPARAMETER_TYPE type, LPCVOID data) return f; } -static inline BOOL get_bool(LPCVOID data) +static inline BOOL get_bool(const void *data) { - return (*(BOOL *)data) ? TRUE : FALSE; + return !!*(BOOL *)data; } -static void set_number(LPVOID outdata, D3DXPARAMETER_TYPE outtype, LPCVOID indata, D3DXPARAMETER_TYPE intype) +static void set_number(void *outdata, D3DXPARAMETER_TYPE outtype, const void *indata, D3DXPARAMETER_TYPE intype) { switch (outtype) { diff --git a/dlls/d3dx9_36/tests/shader.c b/dlls/d3dx9_36/tests/shader.c index d1669dbe4bf..3d0d55b87f8 100644 --- a/dlls/d3dx9_36/tests/shader.c +++ b/dlls/d3dx9_36/tests/shader.c @@ -305,8 +305,8 @@ static void test_get_shader_version(void) static void test_find_shader_comment(void) { + const void *data = (void *)0xdeadbeef; HRESULT hr; - LPCVOID data = (LPVOID)0xdeadbeef; UINT size = 100; hr = D3DXFindShaderComment(NULL, MAKEFOURCC('C','T','A','B'), &data, &size); @@ -320,7 +320,7 @@ static void test_find_shader_comment(void) hr = D3DXFindShaderComment(shader_with_ctab, MAKEFOURCC('C','T','A','B'), &data, NULL); ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK)\n", hr); - ok(data == (LPCVOID)(shader_with_ctab + 6), "Got result %p, expected %p\n", data, shader_with_ctab + 6); + ok(data == shader_with_ctab + 6, "Got result %p, expected %p.\n", data, shader_with_ctab + 6); hr = D3DXFindShaderComment(shader_with_ctab, 0, &data, &size); ok(hr == S_FALSE, "Got result %x, expected 1 (S_FALSE)\n", hr); @@ -334,7 +334,7 @@ static void test_find_shader_comment(void) hr = D3DXFindShaderComment(shader_with_ctab, MAKEFOURCC('C','T','A','B'), &data, &size); ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK)\n", hr); - ok(data == (LPCVOID)(shader_with_ctab + 6), "Got result %p, expected %p\n", data, shader_with_ctab + 6); + ok(data == shader_with_ctab + 6, "Got result %p, expected %p.\n", data, shader_with_ctab + 6); ok(size == 28, "Got result %d, expected 28\n", size); hr = D3DXFindShaderComment(shader_zero, MAKEFOURCC('C','T','A','B'), &data, &size); diff --git a/dlls/d3dx9_36/util.c b/dlls/d3dx9_36/util.c index 1fae9562f43..ecfa6729686 100644 --- a/dlls/d3dx9_36/util.c +++ b/dlls/d3dx9_36/util.c @@ -285,7 +285,7 @@ const char *debug_d3dxparameter_registerset(D3DXREGISTER_SET r) #undef WINE_D3DX_TO_STR /* parameter type conversion helpers */ -static BOOL get_bool(D3DXPARAMETER_TYPE type, LPCVOID data) +static BOOL get_bool(D3DXPARAMETER_TYPE type, const void *data) { switch (type) { @@ -303,7 +303,7 @@ static BOOL get_bool(D3DXPARAMETER_TYPE type, LPCVOID data) } } -static INT get_int(D3DXPARAMETER_TYPE type, LPCVOID data) +static INT get_int(D3DXPARAMETER_TYPE type, const void *data) { switch (type) { @@ -323,7 +323,7 @@ static INT get_int(D3DXPARAMETER_TYPE type, LPCVOID data) } } -static FLOAT get_float(D3DXPARAMETER_TYPE type, LPCVOID data) +static FLOAT get_float(D3DXPARAMETER_TYPE type, const void *data) { switch (type) { @@ -343,7 +343,7 @@ static FLOAT get_float(D3DXPARAMETER_TYPE type, LPCVOID data) } } -void set_number(LPVOID outdata, D3DXPARAMETER_TYPE outtype, LPCVOID indata, D3DXPARAMETER_TYPE intype) +void set_number(void *outdata, D3DXPARAMETER_TYPE outtype, const void *indata, D3DXPARAMETER_TYPE intype) { TRACE("Changing from type %s to type %s\n", debug_d3dxparameter_type(intype), debug_d3dxparameter_type(outtype)); diff --git a/include/d3dx9effect.h b/include/d3dx9effect.h index 2127e6fba32..2efffbbae26 100644 --- a/include/d3dx9effect.h +++ b/include/d3dx9effect.h @@ -121,7 +121,7 @@ DECLARE_INTERFACE_(ID3DXBaseEffect, IUnknown) STDMETHOD_(D3DXHANDLE, GetFunctionByName)(THIS_ const char *name); STDMETHOD_(D3DXHANDLE, GetAnnotation)(THIS_ D3DXHANDLE object, UINT index) PURE; STDMETHOD_(D3DXHANDLE, GetAnnotationByName)(THIS_ D3DXHANDLE object, const char *name) PURE; - STDMETHOD(SetValue)(THIS_ D3DXHANDLE parameter, LPCVOID data, UINT bytes) PURE; + STDMETHOD(SetValue)(THIS_ D3DXHANDLE parameter, const void *data, UINT bytes) PURE; STDMETHOD(GetValue)(THIS_ D3DXHANDLE parameter, LPVOID data, UINT bytes) PURE; STDMETHOD(SetBool)(THIS_ D3DXHANDLE parameter, BOOL b) PURE; STDMETHOD(GetBool)(THIS_ D3DXHANDLE parameter, BOOL* b) PURE; @@ -225,7 +225,7 @@ DECLARE_INTERFACE_(ID3DXEffect, ID3DXBaseEffect) STDMETHOD_(D3DXHANDLE, GetFunctionByName)(THIS_ const char *name); STDMETHOD_(D3DXHANDLE, GetAnnotation)(THIS_ D3DXHANDLE object, UINT index) PURE; STDMETHOD_(D3DXHANDLE, GetAnnotationByName)(THIS_ D3DXHANDLE object, const char *name) PURE; - STDMETHOD(SetValue)(THIS_ D3DXHANDLE parameter, LPCVOID data, UINT bytes) PURE; + STDMETHOD(SetValue)(THIS_ D3DXHANDLE parameter, const void *data, UINT bytes) PURE; STDMETHOD(GetValue)(THIS_ D3DXHANDLE parameter, LPVOID data, UINT bytes) PURE; STDMETHOD(SetBool)(THIS_ D3DXHANDLE parameter, BOOL b) PURE; STDMETHOD(GetBool)(THIS_ D3DXHANDLE parameter, BOOL* b) PURE; @@ -284,7 +284,7 @@ DECLARE_INTERFACE_(ID3DXEffect, ID3DXBaseEffect) STDMETHOD(ApplyParameterBlock)(THIS_ D3DXHANDLE parameter_block) PURE; STDMETHOD(DeleteParameterBlock)(THIS_ D3DXHANDLE parameter_block) PURE; STDMETHOD(CloneEffect)(THIS_ struct IDirect3DDevice9 *device, struct ID3DXEffect **effect) PURE; - STDMETHOD(SetRawValue)(THIS_ D3DXHANDLE parameter, LPCVOID data, UINT byte_offset, UINT bytes) PURE; + STDMETHOD(SetRawValue)(THIS_ D3DXHANDLE parameter, const void *data, UINT byte_offset, UINT bytes) PURE; }; #undef INTERFACE @@ -318,7 +318,7 @@ DECLARE_INTERFACE_(ID3DXEffectCompiler, ID3DXBaseEffect) STDMETHOD_(D3DXHANDLE, GetFunctionByName)(THIS_ const char *name); STDMETHOD_(D3DXHANDLE, GetAnnotation)(THIS_ D3DXHANDLE object, UINT index) PURE; STDMETHOD_(D3DXHANDLE, GetAnnotationByName)(THIS_ D3DXHANDLE object, const char *name) PURE; - STDMETHOD(SetValue)(THIS_ D3DXHANDLE parameter, LPCVOID data, UINT bytes) PURE; + STDMETHOD(SetValue)(THIS_ D3DXHANDLE parameter, const void *data, UINT bytes) PURE; STDMETHOD(GetValue)(THIS_ D3DXHANDLE parameter, LPVOID data, UINT bytes) PURE; STDMETHOD(SetBool)(THIS_ D3DXHANDLE parameter, BOOL b) PURE; STDMETHOD(GetBool)(THIS_ D3DXHANDLE parameter, BOOL* b) PURE; diff --git a/include/d3dx9mesh.h b/include/d3dx9mesh.h index b71fc334054..94e3734d9b6 100644 --- a/include/d3dx9mesh.h +++ b/include/d3dx9mesh.h @@ -536,8 +536,8 @@ DECLARE_INTERFACE_(ID3DXSkinInfo, IUnknown) STDMETHOD(SetDeclaration)(THIS_ CONST D3DVERTEXELEMENT9* declaration) PURE; STDMETHOD_(DWORD, GetFVF)(THIS) PURE; STDMETHOD(GetDeclaration)(THIS_ D3DVERTEXELEMENT9 declaration[MAX_FVF_DECL_SIZE]) PURE; - STDMETHOD(UpdateSkinnedMesh)(THIS_ CONST D3DXMATRIX* bone_transforms, - CONST D3DXMATRIX* bone_inv_transpose_transforms, LPCVOID vertices_src, PVOID vertices_dest) PURE; + STDMETHOD(UpdateSkinnedMesh)(THIS_ const D3DXMATRIX *bone_transforms, + const D3DXMATRIX *bone_inv_transpose_transforms, const void *src_vertices, void *dst_vertices) PURE; STDMETHOD(ConvertToBlendedMesh)(THIS_ ID3DXMesh *mesh_in, DWORD options, const DWORD *adjacency_in, DWORD *adjacency_out, DWORD *face_remap, ID3DXBuffer **vertex_remap, DWORD *max_face_infl, DWORD *num_bone_combinations, ID3DXBuffer **bone_combination_table, ID3DXMesh **mesh_out) PURE; @@ -807,8 +807,10 @@ HRESULT WINAPI D3DXIntersectSubset(ID3DXBaseMesh *mesh, DWORD attribute_id, cons const D3DXVECTOR3 *ray_direction, BOOL *hit, DWORD *face_idx, float *u, float *v, float *distance, ID3DXBuffer **hits, DWORD *hit_count); BOOL WINAPI D3DXIntersectTri(CONST D3DXVECTOR3 *, CONST D3DXVECTOR3 *, CONST D3DXVECTOR3 *, CONST D3DXVECTOR3 *, CONST D3DXVECTOR3*, FLOAT *, FLOAT *, FLOAT *); -HRESULT WINAPI D3DXOptimizeFaces(LPCVOID, UINT, UINT, BOOL, DWORD *); -HRESULT WINAPI D3DXOptimizeVertices(LPCVOID, UINT, UINT, BOOL, DWORD *); +HRESULT WINAPI D3DXOptimizeFaces(const void *indices, UINT face_count, + UINT vertex_count, BOOL idx_32bit, DWORD *face_remap); +HRESULT WINAPI D3DXOptimizeVertices(const void *indices, UINT face_count, + UINT vertex_count, BOOL idx_32bit, DWORD *vertex_remap); HRESULT WINAPI D3DXRectPatchSize(CONST FLOAT *, DWORD *, DWORD *); HRESULT WINAPI D3DXSHPRTCompSuperCluster(UINT *cluster_ids, ID3DXMesh *scene, UINT max_cluster_count, UINT cluster_count, UINT *scluster_ids, UINT *scluster_count); diff --git a/include/d3dx9shader.h b/include/d3dx9shader.h index 93a7368cdbb..0586544850c 100644 --- a/include/d3dx9shader.h +++ b/include/d3dx9shader.h @@ -109,7 +109,7 @@ typedef struct _D3DXCONSTANT_DESC UINT Elements; UINT StructMembers; UINT Bytes; - LPCVOID DefaultValue; + const void *DefaultValue; } D3DXCONSTANT_DESC, *LPD3DXCONSTANT_DESC; DEFINE_GUID(IID_ID3DXConstantTable, 0x9dca3190, 0x38b9, 0x4fc3, 0x92, 0xe3, 0x39, 0xc6, 0xdd, 0xfb, 0x35, 0x8b); diff --git a/include/d3dx9tex.h b/include/d3dx9tex.h index b076d5453db..26c395ffbde 100644 --- a/include/d3dx9tex.h +++ b/include/d3dx9tex.h @@ -100,7 +100,7 @@ HRESULT WINAPI D3DXGetImageInfoFromResourceA(HMODULE module, const char *resourc HRESULT WINAPI D3DXGetImageInfoFromResourceW(HMODULE module, const WCHAR *resource, D3DXIMAGE_INFO *info); #define D3DXGetImageInfoFromResource WINELIB_NAME_AW(D3DXGetImageInfoFromResource) -HRESULT WINAPI D3DXGetImageInfoFromFileInMemory(LPCVOID data, UINT datasize, D3DXIMAGE_INFO *info); +HRESULT WINAPI D3DXGetImageInfoFromFileInMemory(const void *data, UINT data_size, D3DXIMAGE_INFO *info); /* Surface Loading/Saving */ diff --git a/include/d3dx9xof.h b/include/d3dx9xof.h index b15d9da56f5..ee30572a491 100644 --- a/include/d3dx9xof.h +++ b/include/d3dx9xof.h @@ -81,7 +81,7 @@ DECLARE_INTERFACE_IID_(ID3DXFile,IUnknown,"cef08cf9-7b4f-4429-9624-2a690a933201" struct ID3DXFileEnumObject **enum_obj) PURE; STDMETHOD(CreateSaveObject)(THIS_ const void *data, D3DXF_FILESAVEOPTIONS flags, D3DXF_FILEFORMAT format, struct ID3DXFileSaveObject **save_obj) PURE; - STDMETHOD(RegisterTemplates)(THIS_ LPCVOID, SIZE_T) PURE; + STDMETHOD(RegisterTemplates)(THIS_ const void *data, SIZE_T data_size) PURE; STDMETHOD(RegisterEnumTemplates)(THIS_ struct ID3DXFileEnumObject *enum_obj) PURE; }; #undef INTERFACE @@ -147,7 +147,7 @@ DECLARE_INTERFACE_IID_(ID3DXFileData,IUnknown,"cef08cfd-7b4f-4429-9624-2a690a933 STDMETHOD(GetEnum)(THIS_ ID3DXFileEnumObject **enum_obj) PURE; STDMETHOD(GetName)(THIS_ char *name, SIZE_T *size) PURE; STDMETHOD(GetId)(THIS_ LPGUID) PURE; - STDMETHOD(Lock)(THIS_ SIZE_T*, LPCVOID*) PURE; + STDMETHOD(Lock)(THIS_ SIZE_T *data_size, const void **data) PURE; STDMETHOD(Unlock)(THIS) PURE; STDMETHOD(GetType)(THIS_ GUID*) PURE; STDMETHOD_(BOOL,IsReference)(THIS) PURE;