[ekohl] 37860: Sync to wine-1.1.3: - Dan Hipschman <[e-mail]> Thu, 7 Aug 2008 widl: Honor typedef pointer attributes.

Author: ekohl
Date: Thu Dec  4 14:20:08 2008
New Revision: 37860

URL: http://svn.reactos.org/svn/reactos?rev=37860&view=rev
Log:
Sync to wine-1.1.3:

- Dan Hipschman <dsh(a)linux.ucla.edu> Thu, 7 Aug 2008
widl: Honor typedef pointer attributes.

Modified:
    trunk/reactos/media/doc/README.WINE
    trunk/reactos/tools/widl/parser.tab.c
    trunk/reactos/tools/widl/parser.y

Modified: trunk/reactos/media/doc/README.WINE
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…
==============================================================================
--- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Thu Dec  4 14:20:08 2008
@@ -26,7 +26,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/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.
 

Modified: trunk/reactos/tools/widl/parser.tab.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/parser.tab.c?re…
==============================================================================
--- trunk/reactos/tools/widl/parser.tab.c [iso-8859-1] (original)
+++ trunk/reactos/tools/widl/parser.tab.c [iso-8859-1] Thu Dec  4 14:20:08 2008
@@ -4741,7 +4741,6 @@
 {
   expr_list_t *sizes = get_attrp(v->attrs, ATTR_SIZEIS);
   expr_list_t *lengs = get_attrp(v->attrs, ATTR_LENGTHIS);
-  int ptr_attr = get_attrv(v->attrs, ATTR_POINTERTYPE);
   int sizeless, has_varconf;
   expr_t *dim;
   type_t *atype, **ptype;
@@ -4772,13 +4771,15 @@
    * pointer_default so we need to fix that up here */
   if (!arr)
   {
+    int ptr_attr = get_attrv(v->attrs, ATTR_POINTERTYPE);
     const type_t *ptr = NULL;
     /* pointer attributes on the left side of the type belong to the function
      * pointer, if one is being declared */
     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;
       else
         break;

Modified: trunk/reactos/tools/widl/parser.y
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/parser.y?rev=37…
==============================================================================
--- trunk/reactos/tools/widl/parser.y [iso-8859-1] (original)
+++ trunk/reactos/tools/widl/parser.y [iso-8859-1] Thu Dec  4 14:20:08 2008
@@ -1426,7 +1426,6 @@
 {
   expr_list_t *sizes = get_attrp(v->attrs, ATTR_SIZEIS);
   expr_list_t *lengs = get_attrp(v->attrs, ATTR_LENGTHIS);
-  int ptr_attr = get_attrv(v->attrs, ATTR_POINTERTYPE);
   int sizeless, has_varconf;
   expr_t *dim;
   type_t *atype, **ptype;
@@ -1457,13 +1456,15 @@
    * pointer_default so we need to fix that up here */
   if (!arr)
   {
+    int ptr_attr = get_attrv(v->attrs, ATTR_POINTERTYPE);
     const type_t *ptr = NULL;
     /* pointer attributes on the left side of the type belong to the function
      * pointer, if one is being declared */
     type_t **pt = func_type ? &func_type : &v->type;
-    for (ptr = *pt; ptr; )
-    {
-      if (ptr->kind == TKIND_ALIAS)
+    for (ptr = *pt; ptr && !ptr_attr; )
+    {
+      ptr_attr = get_attrv(ptr->attrs, ATTR_POINTERTYPE);
+      if (!ptr_attr && ptr->kind == TKIND_ALIAS)
         ptr = ptr->orig;
       else
         break;