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

inetcomm: COM cleanup for the IStream iface.

Browse Source
This commit is contained in:
Michael Stefaniuc 2013-03-04 00:36:06 +01:00 committed by Alexandre Julliard
parent c7d05df81d
commit 9a436a98f4
1 changed files with 25 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
dlls/inetcomm/mimeole.c
View File

@ -572,19 +572,14 @@ static HRESULT WINAPI MimeBody_IsDirty(
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI MimeBody_Load( static HRESULT WINAPI MimeBody_Load(IMimeBody *iface, IStream *pStm)
IMimeBody* iface,
LPSTREAM pStm)
{ {
MimeBody *This = impl_from_IMimeBody(iface); MimeBody *This = impl_from_IMimeBody(iface);
TRACE("(%p)->(%p)\n", iface, pStm); TRACE("(%p)->(%p)\n", iface, pStm);
return parse_headers(This, pStm); return parse_headers(This, pStm);
} }
static HRESULT WINAPI MimeBody_Save( static HRESULT WINAPI MimeBody_Save(IMimeBody *iface, IStream *pStm, BOOL fClearDirty)
IMimeBody* iface,
LPSTREAM pStm,
BOOL fClearDirty)
{ {
FIXME("stub\n"); FIXME("stub\n");
return E_NOTIMPL; return E_NOTIMPL;
@ -1150,62 +1145,58 @@ HRESULT MimeBody_create(IUnknown *outer, void **ppv)
typedef struct typedef struct
{ {
IStreamVtbl *lpVtbl; IStream IStream_iface;
LONG refs; LONG ref;
IStream *base; IStream *base;
ULARGE_INTEGER pos, start, length; ULARGE_INTEGER pos, start, length;
} sub_stream_t; } sub_stream_t;
static inline sub_stream_t *impl_from_IStream( IStream *iface ) static inline sub_stream_t *impl_from_IStream(IStream *iface)
{ {
return (sub_stream_t *)((char*)iface - FIELD_OFFSET(sub_stream_t, lpVtbl)); return CONTAINING_RECORD(iface, sub_stream_t, IStream_iface);
} }
static HRESULT WINAPI sub_stream_QueryInterface( static HRESULT WINAPI sub_stream_QueryInterface(IStream *iface, REFIID riid, void **ppv)
IStream* iface,
REFIID riid,
void **ppvObject)
{ {
sub_stream_t *This = impl_from_IStream(iface); sub_stream_t *This = impl_from_IStream(iface);
TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid), ppvObject); TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid), ppv);
*ppvObject = NULL; *ppv = NULL;
if(IsEqualIID(riid, &IID_IUnknown) || if(IsEqualIID(riid, &IID_IUnknown) ||
IsEqualIID(riid, &IID_ISequentialStream) || IsEqualIID(riid, &IID_ISequentialStream) ||
IsEqualIID(riid, &IID_IStream)) IsEqualIID(riid, &IID_IStream))
{ {
IStream_AddRef(iface); IStream_AddRef(iface);
*ppvObject = iface; *ppv = iface;
return S_OK; return S_OK;
} }
return E_NOINTERFACE; return E_NOINTERFACE;
} }
static ULONG WINAPI sub_stream_AddRef( static ULONG WINAPI sub_stream_AddRef(IStream *iface)
IStream* iface)
{ {
sub_stream_t *This = impl_from_IStream(iface); sub_stream_t *This = impl_from_IStream(iface);
LONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p)\n", This); TRACE("(%p) ref=%d\n", This, ref);
return InterlockedIncrement(&This->refs);
return ref;
} }
static ULONG WINAPI sub_stream_Release( static ULONG WINAPI sub_stream_Release(IStream *iface)
IStream* iface)
{ {
sub_stream_t *This = impl_from_IStream(iface); sub_stream_t *This = impl_from_IStream(iface);
LONG refs; LONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p)\n", This); TRACE("(%p) ref=%d\n", This, ref);
refs = InterlockedDecrement(&This->refs);
if(!refs) if(!ref)
{ {
IStream_Release(This->base); IStream_Release(This->base);
HeapFree(GetProcessHeap(), 0, This); HeapFree(GetProcessHeap(), 0, This);
} }
return refs; return ref;
} }
static HRESULT WINAPI sub_stream_Read( static HRESULT WINAPI sub_stream_Read(
@ -1422,15 +1413,15 @@ static HRESULT create_sub_stream(IStream *stream, ULARGE_INTEGER start, ULARGE_I
This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This));
if(!This) return E_OUTOFMEMORY; if(!This) return E_OUTOFMEMORY;
This->lpVtbl = &sub_stream_vtbl; This->IStream_iface.lpVtbl = &sub_stream_vtbl;
This->refs = 1; This->ref = 1;
This->start = start; This->start = start;
This->length = length; This->length = length;
This->pos.QuadPart = 0; This->pos.QuadPart = 0;
IStream_AddRef(stream); IStream_AddRef(stream);
This->base = stream; This->base = stream;
*out = (IStream*)&This->lpVtbl; *out = &This->IStream_iface;
return S_OK; return S_OK;
} }
@ -1733,10 +1724,7 @@ static HRESULT WINAPI MimeMessage_Load(IMimeMessage *iface, IStream *pStm)
return S_OK; return S_OK;
} }
static HRESULT WINAPI MimeMessage_Save( static HRESULT WINAPI MimeMessage_Save(IMimeMessage *iface, IStream *pStm, BOOL fClearDirty)
IMimeMessage *iface,
LPSTREAM pStm,
BOOL fClearDirty)
{ {
FIXME("(%p)->(%p, %s)\n", iface, pStm, fClearDirty ? "TRUE" : "FALSE"); FIXME("(%p)->(%p, %s)\n", iface, pStm, fClearDirty ? "TRUE" : "FALSE");
return E_NOTIMPL; return E_NOTIMPL;