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