Module: wine Branch: master Commit: d92b59717dc8c3ce1511bcef7c56f887554c2809 URL: https://gitlab.winehq.org/wine/wine/-/commit/d92b59717dc8c3ce1511bcef7c56f88...
Author: Alexandre Julliard julliard@winehq.org Date: Wed Dec 7 11:33:13 2022 +0100
include: Use proper dllimports for user32 functions.
---
dlls/kernelbase/Makefile.in | 2 +- dlls/win32u/Makefile.in | 2 +- include/dde.h | 4 +++- include/ddeml.h | 4 +++- include/winuser.h | 4 +++- 5 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/dlls/kernelbase/Makefile.in b/dlls/kernelbase/Makefile.in index 2ea1890c7eb..784fd0e74f7 100644 --- a/dlls/kernelbase/Makefile.in +++ b/dlls/kernelbase/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -DWINBASEAPI= -DWINADVAPI= +EXTRADEFS = -DWINBASEAPI= -DWINADVAPI= -DWINUSERAPI= MODULE = kernelbase.dll IMPORTLIB = kernelbase IMPORTS = uuid ntdll winecrt0 diff --git a/dlls/win32u/Makefile.in b/dlls/win32u/Makefile.in index 2cf822401d5..7274f132fa5 100644 --- a/dlls/win32u/Makefile.in +++ b/dlls/win32u/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -DWINGDIAPI= +EXTRADEFS = -DWINGDIAPI= -DWINUSERAPI= MODULE = win32u.dll UNIXLIB = win32u.so IMPORTLIB = win32u diff --git a/include/dde.h b/include/dde.h index 4e0d1176727..fda798b06f4 100644 --- a/include/dde.h +++ b/include/dde.h @@ -28,10 +28,12 @@ extern "C" { #endif
+#ifndef WINUSERAPI #if defined(_USER32_) || defined(WINE_UNIX_LIB) #define WINUSERAPI #else -#define WINUSERAPI DECLSPEC_HIDDEN +#define WINUSERAPI DECLSPEC_IMPORT +#endif #endif
#include <dde.rh> diff --git a/include/ddeml.h b/include/ddeml.h index dcac04bfb19..41c43e6b321 100644 --- a/include/ddeml.h +++ b/include/ddeml.h @@ -26,10 +26,12 @@ extern "C" { #endif /* defined(__cplusplus) */
+#ifndef WINUSERAPI #if defined(_USER32_) || defined(WINE_UNIX_LIB) #define WINUSERAPI #else -#define WINUSERAPI DECLSPEC_HIDDEN +#define WINUSERAPI DECLSPEC_IMPORT +#endif #endif
/* Codepage Constants diff --git a/include/winuser.h b/include/winuser.h index a82a6ec26c5..d1e03461d07 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -19,11 +19,13 @@ #ifndef _WINUSER_ #define _WINUSER_
+#ifndef WINUSERAPI #if !defined(_USER32_) && !defined(WINE_UNIX_LIB) -#define WINUSERAPI DECLSPEC_HIDDEN +#define WINUSERAPI DECLSPEC_IMPORT #else #define WINUSERAPI #endif +#endif
#ifndef RC_INVOKED #include <stdarg.h>