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

    r8620 r21916  
    180180        }
    181181
    182         msg->cbBuffer = ststg.cbSize.s.LowPart;
    183         msg->Buffer = HeapReAlloc(GetProcessHeap(),0,msg->Buffer,ststg.cbSize.s.LowPart);
    184         seekto.s.LowPart = 0;seekto.s.HighPart = 0;
     182        msg->cbBuffer = ststg.cbSize.DUMMYSTRUCTNAME_DOT LowPart;
     183        msg->Buffer = HeapReAlloc(GetProcessHeap(),0,msg->Buffer,ststg.cbSize.DUMMYSTRUCTNAME_DOT LowPart);
     184        seekto.DUMMYSTRUCTNAME_DOT LowPart = 0;seekto.DUMMYSTRUCTNAME_DOT HighPart = 0;
    185185        hres = IStream_Seek(pStm,seekto,SEEK_SET,&newpos);
    186186        if (hres) {
Note: See TracChangeset for help on using the changeset viewer.