Interlocked LONG* gcc warning fixes.

This commit is contained in:
Mike McCormack 2005-07-13 11:59:15 +00:00 committed by Alexandre Julliard
parent 8d63dfb73e
commit bda7ace2e9
24 changed files with 43 additions and 43 deletions

View File

@ -227,7 +227,7 @@ static HRESULT DP_InitializeDPLSP( IDirectPlay3Impl* This, HMODULE hServiceProvi
/* Strip out all dwFlags values for CREATEPLAYER msg */ /* Strip out all dwFlags values for CREATEPLAYER msg */
#define DPMSG_CREATEPLAYER_DWFLAGS(x) 0 #define DPMSG_CREATEPLAYER_DWFLAGS(x) 0
static DWORD kludgePlayerGroupId = 1000; static LONG kludgePlayerGroupId = 1000;
/* ------------------------------------------------------------------ */ /* ------------------------------------------------------------------ */

View File

@ -45,7 +45,7 @@ typedef struct IDirectPlay4Impl IDirectPlay4Impl;
typedef struct tagDirectPlayIUnknownData typedef struct tagDirectPlayIUnknownData
{ {
ULONG ulObjRef; LONG ulObjRef;
CRITICAL_SECTION DP_lock; CRITICAL_SECTION DP_lock;
} DirectPlayIUnknownData; } DirectPlayIUnknownData;
@ -207,7 +207,7 @@ typedef struct tagDirectPlay4Data
} DirectPlay4Data; } DirectPlay4Data;
#define DP_IMPL_FIELDS \ #define DP_IMPL_FIELDS \
ULONG ulInterfaceRef; \ LONG ulInterfaceRef; \
DirectPlayIUnknownData* unk; \ DirectPlayIUnknownData* unk; \
DirectPlay2Data* dp2; \ DirectPlay2Data* dp2; \
DirectPlay3Data* dp3; \ DirectPlay3Data* dp3; \

View File

