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

    r10308 r21916  
    294294
    295295        FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_STRING,
    296                        pszText, 0, 0, (LPWSTR)&pszTemp, 0, &args);
     296                       pszText, 0, 0, (LPWSTR)&pszTemp, 0, (LPDWORD)&args);
    297297
    298298        va_end(args);
    … …  
    336336
    337337        FormatMessageA(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_STRING,
    338                        pszText, 0, 0, (LPSTR)&pszTemp, 0, &args);
     338                       pszText, 0, 0, (LPSTR)&pszTemp, 0, (LPDWORD)&args);
    339339
    340340        va_end(args);
    … …  
    602602DWORD WINAPI SHAddToRecentDocs (UINT uFlags,LPCVOID pv)
    603603{
    604 
    605 /* FIXME: !!! move CREATEMRULIST and flags to header file !!! */
    606 /*        !!! it is in both here and comctl32undoc.c      !!! */
    607 typedef struct tagCREATEMRULIST
    608 {
    609     DWORD  cbSize;        /* size of struct */
    610     DWORD  nMaxItems;     /* max no. of items in list */
    611     DWORD  dwFlags;       /* see below */
    612     HKEY   hKey;          /* root reg. key under which list is saved */
    613     LPCSTR lpszSubKey;    /* reg. subkey */
    614     PROC   lpfnCompare;   /* item compare proc */
    615 } CREATEMRULIST, *LPCREATEMRULIST;
    616 
    617 /* dwFlags */
    618 #define MRUF_STRING_LIST  0 /* list will contain strings */
    619 #define MRUF_BINARY_LIST  1 /* list will contain binary data */
    620 #define MRUF_DELAYED_SAVE 2 /* only save list order to reg. is FreeMRUList */
    621 
    622 /* If list is a string list lpfnCompare has the following prototype
    623  * int CALLBACK MRUCompareString(LPCSTR s1, LPCSTR s2)
    624  * for binary lists the prototype is
    625  * int CALLBACK MRUCompareBinary(LPCVOID data1, LPCVOID data2, DWORD cbData)
    626  * where cbData is the no. of bytes to compare.
    627  * Need to check what return value means identical - 0?
    628  */
    629 
     604    /* If list is a string list lpfnCompare has the following prototype
     605     * int CALLBACK MRUCompareString(LPCSTR s1, LPCSTR s2)
     606     * for binary lists the prototype is
     607     * int CALLBACK MRUCompareBinary(LPCVOID data1, LPCVOID data2, DWORD cbData)
     608     * where cbData is the no. of bytes to compare.
     609     * Need to check what return value means identical - 0?
     610     */
    630611
    631612    UINT olderrormode;
    … …  
    906887            else
    907888             if (uFlags == SHARD_PATHW)
    908                 hres = IShellLinkW_SetPath(psl, (LPCWSTR) pv);
     889                hres = IShellLinkW_SetPath(((IShellLinkW *)psl), (LPCWSTR) pv);
    909890             else
    910                 hres = IShellLinkA_SetPath(psl, (LPCWSTR) pv);
     891                hres = IShellLinkA_SetPath(psl, (LPCSTR) pv);
    911892#else
    912893
Note: See TracChangeset for help on using the changeset viewer.