ReceiveTempSMS/Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Get rid of the non-standard ICOM_VFIELD macro.

Browse Source
This commit is contained in:
Alexandre Julliard 2004-08-12 19:52:49 +00:00
parent 616940eb9a
commit 0467ce9fd7
90 changed files with 238 additions and 239 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/avifil32/acmstream.c
View File

@ -74,7 +74,7 @@ struct ICOM_VTABLE(IAVIStream) iacmst = {
typedef struct _IAVIStreamImpl { typedef struct _IAVIStreamImpl {
/* IUnknown stuff */ /* IUnknown stuff */
ICOM_VFIELD(IAVIStream); IAVIStreamVtbl *lpVtbl;
DWORD ref; DWORD ref;
/* IAVIStream stuff */ /* IAVIStream stuff */

6
dlls/avifil32/avifile.c
View File

@ -143,7 +143,7 @@ typedef struct _IAVIFileImpl IAVIFileImpl;
typedef struct _IPersistFileImpl { typedef struct _IPersistFileImpl {
/* IUnknown stuff */ /* IUnknown stuff */
ICOM_VFIELD(IPersistFile); IPersistFileVtbl *lpVtbl;
/* IPersistFile stuff */ /* IPersistFile stuff */
IAVIFileImpl *paf; IAVIFileImpl *paf;
@ -151,7 +151,7 @@ typedef struct _IPersistFileImpl {
typedef struct _IAVIStreamImpl { typedef struct _IAVIStreamImpl {
/* IUnknown stuff */ /* IUnknown stuff */
ICOM_VFIELD(IAVIStream); IAVIStreamVtbl *lpVtbl;
DWORD ref; DWORD ref;
/* IAVIStream stuff */ /* IAVIStream stuff */
@ -180,7 +180,7 @@ typedef struct _IAVIStreamImpl {
struct _IAVIFileImpl { struct _IAVIFileImpl {
/* IUnknown stuff */ /* IUnknown stuff */
ICOM_VFIELD(IAVIFile); IAVIFileVtbl *lpVtbl;
DWORD ref; DWORD ref;
/* IAVIFile stuff... */ /* IAVIFile stuff... */

6
dlls/avifil32/editstream.c
View File

@ -146,7 +146,7 @@ typedef struct _IAVIEditStreamImpl IAVIEditStreamImpl;
typedef struct _IEditAVIStreamImpl { typedef struct _IEditAVIStreamImpl {
/* IUnknown stuff */ /* IUnknown stuff */
ICOM_VFIELD(IAVIStream); IAVIStreamVtbl *lpVtbl;
/* IAVIStream stuff */ /* IAVIStream stuff */
IAVIEditStreamImpl *pae; IAVIEditStreamImpl *pae;
@ -154,7 +154,7 @@ typedef struct _IEditAVIStreamImpl {
typedef struct _IEditStreamInternalImpl { typedef struct _IEditStreamInternalImpl {
/* IUnknown stuff */ /* IUnknown stuff */
ICOM_VFIELD(IEditStreamInternal); IEditStreamInternalVtbl *lpVtbl;
/* IEditStreamInternal stuff */ /* IEditStreamInternal stuff */
IAVIEditStreamImpl *pae; IAVIEditStreamImpl *pae;
@ -162,7 +162,7 @@ typedef struct _IEditStreamInternalImpl {
struct _IAVIEditStreamImpl { struct _IAVIEditStreamImpl {
/* IUnknown stuff */ /* IUnknown stuff */
ICOM_VFIELD(IAVIEditStream); IAVIEditStreamVtbl *lpVtbl;
DWORD ref; DWORD ref;
/* IAVIEditStream stuff */ /* IAVIEditStream stuff */

2
dlls/avifil32/factory.c
View File

@ -60,7 +60,7 @@ static ICOM_VTABLE(IClassFactory) iclassfact = {
typedef struct typedef struct
{ {
/* IUnknown fields */ /* IUnknown fields */
ICOM_VFIELD(IClassFactory); IClassFactoryVtbl *lpVtbl;
DWORD dwRef; DWORD dwRef;
CLSID clsid; CLSID clsid;

2
dlls/avifil32/getframe.c
View File

@ -67,7 +67,7 @@ struct ICOM_VTABLE(IGetFrame) igetframeVtbl = {
typedef struct _IGetFrameImpl { typedef struct _IGetFrameImpl {
/* IUnknown stuff */ /* IUnknown stuff */
ICOM_VFIELD(IGetFrame); IGetFrameVtbl *lpVtbl;
DWORD ref; DWORD ref;
/* IGetFrame stuff */ /* IGetFrame stuff */

2
dlls/avifil32/icmstream.c
View File

@ -77,7 +77,7 @@ struct ICOM_VTABLE(IAVIStream) iicmst = {
typedef struct _IAVIStreamImpl { typedef struct _IAVIStreamImpl {
/* IUnknown stuff */ /* IUnknown stuff */
ICOM_VFIELD(IAVIStream); IAVIStreamVtbl *lpVtbl;
DWORD ref; DWORD ref;
/* IAVIStream stuff */ /* IAVIStream stuff */

2
dlls/avifil32/tmpfile.c
View File

@ -66,7 +66,7 @@ struct ICOM_VTABLE(IAVIFile) itmpft = {
typedef struct _ITmpFileImpl { typedef struct _ITmpFileImpl {
/* IUnknown stuff */ /* IUnknown stuff */
ICOM_VFIELD(IAVIFile); IAVIFileVtbl *lpVtbl;
DWORD ref; DWORD ref;
/* IAVIFile stuff */ /* IAVIFile stuff */

6
dlls/avifil32/wavfile.c
View File

@ -173,7 +173,7 @@ typedef struct _IAVIFileImpl IAVIFileImpl;
typedef struct _IPersistFileImpl { typedef struct _IPersistFileImpl {
/* IUnknown stuff */ /* IUnknown stuff */
ICOM_VFIELD(IPersistFile); IPersistFileVtbl *lpVtbl;
/* IPersistFile stuff */ /* IPersistFile stuff */
IAVIFileImpl *paf; IAVIFileImpl *paf;
@ -181,7 +181,7 @@ typedef struct _IPersistFileImpl {
typedef struct _IAVIStreamImpl { typedef struct _IAVIStreamImpl {
/* IUnknown stuff */ /* IUnknown stuff */
ICOM_VFIELD(IAVIStream); IAVIStreamVtbl *lpVtbl;
/* IAVIStream stuff */ /* IAVIStream stuff */
IAVIFileImpl *paf; IAVIFileImpl *paf;
@ -189,7 +189,7 @@ typedef struct _IAVIStreamImpl {
struct _IAVIFileImpl { struct _IAVIFileImpl {
/* IUnknown stuff */ /* IUnknown stuff */
ICOM_VFIELD(IAVIFile); IAVIFileVtbl *lpVtbl;
DWORD ref; DWORD ref;
/* IAVIFile, IAVIStream stuff... */ /* IAVIFile, IAVIStream stuff... */

2
dlls/comcat/comcat_private.h
View File

@ -42,7 +42,7 @@ extern DWORD dll_ref;
typedef struct typedef struct
{ {
/* IUnknown fields */ /* IUnknown fields */
ICOM_VFIELD(IClassFactory); IClassFactoryVtbl *lpVtbl;
DWORD ref; DWORD ref;
} ClassFactoryImpl; } ClassFactoryImpl;

6
dlls/comcat/information.c
View File

@ -298,7 +298,7 @@ ICOM_VTABLE(ICatInformation) COMCAT_ICatInformation_Vtbl =
*/ */
typedef struct typedef struct
{ {
ICOM_VFIELD(IEnumCATEGORYINFO); IEnumCATEGORYINFOVtbl *lpVtbl;
DWORD ref; DWORD ref;
LCID lcid; LCID lcid;
HKEY key; HKEY key;
@ -601,7 +601,7 @@ static HRESULT COMCAT_IsClassOfCategories(
*/ */
typedef struct typedef struct
{ {
ICOM_VFIELD(IEnumGUID); IEnumGUIDVtbl *lpVtbl;
DWORD ref; DWORD ref;
struct class_categories const *categories; struct class_categories const *categories;
HKEY key; HKEY key;
@ -794,7 +794,7 @@ static LPENUMGUID COMCAT_CLSID_IEnumGUID_Construct(
*/ */
typedef struct typedef struct
{ {
ICOM_VFIELD(IEnumGUID); IEnumGUIDVtbl *lpVtbl;
DWORD ref; DWORD ref;
WCHAR keyname[68]; WCHAR keyname[68];
HKEY key; HKEY key;

32
dlls/d3d8/d3d8_private.h
View File

@ -281,7 +281,7 @@ extern ICOM_VTABLE(IDirect3D8) Direct3D8_Vtbl;
struct IDirect3D8Impl struct IDirect3D8Impl
{ {
/* IUnknown fields */ /* IUnknown fields */
ICOM_VFIELD(IDirect3D8); IDirect3D8Vtbl *lpVtbl;
DWORD ref; DWORD ref;
/* IDirect3D8 fields */ /* IDirect3D8 fields */
@ -331,7 +331,7 @@ extern ICOM_VTABLE(IDirect3DDevice8) Direct3DDevice8_Vtbl;
struct IDirect3DDevice8Impl struct IDirect3DDevice8Impl
{ {
/* IUnknown fields */ /* IUnknown fields */
ICOM_VFIELD(IDirect3DDevice8); IDirect3DDevice8Vtbl *lpVtbl;
DWORD ref; DWORD ref;
/* IDirect3DDevice8 fields */ /* IDirect3DDevice8 fields */
@ -525,7 +525,7 @@ extern ICOM_VTABLE(IDirect3DVolume8) Direct3DVolume8_Vtbl;
struct IDirect3DVolume8Impl struct IDirect3DVolume8Impl
{ {
/* IUnknown fields */ /* IUnknown fields */
ICOM_VFIELD(IDirect3DVolume8); IDirect3DVolume8Vtbl *lpVtbl;
DWORD ref; DWORD ref;
/* IDirect3DVolume8 fields */ /* IDirect3DVolume8 fields */
@ -579,7 +579,7 @@ extern ICOM_VTABLE(IDirect3DSwapChain8) Direct3DSwapChain8_Vtbl;
struct IDirect3DSwapChain8Impl struct IDirect3DSwapChain8Impl
{ {
/* IUnknown fields */ /* IUnknown fields */
ICOM_VFIELD(IDirect3DSwapChain8); IDirect3DSwapChain8Vtbl *lpVtbl;
DWORD ref; DWORD ref;
/* IDirect3DSwapChain8 fields */ /* IDirect3DSwapChain8 fields */
@ -618,7 +618,7 @@ extern ICOM_VTABLE(IDirect3DSurface8) Direct3DSurface8_Vtbl;
struct IDirect3DSurface8Impl struct IDirect3DSurface8Impl
{ {
/* IUnknown fields */ /* IUnknown fields */
ICOM_VFIELD(IDirect3DSurface8); IDirect3DSurface8Vtbl *lpVtbl;
DWORD ref; DWORD ref;
/* IDirect3DSurface8 fields */ /* IDirect3DSurface8 fields */
@ -676,7 +676,7 @@ extern ICOM_VTABLE(IDirect3DResource8) Direct3DResource8_Vtbl;
struct IDirect3DResource8Impl struct IDirect3DResource8Impl
{ {
/* IUnknown fields */ /* IUnknown fields */
ICOM_VFIELD(IDirect3DResource8); IDirect3DResource8Vtbl *lpVtbl;
DWORD ref; DWORD ref;
/* IDirect3DResource8 fields */ /* IDirect3DResource8 fields */
@ -718,7 +718,7 @@ extern ICOM_VTABLE(IDirect3DVertexBuffer8) Direct3DVertexBuffer8_Vtbl;
struct IDirect3DVertexBuffer8Impl struct IDirect3DVertexBuffer8Impl
{ {
/* IUnknown fields */ /* IUnknown fields */
ICOM_VFIELD(IDirect3DVertexBuffer8); IDirect3DVertexBuffer8Vtbl *lpVtbl;
DWORD ref; DWORD ref;
/* IDirect3DResource8 fields */ /* IDirect3DResource8 fields */
@ -766,7 +766,7 @@ extern ICOM_VTABLE(IDirect3DIndexBuffer8) Direct3DIndexBuffer8_Vtbl;
struct IDirect3DIndexBuffer8Impl struct IDirect3DIndexBuffer8Impl
{ {
/* IUnknown fields */ /* IUnknown fields */
ICOM_VFIELD(IDirect3DIndexBuffer8); IDirect3DIndexBuffer8Vtbl *lpVtbl;
DWORD ref; DWORD ref;
/* IDirect3DResource8 fields */ /* IDirect3DResource8 fields */
@ -814,7 +814,7 @@ extern ICOM_VTABLE(IDirect3DBaseTexture8) Direct3DBaseTexture8_Vtbl;
struct IDirect3DBaseTexture8Impl struct IDirect3DBaseTexture8Impl
{ {
/* IUnknown fields */ /* IUnknown fields */
ICOM_VFIELD(IDirect3DBaseTexture8); IDirect3DBaseTexture8Vtbl *lpVtbl;
DWORD ref; DWORD ref;
/* IDirect3DResource8 fields */ /* IDirect3DResource8 fields */
@ -871,7 +871,7 @@ extern ICOM_VTABLE(IDirect3DCubeTexture8) Direct3DCubeTexture8_Vtbl;
struct IDirect3DCubeTexture8Impl struct IDirect3DCubeTexture8Impl
{ {
/* IUnknown fields */ /* IUnknown fields */
ICOM_VFIELD(IDirect3DCubeTexture8); IDirect3DCubeTexture8Vtbl *lpVtbl;
DWORD ref; DWORD ref;
/* IDirect3DResource8 fields */ /* IDirect3DResource8 fields */
@ -933,7 +933,7 @@ extern ICOM_VTABLE(IDirect3DTexture8) Direct3DTexture8_Vtbl;
struct IDirect3DTexture8Impl struct IDirect3DTexture8Impl
{ {
/* IUnknown fields */ /* IUnknown fields */
ICOM_VFIELD(IDirect3DTexture8); IDirect3DTexture8Vtbl *lpVtbl;
DWORD ref; DWORD ref;
/* IDirect3DResourc8 fields */ /* IDirect3DResourc8 fields */
@ -996,7 +996,7 @@ extern ICOM_VTABLE(IDirect3DVolumeTexture8) Direct3DVolumeTexture8_Vtbl;
struct IDirect3DVolumeTexture8Impl struct IDirect3DVolumeTexture8Impl
{ {
/* IUnknown fields */ /* IUnknown fields */
ICOM_VFIELD(IDirect3DVolumeTexture8); IDirect3DVolumeTexture8Vtbl *lpVtbl;
DWORD ref; DWORD ref;
/* IDirect3DResource8 fields */ /* IDirect3DResource8 fields */
@ -1084,7 +1084,7 @@ typedef struct SAVEDSTATES {
*/ */
struct IDirect3DStateBlockImpl { struct IDirect3DStateBlockImpl {
/* IUnknown fields */ /* IUnknown fields */
/*ICOM_VFIELD(IDirect3DStateBlock9);*/ /*IDirect3DStateBlock9Vtbl *lpVtbl;*/
DWORD ref; DWORD ref;
/* The device, to be replaced by a IDirect3DDeviceImpl */ /* The device, to be replaced by a IDirect3DDeviceImpl */
@ -1173,7 +1173,7 @@ extern HRESULT WINAPI IDirect3DDeviceImpl_CaptureStateBlock(IDirect3DDevice8Impl
*/ */
struct IDirect3DVertexShaderDeclarationImpl { struct IDirect3DVertexShaderDeclarationImpl {
/* IUnknown fields */ /* IUnknown fields */
/*ICOM_VFIELD(IDirect3DVertexShaderDeclaration9);*/ /*IDirect3DVertexShaderDeclaration9Vtbl *lpVtbl;*/
DWORD ref; DWORD ref;
/* The device, to be replaced by a IDirect3DDeviceImpl */ /* The device, to be replaced by a IDirect3DDeviceImpl */
@ -1209,7 +1209,7 @@ extern HRESULT WINAPI IDirect3DDeviceImpl_CreateVertexShaderDeclaration8(IDirect
* IDirect3DVertexShader implementation structure * IDirect3DVertexShader implementation structure
*/ */
struct IDirect3DVertexShaderImpl { struct IDirect3DVertexShaderImpl {
/*ICOM_VFIELD(IDirect3DVertexShader9);*/ /*IDirect3DVertexShader9Vtbl *lpVtbl;*/
DWORD ref; DWORD ref;
/* The device, to be replaced by a IDirect3DDeviceImpl */ /* The device, to be replaced by a IDirect3DDeviceImpl */
@ -1258,7 +1258,7 @@ extern HRESULT WINAPI IDirect3DDeviceImpl_FillVertexShaderInputArbHW(IDirect3DDe
* IDirect3DPixelShader implementation structure * IDirect3DPixelShader implementation structure
*/ */
struct IDirect3DPixelShaderImpl { struct IDirect3DPixelShaderImpl {
/*ICOM_VFIELD(IDirect3DPixelShader9);*/ /*IDirect3DPixelShader9Vtbl *lpVtbl;*/
DWORD ref; DWORD ref;
/* The device, to be replaced by a IDirect3DDeviceImpl */ /* The device, to be replaced by a IDirect3DDeviceImpl */

34
dlls/d3d9/d3d9_private.h
View File

@ -177,7 +177,7 @@ extern ICOM_VTABLE(IDirect3D9) Direct3D9_Vtbl;
struct IDirect3D9Impl struct IDirect3D9Impl
{ {
/* IUnknown fields */ /* IUnknown fields */
ICOM_VFIELD(IDirect3D9); IDirect3D9Vtbl *lpVtbl;
DWORD ref; DWORD ref;
/* IDirect3D9 fields */ /* IDirect3D9 fields */
@ -222,7 +222,7 @@ extern ICOM_VTABLE(IDirect3DDevice9) Direct3DDevice9_Vtbl;
struct IDirect3DDevice9Impl struct IDirect3DDevice9Impl
{ {
/* IUnknown fields */ /* IUnknown fields */
ICOM_VFIELD(IDirect3DDevice9); IDirect3DDevice9Vtbl *lpVtbl;
DWORD ref; DWORD ref;
/* IDirect3DDevice9 fields */ /* IDirect3DDevice9 fields */
@ -427,7 +427,7 @@ extern ICOM_VTABLE(IDirect3DVolume9) Direct3DVolume9_Vtbl;
struct IDirect3DVolume9Impl struct IDirect3DVolume9Impl
{ {
/* IUnknown fields */ /* IUnknown fields */
ICOM_VFIELD(IDirect3DVolume9); IDirect3DVolume9Vtbl *lpVtbl;
DWORD ref; DWORD ref;
/* IDirect3DVolume9 fields */ /* IDirect3DVolume9 fields */
@ -478,7 +478,7 @@ extern ICOM_VTABLE(IDirect3DSwapChain9) Direct3DSwapChain9_Vtbl;
struct IDirect3DSwapChain9Impl struct IDirect3DSwapChain9Impl
{ {
/* IUnknown fields */ /* IUnknown fields */
ICOM_VFIELD(IDirect3DSwapChain9); IDirect3DSwapChain9Vtbl *lpVtbl;
DWORD ref; DWORD ref;
/* IDirect3DSwapChain9 fields */ /* IDirect3DSwapChain9 fields */
@ -519,7 +519,7 @@ extern ICOM_VTABLE(IDirect3DResource9) Direct3DResource9_Vtbl;
struct IDirect3DResource9Impl struct IDirect3DResource9Impl
{ {
/* IUnknown fields */ /* IUnknown fields */
ICOM_VFIELD(IDirect3DResource9); IDirect3DResource9Vtbl *lpVtbl;
DWORD ref; DWORD ref;
/* IDirect3DResource9 fields */ /* IDirect3DResource9 fields */
@ -558,7 +558,7 @@ extern ICOM_VTABLE(IDirect3DSurface9) Direct3DSurface9_Vtbl;
struct IDirect3DSurface9Impl struct IDirect3DSurface9Impl
{ {
/* IUnknown fields */ /* IUnknown fields */
ICOM_VFIELD(IDirect3DSurface9); IDirect3DSurface9Vtbl *lpVtbl;
DWORD ref; DWORD ref;
/* IDirect3DResource9 fields */ /* IDirect3DResource9 fields */
@ -618,7 +618,7 @@ extern ICOM_VTABLE(IDirect3DVertexBuffer9) Direct3DVertexBuffer9_Vtbl;
struct IDirect3DVertexBuffer9Impl struct IDirect3DVertexBuffer9Impl
{ {
/* IUnknown fields */ /* IUnknown fields */
ICOM_VFIELD(IDirect3DVertexBuffer9); IDirect3DVertexBuffer9Vtbl *lpVtbl;
DWORD ref; DWORD ref;
/* IDirect3DResource9 fields */ /* IDirect3DResource9 fields */
@ -666,7 +666,7 @@ extern ICOM_VTABLE(IDirect3DIndexBuffer9) Direct3DIndexBuffer9_Vtbl;
struct IDirect3DIndexBuffer9Impl struct IDirect3DIndexBuffer9Impl
{ {
/* IUnknown fields */ /* IUnknown fields */
ICOM_VFIELD(IDirect3DIndexBuffer9); IDirect3DIndexBuffer9Vtbl *lpVtbl;
DWORD ref; DWORD ref;
/* IDirect3DResource9 fields */ /* IDirect3DResource9 fields */
@ -714,7 +714,7 @@ extern ICOM_VTABLE(IDirect3DBaseTexture9) Direct3DBaseTexture9_Vtbl;
struct IDirect3DBaseTexture9Impl struct IDirect3DBaseTexture9Impl
{ {
/* IUnknown fields */ /* IUnknown fields */
ICOM_VFIELD(IDirect3DBaseTexture9); IDirect3DBaseTexture9Vtbl *lpVtbl;
DWORD ref; DWORD ref;
/* IDirect3DResource9 fields */ /* IDirect3DResource9 fields */
@ -766,7 +766,7 @@ extern ICOM_VTABLE(IDirect3DCubeTexture9) Direct3DCubeTexture9_Vtbl;
struct IDirect3DCubeTexture9Impl struct IDirect3DCubeTexture9Impl
{ {
/* IUnknown fields */ /* IUnknown fields */
ICOM_VFIELD(IDirect3DCubeTexture9); IDirect3DCubeTexture9Vtbl *lpVtbl;
DWORD ref; DWORD ref;
/* IDirect3DResource9 fields */ /* IDirect3DResource9 fields */
@ -830,7 +830,7 @@ extern ICOM_VTABLE(IDirect3DTexture9) Direct3DTexture9_Vtbl;
struct IDirect3DTexture9Impl struct IDirect3DTexture9Impl
{ {
/* IUnknown fields */ /* IUnknown fields */
ICOM_VFIELD(IDirect3DTexture9); IDirect3DTexture9Vtbl *lpVtbl;
DWORD ref; DWORD ref;
/* IDirect3DResource9 fields */ /* IDirect3DResource9 fields */
@ -895,7 +895,7 @@ extern ICOM_VTABLE(IDirect3DVolumeTexture9) Direct3DVolumeTexture9_Vtbl;
struct IDirect3DVolumeTexture9Impl struct IDirect3DVolumeTexture9Impl
{ {
/* IUnknown fields */ /* IUnknown fields */
ICOM_VFIELD(IDirect3DVolumeTexture9); IDirect3DVolumeTexture9Vtbl *lpVtbl;
DWORD ref; DWORD ref;
/* IDirect3DResource9 fields */ /* IDirect3DResource9 fields */
@ -960,7 +960,7 @@ extern ICOM_VTABLE(IDirect3DStateBlock9) Direct3DStateBlock9_Vtbl;
*/ */
struct IDirect3DStateBlock9Impl { struct IDirect3DStateBlock9Impl {
/* IUnknown fields */ /* IUnknown fields */
ICOM_VFIELD(IDirect3DStateBlock9); IDirect3DStateBlock9Vtbl *lpVtbl;
DWORD ref; DWORD ref;
/* IDirect3DStateBlock9 fields */ /* IDirect3DStateBlock9 fields */
@ -1058,7 +1058,7 @@ extern ICOM_VTABLE(IDirect3DVertexDeclaration9) Direct3DVertexDeclaration9_Vtbl;
*/ */
struct IDirect3DVertexDeclaration9Impl { struct IDirect3DVertexDeclaration9Impl {
/* IUnknown fields */ /* IUnknown fields */
ICOM_VFIELD(IDirect3DVertexDeclaration9); IDirect3DVertexDeclaration9Vtbl *lpVtbl;
DWORD ref; DWORD ref;
/* IDirect3DVertexDeclaration9 fields */ /* IDirect3DVertexDeclaration9 fields */
@ -1097,7 +1097,7 @@ extern ICOM_VTABLE(IDirect3DVertexShader9) Direct3DVertexShader9_Vtbl;
*/ */
struct IDirect3DVertexShader9Impl { struct IDirect3DVertexShader9Impl {
/* IUnknown fields */ /* IUnknown fields */
ICOM_VFIELD(IDirect3DVertexShader9); IDirect3DVertexShader9Vtbl *lpVtbl;
DWORD ref; DWORD ref;
/* IDirect3DVertexDeclaration9 fields */ /* IDirect3DVertexDeclaration9 fields */
@ -1139,7 +1139,7 @@ extern ICOM_VTABLE(IDirect3DPixelShader9) Direct3DPixelShader9_Vtbl;
*/ */
struct IDirect3DPixelShader9Impl { struct IDirect3DPixelShader9Impl {
/* IUnknown fields */ /* IUnknown fields */
ICOM_VFIELD(IDirect3DPixelShader9); IDirect3DPixelShader9Vtbl *lpVtbl;
DWORD ref; DWORD ref;
/* IDirect3DPixelShader9 fields */ /* IDirect3DPixelShader9 fields */
@ -1180,7 +1180,7 @@ extern ICOM_VTABLE(IDirect3DQuery9) Direct3DQuery9_Vtbl;
*/ */
struct IDirect3DQuery9Impl { struct IDirect3DQuery9Impl {
/* IUnknown fields */ /* IUnknown fields */
ICOM_VFIELD(IDirect3DQuery9); IDirect3DQuery9Vtbl *lpVtbl;
DWORD ref; DWORD ref;
/* IDirect3DQuery9 fields */ /* IDirect3DQuery9 fields */

4
dlls/d3dx8/d3dx8core_private.h
View File

@ -46,7 +46,7 @@ extern ICOM_VTABLE(ID3DXBuffer) D3DXBuffer_Vtbl;
struct ID3DXBufferImpl struct ID3DXBufferImpl
{ {
/* IUnknown fields */ /* IUnknown fields */
ICOM_VFIELD(ID3DXBuffer); ID3DXBufferVtbl *lpVtbl;
DWORD ref; DWORD ref;
/* ID3DXBuffer fields */ /* ID3DXBuffer fields */
@ -78,7 +78,7 @@ extern ICOM_VTABLE(ID3DXFont) D3DXFont_Vtbl;
struct ID3DXFontImpl struct ID3DXFontImpl
{ {
/* IUnknown fields */ /* IUnknown fields */
ICOM_VFIELD(ID3DXFont); ID3DXFontVtbl *lpVtbl;
DWORD ref; DWORD ref;
/* ID3DXFont fields */ /* ID3DXFont fields */

12
dlls/devenum/devenum_private.h
View File

@ -48,19 +48,19 @@ extern DWORD dll_ref;
typedef struct typedef struct
{ {
/* IUnknown fields */ /* IUnknown fields */
ICOM_VFIELD(IClassFactory); IClassFactoryVtbl *lpVtbl;
DWORD ref; DWORD ref;
} ClassFactoryImpl; } ClassFactoryImpl;
typedef struct typedef struct
{ {
ICOM_VFIELD(ICreateDevEnum); ICreateDevEnumVtbl *lpVtbl;
DWORD ref; DWORD ref;
} CreateDevEnumImpl; } CreateDevEnumImpl;
typedef struct typedef struct
{ {
ICOM_VFIELD(IEnumMoniker); IEnumMonikerVtbl *lpVtbl;
DWORD ref; DWORD ref;
DWORD index; DWORD index;
HKEY hkey; HKEY hkey;
@ -68,7 +68,7 @@ typedef struct
typedef struct typedef struct
{ {
ICOM_VFIELD(IMoniker); IMonikerVtbl *lpVtbl;
DWORD ref; DWORD ref;
HKEY hkey; HKEY hkey;
@ -76,14 +76,14 @@ typedef struct
typedef struct typedef struct
{ {
ICOM_VFIELD(IPropertyBag); IPropertyBagVtbl *lpVtbl;
DWORD ref; DWORD ref;
HKEY hkey; HKEY hkey;
} RegPropBagImpl; } RegPropBagImpl;
typedef struct typedef struct
{ {
ICOM_VFIELD(IParseDisplayName); IParseDisplayNameVtbl *lpVtbl;
DWORD ref; DWORD ref;
} ParseDisplayNameImpl; } ParseDisplayNameImpl;

2
dlls/dinput/device_private.h
View File

@ -30,7 +30,7 @@
typedef struct IDirectInputDevice2AImpl IDirectInputDevice2AImpl; typedef struct IDirectInputDevice2AImpl IDirectInputDevice2AImpl;
struct IDirectInputDevice2AImpl struct IDirectInputDevice2AImpl
{ {
ICOM_VFIELD(IDirectInputDevice2A); IDirectInputDevice2AVtbl *lpVtbl;
DWORD ref; DWORD ref;
GUID guid; GUID guid;
}; };

2
dlls/dinput/dinput_main.c
View File

@ -627,7 +627,7 @@ static ICOM_VTABLE(IDirectInput8W) ddi8wvt = {
typedef struct typedef struct
{ {
/* IUnknown fields */ /* IUnknown fields */
ICOM_VFIELD(IClassFactory); IClassFactoryVtbl *lpVtbl;
DWORD ref; DWORD ref;
} IClassFactoryImpl; } IClassFactoryImpl;

2
dlls/dmband/dmband_main.c
View File

@ -23,7 +23,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmband);
typedef struct { typedef struct {
/* IUnknown fields */ /* IUnknown fields */
ICOM_VFIELD(IClassFactory); IClassFactoryVtbl *lpVtbl;
DWORD ref; DWORD ref;
} IClassFactoryImpl; } IClassFactoryImpl;

2
dlls/dmcompos/dmcompos_main.c
View File

@ -23,7 +23,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmcompos);
typedef struct { typedef struct {
/* IUnknown fields */ /* IUnknown fields */
ICOM_VFIELD(IClassFactory); IClassFactoryVtbl *lpVtbl;
DWORD ref; DWORD ref;
} IClassFactoryImpl; } IClassFactoryImpl;

2
dlls/dmcompos/dmcompos_private.h
View File

@ -122,7 +122,7 @@ extern HRESULT WINAPI IDirectMusicChordMapImpl_IPersistStream_GetSizeMax (LPPERS
*/ */
struct IDirectMusicComposerImpl { struct IDirectMusicComposerImpl {
/* IUnknown fields */ /* IUnknown fields */
ICOM_VFIELD(IDirectMusicComposer); IDirectMusicComposerVtbl *lpVtbl;
DWORD ref; DWORD ref;
/* IDirectMusicComposerImpl fields */ /* IDirectMusicComposerImpl fields */

2
dlls/dmime/dmime_main.c
View File

@ -25,7 +25,7 @@ WINE_DECLARE_DEBUG_CHANNEL(dmfile);
typedef struct { typedef struct {
/* IUnknown fields */ /* IUnknown fields */
ICOM_VFIELD(IClassFactory); IClassFactoryVtbl *lpVtbl;
DWORD ref; DWORD ref;
} IClassFactoryImpl; } IClassFactoryImpl;

8
dlls/dmime/dmime_private.h
View File

@ -192,7 +192,7 @@ typedef struct DMUSIC_PRIVATE_PCHANNEL_ {
*/ */
struct IDirectMusicPerformance8Impl { struct IDirectMusicPerformance8Impl {
/* IUnknown fields */ /* IUnknown fields */
ICOM_VFIELD(IDirectMusicPerformance8); IDirectMusicPerformance8Vtbl *lpVtbl;
DWORD ref; DWORD ref;
/* IDirectMusicPerformanceImpl fields */ /* IDirectMusicPerformanceImpl fields */
@ -361,7 +361,7 @@ extern HRESULT WINAPI IDirectMusicSegment8Impl_IPersistStream_GetSizeMax (LPPERS
*/ */
struct IDirectMusicSegmentState8Impl { struct IDirectMusicSegmentState8Impl {
/* IUnknown fields */ /* IUnknown fields */
ICOM_VFIELD(IDirectMusicSegmentState8); IDirectMusicSegmentState8Vtbl *lpVtbl;
DWORD ref; DWORD ref;
/* IDirectMusicSegmentState8Impl fields */ /* IDirectMusicSegmentState8Impl fields */
@ -481,7 +481,7 @@ extern HRESULT WINAPI IDirectMusicAudioPathImpl_IPersistStream_GetSizeMax (LPPER
*/ */
struct IDirectMusicTool8Impl { struct IDirectMusicTool8Impl {
/* IUnknown fields */ /* IUnknown fields */
ICOM_VFIELD(IDirectMusicTool8); IDirectMusicTool8Vtbl *lpVtbl;
DWORD ref; DWORD ref;
/* IDirectMusicTool8Impl fields */ /* IDirectMusicTool8Impl fields */
@ -505,7 +505,7 @@ extern HRESULT WINAPI IDirectMusicTool8Impl_Clone (LPDIRECTMUSICTOOL8 iface, IDi
*/ */
struct IDirectMusicPatternTrackImpl { struct IDirectMusicPatternTrackImpl {
/* IUnknown fields */ /* IUnknown fields */
ICOM_VFIELD(IDirectMusicPatternTrack); IDirectMusicPatternTrackVtbl *lpVtbl;
DWORD ref; DWORD ref;
/* IDirectMusicPatternTrackImpl fields */ /* IDirectMusicPatternTrackImpl fields */

4
dlls/dmloader/dmloader_private.h
View File

@ -105,7 +105,7 @@ extern HRESULT WINAPI DMUSIC_DestroyDirectMusicLoaderGenericStream (LPSTREAM ifa
*/ */
struct IDirectMusicLoaderCF { struct IDirectMusicLoaderCF {
/* IUnknown fields */ /* IUnknown fields */
ICOM_VFIELD(IClassFactory); IClassFactoryVtbl *lpVtbl;
DWORD dwRef; DWORD dwRef;
}; };
@ -122,7 +122,7 @@ extern HRESULT WINAPI IDirectMusicLoaderCF_LockServer (LPCLASSFACTORY iface,BOOL
*/ */
struct IDirectMusicContainerCF { struct IDirectMusicContainerCF {
/* IUnknown fields */ /* IUnknown fields */
ICOM_VFIELD(IClassFactory); IClassFactoryVtbl *lpVtbl;
DWORD dwRef; DWORD dwRef;
}; };

2
dlls/dmscript/dmscript_main.c
View File

@ -23,7 +23,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmscript);
typedef struct { typedef struct {
/* IUnknown fields */ /* IUnknown fields */
ICOM_VFIELD(IClassFactory); IClassFactoryVtbl *lpVtbl;
DWORD ref; DWORD ref;
} IClassFactoryImpl; } IClassFactoryImpl;

2
dlls/dmstyle/dmstyle_main.c
View File

@ -23,7 +23,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmstyle);
typedef struct { typedef struct {
/* IUnknown fields */ /* IUnknown fields */
ICOM_VFIELD(IClassFactory); IClassFactoryVtbl *lpVtbl;
DWORD ref; DWORD ref;
} IClassFactoryImpl; } IClassFactoryImpl;

2
dlls/dmsynth/dmsynth_main.c
View File

@ -25,7 +25,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmsynth);
typedef struct { typedef struct {
/* IUnknown fields */ /* IUnknown fields */
ICOM_VFIELD(IClassFactory); IClassFactoryVtbl *lpVtbl;
DWORD ref; DWORD ref;
} IClassFactoryImpl; } IClassFactoryImpl;

4
dlls/dmsynth/dmsynth_private.h
View File

@ -62,7 +62,7 @@ extern HRESULT WINAPI DMUSIC_CreateDirectMusicSynthSinkImpl (LPCGUID lpcGUID, LP
*/ */
struct IDirectMusicSynth8Impl { struct IDirectMusicSynth8Impl {
/* IUnknown fields */ /* IUnknown fields */
ICOM_VFIELD(IDirectMusicSynth8); IDirectMusicSynth8Vtbl *lpVtbl;
DWORD ref; DWORD ref;
/* IDirectMusicSynth8 fields */ /* IDirectMusicSynth8 fields */
@ -106,7 +106,7 @@ extern HRESULT WINAPI IDirectMusicSynth8Impl_AssignChannelToBuses (LPDIRECTMUSIC
*/ */
struct IDirectMusicSynthSinkImpl { struct IDirectMusicSynthSinkImpl {
/* IUnknown fields */ /* IUnknown fields */
ICOM_VFIELD(IDirectMusicSynthSink); IDirectMusicSynthSinkVtbl *lpVtbl;
DWORD ref; DWORD ref;
/* IDirectMusicSynthSinkImpl fields */ /* IDirectMusicSynthSinkImpl fields */

2
dlls/dmusic/dmusic_main.c
View File

@ -25,7 +25,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmusic);
typedef struct { typedef struct {
/* IUnknown fields */ /* IUnknown fields */
ICOM_VFIELD(IClassFactory); IClassFactoryVtbl *lpVtbl;
DWORD ref; DWORD ref;
} IClassFactoryImpl; } IClassFactoryImpl;

16
dlls/dmusic/dmusic_private.h
View File

@ -108,7 +108,7 @@ extern HRESULT WINAPI DMUSIC_CreateDirectMusicInstrumentImpl (LPCGUID lpcGUID, L
*/ */
struct IDirectMusic8Impl { struct IDirectMusic8Impl {
/* IUnknown fields */ /* IUnknown fields */
ICOM_VFIELD(IDirectMusic8); IDirectMusic8Vtbl *lpVtbl;
DWORD ref; DWORD ref;
/* IDirectMusicImpl fields */ /* IDirectMusicImpl fields */
@ -139,7 +139,7 @@ extern HRESULT WINAPI IDirectMusic8Impl_SetExternalMasterClock (LPDIRECTMUSIC8 i
*/ */
struct IDirectMusicBufferImpl { struct IDirectMusicBufferImpl {
/* IUnknown fields */ /* IUnknown fields */
ICOM_VFIELD(IDirectMusicBuffer); IDirectMusicBufferVtbl *lpVtbl;
DWORD ref; DWORD ref;
/* IDirectMusicBufferImpl fields */ /* IDirectMusicBufferImpl fields */
@ -170,7 +170,7 @@ extern HRESULT WINAPI IDirectMusicBufferImpl_SetUsedBytes (LPDIRECTMUSICBUFFER i
*/ */
struct IDirectMusicDownloadedInstrumentImpl { struct IDirectMusicDownloadedInstrumentImpl {
/* IUnknown fields */ /* IUnknown fields */
ICOM_VFIELD(IDirectMusicDownloadedInstrument); IDirectMusicDownloadedInstrumentVtbl *lpVtbl;
DWORD ref; DWORD ref;
/* IDirectMusicDownloadedInstrumentImpl fields */ /* IDirectMusicDownloadedInstrumentImpl fields */
@ -189,7 +189,7 @@ extern ULONG WINAPI IDirectMusicDownloadedInstrumentImpl_Release (LPDIRECTMUSI
*/ */
struct IDirectMusicDownloadImpl { struct IDirectMusicDownloadImpl {
/* IUnknown fields */ /* IUnknown fields */
ICOM_VFIELD(IDirectMusicDownload); IDirectMusicDownloadVtbl *lpVtbl;
DWORD ref; DWORD ref;
/* IDirectMusicDownloadImpl fields */ /* IDirectMusicDownloadImpl fields */
@ -208,7 +208,7 @@ extern HRESULT WINAPI IDirectMusicDownloadImpl_GetBuffer (LPDIRECTMUSICDOWNLOAD
*/ */
struct IDirectMusicPortDownloadImpl { struct IDirectMusicPortDownloadImpl {
/* IUnknown fields */ /* IUnknown fields */
ICOM_VFIELD(IDirectMusicPortDownload); IDirectMusicPortDownloadVtbl *lpVtbl;
DWORD ref; DWORD ref;
/* IDirectMusicPortDownloadImpl fields */ /* IDirectMusicPortDownloadImpl fields */
@ -231,7 +231,7 @@ extern HRESULT WINAPI IDirectMusicPortDownloadImpl_Unload (LPDIRECTMUSICPORTDOWN
*/ */
struct IDirectMusicPortImpl { struct IDirectMusicPortImpl {
/* IUnknown fields */ /* IUnknown fields */
ICOM_VFIELD(IDirectMusicPort); IDirectMusicPortVtbl *lpVtbl;
DWORD ref; DWORD ref;
/* IDirectMusicPortImpl fields */ /* IDirectMusicPortImpl fields */
@ -272,7 +272,7 @@ extern HRESULT WINAPI IDirectMusicPortImpl_GetFormat (LPDIRECTMUSICPORT iface, L
*/ */
struct IDirectMusicThruImpl { struct IDirectMusicThruImpl {
/* IUnknown fields */ /* IUnknown fields */
ICOM_VFIELD(IDirectMusicThru); IDirectMusicThruVtbl *lpVtbl;
DWORD ref; DWORD ref;
/* IDirectMusicThruImpl fields */ /* IDirectMusicThruImpl fields */
@ -290,7 +290,7 @@ extern HRESULT WINAPI ThruChannel (LPDIRECTMUSICTHRU iface, DWORD dwSourceChanne
*/ */
struct IReferenceClockImpl { struct IReferenceClockImpl {
/* IUnknown fields */ /* IUnknown fields */
ICOM_VFIELD(IReferenceClock); IReferenceClockVtbl *lpVtbl;
DWORD ref; DWORD ref;
/* IReferenceClockImpl fields */ /* IReferenceClockImpl fields */

2
dlls/dplayx/dpclassfactory.c
View File

@ -36,7 +36,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dplay);
typedef struct typedef struct
{ {
/* IUnknown fields */ /* IUnknown fields */
ICOM_VFIELD(IClassFactory); IClassFactoryVtbl *lpVtbl;
DWORD ref; DWORD ref;
} IClassFactoryImpl; } IClassFactoryImpl;

6
dlls/dplayx/dplay_global.h
View File

@ -215,19 +215,19 @@ typedef struct tagDirectPlay4Data
struct IDirectPlay2Impl struct IDirectPlay2Impl
{ {
ICOM_VFIELD(IDirectPlay2); IDirectPlay2Vtbl *lpVtbl;
DP_IMPL_FIELDS DP_IMPL_FIELDS
}; };
struct IDirectPlay3Impl struct IDirectPlay3Impl
{ {
ICOM_VFIELD(IDirectPlay3); IDirectPlay3Vtbl *lpVtbl;
DP_IMPL_FIELDS DP_IMPL_FIELDS
}; };
struct IDirectPlay4Impl struct IDirectPlay4Impl
{ {
ICOM_VFIELD(IDirectPlay4); IDirectPlay4Vtbl *lpVtbl;
DP_IMPL_FIELDS DP_IMPL_FIELDS
}; };

2
dlls/dplayx/dplaysp.c
View File

@ -68,7 +68,7 @@ typedef struct tagDirectPlaySPData
struct IDirectPlaySPImpl struct IDirectPlaySPImpl
{ {
ICOM_VFIELD(IDirectPlaySP); IDirectPlaySPVtbl *lpVtbl;
DPSP_IMPL_FIELDS DPSP_IMPL_FIELDS
}; };

6
dlls/dplayx/dplobby.c
View File

@ -118,19 +118,19 @@ typedef struct tagDirectPlayLobby3Data
struct IDirectPlayLobbyImpl struct IDirectPlayLobbyImpl
{ {
ICOM_VFIELD(IDirectPlayLobby); IDirectPlayLobbyVtbl *lpVtbl;
DPL_IMPL_FIELDS DPL_IMPL_FIELDS
}; };
struct IDirectPlayLobby2Impl struct IDirectPlayLobby2Impl
{ {
ICOM_VFIELD(IDirectPlayLobby2); IDirectPlayLobby2Vtbl *lpVtbl;
DPL_IMPL_FIELDS DPL_IMPL_FIELDS
}; };
struct IDirectPlayLobby3Impl struct IDirectPlayLobby3Impl
{ {
ICOM_VFIELD(IDirectPlayLobby3); IDirectPlayLobby3Vtbl *lpVtbl;
DPL_IMPL_FIELDS DPL_IMPL_FIELDS
}; };

2
dlls/dplayx/lobbysp.c
View File

@ -55,7 +55,7 @@ typedef struct tagDPLobbySPData
struct IDPLobbySPImpl struct IDPLobbySPImpl
{ {
ICOM_VFIELD(IDPLobbySP); IDPLobbySPVtbl *lpVtbl;
DPLSP_IMPL_FIELDS DPLSP_IMPL_FIELDS
}; };

2
dlls/dpnet/dpnet_main.c
View File

@ -65,7 +65,7 @@ HRESULT WINAPI DirectPlay8Create(REFGUID lpGUID, LPVOID *ppvInt, LPUNKNOWN punkO
typedef struct typedef struct
{ {
/* IUnknown fields */ /* IUnknown fields */
ICOM_VFIELD(IClassFactory); IClassFactoryVtbl *lpVtbl;
DWORD ref; DWORD 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);

4
dlls/dpnet/dpnet_private.h
View File

@ -50,7 +50,7 @@ extern ICOM_VTABLE(IDirectPlay8Client) DirectPlay8Client_Vtbl;
struct IDirectPlay8ClientImpl struct IDirectPlay8ClientImpl
{ {
/* IUnknown fields */ /* IUnknown fields */
ICOM_VFIELD(IDirectPlay8Client); IDirectPlay8ClientVtbl *lpVtbl;
DWORD ref; DWORD ref;
/* IDirectPlay8Client fields */ /* IDirectPlay8Client fields */
}; };
@ -96,7 +96,7 @@ extern ICOM_VTABLE(IDirectPlay8Address) DirectPlay8Address_Vtbl;
struct IDirectPlay8AddressImpl struct IDirectPlay8AddressImpl
{ {
/* IUnknown fields */ /* IUnknown fields */
ICOM_VFIELD(IDirectPlay8Address); IDirectPlay8AddressVtbl *lpVtbl;
DWORD ref; DWORD ref;
/* IDirectPlay8Address fields */ /* IDirectPlay8Address fields */
GUID SP_guid; GUID SP_guid;

38
dlls/dsound/dsound_private.h
View File

@ -70,7 +70,7 @@ typedef struct IClassFactoryImpl IClassFactoryImpl;
struct IDirectSoundImpl struct IDirectSoundImpl
{ {
/* IUnknown fields */ /* IUnknown fields */
ICOM_VFIELD(IDirectSound8); IDirectSound8Vtbl *lpVtbl;
DWORD ref; DWORD ref;
/* IDirectSoundImpl fields */ /* IDirectSoundImpl fields */
GUID guid; GUID guid;
@ -131,7 +131,7 @@ HRESULT WINAPI DSOUND_Create8(
* IDirectSound COM components * IDirectSound COM components
*/ */
struct IDirectSound_IUnknown { struct IDirectSound_IUnknown {
ICOM_VFIELD(IUnknown); IUnknownVtbl *lpVtbl;
DWORD ref; DWORD ref;
LPDIRECTSOUND8 pds; LPDIRECTSOUND8 pds;
}; };
@ -141,7 +141,7 @@ HRESULT WINAPI IDirectSound_IUnknown_Create(
LPUNKNOWN * ppunk); LPUNKNOWN * ppunk);
struct IDirectSound_IDirectSound { struct IDirectSound_IDirectSound {
ICOM_VFIELD(IDirectSound); IDirectSoundVtbl *lpVtbl;
DWORD ref; DWORD ref;
LPDIRECTSOUND8 pds; LPDIRECTSOUND8 pds;
}; };
@ -154,7 +154,7 @@ HRESULT WINAPI IDirectSound_IDirectSound_Create(
* IDirectSound8 COM components * IDirectSound8 COM components
*/ */
struct IDirectSound8_IUnknown { struct IDirectSound8_IUnknown {
ICOM_VFIELD(IUnknown); IUnknownVtbl *lpVtbl;
DWORD ref; DWORD ref;
LPDIRECTSOUND8 pds; LPDIRECTSOUND8 pds;
}; };
@ -164,7 +164,7 @@ HRESULT WINAPI IDirectSound8_IUnknown_Create(
LPUNKNOWN * ppunk); LPUNKNOWN * ppunk);
struct IDirectSound8_IDirectSound { struct IDirectSound8_IDirectSound {
ICOM_VFIELD(IDirectSound); IDirectSoundVtbl *lpVtbl;
DWORD ref; DWORD ref;
LPDIRECTSOUND8 pds; LPDIRECTSOUND8 pds;
}; };
@ -174,7 +174,7 @@ HRESULT WINAPI IDirectSound8_IDirectSound_Create(
LPDIRECTSOUND * ppds); LPDIRECTSOUND * ppds);
struct IDirectSound8_IDirectSound8 { struct IDirectSound8_IDirectSound8 {
ICOM_VFIELD(IDirectSound8); IDirectSound8Vtbl *lpVtbl;
DWORD ref; DWORD ref;
LPDIRECTSOUND8 pds; LPDIRECTSOUND8 pds;
}; };
@ -190,7 +190,7 @@ struct IDirectSoundBufferImpl
{ {
/* FIXME: document */ /* FIXME: document */
/* IUnknown fields */ /* IUnknown fields */
ICOM_VFIELD(IDirectSoundBuffer8); IDirectSoundBuffer8Vtbl *lpVtbl;
DWORD ref; DWORD ref;
/* IDirectSoundBufferImpl fields */ /* IDirectSoundBufferImpl fields */
SecondaryBufferImpl* dsb; SecondaryBufferImpl* dsb;
@ -240,7 +240,7 @@ HRESULT WINAPI IDirectSoundBufferImpl_Destroy(
*/ */
struct SecondaryBufferImpl struct SecondaryBufferImpl
{ {
ICOM_VFIELD(IDirectSoundBuffer8); IDirectSoundBuffer8Vtbl *lpVtbl;
DWORD ref; DWORD ref;
IDirectSoundBufferImpl* dsb; IDirectSoundBufferImpl* dsb;
}; };
@ -256,7 +256,7 @@ HRESULT WINAPI SecondaryBufferImpl_Destroy(
*/ */
struct PrimaryBufferImpl struct PrimaryBufferImpl
{ {
ICOM_VFIELD(IDirectSoundBuffer8); IDirectSoundBuffer8Vtbl *lpVtbl;
DWORD ref; DWORD ref;
IDirectSoundImpl* dsound; IDirectSoundImpl* dsound;
}; };
@ -272,7 +272,7 @@ HRESULT WINAPI PrimaryBufferImpl_Create(
struct IDirectSoundCaptureImpl struct IDirectSoundCaptureImpl
{ {
/* IUnknown fields */ /* IUnknown fields */
ICOM_VFIELD(IDirectSoundCapture); IDirectSoundCaptureVtbl *lpVtbl;
DWORD ref; DWORD ref;
/* IDirectSoundCaptureImpl fields */ /* IDirectSoundCaptureImpl fields */
@ -309,7 +309,7 @@ struct IDirectSoundCaptureImpl
struct IDirectSoundCaptureBufferImpl struct IDirectSoundCaptureBufferImpl
{ {
/* IUnknown fields */ /* IUnknown fields */
ICOM_VFIELD(IDirectSoundCaptureBuffer8); IDirectSoundCaptureBuffer8Vtbl *lpVtbl;
DWORD ref; DWORD ref;
/* IDirectSoundCaptureBufferImpl fields */ /* IDirectSoundCaptureBufferImpl fields */
@ -331,7 +331,7 @@ struct IDirectSoundCaptureBufferImpl
struct IDirectSoundFullDuplexImpl struct IDirectSoundFullDuplexImpl
{ {
/* IUnknown fields */ /* IUnknown fields */
ICOM_VFIELD(IDirectSoundFullDuplex); IDirectSoundFullDuplexVtbl *lpVtbl;
DWORD ref; DWORD ref;
/* IDirectSoundFullDuplexImpl fields */ /* IDirectSoundFullDuplexImpl fields */
@ -344,7 +344,7 @@ struct IDirectSoundFullDuplexImpl
struct IDirectSoundNotifyImpl struct IDirectSoundNotifyImpl
{ {
/* IUnknown fields */ /* IUnknown fields */
ICOM_VFIELD(IDirectSoundNotify); IDirectSoundNotifyVtbl *lpVtbl;
DWORD ref; DWORD ref;
IDirectSoundBufferImpl* dsb; IDirectSoundBufferImpl* dsb;
}; };
@ -361,7 +361,7 @@ HRESULT WINAPI IDirectSoundNotifyImpl_Destroy(
struct IDirectSoundCaptureNotifyImpl struct IDirectSoundCaptureNotifyImpl
{ {
/* IUnknown fields */ /* IUnknown fields */
ICOM_VFIELD(IDirectSoundNotify); IDirectSoundNotifyVtbl *lpVtbl;
DWORD ref; DWORD ref;
IDirectSoundCaptureBufferImpl* dscb; IDirectSoundCaptureBufferImpl* dscb;
}; };
@ -376,7 +376,7 @@ HRESULT WINAPI IDirectSoundCaptureNotifyImpl_Create(
struct IDirectSound3DListenerImpl struct IDirectSound3DListenerImpl
{ {
/* IUnknown fields */ /* IUnknown fields */
ICOM_VFIELD(IDirectSound3DListener); IDirectSound3DListenerVtbl *lpVtbl;
DWORD ref; DWORD ref;
/* IDirectSound3DListenerImpl fields */ /* IDirectSound3DListenerImpl fields */
IDirectSoundImpl* dsound; IDirectSoundImpl* dsound;
@ -392,7 +392,7 @@ HRESULT WINAPI IDirectSound3DListenerImpl_Create(
struct IKsBufferPropertySetImpl struct IKsBufferPropertySetImpl
{ {
/* IUnknown fields */ /* IUnknown fields */
ICOM_VFIELD(IKsPropertySet); IKsPropertySetVtbl *lpVtbl;
DWORD ref; DWORD ref;
/* IKsPropertySetImpl fields */ /* IKsPropertySetImpl fields */
IDirectSoundBufferImpl* dsb; IDirectSoundBufferImpl* dsb;
@ -410,7 +410,7 @@ HRESULT WINAPI IKsBufferPropertySetImpl_Destroy(
struct IKsPrivatePropertySetImpl struct IKsPrivatePropertySetImpl
{ {
/* IUnknown fields */ /* IUnknown fields */
ICOM_VFIELD(IKsPropertySet); IKsPropertySetVtbl *lpVtbl;
DWORD ref; DWORD ref;
}; };
@ -423,7 +423,7 @@ HRESULT WINAPI IKsPrivatePropertySetImpl_Create(
struct IDirectSound3DBufferImpl struct IDirectSound3DBufferImpl
{ {
/* IUnknown fields */ /* IUnknown fields */
ICOM_VFIELD(IDirectSound3DBuffer); IDirectSound3DBufferVtbl *lpVtbl;
DWORD ref; DWORD ref;
/* IDirectSound3DBufferImpl fields */ /* IDirectSound3DBufferImpl fields */
IDirectSoundBufferImpl* dsb; IDirectSoundBufferImpl* dsb;
@ -441,7 +441,7 @@ HRESULT WINAPI IDirectSound3DBufferImpl_Destroy(
struct IClassFactoryImpl struct IClassFactoryImpl
{ {
/* IUnknown fields */ /* IUnknown fields */
ICOM_VFIELD(IClassFactory); IClassFactoryVtbl *lpVtbl;
DWORD ref; DWORD ref;
}; };

2
dlls/dswave/dswave_main.c
View File

@ -25,7 +25,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dswave);
typedef struct { typedef struct {
/* IUnknown fields */ /* IUnknown fields */
ICOM_VFIELD(IClassFactory); IClassFactoryVtbl *lpVtbl;
DWORD ref; DWORD ref;
} IClassFactoryImpl; } IClassFactoryImpl;

2
dlls/dxdiagn/dxdiag_main.c
View File

@ -40,7 +40,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpvReserved)
*/ */
typedef struct { typedef struct {
/* IUnknown fields */ /* IUnknown fields */
ICOM_VFIELD(IClassFactory); IClassFactoryVtbl *lpVtbl;
DWORD ref; DWORD 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);

4
dlls/dxdiagn/dxdiag_private.h
View File

@ -49,7 +49,7 @@ extern ICOM_VTABLE(IDxDiagProvider) DxDiagProvider_Vtbl;
*/ */
struct IDxDiagProviderImpl { struct IDxDiagProviderImpl {
/* IUnknown fields */ /* IUnknown fields */
ICOM_VFIELD(IDxDiagProvider); IDxDiagProviderVtbl *lpVtbl;
DWORD ref; DWORD ref;
/* IDxDiagProvider fields */ /* IDxDiagProvider fields */
BOOL init; BOOL init;
@ -86,7 +86,7 @@ extern ICOM_VTABLE(IDxDiagContainer) DxDiagContainer_Vtbl;
*/ */
struct IDxDiagContainerImpl { struct IDxDiagContainerImpl {
/* IUnknown fields */ /* IUnknown fields */
ICOM_VFIELD(IDxDiagContainer); IDxDiagContainerVtbl *lpVtbl;
DWORD ref; DWORD ref;
/* IDxDiagContainer fields */ /* IDxDiagContainer fields */
IDxDiagContainerImpl_SubContainer* subContainers; IDxDiagContainerImpl_SubContainer* subContainers;

2
dlls/msdmo/dmoreg.c
View File

@ -79,7 +79,7 @@ static const WCHAR szCat2Fmt[] =
typedef struct typedef struct
{ {
ICOM_VFIELD(IEnumDMO); IEnumDMOVtbl *lpVtbl;
DWORD ref; DWORD ref;
DWORD index; DWORD index;
const GUID* guidCategory; const GUID* guidCategory;

2
dlls/msi/msi.c
View File

@ -1377,7 +1377,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) {
typedef struct { typedef struct {
/* IUnknown fields */ /* IUnknown fields */
ICOM_VFIELD(IClassFactory); IClassFactoryVtbl *lpVtbl;
DWORD ref; DWORD ref;
} IClassFactoryImpl; } IClassFactoryImpl;

2
dlls/ole32/bindctx.c
View File

@ -48,7 +48,7 @@ typedef struct BindCtxObject{
/* BindCtx data strucrture */ /* BindCtx data strucrture */
typedef struct BindCtxImpl{ typedef struct BindCtxImpl{
ICOM_VFIELD(IBindCtx); /* VTable relative to the IBindCtx interface.*/ IBindCtxVtbl *lpVtbl; /* VTable relative to the IBindCtx interface.*/
ULONG ref; /* reference counter for this object */ ULONG ref; /* reference counter for this object */

2
dlls/ole32/clipboard.c
View File

@ -133,7 +133,7 @@ typedef struct OLEClipbrd OLEClipbrd;
typedef struct typedef struct
{ {
/* IEnumFORMATETC VTable */ /* IEnumFORMATETC VTable */
ICOM_VFIELD(IEnumFORMATETC); IEnumFORMATETCVtbl *lpVtbl;
/* IEnumFORMATETC fields */ /* IEnumFORMATETC fields */
UINT posFmt; /* current enumerator position */ UINT posFmt; /* current enumerator position */

2
dlls/ole32/compositemoniker.c
View File

@ -66,7 +66,7 @@ typedef struct CompositeMonikerImpl{
/* EnumMoniker data structure */ /* EnumMoniker data structure */
typedef struct EnumMonikerImpl{ typedef struct EnumMonikerImpl{
ICOM_VFIELD(IEnumMoniker); /* VTable relative to the IEnumMoniker interface.*/ IEnumMonikerVtbl *lpVtbl; /* VTable relative to the IEnumMoniker interface.*/
ULONG ref; /* reference counter for this object */ ULONG ref; /* reference counter for this object */

4
dlls/ole32/ftmarshal.c
View File

@ -35,9 +35,9 @@
WINE_DEFAULT_DEBUG_CHANNEL(ole); WINE_DEFAULT_DEBUG_CHANNEL(ole);
typedef struct _FTMarshalImpl { typedef struct _FTMarshalImpl {
ICOM_VFIELD (IUnknown); IUnknownVtbl *lpVtbl;
DWORD ref; DWORD ref;
ICOM_VTABLE (IMarshal) * lpvtblFTM; IMarshalVtbl *lpvtblFTM;
IUnknown *pUnkOuter; IUnknown *pUnkOuter;
} FTMarshalImpl; } FTMarshalImpl;

2
dlls/ole32/git.c
View File

@ -70,7 +70,7 @@ typedef struct StdGITEntry
/* Class data */ /* Class data */
typedef struct StdGlobalInterfaceTableImpl typedef struct StdGlobalInterfaceTableImpl
{ {
ICOM_VFIELD(IGlobalInterfaceTable); IGlobalInterfaceTableVtbl *lpVtbl;
ULONG ref; ULONG ref;
struct StdGITEntry* firstEntry; struct StdGITEntry* firstEntry;

2
dlls/ole32/hglobalstream.c
View File

@ -52,7 +52,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(storage);
*/ */
struct HGLOBALStreamImpl struct HGLOBALStreamImpl
{ {
ICOM_VFIELD(IStream); /* Needs to be the first item in the stuct IStreamVtbl *lpVtbl; /* Needs to be the first item in the stuct
* since we want to cast this in a IStream pointer */ * since we want to cast this in a IStream pointer */
/* /*

4
dlls/ole32/ifs.c
View File

@ -48,7 +48,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(olemalloc);
static ICOM_VTABLE(IMalloc) VT_IMalloc32; static ICOM_VTABLE(IMalloc) VT_IMalloc32;
typedef struct { typedef struct {
ICOM_VFIELD(IMalloc); IMallocVtbl *lpVtbl;
DWORD dummy; /* nothing, we are static */ DWORD dummy; /* nothing, we are static */
IMallocSpy * pSpy; /* the spy when active */ IMallocSpy * pSpy; /* the spy when active */
DWORD SpyedAllocationsLeft; /* number of spyed allocations left */ DWORD SpyedAllocationsLeft; /* number of spyed allocations left */
@ -364,7 +364,7 @@ static ICOM_VTABLE(IMalloc) VT_IMalloc32 =
static ICOM_VTABLE(IMallocSpy) VT_IMallocSpy; static ICOM_VTABLE(IMallocSpy) VT_IMallocSpy;
typedef struct { typedef struct {
ICOM_VFIELD(IMallocSpy); IMallocSpyVtbl *lpVtbl;
DWORD ref; DWORD ref;
} _MallocSpy; } _MallocSpy;

2
dlls/ole32/memlockbytes.c
View File

@ -53,7 +53,7 @@ struct HGLOBALLockBytesImpl
* Needs to be the first item in the stuct * Needs to be the first item in the stuct
* since we want to cast this in an ILockBytes pointer * since we want to cast this in an ILockBytes pointer
*/ */
ICOM_VFIELD(ILockBytes); ILockBytesVtbl *lpVtbl;
/* /*
* Reference count * Reference count

2
dlls/ole32/memlockbytes16.c
View File

@ -52,7 +52,7 @@ struct HGLOBALLockBytesImpl16
* Needs to be the first item in the stuct * Needs to be the first item in the stuct
* since we want to cast this in an ILockBytes pointer * since we want to cast this in an ILockBytes pointer
*/ */
ICOM_VFIELD(ILockBytes16); ILockBytes16Vtbl *lpVtbl;
ULONG ref; ULONG ref;
/* /*

2
dlls/ole32/moniker.c
View File

@ -58,7 +58,7 @@ typedef struct RunObject{
/* define the RunningObjectTableImpl structure */ /* define the RunningObjectTableImpl structure */
typedef struct RunningObjectTableImpl{ typedef struct RunningObjectTableImpl{
ICOM_VFIELD(IRunningObjectTable); IRunningObjectTableVtbl *lpVtbl;
ULONG ref; ULONG ref;
RunObject* runObjTab; /* pointer to the first object in the table */ RunObject* runObjTab; /* pointer to the first object in the table */

2
dlls/ole32/ole16.c
View File

@ -64,7 +64,7 @@ LPMALLOC16 currentMalloc16=NULL;
typedef struct typedef struct
{ {
/* IUnknown fields */ /* IUnknown fields */
ICOM_VFIELD(IMalloc16); IMalloc16Vtbl *lpVtbl;
DWORD ref; DWORD ref;
/* IMalloc16 fields */ /* IMalloc16 fields */
} IMalloc16Impl; } IMalloc16Impl;

4
dlls/ole32/oleobj.c
View File

@ -38,7 +38,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole);
*/ */
typedef struct OleAdviseHolderImpl typedef struct OleAdviseHolderImpl
{ {
ICOM_VFIELD(IOleAdviseHolder); IOleAdviseHolderVtbl *lpVtbl;
DWORD ref; DWORD ref;
@ -369,7 +369,7 @@ typedef struct DataAdviseConnection {
typedef struct DataAdviseHolder typedef struct DataAdviseHolder
{ {
ICOM_VFIELD(IDataAdviseHolder); IDataAdviseHolderVtbl *lpVtbl;
DWORD ref; DWORD ref;
DWORD maxCons; DWORD maxCons;

6
dlls/ole32/storage.c
View File

@ -954,7 +954,7 @@ STORAGE_get_free_pps_entry(HANDLE hf) {
typedef struct typedef struct
{ {
/* IUnknown fields */ /* IUnknown fields */
ICOM_VFIELD(IStream16); IStream16Vtbl *lpVtbl;
DWORD ref; DWORD ref;
/* IStream16 fields */ /* IStream16 fields */
SEGPTR thisptr; /* pointer to this struct as segmented */ SEGPTR thisptr; /* pointer to this struct as segmented */
@ -1448,7 +1448,7 @@ static void _create_istream16(LPSTREAM16 *str) {
typedef struct typedef struct
{ {
/* IUnknown fields */ /* IUnknown fields */
ICOM_VFIELD(IStream); IStreamVtbl *lpVtbl;
DWORD ref; DWORD ref;
/* IStream32 fields */ /* IStream32 fields */
struct storage_pps_entry stde; struct storage_pps_entry stde;
@ -1502,7 +1502,7 @@ ULONG WINAPI IStream_fnRelease(IStream* iface) {
typedef struct typedef struct
{ {
/* IUnknown fields */ /* IUnknown fields */
ICOM_VFIELD(IStorage16); IStorage16Vtbl *lpVtbl;
DWORD ref; DWORD ref;
/* IStorage16 fields */ /* IStorage16 fields */
SEGPTR thisptr; /* pointer to this struct as segmented */ SEGPTR thisptr; /* pointer to this struct as segmented */

14
dlls/ole32/storage32.h
View File

@ -204,7 +204,7 @@ HRESULT OLECONVERT_CreateCompObjStream(LPSTORAGE pStorage, LPCSTR strOleTypeName
*/ */
struct StorageBaseImpl struct StorageBaseImpl
{ {
ICOM_VFIELD(IStorage); /* Needs to be the first item in the struct IStorageVtbl *lpVtbl; /* Needs to be the first item in the struct
* since we want to cast this in a Storage32 pointer */ * since we want to cast this in a Storage32 pointer */
/* /*
@ -298,7 +298,7 @@ HRESULT WINAPI StorageBaseImpl_SetClass(
*/ */
struct StorageImpl struct StorageImpl
{ {
ICOM_VFIELD(IStorage); /* Needs to be the first item in the struct IStorageVtbl *lpVtbl; /* Needs to be the first item in the struct
* since we want to cast this in a Storage32 pointer */ * since we want to cast this in a Storage32 pointer */
/* /*
@ -498,7 +498,7 @@ void Storage32Impl_SetExtDepotBlock(StorageImpl* This,
*/ */
struct StorageInternalImpl struct StorageInternalImpl
{ {
ICOM_VFIELD(IStorage); /* Needs to be the first item in the struct IStorageVtbl *lpVtbl; /* Needs to be the first item in the struct
* since we want to cast this in a Storage32 pointer */ * since we want to cast this in a Storage32 pointer */
/* /*
@ -542,8 +542,8 @@ HRESULT WINAPI StorageInternalImpl_Revert(
*/ */
struct IEnumSTATSTGImpl struct IEnumSTATSTGImpl
{ {
ICOM_VFIELD(IEnumSTATSTG); /* Needs to be the first item in the struct IEnumSTATSTGVtbl *lpVtbl; /* Needs to be the first item in the struct
* since we want to cast this in a IEnumSTATSTG pointer */ * since we want to cast this in a IEnumSTATSTG pointer */
ULONG ref; /* Reference count */ ULONG ref; /* Reference count */
StorageImpl* parentStorage; /* Reference to the parent storage */ StorageImpl* parentStorage; /* Reference to the parent storage */
@ -627,8 +627,8 @@ INT IEnumSTATSTGImpl_FindParentProperty(
*/ */
struct StgStreamImpl struct StgStreamImpl
{ {
ICOM_VFIELD(IStream); /* Needs to be the first item in the struct IStreamVtbl *lpVtbl; /* Needs to be the first item in the struct
* since we want to cast this in a IStream pointer */ * since we want to cast this in a IStream pointer */
/* /*
* Reference count * Reference count

2
dlls/oleaut32/dispatch.c
View File

@ -239,7 +239,7 @@ HRESULT WINAPI CreateDispTypeInfo(
typedef struct typedef struct
{ {
ICOM_VFIELD(IDispatch); IDispatchVtbl *lpVtbl;
void * pvThis; void * pvThis;
ITypeInfo * pTypeInfo; ITypeInfo * pTypeInfo;
ULONG ref; ULONG ref;

2
dlls/oleaut32/olefont.c
View File

@ -1955,7 +1955,7 @@ static ICOM_VTABLE(IPersistStreamInit) OLEFontImpl_IPersistStreamInit_VTable =
typedef struct typedef struct
{ {
/* IUnknown fields */ /* IUnknown fields */
ICOM_VFIELD(IClassFactory); IClassFactoryVtbl *lpVtbl;
DWORD ref; DWORD ref;
} IClassFactoryImpl; } IClassFactoryImpl;

2
dlls/oleaut32/olepicture.c
View File

@ -1638,7 +1638,7 @@ HRESULT WINAPI OleLoadPictureEx( LPSTREAM lpstream, LONG lSize, BOOL fRunmode,
typedef struct typedef struct
{ {
/* IUnknown fields */ /* IUnknown fields */
ICOM_VFIELD(IClassFactory); IClassFactoryVtbl *lpVtbl;
DWORD ref; DWORD ref;
} IClassFactoryImpl; } IClassFactoryImpl;

2
dlls/oleaut32/tests/vartype.c
View File

@ -483,7 +483,7 @@ typedef struct tagINTERNAL_BSTR
typedef struct typedef struct
{ {
ICOM_VFIELD(IDispatch); IDispatchVtbl *lpVtbl;
ULONG ref; ULONG ref;
VARTYPE vt; VARTYPE vt;
BOOL bFailInvoke; BOOL bFailInvoke;

8
dlls/oleaut32/typelib.c
View File

@ -853,8 +853,8 @@ typedef struct tagTLBImpLib
/* internal ITypeLib data */ /* internal ITypeLib data */
typedef struct tagITypeLibImpl typedef struct tagITypeLibImpl
{ {
ICOM_VFIELD(ITypeLib2); ITypeLib2Vtbl *lpVtbl;
ICOM_VTABLE(ITypeComp) * lpVtblTypeComp; ITypeCompVtbl *lpVtblTypeComp;
UINT ref; UINT ref;
TLIBATTR LibAttr; /* guid,lcid,syskind,version,flags */ TLIBATTR LibAttr; /* guid,lcid,syskind,version,flags */
@ -964,8 +964,8 @@ typedef struct tagTLBImplType
/* internal TypeInfo data */ /* internal TypeInfo data */
typedef struct tagITypeInfoImpl typedef struct tagITypeInfoImpl
{ {
ICOM_VFIELD(ITypeInfo2); ITypeInfo2Vtbl *lpVtbl;
ICOM_VTABLE(ITypeComp) * lpVtblTypeComp; ITypeCompVtbl *lpVtblTypeComp;
UINT ref; UINT ref;
TYPEATTR TypeAttr ; /* _lots_ of type information. */ TYPEATTR TypeAttr ; /* _lots_ of type information. */
ITypeLibImpl * pTypeLib; /* back pointer to typelib */ ITypeLibImpl * pTypeLib; /* back pointer to typelib */

8
dlls/oleaut32/typelib2.c
View File

@ -146,8 +146,8 @@ typedef struct tagMSFT_ImpFile {
typedef struct tagICreateTypeLib2Impl typedef struct tagICreateTypeLib2Impl
{ {
ICOM_VFIELD(ICreateTypeLib2); ICreateTypeLib2Vtbl *lpVtbl;
ICOM_VTABLE(ITypeLib2) *lpVtblTypeLib2; ITypeLib2Vtbl *lpVtblTypeLib2;
UINT ref; UINT ref;
@ -172,8 +172,8 @@ typedef struct tagICreateTypeLib2Impl
typedef struct tagICreateTypeInfo2Impl typedef struct tagICreateTypeInfo2Impl
{ {
ICOM_VFIELD(ICreateTypeInfo2); ICreateTypeInfo2Vtbl *lpVtbl;
ICOM_VTABLE(ITypeInfo2) *lpVtblTypeInfo2; ITypeInfo2Vtbl *lpVtblTypeInfo2;
UINT ref; UINT ref;

2
dlls/quartz/enummoniker.c
View File

@ -36,7 +36,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(quartz);
typedef struct EnumMonikerImpl typedef struct EnumMonikerImpl
{ {
ICOM_VFIELD(IEnumMoniker); IEnumMonikerVtbl *lpVtbl;
ULONG ref; ULONG ref;
IMoniker ** ppMoniker; IMoniker ** ppMoniker;
ULONG nMonikerCount; ULONG nMonikerCount;

4
dlls/quartz/filtermapper.c
View File

@ -44,8 +44,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(quartz);
typedef struct FilterMapper2Impl typedef struct FilterMapper2Impl
{ {
ICOM_VFIELD(IFilterMapper2); IFilterMapper2Vtbl *lpVtbl;
ICOM_VTABLE(IFilterMapper) * lpVtblFilterMapper; IFilterMapperVtbl *lpVtblFilterMapper;
ULONG refCount; ULONG refCount;
} FilterMapper2Impl; } FilterMapper2Impl;

2
dlls/quartz/systemclock.c
View File

@ -39,7 +39,7 @@ struct SystemClockAdviseEntry {
}; };
typedef struct SystemClockImpl { typedef struct SystemClockImpl {
ICOM_VFIELD(IReferenceClock); IReferenceClockVtbl *lpVtbl;
ULONG ref; ULONG ref;
/** IReferenceClock */ /** IReferenceClock */

2
dlls/rpcrt4/ndr_ole.c
View File

@ -77,7 +77,7 @@ static HMODULE LoadCOM(void)
* (which also implements the MInterfacePointer structure) */ * (which also implements the MInterfacePointer structure) */
typedef struct RpcStreamImpl typedef struct RpcStreamImpl
{ {
ICOM_VFIELD(IStream); IStreamVtbl *lpVtbl;
DWORD RefCount; DWORD RefCount;
PMIDL_STUB_MESSAGE pMsg; PMIDL_STUB_MESSAGE pMsg;
LPDWORD size; LPDWORD size;

24
dlls/shdocvw/shdocvw.h
View File

@ -41,7 +41,7 @@
typedef struct typedef struct
{ {
/* IUnknown fields */ /* IUnknown fields */
ICOM_VFIELD(IClassFactory); IClassFactoryVtbl *lpVtbl;
DWORD ref; DWORD ref;
} IClassFactoryImpl; } IClassFactoryImpl;
@ -54,7 +54,7 @@ extern IClassFactoryImpl SHDOCVW_ClassFactory;
typedef struct typedef struct
{ {
/* IUnknown fields */ /* IUnknown fields */
ICOM_VFIELD(IOleObject); IOleObjectVtbl *lpVtbl;
DWORD ref; DWORD ref;
} IOleObjectImpl; } IOleObjectImpl;
@ -67,7 +67,7 @@ extern IOleObjectImpl SHDOCVW_OleObject;
typedef struct typedef struct
{ {
/* IUnknown fields */ /* IUnknown fields */
ICOM_VFIELD(IOleInPlaceObject); IOleInPlaceObjectVtbl *lpVtbl;
DWORD ref; DWORD ref;
} IOleInPlaceObjectImpl; } IOleInPlaceObjectImpl;
@ -80,7 +80,7 @@ extern IOleInPlaceObjectImpl SHDOCVW_OleInPlaceObject;
typedef struct typedef struct
{ {
/* IUnknown fields */ /* IUnknown fields */
ICOM_VFIELD(IOleControl); IOleControlVtbl *lpVtbl;
DWORD ref; DWORD ref;
} IOleControlImpl; } IOleControlImpl;
@ -93,7 +93,7 @@ extern IOleControlImpl SHDOCVW_OleControl;
typedef struct typedef struct
{ {
/* IUnknown fields */ /* IUnknown fields */
ICOM_VFIELD(IWebBrowser); IWebBrowserVtbl *lpVtbl;
DWORD ref; DWORD ref;
} IWebBrowserImpl; } IWebBrowserImpl;
@ -106,7 +106,7 @@ extern IWebBrowserImpl SHDOCVW_WebBrowser;
typedef struct typedef struct
{ {
/* IUnknown fields */ /* IUnknown fields */
ICOM_VFIELD(IProvideClassInfo); IProvideClassInfoVtbl *lpVtbl;
DWORD ref; DWORD ref;
} IProvideClassInfoImpl; } IProvideClassInfoImpl;
@ -119,7 +119,7 @@ extern IProvideClassInfoImpl SHDOCVW_ProvideClassInfo;
typedef struct typedef struct
{ {
/* IUnknown fields */ /* IUnknown fields */
ICOM_VFIELD(IProvideClassInfo2); IProvideClassInfo2Vtbl *lpVtbl;
DWORD ref; DWORD ref;
} IProvideClassInfo2Impl; } IProvideClassInfo2Impl;
@ -132,7 +132,7 @@ extern IProvideClassInfo2Impl SHDOCVW_ProvideClassInfo2;
typedef struct typedef struct
{ {
/* IUnknown fields */ /* IUnknown fields */
ICOM_VFIELD(IPersistStorage); IPersistStorageVtbl *lpVtbl;
DWORD ref; DWORD ref;
} IPersistStorageImpl; } IPersistStorageImpl;
@ -145,7 +145,7 @@ extern IPersistStorageImpl SHDOCVW_PersistStorage;
typedef struct typedef struct
{ {
/* IUnknown fields */ /* IUnknown fields */
ICOM_VFIELD(IPersistStreamInit); IPersistStreamInitVtbl *lpVtbl;
DWORD ref; DWORD ref;
} IPersistStreamInitImpl; } IPersistStreamInitImpl;
@ -158,7 +158,7 @@ extern IPersistStreamInitImpl SHDOCVW_PersistStreamInit;
typedef struct typedef struct
{ {
/* IUnknown fields */ /* IUnknown fields */
ICOM_VFIELD(IQuickActivate); IQuickActivateVtbl *lpVtbl;
DWORD ref; DWORD ref;
} IQuickActivateImpl; } IQuickActivateImpl;
@ -171,7 +171,7 @@ extern IQuickActivateImpl SHDOCVW_QuickActivate;
typedef struct typedef struct
{ {
/* IUnknown fields */ /* IUnknown fields */
ICOM_VFIELD(IConnectionPointContainer); IConnectionPointContainerVtbl *lpVtbl;
DWORD ref; DWORD ref;
} IConnectionPointContainerImpl; } IConnectionPointContainerImpl;
@ -184,7 +184,7 @@ extern IConnectionPointContainerImpl SHDOCVW_ConnectionPointContainer;
typedef struct typedef struct
{ {
/* IUnknown fields */ /* IUnknown fields */
ICOM_VFIELD(IConnectionPoint); IConnectionPointVtbl *lpVtbl;
DWORD ref; DWORD ref;
} IConnectionPointImpl; } IConnectionPointImpl;

4
dlls/shell32/autocomplete.c
View File

@ -59,8 +59,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell);
typedef struct typedef struct
{ {
ICOM_VFIELD(IAutoComplete); IAutoCompleteVtbl *lpVtbl;
ICOM_VTABLE (IAutoComplete2) * lpvtblAutoComplete2; IAutoComplete2Vtbl *lpvtblAutoComplete2;
DWORD ref; DWORD ref;
BOOL enabled; BOOL enabled;
HWND hwndEdit; HWND hwndEdit;

11
dlls/shell32/cpanelfolder.c
View File

@ -57,12 +57,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell);
*/ */
typedef struct { typedef struct {
ICOM_VFIELD(IShellFolder2); IShellFolder2Vtbl *lpVtbl;
DWORD ref; DWORD ref;
IPersistFolder2Vtbl *lpVtblPersistFolder2;
ICOM_VTABLE(IPersistFolder2)* lpVtblPersistFolder2; IShellExecuteHookWVtbl *lpVtblShellExecuteHookW;
ICOM_VTABLE(IShellExecuteHookW)* lpVtblShellExecuteHookW; IShellExecuteHookAVtbl *lpVtblShellExecuteHookA;
ICOM_VTABLE(IShellExecuteHookA)* lpVtblShellExecuteHookA;
IUnknown *pUnkOuter; /* used for aggregation */ IUnknown *pUnkOuter; /* used for aggregation */

4
dlls/shell32/dataobject.c
View File

@ -40,7 +40,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell);
typedef struct typedef struct
{ {
/* IUnknown fields */ /* IUnknown fields */
ICOM_VFIELD(IEnumFORMATETC); IEnumFORMATETCVtbl *lpVtbl;
DWORD ref; DWORD ref;
/* IEnumFORMATETC fields */ /* IEnumFORMATETC fields */
UINT posFmt; UINT posFmt;
@ -208,7 +208,7 @@ static HRESULT WINAPI IEnumFORMATETC_fnClone(LPENUMFORMATETC iface, LPENUMFORMAT
typedef struct typedef struct
{ {
/* IUnknown fields */ /* IUnknown fields */
ICOM_VFIELD(IDataObject); IDataObjectVtbl *lpVtbl;
DWORD ref; DWORD ref;
/* IDataObject fields */ /* IDataObject fields */

2
dlls/shell32/dragdrophelper.c
View File

@ -46,7 +46,7 @@ WINE_DEFAULT_DEBUG_CHANNEL (shell);
*/ */
typedef struct { typedef struct {
ICOM_VFIELD (IDropTargetHelper); IDropTargetHelperVtbl *lpVtbl;
DWORD ref; DWORD ref;
} IDropTargetHelperImpl; } IDropTargetHelperImpl;

2
dlls/shell32/enumidlist.c
View File

@ -45,7 +45,7 @@ typedef struct tagENUMLIST
typedef struct typedef struct
{ {
ICOM_VFIELD(IEnumIDList); IEnumIDListVtbl *lpVtbl;
DWORD ref; DWORD ref;
LPENUMLIST mpFirst; LPENUMLIST mpFirst;
LPENUMLIST mpLast; LPENUMLIST mpLast;

10
dlls/shell32/folders.c
View File

@ -46,11 +46,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell);
*/ */
typedef struct typedef struct
{ {
ICOM_VFIELD(IExtractIconW); IExtractIconWVtbl *lpVtbl;
DWORD ref; DWORD ref;
ICOM_VTABLE(IPersistFile)* lpvtblPersistFile; IPersistFileVtbl *lpvtblPersistFile;
ICOM_VTABLE(IExtractIconA)* lpvtblExtractIconA; IExtractIconAVtbl *lpvtblExtractIconA;
LPITEMIDLIST pidl; LPITEMIDLIST pidl;
} IExtractIconWImpl; } IExtractIconWImpl;
static struct ICOM_VTABLE(IExtractIconA) eiavt; static struct ICOM_VTABLE(IExtractIconA) eiavt;

10
dlls/shell32/shelllink.c
View File

@ -121,12 +121,12 @@ static ICOM_VTABLE(IPersistStream) psvt;
typedef struct typedef struct
{ {
ICOM_VFIELD(IShellLinkA); IShellLinkAVtbl *lpVtbl;
DWORD ref; DWORD ref;
ICOM_VTABLE(IShellLinkW)* lpvtblw; IShellLinkWVtbl *lpvtblw;
ICOM_VTABLE(IPersistFile)* lpvtblPersistFile; IPersistFileVtbl *lpvtblPersistFile;
ICOM_VTABLE(IPersistStream)* lpvtblPersistStream; IPersistStreamVtbl *lpvtblPersistStream;
/* data structures according to the informations in the link */ /* data structures according to the informations in the link */
LPITEMIDLIST pPidl; LPITEMIDLIST pPidl;

4
dlls/shell32/shellole.c
View File

@ -278,7 +278,7 @@ static ICOM_VTABLE(IMalloc) VT_Shell_IMalloc32;
/* this is the static object instance */ /* this is the static object instance */
typedef struct { typedef struct {
ICOM_VFIELD(IMalloc); IMallocVtbl *lpVtbl;
DWORD dummy; DWORD dummy;
} _ShellMalloc; } _ShellMalloc;
@ -498,7 +498,7 @@ HRESULT WINAPI SHGetDesktopFolder(IShellFolder **psf)
typedef struct typedef struct
{ {
ICOM_VFIELD(IClassFactory); IClassFactoryVtbl *lpVtbl;
DWORD ref; DWORD ref;
CLSID *rclsid; CLSID *rclsid;
LPFNCREATEINSTANCE lpfnCI; LPFNCREATEINSTANCE lpfnCI;

2
dlls/shell32/shfldr_desktop.c
View File

@ -58,7 +58,7 @@ WINE_DEFAULT_DEBUG_CHANNEL (shell);
*/ */
typedef struct { typedef struct {
ICOM_VFIELD (IShellFolder2); IShellFolder2Vtbl *lpVtbl;
DWORD ref; DWORD ref;
CLSID *pclsid; CLSID *pclsid;

12
dlls/shell32/shfldr_fs.c
View File

@ -58,12 +58,12 @@ WINE_DEFAULT_DEBUG_CHANNEL (shell);
*/ */
typedef struct { typedef struct {
ICOM_VFIELD (IUnknown); IUnknownVtbl *lpVtbl;
DWORD ref; DWORD ref;
ICOM_VTABLE (IShellFolder2) * lpvtblShellFolder; IShellFolder2Vtbl *lpvtblShellFolder;
ICOM_VTABLE (IPersistFolder3) * lpvtblPersistFolder3; IPersistFolder3Vtbl *lpvtblPersistFolder3;
ICOM_VTABLE (IDropTarget) * lpvtblDropTarget; IDropTargetVtbl *lpvtblDropTarget;
ICOM_VTABLE (ISFHelper) * lpvtblSFHelper; ISFHelperVtbl *lpvtblSFHelper;
IUnknown *pUnkOuter; /* used for aggregation */ IUnknown *pUnkOuter; /* used for aggregation */

6
dlls/shell32/shfldr_mycomp.c
View File

@ -55,9 +55,9 @@ WINE_DEFAULT_DEBUG_CHANNEL (shell);
*/ */
typedef struct { typedef struct {
ICOM_VFIELD (IShellFolder2); IShellFolder2Vtbl *lpVtbl;
DWORD ref; DWORD ref;
ICOM_VTABLE (IPersistFolder2) * lpVtblPersistFolder2; IPersistFolder2Vtbl *lpVtblPersistFolder2;
/* both paths are parsible from the desktop */ /* both paths are parsible from the desktop */
LPITEMIDLIST pidlRoot; /* absolute pidl */ LPITEMIDLIST pidlRoot; /* absolute pidl */

2
dlls/shell32/shlfsbind.c
View File

@ -41,7 +41,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(pidl);
*/ */
typedef struct typedef struct
{ {
ICOM_VFIELD(IFileSystemBindData); IFileSystemBindDataVtbl *lpVtbl;
DWORD ref; DWORD ref;
WIN32_FIND_DATAW findFile; WIN32_FIND_DATAW findFile;
} IFileSystemBindDataImpl; } IFileSystemBindDataImpl;

13
dlls/shell32/shlview.c
View File

@ -74,12 +74,13 @@ typedef struct
}LISTVIEW_SORT_INFO, *LPLISTVIEW_SORT_INFO; }LISTVIEW_SORT_INFO, *LPLISTVIEW_SORT_INFO;
typedef struct typedef struct
{ ICOM_VFIELD(IShellView); {
DWORD ref; IShellViewVtbl* lpVtbl;
ICOM_VTABLE(IOleCommandTarget)* lpvtblOleCommandTarget; DWORD ref;
ICOM_VTABLE(IDropTarget)* lpvtblDropTarget; IOleCommandTargetVtbl* lpvtblOleCommandTarget;
ICOM_VTABLE(IDropSource)* lpvtblDropSource; IDropTargetVtbl* lpvtblDropTarget;
ICOM_VTABLE(IViewObject)* lpvtblViewObject; IDropSourceVtbl* lpvtblDropSource;
IViewObjectVtbl* lpvtblViewObject;
IShellFolder* pSFParent; IShellFolder* pSFParent;
IShellFolder2* pSF2Parent; IShellFolder2* pSF2Parent;
IShellBrowser* pShellBrowser; IShellBrowser* pShellBrowser;

2
dlls/shell32/shv_bg_cmenu.c
View File

@ -41,7 +41,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell);
*/ */
typedef struct typedef struct
{ {
ICOM_VFIELD(IContextMenu2); IContextMenu2Vtbl *lpVtbl;
IShellFolder* pSFParent; IShellFolder* pSFParent;
DWORD ref; DWORD ref;
} BgCmImpl; } BgCmImpl;

2
dlls/shell32/shv_item_cmenu.c
View File

@ -41,7 +41,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell);
* IContextMenu Implementation * IContextMenu Implementation
*/ */
typedef struct typedef struct
{ ICOM_VFIELD(IContextMenu2); { IContextMenu2Vtbl *lpVtbl;
DWORD ref; DWORD ref;
IShellFolder* pSFParent; IShellFolder* pSFParent;
LPITEMIDLIST pidl; /* root pidl */ LPITEMIDLIST pidl; /* root pidl */

2
dlls/shlwapi/assoc.c
View File

@ -58,7 +58,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell);
typedef struct typedef struct
{ {
ICOM_VFIELD(IQueryAssociations); IQueryAssociationsVtbl *lpVtbl;
LONG ref; LONG ref;
HKEY hkeySource; HKEY hkeySource;
HKEY hkeyProgID; HKEY hkeyProgID;

2
dlls/shlwapi/istream.c
View File

@ -36,7 +36,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell);
/* Layout of ISHFileStream object */ /* Layout of ISHFileStream object */
typedef struct typedef struct
{ {
ICOM_VFIELD(IStream); IStreamVtbl *lpVtbl;
ULONG ref; ULONG ref;
HANDLE hFile; HANDLE hFile;
DWORD dwMode; DWORD dwMode;

2
dlls/shlwapi/regstream.c
View File

@ -33,7 +33,7 @@
WINE_DEFAULT_DEBUG_CHANNEL(shell); WINE_DEFAULT_DEBUG_CHANNEL(shell);
typedef struct typedef struct
{ ICOM_VFIELD(IStream); { IStreamVtbl *lpVtbl;
DWORD ref; DWORD ref;
HKEY hKey; HKEY hKey;
LPBYTE pbBuffer; LPBYTE pbBuffer;

4
dlls/winmm/winealsa/audio.c
View File

@ -2095,7 +2095,7 @@ typedef struct IDsDriverBufferImpl IDsDriverBufferImpl;
struct IDsDriverImpl struct IDsDriverImpl
{ {
/* IUnknown fields */ /* IUnknown fields */
ICOM_VFIELD(IDsDriver); IDsDriverVtbl *lpVtbl;
DWORD ref; DWORD ref;
/* IDsDriverImpl fields */ /* IDsDriverImpl fields */
UINT wDevID; UINT wDevID;
@ -2105,7 +2105,7 @@ struct IDsDriverImpl
struct IDsDriverBufferImpl struct IDsDriverBufferImpl
{ {
/* IUnknown fields */ /* IUnknown fields */
ICOM_VFIELD(IDsDriverBuffer); IDsDriverBufferVtbl *lpVtbl;
DWORD ref; DWORD ref;
/* IDsDriverBufferImpl fields */ /* IDsDriverBufferImpl fields */
IDsDriverImpl* drv; IDsDriverImpl* drv;

4
dlls/winmm/winealsa/audio_05.c
View File

@ -1359,7 +1359,7 @@ typedef struct IDsDriverBufferImpl IDsDriverBufferImpl;
struct IDsDriverImpl struct IDsDriverImpl
{ {
/* IUnknown fields */ /* IUnknown fields */
ICOM_VFIELD(IDsDriver); IDsDriverVtbl *lpVtbl;
DWORD ref; DWORD ref;
/* IDsDriverImpl fields */ /* IDsDriverImpl fields */
UINT wDevID; UINT wDevID;
@ -1369,7 +1369,7 @@ struct IDsDriverImpl
struct IDsDriverBufferImpl struct IDsDriverBufferImpl
{ {
/* IUnknown fields */ /* IUnknown fields */
ICOM_VFIELD(IDsDriverBuffer); IDsDriverBufferVtbl *lpVtbl;
DWORD ref; DWORD ref;
/* IDsDriverBufferImpl fields */ /* IDsDriverBufferImpl fields */
IDsDriverImpl* drv; IDsDriverImpl* drv;

4
dlls/winmm/wineaudioio/audio.c
View File

@ -1285,7 +1285,7 @@ typedef struct IDsDriverBufferImpl IDsDriverBufferImpl;
struct IDsDriverImpl struct IDsDriverImpl
{ {
/* IUnknown fields */ /* IUnknown fields */
ICOM_VFIELD(IDsDriver); IDsDriverVtbl *lpVtbl;
DWORD ref; DWORD ref;
/* IDsDriverImpl fields */ /* IDsDriverImpl fields */
UINT wDevID; UINT wDevID;
@ -1295,7 +1295,7 @@ struct IDsDriverImpl
struct IDsDriverBufferImpl struct IDsDriverBufferImpl
{ {
/* IUnknown fields */ /* IUnknown fields */
ICOM_VFIELD(IDsDriverBuffer); IDsDriverBufferVtbl *lpVtbl;
DWORD ref; DWORD ref;
/* IDsDriverBufferImpl fields */ /* IDsDriverBufferImpl fields */
IDsDriverImpl* drv; IDsDriverImpl* drv;

4
dlls/winmm/winejack/audio.c
View File

@ -1784,7 +1784,7 @@ typedef struct IDsDriverBufferImpl IDsDriverBufferImpl;
struct IDsDriverImpl struct IDsDriverImpl
{ {
/* IUnknown fields */ /* IUnknown fields */
ICOM_VFIELD(IDsDriver); IDsDriverVtbl *lpVtbl;
DWORD ref; DWORD ref;
/* IDsDriverImpl fields */ /* IDsDriverImpl fields */
UINT wDevID; UINT wDevID;
@ -1794,7 +1794,7 @@ struct IDsDriverImpl
struct IDsDriverBufferImpl struct IDsDriverBufferImpl
{ {
/* IUnknown fields */ /* IUnknown fields */
ICOM_VFIELD(IDsDriverBuffer); IDsDriverBufferVtbl *lpVtbl;
DWORD ref; DWORD ref;
/* IDsDriverBufferImpl fields */ /* IDsDriverBufferImpl fields */
IDsDriverImpl* drv; IDsDriverImpl* drv;

16
dlls/winmm/wineoss/audio.c
View File

@ -2306,7 +2306,7 @@ typedef struct IDsDriverBufferImpl IDsDriverBufferImpl;
struct IDsDriverPropertySetImpl struct IDsDriverPropertySetImpl
{ {
/* IUnknown fields */ /* IUnknown fields */
ICOM_VFIELD(IDsDriverPropertySet); IDsDriverPropertySetVtbl *lpVtbl;
DWORD ref; DWORD ref;
IDsDriverBufferImpl* buffer; IDsDriverBufferImpl* buffer;
@ -2315,7 +2315,7 @@ struct IDsDriverPropertySetImpl
struct IDsDriverNotifyImpl struct IDsDriverNotifyImpl
{ {
/* IUnknown fields */ /* IUnknown fields */
ICOM_VFIELD(IDsDriverNotify); IDsDriverNotifyVtbl *lpVtbl;
DWORD ref; DWORD ref;
/* IDsDriverNotifyImpl fields */ /* IDsDriverNotifyImpl fields */
@ -2328,7 +2328,7 @@ struct IDsDriverNotifyImpl
struct IDsDriverImpl struct IDsDriverImpl
{ {
/* IUnknown fields */ /* IUnknown fields */
ICOM_VFIELD(IDsDriver); IDsDriverVtbl *lpVtbl;
DWORD ref; DWORD ref;
/* IDsDriverImpl fields */ /* IDsDriverImpl fields */
@ -2342,7 +2342,7 @@ struct IDsDriverImpl
struct IDsDriverBufferImpl struct IDsDriverBufferImpl
{ {
/* IUnknown fields */ /* IUnknown fields */
ICOM_VFIELD(IDsDriverBuffer); IDsDriverBufferVtbl *lpVtbl;
DWORD ref; DWORD ref;
/* IDsDriverBufferImpl fields */ /* IDsDriverBufferImpl fields */
@ -3950,7 +3950,7 @@ typedef struct IDsCaptureDriverBufferImpl IDsCaptureDriverBufferImpl;
struct IDsCaptureDriverPropertySetImpl struct IDsCaptureDriverPropertySetImpl
{ {
/* IUnknown fields */ /* IUnknown fields */
ICOM_VFIELD(IDsDriverPropertySet); IDsDriverPropertySetVtbl *lpVtbl;
DWORD ref; DWORD ref;
IDsCaptureDriverBufferImpl* capture_buffer; IDsCaptureDriverBufferImpl* capture_buffer;
@ -3959,7 +3959,7 @@ struct IDsCaptureDriverPropertySetImpl
struct IDsCaptureDriverNotifyImpl struct IDsCaptureDriverNotifyImpl
{ {
/* IUnknown fields */ /* IUnknown fields */
ICOM_VFIELD(IDsDriverNotify); IDsDriverNotifyVtbl *lpVtbl;
DWORD ref; DWORD ref;
IDsCaptureDriverBufferImpl* capture_buffer; IDsCaptureDriverBufferImpl* capture_buffer;
@ -3968,7 +3968,7 @@ struct IDsCaptureDriverNotifyImpl
struct IDsCaptureDriverImpl struct IDsCaptureDriverImpl
{ {
/* IUnknown fields */ /* IUnknown fields */
ICOM_VFIELD(IDsCaptureDriver); IDsCaptureDriverVtbl *lpVtbl;
DWORD ref; DWORD ref;
/* IDsCaptureDriverImpl fields */ /* IDsCaptureDriverImpl fields */
@ -3979,7 +3979,7 @@ struct IDsCaptureDriverImpl
struct IDsCaptureDriverBufferImpl struct IDsCaptureDriverBufferImpl
{ {
/* IUnknown fields */ /* IUnknown fields */
ICOM_VFIELD(IDsCaptureDriverBuffer); IDsCaptureDriverBufferVtbl *lpVtbl;
DWORD ref; DWORD ref;
/* IDsCaptureDriverBufferImpl fields */ /* IDsCaptureDriverBufferImpl fields */

1
include/objbase.h
View File

@ -298,7 +298,6 @@
/* Wine-specific macros */ /* Wine-specific macros */
#define ICOM_VTABLE(iface) iface##Vtbl #define ICOM_VTABLE(iface) iface##Vtbl
#define ICOM_VFIELD(iface) ICOM_VTABLE(iface)* lpVtbl
#define ICOM_THIS(impl,iface) impl* const This=(impl*)(iface) #define ICOM_THIS(impl,iface) impl* const This=(impl*)(iface)
#define ICOM_THIS_MULTI(impl,field,iface) impl* const This=(impl*)((char*)(iface) - offsetof(impl,field)) #define ICOM_THIS_MULTI(impl,field,iface) impl* const This=(impl*)((char*)(iface) - offsetof(impl,field))