Changeset 21447

Timestamp:

Sep 18, 2010, 5:27:16 PM (15 years ago)

Author:

dmik

Message:

Fixed ntdll build break by gcc4 by fixing DUMMYUNIONNAME/DUMMYSTRUCTNAME macros.

Location:

trunk

Files:

• include/win/windef.h (modified) (4 diffs)
• src/NTDLL/file.c (modified) (1 diff)
• src/comctl32/treeview.c (modified) (2 diffs)
• src/shell32/brsfolder.c (modified) (1 diff)

trunk/include/win/windef.h

@@ -182 +182 @@
 #define DUMMYSTRUCTNAME4
 #define DUMMYSTRUCTNAME5
+#define DUMMYSTRUCTNAME_DOT
+#define DUMMYSTRUCTNAME1_DOT
+#define DUMMYSTRUCTNAME2_DOT
+#define DUMMYSTRUCTNAME3_DOT
+#define DUMMYSTRUCTNAME4_DOT
+#define DUMMYSTRUCTNAME5_DOT
 #else /* !defined(NONAMELESSSTRUCT) */
 #define DUMMYSTRUCTNAME   s
@@ -189 +195 @@
 #define DUMMYSTRUCTNAME4  s4
 #define DUMMYSTRUCTNAME5  s5
+#define DUMMYSTRUCTNAME_DOT   s.
+#define DUMMYSTRUCTNAME1_DOT  s1.
+#define DUMMYSTRUCTNAME2_DOT  s2.
+#define DUMMYSTRUCTNAME3_DOT  s3.
+#define DUMMYSTRUCTNAME4_DOT  s4.
+#define DUMMYSTRUCTNAME5_DOT  s5.
 #endif /* !defined(NONAMELESSSTRUCT) */
 
@@ -201 +213 @@
 #define DUMMYUNIONNAME7
 #define DUMMYUNIONNAME8
+#define DUMMYUNIONNAME_DOT
+#define DUMMYUNIONNAME1_DOT
+#define DUMMYUNIONNAME2_DOT
+#define DUMMYUNIONNAME3_DOT
+#define DUMMYUNIONNAME4_DOT
+#define DUMMYUNIONNAME5_DOT
+#define DUMMYUNIONNAME6_DOT
+#define DUMMYUNIONNAME7_DOT
+#define DUMMYUNIONNAME8_DOT
 #else /* !defined(NONAMELESSUNION) */
 #define DUMMYUNIONNAME   u
@@ -211 +232 @@
 #define DUMMYUNIONNAME7  u7
 #define DUMMYUNIONNAME8  u8
+#define DUMMYUNIONNAME_DOT   u.
+#define DUMMYUNIONNAME1_DOT  u1.
+#define DUMMYUNIONNAME2_DOT  u2.
+#define DUMMYUNIONNAME3_DOT  u3.
+#define DUMMYUNIONNAME4_DOT  u4.
+#define DUMMYUNIONNAME5_DOT  u5.
+#define DUMMYUNIONNAME6_DOT  u6.
+#define DUMMYUNIONNAME7_DOT  u7.
+#define DUMMYUNIONNAME8_DOT  u8.
 #endif /* !defined(NONAMELESSUNION) */
 

trunk/src/NTDLL/file.c

@@ -333 +333 @@
             break;
         }
-        IoStatusBlock->DUMMYUNIONNAME.Status = STATUS_SUCCESS;
+        IoStatusBlock->DUMMYUNIONNAME_DOT Status = STATUS_SUCCESS;
         IoStatusBlock->Information = len;
         return STATUS_SUCCESS;

trunk/src/comctl32/treeview.c

