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

widl: Handle LPSTR in typelibs.

This commit is contained in:
Dan Hipschman 2007-08-27 20:24:37 -07:00 committed by Alexandre Julliard
parent 5861d08426
commit d82b384859
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tools/widl/typelib.c
View File

@ -126,8 +126,9 @@ static int kw_cmp_func(const void *s1, const void *s2)
return strcmp(KWP(s1)->kw, KWP(s2)->kw);
}
static unsigned short builtin_vt(const char *kw)
static unsigned short builtin_vt(const type_t *t)
{
const char *kw = t->name;
struct oatype key, *kwp;
key.kw = kw;
#ifdef KW_BSEARCH
@ -145,6 +146,13 @@ static unsigned short builtin_vt(const char *kw)
if (kwp) {
return kwp->vt;
}
if (is_string_type (t->attrs, t))
switch (t->ref->type)
{
case RPC_FC_CHAR: return VT_LPSTR;
case RPC_FC_WCHAR: return VT_LPWSTR;
default: break;
}
return 0;
}
@ -160,7 +168,7 @@ unsigned short get_type_vt(type_t *t)
chat("get_type_vt: %p type->name %s\n", t, t->name);
if (t->name) {
vt = builtin_vt(t->name);
vt = builtin_vt(t);
if (vt) return vt;
}

7
tools/widl/write_msft.c
View File

@ -852,6 +852,13 @@ static int encode_type(
*encoded_type = default_type;
break;
case VT_LPSTR:
case VT_LPWSTR:
*encoded_type = 0xfffe0000 | vt;
*width = 4;
*alignment = 4;
break;
case VT_PTR:
{
int next_vt;