Ignore:
Timestamp:
Dec 18, 2011, 10:28:22 PM (14 years ago)
Author:
dmik
Message:

Merge branch gcc-kmk to trunk.

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk

    • Property svn:ignore

      •  

        old new  
        1 bin
        2 Makefile.inc
         1env.cmd
         2LocalConfig.kmk
    • Property svn:mergeinfo set to
      /branches/gcc-kmkmergedeligible

  • trunk/src/ole32/datacache.c

    r9400 r21916  
    700700
    701701    return (elem->type == STGTY_STREAM)
    702         && (elem->cbSize.s.LowPart >= sizeof(PresentationDataHeader))
     702        && (elem->cbSize.DUMMYSTRUCTNAME_DOT LowPart >= sizeof(PresentationDataHeader))
    703703        && (strlenW(name) == 11)
    704704        && (strncmpW(name, OlePres, 8) == 0)
    … …  
    769769                    /* Rewind the stream before returning it. */
    770770                    LARGE_INTEGER offset;
    771                     offset.s.LowPart = 0;
    772                     offset.s.HighPart = 0;
     771                    offset.DUMMYSTRUCTNAME_DOT LowPart = 0;
     772                    offset.DUMMYSTRUCTNAME_DOT HighPart = 0;
    773773                    IStream_Seek(pStm, offset, STREAM_SEEK_SET, NULL);
    774774
    … …  
    839839   * Skip the header
    840840   */
    841   offset.s.HighPart = 0;
    842   offset.s.LowPart  = sizeof(PresentationDataHeader);
     841  offset.DUMMYSTRUCTNAME_DOT HighPart = 0;
     842  offset.DUMMYSTRUCTNAME_DOT LowPart  = sizeof(PresentationDataHeader);
    843843
    844844  hres = IStream_Seek(
    … …  
    848848           NULL);
    849849
    850   streamInfo.cbSize.s.LowPart -= offset.s.LowPart;
     850  streamInfo.cbSize.DUMMYSTRUCTNAME_DOT LowPart -= offset.DUMMYSTRUCTNAME_DOT LowPart;
    851851
    852852  /*
    … …  
    855855  metafileBits = HeapAlloc(GetProcessHeap(),
    856856                           0,
    857                            streamInfo.cbSize.s.LowPart);
     857                           streamInfo.cbSize.DUMMYSTRUCTNAME_DOT LowPart);
    858858
    859859  /*
    … …  
    863863           presStream,
    864864           metafileBits,
    865            streamInfo.cbSize.s.LowPart,
     865           streamInfo.cbSize.DUMMYSTRUCTNAME_DOT LowPart,
    866866           NULL);
    867867
    … …  
    871871  if (SUCCEEDED(hres))
    872872  {
    873     newMetafile = SetMetaFileBitsEx(streamInfo.cbSize.s.LowPart, metafileBits);
     873    newMetafile = SetMetaFileBitsEx(streamInfo.cbSize.DUMMYSTRUCTNAME_DOT LowPart, metafileBits);
    874874  }
    875875
    … …  
    11411141    GlobalUnlock(hGlobalMF);
    11421142
    1143     pmedium->u.hGlobal = hGlobalMF;
     1143    pmedium->DUMMYUNIONNAME_DOT hGlobal = hGlobalMF;
    11441144    pmedium->tymed = TYMED_MFPICT;
    11451145    hrRet = S_OK;
Note: See TracChangeset for help on using the changeset viewer.