mirror of
https://github.com/reactos/reactos.git
synced 2024-12-28 10:04:49 +00:00
Updates for new wine source tree.
svn path=/trunk/; revision=5525
This commit is contained in:
Richard Campbell
parent
acdc820a0d
commit
aee5041a87
1 changed files with 225 additions and 225 deletions
|
|
@ -32,32 +32,6 @@
|
|||
extern "C" {
|
||||
#endif
|
||||
|
||||
#define GetWindowWord GetWindowLongA
|
||||
|
||||
/* Macros to map Winelib names to the correct implementation name */
|
||||
/* depending on __WINE__ and UNICODE macros. */
|
||||
/* Note that Winelib is purely Win32. */
|
||||
|
||||
#ifdef __WINE__
|
||||
# define WINELIB_NAME_AW(func) \
|
||||
func##_must_be_suffixed_with_W_or_A_in_this_context \
|
||||
func##_must_be_suffixed_with_W_or_A_in_this_context
|
||||
#else /* __WINE__ */
|
||||
# ifdef UNICODE
|
||||
# define WINELIB_NAME_AW(func) func##W
|
||||
# else
|
||||
# define WINELIB_NAME_AW(func) func##A
|
||||
# endif /* UNICODE */
|
||||
#endif /* __WINE__ */
|
||||
|
||||
#ifdef __WINE__
|
||||
# define DECL_WINELIB_TYPE_AW(type) /* nothing */
|
||||
#else /* __WINE__ */
|
||||
# define DECL_WINELIB_TYPE_AW(type) typedef WINELIB_NAME_AW(type) type;
|
||||
#endif /* __WINE__ */
|
||||
|
||||
|
||||
|
||||
BOOL WINAPI ShowHideMenuCtl (HWND, UINT, LPINT);
|
||||
VOID WINAPI GetEffectiveClientRect (HWND, LPRECT, LPINT);
|
||||
VOID WINAPI InitCommonControls (VOID);
|
||||
|
|
@ -505,14 +479,8 @@ typedef struct
|
|||
struct _IMAGELIST;
|
||||
typedef struct _IMAGELIST *HIMAGELIST;
|
||||
|
||||
#ifndef CLR_NONE
|
||||
#define CLR_NONE 0xFFFFFFFF
|
||||
#endif
|
||||
|
||||
#ifndef CLR_DEFAULT
|
||||
#define CLR_DEFAULT 0xFF000000
|
||||
#endif
|
||||
|
||||
#define CLR_HILIGHT CLR_DEFAULT
|
||||
|
||||
#define ILC_MASK 0x0001
|
||||
|
|
@ -586,7 +554,6 @@ typedef struct _IMAGELISTDRAWPARAMS
|
|||
|
||||
|
||||
INT WINAPI ImageList_Add(HIMAGELIST,HBITMAP,HBITMAP);
|
||||
INT WINAPI ImageList_AddIcon (HIMAGELIST, HICON);
|
||||
INT WINAPI ImageList_AddMasked(HIMAGELIST,HBITMAP,COLORREF);
|
||||
BOOL WINAPI ImageList_BeginDrag(HIMAGELIST,INT,INT,INT);
|
||||
BOOL WINAPI ImageList_Copy(HIMAGELIST,INT,HIMAGELIST,INT,INT);
|
||||
|
|
@ -615,7 +582,7 @@ HIMAGELIST WINAPI ImageList_LoadImageW(HINSTANCE,LPCWSTR,INT,INT,
|
|||
COLORREF,UINT,UINT);
|
||||
#define ImageList_LoadImage WINELIB_NAME_AW(ImageList_LoadImage)
|
||||
HIMAGELIST WINAPI ImageList_Merge(HIMAGELIST,INT,HIMAGELIST,INT,INT,INT);
|
||||
#ifdef IStream_IMETHODS
|
||||
#ifdef IStream_METHODS
|
||||
HIMAGELIST WINAPI ImageList_Read(LPSTREAM);
|
||||
#endif
|
||||
BOOL WINAPI ImageList_Remove(HIMAGELIST,INT);
|
||||
|
|
@ -627,13 +594,11 @@ BOOL WINAPI ImageList_SetDragCursorImage(HIMAGELIST,INT,INT,INT);
|
|||
BOOL WINAPI ImageList_SetIconSize(HIMAGELIST,INT,INT);
|
||||
BOOL WINAPI ImageList_SetImageCount(HIMAGELIST,INT);
|
||||
BOOL WINAPI ImageList_SetOverlayImage(HIMAGELIST,INT,INT);
|
||||
#ifdef IStream_IMETHODS
|
||||
#ifdef IStream_METHODS
|
||||
BOOL WINAPI ImageList_Write(HIMAGELIST, LPSTREAM);
|
||||
#endif
|
||||
|
||||
#ifndef __WINE__
|
||||
#define ImageList_AddIcon(himl,hicon) ImageList_ReplaceIcon(himl,-1,hicon)
|
||||
#endif
|
||||
#define ImageList_ExtractIcon(hi,himl,i) ImageList_GetIcon(himl,i,0)
|
||||
#define ImageList_LoadBitmap(hi,lpbmp,cx,cGrow,crMask) \
|
||||
ImageList_LoadImage(hi,lpbmp,cx,cGrow,crMask,IMAGE_BITMAP,0)
|
||||
|
|
@ -2383,9 +2348,13 @@ typedef struct tagNMTREEVIEWW {
|
|||
|
||||
#define NMTREEVIEW WINELIB_NAME_AW(NMTREEVIEW)
|
||||
#define NM_TREEVIEW WINELIB_NAME_AW(NMTREEVIEW)
|
||||
#define NM_TREEVIEWA NMTREEVIEWA
|
||||
#define NM_TREEVIEWW NMTREEVIEWW
|
||||
#define LPNMTREEVIEW WINELIB_NAME_AW(LPNMTREEVIEW)
|
||||
|
||||
#define LPNM_TREEVIEW LPNMTREEVIEW
|
||||
#define LPNM_TREEVIEWA LPNMTREEVIEWA
|
||||
#define LPNM_TREEVIEWW LPNMTREEVIEWW
|
||||
|
||||
typedef struct tagTVDISPINFOA {
|
||||
NMHDR hdr;
|
||||
|
|
@ -2747,6 +2716,8 @@ static const WCHAR WC_LISTVIEWW[] = { 'S','y','s',
|
|||
#define LVIF_PARAM 0x0004
|
||||
#define LVIF_STATE 0x0008
|
||||
#define LVIF_INDENT 0x0010
|
||||
#define LVIF_GROUPID 0x0100
|
||||
#define LVIF_COLUMNS 0x0200
|
||||
#define LVIF_NORECOMPUTE 0x0800
|
||||
#define LVIF_DI_SETITEM 0x1000
|
||||
|
||||
|
|
@ -2976,6 +2947,8 @@ typedef struct tagLVITEMW
|
|||
#define LVITEM_V1_SIZE WINELIB_NAME_AW(LVITEM_V1_SIZE)
|
||||
|
||||
#define LV_ITEM LVITEM
|
||||
#define LV_ITEMA LVITEMA
|
||||
#define LV_ITEMW LVITEMW
|
||||
|
||||
typedef struct LVSETINFOTIPA
|
||||
{
|
||||
|
|
@ -3100,7 +3073,7 @@ typedef struct tagNMITEMACTIVATE
|
|||
UINT uKeyFlags;
|
||||
} NMITEMACTIVATE, *LPNMITEMACTIVATE;
|
||||
|
||||
typedef struct tagLVDISPINFOA
|
||||
typedef struct tagLVDISPINFO
|
||||
{
|
||||
NMHDR hdr;
|
||||
LVITEMA item;
|
||||
|
|
@ -3116,6 +3089,8 @@ typedef struct tagLVDISPINFOW
|
|||
#define LPNMLVDISPINFO WINELIB_NAME_AW(LPNMLVDISPINFO)
|
||||
|
||||
#define LV_DISPINFO NMLVDISPINFO
|
||||
#define LV_DISPINFOA NMLVDISPINFOA
|
||||
#define LV_DISPINFOW NMLVDISPINFOW
|
||||
|
||||
#include "pshpack1.h"
|
||||
typedef struct tagLVKEYDOWN
|
||||
|
|
@ -3186,6 +3161,10 @@ typedef struct tagLVFINDINFOW
|
|||
#define LVFINDINFO WINELIB_NAME_AW(LVFINDINFO)
|
||||
#define LPLVFINDINFO WINELIB_NAME_AW(LPLVFINDINFO)
|
||||
|
||||
#define LV_FINDINFO LVFINDINFO
|
||||
#define LV_FINDINFOA LVFINDINFOA
|
||||
#define LV_FINDINFOW LVFINDINFOW
|
||||
|
||||
/* Groups relates structures */
|
||||
|
||||
typedef struct LVGROUPA
|
||||
|
|
@ -3357,6 +3336,8 @@ typedef struct NMLVSCROLL
|
|||
int dy;
|
||||
} NMLVSCROLL, *LPNMLVSCROLL;
|
||||
|
||||
#define ListView_SetItemCount(hwnd,count) \
|
||||
(BOOL)SNDMSGA((hwnd),LVM_SETITEMCOUNT,(WPARAM)(INT)(count),0)
|
||||
#define ListView_SetTextBkColor(hwnd,clrBk) \
|
||||
(BOOL)SNDMSGA((hwnd),LVM_SETTEXTBKCOLOR,0,(LPARAM)(COLORREF)(clrBk))
|
||||
#define ListView_SetTextColor(hwnd,clrBk) \
|
||||
|
|
@ -3396,8 +3377,9 @@ typedef struct NMLVSCROLL
|
|||
#define ListView_SetItemW(hwnd,pitem) \
|
||||
(INT)SNDMSGW((hwnd),LVM_SETITEMW,0,(LPARAM)(const LVITEMW *)(pitem))
|
||||
#define ListView_SetItem WINELIB_NAME_AW(ListView_SetItem)
|
||||
#define ListView_SetItemState(hwnd,i,pitem) \
|
||||
(BOOL)SNDMSGA((hwnd),LVM_SETITEMSTATE,(WPARAM)(UINT)(i),(LPARAM)(LPLVITEMA)(pitem))
|
||||
#define ListView_SetItemState(hwnd,i,data,dataMask) \
|
||||
{ LVITEMA _LVi; _LVi.state = data; _LVi.stateMask = dataMask;\
|
||||
SNDMSGA(hwnd, LVM_SETITEMSTATE, (WPARAM)(UINT)i, (LPARAM) (LPLVITEMA)&_LVi);}
|
||||
#define ListView_GetItemState(hwnd,i,mask) \
|
||||
(BOOL)SNDMSGA((hwnd),LVM_GETITEMSTATE,(WPARAM)(UINT)(i),(LPARAM)(UINT)(mask))
|
||||
#define ListView_GetCountPerPage(hwnd) \
|
||||
|
|
@ -3459,6 +3441,24 @@ typedef struct NMLVSCROLL
|
|||
(HWND)SNDMSGW((hwndLV),LVM_EDITLABELW,(WPARAM)(int)(i), 0L)
|
||||
#define ListView_EditLabel WINELIB_NAME_AW(ListView_EditLabel)
|
||||
|
||||
#define ListView_GetItemTextA(hwndLV, i, _iSubItem, _pszText, _cchTextMax) \
|
||||
{ \
|
||||
LVITEMA _LVi;\
|
||||
_LVi.iSubItem = _iSubItem;\
|
||||
_LVi.cchTextMax = _cchTextMax;\
|
||||
_LVi.pszText = _pszText;\
|
||||
SNDMSGA(hwndLV, LVM_GETITEMTEXTA, (WPARAM)(i), (LPARAM)&_LVi);\
|
||||
}
|
||||
#define ListView_GetItemTextW(hwndLV, i, _iSubItem, _pszText, _cchTextMax) \
|
||||
{ \
|
||||
LVITEMW _LVi;\
|
||||
_LVi.iSubItem = _iSubItem;\
|
||||
_LVi.cchTextMax = _cchTextMax;\
|
||||
_LVi.pszText = _pszText;\
|
||||
SNDMSGW(hwndLV, LVM_GETITEMTEXTW, (WPARAM)(i), (LPARAM)&_LVi);\
|
||||
}
|
||||
#define ListView_GetItemText WINELIB_NAME_AW(ListView_GetItemText)
|
||||
|
||||
#define ListView_SetItemTextA(hwndLV, i, _iSubItem, _pszText) \
|
||||
{ LVITEMA _LVi; _LVi.iSubItem = _iSubItem; _LVi.pszText = _pszText;\
|
||||
SNDMSGA(hwndLV, LVM_SETITEMTEXTA, (WPARAM)i, (LPARAM) (LVITEMA*)&_LVi);}
|
||||
|
|
|
|||
Loading…
Reference in a new issue