Commit 0791d062 authored by Mike McCormack's avatar Mike McCormack Committed by Alexandre Julliard

Interlocked LONG* gcc warning fixes.

parent f675a783
......@@ -95,7 +95,7 @@ extern HRESULT WINAPI DMUSIC_CreateDirectMusicInstrumentImpl (LPCGUID lpcGUID, L
struct IDirectMusic8Impl {
/* IUnknown fields */
const IDirectMusic8Vtbl *lpVtbl;
DWORD ref;
LONG ref;
/* IDirectMusicImpl fields */
IReferenceClockImpl* pMasterClock;
......@@ -112,7 +112,7 @@ extern ULONG WINAPI IDirectMusic8Impl_AddRef (LPDIRECTMUSIC8 iface);
struct IDirectMusicBufferImpl {
/* IUnknown fields */
const IDirectMusicBufferVtbl *lpVtbl;
DWORD ref;
LONG ref;
/* IDirectMusicBufferImpl fields */
};
......@@ -126,7 +126,7 @@ extern ULONG WINAPI IDirectMusicBufferImpl_AddRef (LPDIRECTMUSICBUFFER iface);
struct IDirectMusicDownloadedInstrumentImpl {
/* IUnknown fields */
const IDirectMusicDownloadedInstrumentVtbl *lpVtbl;
DWORD ref;
LONG ref;
/* IDirectMusicDownloadedInstrumentImpl fields */
};
......@@ -142,7 +142,7 @@ extern ULONG WINAPI IDirectMusicDownloadedInstrumentImpl_AddRef (LPDIRECTMUSIC
struct IDirectMusicDownloadImpl {
/* IUnknown fields */
const IDirectMusicDownloadVtbl *lpVtbl;
DWORD ref;
LONG ref;
/* IDirectMusicDownloadImpl fields */
};
......@@ -156,7 +156,7 @@ extern ULONG WINAPI IDirectMusicDownloadImpl_AddRef (LPDIRECTMUSICDOWNLOAD ifa
struct IDirectMusicPortDownloadImpl {
/* IUnknown fields */
const IDirectMusicPortDownloadVtbl *lpVtbl;
DWORD ref;
LONG ref;
/* IDirectMusicPortDownloadImpl fields */
};
......@@ -170,7 +170,7 @@ extern ULONG WINAPI IDirectMusicPortDownloadImpl_AddRef (LPDIRECTMUSICPORTDOWN
struct IDirectMusicPortImpl {
/* IUnknown fields */
const IDirectMusicPortVtbl *lpVtbl;
DWORD ref;
LONG ref;
/* IDirectMusicPortImpl fields */
IDirectSound* pDirectSound;
......@@ -191,7 +191,7 @@ extern ULONG WINAPI IDirectMusicPortImpl_AddRef (LPDIRECTMUSICPORT iface);
struct IDirectMusicThruImpl {
/* IUnknown fields */
const IDirectMusicThruVtbl *lpVtbl;
DWORD ref;
LONG ref;
/* IDirectMusicThruImpl fields */
};
......@@ -205,7 +205,7 @@ extern ULONG WINAPI IDirectMusicThruImpl_AddRef (LPDIRECTMUSICTHRU iface);
struct IReferenceClockImpl {
/* IUnknown fields */
const IReferenceClockVtbl *lpVtbl;
DWORD ref;
LONG ref;
/* IReferenceClockImpl fields */
REFERENCE_TIME rtTime;
......@@ -233,7 +233,7 @@ struct IDirectMusicCollectionImpl {
const IDirectMusicCollectionVtbl *CollectionVtbl;
const IDirectMusicObjectVtbl *ObjectVtbl;
const IPersistStreamVtbl *PersistStreamVtbl;
DWORD ref;
LONG ref;
/* IDirectMusicCollectionImpl fields */
IStream *pStm; /* stream from which we load collection and later instruments */
......@@ -265,7 +265,7 @@ struct IDirectMusicInstrumentImpl {
/* IUnknown fields */
const IUnknownVtbl *UnknownVtbl;
const IDirectMusicInstrumentVtbl *InstrumentVtbl;
DWORD ref;
LONG ref;
/* IDirectMusicInstrumentImpl fields */
LARGE_INTEGER liInstrumentPosition; /* offset in a stream where instrument chunk can be found */
......
......@@ -40,7 +40,7 @@ typedef struct
{
/* IUnknown fields */
const IClassFactoryVtbl *lpVtbl;
DWORD ref;
LONG ref;
} IClassFactoryImpl;
static HRESULT WINAPI
......
......@@ -45,7 +45,7 @@ typedef struct IDirectPlaySPImpl IDirectPlaySPImpl;
typedef struct tagDirectPlaySPIUnknownData
{
ULONG ulObjRef;
LONG ulObjRef;
CRITICAL_SECTION DPSP_lock;
} DirectPlaySPIUnknownData;
......@@ -62,7 +62,7 @@ typedef struct tagDirectPlaySPData
} DirectPlaySPData;
#define DPSP_IMPL_FIELDS \
ULONG ulInterfaceRef; \
LONG ulInterfaceRef; \
DirectPlaySPIUnknownData* unk; \
DirectPlaySPData* sp;
......
......@@ -88,7 +88,7 @@ typedef struct DPLMSG* LPDPLMSG;
typedef struct tagDirectPlayLobbyIUnknownData
{
ULONG ulObjRef;
LONG ulObjRef;
CRITICAL_SECTION DPL_lock;
} DirectPlayLobbyIUnknownData;
......@@ -110,7 +110,7 @@ typedef struct tagDirectPlayLobby3Data
} DirectPlayLobby3Data;
#define DPL_IMPL_FIELDS \
ULONG ulInterfaceRef; \
LONG ulInterfaceRef; \
DirectPlayLobbyIUnknownData* unk; \
DirectPlayLobbyData* dpl; \
DirectPlayLobby2Data* dpl2; \
......
......@@ -39,7 +39,7 @@ typedef struct IDPLobbySPImpl IDPLobbySPImpl;
typedef struct tagDPLobbySPIUnknownData
{
ULONG ulObjRef;
LONG ulObjRef;
CRITICAL_SECTION DPLSP_lock;
} DPLobbySPIUnknownData;
......@@ -49,7 +49,7 @@ typedef struct tagDPLobbySPData
} DPLobbySPData;
#define DPLSP_IMPL_FIELDS \
ULONG ulInterfaceRef; \
LONG ulInterfaceRef; \
DPLobbySPIUnknownData* unk; \
DPLobbySPData* sp;
......
......@@ -66,7 +66,7 @@ typedef struct
{
/* IUnknown fields */
const IClassFactoryVtbl *lpVtbl;
DWORD ref;
LONG ref;
REFCLSID rclsid;
HRESULT (*pfnCreateInstanceFactory)(LPCLASSFACTORY iface, LPUNKNOWN punkOuter, REFIID riid, LPVOID *ppobj);
} IClassFactoryImpl;
......
......@@ -46,7 +46,7 @@ struct IDirectPlay8ClientImpl
{
/* IUnknown fields */
const IDirectPlay8ClientVtbl *lpVtbl;
DWORD ref;
LONG ref;
/* IDirectPlay8Client fields */
};
......@@ -64,7 +64,7 @@ struct IDirectPlay8AddressImpl
{
/* IUnknown fields */
const IDirectPlay8AddressVtbl *lpVtbl;
DWORD ref;
LONG ref;
/* IDirectPlay8Address fields */
GUID SP_guid;
const WCHAR *url;
......
......@@ -73,7 +73,7 @@ struct IDirectSoundImpl
{
/* IUnknown fields */
const IDirectSound8Vtbl *lpVtbl;
DWORD ref;
LONG ref;
DirectSoundDevice *device;
LPUNKNOWN pUnknown;
......@@ -83,7 +83,7 @@ struct IDirectSoundImpl
struct DirectSoundDevice
{
DWORD ref;
LONG ref;
GUID guid;
PIDSDRIVER driver;
......@@ -118,7 +118,7 @@ struct DirectSoundDevice
/* reference counted buffer memory for duplicated buffer memory */
typedef struct BufferMemory
{
DWORD ref;
LONG ref;
LPBYTE memory;
} BufferMemory;
......@@ -138,7 +138,7 @@ HRESULT WINAPI DSOUND_Create8(
*/
struct IDirectSound_IUnknown {
const IUnknownVtbl *lpVtbl;
DWORD ref;
LONG ref;
LPDIRECTSOUND8 pds;
};
......@@ -148,7 +148,7 @@ HRESULT WINAPI IDirectSound_IUnknown_Create(
struct IDirectSound_IDirectSound {
const IDirectSoundVtbl *lpVtbl;
DWORD ref;
LONG ref;
LPDIRECTSOUND8 pds;
};
......@@ -161,7 +161,7 @@ HRESULT WINAPI IDirectSound_IDirectSound_Create(
*/
struct IDirectSound8_IUnknown {
const IUnknownVtbl *lpVtbl;
DWORD ref;
LONG ref;
LPDIRECTSOUND8 pds;
};
......@@ -171,7 +171,7 @@ HRESULT WINAPI IDirectSound8_IUnknown_Create(
struct IDirectSound8_IDirectSound {
const IDirectSoundVtbl *lpVtbl;
DWORD ref;
LONG ref;
LPDIRECTSOUND8 pds;
};
......@@ -181,7 +181,7 @@ HRESULT WINAPI IDirectSound8_IDirectSound_Create(
struct IDirectSound8_IDirectSound8 {
const IDirectSound8Vtbl *lpVtbl;
DWORD ref;
LONG ref;
LPDIRECTSOUND8 pds;
};
......@@ -197,7 +197,7 @@ struct IDirectSoundBufferImpl
/* FIXME: document */
/* IUnknown fields */
const IDirectSoundBuffer8Vtbl *lpVtbl;
DWORD ref;
LONG ref;
/* IDirectSoundBufferImpl fields */
SecondaryBufferImpl* dsb;
IDirectSoundImpl* dsound;
......@@ -247,7 +247,7 @@ HRESULT WINAPI IDirectSoundBufferImpl_Destroy(
struct SecondaryBufferImpl
{
const IDirectSoundBuffer8Vtbl *lpVtbl;
DWORD ref;
LONG ref;
IDirectSoundBufferImpl* dsb;
};
......@@ -263,7 +263,7 @@ HRESULT WINAPI SecondaryBufferImpl_Destroy(
struct PrimaryBufferImpl
{
const IDirectSoundBuffer8Vtbl *lpVtbl;
DWORD ref;
LONG ref;
IDirectSoundImpl* dsound;
};
......@@ -279,7 +279,7 @@ struct IDirectSoundCaptureImpl
{
/* IUnknown fields */
const IDirectSoundCaptureVtbl *lpVtbl;
DWORD ref;
LONG ref;
DirectSoundCaptureDevice *device;
};
......@@ -288,7 +288,7 @@ struct DirectSoundCaptureDevice
{
/* IDirectSoundCaptureImpl fields */
GUID guid;
DWORD ref;
LONG ref;
/* DirectSound driver stuff */
PIDSCDRIVER driver;
......@@ -332,7 +332,7 @@ struct IDirectSoundCaptureBufferImpl
{
/* IUnknown fields */
const IDirectSoundCaptureBuffer8Vtbl *lpVtbl;
DWORD ref;
LONG ref;
/* IDirectSoundCaptureBufferImpl fields */
IDirectSoundCaptureImpl* dsound;
......@@ -354,7 +354,7 @@ struct IDirectSoundFullDuplexImpl
{
/* IUnknown fields */
const IDirectSoundFullDuplexVtbl *lpVtbl;
DWORD ref;
LONG ref;
/* IDirectSoundFullDuplexImpl fields */
CRITICAL_SECTION lock;
......@@ -367,7 +367,7 @@ struct IDirectSoundNotifyImpl
{
/* IUnknown fields */
const IDirectSoundNotifyVtbl *lpVtbl;
DWORD ref;
LONG ref;
IDirectSoundBufferImpl* dsb;
};
......@@ -384,7 +384,7 @@ struct IDirectSoundCaptureNotifyImpl
{
/* IUnknown fields */
const IDirectSoundNotifyVtbl *lpVtbl;
DWORD ref;
LONG ref;
IDirectSoundCaptureBufferImpl* dscb;
};
......@@ -399,7 +399,7 @@ struct IDirectSound3DListenerImpl
{
/* IUnknown fields */
const IDirectSound3DListenerVtbl *lpVtbl;
DWORD ref;
LONG ref;
/* IDirectSound3DListenerImpl fields */
IDirectSoundImpl* dsound;
};
......@@ -415,7 +415,7 @@ struct IKsBufferPropertySetImpl
{
/* IUnknown fields */
const IKsPropertySetVtbl *lpVtbl;
DWORD ref;
LONG ref;
/* IKsPropertySetImpl fields */
IDirectSoundBufferImpl* dsb;
};
......@@ -433,7 +433,7 @@ struct IKsPrivatePropertySetImpl
{
/* IUnknown fields */
const IKsPropertySetVtbl *lpVtbl;
DWORD ref;
LONG ref;
};
HRESULT WINAPI IKsPrivatePropertySetImpl_Create(
......@@ -446,7 +446,7 @@ struct IDirectSound3DBufferImpl
{
/* IUnknown fields */
const IDirectSound3DBufferVtbl *lpVtbl;
DWORD ref;
LONG ref;
/* IDirectSound3DBufferImpl fields */
IDirectSoundBufferImpl* dsb;
};
......@@ -464,7 +464,7 @@ struct IClassFactoryImpl
{
/* IUnknown fields */
const IClassFactoryVtbl *lpVtbl;
DWORD ref;
LONG ref;
};
extern IClassFactoryImpl DSOUND_CAPTURE_CF;
......
......@@ -60,7 +60,7 @@ struct IDirectMusicWaveImpl {
const IDirectMusicSegment8Vtbl *SegmentVtbl;
const IDirectMusicObjectVtbl *ObjectVtbl;
const IPersistStreamVtbl *PersistStreamVtbl;
DWORD ref;
LONG ref;
/* IDirectMusicWaveImpl fields */
LPDMUS_OBJECTDESC pDesc;
......
......@@ -71,7 +71,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv)
typedef struct {
IClassFactory ITF_IClassFactory;
DWORD ref;
LONG ref;
HRESULT (*pfnCreateInstance)(IUnknown *pUnkOuter, LPVOID *ppObj);
} IClassFactoryImpl;
......@@ -214,7 +214,7 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv)
typedef struct {
const IITStorageVtbl *vtbl_IITStorage;
DWORD ref;
LONG ref;
} ITStorageImpl;
......
......@@ -50,7 +50,7 @@ extern ULONG dll_count;
typedef struct {
const IMonikerVtbl *vtbl_ITS_IMoniker;
DWORD ref;
LONG ref;
LPWSTR szHtml;
WCHAR szFile[1];
} ITS_IMonikerImpl;
......@@ -378,7 +378,7 @@ static HRESULT ITS_IMoniker_create( IMoniker **ppObj, LPWSTR name, DWORD n )
typedef struct {
const IParseDisplayNameVtbl *vtbl_ITS_IParseDisplayName;
DWORD ref;
LONG ref;
} ITS_IParseDisplayNameImpl;
static HRESULT WINAPI ITS_IParseDisplayNameImpl_QueryInterface(
......
......@@ -654,7 +654,7 @@ HRESULT WINAPI LcidToRfc1766W(
typedef struct {
IClassFactory ITF_IClassFactory;
DWORD ref;
LONG ref;
HRESULT (*pfnCreateInstance)(IUnknown *pUnkOuter, LPVOID *ppObj);
} IClassFactoryImpl;
......@@ -793,7 +793,7 @@ typedef struct tagMLang_impl
const IMLangFontLinkVtbl *vtbl_IMLangFontLink;
const IMultiLanguageVtbl *vtbl_IMultiLanguage;
const IMultiLanguage2Vtbl *vtbl_IMultiLanguage2;
DWORD ref;
LONG ref;
DWORD total_cp, total_scripts;
} MLang_impl;
......@@ -858,7 +858,7 @@ static HRESULT WINAPI MLang_QueryInterface(
typedef struct tagEnumCodePage_impl
{
const IEnumCodePageVtbl *vtbl_IEnumCodePage;
DWORD ref;
LONG ref;
MIMECPINFO *cpinfo;
DWORD total, pos;
} EnumCodePage_impl;
......@@ -1044,7 +1044,7 @@ static HRESULT EnumCodePage_create( MLang_impl* mlang, DWORD grfFlags,
typedef struct tagEnumScript_impl
{
const IEnumScriptVtbl *vtbl_IEnumScript;
DWORD ref;
LONG ref;
SCRIPTINFO *script_info;
DWORD total, pos;
} EnumScript_impl;
......
......@@ -80,7 +80,7 @@ static const WCHAR szCat2Fmt[] =
typedef struct
{
const IEnumDMOVtbl *lpVtbl;
DWORD ref;
LONG ref;
DWORD index;
const GUID* guidCategory;
DWORD dwFlags;
......
......@@ -56,7 +56,7 @@ typedef struct _NetBIOSAdapter
{
BOOL enabled;
BOOL shuttingDown;
ULONG resetting;
LONG resetting;
ULONG transport_id;
NetBIOSTransport *transport;
NetBIOSAdapterImpl impl;
......
......@@ -56,7 +56,7 @@ typedef struct CaptureGraphImpl
{
const ICaptureGraphBuilder2Vtbl * lpVtbl2;
const ICaptureGraphBuilderVtbl * lpVtbl;
DWORD ref;
LONG ref;
IGraphBuilder *mygraph;
CRITICAL_SECTION csFilter;
......
......@@ -91,7 +91,7 @@ void dump_AM_MEDIA_TYPE(const AM_MEDIA_TYPE * pmt)
typedef struct IEnumMediaTypesImpl
{
const IEnumMediaTypesVtbl * lpVtbl;
ULONG refCount;
LONG refCount;
ENUMMEDIADETAILS enumMediaDetails;
ULONG uIndex;
} IEnumMediaTypesImpl;
......
......@@ -38,7 +38,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(qcap);
typedef struct IEnumPinsImpl
{
const IEnumPinsVtbl * lpVtbl;
ULONG refCount;
LONG refCount;
ENUMPINDETAILS enumPinDetails;
ULONG uIndex;
} IEnumPinsImpl;
......
......@@ -43,8 +43,8 @@
WINE_DEFAULT_DEBUG_CHANNEL(qcap);
static DWORD objects_ref = 0;
static DWORD server_locks = 0;
static LONG objects_ref = 0;
static LONG server_locks = 0;
static HINSTANCE ghInst = NULL;
static const WCHAR wAudioCaptFilter[] =
......@@ -206,7 +206,7 @@ HRESULT WINAPI QCAP_DllCanUnloadNow(void)
typedef struct {
IClassFactory ITF_IClassFactory;
DWORD ref;
LONG ref;
LPFNNewCOMObject pfnCreateInstance;
} IClassFactoryImpl;
......
......@@ -68,7 +68,7 @@ typedef struct VfwCapture
BOOL init;
Capture *driver_info;
ULONG refCount;
LONG refCount;
FILTER_INFO filterInfo;
FILTER_STATE state;
CRITICAL_SECTION csFilter;
......
......@@ -52,7 +52,7 @@ typedef struct DSoundRenderImpl
const IBaseFilterVtbl * lpVtbl;
const IBasicAudioVtbl *IBasicAudio_vtbl;
ULONG refCount;
LONG refCount;
CRITICAL_SECTION csFilter;
FILTER_STATE state;
REFERENCE_TIME rtStreamStart;
......
......@@ -93,7 +93,7 @@ void dump_AM_MEDIA_TYPE(const AM_MEDIA_TYPE * pmt)
typedef struct IEnumMediaTypesImpl
{
const IEnumMediaTypesVtbl * lpVtbl;
ULONG refCount;
LONG refCount;
ENUMMEDIADETAILS enumMediaDetails;
ULONG uIndex;
} IEnumMediaTypesImpl;
......
......@@ -27,7 +27,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(quartz);
typedef struct IEnumPinsImpl
{
const IEnumPinsVtbl * lpVtbl;
ULONG refCount;
LONG refCount;
ENUMPINDETAILS enumPinDetails;
ULONG uIndex;
} IEnumPinsImpl;
......
......@@ -165,7 +165,7 @@ typedef struct _IFilterGraphImpl {
/* IServiceProvider */
/* IVideoFrameStep */
ULONG ref;
LONG ref;
IFilterMapper2 * pFilterMapper2;
IBaseFilter ** ppFiltersInGraph;
LPWSTR * pFilterNames;
......
......@@ -48,7 +48,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv)
typedef struct {
IClassFactory ITF_IClassFactory;
DWORD ref;
LONG ref;
HRESULT (*pfnCreateInstance)(IUnknown *pUnkOuter, LPVOID *ppObj);
} IClassFactoryImpl;
......
......@@ -55,7 +55,7 @@ typedef struct BaseMemAllocator
{
const IMemAllocatorVtbl * lpVtbl;
ULONG ref;
LONG ref;
ALLOCATOR_PROPERTIES * pProps;
CRITICAL_SECTION csState;
HRESULT (* fnAlloc) (IMemAllocator *);
......@@ -72,7 +72,7 @@ typedef struct StdMediaSample2
{
const IMediaSample2Vtbl * lpvtbl;
ULONG ref;
LONG ref;
AM_SAMPLE2_PROPERTIES props;
IMemAllocator * pParent;
struct list listentry;
......
......@@ -28,7 +28,7 @@ struct ParserImpl
{
const IBaseFilterVtbl * lpVtbl;
ULONG refCount;
LONG refCount;
CRITICAL_SECTION csFilter;
FILTER_STATE state;
REFERENCE_TIME rtStreamStart;
......
......@@ -40,7 +40,7 @@ struct SystemClockAdviseEntry {
typedef struct SystemClockImpl {
const IReferenceClockVtbl *lpVtbl;
ULONG ref;
LONG ref;
/** IReferenceClock */
HANDLE adviseThread;
......
......@@ -32,7 +32,7 @@ struct TransformFilterImpl
{
const IBaseFilterVtbl * lpVtbl;
ULONG refCount;
LONG refCount;
CRITICAL_SECTION csFilter;
FILTER_STATE state;
REFERENCE_TIME rtStreamStart;
......
......@@ -58,7 +58,7 @@ typedef struct VideoRendererImpl
const IBasicVideoVtbl * IBasicVideo_vtbl;
const IVideoWindowVtbl * IVideoWindow_vtbl;
ULONG refCount;
LONG refCount;
CRITICAL_SECTION csFilter;
FILTER_STATE state;
REFERENCE_TIME rtStreamStart;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment