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/storage32.c

    r21494 r21916  
    681681  if (res == S_OK)
    682682  {
    683     TRACE("<-- STATSTG: pwcsName: %s, type: %ld, cbSize.Low/High: %ld/%ld, grfMode: %08lx, grfLocksSupported: %ld, grfStateBits: %08lx\n", debugstr_w(pstatstg->pwcsName), pstatstg->type, pstatstg->cbSize.s.LowPart, pstatstg->cbSize.s.HighPart, pstatstg->grfMode, pstatstg->grfLocksSupported, pstatstg->grfStateBits);
     683    TRACE("<-- STATSTG: pwcsName: %s, type: %ld, cbSize.Low/High: %ld/%ld, grfMode: %08lx, grfLocksSupported: %ld, grfStateBits: %08lx\n", debugstr_w(pstatstg->pwcsName), pstatstg->type, pstatstg->cbSize.DUMMYSTRUCTNAME_DOT LowPart, pstatstg->cbSize.DUMMYSTRUCTNAME_DOT HighPart, pstatstg->grfMode, pstatstg->grfLocksSupported, pstatstg->grfStateBits);
    684684  }
    685685  TRACE("<-- %08lx\n", res);
    … …  
    765765    renamedProperty.propertyType  = currentProperty.propertyType;
    766766    renamedProperty.startingBlock = currentProperty.startingBlock;
    767     renamedProperty.size.s.LowPart  = currentProperty.size.s.LowPart;
    768     renamedProperty.size.s.HighPart = currentProperty.size.s.HighPart;
     767    renamedProperty.size.DUMMYSTRUCTNAME_DOT LowPart  = currentProperty.size.DUMMYSTRUCTNAME_DOT LowPart;
     768    renamedProperty.size.DUMMYSTRUCTNAME_DOT HighPart = currentProperty.size.DUMMYSTRUCTNAME_DOT HighPart;
    769769
    770770    renamedProperty.previousProperty = PROPERTY_NULL;
    … …  
    939939  newStreamProperty.propertyType  = PROPTYPE_STREAM;
    940940  newStreamProperty.startingBlock = BLOCK_END_OF_CHAIN;
    941   newStreamProperty.size.s.LowPart  = 0;
    942   newStreamProperty.size.s.HighPart = 0;
     941  newStreamProperty.size.DUMMYSTRUCTNAME_DOT LowPart  = 0;
     942  newStreamProperty.size.DUMMYSTRUCTNAME_DOT HighPart = 0;
    943943
    944944  newStreamProperty.previousProperty = PROPERTY_NULL;
    … …  
    11241124  newProperty.propertyType  = PROPTYPE_STORAGE;
    11251125  newProperty.startingBlock = BLOCK_END_OF_CHAIN;
    1126   newProperty.size.s.LowPart  = 0;
    1127   newProperty.size.s.HighPart = 0;
     1126  newProperty.size.DUMMYSTRUCTNAME_DOT LowPart  = 0;
     1127  newProperty.size.DUMMYSTRUCTNAME_DOT HighPart = 0;
    11281128
    11291129  newProperty.previousProperty = PROPERTY_NULL;
    … …  
    12461246     * initialize the size used by the property stream
    12471247     */
    1248     newSize.s.HighPart = 0;
    1249     newSize.s.LowPart  = storage->bigBlockSize * blockCount;
     1248    newSize.DUMMYSTRUCTNAME_DOT HighPart = 0;
     1249    newSize.DUMMYSTRUCTNAME_DOT LowPart  = storage->bigBlockSize * blockCount;
    12501250
    12511251    /*
    … …  
    18751875  ULARGE_INTEGER size;
    18761876
    1877   size.s.HighPart = 0;
    1878   size.s.LowPart = 0;
     1877  size.DUMMYSTRUCTNAME_DOT HighPart = 0;
     1878  size.DUMMYSTRUCTNAME_DOT LowPart = 0;
    18791879
    18801880  hr = StorageBaseImpl_OpenStream(
    … …  
    22832283     * Add one block for the big block depot and one block for the properties
    22842284     */
    2285     size.s.HighPart = 0;
    2286     size.s.LowPart  = This->bigBlockSize * 3;
     2285    size.DUMMYSTRUCTNAME_DOT HighPart = 0;
     2286    size.DUMMYSTRUCTNAME_DOT LowPart  = This->bigBlockSize * 3;
    22872287    BIGBLOCKFILE_SetSize(This->bigBlockFile, size);
    22882288
    … …  
    23512351    rootProp.dirProperty      = PROPERTY_NULL;
    23522352    rootProp.startingBlock    = BLOCK_END_OF_CHAIN;
    2353     rootProp.size.s.HighPart    = 0;
    2354     rootProp.size.s.LowPart     = 0;
     2353    rootProp.size.DUMMYSTRUCTNAME_DOT HighPart    = 0;
     2354    rootProp.size.DUMMYSTRUCTNAME_DOT LowPart     = 0;
    23552355
    23562356    StorageImpl_WriteProperty(This, 0, &rootProp);
    … …  
    31283128  ULONG          bytesRead;
    31293129
    3130   offsetInPropSet.s.HighPart = 0;
    3131   offsetInPropSet.s.LowPart  = index * PROPSET_BLOCK_SIZE;
     3130  offsetInPropSet.DUMMYSTRUCTNAME_DOT HighPart = 0;
     3131  offsetInPropSet.DUMMYSTRUCTNAME_DOT LowPart  = index * PROPSET_BLOCK_SIZE;
    31323132
    31333133  readSuccessful = BlockChainStream_ReadAt(
    … …  
    32063206      currentProperty,
    32073207      OFFSET_PS_SIZE,
    3208       &buffer->size.s.LowPart);
    3209 
    3210     buffer->size.s.HighPart = 0;
     3208      &buffer->size.DUMMYSTRUCTNAME_DOT LowPart);
     3209
     3210    buffer->size.DUMMYSTRUCTNAME_DOT HighPart = 0;
    32113211  }
    32123212
    … …  
    32273227  ULONG          bytesWritten;
    32283228
    3229   offsetInPropSet.s.HighPart = 0;
    3230   offsetInPropSet.s.LowPart  = index * PROPSET_BLOCK_SIZE;
     3229  offsetInPropSet.DUMMYSTRUCTNAME_DOT HighPart = 0;
     3230  offsetInPropSet.DUMMYSTRUCTNAME_DOT LowPart  = index * PROPSET_BLOCK_SIZE;
    32313231
    32323232  memset(currentProperty, 0, PROPSET_BLOCK_SIZE);
    … …  
    32923292    currentProperty,
    32933293      OFFSET_PS_SIZE,
    3294       buffer->size.s.LowPart);
     3294      buffer->size.DUMMYSTRUCTNAME_DOT LowPart);
    32953295
    32963296  writeSuccessful = BlockChainStream_WriteAt(This->rootBlockChain,
    … …  
    34043404   * by small block size increments.
    34053405   */
    3406   offset.s.LowPart = 0;
    3407   offset.s.HighPart = 0;
     3406  offset.DUMMYSTRUCTNAME_DOT LowPart = 0;
     3407  offset.DUMMYSTRUCTNAME_DOT HighPart = 0;
    34083408  cbTotalRead = 0;
    34093409  cbTotalWritten = 0;
    … …  
    34263426    cbTotalWritten += cbWritten;
    34273427
    3428     offset.s.LowPart += This->smallBlockSize;
     3428    offset.DUMMYSTRUCTNAME_DOT LowPart += This->smallBlockSize;
    34293429
    34303430  } while (successRead && successWrite);
    … …  
    34373437   */
    34383438  propertyIndex = (*ppsbChain)->ownerPropertyIndex;
    3439   size.s.HighPart = 0;
    3440   size.s.LowPart  = 0;
     3439  size.DUMMYSTRUCTNAME_DOT HighPart = 0;
     3440  size.DUMMYSTRUCTNAME_DOT LowPart  = 0;
    34413441  SmallBlockChainStream_SetSize(*ppsbChain, size);
    34423442  SmallBlockChainStream_Destroy(*ppsbChain);
    … …  
    42654265  ULONG*         bytesRead)
    42664266{
    4267   ULONG blockNoInSequence = offset.s.LowPart / This->parentStorage->bigBlockSize;
    4268   ULONG offsetInBlock     = offset.s.LowPart % This->parentStorage->bigBlockSize;
     4267  ULONG blockNoInSequence = offset.DUMMYSTRUCTNAME_DOT LowPart / This->parentStorage->bigBlockSize;
     4268  ULONG offsetInBlock     = offset.DUMMYSTRUCTNAME_DOT LowPart % This->parentStorage->bigBlockSize;
    42694269  ULONG bytesToReadInBuffer;
    42704270  ULONG blockIndex;
    … …  
    43534353  ULONG*            bytesWritten)
    43544354{
    4355   ULONG blockNoInSequence = offset.s.LowPart / This->parentStorage->bigBlockSize;
    4356   ULONG offsetInBlock     = offset.s.LowPart % This->parentStorage->bigBlockSize;
     4355  ULONG blockNoInSequence = offset.DUMMYSTRUCTNAME_DOT LowPart / This->parentStorage->bigBlockSize;
     4356  ULONG offsetInBlock     = offset.DUMMYSTRUCTNAME_DOT LowPart % This->parentStorage->bigBlockSize;
    43574357  ULONG bytesToWrite;
    43584358  ULONG blockIndex;
    … …  
    44494449   * Figure out how many blocks are needed to contain the new size
    44504450   */
    4451   numBlocks = newSize.s.LowPart / This->parentStorage->bigBlockSize;
    4452 
    4453   if ((newSize.s.LowPart % This->parentStorage->bigBlockSize) != 0)
     4451  numBlocks = newSize.DUMMYSTRUCTNAME_DOT LowPart / This->parentStorage->bigBlockSize;
     4452
     4453  if ((newSize.DUMMYSTRUCTNAME_DOT LowPart % This->parentStorage->bigBlockSize) != 0)
    44544454    numBlocks++;
    44554455
    … …  
    45494549   * Figure out how many blocks are needed to contain this stream
    45504550   */
    4551   newNumBlocks = newSize.s.LowPart / This->parentStorage->bigBlockSize;
    4552 
    4553   if ((newSize.s.LowPart % This->parentStorage->bigBlockSize) != 0)
     4551  newNumBlocks = newSize.DUMMYSTRUCTNAME_DOT LowPart / This->parentStorage->bigBlockSize;
     4552
     4553  if ((newSize.DUMMYSTRUCTNAME_DOT LowPart % This->parentStorage->bigBlockSize) != 0)
    45544554    newNumBlocks++;
    45554555
    … …  
    46234623  ULARGE_INTEGER size = BlockChainStream_GetSize(This);
    46244624
    4625   if (newSize.s.LowPart == size.s.LowPart)
     4625  if (newSize.DUMMYSTRUCTNAME_DOT LowPart == size.DUMMYSTRUCTNAME_DOT LowPart)
    46264626    return TRUE;
    46274627
    4628   if (newSize.s.LowPart < size.s.LowPart)
     4628  if (newSize.DUMMYSTRUCTNAME_DOT LowPart < size.DUMMYSTRUCTNAME_DOT LowPart)
    46294629  {
    46304630    BlockChainStream_Shrink(This, newSize);
    … …  
    46354635      BIGBLOCKFILE_GetSize(This->parentStorage->bigBlockFile);
    46364636
    4637     ULONG diff = newSize.s.LowPart - size.s.LowPart;
     4637    ULONG diff = newSize.DUMMYSTRUCTNAME_DOT LowPart - size.DUMMYSTRUCTNAME_DOT LowPart;
    46384638
    46394639    /*
    … …  
    46444644                (diff % This->parentStorage->bigBlockSize) );
    46454645
    4646     fileSize.s.LowPart += diff;
     4646    fileSize.DUMMYSTRUCTNAME_DOT LowPart += diff;
    46474647    BIGBLOCKFILE_SetSize(This->parentStorage->bigBlockFile, fileSize);
    46484648
    … …  
    46844684     */
    46854685    ULARGE_INTEGER result;
    4686     result.s.HighPart = 0;
    4687 
    4688     result.s.LowPart  =
     4686    result.DUMMYSTRUCTNAME_DOT HighPart = 0;
     4687
     4688    result.DUMMYSTRUCTNAME_DOT LowPart  =
    46894689      BlockChainStream_GetCount(This) *
    46904690      This->parentStorage->bigBlockSize;
    … …  
    47674767  *nextBlockInChain = BLOCK_END_OF_CHAIN;
    47684768
    4769   offsetOfBlockInDepot.s.HighPart = 0;
    4770   offsetOfBlockInDepot.s.LowPart  = blockIndex * sizeof(ULONG);
     4769  offsetOfBlockInDepot.DUMMYSTRUCTNAME_DOT HighPart = 0;
     4770  offsetOfBlockInDepot.DUMMYSTRUCTNAME_DOT LowPart  = blockIndex * sizeof(ULONG);
    47714771
    47724772  /*
    … …  
    48064806  ULONG  bytesWritten;
    48074807
    4808   offsetOfBlockInDepot.s.HighPart = 0;
    4809   offsetOfBlockInDepot.s.LowPart  = blockIndex * sizeof(ULONG);
     4808  offsetOfBlockInDepot.DUMMYSTRUCTNAME_DOT HighPart = 0;
     4809  offsetOfBlockInDepot.DUMMYSTRUCTNAME_DOT LowPart  = blockIndex * sizeof(ULONG);
    48104810
    48114811  StorageUtl_WriteDWord(&buffer, 0, nextBlock);
    … …  
    48524852  ULONG smallBlocksPerBigBlock;
    48534853
    4854   offsetOfBlockInDepot.s.HighPart = 0;
     4854  offsetOfBlockInDepot.DUMMYSTRUCTNAME_DOT HighPart = 0;
    48554855
    48564856  /*
    … …  
    48594859  while (nextBlockIndex != BLOCK_UNUSED)
    48604860  {
    4861     offsetOfBlockInDepot.s.LowPart = blockIndex * sizeof(ULONG);
     4861    offsetOfBlockInDepot.DUMMYSTRUCTNAME_DOT LowPart = blockIndex * sizeof(ULONG);
    48624862
    48634863    success = BlockChainStream_ReadAt(
    … …  
    49464946
    49474947        rootProp.startingBlock = sbStartIndex;
    4948         rootProp.size.s.HighPart = 0;
    4949         rootProp.size.s.LowPart  = This->parentStorage->bigBlockSize;
     4948        rootProp.size.DUMMYSTRUCTNAME_DOT HighPart = 0;
     4949        rootProp.size.DUMMYSTRUCTNAME_DOT LowPart  = This->parentStorage->bigBlockSize;
    49504950
    49514951        StorageImpl_WriteProperty(
    … …  
    49734973      &rootProp);
    49744974
    4975     if (rootProp.size.s.LowPart <
     4975    if (rootProp.size.DUMMYSTRUCTNAME_DOT LowPart <
    49764976       (blocksRequired * This->parentStorage->bigBlockSize))
    49774977    {
    4978       rootProp.size.s.LowPart += This->parentStorage->bigBlockSize;
     4978      rootProp.size.DUMMYSTRUCTNAME_DOT LowPart += This->parentStorage->bigBlockSize;
    49794979
    49804980      BlockChainStream_SetSize(
    … …  
    50085008  ULARGE_INTEGER offsetInBigBlockFile;
    50095009  ULONG blockNoInSequence =
    5010     offset.s.LowPart / This->parentStorage->smallBlockSize;
    5011 
    5012   ULONG offsetInBlock = offset.s.LowPart % This->parentStorage->smallBlockSize;
     5010    offset.DUMMYSTRUCTNAME_DOT LowPart / This->parentStorage->smallBlockSize;
     5011
     5012  ULONG offsetInBlock = offset.DUMMYSTRUCTNAME_DOT LowPart % This->parentStorage->smallBlockSize;
    50135013  ULONG bytesToReadInBuffer;
    50145014  ULONG blockIndex;
    … …  
    50195019   * This should never happen on a small block file.
    50205020   */
    5021   assert(offset.s.HighPart==0);
     5021  assert(offset.DUMMYSTRUCTNAME_DOT HighPart==0);
    50225022
    50235023  /*
    … …  
    50515051     * Calculate the offset of the small block in the small block file.
    50525052     */
    5053     offsetInBigBlockFile.s.HighPart  = 0;
    5054     offsetInBigBlockFile.s.LowPart   =
     5053    offsetInBigBlockFile.DUMMYSTRUCTNAME_DOT HighPart  = 0;
     5054    offsetInBigBlockFile.DUMMYSTRUCTNAME_DOT LowPart   =
    50555055      blockIndex * This->parentStorage->smallBlockSize;
    50565056
    5057     offsetInBigBlockFile.s.LowPart  += offsetInBlock;
     5057    offsetInBigBlockFile.DUMMYSTRUCTNAME_DOT LowPart  += offsetInBlock;
    50585058
    50595059    /*
    … …  
    50985098  ULARGE_INTEGER offsetInBigBlockFile;
    50995099  ULONG blockNoInSequence =
    5100     offset.s.LowPart / This->parentStorage->smallBlockSize;
    5101 
    5102   ULONG offsetInBlock = offset.s.LowPart % This->parentStorage->smallBlockSize;
     5100    offset.DUMMYSTRUCTNAME_DOT LowPart / This->parentStorage->smallBlockSize;
     5101
     5102  ULONG offsetInBlock = offset.DUMMYSTRUCTNAME_DOT LowPart % This->parentStorage->smallBlockSize;
    51035103  ULONG bytesToWriteInBuffer;
    51045104  ULONG blockIndex;
    … …  
    51095109   * This should never happen on a small block file.
    51105110   */
    5111   assert(offset.s.HighPart==0);
     5111  assert(offset.DUMMYSTRUCTNAME_DOT HighPart==0);
    51125112
    51135113  /*
    … …  
    51425142     * Calculate the offset of the small block in the small block file.
    51435143     */
    5144     offsetInBigBlockFile.s.HighPart  = 0;
    5145     offsetInBigBlockFile.s.LowPart   =
     5144    offsetInBigBlockFile.DUMMYSTRUCTNAME_DOT HighPart  = 0;
     5145    offsetInBigBlockFile.DUMMYSTRUCTNAME_DOT LowPart   =
    51465146      blockIndex * This->parentStorage->smallBlockSize;
    51475147
    5148     offsetInBigBlockFile.s.LowPart  += offsetInBlock;
     5148    offsetInBigBlockFile.DUMMYSTRUCTNAME_DOT LowPart  += offsetInBlock;
    51495149
    51505150    /*
    … …  
    51875187  ULONG count = 0;
    51885188
    5189   numBlocks = newSize.s.LowPart / This->parentStorage->smallBlockSize;
    5190 
    5191   if ((newSize.s.LowPart % This->parentStorage->smallBlockSize) != 0)
     5189  numBlocks = newSize.DUMMYSTRUCTNAME_DOT LowPart / This->parentStorage->smallBlockSize;
     5190
     5191  if ((newSize.DUMMYSTRUCTNAME_DOT LowPart % This->parentStorage->smallBlockSize) != 0)
    51925192    numBlocks++;
    51935193
    … …  
    53005300   * Figure out how many blocks are needed to contain this stream
    53015301   */
    5302   newNumBlocks = newSize.s.LowPart / This->parentStorage->smallBlockSize;
    5303 
    5304   if ((newSize.s.LowPart % This->parentStorage->smallBlockSize) != 0)
     5302  newNumBlocks = newSize.DUMMYSTRUCTNAME_DOT LowPart / This->parentStorage->smallBlockSize;
     5303
     5304  if ((newSize.DUMMYSTRUCTNAME_DOT LowPart % This->parentStorage->smallBlockSize) != 0)
    53055305    newNumBlocks++;
    53065306
    … …  
    53765376  ULARGE_INTEGER size = SmallBlockChainStream_GetSize(This);
    53775377
    5378   if (newSize.s.LowPart == size.s.LowPart)
     5378  if (newSize.DUMMYSTRUCTNAME_DOT LowPart == size.DUMMYSTRUCTNAME_DOT LowPart)
    53795379    return TRUE;
    53805380
    5381   if (newSize.s.LowPart < size.s.LowPart)
     5381  if (newSize.DUMMYSTRUCTNAME_DOT LowPart < size.DUMMYSTRUCTNAME_DOT LowPart)
    53825382  {
    53835383    SmallBlockChainStream_Shrink(This, newSize);
    … …  
    58225822  ULARGE_INTEGER offset;
    58235823
    5824   offset.s.HighPart = 0;
    5825   offset.s.LowPart  = 0;
     5824  offset.DUMMYSTRUCTNAME_DOT HighPart = 0;
     5825  offset.DUMMYSTRUCTNAME_DOT LowPart  = 0;
    58265826
    58275827  ILockBytes_ReadAt(plkbyt, offset, sig, sizeof(sig), NULL);
    … …  
    68106810
    68116811        /*Get the OleType from the CompObj Stream */
    6812         iSeekPos.s.LowPart = sizeof(CompObj.byUnknown1) + sizeof(CompObj.clsid);
    6813         iSeekPos.s.HighPart = 0;
     6812        iSeekPos.DUMMYSTRUCTNAME_DOT LowPart = sizeof(CompObj.byUnknown1) + sizeof(CompObj.clsid);
     6813        iSeekPos.DUMMYSTRUCTNAME_DOT HighPart = 0;
    68146814
    68156815        IStream_Seek(pStream, iSeekPos, STREAM_SEEK_SET, NULL);
    68166816        IStream_Read(pStream, &CompObj.dwCLSIDNameLength, sizeof(CompObj.dwCLSIDNameLength), NULL);
    6817         iSeekPos.s.LowPart = CompObj.dwCLSIDNameLength;
     6817        iSeekPos.DUMMYSTRUCTNAME_DOT LowPart = CompObj.dwCLSIDNameLength;
    68186818        IStream_Seek(pStream, iSeekPos, STREAM_SEEK_CUR , NULL);
    68196819        IStream_Read(pStream, &CompObj.dwOleTypeNameLength, sizeof(CompObj.dwOleTypeNameLength), NULL);
    6820         iSeekPos.s.LowPart = CompObj.dwOleTypeNameLength;
     6820        iSeekPos.DUMMYSTRUCTNAME_DOT LowPart = CompObj.dwOleTypeNameLength;
    68216821        IStream_Seek(pStream, iSeekPos, STREAM_SEEK_CUR , NULL);
    68226822
    … …  
    69576957        strcpy(pOleStreamData[1].strOleTypeName, strMetafilePictName);
    69586958
    6959         iSeekPos.s.HighPart = 0;
    6960         iSeekPos.s.LowPart = sizeof(olePress.byUnknown1);
     6959        iSeekPos.DUMMYSTRUCTNAME_DOT HighPart = 0;
     6960        iSeekPos.DUMMYSTRUCTNAME_DOT LowPart = sizeof(olePress.byUnknown1);
    69616961
    69626962        /* Get Presentation Data */
Note: See TracChangeset for help on using the changeset viewer.