gcc 4.0 warning fixes for Interlocked* functions.

This commit is contained in:
Mike McCormack 2005-08-03 11:03:05 +00:00 committed by Alexandre Julliard
parent d708acd979
commit 50a6d970f5
11 changed files with 13 additions and 13 deletions

View File

@ -617,7 +617,7 @@ typedef struct
{ {
/* IUnknown fields */ /* IUnknown fields */
const IClassFactoryVtbl *lpVtbl; const IClassFactoryVtbl *lpVtbl;
DWORD ref; LONG ref;
} IClassFactoryImpl; } IClassFactoryImpl;
static HRESULT WINAPI DICF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) { static HRESULT WINAPI DICF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) {

View File

@ -30,7 +30,7 @@ typedef struct IDirectInputImpl IDirectInputImpl;
struct IDirectInputImpl struct IDirectInputImpl
{ {
const void *lpVtbl; const void *lpVtbl;
DWORD ref; LONG ref;
/* Used to have an unique sequence number for all the events */ /* Used to have an unique sequence number for all the events */
DWORD evsequence; DWORD evsequence;

View File

@ -89,7 +89,7 @@ static const IDirectInputDevice8WVtbl JoystickWvt;
struct JoystickImpl struct JoystickImpl
{ {
const void *lpVtbl; const void *lpVtbl;
DWORD ref; LONG ref;
GUID guid; GUID guid;
char dev[32]; char dev[32];

View File

@ -47,7 +47,7 @@ typedef struct SysKeyboardImpl SysKeyboardImpl;
struct SysKeyboardImpl struct SysKeyboardImpl
{ {
const void *lpVtbl; const void *lpVtbl;
DWORD ref; LONG ref;
GUID guid; GUID guid;
IDirectInputImpl* dinput; 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 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; static HHOOK keyboard_hook = NULL;
LRESULT CALLBACK KeyboardCallback( int code, WPARAM wparam, LPARAM lparam ) LRESULT CALLBACK KeyboardCallback( int code, WPARAM wparam, LPARAM lparam )

View File

@ -109,7 +109,7 @@ typedef enum {
struct SysMouseImpl struct SysMouseImpl
{ {
const void *lpVtbl; const void *lpVtbl;
DWORD ref; LONG ref;
GUID guid; GUID guid;
IDirectInputImpl *dinput; IDirectInputImpl *dinput;

View File

@ -46,7 +46,7 @@ typedef struct IDxDiagContainerImpl IDxDiagContainerImpl;
struct IDxDiagProviderImpl { struct IDxDiagProviderImpl {
/* IUnknown fields */ /* IUnknown fields */
const IDxDiagProviderVtbl *lpVtbl; const IDxDiagProviderVtbl *lpVtbl;
DWORD ref; LONG ref;
/* IDxDiagProvider fields */ /* IDxDiagProvider fields */
BOOL init; BOOL init;
DXDIAG_INIT_PARAMS params; DXDIAG_INIT_PARAMS params;
@ -85,7 +85,7 @@ typedef struct IDxDiagContainerImpl_Property {
struct IDxDiagContainerImpl { struct IDxDiagContainerImpl {
/* IUnknown fields */ /* IUnknown fields */
const IDxDiagContainerVtbl *lpVtbl; const IDxDiagContainerVtbl *lpVtbl;
DWORD ref; LONG ref;
/* IDxDiagContainer fields */ /* IDxDiagContainer fields */
IDxDiagContainerImpl_Property* properties; IDxDiagContainerImpl_Property* properties;
IDxDiagContainerImpl_SubContainer* subContainers; IDxDiagContainerImpl_SubContainer* subContainers;

View File

@ -78,7 +78,7 @@ BOOL HAVE_OLEAUT32_INT_PTR;
typedef struct IRecordInfoImpl typedef struct IRecordInfoImpl
{ {
const IRecordInfoVtbl *lpvtbl; const IRecordInfoVtbl *lpvtbl;
DWORD ref; LONG ref;
DWORD sizeCalled; DWORD sizeCalled;
DWORD clearCalled; DWORD clearCalled;
} IRecordInfoImpl; } IRecordInfoImpl;

View File

@ -511,7 +511,7 @@ typedef struct tagINTERNAL_BSTR
typedef struct typedef struct
{ {
const IDispatchVtbl *lpVtbl; const IDispatchVtbl *lpVtbl;
ULONG ref; LONG ref;
VARTYPE vt; VARTYPE vt;
BOOL bFailInvoke; BOOL bFailInvoke;
} DummyDispatch; } DummyDispatch;

View File

@ -33,7 +33,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(quartz);
typedef struct EnumMonikerImpl typedef struct EnumMonikerImpl
{ {
const IEnumMonikerVtbl *lpVtbl; const IEnumMonikerVtbl *lpVtbl;
ULONG ref; LONG ref;
IMoniker ** ppMoniker; IMoniker ** ppMoniker;
ULONG nMonikerCount; ULONG nMonikerCount;
ULONG index; ULONG index;

View File

@ -37,7 +37,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(richedit);
typedef struct IRichEditOleImpl { typedef struct IRichEditOleImpl {
const IRichEditOleVtbl *lpVtbl; const IRichEditOleVtbl *lpVtbl;
DWORD ref; LONG ref;
} IRichEditOleImpl; } IRichEditOleImpl;
/* there is no way to be consistent across different sets of headers - mingw, Wine, Win32 SDK*/ /* there is no way to be consistent across different sets of headers - mingw, Wine, Win32 SDK*/

View File

@ -922,7 +922,7 @@ typedef struct _WineD3D_GLContext {
XVisualInfo* visInfo; XVisualInfo* visInfo;
Display* display; Display* display;
Drawable drawable; Drawable drawable;
DWORD ref; LONG ref;
} WineD3D_Context; } WineD3D_Context;
#endif /* HAVE_OPENGL */ #endif /* HAVE_OPENGL */