Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-23 00:45:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

Sync to wine-1.1.3:

Browse source 
- Dan Hipschman <dsh@linux.ucla.edu> Thu, 7 Aug 2008
widl: Honor typedef pointer attributes.

svn path=/trunk/; revision=37860
This commit is contained in:
Eric Kohl 2008-12-04 20:20:08 +00:00
parent f12d11b4f7
commit 599818849a
3 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
reactos/media/doc/README.WINE
View file

@ -26,7 +26,7 @@ reactos/tools/wpp # Synced to Wine-20081105 (~Wine-1.1.7)
reactos/tools/winebuild # Synced to Wine-20081105 (~Wine-1.1.7) reactos/tools/winebuild # Synced to Wine-20081105 (~Wine-1.1.7)
reactos/tools/wmc # Synced to Wine-20081105 (~Wine-1.1.7) reactos/tools/wmc # Synced to Wine-20081105 (~Wine-1.1.7)
reactos/tools/wrc # Synced to Wine-20081105 (~Wine-1.1.7) reactos/tools/wrc # Synced to Wine-20081105 (~Wine-1.1.7)
reactos/tools/widl # Synced to Wine-1_1_1 omitting patches that break MIDL-Compatibility reactos/tools/widl # Synced to Wine-1_1_3, omitting patches that break MIDL-Compatibility
The following libraries are shared with Wine. The following libraries are shared with Wine.

7
reactos/tools/widl/parser.tab.c
View file

@ -4741,7 +4741,6 @@ static void set_type(var_t *v, decl_spec_t *decl_spec, const declarator_t *decl,
{ {
expr_list_t *sizes = get_attrp(v->attrs, ATTR_SIZEIS); expr_list_t *sizes = get_attrp(v->attrs, ATTR_SIZEIS);
expr_list_t *lengs = get_attrp(v->attrs, ATTR_LENGTHIS); expr_list_t *lengs = get_attrp(v->attrs, ATTR_LENGTHIS);
int ptr_attr = get_attrv(v->attrs, ATTR_POINTERTYPE);
int sizeless, has_varconf; int sizeless, has_varconf;
expr_t *dim; expr_t *dim;
type_t *atype, **ptype; type_t *atype, **ptype;
@ -4772,13 +4771,15 @@ static void set_type(var_t *v, decl_spec_t *decl_spec, const declarator_t *decl,
* pointer_default so we need to fix that up here */ * pointer_default so we need to fix that up here */
if (!arr) if (!arr)
{ {
int ptr_attr = get_attrv(v->attrs, ATTR_POINTERTYPE);
const type_t *ptr = NULL; const type_t *ptr = NULL;
/* pointer attributes on the left side of the type belong to the function /* pointer attributes on the left side of the type belong to the function
* pointer, if one is being declared */ * pointer, if one is being declared */
type_t **pt = func_type ? &func_type : &v->type; type_t **pt = func_type ? &func_type : &v->type;
for (ptr = *pt; ptr; ) for (ptr = *pt; ptr && !ptr_attr; )
{ {
if (ptr->kind == TKIND_ALIAS) ptr_attr = get_attrv(ptr->attrs, ATTR_POINTERTYPE);
if (!ptr_attr && ptr->kind == TKIND_ALIAS)
ptr = ptr->orig; ptr = ptr->orig;
else else
break; break;

7
reactos/tools/widl/parser.y
View file

@ -1426,7 +1426,6 @@ static void set_type(var_t *v, decl_spec_t *decl_spec, const declarator_t *decl,
{ {
expr_list_t *sizes = get_attrp(v->attrs, ATTR_SIZEIS); expr_list_t *sizes = get_attrp(v->attrs, ATTR_SIZEIS);
expr_list_t *lengs = get_attrp(v->attrs, ATTR_LENGTHIS); expr_list_t *lengs = get_attrp(v->attrs, ATTR_LENGTHIS);
int ptr_attr = get_attrv(v->attrs, ATTR_POINTERTYPE);
int sizeless, has_varconf; int sizeless, has_varconf;
expr_t *dim; expr_t *dim;
type_t *atype, **ptype; type_t *atype, **ptype;
@ -1457,13 +1456,15 @@ static void set_type(var_t *v, decl_spec_t *decl_spec, const declarator_t *decl,
* pointer_default so we need to fix that up here */ * pointer_default so we need to fix that up here */
if (!arr) if (!arr)
{ {
int ptr_attr = get_attrv(v->attrs, ATTR_POINTERTYPE);
const type_t *ptr = NULL; const type_t *ptr = NULL;
/* pointer attributes on the left side of the type belong to the function /* pointer attributes on the left side of the type belong to the function
* pointer, if one is being declared */ * pointer, if one is being declared */
type_t **pt = func_type ? &func_type : &v->type; type_t **pt = func_type ? &func_type : &v->type;
for (ptr = *pt; ptr; ) for (ptr = *pt; ptr && !ptr_attr; )
{ {
if (ptr->kind == TKIND_ALIAS) ptr_attr = get_attrv(ptr->attrs, ATTR_POINTERTYPE);
if (!ptr_attr && ptr->kind == TKIND_ALIAS)
ptr = ptr->orig; ptr = ptr->orig;
else else
break; break;