commit e994d5036eca87db19547db3cdbdc1eb5d571063
author Alexandre Julliard <julliard@winehq.org> Thu Aug 09 21:21:13 2001 +0000
committer Alexandre Julliard <julliard@winehq.org> Thu Aug 09 21:21:13 2001 +0000
tree e43408a6c26aeaab80771fd2b9b969a95971863d
parent da920ee9b9be1bbb8a6aa026db6e8351b351914c

Added Interlocked*Pointer functions.
Fixed InterlockedCompareExchange prototype.

include/winbase.h

diff --git a/include/winbase.h b/include/winbase.h
index 9a73b6d..2ae06ca 100644
--- a/include/winbase.h
+++ b/include/winbase.h
@@ -1933,10 +1933,10 @@
 
 #if defined(__i386__) && defined(__GNUC__)
 
-extern inline PVOID WINAPI InterlockedCompareExchange( PVOID *dest, PVOID xchg, PVOID compare );
-extern inline PVOID WINAPI InterlockedCompareExchange( PVOID *dest, PVOID xchg, PVOID compare )
+extern inline LONG WINAPI InterlockedCompareExchange( PLONG dest, LONG xchg, LONG compare );
+extern inline LONG WINAPI InterlockedCompareExchange( PLONG dest, LONG xchg, LONG compare )
 {
-    PVOID ret;
+    LONG ret;
     __asm__ __volatile__( "lock; cmpxchgl %2,(%1)"
                           : "=a" (ret) : "r" (dest), "r" (xchg), "0" (compare) : "memory" );
     return ret;
@@ -1951,6 +1951,24 @@
     return ret;
 }
 
+extern inline PVOID WINAPI InterlockedCompareExchangePointer( PVOID *dest, PVOID xchg, PVOID compare );
+extern inline PVOID WINAPI InterlockedCompareExchangePointer( PVOID *dest, PVOID xchg, PVOID compare )
+{
+    PVOID ret;
+    __asm__ __volatile__( "lock; cmpxchgl %2,(%1)"
+                          : "=a" (ret) : "r" (dest), "r" (xchg), "0" (compare) : "memory" );
+    return ret;
+}
+
+extern inline PVOID WINAPI InterlockedExchangePointer( PVOID *dest, PVOID val );
+extern inline PVOID WINAPI InterlockedExchangePointer( PVOID *dest, PVOID val )
+{
+    PVOID ret;
+    __asm__ __volatile__( "lock; xchgl %0,(%1)"
+                          : "=r" (ret) :"r" (dest), "0" (val) : "memory" );
+    return ret;
+}
+
 extern inline LONG WINAPI InterlockedExchangeAdd( PLONG dest, LONG incr );
 extern inline LONG WINAPI InterlockedExchangeAdd( PLONG dest, LONG incr )
 {
@@ -2015,12 +2033,17 @@
 DWORD       WINAPI GetCurrentThreadId(void);
 DWORD       WINAPI GetLastError(void);
 HANDLE      WINAPI GetProcessHeap(void);
-PVOID       WINAPI InterlockedCompareExchange(PVOID*,PVOID,PVOID);
+LONG        WINAPI InterlockedCompareExchange(LONG*,LONG,LONG);
 LONG        WINAPI InterlockedDecrement(PLONG);
 LONG        WINAPI InterlockedExchange(PLONG,LONG);
 LONG        WINAPI InterlockedExchangeAdd(PLONG,LONG);
 LONG        WINAPI InterlockedIncrement(PLONG);
 VOID        WINAPI SetLastError(DWORD);
+/* FIXME: should handle platforms where sizeof(void*) != sizeof(long) */
+#define InterlockedCompareExchangePointer(a,b,c) \
+    ((PVOID)InterlockedCompareExchange((PLONG)(a),(LONG)(b),(LONG)(c)))
+#define InterlockedExchangePointer(a,b) \
+    ((PVOID)InterlockedExchange((PLONG)(a),(LONG)(b)))
 #endif  /* __i386__ && __GNUC__ */
 
 #ifdef __WINE__