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/shell32_main.h

    r10162 r21916  
    3535* pointer to functions dynamically loaded
    3636*/
    37 extern LPVOID   (* WINAPI pCOMCTL32_Alloc) (INT); 
    38 extern BOOL     (* WINAPI pCOMCTL32_Free) (LPVOID); 
     37extern LPVOID   (* WINAPI pCOMCTL32_Alloc) (INT);
     38extern BOOL     (* WINAPI pCOMCTL32_Free) (LPVOID);
    3939
    4040#define pDPA_Create     DPA_Create
    … …  
    4646#define pDPA_DeletePtr  DPA_DeletePtr
    4747
    48 #define pDPA_GetPtrCount(hdpa)  (*(INT*)(hdpa))   
     48#define pDPA_GetPtrCount(hdpa)  (*(INT*)(hdpa))
    4949
    5050#define pLookupIconIdFromDirectoryEx LookupIconIdFromDirectoryEx
    5151#define pCreateIconFromResourceEx    CreateIconFromResourceEx
    5252
    53 #include <wine\undoccomctl32.h>
     53#include <wine/undoccomctl32.h>
    5454
    5555#define pAddMRUData     AddMRUData
    … …  
    106106
    107107LPEXTRACTICONA  IExtractIconA_Constructor(LPITEMIDLIST);
    108 HRESULT         CreateStreamOnFile (LPCSTR pszFilename, IStream ** ppstm);     
     108HRESULT         CreateStreamOnFile (LPCSTR pszFilename, IStream ** ppstm);
    109109
    110110/* fixme: rename the functions when the shell32.dll has it's own exports namespace */
    … …  
    148148extern HRESULT (* WINAPI pRegisterDragDrop)(HWND hwnd, IDropTarget* pDropTarget);
    149149extern HRESULT (* WINAPI pRevokeDragDrop)(HWND hwnd);
    150 extern HRESULT (* WINAPI pDoDragDrop)(LPDATAOBJECT,LPDROPSOURCE,DWORD,DWORD*); 
     150extern HRESULT (* WINAPI pDoDragDrop)(LPDATAOBJECT,LPDROPSOURCE,DWORD,DWORD*);
    151151extern void     (* WINAPI pReleaseStgMedium)(STGMEDIUM* pmedium);
    152152extern HRESULT (* WINAPI pOleSetClipboard)(IDataObject* pDataObj);
    … …  
    157157HRESULT (* WINAPI pRegisterDragDrop)(HWND hwnd, IDropTarget* pDropTarget);
    158158HRESULT (* WINAPI pRevokeDragDrop)(HWND hwnd);
    159 HRESULT (* WINAPI pDoDragDrop)(LPDATAOBJECT,LPDROPSOURCE,DWORD,DWORD*); 
     159HRESULT (* WINAPI pDoDragDrop)(LPDATAOBJECT,LPDROPSOURCE,DWORD,DWORD*);
    160160void    (* WINAPI pReleaseStgMedium)(STGMEDIUM* pmedium);
    161161HRESULT (* WINAPI pOleSetClipboard)(IDataObject* pDataObj);
Note: See TracChangeset for help on using the changeset viewer.