Interlocked LONG* gcc warning fixes.
diff --git a/dlls/d3dxof/d3dxof_private.h b/dlls/d3dxof/d3dxof_private.h
index e3eaa75..5c55a4f 100644
--- a/dlls/d3dxof/d3dxof_private.h
+++ b/dlls/d3dxof/d3dxof_private.h
@@ -37,37 +37,37 @@
typedef struct {
IDirectXFile lpVtbl;
- ULONG ref;
+ LONG ref;
} IDirectXFileImpl;
typedef struct {
IDirectXFileBinary lpVtbl;
- ULONG ref;
+ LONG ref;
} IDirectXFileBinaryImpl;
typedef struct {
IDirectXFileData lpVtbl;
- ULONG ref;
+ LONG ref;
} IDirectXFileDataImpl;
typedef struct {
IDirectXFileDataReference lpVtbl;
- ULONG ref;
+ LONG ref;
} IDirectXFileDataReferenceImpl;
typedef struct {
IDirectXFileObject lpVtbl;
- ULONG ref;
+ LONG ref;
} IDirectXFileObjectImpl;
typedef struct {
IDirectXFileEnumObject lpVtbl;
- ULONG ref;
+ LONG ref;
} IDirectXFileEnumObjectImpl;
typedef struct {
IDirectXFileSaveObject lpVtbl;
- ULONG ref;
+ LONG ref;
} IDirectXFileSaveObjectImpl;
HRESULT IDirectXFileImpl_Create(IUnknown *pUnkOuter, LPVOID *ppObj);
diff --git a/dlls/d3dxof/main.c b/dlls/d3dxof/main.c
index b3bdd25..b4a3326 100644
--- a/dlls/d3dxof/main.c
+++ b/dlls/d3dxof/main.c
@@ -43,7 +43,7 @@
WINE_DEFAULT_DEBUG_CHANNEL(d3dxof);
-static DWORD dll_ref = 0;
+static LONG dll_ref = 0;
/* For the moment, do nothing here. */
BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv)
@@ -64,7 +64,7 @@
typedef struct {
IClassFactory ITF_IClassFactory;
- DWORD ref;
+ LONG ref;
HRESULT (*pfnCreateInstance)(IUnknown *pUnkOuter, LPVOID *ppObj);
} IClassFactoryImpl;
diff --git a/dlls/dinput/device_private.h b/dlls/dinput/device_private.h
index f833e74..4f2347b 100644
--- a/dlls/dinput/device_private.h
+++ b/dlls/dinput/device_private.h
@@ -31,7 +31,7 @@
struct IDirectInputDevice2AImpl
{
const IDirectInputDevice2AVtbl *lpVtbl;
- DWORD ref;
+ LONG ref;
GUID guid;
};
diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c
index 1dee22f..591538f 100644
--- a/dlls/dinput/joystick_linuxinput.c
+++ b/dlls/dinput/joystick_linuxinput.c
@@ -71,7 +71,7 @@
struct JoystickImpl
{
const void *lpVtbl;
- DWORD ref;
+ LONG ref;
GUID guid;
diff --git a/dlls/dmband/dmband_private.h b/dlls/dmband/dmband_private.h
index 9548cd1..36c27a1 100644
--- a/dlls/dmband/dmband_private.h
+++ b/dlls/dmband/dmband_private.h
@@ -92,7 +92,7 @@
const IDirectMusicBandVtbl *BandVtbl;
const IDirectMusicObjectVtbl *ObjectVtbl;
const IPersistStreamVtbl *PersistStreamVtbl;
- DWORD ref;
+ LONG ref;
/* IDirectMusicBandImpl fields */
LPDMUS_OBJECTDESC pDesc;
@@ -108,7 +108,7 @@
const IUnknownVtbl *UnknownVtbl;
const IDirectMusicTrack8Vtbl *TrackVtbl;
const IPersistStreamVtbl *PersistStreamVtbl;
- DWORD ref;
+ LONG ref;
/* IDirectMusicBandTrack fields */
LPDMUS_OBJECTDESC pDesc;
diff --git a/dlls/dmcompos/dmcompos_private.h b/dlls/dmcompos/dmcompos_private.h
index 52a70bc..ce2c1bc 100644
--- a/dlls/dmcompos/dmcompos_private.h
+++ b/dlls/dmcompos/dmcompos_private.h
@@ -67,7 +67,7 @@
const IDirectMusicChordMapVtbl *ChordMapVtbl;
const IDirectMusicObjectVtbl *ObjectVtbl;
const IPersistStreamVtbl *PersistStreamVtbl;
- DWORD ref;
+ LONG ref;
/* IDirectMusicChordMapImpl fields */
LPDMUS_OBJECTDESC pDesc;
@@ -89,7 +89,7 @@
struct IDirectMusicComposerImpl {
/* IUnknown fields */
const IDirectMusicComposerVtbl *lpVtbl;
- DWORD ref;
+ LONG ref;
/* IDirectMusicComposerImpl fields */
};
@@ -106,7 +106,7 @@
const IUnknownVtbl *UnknownVtbl;
const IDirectMusicTrack8Vtbl *TrackVtbl;
const IPersistStreamVtbl *PersistStreamVtbl;
- DWORD ref;
+ LONG ref;
/* IDirectMusicChordMapTrack fields */
LPDMUS_OBJECTDESC pDesc;
@@ -127,7 +127,7 @@
const IUnknownVtbl *UnknownVtbl;
const IDirectMusicTrack8Vtbl *TrackVtbl;
const IPersistStreamVtbl *PersistStreamVtbl;
- DWORD ref;
+ LONG ref;
/* IDirectMusicSignPostTrack fields */
LPDMUS_OBJECTDESC pDesc;
diff --git a/dlls/dmime/dmime_private.h b/dlls/dmime/dmime_private.h
index 6dc6c0d..6fe3fb5 100644
--- a/dlls/dmime/dmime_private.h
+++ b/dlls/dmime/dmime_private.h
@@ -132,7 +132,7 @@
struct IDirectMusicPerformance8Impl {
/* IUnknown fields */
const IDirectMusicPerformance8Vtbl *lpVtbl;
- DWORD ref;
+ LONG ref;
/* IDirectMusicPerformanceImpl fields */
IDirectMusic8* pDirectMusic;
@@ -176,7 +176,7 @@
const IDirectMusicSegment8Vtbl *SegmentVtbl;
const IDirectMusicObjectVtbl *ObjectVtbl;
const IPersistStreamVtbl *PersistStreamVtbl;
- DWORD ref;
+ LONG ref;
/* IDirectMusicSegment8Impl fields */
LPDMUS_OBJECTDESC pDesc;
@@ -191,7 +191,7 @@
struct IDirectMusicSegmentState8Impl {
/* IUnknown fields */
const IDirectMusicSegmentState8Vtbl *lpVtbl;
- DWORD ref;
+ LONG ref;
/* IDirectMusicSegmentState8Impl fields */
};
@@ -205,7 +205,7 @@
const IDirectMusicGraphVtbl *GraphVtbl;
const IDirectMusicObjectVtbl *ObjectVtbl;
const IPersistStreamVtbl *PersistStreamVtbl;
- DWORD ref;
+ LONG ref;
/* IDirectMusicGraphImpl fields */
LPDMUS_OBJECTDESC pDesc;
@@ -222,7 +222,7 @@
const IDirectMusicAudioPathVtbl *AudioPathVtbl;
const IDirectMusicObjectVtbl *ObjectVtbl;
const IPersistStreamVtbl *PersistStreamVtbl;
- DWORD ref;
+ LONG ref;
/* IDirectMusicAudioPathImpl fields */
LPDMUS_OBJECTDESC pDesc;
@@ -241,7 +241,7 @@
struct IDirectMusicTool8Impl {
/* IUnknown fields */
const IDirectMusicTool8Vtbl *lpVtbl;
- DWORD ref;
+ LONG ref;
/* IDirectMusicTool8Impl fields */
};
@@ -252,7 +252,7 @@
struct IDirectMusicPatternTrackImpl {
/* IUnknown fields */
const IDirectMusicPatternTrackVtbl *lpVtbl;
- DWORD ref;
+ LONG ref;
/* IDirectMusicPatternTrackImpl fields */
};
@@ -266,7 +266,7 @@
const IUnknownVtbl *UnknownVtbl;
const IDirectMusicTrack8Vtbl *TrackVtbl;
const IPersistStreamVtbl *PersistStreamVtbl;
- DWORD ref;
+ LONG ref;
/* IDirectMusicLyricsTrack fields */
LPDMUS_OBJECTDESC pDesc;
@@ -280,7 +280,7 @@
const IUnknownVtbl *UnknownVtbl;
const IDirectMusicTrack8Vtbl *TrackVtbl;
const IPersistStreamVtbl *PersistStreamVtbl;
- DWORD ref;
+ LONG ref;
/* IDirectMusicMarkerTrack fields */
LPDMUS_OBJECTDESC pDesc;
@@ -294,7 +294,7 @@
const IUnknownVtbl *UnknownVtbl;
const IDirectMusicTrack8Vtbl *TrackVtbl;
const IPersistStreamVtbl *PersistStreamVtbl;
- DWORD ref;
+ LONG ref;
/* IDirectMusicParamControlTrack fields */
LPDMUS_OBJECTDESC pDesc;
@@ -308,7 +308,7 @@
const IUnknownVtbl *UnknownVtbl;
const IDirectMusicTrack8Vtbl *TrackVtbl;
const IPersistStreamVtbl *PersistStreamVtbl;
- DWORD ref;
+ LONG ref;
/* IDirectMusicSegTriggerTrack fields */
LPDMUS_OBJECTDESC pDesc;
@@ -324,7 +324,7 @@
const IUnknownVtbl *UnknownVtbl;
const IDirectMusicTrack8Vtbl *TrackVtbl;
const IPersistStreamVtbl *PersistStreamVtbl;
- DWORD ref;
+ LONG ref;
/* IDirectMusicSeqTrack fields */
LPDMUS_OBJECTDESC pDesc;
@@ -338,7 +338,7 @@
const IUnknownVtbl *UnknownVtbl;
const IDirectMusicTrack8Vtbl *TrackVtbl;
const IPersistStreamVtbl *PersistStreamVtbl;
- DWORD ref;
+ LONG ref;
/* IDirectMusicSysExTrack fields */
LPDMUS_OBJECTDESC pDesc;
@@ -352,7 +352,7 @@
const IUnknownVtbl *UnknownVtbl;
const IDirectMusicTrack8Vtbl *TrackVtbl;
const IPersistStreamVtbl *PersistStreamVtbl;
- DWORD ref;
+ LONG ref;
/* IDirectMusicTempoTrack fields */
LPDMUS_OBJECTDESC pDesc;
@@ -368,7 +368,7 @@
const IUnknownVtbl *UnknownVtbl;
const IDirectMusicTrack8Vtbl *TrackVtbl;
const IPersistStreamVtbl *PersistStreamVtbl;
- DWORD ref;
+ LONG ref;
/* IDirectMusicTimeSigTrack fields */
LPDMUS_OBJECTDESC pDesc;
@@ -382,7 +382,7 @@
const IUnknownVtbl *UnknownVtbl;
const IDirectMusicTrack8Vtbl *TrackVtbl;
const IPersistStreamVtbl *PersistStreamVtbl;
- DWORD ref;
+ LONG ref;
/* IDirectMusicWaveTrack fields */
LPDMUS_OBJECTDESC pDesc;
diff --git a/dlls/dmscript/dmscript_private.h b/dlls/dmscript/dmscript_private.h
index 407380f..429a78e 100644
--- a/dlls/dmscript/dmscript_private.h
+++ b/dlls/dmscript/dmscript_private.h
@@ -65,7 +65,7 @@
const IDirectMusicScriptVtbl *ScriptVtbl;
const IDirectMusicObjectVtbl *ObjectVtbl;
const IPersistStreamVtbl *PersistStreamVtbl;
- DWORD ref;
+ LONG ref;
/* IDirectMusicScriptImpl fields */
IDirectMusicPerformance* pPerformance;
@@ -94,7 +94,7 @@
const IUnknownVtbl *UnknownVtbl;
const IDirectMusicTrack8Vtbl *TrackVtbl;
const IPersistStreamVtbl *PersistStreamVtbl;
- DWORD ref;
+ LONG ref;
/* IDirectMusicScriptTrack fields */
LPDMUS_OBJECTDESC pDesc;
diff --git a/dlls/dmstyle/dmstyle_private.h b/dlls/dmstyle/dmstyle_private.h
index 9c9a911..0c24fda 100644
--- a/dlls/dmstyle/dmstyle_private.h
+++ b/dlls/dmstyle/dmstyle_private.h
@@ -109,7 +109,7 @@
const IDirectMusicStyle8Vtbl *StyleVtbl;
const IDirectMusicObjectVtbl *ObjectVtbl;
const IPersistStreamVtbl *PersistStreamVtbl;
- DWORD ref;
+ LONG ref;
/* IDirectMusicStyle8Impl fields */
LPDMUS_OBJECTDESC pDesc;
@@ -138,7 +138,7 @@
const IUnknownVtbl *UnknownVtbl;
const IDirectMusicTrack8Vtbl *TrackVtbl;
const IPersistStreamVtbl *PersistStreamVtbl;
- DWORD ref;
+ LONG ref;
/* IDirectMusicAuditionTrack fields */
LPDMUS_OBJECTDESC pDesc;
@@ -160,7 +160,7 @@
const IUnknownVtbl *UnknownVtbl;
const IDirectMusicTrack8Vtbl *TrackVtbl;
const IPersistStreamVtbl *PersistStreamVtbl;
- DWORD ref;
+ LONG ref;
/* IDirectMusicChordTrack fields */
LPDMUS_OBJECTDESC pDesc;
@@ -189,7 +189,7 @@
const IUnknownVtbl *UnknownVtbl;
const IDirectMusicTrack8Vtbl *TrackVtbl;
const IPersistStreamVtbl *PersistStreamVtbl;
- DWORD ref;
+ LONG ref;
/* IDirectMusicCommandTrack fields */
LPDMUS_OBJECTDESC pDesc;
@@ -213,7 +213,7 @@
const IUnknownVtbl *UnknownVtbl;
const IDirectMusicTrack8Vtbl *TrackVtbl;
const IPersistStreamVtbl *PersistStreamVtbl;
- DWORD ref;
+ LONG ref;
/* IDirectMusicMelodyFormulationTrack fields */
LPDMUS_OBJECTDESC pDesc;
@@ -235,7 +235,7 @@
const IUnknownVtbl *UnknownVtbl;
const IDirectMusicTrack8Vtbl *TrackVtbl;
const IPersistStreamVtbl *PersistStreamVtbl;
- DWORD ref;
+ LONG ref;
/* IDirectMusicMotifTrack fields */
LPDMUS_OBJECTDESC pDesc;
@@ -257,7 +257,7 @@
const IUnknownVtbl *UnknownVtbl;
const IDirectMusicTrack8Vtbl *TrackVtbl;
const IPersistStreamVtbl *PersistStreamVtbl;
- DWORD ref;
+ LONG ref;
/* IDirectMusicMuteTrack fields */
LPDMUS_OBJECTDESC pDesc;
@@ -279,7 +279,7 @@
const IUnknownVtbl *UnknownVtbl;
const IDirectMusicTrack8Vtbl *TrackVtbl;
const IPersistStreamVtbl *PersistStreamVtbl;
- DWORD ref;
+ LONG ref;
/* IDirectMusicStyleTrack fields */
LPDMUS_OBJECTDESC pDesc;
diff --git a/dlls/dmsynth/dmsynth_private.h b/dlls/dmsynth/dmsynth_private.h
index d0f7a60..0dcf089 100644
--- a/dlls/dmsynth/dmsynth_private.h
+++ b/dlls/dmsynth/dmsynth_private.h
@@ -58,7 +58,7 @@
struct IDirectMusicSynth8Impl {
/* IUnknown fields */
const IDirectMusicSynth8Vtbl *lpVtbl;
- DWORD ref;
+ LONG ref;
/* IDirectMusicSynth8 fields */
DMUS_PORTCAPS pCaps;
@@ -77,7 +77,7 @@
struct IDirectMusicSynthSinkImpl {
/* IUnknown fields */
const IDirectMusicSynthSinkVtbl *lpVtbl;
- DWORD ref;
+ LONG ref;
/* IDirectMusicSynthSinkImpl fields */
};