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/shell32/iconcache.c

    r21494 r21916  
    253253
    254254                INT iResId = abs( pIcons->nStartIndex );
    255                 if ( lpszName < 0x10000 )
     255                if ( lpszName < (LPTSTR)0x10000 )
    256256                {
    257257                        if ( (INT)lpszName == iResId )
    … …  
    787787#ifdef __WIN32OS2__
    788788          // 2001-06-01 PH memory leak in WINE
    789           HeapFree(GetProcessHeap(),0,lpsice->sSourceFile);
     789          HeapFree(GetProcessHeap(), 0, (LPVOID)lpsice->sSourceFile);
    790790#endif         
    791791          SHFree(lpsice);
    … …  
    966966#ifdef __WIN32OS2__
    967967            // 2003-11-23 DT see also SIC_IconAppend, memory leak in WINE
    968             HeapFree(GetProcessHeap(),0,lpsice->sSourceFile);
     968            HeapFree(GetProcessHeap(), 0, (LPVOID)lpsice->sSourceFile);
    969969#endif         
    970970            SHFree(lpsice);
Note: See TracChangeset for help on using the changeset viewer.