Henri Verbeet : d3drm: Get rid of the mesh_group typedef.
Alexandre Julliard
julliard at winehq.org
Tue Oct 29 15:12:25 CDT 2013
Module: wine
Branch: master
Commit: ff08d70f4a421cbc40bdeab2031c0567e54c38bd
URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff08d70f4a421cbc40bdeab2031c0567e54c38bd
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Tue Oct 29 10:28:07 2013 +0100
d3drm: Get rid of the mesh_group typedef.
---
dlls/d3drm/meshbuilder.c | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c
index 0262284..f01d440 100644
--- a/dlls/d3drm/meshbuilder.c
+++ b/dlls/d3drm/meshbuilder.c
@@ -34,7 +34,8 @@
WINE_DEFAULT_DEBUG_CHANNEL(d3drm);
-typedef struct {
+struct mesh_group
+{
unsigned nb_vertices;
D3DRMVERTEX* vertices;
unsigned nb_faces;
@@ -44,14 +45,14 @@ typedef struct {
D3DCOLOR color;
IDirect3DRMMaterial2* material;
IDirect3DRMTexture3* texture;
-} mesh_group;
+};
typedef struct {
IDirect3DRMMesh IDirect3DRMMesh_iface;
LONG ref;
DWORD groups_capacity;
DWORD nb_groups;
- mesh_group* groups;
+ struct mesh_group *groups;
} IDirect3DRMMeshImpl;
typedef struct {
@@ -2628,7 +2629,7 @@ static HRESULT WINAPI IDirect3DRMMeshImpl_AddGroup(IDirect3DRMMesh* iface,
unsigned *face_data, D3DRMGROUPINDEX *return_id)
{
IDirect3DRMMeshImpl *This = impl_from_IDirect3DRMMesh(iface);
- mesh_group* group;
+ struct mesh_group *group;
TRACE("(%p)->(%u,%u,%u,%p,%p)\n", This, vertex_count, face_count, vertex_per_face, face_data, return_id);
@@ -2637,18 +2638,18 @@ static HRESULT WINAPI IDirect3DRMMeshImpl_AddGroup(IDirect3DRMMesh* iface,
if ((This->nb_groups + 1) > This->groups_capacity)
{
+ struct mesh_group *groups;
ULONG new_capacity;
- mesh_group* groups;
if (!This->groups_capacity)
{
new_capacity = 16;
- groups = HeapAlloc(GetProcessHeap(), 0, new_capacity * sizeof(mesh_group));
+ groups = HeapAlloc(GetProcessHeap(), 0, new_capacity * sizeof(*groups));
}
else
{
new_capacity = This->groups_capacity * 2;
- groups = HeapReAlloc(GetProcessHeap(), 0, This->groups, new_capacity * sizeof(mesh_group));
+ groups = HeapReAlloc(GetProcessHeap(), 0, This->groups, new_capacity * sizeof(*groups));
}
if (!groups)
More information about the wine-cvs
mailing list