Skip to content

W
wine-winehq
Commit 2d7ea238 authored by Mike McCormack's avatar Mike McCormack Committed by Alexandre Julliard
Browse files
Options

Interlocked LONG* gcc warning fixes.

parent 38ba5fe0
Show whitespace changes
Inline Side-by-side
Showing with 43 additions and 43 deletions
dlls/amstream/amstream.c
View file @ 2d7ea238
......@@ -36,7 +36,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(amstream);
typedef struct {
IAMMultiMediaStream lpVtbl;
ULONG ref;
LONG ref;
} IAMMultiMediaStreamImpl;
static const struct IAMMultiMediaStreamVtbl AM_Vtbl;
......
dlls/amstream/main.c
View file @ 2d7ea238
......@@ -64,7 +64,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;
......
dlls/atl/registrar.c
View file @ 2d7ea238
......@@ -37,7 +37,7 @@
WINE_DEFAULT_DEBUG_CHANNEL(atl);
ULONG dll_count = 0;
LONG dll_count = 0;
/**************************************************************
* ATLRegistrar implementation
......@@ -79,7 +79,7 @@ typedef struct rep_list_str {
typedef struct {
const IRegistrarVtbl *lpVtbl;
ULONG ref;
LONG ref;
rep_list *rep;
} Registrar;
......
dlls/comcat/comcat_main.c
View file @ 2d7ea238
......@@ -24,7 +24,7 @@
WINE_DEFAULT_DEBUG_CHANNEL(ole);
DWORD dll_ref = 0;
LONG dll_ref = 0;
/***********************************************************************
* Global string constant definitions
......
dlls/comcat/comcat_private.h
View file @ 2d7ea238
......@@ -38,7 +38,7 @@
/**********************************************************************
* Dll lifetime tracking declaration for comcat.dll
*/
extern DWORD dll_ref;
extern LONG dll_ref;
/**********************************************************************
* ClassFactory declaration for comcat.dll
......@@ -47,7 +47,7 @@ typedef struct
{
/* IUnknown fields */
const IClassFactoryVtbl *lpVtbl;
DWORD ref;
LONG ref;
} ClassFactoryImpl;
extern ClassFactoryImpl COMCAT_ClassFactory;
......@@ -61,7 +61,7 @@ typedef struct
const IUnknownVtbl *unkVtbl;
const ICatRegisterVtbl *regVtbl;
const ICatInformationVtbl *infVtbl;
DWORD ref;
LONG ref;
} ComCatMgrImpl;
extern const ComCatMgrImpl COMCAT_ComCatMgr;
......
dlls/comcat/information.c
View file @ 2d7ea238
......@@ -298,7 +298,7 @@ const ICatInformationVtbl COMCAT_ICatInformation_Vtbl =
typedef struct
{
const IEnumCATEGORYINFOVtbl *lpVtbl;
DWORD ref;
LONG ref;
LCID lcid;
HKEY key;
DWORD next_index;
......@@ -602,7 +602,7 @@ static HRESULT COMCAT_IsClassOfCategories(
typedef struct
{
const IEnumGUIDVtbl *lpVtbl;
DWORD ref;
LONG ref;
const struct class_categories *categories;
HKEY key;
DWORD next_index;
......@@ -795,7 +795,7 @@ static LPENUMGUID COMCAT_CLSID_IEnumGUID_Construct(
typedef struct
{
const IEnumGUIDVtbl *lpVtbl;
DWORD ref;
LONG ref;
WCHAR keyname[68];
HKEY key;
DWORD next_index;
......
dlls/d3d8/d3d8_private.h
View file @ 2d7ea238
......@@ -342,7 +342,7 @@ struct IDirect3D8Impl
{
/* IUnknown fields */
const IDirect3D8Vtbl *lpVtbl;
DWORD ref;
LONG ref;
/* The WineD3D device */
IWineD3D *WineD3D;
......@@ -395,7 +395,7 @@ struct IDirect3DDevice8Impl
{
/* IUnknown fields */
const IDirect3DDevice8Vtbl *lpVtbl;
DWORD ref;
LONG ref;
/* IDirect3DDevice8 fields */
IDirect3D8Impl *direct3d8;
......@@ -590,7 +590,7 @@ struct IDirect3DVolume8Impl
{
/* IUnknown fields */
const IDirect3DVolume8Vtbl *lpVtbl;
DWORD ref;
LONG ref;
/* IDirect3DVolume8 fields */
IDirect3DDevice8Impl *Device;
......@@ -644,7 +644,7 @@ struct IDirect3DSwapChain8Impl
{
/* IUnknown fields */
const IDirect3DSwapChain8Vtbl *lpVtbl;
DWORD ref;
LONG ref;
/* IDirect3DSwapChain8 fields */
IDirect3DSurface8Impl *frontBuffer;
......@@ -686,7 +686,7 @@ struct IDirect3DSurface8Impl
{
/* IUnknown fields */
const IDirect3DSurface8Vtbl *lpVtbl;
DWORD ref;
LONG ref;
/* IDirect3DSurface8 fields */
IDirect3DDevice8Impl *Device;
......@@ -746,7 +746,7 @@ struct IDirect3DResource8Impl
{
/* IUnknown fields */
const IDirect3DResource8Vtbl *lpVtbl;
DWORD ref;
LONG ref;
/* IDirect3DResource8 fields */
IDirect3DDevice8Impl *Device;
......@@ -788,7 +788,7 @@ struct IDirect3DVertexBuffer8Impl
{
/* IUnknown fields */
const IDirect3DVertexBuffer8Vtbl *lpVtbl;
DWORD ref;
LONG ref;
/* IDirect3DResource8 fields */
IDirect3DDevice8Impl *Device;
......@@ -836,7 +836,7 @@ struct IDirect3DIndexBuffer8Impl
{
/* IUnknown fields */
const IDirect3DIndexBuffer8Vtbl *lpVtbl;
DWORD ref;
LONG ref;
/* IDirect3DResource8 fields */
IDirect3DDevice8Impl *Device;
......@@ -879,7 +879,7 @@ struct IDirect3DBaseTexture8Impl
{
/* IUnknown fields */
const IDirect3DBaseTexture8Vtbl *lpVtbl;
DWORD ref;
LONG ref;
/* IDirect3DResource8 fields */
IDirect3DDevice8Impl *Device;
......@@ -936,7 +936,7 @@ struct IDirect3DCubeTexture8Impl
{
/* IUnknown fields */
const IDirect3DCubeTexture8Vtbl *lpVtbl;
DWORD ref;
LONG ref;
/* IDirect3DResource8 fields */
IDirect3DDevice8Impl *Device;
......@@ -998,7 +998,7 @@ struct IDirect3DTexture8Impl
{
/* IUnknown fields */
const IDirect3DTexture8Vtbl *lpVtbl;
DWORD ref;
LONG ref;
/* IDirect3DResourc8 fields */
IDirect3DDevice8Impl *Device;
......@@ -1061,7 +1061,7 @@ struct IDirect3DVolumeTexture8Impl
{
/* IUnknown fields */
const IDirect3DVolumeTexture8Vtbl *lpVtbl;
DWORD ref;
LONG ref;
/* IDirect3DResource8 fields */
IDirect3DDevice8Impl *Device;
......@@ -1149,7 +1149,7 @@ typedef struct SAVEDSTATES {
struct IDirect3DStateBlockImpl {
/* IUnknown fields */
/*const IDirect3DStateBlock9Vtbl *lpVtbl;*/
DWORD ref;
LONG ref;
/* The device, to be replaced by an IDirect3DDeviceImpl */
IDirect3DDevice8Impl* device;
......@@ -1238,7 +1238,7 @@ extern HRESULT WINAPI IDirect3DDeviceImpl_CaptureStateBlock(IDirect3DDevice8Impl
struct IDirect3DVertexShaderDeclarationImpl {
/* IUnknown fields */
/*const IDirect3DVertexShaderDeclaration9Vtbl *lpVtbl;*/
DWORD ref;
LONG ref;
/* The device, to be replaced by an IDirect3DDeviceImpl */
IDirect3DDevice8Impl* device;
......@@ -1274,7 +1274,7 @@ extern HRESULT WINAPI IDirect3DDeviceImpl_CreateVertexShaderDeclaration8(IDirect
*/
struct IDirect3DVertexShaderImpl {
/*const IDirect3DVertexShader9Vtbl *lpVtbl;*/
DWORD ref;
LONG ref;
/* The device, to be replaced by an IDirect3DDeviceImpl */
IDirect3DDevice8Impl* device;
......@@ -1323,7 +1323,7 @@ extern HRESULT WINAPI IDirect3DDeviceImpl_FillVertexShaderInputArbHW(IDirect3DDe
*/
struct IDirect3DPixelShaderImpl {
/*const IDirect3DPixelShader9Vtbl *lpVtbl;*/
DWORD ref;
LONG ref;
/* The device, to be replaced by an IDirect3DDeviceImpl */
IDirect3DDevice8Impl* device;
......
dlls/d3dx8/d3dx8core_private.h
View file @ 2d7ea238
......@@ -47,7 +47,7 @@ struct ID3DXBufferImpl
{
/* IUnknown fields */
const ID3DXBufferVtbl *lpVtbl;
DWORD ref;
LONG ref;
/* ID3DXBuffer fields */
DWORD *buffer;
......@@ -79,7 +79,7 @@ struct ID3DXFontImpl
{
/* IUnknown fields */
const ID3DXFontVtbl *lpVtbl;
DWORD ref;
LONG ref;
/* ID3DXFont fields */
};
......
dlls/ddraw/d3d_private.h
View file @ 2d7ea238
......@@ -67,7 +67,7 @@ typedef struct STATEBLOCK {
struct IDirect3DLightImpl
{
ICOM_VFIELD_MULTI(IDirect3DLight);
DWORD ref;
LONG ref;
/* IDirect3DLight fields */
IDirectDrawImpl *d3d;
/* If this light is active for one viewport, put the viewport here */
......@@ -95,7 +95,7 @@ struct IDirect3DMaterialImpl
ICOM_VFIELD_MULTI(IDirect3DMaterial3);
ICOM_VFIELD_MULTI(IDirect3DMaterial2);
ICOM_VFIELD_MULTI(IDirect3DMaterial);
DWORD ref;
LONG ref;
/* IDirect3DMaterial2 fields */
IDirectDrawImpl *d3d;
IDirect3DDeviceImpl *active_device;
......@@ -111,7 +111,7 @@ struct IDirect3DMaterialImpl
struct IDirect3DViewportImpl
{
ICOM_VFIELD_MULTI(IDirect3DViewport3);
DWORD ref;
LONG ref;
/* IDirect3DViewport fields */
IDirectDrawImpl *d3d;
/* If this viewport is active for one device, put the device here */
......@@ -145,7 +145,7 @@ struct IDirect3DViewportImpl
struct IDirect3DExecuteBufferImpl
{
ICOM_VFIELD_MULTI(IDirect3DExecuteBuffer);
DWORD ref;
LONG ref;
/* IDirect3DExecuteBuffer fields */
IDirectDrawImpl *d3d;
IDirect3DDeviceImpl* d3ddev;
......@@ -195,7 +195,7 @@ struct IDirect3DDeviceImpl
ICOM_VFIELD_MULTI(IDirect3DDevice3);
ICOM_VFIELD_MULTI(IDirect3DDevice2);
ICOM_VFIELD_MULTI(IDirect3DDevice);
DWORD ref;
LONG ref;
/* Version of the Direct3D object from which the device has been created */
DWORD version;
......@@ -260,7 +260,7 @@ struct IDirect3DVertexBufferImpl
{
ICOM_VFIELD_MULTI(IDirect3DVertexBuffer7);
ICOM_VFIELD_MULTI(IDirect3DVertexBuffer);
DWORD ref;
LONG ref;
IDirectDrawImpl *d3d;
D3DVERTEXBUFFERDESC desc;
LPVOID *vertices;
......
dlls/ddraw/ddraw_private.h
View file @ 2d7ea238
......@@ -86,7 +86,7 @@ struct IDirectDrawImpl
ICOM_VFIELD_MULTI(IDirect3D2);
ICOM_VFIELD_MULTI(IDirect3D);
DWORD ref;
LONG ref;
/* TRUE if created via DirectDrawCreateEx or CoCreateInstance,
* FALSE if created via DirectDrawCreate. */
......@@ -198,7 +198,7 @@ struct IDirectDrawPaletteImpl
{
/* IUnknown fields */
ICOM_VFIELD_MULTI(IDirectDrawPalette);
DWORD ref;
LONG ref;
DDRAWI_DDRAWPALETTE_LCL local;
DDRAWI_DDRAWPALETTE_GBL global;
......@@ -226,7 +226,7 @@ struct IDirectDrawClipperImpl
{
/* IUnknown fields */
ICOM_VFIELD_MULTI(IDirectDrawClipper);
DWORD ref;
LONG ref;
/* IDirectDrawClipper fields */
HWND hWnd;
......@@ -248,7 +248,7 @@ struct IDirectDrawSurfaceImpl
ICOM_VFIELD_MULTI(IDirectDrawGammaControl);
ICOM_VFIELD_MULTI(IDirect3DTexture2);
ICOM_VFIELD_MULTI(IDirect3DTexture);
DWORD ref;
LONG ref;
struct IDirectDrawSurfaceImpl* attached; /* attached surfaces */
......
dlls/ddraw/main.c
View file @ 2d7ea238
......@@ -450,7 +450,7 @@ static HRESULT DDRAW_CreateDirectDraw(IUnknown* pUnkOuter, REFIID iid,
typedef struct {
ICOM_VFIELD_MULTI(IClassFactory);
DWORD ref;
LONG ref;
HRESULT (*pfnCreateInstance)(IUnknown *pUnkOuter, REFIID iid,
LPVOID *ppObj);
} IClassFactoryImpl;
......
dlls/devenum/devenum_private.h
View file @ 2d7ea238
......@@ -69,7 +69,7 @@ typedef struct
typedef struct
{
const IEnumMonikerVtbl *lpVtbl;
DWORD ref;
LONG ref;
DWORD index;
HKEY hkey;
} EnumMonikerImpl;
......@@ -77,7 +77,7 @@ typedef struct
typedef struct
{
const IMonikerVtbl *lpVtbl;
ULONG ref;
LONG ref;
HKEY hkey;
} MediaCatMoniker;
......
dlls/devenum/mediacatenum.c
View file @ 2d7ea238
......@@ -41,7 +41,7 @@ static ULONG WINAPI DEVENUM_IPropertyBag_AddRef(LPPROPERTYBAG iface);
typedef struct
{
const IPropertyBagVtbl *lpVtbl;
DWORD ref;
LONG ref;
HKEY hkey;
} RegPropBagImpl;
......
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