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

xmllite: COM cleanup in reader.c.

This commit is contained in:
Michael Stefaniuc 2011-03-24 13:53:43 +01:00 committed by Alexandre Julliard
parent 4c98182a5b
commit 337e71d4f3
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
dlls/xmllite/reader.c
View File

@ -38,7 +38,7 @@ static HRESULT xmlreaderinput_query_for_stream(IXmlReaderInput *iface, void **pO
typedef struct _xmlreader typedef struct _xmlreader
{ {
const IXmlReaderVtbl *lpVtbl; IXmlReader IXmlReader_iface;
LONG ref; LONG ref;
IXmlReaderInput *input; IXmlReaderInput *input;
ISequentialStream *stream;/* stored as sequential stream, cause currently ISequentialStream *stream;/* stored as sequential stream, cause currently
@ -49,19 +49,19 @@ typedef struct _xmlreader
typedef struct _xmlreaderinput typedef struct _xmlreaderinput
{ {
const IUnknownVtbl *lpVtbl; IXmlReaderInput IXmlReaderInput_iface;
LONG ref; LONG ref;
IUnknown *input; /* reference passed on IXmlReaderInput creation */ IUnknown *input; /* reference passed on IXmlReaderInput creation */
} xmlreaderinput; } xmlreaderinput;
static inline xmlreader *impl_from_IXmlReader(IXmlReader *iface) static inline xmlreader *impl_from_IXmlReader(IXmlReader *iface)
{ {
return (xmlreader *)((char*)iface - FIELD_OFFSET(xmlreader, lpVtbl)); return CONTAINING_RECORD(iface, xmlreader, IXmlReader_iface);
} }
static inline xmlreaderinput *impl_from_IXmlReaderInput(IXmlReaderInput *iface) static inline xmlreaderinput *impl_from_IXmlReaderInput(IXmlReaderInput *iface)
{ {
return (xmlreaderinput *)((char*)iface - FIELD_OFFSET(xmlreaderinput, lpVtbl)); return CONTAINING_RECORD(iface, xmlreaderinput, IXmlReaderInput_iface);
} }
static HRESULT WINAPI xmlreader_QueryInterface(IXmlReader *iface, REFIID riid, void** ppvObject) static HRESULT WINAPI xmlreader_QueryInterface(IXmlReader *iface, REFIID riid, void** ppvObject)
@ -450,14 +450,14 @@ HRESULT WINAPI CreateXmlReader(REFIID riid, void **pObject, IMalloc *pMalloc)
reader = HeapAlloc(GetProcessHeap(), 0, sizeof (*reader)); reader = HeapAlloc(GetProcessHeap(), 0, sizeof (*reader));
if(!reader) return E_OUTOFMEMORY; if(!reader) return E_OUTOFMEMORY;
reader->lpVtbl = &xmlreader_vtbl; reader->IXmlReader_iface.lpVtbl = &xmlreader_vtbl;
reader->ref = 1; reader->ref = 1;
reader->stream = NULL; reader->stream = NULL;
reader->input = NULL; reader->input = NULL;
reader->state = XmlReadState_Closed; reader->state = XmlReadState_Closed;
reader->line = reader->pos = 0; reader->line = reader->pos = 0;
*pObject = &reader->lpVtbl; *pObject = &reader->IXmlReader_iface;
TRACE("returning iface %p\n", *pObject); TRACE("returning iface %p\n", *pObject);
@ -481,11 +481,11 @@ HRESULT WINAPI CreateXmlReaderInputWithEncodingName(IUnknown *stream,
readerinput = HeapAlloc(GetProcessHeap(), 0, sizeof (*readerinput)); readerinput = HeapAlloc(GetProcessHeap(), 0, sizeof (*readerinput));
if(!readerinput) return E_OUTOFMEMORY; if(!readerinput) return E_OUTOFMEMORY;
readerinput->lpVtbl = &xmlreaderinput_vtbl; readerinput->IXmlReaderInput_iface.lpVtbl = &xmlreaderinput_vtbl;
readerinput->ref = 1; readerinput->ref = 1;
IUnknown_QueryInterface(stream, &IID_IUnknown, (void**)&readerinput->input); IUnknown_QueryInterface(stream, &IID_IUnknown, (void**)&readerinput->input);
*ppInput = (IXmlReaderInput*)&readerinput->lpVtbl; *ppInput = &readerinput->IXmlReaderInput_iface;
TRACE("returning iface %p\n", *ppInput); TRACE("returning iface %p\n", *ppInput);