Alexandre Julliard : include: Disallow fastcall functions in Unix libraries.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 718068c42ca1f70ac8f94027f898354b5d4c94e7
URL:    https://gitlab.winehq.org/wine/wine/-/commit/718068c42ca1f70ac8f94027f898354...

Author: Alexandre Julliard 
Date:   Mon Jun 19 13:43:42 2023 +0200

include: Disallow fastcall functions in Unix libraries.

---

include/ddk/wdm.h | 29 +++++++++++++++++------------
 include/windef.h  |  2 +-
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h
index bf240f4fe53..0e54d59a7f6 100644
--- a/include/ddk/wdm.h
+++ b/include/ddk/wdm.h
@@ -1665,6 +1665,8 @@ static inline void IoCopyCurrentIrpStackLocationToNext(IRP *irp)
 #define SYMBOLIC_LINK_QUERY             0x0001
 #define SYMBOLIC_LINK_ALL_ACCESS        (STANDARD_RIGHTS_REQUIRED | 0x1)

+#ifndef WINE_UNIX_LIB
+
 NTSTATUS  WINAPI DbgQueryDebugFilterState(ULONG, ULONG);

void    FASTCALL ExAcquireFastMutex(FAST_MUTEX*);
@@ -1775,10 +1777,6 @@ void      WINAPI KeInitializeDpc(KDPC*,PKDEFERRED_ROUTINE,void*);
 void      WINAPI KeInitializeEvent(PRKEVENT,EVENT_TYPE,BOOLEAN);
 void      WINAPI KeInitializeMutex(PRKMUTEX,ULONG);
 void      WINAPI KeInitializeSemaphore(PRKSEMAPHORE,LONG,LONG);
-static FORCEINLINE void WINAPI KeInitializeSpinLock( KSPIN_LOCK *lock )
-{
-  *lock = 0;
-}
 void      WINAPI KeInitializeTimerEx(PKTIMER,TIMER_TYPE);
 void      WINAPI KeInitializeTimer(KTIMER*);
 BOOLEAN   WINAPI KeInsertDeviceQueue(KDEVICE_QUEUE*,KDEVICE_QUEUE_ENTRY*);
@@ -1821,14 +1819,6 @@ MM_SYSTEMSIZE WINAPI MmQuerySystemSize(void);
 void      WINAPI MmProbeAndLockPages(PMDLX, KPROCESSOR_MODE, LOCK_OPERATION);
 void      WINAPI MmUnmapLockedPages(void*, PMDL);

-static inline void *MmGetSystemAddressForMdlSafe(MDL *mdl, ULONG priority)
-{
-    if (mdl->MdlFlags & (MDL_MAPPED_TO_SYSTEM_VA | MDL_SOURCE_IS_NONPAGED_POOL))
-        return mdl->MappedSystemVa;
-    else
-        return MmMapLockedPagesSpecifyCache(mdl, KernelMode, MmCached, NULL, FALSE, priority);
-}
-
 void    FASTCALL ObfReferenceObject(void*);
 void      WINAPI ObDereferenceObject(void*);
 USHORT    WINAPI ObGetFilterVersion(void);
@@ -1972,4 +1962,19 @@ static inline void ExInitializeFastMutex( FAST_MUTEX *mutex )
     KeInitializeEvent( &mutex->Event, SynchronizationEvent, FALSE );
 }

+static FORCEINLINE void WINAPI KeInitializeSpinLock( KSPIN_LOCK *lock )
+{
+  *lock = 0;
+}
+
+static inline void *MmGetSystemAddressForMdlSafe(MDL *mdl, ULONG priority)
+{
+    if (mdl->MdlFlags & (MDL_MAPPED_TO_SYSTEM_VA | MDL_SOURCE_IS_NONPAGED_POOL))
+        return mdl->MappedSystemVa;
+    else
+        return MmMapLockedPagesSpecifyCache(mdl, KernelMode, MmCached, NULL, FALSE, priority);
+}
+
+#endif /* WINE_UNIX_LIB */
+
 #endif
diff --git a/include/windef.h b/include/windef.h
index b5f8f3d0b4c..366a195febd 100644
--- a/include/windef.h
+++ b/include/windef.h
@@ -59,7 +59,7 @@ extern "C" {
 #ifdef WINE_UNIX_LIB
 # define __stdcall
 # define __cdecl
-# define __fastcall
+# undef __fastcall
 #else
 # undef __stdcall
 # ifdef __i386__