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/oleaut32/olefont.c

    r9400 r21916  
    638638    return E_POINTER;
    639639
    640   psize->s.Hi = 0;
    641   psize->s.Lo = this->description.cySize.s.Lo;
     640  psize->DUMMYSTRUCTNAME_DOT Hi = 0;
     641  psize->DUMMYSTRUCTNAME_DOT Lo = this->description.cySize.DUMMYSTRUCTNAME_DOT Lo;
    642642
    643643  return S_OK;
    … …  
    654654{
    655655  _ICOM_THIS(OLEFontImpl, iface);
    656   TRACE("(%p)->(%ld)\n", this, size.s.Lo);
    657   this->description.cySize.s.Hi = 0;
    658   this->description.cySize.s.Lo = size.s.Lo;
     656  TRACE("(%p)->(%ld)\n", this, size.DUMMYSTRUCTNAME_DOT Lo);
     657  this->description.cySize.DUMMYSTRUCTNAME_DOT Hi = 0;
     658  this->description.cySize.DUMMYSTRUCTNAME_DOT Lo = size.DUMMYSTRUCTNAME_DOT Lo;
    659659  OLEFont_SendNotify(this, DISPID_FONT_SIZE);
    660660
    … …  
    936936    IFont_get_Size(iface, &cySize);
    937937
    938     fontHeight = MulDiv(cySize.s.Lo, 2540L, 72L);
     938    fontHeight = MulDiv(cySize.DUMMYSTRUCTNAME_DOT Lo, 2540L, 72L);
    939939    fontHeight = MulDiv(fontHeight, this->cyLogical,this->cyHimetric);
    940940
    … …  
    10041004  IFont_get_Size(iface, &cySize);
    10051005
    1006   fontHeight = MulDiv(cySize.s.Lo, 2540L, 72L);
     1006  fontHeight = MulDiv(cySize.DUMMYSTRUCTNAME_DOT Lo, 2540L, 72L);
    10071007  fontHeight = MulDiv(fontHeight, this->cyLogical,this->cyHimetric);
    10081008
    … …  
    14011401   * Size
    14021402   */
    1403   IStream_Read(pLoadStream, &this->description.cySize.s.Lo, 4, &cbRead);
     1403  IStream_Read(pLoadStream, &this->description.cySize.DUMMYSTRUCTNAME_DOT Lo, 4, &cbRead);
    14041404
    14051405  if (cbRead!=4)
    14061406    return E_FAIL;
    14071407
    1408   this->description.cySize.s.Hi = 0;
     1408  this->description.cySize.DUMMYSTRUCTNAME_DOT Hi = 0;
    14091409
    14101410  /*
    … …  
    15001500   * Size
    15011501   */
    1502   IStream_Write(pOutStream, &this->description.cySize.s.Lo, 4, &cbWritten);
     1502  IStream_Write(pOutStream, &this->description.cySize.DUMMYSTRUCTNAME_DOT Lo, 4, &cbWritten);
    15031503
    15041504  if (cbWritten!=4)
    … …  
    15501550    return E_POINTER;
    15511551
    1552   pcbSize->s.HighPart = 0;
    1553   pcbSize->s.LowPart = 0;
    1554 
    1555   pcbSize->s.LowPart += sizeof(BYTE);  /* Version */
    1556   pcbSize->s.LowPart += sizeof(WORD);  /* Lang code */
    1557   pcbSize->s.LowPart += sizeof(BYTE);  /* Flags */
    1558   pcbSize->s.LowPart += sizeof(WORD);  /* Weight */
    1559   pcbSize->s.LowPart += sizeof(DWORD); /* Size */
    1560   pcbSize->s.LowPart += sizeof(BYTE);  /* StrLength */
     1552  pcbSize->DUMMYSTRUCTNAME_DOT HighPart = 0;
     1553  pcbSize->DUMMYSTRUCTNAME_DOT LowPart = 0;
     1554
     1555  pcbSize->DUMMYSTRUCTNAME_DOT LowPart += sizeof(BYTE);  /* Version */
     1556  pcbSize->DUMMYSTRUCTNAME_DOT LowPart += sizeof(WORD);  /* Lang code */
     1557  pcbSize->DUMMYSTRUCTNAME_DOT LowPart += sizeof(BYTE);  /* Flags */
     1558  pcbSize->DUMMYSTRUCTNAME_DOT LowPart += sizeof(WORD);  /* Weight */
     1559  pcbSize->DUMMYSTRUCTNAME_DOT LowPart += sizeof(DWORD); /* Size */
     1560  pcbSize->DUMMYSTRUCTNAME_DOT LowPart += sizeof(BYTE);  /* StrLength */
    15611561
    15621562  if (this->description.lpstrName!=0)
    1563     pcbSize->s.LowPart += lstrlenW(this->description.lpstrName);
     1563    pcbSize->DUMMYSTRUCTNAME_DOT LowPart += lstrlenW(this->description.lpstrName);
    15641564
    15651565  return S_OK;
    … …  
    16851685        fd.cbSizeofstruct = sizeof(fd);
    16861686        fd.lpstrName      = fname;
    1687         fd.cySize.s.Lo    = 80000;
    1688         fd.cySize.s.Hi    = 0;
    1689         fd.sWeight            = 0;
     1687        fd.cySize.DUMMYSTRUCTNAME_DOT Lo    = 80000;
     1688        fd.cySize.DUMMYSTRUCTNAME_DOT Hi    = 0;
     1689        fd.sWeight        = 0;
    16901690        fd.sCharset       = 0;
    1691         fd.fItalic            = 0;
     1691        fd.fItalic        = 0;
    16921692        fd.fUnderline     = 0;
    16931693        fd.fStrikethrough = 0;
Note: See TracChangeset for help on using the changeset viewer.