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

    r8620 r21916  
    281281    /* Normaly the sizemax must be the  size of DWORD ! but I tested this function it ususlly return 16 bytes */
    282282    /* more than the number of bytes used by AntiMoniker::Save function */
    283     pcbSize->s.LowPart =  sizeof(DWORD)+16;
    284 
    285     pcbSize->s.HighPart=0;
     283    pcbSize->DUMMYSTRUCTNAME_DOT LowPart =  sizeof(DWORD)+16;
     284
     285    pcbSize->DUMMYSTRUCTNAME_DOT HighPart=0;
    286286
    287287    return S_OK;
Note: See TracChangeset for help on using the changeset viewer.