@@ -1174 +1174 @@
 {
     const TVINSERTSTRUCTA *ptdi = (LPTVINSERTSTRUCTA) lParam;
-    const TVITEMEXA *tvItem = &ptdi->DUMMYUNIONNAME.itemex;
+    const TVITEMEXA *tvItem = &ptdi->DUMMYUNIONNAME_DOT itemex;
     HTREEITEM insertAfter;
     TREEVIEW_ITEM *newItem, *parentItem;
@@ -1384 +1384 @@
     tvisA.hInsertAfter = tvisW->hInsertAfter;
 
-    tvisA.DUMMYUNIONNAME.item.mask = tvisW->DUMMYUNIONNAME.item.mask;
-    tvisA.DUMMYUNIONNAME.item.hItem = tvisW->DUMMYUNIONNAME.item.hItem;
-    tvisA.DUMMYUNIONNAME.item.state = tvisW->DUMMYUNIONNAME.item.state;
-    tvisA.DUMMYUNIONNAME.item.stateMask = tvisW->DUMMYUNIONNAME.item.stateMask;
-    tvisA.DUMMYUNIONNAME.item.cchTextMax =
-    tvisW->DUMMYUNIONNAME.item.cchTextMax;
-
-    if (tvisW->DUMMYUNIONNAME.item.pszText)
-    {
-    if (tvisW->DUMMYUNIONNAME.item.pszText != LPSTR_TEXTCALLBACKW)
-    {
-            int len = WideCharToMultiByte( CP_ACP, 0, tvisW->DUMMYUNIONNAME.item.pszText, -1,
+    tvisA.DUMMYUNIONNAME_DOT item.mask = tvisW->DUMMYUNIONNAME_DOT item.mask;
+    tvisA.DUMMYUNIONNAME_DOT item.hItem = tvisW->DUMMYUNIONNAME_DOT item.hItem;
+    tvisA.DUMMYUNIONNAME_DOT item.state = tvisW->DUMMYUNIONNAME_DOT item.state;
+    tvisA.DUMMYUNIONNAME_DOT item.stateMask = tvisW->DUMMYUNIONNAME_DOT item.stateMask;
+    tvisA.DUMMYUNIONNAME_DOT item.cchTextMax =
+    tvisW->DUMMYUNIONNAME_DOT item.cchTextMax;
+
+    if (tvisW->DUMMYUNIONNAME_DOT item.pszText)
+    {
+    if (tvisW->DUMMYUNIONNAME_DOT item.pszText != LPSTR_TEXTCALLBACKW)
+    {
+            int len = WideCharToMultiByte( CP_ACP, 0, tvisW->DUMMYUNIONNAME_DOT item.pszText, -1,
                                            NULL, 0, NULL, NULL );
-        tvisA.DUMMYUNIONNAME.item.pszText = COMCTL32_Alloc(len);
-            WideCharToMultiByte( CP_ACP, 0, tvisW->DUMMYUNIONNAME.item.pszText, -1,
-                                 tvisA.DUMMYUNIONNAME.item.pszText, len, NULL, NULL );
+        tvisA.DUMMYUNIONNAME_DOT item.pszText = COMCTL32_Alloc(len);
+            WideCharToMultiByte( CP_ACP, 0, tvisW->DUMMYUNIONNAME_DOT item.pszText, -1,
+                                 tvisA.DUMMYUNIONNAME_DOT item.pszText, len, NULL, NULL );
     }
     else
     {
-        tvisA.DUMMYUNIONNAME.item.pszText = LPSTR_TEXTCALLBACKA;
-        tvisA.DUMMYUNIONNAME.item.cchTextMax = 0;
-    }
-    }
-
-    tvisA.DUMMYUNIONNAME.item.iImage = tvisW->DUMMYUNIONNAME.item.iImage;
-    tvisA.DUMMYUNIONNAME.item.iSelectedImage =
-    tvisW->DUMMYUNIONNAME.item.iSelectedImage;
-    tvisA.DUMMYUNIONNAME.item.cChildren = tvisW->DUMMYUNIONNAME.item.cChildren;
-    tvisA.DUMMYUNIONNAME.item.lParam = tvisW->DUMMYUNIONNAME.item.lParam;
+        tvisA.DUMMYUNIONNAME_DOT item.pszText = LPSTR_TEXTCALLBACKA;
+        tvisA.DUMMYUNIONNAME_DOT item.cchTextMax = 0;
+    }
+    }
+
+    tvisA.DUMMYUNIONNAME_DOT item.iImage = tvisW->DUMMYUNIONNAME_DOT item.iImage;
+    tvisA.DUMMYUNIONNAME_DOT item.iSelectedImage =
+    tvisW->DUMMYUNIONNAME_DOT item.iSelectedImage;
+    tvisA.DUMMYUNIONNAME_DOT item.cChildren = tvisW->DUMMYUNIONNAME_DOT item.cChildren;
+    tvisA.DUMMYUNIONNAME_DOT item.lParam = tvisW->DUMMYUNIONNAME_DOT item.lParam;
 
     lRes = TREEVIEW_InsertItemA(infoPtr, (LPARAM)&tvisA);
 
-    if (tvisA.DUMMYUNIONNAME.item.pszText != LPSTR_TEXTCALLBACKA)
-    {
-    COMCTL32_Free(tvisA.DUMMYUNIONNAME.item.pszText);
+    if (tvisA.DUMMYUNIONNAME_DOT item.pszText != LPSTR_TEXTCALLBACKA)
+    {
+    COMCTL32_Free(tvisA.DUMMYUNIONNAME_DOT item.pszText);
     }
 

trunk/src/shell32/brsfolder.c

@@ -175 +175 @@
                 GetNormalAndSelectedIcons(lptvid->lpifq, &tvi);
 
-                tvins.DUMMYUNIONNAME.item         = tvi;
+                tvins.DUMMYUNIONNAME_DOT item = tvi;
                 tvins.hInsertAfter = hPrev;
                 tvins.hParent      = hParent;