Commit c63f4853 authored by Alexandre Julliard's avatar Alexandre Julliard

include: Use proper dllimports for comctl32 functions.

parent f9ee565c
EXTRADEFS = -D_COMCTL32_
MODULE = comctl32.dll MODULE = comctl32.dll
IMPORTLIB = comctl32 IMPORTLIB = comctl32
IMPORTS = uuid user32 gdi32 advapi32 usp10 imm32 kernelbase IMPORTS = uuid user32 gdi32 advapi32 usp10 imm32 kernelbase
......
...@@ -23,6 +23,14 @@ ...@@ -23,6 +23,14 @@
extern "C" { extern "C" {
#endif #endif
#ifndef WINCOMMCTRLAPI
#ifdef _COMCTL32_
# define WINCOMMCTRLAPI
#else
# define WINCOMMCTRLAPI DECLSPEC_IMPORT
#endif
#endif
/* /*
* Property sheet support (callback procs) * Property sheet support (callback procs)
...@@ -276,13 +284,13 @@ typedef const PROPSHEETHEADERW *LPCPROPSHEETHEADERW; ...@@ -276,13 +284,13 @@ typedef const PROPSHEETHEADERW *LPCPROPSHEETHEADERW;
/* /*
* Property sheet support (methods) * Property sheet support (methods)
*/ */
INT_PTR WINAPI PropertySheetA(LPCPROPSHEETHEADERA); WINCOMMCTRLAPI INT_PTR WINAPI PropertySheetA(LPCPROPSHEETHEADERA);
INT_PTR WINAPI PropertySheetW(LPCPROPSHEETHEADERW); WINCOMMCTRLAPI INT_PTR WINAPI PropertySheetW(LPCPROPSHEETHEADERW);
#define PropertySheet WINELIB_NAME_AW(PropertySheet) #define PropertySheet WINELIB_NAME_AW(PropertySheet)
HPROPSHEETPAGE WINAPI CreatePropertySheetPageA(LPCPROPSHEETPAGEA); WINCOMMCTRLAPI HPROPSHEETPAGE WINAPI CreatePropertySheetPageA(LPCPROPSHEETPAGEA);
HPROPSHEETPAGE WINAPI CreatePropertySheetPageW(LPCPROPSHEETPAGEW); WINCOMMCTRLAPI HPROPSHEETPAGE WINAPI CreatePropertySheetPageW(LPCPROPSHEETPAGEW);
#define CreatePropertySheetPage WINELIB_NAME_AW(CreatePropertySheetPage) #define CreatePropertySheetPage WINELIB_NAME_AW(CreatePropertySheetPage)
BOOL WINAPI DestroyPropertySheetPage(HPROPSHEETPAGE hPropPage); WINCOMMCTRLAPI BOOL WINAPI DestroyPropertySheetPage(HPROPSHEETPAGE hPropPage);
/* /*
* Property sheet support (UNICODE-Winelib) * 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