From 50a6d970f511c9711000fdc437f4adcf97a06904 Mon Sep 17 00:00:00 2001
From: Mike McCormack <mike@codeweavers.com>
Date: Wed, 3 Aug 2005 11:03:05 +0000
Subject: [PATCH] gcc 4.0 warning fixes for Interlocked* functions.

---
 dlls/dinput/dinput_main.c       | 2 +-
 dlls/dinput/dinput_private.h    | 2 +-
 dlls/dinput/joystick_linux.c    | 2 +-
 dlls/dinput/keyboard.c          | 4 ++--
 dlls/dinput/mouse.c             | 2 +-
 dlls/dxdiagn/dxdiag_private.h   | 4 ++--
 dlls/oleaut32/tests/safearray.c | 2 +-
 dlls/oleaut32/tests/vartype.c   | 2 +-
 dlls/quartz/enummoniker.c       | 2 +-
 dlls/riched20/richole.c         | 2 +-
 include/wine/wined3d_gl.h       | 2 +-
 11 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c
index 0651cd1db87..f79dd20d068 100644
--- a/dlls/dinput/dinput_main.c
+++ b/dlls/dinput/dinput_main.c
@@ -617,7 +617,7 @@ typedef struct
 {
     /* IUnknown fields */
     const IClassFactoryVtbl    *lpVtbl;
-    DWORD                       ref;
+    LONG                        ref;
 } IClassFactoryImpl;
 
 static HRESULT WINAPI DICF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) {
diff --git a/dlls/dinput/dinput_private.h b/dlls/dinput/dinput_private.h
index 7ffa73ae64f..51385815e48 100644
--- a/dlls/dinput/dinput_private.h
+++ b/dlls/dinput/dinput_private.h
@@ -30,7 +30,7 @@ typedef struct IDirectInputImpl IDirectInputImpl;
 struct IDirectInputImpl
 {
    const void *lpVtbl;
-   DWORD  ref;
+   LONG  ref;
 
    /* Used to have an unique sequence number for all the events */
    DWORD evsequence;
diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c
index 752d69bf220..c0c4e53f96a 100644
--- a/dlls/dinput/joystick_linux.c
+++ b/dlls/dinput/joystick_linux.c
@@ -89,7 +89,7 @@ static const IDirectInputDevice8WVtbl JoystickWvt;
 struct JoystickImpl
 {
         const void                     *lpVtbl;
-        DWORD                           ref;
+        LONG                            ref;
         GUID                            guid;
 	char				dev[32];
 
diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c
index 7e5d253330e..52d5b0829b1 100644
--- a/dlls/dinput/keyboard.c
+++ b/dlls/dinput/keyboard.c
@@ -47,7 +47,7 @@ typedef struct SysKeyboardImpl SysKeyboardImpl;
 struct SysKeyboardImpl
 {
         const void                     *lpVtbl;
-        DWORD                           ref;
+        LONG                            ref;
         GUID                            guid;
 
 	IDirectInputImpl*               dinput;
@@ -87,7 +87,7 @@ static CRITICAL_SECTION_DEBUG critsect_debug =
 };
 static CRITICAL_SECTION keyboard_crit = { &critsect_debug, -1, 0, 0, 0, 0 };
 
-static DWORD keyboard_users = 0;
+static LONG keyboard_users = 0;
 static HHOOK keyboard_hook = NULL;
 
 LRESULT CALLBACK KeyboardCallback( int code, WPARAM wparam, LPARAM lparam )
diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c
index 0647134d083..ab7f15ad635 100644
--- a/dlls/dinput/mouse.c
+++ b/dlls/dinput/mouse.c
@@ -109,7 +109,7 @@ typedef enum {
 struct SysMouseImpl
 {
     const void                     *lpVtbl;
-    DWORD                           ref;
+    LONG                            ref;
     GUID                            guid;
     
     IDirectInputImpl               *dinput;
diff --git a/dlls/dxdiagn/dxdiag_private.h b/dlls/dxdiagn/dxdiag_private.h
index 43cc777ef86..86691e8cfda 100644
--- a/dlls/dxdiagn/dxdiag_private.h
+++ b/dlls/dxdiagn/dxdiag_private.h
@@ -46,7 +46,7 @@ typedef struct IDxDiagContainerImpl IDxDiagContainerImpl;
 struct IDxDiagProviderImpl {
   /* IUnknown fields */
   const IDxDiagProviderVtbl *lpVtbl;
-  DWORD       ref;
+  LONG        ref;
   /* IDxDiagProvider fields */
   BOOL        init;
   DXDIAG_INIT_PARAMS params;
@@ -85,7 +85,7 @@ typedef struct IDxDiagContainerImpl_Property {
 struct IDxDiagContainerImpl {
   /* IUnknown fields */
   const IDxDiagContainerVtbl *lpVtbl;
-  DWORD       ref;
+  LONG        ref;
   /* IDxDiagContainer fields */
   IDxDiagContainerImpl_Property* properties;  
   IDxDiagContainerImpl_SubContainer* subContainers;
diff --git a/dlls/oleaut32/tests/safearray.c b/dlls/oleaut32/tests/safearray.c
index 68a652013a5..a39d43abb14 100644
--- a/dlls/oleaut32/tests/safearray.c
+++ b/dlls/oleaut32/tests/safearray.c
@@ -78,7 +78,7 @@ BOOL HAVE_OLEAUT32_INT_PTR;
 typedef struct IRecordInfoImpl
 {
   const IRecordInfoVtbl *lpvtbl;
-  DWORD ref;
+  LONG ref;
   DWORD sizeCalled;
   DWORD clearCalled;
 } IRecordInfoImpl;
diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c
index b42627c2c24..9e174d257e2 100644
--- a/dlls/oleaut32/tests/vartype.c
+++ b/dlls/oleaut32/tests/vartype.c
@@ -511,7 +511,7 @@ typedef struct tagINTERNAL_BSTR
 typedef struct
 {
   const IDispatchVtbl *lpVtbl;
-  ULONG ref;
+  LONG ref;
   VARTYPE vt;
   BOOL bFailInvoke;
 } DummyDispatch;
diff --git a/dlls/quartz/enummoniker.c b/dlls/quartz/enummoniker.c
index cfdf5f81b2c..75228a46bfd 100644
--- a/dlls/quartz/enummoniker.c
+++ b/dlls/quartz/enummoniker.c
@@ -33,7 +33,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(quartz);
 typedef struct EnumMonikerImpl
 {
     const IEnumMonikerVtbl *lpVtbl;
-    ULONG ref;
+    LONG ref;
     IMoniker ** ppMoniker;
     ULONG nMonikerCount;
     ULONG index;
diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c
index 4f399a2067a..d45741477d6 100644
--- a/dlls/riched20/richole.c
+++ b/dlls/riched20/richole.c
@@ -37,7 +37,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(richedit);
 
 typedef struct IRichEditOleImpl {
     const IRichEditOleVtbl *lpVtbl;
-    DWORD ref;
+    LONG ref;
 } IRichEditOleImpl;
 
 /* there is no way to be consistent across different sets of headers - mingw, Wine, Win32 SDK*/
diff --git a/include/wine/wined3d_gl.h b/include/wine/wined3d_gl.h
index 720041436d5..dc3d674bd6d 100644
--- a/include/wine/wined3d_gl.h
+++ b/include/wine/wined3d_gl.h
@@ -922,7 +922,7 @@ typedef struct _WineD3D_GLContext {
   XVisualInfo* visInfo;
   Display*     display;
   Drawable     drawable;
-  DWORD        ref;
+  LONG         ref;
 } WineD3D_Context;
 
 #endif /* HAVE_OPENGL */
-- 
2.11.4.GIT