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

    r21512 r21916  
    3535        {
    3636          case STRRET_WSTR:
    37             WideCharToMultiByte(CP_ACP, 0, src->u.pOleStr, -1, (LPSTR)dest, len, NULL, NULL);
    38 /*          SHFree(src->u.pOleStr);  FIXME: is this right? */
     37            WideCharToMultiByte(CP_ACP, 0, src->DUMMYUNIONNAME_DOT pOleStr, -1, (LPSTR)dest, len, NULL, NULL);
     38/*          SHFree(src->DUMMYUNIONNAME_DOT pOleStr);  FIXME: is this right? */
    3939            break;
    4040
    4141          case STRRET_CSTR:
    42             lstrcpynA((LPSTR)dest, src->u.cStr, len);
     42            lstrcpynA((LPSTR)dest, src->DUMMYUNIONNAME_DOT cStr, len);
    4343            break;
    4444
    4545          case STRRET_OFFSET:
    46             lstrcpynA((LPSTR)dest, ((LPCSTR)&pidl->mkid)+src->u.uOffset, len);
     46            lstrcpynA((LPSTR)dest, ((LPCSTR)&pidl->mkid)+src->DUMMYUNIONNAME_DOT uOffset, len);
    4747            break;
    4848
    … …  
    6868        {
    6969          case STRRET_WSTR:
    70             lstrcpynW((LPWSTR)dest, src->u.pOleStr, len);
    71 /*          SHFree(src->u.pOleStr);  FIXME: is this right? */
     70            lstrcpynW((LPWSTR)dest, src->DUMMYUNIONNAME_DOT pOleStr, len);
     71/*          SHFree(src->DUMMYUNIONNAME_DOT pOleStr);  FIXME: is this right? */
    7272            break;
    7373
    7474          case STRRET_CSTR:
    75               if (!MultiByteToWideChar( CP_ACP, 0, src->u.cStr, -1, dest, len ) && len)
     75              if (!MultiByteToWideChar( CP_ACP, 0, src->DUMMYUNIONNAME_DOT cStr, -1, dest, len ) && len)
    7676                  dest[len-1] = 0;
    7777            break;
    … …  
    8080            if (pidl)
    8181            {
    82               if (!MultiByteToWideChar( CP_ACP, 0, ((LPCSTR)&pidl->mkid)+src->u.uOffset, -1,
     82              if (!MultiByteToWideChar( CP_ACP, 0, ((LPCSTR)&pidl->mkid)+src->DUMMYUNIONNAME_DOT uOffset, -1,
    8383                                        dest, len ) && len)
    8484                  dest[len-1] = 0;
Note: See TracChangeset for help on using the changeset viewer.