Changeset 21855 for branches/gcc-kmk/src/ole32/datacache.c

Timestamp:

Dec 6, 2011, 6:19:13 PM (14 years ago)

Author:

dmik

Message:

Port OLE32 and REGSVR32 to GCC/kBuild.

File:

• branches/gcc-kmk/src/ole32/datacache.c (modified) (8 diffs)

branches/gcc-kmk/src/ole32/datacache.c

@@ -700 +700 @@
 
     return (elem->type == STGTY_STREAM)
-        && (elem->cbSize.s.LowPart >= sizeof(PresentationDataHeader))
+        && (elem->cbSize.DUMMYSTRUCTNAME_DOT LowPart >= sizeof(PresentationDataHeader))
         && (strlenW(name) == 11)
         && (strncmpW(name, OlePres, 8) == 0)
@@ -769 +769 @@
                     /* Rewind the stream before returning it. */
                     LARGE_INTEGER offset;
-                    offset.s.LowPart = 0;
-                    offset.s.HighPart = 0;
+                    offset.DUMMYSTRUCTNAME_DOT LowPart = 0;
+                    offset.DUMMYSTRUCTNAME_DOT HighPart = 0;
                     IStream_Seek(pStm, offset, STREAM_SEEK_SET, NULL);
 
@@ -839 +839 @@
    * Skip the header
    */
-  offset.s.HighPart = 0;
-  offset.s.LowPart  = sizeof(PresentationDataHeader);
+  offset.DUMMYSTRUCTNAME_DOT HighPart = 0;
+  offset.DUMMYSTRUCTNAME_DOT LowPart  = sizeof(PresentationDataHeader);
 
   hres = IStream_Seek(
@@ -848 +848 @@
            NULL);
 
-  streamInfo.cbSize.s.LowPart -= offset.s.LowPart;
+  streamInfo.cbSize.DUMMYSTRUCTNAME_DOT LowPart -= offset.DUMMYSTRUCTNAME_DOT LowPart;
 
   /*
@@ -855 +855 @@
   metafileBits = HeapAlloc(GetProcessHeap(),
                            0,
-                           streamInfo.cbSize.s.LowPart);
+                           streamInfo.cbSize.DUMMYSTRUCTNAME_DOT LowPart);
 
   /*
@@ -863 +863 @@
            presStream,
            metafileBits,
-           streamInfo.cbSize.s.LowPart,
+           streamInfo.cbSize.DUMMYSTRUCTNAME_DOT LowPart,
            NULL);
 
@@ -871 +871 @@
   if (SUCCEEDED(hres))
   {
-    newMetafile = SetMetaFileBitsEx(streamInfo.cbSize.s.LowPart, metafileBits);
+    newMetafile = SetMetaFileBitsEx(streamInfo.cbSize.DUMMYSTRUCTNAME_DOT LowPart, metafileBits);
   }
 
@@ -1141 +1141 @@
     GlobalUnlock(hGlobalMF);
 
-    pmedium->u.hGlobal = hGlobalMF;
+    pmedium->DUMMYUNIONNAME_DOT hGlobal = hGlobalMF;
     pmedium->tymed = TYMED_MFPICT;
     hrRet = S_OK;