@ -51,7 +51,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(itss);
static HRESULT ITSS_create(IUnknown *pUnkOuter, LPVOID *ppObj); static HRESULT ITSS_create(IUnknown *pUnkOuter, LPVOID *ppObj);
ULONG dll_count = 0; LONG dll_count = 0;
BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv)
{ {

View File

@ -44,7 +44,7 @@
WINE_DEFAULT_DEBUG_CHANNEL(itss); WINE_DEFAULT_DEBUG_CHANNEL(itss);
extern ULONG dll_count; extern LONG dll_count;
/*****************************************************************************/ /*****************************************************************************/

View File

@ -45,14 +45,14 @@
WINE_DEFAULT_DEBUG_CHANNEL(itss); WINE_DEFAULT_DEBUG_CHANNEL(itss);
extern ULONG dll_count; extern LONG dll_count;
/************************************************************************/ /************************************************************************/
typedef struct _ITSS_IStorageImpl typedef struct _ITSS_IStorageImpl
{ {
const IStorageVtbl *vtbl_IStorage; const IStorageVtbl *vtbl_IStorage;
DWORD ref; LONG ref;
struct chmFile *chmfile; struct chmFile *chmfile;
WCHAR dir[1]; WCHAR dir[1];
} ITSS_IStorageImpl; } ITSS_IStorageImpl;
@ -66,14 +66,14 @@ struct enum_info
typedef struct _IEnumSTATSTG_Impl typedef struct _IEnumSTATSTG_Impl
{ {
const IEnumSTATSTGVtbl *vtbl_IEnumSTATSTG; const IEnumSTATSTGVtbl *vtbl_IEnumSTATSTG;
DWORD ref; LONG ref;
struct enum_info *first, *last, *current; struct enum_info *first, *last, *current;
} IEnumSTATSTG_Impl; } IEnumSTATSTG_Impl;
typedef struct _IStream_Impl typedef struct _IStream_Impl
{ {
const IStreamVtbl *vtbl_IStream; const IStreamVtbl *vtbl_IStream;
DWORD ref; LONG ref;
ITSS_IStorageImpl *stg; ITSS_IStorageImpl *stg;
ULONGLONG addr; ULONGLONG addr;
struct chmUnitInfo ui; struct chmUnitInfo ui;

View File

@ -38,7 +38,7 @@ typedef HRESULT (* PRECONNECTPROC)(IPin * iface, IPin * pConnectPin);
typedef struct IPinImpl typedef struct IPinImpl
{ {
const struct IPinVtbl * lpVtbl; const struct IPinVtbl * lpVtbl;
ULONG refCount; LONG refCount;
LPCRITICAL_SECTION pCritSec; LPCRITICAL_SECTION pCritSec;
PIN_INFO pinInfo; PIN_INFO pinInfo;
IPin * pConnectedTo; IPin * pConnectedTo;

View File

@ -27,7 +27,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(quartz);
typedef struct IEnumFiltersImpl typedef struct IEnumFiltersImpl
{ {
const IEnumFiltersVtbl * lpVtbl; const IEnumFiltersVtbl * lpVtbl;
ULONG refCount; LONG refCount;
IBaseFilter ** ppFilters; IBaseFilter ** ppFilters;
int nFilters; int nFilters;
ULONG uIndex; ULONG uIndex;

View File

@ -29,7 +29,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(quartz);
typedef struct IEnumRegFiltersImpl typedef struct IEnumRegFiltersImpl
{ {
const IEnumRegFiltersVtbl * lpVtbl; const IEnumRegFiltersVtbl * lpVtbl;
ULONG refCount; LONG refCount;
ULONG size; ULONG size;
REGFILTER* RegFilters; REGFILTER* RegFilters;
ULONG uIndex; ULONG uIndex;

View File

@ -42,7 +42,7 @@ typedef struct AsyncReader
const IBaseFilterVtbl * lpVtbl; const IBaseFilterVtbl * lpVtbl;
const IFileSourceFilterVtbl * lpVtblFSF; const IFileSourceFilterVtbl * lpVtblFSF;
ULONG refCount; LONG refCount;
FILTER_INFO filterInfo; FILTER_INFO filterInfo;
FILTER_STATE state; FILTER_STATE state;
CRITICAL_SECTION csFilter; CRITICAL_SECTION csFilter;

View File

@ -46,7 +46,7 @@ typedef struct FilterMapper2Impl
{ {
const IFilterMapper2Vtbl *lpVtbl; const IFilterMapper2Vtbl *lpVtbl;
const IFilterMapperVtbl *lpVtblFilterMapper; const IFilterMapperVtbl *lpVtblFilterMapper;
ULONG refCount; LONG refCount;
} FilterMapper2Impl; } FilterMapper2Impl;
static const IFilterMapper2Vtbl fm2vtbl; static const IFilterMapper2Vtbl fm2vtbl;

View File

@ -38,7 +38,7 @@ typedef HRESULT (* PRECONNECTPROC)(IPin * iface, IPin * pConnectPin);
typedef struct IPinImpl typedef struct IPinImpl
{ {
const struct IPinVtbl * lpVtbl; const struct IPinVtbl * lpVtbl;
ULONG refCount; LONG refCount;
LPCRITICAL_SECTION pCritSec; LPCRITICAL_SECTION pCritSec;
PIN_INFO pinInfo; PIN_INFO pinInfo;
IPin * pConnectedTo; IPin * pConnectedTo;

View File

@ -41,7 +41,7 @@ typedef struct _RpcConnection
/* don't know what MS's structure looks like */ /* don't know what MS's structure looks like */
typedef struct _RpcBinding typedef struct _RpcBinding
{ {
DWORD refs; LONG refs;
struct _RpcBinding* Next; struct _RpcBinding* Next;
BOOL server; BOOL server;
UUID ObjectUuid; UUID ObjectUuid;

View File

@ -117,7 +117,7 @@ static RpcPacket* spacket_head;
static RpcPacket* spacket_tail; static RpcPacket* spacket_tail;
static HANDLE server_sem; static HANDLE server_sem;
static DWORD worker_count, worker_free, worker_tls; static LONG worker_count, worker_free, worker_tls;
static UUID uuid_nil; static UUID uuid_nil;

View File

@ -42,7 +42,7 @@ typedef struct
{ {
/* IUnknown fields */ /* IUnknown fields */
const IClassFactoryVtbl *lpVtbl; const IClassFactoryVtbl *lpVtbl;
DWORD ref; LONG ref;
} IClassFactoryImpl; } IClassFactoryImpl;
extern IClassFactoryImpl SHDOCVW_ClassFactory; extern IClassFactoryImpl SHDOCVW_ClassFactory;
@ -55,7 +55,7 @@ typedef struct
{ {
/* IUnknown fields */ /* IUnknown fields */
const IOleObjectVtbl *lpVtbl; const IOleObjectVtbl *lpVtbl;
DWORD ref; LONG ref;
} IOleObjectImpl; } IOleObjectImpl;
extern IOleObjectImpl SHDOCVW_OleObject; extern IOleObjectImpl SHDOCVW_OleObject;
@ -67,7 +67,7 @@ typedef struct
{ {
/* IUnknown fields */ /* IUnknown fields */
const IWebBrowserVtbl *lpVtbl; const IWebBrowserVtbl *lpVtbl;
DWORD ref; LONG ref;
} IWebBrowserImpl; } IWebBrowserImpl;
extern IWebBrowserImpl SHDOCVW_WebBrowser; extern IWebBrowserImpl SHDOCVW_WebBrowser;
@ -80,7 +80,7 @@ typedef struct
{ {
/* IUnknown fields */ /* IUnknown fields */
const IProvideClassInfoVtbl *lpVtbl; const IProvideClassInfoVtbl *lpVtbl;
DWORD ref; LONG ref;
} IProvideClassInfoImpl; } IProvideClassInfoImpl;
extern IProvideClassInfoImpl SHDOCVW_ProvideClassInfo; extern IProvideClassInfoImpl SHDOCVW_ProvideClassInfo;
@ -93,7 +93,7 @@ typedef struct
{ {
/* IUnknown fields */ /* IUnknown fields */
const IProvideClassInfo2Vtbl *lpVtbl; const IProvideClassInfo2Vtbl *lpVtbl;
DWORD ref; LONG ref;
} IProvideClassInfo2Impl; } IProvideClassInfo2Impl;
extern IProvideClassInfo2Impl SHDOCVW_ProvideClassInfo2; extern IProvideClassInfo2Impl SHDOCVW_ProvideClassInfo2;
@ -106,7 +106,7 @@ typedef struct
{ {
/* IUnknown fields */ /* IUnknown fields */
const IPersistStorageVtbl *lpVtbl; const IPersistStorageVtbl *lpVtbl;
DWORD ref; LONG ref;
} IPersistStorageImpl; } IPersistStorageImpl;
extern IPersistStorageImpl SHDOCVW_PersistStorage; extern IPersistStorageImpl SHDOCVW_PersistStorage;
@ -119,7 +119,7 @@ typedef struct
{ {
/* IUnknown fields */ /* IUnknown fields */
const IPersistStreamInitVtbl *lpVtbl; const IPersistStreamInitVtbl *lpVtbl;
DWORD ref; LONG ref;
} IPersistStreamInitImpl; } IPersistStreamInitImpl;
extern IPersistStreamInitImpl SHDOCVW_PersistStreamInit; extern IPersistStreamInitImpl SHDOCVW_PersistStreamInit;
@ -132,7 +132,7 @@ typedef struct
{ {
/* IUnknown fields */ /* IUnknown fields */
const IQuickActivateVtbl *lpVtbl; const IQuickActivateVtbl *lpVtbl;
DWORD ref; LONG ref;
} IQuickActivateImpl; } IQuickActivateImpl;
extern IQuickActivateImpl SHDOCVW_QuickActivate; extern IQuickActivateImpl SHDOCVW_QuickActivate;
@ -145,7 +145,7 @@ typedef struct
{ {
/* IUnknown fields */ /* IUnknown fields */
const IConnectionPointContainerVtbl *lpVtbl; const IConnectionPointContainerVtbl *lpVtbl;
DWORD ref; LONG ref;
} IConnectionPointContainerImpl; } IConnectionPointContainerImpl;
extern IConnectionPointContainerImpl SHDOCVW_ConnectionPointContainer; extern IConnectionPointContainerImpl SHDOCVW_ConnectionPointContainer;
@ -158,7 +158,7 @@ typedef struct
{ {
/* IUnknown fields */ /* IUnknown fields */
const IConnectionPointVtbl *lpVtbl; const IConnectionPointVtbl *lpVtbl;
DWORD ref; LONG ref;
} IConnectionPointImpl; } IConnectionPointImpl;
/********************************************************************** /**********************************************************************

View File

@ -152,7 +152,7 @@ HRESULT WINAPI DllCanUnloadNow(void)
*/ */
typedef struct _IBindStatusCallbackImpl { typedef struct _IBindStatusCallbackImpl {
const IBindStatusCallbackVtbl *vtbl; const IBindStatusCallbackVtbl *vtbl;
DWORD ref; LONG ref;
HWND hDialog; HWND hDialog;
BOOL *pbCancelled; BOOL *pbCancelled;
} IBindStatusCallbackImpl; } IBindStatusCallbackImpl;

View File

@ -53,7 +53,7 @@ static const SHLWAPI_CLIST SHLWAPI_CLIST_items[] =
typedef struct typedef struct
{ {
void* lpVtbl; void* lpVtbl;
ULONG ref; LONG ref;
int readcalls; int readcalls;
BOOL failreadcall; BOOL failreadcall;
BOOL failreadsize; BOOL failreadsize;

View File

@ -59,7 +59,7 @@ static void test_create(void)
typedef struct { typedef struct {
const IBindStatusCallbackVtbl *lpVtbl; const IBindStatusCallbackVtbl *lpVtbl;
ULONG ref; LONG ref;
IBinding *pbind; IBinding *pbind;
IStream *pstr; IStream *pstr;
} statusclb; } statusclb;

View File

@ -91,9 +91,9 @@ HINTERNET WINAPI INTERNET_InternetOpenUrlW(LPWININETAPPINFOW hIC, LPCWSTR lpszUr
static VOID INTERNET_ExecuteWork(void); static VOID INTERNET_ExecuteWork(void);
static DWORD g_dwTlsErrIndex = TLS_OUT_OF_INDEXES; static DWORD g_dwTlsErrIndex = TLS_OUT_OF_INDEXES;
static DWORD dwNumThreads; static LONG dwNumThreads;
static DWORD dwNumIdleThreads; static LONG dwNumIdleThreads;
static DWORD dwNumJobs; static LONG dwNumJobs;
static HANDLE hEventArray[2]; static HANDLE hEventArray[2];
#define hQuitEvent hEventArray[0] #define hQuitEvent hEventArray[0]
#define hWorkEvent hEventArray[1] #define hWorkEvent hEventArray[1]

View File

@ -71,7 +71,7 @@ typedef struct {
/* data for playing the audio part */ /* data for playing the audio part */
HANDLE hWave; HANDLE hWave;
HANDLE hEvent; /* for synchronization */ HANDLE hEvent; /* for synchronization */
DWORD dwEventCount; /* for synchronization */ LONG dwEventCount; /* for synchronization */
/* data for play back */ /* data for play back */
HWND hWnd, hWndPaint; HWND hWnd, hWndPaint;
DWORD dwCachedFrame; /* buffered frame */ DWORD dwCachedFrame; /* buffered frame */

View File

@ -50,7 +50,7 @@ typedef struct {
DWORD dwMciTimeFormat;/* One of the supported MCI_FORMAT_xxxx */ DWORD dwMciTimeFormat;/* One of the supported MCI_FORMAT_xxxx */
DWORD dwPosition; /* position in bytes in chunk */ DWORD dwPosition; /* position in bytes in chunk */
HANDLE hEvent; /* for synchronization */ HANDLE hEvent; /* for synchronization */
DWORD dwEventCount; /* for synchronization */ LONG dwEventCount; /* for synchronization */
BOOL bTemporaryFile; /* temporary file (MCI_RECORD) */ BOOL bTemporaryFile; /* temporary file (MCI_RECORD) */
MMCKINFO ckMainRIFF; /* main RIFF chunk */ MMCKINFO ckMainRIFF; /* main RIFF chunk */
MMCKINFO ckWaveData; /* data chunk */ MMCKINFO ckWaveData; /* data chunk */

View File

@ -140,7 +140,7 @@ static HMMIO get_mmioFromProfile(UINT uFlags, LPCWSTR lpszName)
struct playsound_data struct playsound_data
{ {
HANDLE hEvent; HANDLE hEvent;
DWORD dwEventCount; LONG dwEventCount;
}; };
static void CALLBACK PlaySound_Callback(HWAVEOUT hwo, UINT uMsg, static void CALLBACK PlaySound_Callback(HWAVEOUT hwo, UINT uMsg,

View File

@ -3039,7 +3039,7 @@ struct IDsDriverImpl
{ {
/* IUnknown fields */ /* IUnknown fields */
const IDsDriverVtbl *lpVtbl; const IDsDriverVtbl *lpVtbl;
DWORD ref; LONG ref;
/* IDsDriverImpl fields */ /* IDsDriverImpl fields */
UINT wDevID; UINT wDevID;
IDsDriverBufferImpl*primary; IDsDriverBufferImpl*primary;
@ -3049,7 +3049,7 @@ struct IDsDriverBufferImpl
{ {
/* IUnknown fields */ /* IUnknown fields */
const IDsDriverBufferVtbl *lpVtbl; const IDsDriverBufferVtbl *lpVtbl;
DWORD ref; LONG ref;
/* IDsDriverBufferImpl fields */ /* IDsDriverBufferImpl fields */
IDsDriverImpl* drv; IDsDriverImpl* drv;

View File

@ -132,7 +132,7 @@ typedef struct {
DWORD dwThreadID; /* 0C */ DWORD dwThreadID; /* 0C */
DWORD fpThread; /* 10 address of thread proc (segptr or lin depending on dwFlags) */ DWORD fpThread; /* 10 address of thread proc (segptr or lin depending on dwFlags) */
DWORD dwThreadPmt; /* 14 parameter to be passed upon thread creation to fpThread */ DWORD dwThreadPmt; /* 14 parameter to be passed upon thread creation to fpThread */
DWORD dwSignalCount; /* 18 counter used for signaling */ LONG dwSignalCount; /* 18 counter used for signaling */
HANDLE hEvent; /* 1C event */ HANDLE hEvent; /* 1C event */
HANDLE hVxD; /* 20 return from OpenVxDHandle */ HANDLE hVxD; /* 20 return from OpenVxDHandle */
DWORD dwStatus; /* 24 0x00, 0x10, 0x20, 0x30 */ DWORD dwStatus; /* 24 0x00, 0x10, 0x20, 0x30 */

View File

@ -74,7 +74,7 @@ struct IDsCaptureDriverPropertySetImpl
{ {
/* IUnknown fields */ /* IUnknown fields */
const IDsDriverPropertySetVtbl *lpVtbl; const IDsDriverPropertySetVtbl *lpVtbl;
DWORD ref; LONG ref;
IDsCaptureDriverBufferImpl* capture_buffer; IDsCaptureDriverBufferImpl* capture_buffer;
}; };
@ -83,7 +83,7 @@ struct IDsCaptureDriverNotifyImpl
{ {
/* IUnknown fields */ /* IUnknown fields */
const IDsDriverNotifyVtbl *lpVtbl; const IDsDriverNotifyVtbl *lpVtbl;
DWORD ref; LONG ref;
IDsCaptureDriverBufferImpl* capture_buffer; IDsCaptureDriverBufferImpl* capture_buffer;
}; };
@ -92,7 +92,7 @@ struct IDsCaptureDriverImpl
{ {
/* IUnknown fields */ /* IUnknown fields */
const IDsCaptureDriverVtbl *lpVtbl; const IDsCaptureDriverVtbl *lpVtbl;
DWORD ref; LONG ref;
/* IDsCaptureDriverImpl fields */ /* IDsCaptureDriverImpl fields */
UINT wDevID; UINT wDevID;
@ -103,7 +103,7 @@ struct IDsCaptureDriverBufferImpl
{ {
/* IUnknown fields */ /* IUnknown fields */
const IDsCaptureDriverBufferVtbl *lpVtbl; const IDsCaptureDriverBufferVtbl *lpVtbl;
DWORD ref; LONG ref;
/* IDsCaptureDriverBufferImpl fields */ /* IDsCaptureDriverBufferImpl fields */
IDsCaptureDriverImpl* drv; IDsCaptureDriverImpl* drv;