ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Include guiddef.h in widltypes.h.

This commit is contained in:
Ove Kaaven 2002-12-15 01:13:18 +00:00 committed by Alexandre Julliard
parent e4eee61a3d
commit 064c48a607
4 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/widl/header.c
View File

@ -603,7 +603,7 @@ void write_forward(type_t *iface)
void write_guid(type_t *iface)
{
uuid_t *uuid = get_attrp(iface->attrs, ATTR_UUID);
UUID *uuid = get_attrp(iface->attrs, ATTR_UUID);
if (!uuid) return;
fprintf(header, "DEFINE_GUID(IID_%s, 0x%08lx, 0x%04x, 0x%04x, 0x%02x,0x%02x, 0x%02x,0x%02x,0x%02x,0x%02x,0x%02x,0x%02x);\n",
iface->name, uuid->Data1, uuid->Data2, uuid->Data3, uuid->Data4[0], uuid->Data4[1],

4
tools/widl/parser.l
View File

@ -75,9 +75,9 @@ int import_stack_ptr = 0;
static void pop_import(void);
static uuid_t* parse_uuid(const char*u)
static UUID* parse_uuid(const char*u)
{
uuid_t* uuid = xmalloc(sizeof(uuid_t));
UUID* uuid = xmalloc(sizeof(UUID));
char b[3];
/* it would be nice to use UuidFromStringA */
uuid->Data1 = strtoul(u, NULL, 16);

2
tools/widl/parser.y
View File

@ -106,7 +106,7 @@ static type_t std_uhyper = { "MIDL_uhyper" };
var_t *var;
func_t *func;
char *str;
uuid_t *uuid;
UUID *uuid;
int num;
}

14
tools/widl/widltypes.h
View File

@ -22,15 +22,20 @@
#define __WIDL_WIDLTYPES_H
#include "windef.h"
#include "guiddef.h"
#include "wine/rpcfc.h"
#ifndef UUID_DEFINED
#define UUID_DEFINED
typedef GUID UUID;
#endif
typedef struct _attr_t attr_t;
typedef struct _expr_t expr_t;
typedef struct _type_t type_t;
typedef struct _typeref_t typeref_t;
typedef struct _var_t var_t;
typedef struct _func_t func_t;
typedef struct _uuid_t uuid_t;
#define DECL_LINK(type) \
type *l_next; \
@ -159,11 +164,4 @@ struct _func_t {
DECL_LINK(func_t)
};
struct _uuid_t {
DWORD Data1;
WORD Data2;
WORD Data3;
BYTE Data4[8];
};
#endif