Skip to content

W
wine-winehq
Commit c63f4853 authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files
Options

include: Use proper dllimports for comctl32 functions.

parent f9ee565c
Hide whitespace changes
Inline Side-by-side
Showing with 122 additions and 112 deletions
dlls/comctl32/Makefile.in
View file @ c63f4853
EXTRADEFS = -D_COMCTL32_
MODULE = comctl32.dll
IMPORTLIB = comctl32
IMPORTS = uuid user32 gdi32 advapi32 usp10 imm32 kernelbase
......
include/commctrl.h
View file @ c63f4853
......@@ -28,19 +28,27 @@
extern "C" {
#endif
BOOL WINAPI ShowHideMenuCtl (HWND, UINT_PTR, LPINT);
VOID WINAPI GetEffectiveClientRect (HWND, LPRECT, const INT*);
VOID WINAPI InitCommonControls (VOID);
#ifndef WINCOMMCTRLAPI
#ifdef _COMCTL32_
# define WINCOMMCTRLAPI
#else
# define WINCOMMCTRLAPI DECLSPEC_IMPORT
#endif
#endif
WINCOMMCTRLAPI BOOL WINAPI ShowHideMenuCtl (HWND, UINT_PTR, LPINT);
WINCOMMCTRLAPI VOID WINAPI GetEffectiveClientRect (HWND, LPRECT, const INT*);
WINCOMMCTRLAPI VOID WINAPI InitCommonControls (VOID);
typedef struct tagINITCOMMONCONTROLSEX {
DWORD dwSize;
DWORD dwICC;
} INITCOMMONCONTROLSEX, *LPINITCOMMONCONTROLSEX;
BOOL WINAPI InitCommonControlsEx (const INITCOMMONCONTROLSEX*);
WINCOMMCTRLAPI BOOL WINAPI InitCommonControlsEx (const INITCOMMONCONTROLSEX*);
LANGID WINAPI GetMUILanguage (VOID);
VOID WINAPI InitMUILanguage (LANGID uiLang);
WINCOMMCTRLAPI LANGID WINAPI GetMUILanguage (VOID);
WINCOMMCTRLAPI VOID WINAPI InitMUILanguage (LANGID uiLang);
enum _LI_METRIC
{
......@@ -48,8 +56,8 @@ enum _LI_METRIC
LIM_LARGE
};
HRESULT WINAPI LoadIconWithScaleDown(HINSTANCE, const WCHAR *, int, int, HICON *);
HRESULT WINAPI LoadIconMetric(HINSTANCE, const WCHAR *, int, HICON *);
WINCOMMCTRLAPI HRESULT WINAPI LoadIconWithScaleDown(HINSTANCE, const WCHAR *, int, int, HICON *);
WINCOMMCTRLAPI HRESULT WINAPI LoadIconMetric(HINSTANCE, const WCHAR *, int, HICON *);
#define COMCTL32_VERSION 5 /* dll version */
......@@ -323,14 +331,14 @@ static const WCHAR STATUSCLASSNAMEW[] = { 'm','s','c','t','l','s','_',
#define SBN_LAST (0U-899U)
#define SBN_SIMPLEMODECHANGE (SBN_FIRST-0)
HWND WINAPI CreateStatusWindowA (LONG, LPCSTR, HWND, UINT);
HWND WINAPI CreateStatusWindowW (LONG, LPCWSTR, HWND, UINT);
WINCOMMCTRLAPI HWND WINAPI CreateStatusWindowA (LONG, LPCSTR, HWND, UINT);
WINCOMMCTRLAPI HWND WINAPI CreateStatusWindowW (LONG, LPCWSTR, HWND, UINT);
#define CreateStatusWindow WINELIB_NAME_AW(CreateStatusWindow)
VOID WINAPI DrawStatusTextA (HDC, LPCRECT, LPCSTR, UINT);
VOID WINAPI DrawStatusTextW (HDC, LPCRECT, LPCWSTR, UINT);
WINCOMMCTRLAPI VOID WINAPI DrawStatusTextA (HDC, LPCRECT, LPCSTR, UINT);
WINCOMMCTRLAPI VOID WINAPI DrawStatusTextW (HDC, LPCRECT, LPCWSTR, UINT);
#define DrawStatusText WINELIB_NAME_AW(DrawStatusText)
VOID WINAPI MenuHelp (UINT, WPARAM, LPARAM, HMENU,
HINSTANCE, HWND, UINT*);
WINCOMMCTRLAPI VOID WINAPI MenuHelp (UINT, WPARAM, LPARAM, HMENU,
HINSTANCE, HWND, UINT*);
typedef struct tagCOLORSCHEME
{
......@@ -369,9 +377,9 @@ static const WCHAR DRAGLISTMSGSTRINGW[] = { 'c','o','m','m','c','t','r','l',
#endif
#define DRAGLISTMSGSTRING WINELIB_NAME_AW(DRAGLISTMSGSTRING)
BOOL WINAPI MakeDragList (HWND);
VOID WINAPI DrawInsert (HWND, HWND, INT);
INT WINAPI LBItemFromPt (HWND, POINT, BOOL);
WINCOMMCTRLAPI BOOL WINAPI MakeDragList (HWND);
WINCOMMCTRLAPI VOID WINAPI DrawInsert (HWND, HWND, INT);
WINCOMMCTRLAPI INT WINAPI LBItemFromPt (HWND, POINT, BOOL);
/* UpDown */
......@@ -427,9 +435,7 @@ typedef struct tagNM_UPDOWN
int iDelta;
} NM_UPDOWN, *LPNM_UPDOWN;
HWND WINAPI CreateUpDownControl (DWORD, INT, INT, INT, INT,
HWND, INT, HINSTANCE, HWND,
INT, INT, INT);
WINCOMMCTRLAPI HWND WINAPI CreateUpDownControl (DWORD, INT, INT, INT, INT, HWND, INT, HINSTANCE, HWND, INT, INT, INT);
/* Progress Bar */
......@@ -559,54 +565,49 @@ typedef struct _IMAGELISTDRAWPARAMS
#define IMAGELISTDRAWPARAMS_V3_SIZE CCSIZEOF_STRUCT(IMAGELISTDRAWPARAMS, dwRop)
HRESULT WINAPI HIMAGELIST_QueryInterface(HIMAGELIST,REFIID,void **);
INT WINAPI ImageList_Add(HIMAGELIST,HBITMAP,HBITMAP);
INT WINAPI ImageList_AddMasked(HIMAGELIST,HBITMAP,COLORREF);
BOOL WINAPI ImageList_BeginDrag(HIMAGELIST,INT,INT,INT);
BOOL WINAPI ImageList_Copy(HIMAGELIST,INT,HIMAGELIST,INT,UINT);
HIMAGELIST WINAPI ImageList_Create(INT,INT,UINT,INT,INT);
BOOL WINAPI ImageList_Destroy(HIMAGELIST);
BOOL WINAPI ImageList_DragEnter(HWND,INT,INT);
BOOL WINAPI ImageList_DragLeave(HWND);
BOOL WINAPI ImageList_DragMove(INT,INT);
BOOL WINAPI ImageList_DragShowNolock (BOOL);
BOOL WINAPI ImageList_Draw(HIMAGELIST,INT,HDC,INT,INT,UINT);
BOOL WINAPI ImageList_DrawEx(HIMAGELIST,INT,HDC,INT,INT,INT,
INT,COLORREF,COLORREF,UINT);
BOOL WINAPI ImageList_DrawIndirect(IMAGELISTDRAWPARAMS*);
HIMAGELIST WINAPI ImageList_Duplicate(HIMAGELIST);
VOID WINAPI ImageList_EndDrag(VOID);
COLORREF WINAPI ImageList_GetBkColor(HIMAGELIST);
HIMAGELIST WINAPI ImageList_GetDragImage(POINT*,POINT*);
HICON WINAPI ImageList_GetIcon(HIMAGELIST,INT,UINT);
BOOL WINAPI ImageList_GetIconSize(HIMAGELIST,INT*,INT*);
INT WINAPI ImageList_GetImageCount(HIMAGELIST);
BOOL WINAPI ImageList_GetImageInfo(HIMAGELIST,INT,IMAGEINFO*);
BOOL WINAPI ImageList_GetImageRect(HIMAGELIST,INT,LPRECT);
HIMAGELIST WINAPI ImageList_LoadImageA(HINSTANCE,LPCSTR,INT,INT,
COLORREF,UINT,UINT);
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);
BOOL WINAPI ImageList_Remove(HIMAGELIST,INT);
BOOL WINAPI ImageList_Replace(HIMAGELIST,INT,HBITMAP,HBITMAP);
INT WINAPI ImageList_ReplaceIcon(HIMAGELIST,INT,HICON);
COLORREF WINAPI ImageList_SetBkColor(HIMAGELIST,COLORREF);
BOOL WINAPI ImageList_SetDragCursorImage(HIMAGELIST,INT,INT,INT);
BOOL WINAPI ImageList_SetIconSize(HIMAGELIST,INT,INT);
BOOL WINAPI ImageList_SetImageCount(HIMAGELIST,UINT);
BOOL WINAPI ImageList_SetOverlayImage(HIMAGELIST,INT,INT);
WINCOMMCTRLAPI HRESULT WINAPI HIMAGELIST_QueryInterface(HIMAGELIST,REFIID,void **);
WINCOMMCTRLAPI INT WINAPI ImageList_Add(HIMAGELIST,HBITMAP,HBITMAP);
WINCOMMCTRLAPI INT WINAPI ImageList_AddMasked(HIMAGELIST,HBITMAP,COLORREF);
WINCOMMCTRLAPI BOOL WINAPI ImageList_BeginDrag(HIMAGELIST,INT,INT,INT);
WINCOMMCTRLAPI BOOL WINAPI ImageList_Copy(HIMAGELIST,INT,HIMAGELIST,INT,UINT);
WINCOMMCTRLAPI HIMAGELIST WINAPI ImageList_Create(INT,INT,UINT,INT,INT);
WINCOMMCTRLAPI BOOL WINAPI ImageList_Destroy(HIMAGELIST);
WINCOMMCTRLAPI BOOL WINAPI ImageList_DragEnter(HWND,INT,INT);
WINCOMMCTRLAPI BOOL WINAPI ImageList_DragLeave(HWND);
WINCOMMCTRLAPI BOOL WINAPI ImageList_DragMove(INT,INT);
WINCOMMCTRLAPI BOOL WINAPI ImageList_DragShowNolock (BOOL);
WINCOMMCTRLAPI BOOL WINAPI ImageList_Draw(HIMAGELIST,INT,HDC,INT,INT,UINT);
WINCOMMCTRLAPI BOOL WINAPI ImageList_DrawEx(HIMAGELIST,INT,HDC,INT,INT,INT,INT,COLORREF,COLORREF,UINT);
WINCOMMCTRLAPI BOOL WINAPI ImageList_DrawIndirect(IMAGELISTDRAWPARAMS*);
WINCOMMCTRLAPI HIMAGELIST WINAPI ImageList_Duplicate(HIMAGELIST);
WINCOMMCTRLAPI VOID WINAPI ImageList_EndDrag(VOID);
WINCOMMCTRLAPI COLORREF WINAPI ImageList_GetBkColor(HIMAGELIST);
WINCOMMCTRLAPI HIMAGELIST WINAPI ImageList_GetDragImage(POINT*,POINT*);
WINCOMMCTRLAPI HICON WINAPI ImageList_GetIcon(HIMAGELIST,INT,UINT);
WINCOMMCTRLAPI BOOL WINAPI ImageList_GetIconSize(HIMAGELIST,INT*,INT*);
WINCOMMCTRLAPI INT WINAPI ImageList_GetImageCount(HIMAGELIST);
WINCOMMCTRLAPI BOOL WINAPI ImageList_GetImageInfo(HIMAGELIST,INT,IMAGEINFO*);
WINCOMMCTRLAPI BOOL WINAPI ImageList_GetImageRect(HIMAGELIST,INT,LPRECT);
WINCOMMCTRLAPI HIMAGELIST WINAPI ImageList_LoadImageA(HINSTANCE,LPCSTR,INT,INT,COLORREF,UINT,UINT);
WINCOMMCTRLAPI HIMAGELIST WINAPI ImageList_LoadImageW(HINSTANCE,LPCWSTR,INT,INT,COLORREF,UINT,UINT);
#define ImageList_LoadImage WINELIB_NAME_AW(ImageList_LoadImage)
WINCOMMCTRLAPI HIMAGELIST WINAPI ImageList_Merge(HIMAGELIST,INT,HIMAGELIST,INT,INT,INT);
WINCOMMCTRLAPI BOOL WINAPI ImageList_Remove(HIMAGELIST,INT);
WINCOMMCTRLAPI BOOL WINAPI ImageList_Replace(HIMAGELIST,INT,HBITMAP,HBITMAP);
WINCOMMCTRLAPI INT WINAPI ImageList_ReplaceIcon(HIMAGELIST,INT,HICON);
WINCOMMCTRLAPI COLORREF WINAPI ImageList_SetBkColor(HIMAGELIST,COLORREF);
WINCOMMCTRLAPI BOOL WINAPI ImageList_SetDragCursorImage(HIMAGELIST,INT,INT,INT);
WINCOMMCTRLAPI BOOL WINAPI ImageList_SetIconSize(HIMAGELIST,INT,INT);
WINCOMMCTRLAPI BOOL WINAPI ImageList_SetImageCount(HIMAGELIST,UINT);
WINCOMMCTRLAPI BOOL WINAPI ImageList_SetOverlayImage(HIMAGELIST,INT,INT);
#ifdef __IStream_INTERFACE_DEFINED__
HIMAGELIST WINAPI ImageList_Read(LPSTREAM);
BOOL WINAPI ImageList_Write(HIMAGELIST,IStream*);
WINCOMMCTRLAPI HIMAGELIST WINAPI ImageList_Read(LPSTREAM);
WINCOMMCTRLAPI BOOL WINAPI ImageList_Write(HIMAGELIST,IStream*);
WINCOMMCTRLAPI HRESULT WINAPI ImageList_WriteEx(HIMAGELIST,DWORD,IStream*);
#define ILP_NORMAL 0
#define ILP_DOWNLEVEL 1
HRESULT WINAPI ImageList_WriteEx(HIMAGELIST,DWORD,IStream*);
#endif
#define ImageList_AddIcon(himl,hicon) ImageList_ReplaceIcon(himl,-1,hicon)
......@@ -641,7 +642,7 @@ typedef struct tagTRACKMOUSEEVENT {
#endif
BOOL WINAPI _TrackMouseEvent(LPTRACKMOUSEEVENT lpEventTrack);
WINCOMMCTRLAPI BOOL WINAPI _TrackMouseEvent(LPTRACKMOUSEEVENT lpEventTrack);
/* Flat Scrollbar control */
......@@ -673,27 +674,27 @@ static const WCHAR FLATSB_CLASSW[] = { 'f','l','a','t','s','b','_',
#define FSB_FLAT_MODE 2
BOOL WINAPI FlatSB_EnableScrollBar(HWND, INT, UINT);
BOOL WINAPI FlatSB_ShowScrollBar(HWND, INT, BOOL);
BOOL WINAPI FlatSB_GetScrollRange(HWND, INT, LPINT, LPINT);
BOOL WINAPI FlatSB_GetScrollInfo(HWND, INT, LPSCROLLINFO);
INT WINAPI FlatSB_GetScrollPos(HWND, INT);
BOOL WINAPI FlatSB_GetScrollProp(HWND, INT, LPINT);
INT WINAPI FlatSB_SetScrollPos(HWND, INT, INT, BOOL);
INT WINAPI FlatSB_SetScrollInfo(HWND, INT, LPSCROLLINFO, BOOL);
INT WINAPI FlatSB_SetScrollRange(HWND, INT, INT, INT, BOOL);
BOOL WINAPI FlatSB_SetScrollProp(HWND, UINT, INT, BOOL);
BOOL WINAPI InitializeFlatSB(HWND);
HRESULT WINAPI UninitializeFlatSB(HWND);
WINCOMMCTRLAPI BOOL WINAPI FlatSB_EnableScrollBar(HWND, INT, UINT);
WINCOMMCTRLAPI BOOL WINAPI FlatSB_ShowScrollBar(HWND, INT, BOOL);
WINCOMMCTRLAPI BOOL WINAPI FlatSB_GetScrollRange(HWND, INT, LPINT, LPINT);
WINCOMMCTRLAPI BOOL WINAPI FlatSB_GetScrollInfo(HWND, INT, LPSCROLLINFO);
WINCOMMCTRLAPI INT WINAPI FlatSB_GetScrollPos(HWND, INT);
WINCOMMCTRLAPI BOOL WINAPI FlatSB_GetScrollProp(HWND, INT, LPINT);
WINCOMMCTRLAPI INT WINAPI FlatSB_SetScrollPos(HWND, INT, INT, BOOL);
WINCOMMCTRLAPI INT WINAPI FlatSB_SetScrollInfo(HWND, INT, LPSCROLLINFO, BOOL);
WINCOMMCTRLAPI INT WINAPI FlatSB_SetScrollRange(HWND, INT, INT, INT, BOOL);
WINCOMMCTRLAPI BOOL WINAPI FlatSB_SetScrollProp(HWND, UINT, INT, BOOL);
WINCOMMCTRLAPI BOOL WINAPI InitializeFlatSB(HWND);
WINCOMMCTRLAPI HRESULT WINAPI UninitializeFlatSB(HWND);
/* Subclassing stuff */
typedef LRESULT (CALLBACK *SUBCLASSPROC)(HWND, UINT, WPARAM, LPARAM, UINT_PTR, DWORD_PTR);
BOOL WINAPI SetWindowSubclass(HWND, SUBCLASSPROC, UINT_PTR, DWORD_PTR);
BOOL WINAPI GetWindowSubclass(HWND, SUBCLASSPROC, UINT_PTR, DWORD_PTR*);
BOOL WINAPI RemoveWindowSubclass(HWND, SUBCLASSPROC, UINT_PTR);
LRESULT WINAPI DefSubclassProc(HWND, UINT, WPARAM, LPARAM);
WINCOMMCTRLAPI BOOL WINAPI SetWindowSubclass(HWND, SUBCLASSPROC, UINT_PTR, DWORD_PTR);
WINCOMMCTRLAPI BOOL WINAPI GetWindowSubclass(HWND, SUBCLASSPROC, UINT_PTR, DWORD_PTR*);
WINCOMMCTRLAPI BOOL WINAPI RemoveWindowSubclass(HWND, SUBCLASSPROC, UINT_PTR);
WINCOMMCTRLAPI LRESULT WINAPI DefSubclassProc(HWND, UINT, WPARAM, LPARAM);
int WINAPI DrawShadowText(HDC, LPCWSTR, UINT, RECT*, DWORD, COLORREF, COLORREF, int, int);
WINCOMMCTRLAPI int WINAPI DrawShadowText(HDC, LPCWSTR, UINT, RECT*, DWORD, COLORREF, COLORREF, int, int);
/* Header control */
......@@ -5148,11 +5149,11 @@ typedef struct _DSA *HDSA;
typedef INT (CALLBACK *PFNDSAENUMCALLBACK)(LPVOID, LPVOID);
HDSA WINAPI DSA_Create(INT, INT);
BOOL WINAPI DSA_Destroy(HDSA);
void WINAPI DSA_DestroyCallback(HDSA, PFNDSAENUMCALLBACK, LPVOID);
LPVOID WINAPI DSA_GetItemPtr(HDSA, INT);
INT WINAPI DSA_InsertItem(HDSA, INT, LPVOID);
WINCOMMCTRLAPI HDSA WINAPI DSA_Create(INT, INT);
WINCOMMCTRLAPI BOOL WINAPI DSA_Destroy(HDSA);
WINCOMMCTRLAPI void WINAPI DSA_DestroyCallback(HDSA, PFNDSAENUMCALLBACK, LPVOID);
WINCOMMCTRLAPI LPVOID WINAPI DSA_GetItemPtr(HDSA, INT);
WINCOMMCTRLAPI INT WINAPI DSA_InsertItem(HDSA, INT, LPVOID);
#define DPAS_SORTED 0x0001
#define DPAS_INSERTBEFORE 0x0002
......@@ -5179,22 +5180,22 @@ typedef PVOID (CALLBACK *PFNDPAMERGE)(UINT,PVOID,PVOID,LPARAM);
#define DPAM_UNION 0x00000004
#define DPAM_INTERSECT 0x00000008
HDPA WINAPI DPA_Clone(const HDPA, HDPA);
HDPA WINAPI DPA_Create(INT);
BOOL WINAPI DPA_Destroy(HDPA);
LPVOID WINAPI DPA_DeletePtr(HDPA, INT);
BOOL WINAPI DPA_DeleteAllPtrs(HDPA);
BOOL WINAPI DPA_SetPtr(HDPA, INT, LPVOID);
LPVOID WINAPI DPA_GetPtr(HDPA, INT_PTR);
INT WINAPI DPA_GetPtrIndex(HDPA, LPCVOID);
ULONGLONG WINAPI DPA_GetSize(HDPA);
BOOL WINAPI DPA_Grow(HDPA, INT);
INT WINAPI DPA_InsertPtr(HDPA, INT, LPVOID);
BOOL WINAPI DPA_Sort(HDPA, PFNDPACOMPARE, LPARAM);
void WINAPI DPA_EnumCallback(HDPA, PFNDPAENUMCALLBACK, LPVOID);
void WINAPI DPA_DestroyCallback(HDPA, PFNDPAENUMCALLBACK, LPVOID);
INT WINAPI DPA_Search(HDPA, LPVOID, INT, PFNDPACOMPARE, LPARAM, UINT);
BOOL WINAPI DPA_Merge(HDPA, HDPA, DWORD, PFNDPACOMPARE, PFNDPAMERGE, LPARAM);
WINCOMMCTRLAPI HDPA WINAPI DPA_Clone(const HDPA, HDPA);
WINCOMMCTRLAPI HDPA WINAPI DPA_Create(INT);
WINCOMMCTRLAPI BOOL WINAPI DPA_Destroy(HDPA);
WINCOMMCTRLAPI LPVOID WINAPI DPA_DeletePtr(HDPA, INT);
WINCOMMCTRLAPI BOOL WINAPI DPA_DeleteAllPtrs(HDPA);
WINCOMMCTRLAPI BOOL WINAPI DPA_SetPtr(HDPA, INT, LPVOID);
WINCOMMCTRLAPI LPVOID WINAPI DPA_GetPtr(HDPA, INT_PTR);
WINCOMMCTRLAPI INT WINAPI DPA_GetPtrIndex(HDPA, LPCVOID);
WINCOMMCTRLAPI ULONGLONG WINAPI DPA_GetSize(HDPA);
WINCOMMCTRLAPI BOOL WINAPI DPA_Grow(HDPA, INT);
WINCOMMCTRLAPI INT WINAPI DPA_InsertPtr(HDPA, INT, LPVOID);
WINCOMMCTRLAPI BOOL WINAPI DPA_Sort(HDPA, PFNDPACOMPARE, LPARAM);
WINCOMMCTRLAPI void WINAPI DPA_EnumCallback(HDPA, PFNDPAENUMCALLBACK, LPVOID);
WINCOMMCTRLAPI void WINAPI DPA_DestroyCallback(HDPA, PFNDPAENUMCALLBACK, LPVOID);
WINCOMMCTRLAPI INT WINAPI DPA_Search(HDPA, LPVOID, INT, PFNDPACOMPARE, LPARAM, UINT);
WINCOMMCTRLAPI BOOL WINAPI DPA_Merge(HDPA, HDPA, DWORD, PFNDPACOMPARE, PFNDPAMERGE, LPARAM);
/* save/load from stream */
typedef struct _DPASTREAMINFO
......@@ -5206,10 +5207,10 @@ typedef struct _DPASTREAMINFO
struct IStream;
typedef HRESULT (CALLBACK *PFNDPASTREAM)(DPASTREAMINFO*, struct IStream*, LPVOID);
HRESULT WINAPI DPA_LoadStream(HDPA*, PFNDPASTREAM, struct IStream*, LPVOID);
HRESULT WINAPI DPA_SaveStream(HDPA, PFNDPASTREAM, struct IStream*, LPVOID);
WINCOMMCTRLAPI HRESULT WINAPI DPA_LoadStream(HDPA*, PFNDPASTREAM, struct IStream*, LPVOID);
WINCOMMCTRLAPI HRESULT WINAPI DPA_SaveStream(HDPA, PFNDPASTREAM, struct IStream*, LPVOID);
BOOL WINAPI Str_SetPtrW (LPWSTR *, LPCWSTR);
WINCOMMCTRLAPI BOOL WINAPI Str_SetPtrW (LPWSTR *, LPCWSTR);
/**************************************************************************
* SysLink control
......@@ -5554,9 +5555,9 @@ typedef struct _TASKDIALOGCONFIG
UINT cxWidth;
} TASKDIALOGCONFIG;
HRESULT WINAPI TaskDialog(HWND owner, HINSTANCE hinst, const WCHAR *title, const WCHAR *main_instruction,
WINCOMMCTRLAPI HRESULT WINAPI TaskDialog(HWND owner, HINSTANCE hinst, const WCHAR *title, const WCHAR *main_instruction,
const WCHAR *content, TASKDIALOG_COMMON_BUTTON_FLAGS common_buttons, const WCHAR *icon, int *button);
HRESULT WINAPI TaskDialogIndirect(const TASKDIALOGCONFIG *, int *, int *, BOOL *);
WINCOMMCTRLAPI HRESULT WINAPI TaskDialogIndirect(const TASKDIALOGCONFIG *, int *, int *, BOOL *);
#include <poppack.h>
......
include/prsht.h
View file @ c63f4853
......@@ -23,6 +23,14 @@
extern "C" {
#endif
#ifndef WINCOMMCTRLAPI
#ifdef _COMCTL32_
# define WINCOMMCTRLAPI
#else
# define WINCOMMCTRLAPI DECLSPEC_IMPORT
#endif
#endif
/*
* Property sheet support (callback procs)
......@@ -276,13 +284,13 @@ typedef const PROPSHEETHEADERW *LPCPROPSHEETHEADERW;
/*
* Property sheet support (methods)
*/
INT_PTR WINAPI PropertySheetA(LPCPROPSHEETHEADERA);
INT_PTR WINAPI PropertySheetW(LPCPROPSHEETHEADERW);
WINCOMMCTRLAPI INT_PTR WINAPI PropertySheetA(LPCPROPSHEETHEADERA);
WINCOMMCTRLAPI INT_PTR WINAPI PropertySheetW(LPCPROPSHEETHEADERW);
#define PropertySheet WINELIB_NAME_AW(PropertySheet)
HPROPSHEETPAGE WINAPI CreatePropertySheetPageA(LPCPROPSHEETPAGEA);
HPROPSHEETPAGE WINAPI CreatePropertySheetPageW(LPCPROPSHEETPAGEW);
WINCOMMCTRLAPI HPROPSHEETPAGE WINAPI CreatePropertySheetPageA(LPCPROPSHEETPAGEA);
WINCOMMCTRLAPI HPROPSHEETPAGE WINAPI CreatePropertySheetPageW(LPCPROPSHEETPAGEW);
#define CreatePropertySheetPage WINELIB_NAME_AW(CreatePropertySheetPage)
BOOL WINAPI DestroyPropertySheetPage(HPROPSHEETPAGE hPropPage);
WINCOMMCTRLAPI BOOL WINAPI DestroyPropertySheetPage(HPROPSHEETPAGE hPropPage);
/*
* Property sheet support (UNICODE-Winelib)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment