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

    r10625 r21916  
    507507 *      the string representation and HRESULT
    508508 */
    509 HRESULT WINE_StringFromCLSID(
     509HRESULT WINAPI WINE_StringFromCLSID(
    510510        const CLSID *id,        /* [in] GUID to be converted */
    511511        LPSTR idstr             /* [out] pointer to buffer to contain converted guid */
    … …  
    899899    if (hres) return hres;
    900900
    901     buflen = ststg.cbSize.s.LowPart;
     901    buflen = ststg.cbSize.DUMMYSTRUCTNAME_DOT LowPart;
    902902    buffer = HeapAlloc(GetProcessHeap(),0,buflen);
    903     seekto.s.LowPart = 0;
    904     seekto.s.HighPart = 0;
     903    seekto.DUMMYSTRUCTNAME_DOT LowPart = 0;
     904    seekto.DUMMYSTRUCTNAME_DOT HighPart = 0;
    905905    hres = IStream_Seek(pStm,seekto,SEEK_SET,&newpos);
    906906    if (hres) {
Note: See TracChangeset for help on using the changeset viewer.