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

widl: The alignment written for USER_MARSHAL types is the wire-type alignment.

Browse Source
This commit is contained in:
Huw Davies 2009-08-21 13:20:16 +01:00 committed by Alexandre Julliard
parent e4e21193c0
commit a376b86dfe
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tools/widl/typegen.c
View File

@ -1476,13 +1476,15 @@ static void write_user_tfs(FILE *file, type_t *type, unsigned int *tfsoff)
unsigned int align = 0, ualign = 0; unsigned int align = 0, ualign = 0;
const char *name = NULL; const char *name = NULL;
type_t *utype = get_user_type(type, &name); type_t *utype = get_user_type(type, &name);
unsigned int usize = user_type_has_variable_size(utype) ? 0 : type_memsize(utype, &ualign); unsigned int usize = type_memsize(utype, &ualign);
unsigned int size = type_memsize(type, &align); unsigned int size = type_memsize(type, &align);
unsigned short funoff = user_type_offset(name); unsigned short funoff = user_type_offset(name);
short reloff; short reloff;
guard_rec(type); guard_rec(type);
if(user_type_has_variable_size(utype)) usize = 0;
if (type_get_type(utype) == TYPE_BASIC || if (type_get_type(utype) == TYPE_BASIC ||
type_get_type(utype) == TYPE_ENUM) type_get_type(utype) == TYPE_ENUM)
{ {
@ -1518,7 +1520,7 @@ static void write_user_tfs(FILE *file, type_t *type, unsigned int *tfsoff)
print_start_tfs_comment(file, type, start); print_start_tfs_comment(file, type, start);
print_file(file, 2, "0x%x,\t/* FC_USER_MARSHAL */\n", RPC_FC_USER_MARSHAL); print_file(file, 2, "0x%x,\t/* FC_USER_MARSHAL */\n", RPC_FC_USER_MARSHAL);
print_file(file, 2, "0x%x,\t/* Alignment= %d, Flags= %02x */\n", print_file(file, 2, "0x%x,\t/* Alignment= %d, Flags= %02x */\n",
flags | (align - 1), align - 1, flags); flags | (ualign - 1), ualign - 1, flags);
print_file(file, 2, "NdrFcShort(0x%hx),\t/* Function offset= %hu */\n", funoff, funoff); print_file(file, 2, "NdrFcShort(0x%hx),\t/* Function offset= %hu */\n", funoff, funoff);
print_file(file, 2, "NdrFcShort(0x%hx),\t/* %u */\n", size, size); print_file(file, 2, "NdrFcShort(0x%hx),\t/* %u */\n", size, size);
print_file(file, 2, "NdrFcShort(0x%hx),\t/* %u */\n", usize, usize); print_file(file, 2, "NdrFcShort(0x%hx),\t/* %u */\n", usize, usize);