system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-14 18:15:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

widl: Allow enums as union switch types.

Browse source
This commit is contained in:
Dan Hipschman 2007-06-25 18:27:24 -07:00 committed by Alexandre Julliard
parent ea7b1694de
commit 46222aee6e
3 changed files with 49 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
dlls/rpcrt4/tests/server.c
View file

@ -286,6 +286,18 @@ s_enum_ord(e_t e)
} }
} }
double
s_square_encue(encue_t *eue)
{
switch (eue->t)
{
case E1: return eue->tagged_union.i1 * eue->tagged_union.i1;
case E2: return eue->tagged_union.f2 * eue->tagged_union.f2;
default:
return 0.0;
}
}
void void
s_stop(void) s_stop(void)
{ {
@ -409,6 +421,7 @@ basic_tests(void)
static void static void
union_tests(void) union_tests(void)
{ {
encue_t eue;
encu_t eu; encu_t eu;
sun_t su; sun_t su;
int i; int i;
@ -437,6 +450,14 @@ union_tests(void)
eu.t = ENCU_F; eu.t = ENCU_F;
eu.tagged_union.f = 3.0; eu.tagged_union.f = 3.0;
ok(square_encu(&eu) == 9.0, "RPC square_encu\n"); ok(square_encu(&eu) == 9.0, "RPC square_encu\n");
eue.t = E1;
eue.tagged_union.i1 = 8;
ok(square_encue(&eue) == 64.0, "RPC square_encue\n");
eue.t = E2;
eue.tagged_union.f2 = 10.0;
ok(square_encue(&eue) == 100.0, "RPC square_encue\n");
} }
static test_list_t * static test_list_t *

7
dlls/rpcrt4/tests/server.idl
View file

@ -165,9 +165,16 @@ interface IServer
E4 = 64 E4 = 64
} e_t; } e_t;
typedef union encue switch (e_t t)
{
case E1: int i1;
case E2: float f2;
} encue_t;
double square_encu(encu_t *eu); double square_encu(encu_t *eu);
int sum_parr(int *a[3]); int sum_parr(int *a[3]);
int sum_pcarr([size_is(n)] int *a[], int n); int sum_pcarr([size_is(n)] int *a[], int n);
int enum_ord(e_t e); int enum_ord(e_t e);
double square_encue(encue_t *eue);
void stop(void); void stop(void);
} }

26
tools/widl/typegen.c
View file

@ -626,6 +626,7 @@ static size_t write_conf_or_var_desc(FILE *file, const func_t *func, const type_
break; break;
case RPC_FC_WCHAR: case RPC_FC_WCHAR:
case RPC_FC_SHORT: case RPC_FC_SHORT:
case RPC_FC_ENUM16:
param_type = RPC_FC_SHORT; param_type = RPC_FC_SHORT;
param_type_string = "FC_SHORT"; param_type_string = "FC_SHORT";
break; break;
@ -634,6 +635,7 @@ static size_t write_conf_or_var_desc(FILE *file, const func_t *func, const type_
param_type_string = "FC_USHORT"; param_type_string = "FC_USHORT";
break; break;
case RPC_FC_LONG: case RPC_FC_LONG:
case RPC_FC_ENUM32:
param_type = RPC_FC_LONG; param_type = RPC_FC_LONG;
param_type_string = "FC_LONG"; param_type_string = "FC_LONG";
break; break;
@ -1734,12 +1736,26 @@ static size_t write_union_tfs(FILE *file, type_t *type, unsigned int *tfsoff)
{ {
const var_t *sv = LIST_ENTRY(list_head(type->fields), const var_t, entry); const var_t *sv = LIST_ENTRY(list_head(type->fields), const var_t, entry);
const type_t *st = sv->type; const type_t *st = sv->type;
size_t ss = type_memsize(st, &align);
print_file(file, 2, "0x%x,\t/* %s */\n", type->type, string_of_type(type->type)); switch (st->type)
print_file(file, 2, "0x%x,\t/* Switch type= %s */\n", {
(ss << 4) | st->type, string_of_type(st->type)); case RPC_FC_CHAR:
*tfsoff += 2; case RPC_FC_SMALL:
case RPC_FC_USMALL:
case RPC_FC_SHORT:
case RPC_FC_USHORT:
case RPC_FC_LONG:
case RPC_FC_ULONG:
case RPC_FC_ENUM16:
case RPC_FC_ENUM32:
print_file(file, 2, "0x%x,\t/* %s */\n", type->type, string_of_type(type->type));
print_file(file, 2, "0x%x,\t/* Switch type= %s */\n",
0x40 | st->type, string_of_type(st->type));
*tfsoff += 2;
break;
default:
error("union switch type must be an integer, char, or enum\n");
}
} }
print_file(file, 2, "NdrFcShort(0x%x),\t/* %d */\n", size, size); print_file(file, 2, "NdrFcShort(0x%x),\t/* %d */\n", size, size);
print_file(file, 2, "NdrFcShort(0x%x),\t/* %d */\n", nbranch, nbranch); print_file(file, 2, "NdrFcShort(0x%x),\t/* %d */\n", nbranch, nbranch);