Commit 0f9ccac4 authored by Henri Verbeet's avatar Henri Verbeet Committed by Alexandre Julliard

ddraw: Get rid of the member_info typedef.

parent 7f1b26a0
......@@ -571,13 +571,13 @@ struct flag_info
#define FE(x) { x, #x }
typedef struct
struct member_info
{
DWORD val;
const char* name;
const char *name;
void (*func)(const void *);
ptrdiff_t offset;
} member_info;
};
/* Structure copy */
#define ME(x,f,e) { x, #x, (void (*)(const void *))(f), offsetof(STRUCT, e) }
......
......@@ -740,11 +740,7 @@ DDRAW_dump_pixelformat_flag(DWORD flagmask)
DDRAW_dump_flags_nolf(flagmask, flags, sizeof(flags)/sizeof(flags[0]));
}
static void
DDRAW_dump_members(DWORD flags,
const void* data,
const member_info* mems,
size_t num_mems)
static void DDRAW_dump_members(DWORD flags, const void *data, const struct member_info *mems, size_t num_mems)
{
unsigned int i;
......@@ -821,7 +817,7 @@ DDRAW_dump_pixelformat(const DDPIXELFORMAT *pf)
void DDRAW_dump_surface_desc(const DDSURFACEDESC2 *lpddsd)
{
#define STRUCT DDSURFACEDESC2
static const member_info members[] =
static const struct member_info members[] =
{
ME(DDSD_HEIGHT, DDRAW_dump_DWORD, dwHeight),
ME(DDSD_WIDTH, DDRAW_dump_DWORD, dwWidth),
......@@ -839,11 +835,11 @@ void DDRAW_dump_surface_desc(const DDSURFACEDESC2 *lpddsd)
ME(DDSD_CKSRCBLT, DDRAW_dump_DDCOLORKEY, ddckCKSrcBlt),
ME(DDSD_PIXELFORMAT, DDRAW_dump_pixelformat, u4 /* ddpfPixelFormat */)
};
static const member_info members_caps[] =
static const struct member_info members_caps[] =
{
ME(DDSD_CAPS, DDRAW_dump_DDSCAPS, ddsCaps)
};
static const member_info members_caps2[] =
static const struct member_info members_caps2[] =
{
ME(DDSD_CAPS, DDRAW_dump_DDSCAPS2, ddsCaps)
};
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment