Interlocked LONG* gcc warning fixes.
This commit is contained in:
parent
8d63dfb73e
commit
bda7ace2e9
|
@ -227,7 +227,7 @@ static HRESULT DP_InitializeDPLSP( IDirectPlay3Impl* This, HMODULE hServiceProvi
|
|||
/* Strip out all dwFlags values for CREATEPLAYER msg */
|
||||
#define DPMSG_CREATEPLAYER_DWFLAGS(x) 0
|
||||
|
||||
static DWORD kludgePlayerGroupId = 1000;
|
||||
static LONG kludgePlayerGroupId = 1000;
|
||||
|
||||
/* ------------------------------------------------------------------ */
|
||||
|
||||
|
|
|
@ -45,7 +45,7 @@ typedef struct IDirectPlay4Impl IDirectPlay4Impl;
|
|||
|
||||
typedef struct tagDirectPlayIUnknownData
|
||||
{
|
||||
ULONG ulObjRef;
|
||||
LONG ulObjRef;
|
||||
CRITICAL_SECTION DP_lock;
|
||||
} DirectPlayIUnknownData;
|
||||
|
||||
|
@ -207,7 +207,7 @@ typedef struct tagDirectPlay4Data
|
|||
} DirectPlay4Data;
|
||||
|
||||
#define DP_IMPL_FIELDS \
|
||||
ULONG ulInterfaceRef; \
|
||||
LONG ulInterfaceRef; \
|
||||
DirectPlayIUnknownData* unk; \
|
||||
DirectPlay2Data* dp2; \
|
||||
DirectPlay3Data* dp3; \
|
||||
|
|
|
@ -51,7 +51,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(itss);
|
|||
|
||||
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)
|
||||
{
|
||||
|
|
|
@ -44,7 +44,7 @@
|
|||
|
||||
WINE_DEFAULT_DEBUG_CHANNEL(itss);
|
||||
|
||||
extern ULONG dll_count;
|
||||
extern LONG dll_count;
|
||||
|
||||
/*****************************************************************************/
|
||||
|
||||
|
|
|
@ -45,14 +45,14 @@
|
|||
|
||||
WINE_DEFAULT_DEBUG_CHANNEL(itss);
|
||||
|
||||
extern ULONG dll_count;
|
||||
extern LONG dll_count;
|
||||
|
||||
/************************************************************************/
|
||||
|
||||
typedef struct _ITSS_IStorageImpl
|
||||
{
|
||||
const IStorageVtbl *vtbl_IStorage;
|
||||
DWORD ref;
|
||||
LONG ref;
|
||||
struct chmFile *chmfile;
|
||||
WCHAR dir[1];
|
||||
} ITSS_IStorageImpl;
|
||||
|
@ -66,14 +66,14 @@ struct enum_info
|
|||
typedef struct _IEnumSTATSTG_Impl
|
||||
{
|
||||
const IEnumSTATSTGVtbl *vtbl_IEnumSTATSTG;
|
||||
DWORD ref;
|
||||
LONG ref;
|
||||
struct enum_info *first, *last, *current;
|
||||
} IEnumSTATSTG_Impl;
|
||||
|
||||
typedef struct _IStream_Impl
|
||||
{
|
||||
const IStreamVtbl *vtbl_IStream;
|
||||
DWORD ref;
|
||||
LONG ref;
|
||||
ITSS_IStorageImpl *stg;
|
||||
ULONGLONG addr;
|
||||
struct chmUnitInfo ui;
|
||||
|
|
|
@ -38,7 +38,7 @@ typedef HRESULT (* PRECONNECTPROC)(IPin * iface, IPin * pConnectPin);
|
|||
typedef struct IPinImpl
|
||||
{
|
||||
const struct IPinVtbl * lpVtbl;
|
||||
ULONG refCount;
|
||||
LONG refCount;
|
||||
LPCRITICAL_SECTION pCritSec;
|
||||
PIN_INFO pinInfo;
|
||||
IPin * pConnectedTo;
|
||||
|
|
|
@ -27,7 +27,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(quartz);
|
|||
typedef struct IEnumFiltersImpl
|
||||
{
|
||||
const IEnumFiltersVtbl * lpVtbl;
|
||||
ULONG refCount;
|
||||
LONG refCount;
|
||||
IBaseFilter ** ppFilters;
|
||||
int nFilters;
|
||||
ULONG uIndex;
|
||||
|
|
|
@ -29,7 +29,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(quartz);
|
|||
typedef struct IEnumRegFiltersImpl
|
||||
{
|
||||
const IEnumRegFiltersVtbl * lpVtbl;
|
||||
ULONG refCount;
|
||||
LONG refCount;
|
||||
ULONG size;
|
||||
REGFILTER* RegFilters;
|
||||
ULONG uIndex;
|
||||
|
|
|
@ -42,7 +42,7 @@ typedef struct AsyncReader
|
|||
const IBaseFilterVtbl * lpVtbl;
|
||||
const IFileSourceFilterVtbl * lpVtblFSF;
|
||||
|
||||
ULONG refCount;
|
||||
LONG refCount;
|
||||
FILTER_INFO filterInfo;
|
||||
FILTER_STATE state;
|
||||
CRITICAL_SECTION csFilter;
|
||||
|
|
|
@ -46,7 +46,7 @@ typedef struct FilterMapper2Impl
|
|||
{
|
||||
const IFilterMapper2Vtbl *lpVtbl;
|
||||
const IFilterMapperVtbl *lpVtblFilterMapper;
|
||||
ULONG refCount;
|
||||
LONG refCount;
|
||||
} FilterMapper2Impl;
|
||||
|
||||
static const IFilterMapper2Vtbl fm2vtbl;
|
||||
|
|
|
@ -38,7 +38,7 @@ typedef HRESULT (* PRECONNECTPROC)(IPin * iface, IPin * pConnectPin);
|
|||
typedef struct IPinImpl
|
||||
{
|
||||
const struct IPinVtbl * lpVtbl;
|
||||
ULONG refCount;
|
||||
LONG refCount;
|
||||
LPCRITICAL_SECTION pCritSec;
|
||||
PIN_INFO pinInfo;
|
||||
IPin * pConnectedTo;
|
||||
|
|
|
@ -41,7 +41,7 @@ typedef struct _RpcConnection
|
|||
/* don't know what MS's structure looks like */
|
||||
typedef struct _RpcBinding
|
||||
{
|
||||
DWORD refs;
|
||||
LONG refs;
|
||||
struct _RpcBinding* Next;
|
||||
BOOL server;
|
||||
UUID ObjectUuid;
|
||||
|
|
|
@ -117,7 +117,7 @@ static RpcPacket* spacket_head;
|
|||
static RpcPacket* spacket_tail;
|
||||
static HANDLE server_sem;
|
||||
|
||||
static DWORD worker_count, worker_free, worker_tls;
|
||||
static LONG worker_count, worker_free, worker_tls;
|
||||
|
||||
static UUID uuid_nil;
|
||||
|
||||
|
|
|
@ -42,7 +42,7 @@ typedef struct
|
|||
{
|
||||
/* IUnknown fields */
|
||||
const IClassFactoryVtbl *lpVtbl;
|
||||
DWORD ref;
|
||||
LONG ref;
|
||||
} IClassFactoryImpl;
|
||||
|
||||
extern IClassFactoryImpl SHDOCVW_ClassFactory;
|
||||
|
@ -55,7 +55,7 @@ typedef struct
|
|||
{
|
||||
/* IUnknown fields */
|
||||
const IOleObjectVtbl *lpVtbl;
|
||||
DWORD ref;
|
||||
LONG ref;
|
||||
} IOleObjectImpl;
|
||||
|
||||
extern IOleObjectImpl SHDOCVW_OleObject;
|
||||
|
@ -67,7 +67,7 @@ typedef struct
|
|||
{
|
||||
/* IUnknown fields */
|
||||
const IWebBrowserVtbl *lpVtbl;
|
||||
DWORD ref;
|
||||
LONG ref;
|
||||
} IWebBrowserImpl;
|
||||
|
||||
extern IWebBrowserImpl SHDOCVW_WebBrowser;
|
||||
|
@ -80,7 +80,7 @@ typedef struct
|
|||
{
|
||||
/* IUnknown fields */
|
||||
const IProvideClassInfoVtbl *lpVtbl;
|
||||
DWORD ref;
|
||||
LONG ref;
|
||||
} IProvideClassInfoImpl;
|
||||
|
||||
extern IProvideClassInfoImpl SHDOCVW_ProvideClassInfo;
|
||||
|
@ -93,7 +93,7 @@ typedef struct
|
|||
{
|
||||
/* IUnknown fields */
|
||||
const IProvideClassInfo2Vtbl *lpVtbl;
|
||||
DWORD ref;
|
||||
LONG ref;
|
||||
} IProvideClassInfo2Impl;
|
||||
|
||||
extern IProvideClassInfo2Impl SHDOCVW_ProvideClassInfo2;
|
||||
|
@ -106,7 +106,7 @@ typedef struct
|
|||
{
|
||||
/* IUnknown fields */
|
||||
const IPersistStorageVtbl *lpVtbl;
|
||||
DWORD ref;
|
||||
LONG ref;
|
||||
} IPersistStorageImpl;
|
||||
|
||||
extern IPersistStorageImpl SHDOCVW_PersistStorage;
|
||||
|
@ -119,7 +119,7 @@ typedef struct
|
|||
{
|
||||
/* IUnknown fields */
|
||||
const IPersistStreamInitVtbl *lpVtbl;
|
||||
DWORD ref;
|
||||
LONG ref;
|
||||
} IPersistStreamInitImpl;
|
||||
|
||||
extern IPersistStreamInitImpl SHDOCVW_PersistStreamInit;
|
||||
|
@ -132,7 +132,7 @@ typedef struct
|
|||
{
|
||||
/* IUnknown fields */
|
||||
const IQuickActivateVtbl *lpVtbl;
|
||||
DWORD ref;
|
||||
LONG ref;
|
||||
} IQuickActivateImpl;
|
||||
|
||||
extern IQuickActivateImpl SHDOCVW_QuickActivate;
|
||||
|
@ -145,7 +145,7 @@ typedef struct
|
|||
{
|
||||
/* IUnknown fields */
|
||||
const IConnectionPointContainerVtbl *lpVtbl;
|
||||
DWORD ref;
|
||||
LONG ref;
|
||||
} IConnectionPointContainerImpl;
|
||||
|
||||
extern IConnectionPointContainerImpl SHDOCVW_ConnectionPointContainer;
|
||||
|
@ -158,7 +158,7 @@ typedef struct
|
|||
{
|
||||
/* IUnknown fields */
|
||||
const IConnectionPointVtbl *lpVtbl;
|
||||
DWORD ref;
|
||||
LONG ref;
|
||||
} IConnectionPointImpl;
|
||||
|
||||
/**********************************************************************
|
||||
|
|
|
@ -152,7 +152,7 @@ HRESULT WINAPI DllCanUnloadNow(void)
|
|||
*/
|
||||
typedef struct _IBindStatusCallbackImpl {
|
||||
const IBindStatusCallbackVtbl *vtbl;
|
||||
DWORD ref;
|
||||
LONG ref;
|
||||
HWND hDialog;
|
||||
BOOL *pbCancelled;
|
||||
} IBindStatusCallbackImpl;
|
||||
|
|
|
@ -53,7 +53,7 @@ static const SHLWAPI_CLIST SHLWAPI_CLIST_items[] =
|
|||
typedef struct
|
||||
{
|
||||
void* lpVtbl;
|
||||
ULONG ref;
|
||||
LONG ref;
|
||||
int readcalls;
|
||||
BOOL failreadcall;
|
||||
BOOL failreadsize;
|
||||
|
|
|
@ -59,7 +59,7 @@ static void test_create(void)
|
|||
|
||||
typedef struct {
|
||||
const IBindStatusCallbackVtbl *lpVtbl;
|
||||
ULONG ref;
|
||||
LONG ref;
|
||||
IBinding *pbind;
|
||||
IStream *pstr;
|
||||
} statusclb;
|
||||
|
|
|
@ -91,9 +91,9 @@ HINTERNET WINAPI INTERNET_InternetOpenUrlW(LPWININETAPPINFOW hIC, LPCWSTR lpszUr
|
|||
static VOID INTERNET_ExecuteWork(void);
|
||||
|
||||
static DWORD g_dwTlsErrIndex = TLS_OUT_OF_INDEXES;
|
||||
static DWORD dwNumThreads;
|
||||
static DWORD dwNumIdleThreads;
|
||||
static DWORD dwNumJobs;
|
||||
static LONG dwNumThreads;
|
||||
static LONG dwNumIdleThreads;
|
||||
static LONG dwNumJobs;
|
||||
static HANDLE hEventArray[2];
|
||||
#define hQuitEvent hEventArray[0]
|
||||
#define hWorkEvent hEventArray[1]
|
||||
|
|
|
@ -71,7 +71,7 @@ typedef struct {
|
|||
/* data for playing the audio part */
|
||||
HANDLE hWave;
|
||||
HANDLE hEvent; /* for synchronization */
|
||||
DWORD dwEventCount; /* for synchronization */
|
||||
LONG dwEventCount; /* for synchronization */
|
||||
/* data for play back */
|
||||
HWND hWnd, hWndPaint;
|
||||
DWORD dwCachedFrame; /* buffered frame */
|
||||
|
|
|
@ -50,7 +50,7 @@ typedef struct {
|
|||
DWORD dwMciTimeFormat;/* One of the supported MCI_FORMAT_xxxx */
|
||||
DWORD dwPosition; /* position in bytes in chunk */
|
||||
HANDLE hEvent; /* for synchronization */
|
||||
DWORD dwEventCount; /* for synchronization */
|
||||
LONG dwEventCount; /* for synchronization */
|
||||
BOOL bTemporaryFile; /* temporary file (MCI_RECORD) */
|
||||
MMCKINFO ckMainRIFF; /* main RIFF chunk */
|
||||
MMCKINFO ckWaveData; /* data chunk */
|
||||
|
|
|
@ -140,7 +140,7 @@ static HMMIO get_mmioFromProfile(UINT uFlags, LPCWSTR lpszName)
|
|||
struct playsound_data
|
||||
{
|
||||
HANDLE hEvent;
|
||||
DWORD dwEventCount;
|
||||
LONG dwEventCount;
|
||||
};
|
||||
|
||||
static void CALLBACK PlaySound_Callback(HWAVEOUT hwo, UINT uMsg,
|
||||
|
|
|
@ -3039,7 +3039,7 @@ struct IDsDriverImpl
|
|||
{
|
||||
/* IUnknown fields */
|
||||
const IDsDriverVtbl *lpVtbl;
|
||||
DWORD ref;
|
||||
LONG ref;
|
||||
/* IDsDriverImpl fields */
|
||||
UINT wDevID;
|
||||
IDsDriverBufferImpl*primary;
|
||||
|
@ -3049,7 +3049,7 @@ struct IDsDriverBufferImpl
|
|||
{
|
||||
/* IUnknown fields */
|
||||
const IDsDriverBufferVtbl *lpVtbl;
|
||||
DWORD ref;
|
||||
LONG ref;
|
||||
/* IDsDriverBufferImpl fields */
|
||||
IDsDriverImpl* drv;
|
||||
|
||||
|
|
|
@ -132,7 +132,7 @@ typedef struct {
|
|||
DWORD dwThreadID; /* 0C */
|
||||
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 dwSignalCount; /* 18 counter used for signaling */
|
||||
LONG dwSignalCount; /* 18 counter used for signaling */
|
||||
HANDLE hEvent; /* 1C event */
|
||||
HANDLE hVxD; /* 20 return from OpenVxDHandle */
|
||||
DWORD dwStatus; /* 24 0x00, 0x10, 0x20, 0x30 */
|
||||
|
|
|
@ -74,7 +74,7 @@ struct IDsCaptureDriverPropertySetImpl
|
|||
{
|
||||
/* IUnknown fields */
|
||||
const IDsDriverPropertySetVtbl *lpVtbl;
|
||||
DWORD ref;
|
||||
LONG ref;
|
||||
|
||||
IDsCaptureDriverBufferImpl* capture_buffer;
|
||||
};
|
||||
|
@ -83,7 +83,7 @@ struct IDsCaptureDriverNotifyImpl
|
|||
{
|
||||
/* IUnknown fields */
|
||||
const IDsDriverNotifyVtbl *lpVtbl;
|
||||
DWORD ref;
|
||||
LONG ref;
|
||||
|
||||
IDsCaptureDriverBufferImpl* capture_buffer;
|
||||
};
|
||||
|
@ -92,7 +92,7 @@ struct IDsCaptureDriverImpl
|
|||
{
|
||||
/* IUnknown fields */
|
||||
const IDsCaptureDriverVtbl *lpVtbl;
|
||||
DWORD ref;
|
||||
LONG ref;
|
||||
|
||||
/* IDsCaptureDriverImpl fields */
|
||||
UINT wDevID;
|
||||
|
@ -103,7 +103,7 @@ struct IDsCaptureDriverBufferImpl
|
|||
{
|
||||
/* IUnknown fields */
|
||||
const IDsCaptureDriverBufferVtbl *lpVtbl;
|
||||
DWORD ref;
|
||||
LONG ref;
|
||||
|
||||
/* IDsCaptureDriverBufferImpl fields */
|
||||
IDsCaptureDriverImpl* drv;
|
||||
|
|
Loading…
Reference in New Issue