March 2013 - Wine-commits - list.winehq.org

Michael Stefaniuc : inetcomm: COM cleanup for the IMimeMessage iface.
by Alexandre Julliard 04 Mar '13

04 Mar '13

Module: wine Branch: master Commit: f18d156352e9b7f9d7675fdd5846c8cbd7846c59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f18d156352e9b7f9d7675fdd5… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Mar 4 00:28:47 2013 +0100 inetcomm: COM cleanup for the IMimeMessage iface. --- dlls/inetcomm/mimeole.c | 85 +++++++++++++++++++++-------------------------- 1 files changed, 38 insertions(+), 47 deletions(-) diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index ac4142a..3e23fc0 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -1428,15 +1428,19 @@ typedef struct body_t typedef struct MimeMessage { - const IMimeMessageVtbl *lpVtbl; - - LONG refs; + IMimeMessage IMimeMessage_iface; + LONG ref; IStream *stream; struct list body_tree; DWORD next_index; } MimeMessage; +static inline MimeMessage *impl_from_IMimeMessage(IMimeMessage *iface) +{ + return CONTAINING_RECORD(iface, MimeMessage, IMimeMessage_iface); +} + static HRESULT WINAPI MimeMessage_QueryInterface(IMimeMessage *iface, REFIID riid, void **ppv) { TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ppv); @@ -1459,9 +1463,12 @@ static HRESULT WINAPI MimeMessage_QueryInterface(IMimeMessage *iface, REFIID rii static ULONG WINAPI MimeMessage_AddRef(IMimeMessage *iface) { - MimeMessage *This = (MimeMessage *)iface; - TRACE("(%p)->()\n", iface); - return InterlockedIncrement(&This->refs); + MimeMessage *This = impl_from_IMimeMessage(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + return ref; } static void empty_body_list(struct list *list) @@ -1478,13 +1485,12 @@ static void empty_body_list(struct list *list) static ULONG WINAPI MimeMessage_Release(IMimeMessage *iface) { - MimeMessage *This = (MimeMessage *)iface; - ULONG refs; + MimeMessage *This = impl_from_IMimeMessage(iface); + ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p)->()\n", iface); + TRACE("(%p) ref=%d\n", This, ref); - refs = InterlockedDecrement(&This->refs); - if (!refs) + if (!ref) { empty_body_list(&This->body_tree); @@ -1492,7 +1498,7 @@ static ULONG WINAPI MimeMessage_Release(IMimeMessage *iface) HeapFree(GetProcessHeap(), 0, This); } - return refs; + return ref; } /*** IPersist methods ***/ @@ -1674,11 +1680,9 @@ static body_t *create_sub_body(MimeMessage *msg, IStream *pStm, BODYOFFSETS *off return body; } -static HRESULT WINAPI MimeMessage_Load( - IMimeMessage *iface, - LPSTREAM pStm) +static HRESULT WINAPI MimeMessage_Load(IMimeMessage *iface, IStream *pStm) { - MimeMessage *This = (MimeMessage *)iface; + MimeMessage *This = impl_from_IMimeMessage(iface); body_t *root_body; BODYOFFSETS offsets; ULARGE_INTEGER cur; @@ -1734,12 +1738,11 @@ static HRESULT WINAPI MimeMessage_InitNew( } /*** IMimeMessageTree methods ***/ -static HRESULT WINAPI MimeMessage_GetMessageSource( - IMimeMessage *iface, - IStream **ppStream, - DWORD dwFlags) +static HRESULT WINAPI MimeMessage_GetMessageSource(IMimeMessage *iface, IStream **ppStream, + DWORD dwFlags) { - MimeMessage *This = (MimeMessage *)iface; + MimeMessage *This = impl_from_IMimeMessage(iface); + FIXME("(%p)->(%p, 0x%x)\n", iface, ppStream, dwFlags); IStream_AddRef(This->stream); @@ -1822,13 +1825,10 @@ static HRESULT find_body(struct list *list, HBODY hbody, body_t **body) return S_FALSE; } -static HRESULT WINAPI MimeMessage_BindToObject( - IMimeMessage *iface, - const HBODY hBody, - REFIID riid, - void **ppvObject) +static HRESULT WINAPI MimeMessage_BindToObject(IMimeMessage *iface, const HBODY hBody, REFIID riid, + void **ppvObject) { - MimeMessage *This = (MimeMessage *)iface; + MimeMessage *This = impl_from_IMimeMessage(iface); HRESULT hr; body_t *body; @@ -1933,13 +1933,10 @@ static HRESULT WINAPI MimeMessage_InsertBody( return E_NOTIMPL; } -static HRESULT WINAPI MimeMessage_GetBody( - IMimeMessage *iface, - BODYLOCATION location, - HBODY hPivot, - LPHBODY phBody) +static HRESULT WINAPI MimeMessage_GetBody(IMimeMessage *iface, BODYLOCATION location, HBODY hPivot, + HBODY *phBody) { - MimeMessage *This = (MimeMessage *)iface; + MimeMessage *This = impl_from_IMimeMessage(iface); body_t *body; HRESULT hr; @@ -1981,14 +1978,11 @@ static void count_children(body_t *body, boolean recurse, ULONG *count) } } -static HRESULT WINAPI MimeMessage_CountBodies( - IMimeMessage *iface, - HBODY hParent, - boolean fRecurse, - ULONG *pcBodies) +static HRESULT WINAPI MimeMessage_CountBodies(IMimeMessage *iface, HBODY hParent, boolean fRecurse, + ULONG *pcBodies) { HRESULT hr; - MimeMessage *This = (MimeMessage *)iface; + MimeMessage *This = impl_from_IMimeMessage(iface); body_t *body; TRACE("(%p)->(%p, %s, %p)\n", iface, hParent, fRecurse ? "TRUE" : "FALSE", pcBodies); @@ -2044,12 +2038,9 @@ static HRESULT WINAPI MimeMessage_FindFirst( return find_next( iface, NULL, pFindBody, phBody ); } -static HRESULT WINAPI MimeMessage_FindNext( - IMimeMessage *iface, - LPFINDBODY pFindBody, - LPHBODY phBody) +static HRESULT WINAPI MimeMessage_FindNext(IMimeMessage *iface, FINDBODY *pFindBody, HBODY *phBody) { - MimeMessage *This = (MimeMessage *)iface; + MimeMessage *This = impl_from_IMimeMessage(iface); body_t *body; HRESULT hr; @@ -2561,13 +2552,13 @@ HRESULT MimeMessage_create(IUnknown *outer, void **obj) This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); if (!This) return E_OUTOFMEMORY; - This->lpVtbl = &MimeMessageVtbl; - This->refs = 1; + This->IMimeMessage_iface.lpVtbl = &MimeMessageVtbl; + This->ref = 1; This->stream = NULL; list_init(&This->body_tree); This->next_index = 1; - *obj = &This->lpVtbl; + *obj = &This->IMimeMessage_iface; return S_OK; }

1 0

Michael Stefaniuc : inetcomm: Pass the object instead of an iface to a helper function.
by Alexandre Julliard 04 Mar '13

04 Mar '13

Module: wine Branch: master Commit: d50b3b20682822d61a4605398723648b92fb0c64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d50b3b20682822d61a4605398… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Mar 4 00:29:53 2013 +0100 inetcomm: Pass the object instead of an iface to a helper function. --- dlls/inetcomm/mimeole.c | 14 ++++++-------- 1 files changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index 3e23fc0..d897d38 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -1996,9 +1996,8 @@ static HRESULT WINAPI MimeMessage_CountBodies(IMimeMessage *iface, HBODY hParent return S_OK; } -static HRESULT find_next(IMimeMessage *msg, body_t *body, LPFINDBODY find, HBODY *out) +static HRESULT find_next(MimeMessage *This, body_t *body, FINDBODY *find, HBODY *out) { - MimeMessage *This = (MimeMessage *)msg; struct list *ptr; HBODY next; @@ -2027,15 +2026,14 @@ static HRESULT find_next(IMimeMessage *msg, body_t *body, LPFINDBODY find, HBODY return MIME_E_NOT_FOUND; } -static HRESULT WINAPI MimeMessage_FindFirst( - IMimeMessage *iface, - LPFINDBODY pFindBody, - LPHBODY phBody) +static HRESULT WINAPI MimeMessage_FindFirst(IMimeMessage *iface, FINDBODY *pFindBody, HBODY *phBody) { + MimeMessage *This = impl_from_IMimeMessage(iface); + TRACE("(%p)->(%p, %p)\n", iface, pFindBody, phBody); pFindBody->dwReserved = 0; - return find_next( iface, NULL, pFindBody, phBody ); + return find_next(This, NULL, pFindBody, phBody); } static HRESULT WINAPI MimeMessage_FindNext(IMimeMessage *iface, FINDBODY *pFindBody, HBODY *phBody) @@ -2048,7 +2046,7 @@ static HRESULT WINAPI MimeMessage_FindNext(IMimeMessage *iface, FINDBODY *pFindB hr = find_body( &This->body_tree, UlongToHandle( pFindBody->dwReserved ), &body ); if (hr != S_OK) return MIME_E_NOT_FOUND; - return find_next( iface, body, pFindBody, phBody ); + return find_next(This, body, pFindBody, phBody); } static HRESULT WINAPI MimeMessage_ResolveURL(

1 0

Michael Stefaniuc : inetcomm: COM cleanup for the IMimeSecurity iface.
by Alexandre Julliard 04 Mar '13

04 Mar '13

Module: wine Branch: master Commit: f44d66c6175240ad037021b9f15f39c652449112 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f44d66c6175240ad037021b9f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Mar 4 00:31:56 2013 +0100 inetcomm: COM cleanup for the IMimeSecurity iface. --- dlls/inetcomm/mimeole.c | 55 +++++++++++++++++++++++------------------------ 1 files changed, 27 insertions(+), 28 deletions(-) diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index d897d38..2b7a0f3 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -2592,54 +2592,53 @@ HRESULT WINAPI MimeOleCreateVirtualStream(IStream **ppStream) typedef struct MimeSecurity { - const IMimeSecurityVtbl *lpVtbl; - - LONG refs; + IMimeSecurity IMimeSecurity_iface; + LONG ref; } MimeSecurity; -static HRESULT WINAPI MimeSecurity_QueryInterface( - IMimeSecurity* iface, - REFIID riid, - void** obj) +static inline MimeSecurity *impl_from_IMimeSecurity(IMimeSecurity *iface) { - TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), obj); + return CONTAINING_RECORD(iface, MimeSecurity, IMimeSecurity_iface); +} + +static HRESULT WINAPI MimeSecurity_QueryInterface(IMimeSecurity *iface, REFIID riid, void **ppv) +{ + TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ppv); if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IMimeSecurity)) { - *obj = iface; + *ppv = iface; IMimeSecurity_AddRef(iface); return S_OK; } FIXME("no interface for %s\n", debugstr_guid(riid)); - *obj = NULL; + *ppv = NULL; return E_NOINTERFACE; } -static ULONG WINAPI MimeSecurity_AddRef( - IMimeSecurity* iface) +static ULONG WINAPI MimeSecurity_AddRef(IMimeSecurity *iface) { - MimeSecurity *This = (MimeSecurity *)iface; - TRACE("(%p)->()\n", iface); - return InterlockedIncrement(&This->refs); + MimeSecurity *This = impl_from_IMimeSecurity(iface); + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + return ref; } -static ULONG WINAPI MimeSecurity_Release( - IMimeSecurity* iface) +static ULONG WINAPI MimeSecurity_Release(IMimeSecurity *iface) { - MimeSecurity *This = (MimeSecurity *)iface; - ULONG refs; + MimeSecurity *This = impl_from_IMimeSecurity(iface); + LONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p)->()\n", iface); + TRACE("(%p) ref=%d\n", This, ref); - refs = InterlockedDecrement(&This->refs); - if (!refs) - { + if (!ref) HeapFree(GetProcessHeap(), 0, This); - } - return refs; + return ref; } static HRESULT WINAPI MimeSecurity_InitNew( @@ -2764,10 +2763,10 @@ HRESULT MimeSecurity_create(IUnknown *outer, void **obj) This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); if (!This) return E_OUTOFMEMORY; - This->lpVtbl = &MimeSecurityVtbl; - This->refs = 1; + This->IMimeSecurity_iface.lpVtbl = &MimeSecurityVtbl; + This->ref = 1; - *obj = &This->lpVtbl; + *obj = &This->IMimeSecurity_iface; return S_OK; }

1 0

Michael Stefaniuc : inetcomm: Use a static interface instance for IMimeAllocator.
by Alexandre Julliard 04 Mar '13

04 Mar '13

Module: wine Branch: master Commit: 3a9d744f126c8bc0ab2708ef312149faecac8ad0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a9d744f126c8bc0ab2708ef3… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Mar 4 00:32:40 2013 +0100 inetcomm: Use a static interface instance for IMimeAllocator. --- dlls/inetcomm/mimeole.c | 7 +------ 1 files changed, 1 insertions(+), 6 deletions(-) diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index 2b7a0f3..c1fed51 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -2778,11 +2778,6 @@ HRESULT WINAPI MimeOleCreateSecurity(IMimeSecurity **ppSecurity) return MimeSecurity_create(NULL, (void **)ppSecurity); } -typedef struct -{ - IMimeAllocatorVtbl *lpVtbl; -} MimeAllocator; - static HRESULT WINAPI MimeAlloc_QueryInterface( IMimeAllocator* iface, REFIID riid, @@ -2964,7 +2959,7 @@ static IMimeAllocatorVtbl mime_alloc_vtbl = MimeAlloc_PropVariantClear }; -static MimeAllocator mime_allocator = +static IMimeAllocator mime_allocator = { &mime_alloc_vtbl };

1 0

Michael Stefaniuc : inetcomm: COM cleanup for the IMimeBody iface.
by Alexandre Julliard 04 Mar '13

04 Mar '13

Module: wine Branch: master Commit: 4e35ec47773ed9bb84180ec867a2a39b6278e4cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e35ec47773ed9bb84180ec86… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Mar 4 00:33:16 2013 +0100 inetcomm: COM cleanup for the IMimeBody iface. --- dlls/inetcomm/mimeole.c | 34 ++++++++++++++++++---------------- 1 files changed, 18 insertions(+), 16 deletions(-) diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index c1fed51..58a4a5f 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -94,8 +94,8 @@ typedef struct typedef struct MimeBody { - const IMimeBodyVtbl *lpVtbl; - LONG refs; + IMimeBody IMimeBody_iface; + LONG ref; HBODY handle; @@ -110,9 +110,9 @@ typedef struct MimeBody BODYOFFSETS body_offsets; } MimeBody; -static inline MimeBody *impl_from_IMimeBody( IMimeBody *iface ) +static inline MimeBody *impl_from_IMimeBody(IMimeBody *iface) { - return (MimeBody *)((char*)iface - FIELD_OFFSET(MimeBody, lpVtbl)); + return CONTAINING_RECORD(iface, MimeBody, IMimeBody_iface); } static LPSTR strdupA(LPCSTR str) @@ -523,22 +523,24 @@ static HRESULT WINAPI MimeBody_QueryInterface(IMimeBody* iface, return E_NOINTERFACE; } -static ULONG WINAPI MimeBody_AddRef(IMimeBody* iface) +static ULONG WINAPI MimeBody_AddRef(IMimeBody *iface) { MimeBody *This = impl_from_IMimeBody(iface); - TRACE("(%p)->()\n", iface); - return InterlockedIncrement(&This->refs); + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + return ref; } -static ULONG WINAPI MimeBody_Release(IMimeBody* iface) +static ULONG WINAPI MimeBody_Release(IMimeBody *iface) { MimeBody *This = impl_from_IMimeBody(iface); - ULONG refs; + LONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p)->()\n", iface); + TRACE("(%p) ref=%d\n", This, ref); - refs = InterlockedDecrement(&This->refs); - if (!refs) + if (!ref) { empty_header_list(&This->headers); empty_new_prop_list(&This->new_props); @@ -551,7 +553,7 @@ static ULONG WINAPI MimeBody_Release(IMimeBody* iface) HeapFree(GetProcessHeap(), 0, This); } - return refs; + return ref; } static HRESULT WINAPI MimeBody_GetClassID( @@ -1109,8 +1111,8 @@ HRESULT MimeBody_create(IUnknown *outer, void **obj) This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); if (!This) return E_OUTOFMEMORY; - This->lpVtbl = &body_vtbl; - This->refs = 1; + This->IMimeBody_iface.lpVtbl = &body_vtbl; + This->ref = 1; This->handle = NULL; list_init(&This->headers); list_init(&This->new_props); @@ -1125,7 +1127,7 @@ HRESULT MimeBody_create(IUnknown *outer, void **obj) body_offsets.cbBodyStart = body_offsets.cbBodyEnd = 0; MimeBody_set_offsets(This, &body_offsets); - *obj = &This->lpVtbl; + *obj = &This->IMimeBody_iface; return S_OK; }

1 0

Michael Stefaniuc : inetcomm: Include the object instead of IMimeBody in struct body_t.
by Alexandre Julliard 04 Mar '13

04 Mar '13

Module: wine Branch: master Commit: c7d05df81d524a66d35ab0d48cdb6f4603d627a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7d05df81d524a66d35ab0d48… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Mar 4 00:35:05 2013 +0100 inetcomm: Include the object instead of IMimeBody in struct body_t. Avoids COM interface to COM object transitions. --- dlls/inetcomm/mimeole.c | 63 ++++++++++++++++++++++++++++++---------------- 1 files changed, 41 insertions(+), 22 deletions(-) diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index 58a4a5f..62d42b9 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -1099,17 +1099,14 @@ static HRESULT MimeBody_set_offsets(MimeBody *body, const BODYOFFSETS *offsets) #define FIRST_CUSTOM_PROP_ID 0x100 -HRESULT MimeBody_create(IUnknown *outer, void **obj) +MimeBody *mimebody_create(void) { MimeBody *This; BODYOFFSETS body_offsets; - *obj = NULL; - - if(outer) return CLASS_E_NOAGGREGATION; - This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); - if (!This) return E_OUTOFMEMORY; + if (!This) + return NULL; This->IMimeBody_iface.lpVtbl = &body_vtbl; This->ref = 1; @@ -1127,10 +1124,30 @@ HRESULT MimeBody_create(IUnknown *outer, void **obj) body_offsets.cbBodyStart = body_offsets.cbBodyEnd = 0; MimeBody_set_offsets(This, &body_offsets); - *obj = &This->IMimeBody_iface; - return S_OK; + return This; } +HRESULT MimeBody_create(IUnknown *outer, void **ppv) +{ + MimeBody *mb; + + if(outer) + return CLASS_E_NOAGGREGATION; + + if ((mb = mimebody_create())) + { + *ppv = &mb->IMimeBody_iface; + return S_OK; + } + else + { + *ppv = NULL; + return E_OUTOFMEMORY; + } +} + + + typedef struct { IStreamVtbl *lpVtbl; @@ -1422,7 +1439,7 @@ typedef struct body_t { struct list entry; DWORD index; - IMimeBody *mime_body; + MimeBody *mime_body; struct body_t *parent; struct list children; @@ -1480,7 +1497,7 @@ static void empty_body_list(struct list *list) { empty_body_list(&body->children); list_remove(&body->entry); - IMimeBody_Release(body->mime_body); + IMimeBody_Release(&body->mime_body->IMimeBody_iface); HeapFree(GetProcessHeap(), 0, body); } } @@ -1520,7 +1537,7 @@ static HRESULT WINAPI MimeMessage_IsDirty( return E_NOTIMPL; } -static body_t *new_body_entry(IMimeBody *mime_body, DWORD index, body_t *parent) +static body_t *new_body_entry(MimeBody *mime_body, DWORD index, body_t *parent) { body_t *body = HeapAlloc(GetProcessHeap(), 0, sizeof(*body)); if(body) @@ -1625,28 +1642,29 @@ end: static body_t *create_sub_body(MimeMessage *msg, IStream *pStm, BODYOFFSETS *offset, body_t *parent) { - IMimeBody *mime_body; + MimeBody *mime_body; HRESULT hr; body_t *body; ULARGE_INTEGER cur; LARGE_INTEGER zero; - MimeBody_create(NULL, (void**)&mime_body); - IMimeBody_Load(mime_body, pStm); + mime_body = mimebody_create(); + IMimeBody_Load(&mime_body->IMimeBody_iface, pStm); zero.QuadPart = 0; hr = IStream_Seek(pStm, zero, STREAM_SEEK_CUR, &cur); offset->cbBodyStart = cur.u.LowPart + offset->cbHeaderStart; - if(parent) MimeBody_set_offsets(impl_from_IMimeBody(mime_body), offset); - IMimeBody_SetData(mime_body, IET_BINARY, NULL, NULL, &IID_IStream, pStm); + if (parent) MimeBody_set_offsets(mime_body, offset); + IMimeBody_SetData(&mime_body->IMimeBody_iface, IET_BINARY, NULL, NULL, &IID_IStream, pStm); body = new_body_entry(mime_body, msg->next_index++, parent); - if(IMimeBody_IsContentType(mime_body, "multipart", NULL) == S_OK) + if(IMimeBody_IsContentType(&mime_body->IMimeBody_iface, "multipart", NULL) == S_OK) { MIMEPARAMINFO *param_info; ULONG count, i; IMimeAllocator *alloc; - hr = IMimeBody_GetParameters(mime_body, "Content-Type", &count, &param_info); + hr = IMimeBody_GetParameters(&mime_body->IMimeBody_iface, "Content-Type", &count, + &param_info); if(hr != S_OK || count == 0) return body; MimeOleGetAllocator(&alloc); @@ -1708,7 +1726,7 @@ static HRESULT WINAPI MimeMessage_Load(IMimeMessage *iface, IStream *pStm) zero.QuadPart = 0; IStream_Seek(pStm, zero, STREAM_SEEK_END, &cur); offsets.cbBodyEnd = cur.u.LowPart; - MimeBody_set_offsets(impl_from_IMimeBody(root_body->mime_body), &offsets); + MimeBody_set_offsets(root_body->mime_body, &offsets); list_add_head(&This->body_tree, &root_body->entry); @@ -1842,8 +1860,8 @@ static HRESULT WINAPI MimeMessage_BindToObject(IMimeMessage *iface, const HBODY if(IsEqualIID(riid, &IID_IMimeBody)) { - IMimeBody_AddRef(body->mime_body); - *ppvObject = body->mime_body; + IMimeBody_AddRef(&body->mime_body->IMimeBody_iface); + *ppvObject = &body->mime_body->IMimeBody_iface; return S_OK; } @@ -2019,7 +2037,8 @@ static HRESULT find_next(MimeMessage *This, body_t *body, FINDBODY *find, HBODY body = LIST_ENTRY( ptr, body_t, entry ); next = UlongToHandle( body->index ); find->dwReserved = body->index; - if (IMimeBody_IsContentType(body->mime_body, find->pszPriType, find->pszSubType) == S_OK) + if (IMimeBody_IsContentType(&body->mime_body->IMimeBody_iface, find->pszPriType, + find->pszSubType) == S_OK) { *out = next; return S_OK;

1 0

Michael Stefaniuc : inetcomm: COM cleanup for the IStream iface.
by Alexandre Julliard 04 Mar '13

04 Mar '13

Module: wine Branch: master Commit: 9a436a98f4ca6a24c320c4fcb7a5d81da3919e21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a436a98f4ca6a24c320c4fcb… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Mar 4 00:36:06 2013 +0100 inetcomm: COM cleanup for the IStream iface. --- dlls/inetcomm/mimeole.c | 62 +++++++++++++++++++---------------------------- 1 files changed, 25 insertions(+), 37 deletions(-) diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index 62d42b9..4c61f72 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -572,19 +572,14 @@ static HRESULT WINAPI MimeBody_IsDirty( return E_NOTIMPL; } -static HRESULT WINAPI MimeBody_Load( - IMimeBody* iface, - LPSTREAM pStm) +static HRESULT WINAPI MimeBody_Load(IMimeBody *iface, IStream *pStm) { MimeBody *This = impl_from_IMimeBody(iface); TRACE("(%p)->(%p)\n", iface, pStm); return parse_headers(This, pStm); } -static HRESULT WINAPI MimeBody_Save( - IMimeBody* iface, - LPSTREAM pStm, - BOOL fClearDirty) +static HRESULT WINAPI MimeBody_Save(IMimeBody *iface, IStream *pStm, BOOL fClearDirty) { FIXME("stub\n"); return E_NOTIMPL; @@ -1150,62 +1145,58 @@ HRESULT MimeBody_create(IUnknown *outer, void **ppv) typedef struct { - IStreamVtbl *lpVtbl; - LONG refs; - + IStream IStream_iface; + LONG ref; IStream *base; ULARGE_INTEGER pos, start, length; } 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( - IStream* iface, - REFIID riid, - void **ppvObject) +static HRESULT WINAPI sub_stream_QueryInterface(IStream *iface, REFIID riid, void **ppv) { sub_stream_t *This = impl_from_IStream(iface); - TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid), ppvObject); - *ppvObject = NULL; + TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid), ppv); + *ppv = NULL; if(IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_ISequentialStream) || IsEqualIID(riid, &IID_IStream)) { IStream_AddRef(iface); - *ppvObject = iface; + *ppv = iface; return S_OK; } return E_NOINTERFACE; } -static ULONG WINAPI sub_stream_AddRef( - IStream* iface) +static ULONG WINAPI sub_stream_AddRef(IStream *iface) { sub_stream_t *This = impl_from_IStream(iface); + LONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p)\n", This); - return InterlockedIncrement(&This->refs); + TRACE("(%p) ref=%d\n", This, ref); + + return ref; } -static ULONG WINAPI sub_stream_Release( - IStream* iface) +static ULONG WINAPI sub_stream_Release(IStream *iface) { sub_stream_t *This = impl_from_IStream(iface); - LONG refs; + LONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p)\n", This); - refs = InterlockedDecrement(&This->refs); - if(!refs) + TRACE("(%p) ref=%d\n", This, ref); + + if(!ref) { IStream_Release(This->base); HeapFree(GetProcessHeap(), 0, This); } - return refs; + return ref; } 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)); if(!This) return E_OUTOFMEMORY; - This->lpVtbl = &sub_stream_vtbl; - This->refs = 1; + This->IStream_iface.lpVtbl = &sub_stream_vtbl; + This->ref = 1; This->start = start; This->length = length; This->pos.QuadPart = 0; IStream_AddRef(stream); This->base = stream; - *out = (IStream*)&This->lpVtbl; + *out = &This->IStream_iface; return S_OK; } @@ -1733,10 +1724,7 @@ static HRESULT WINAPI MimeMessage_Load(IMimeMessage *iface, IStream *pStm) return S_OK; } -static HRESULT WINAPI MimeMessage_Save( - IMimeMessage *iface, - LPSTREAM pStm, - BOOL fClearDirty) +static HRESULT WINAPI MimeMessage_Save(IMimeMessage *iface, IStream *pStm, BOOL fClearDirty) { FIXME("(%p)->(%p, %s)\n", iface, pStm, fClearDirty ? "TRUE" : "FALSE"); return E_NOTIMPL;

1 0

Dmitry Timoshkov : Revert "gdiplus: Add support for StringFormatFlagsNoClip .".
by Alexandre Julliard 04 Mar '13

04 Mar '13

Module: wine Branch: master Commit: 737790603cc1dd6697ec4b8fbd0c24a002904214 URL: http://source.winehq.org/git/wine.git/?a=commit;h=737790603cc1dd6697ec4b8fb… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Mar 4 17:51:41 2013 +0900 Revert "gdiplus: Add support for StringFormatFlagsNoClip.". This reverts commit bfa35f37a7687cdae338ad9837fc595afb2df2b6. This patch breaks string alignment. --- dlls/gdiplus/graphics.c | 33 +++++---------------------------- 1 files changed, 5 insertions(+), 28 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 1150675..806cfa9 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -4682,16 +4682,8 @@ GpStatus WINGDIPAPI GdipMeasureCharacterRanges(GpGraphics* graphics, scaled_rect.X = (layoutRect->X + margin_x) * args.rel_width; scaled_rect.Y = layoutRect->Y * args.rel_height; - if (stringFormat->attr & StringFormatFlagsNoClip) - { - scaled_rect.Width = (REAL)(1 << 23); - scaled_rect.Height = (REAL)(1 << 23); - } - else - { - scaled_rect.Width = layoutRect->Width * args.rel_width; - scaled_rect.Height = layoutRect->Height * args.rel_height; - } + scaled_rect.Width = layoutRect->Width * args.rel_width; + scaled_rect.Height = layoutRect->Height * args.rel_height; if (scaled_rect.Width >= 0.5) { scaled_rect.Width -= margin_x * 2.0 * args.rel_width; @@ -4771,7 +4763,7 @@ GpStatus WINGDIPAPI GdipMeasureString(GpGraphics *graphics, GpPointF pt[3]; RectF scaled_rect; REAL margin_x; - INT lines, glyphs, format_flags = format ? format->attr : 0; + INT lines, glyphs; TRACE("(%p, %s, %i, %p, %s, %p, %p, %p, %p)\n", graphics, debugstr_wn(string, length), length, font, debugstr_rectf(rect), format, @@ -4813,12 +4805,6 @@ GpStatus WINGDIPAPI GdipMeasureString(GpGraphics *graphics, scaled_rect.Y = rect->Y * args.rel_height; scaled_rect.Width = rect->Width * args.rel_width; scaled_rect.Height = rect->Height * args.rel_height; - - if ((format_flags & StringFormatFlagsNoClip) || - scaled_rect.Width >= 1 << 23 || scaled_rect.Width < 0.5) scaled_rect.Width = 1 << 23; - if ((format_flags & StringFormatFlagsNoClip) || - scaled_rect.Height >= 1 << 23 || scaled_rect.Height < 0.5) scaled_rect.Height = 1 << 23; - if (scaled_rect.Width >= 0.5) { scaled_rect.Width -= margin_x * 2.0 * args.rel_width; @@ -4921,7 +4907,7 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string GpPointF pt[3], rectcpy[4]; POINT corners[4]; REAL rel_width, rel_height, margin_x; - INT save_state, format_flags = 0; + INT save_state; REAL offsety = 0.0; struct draw_string_args args; RectF scaled_rect; @@ -4946,8 +4932,6 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string if(format){ TRACE("may be ignoring some format flags: attr %x\n", format->attr); - format_flags = format->attr; - /* Should be no need to explicitly test for StringAlignmentNear as * that is default behavior if no alignment is passed. */ if(format->vertalign != StringAlignmentNear){ @@ -4992,12 +4976,6 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string scaled_rect.Y = 0.0; scaled_rect.Width = rel_width * rect->Width; scaled_rect.Height = rel_height * rect->Height; - - if ((format_flags & StringFormatFlagsNoClip) || - scaled_rect.Width >= 1 << 23 || scaled_rect.Width < 0.5) scaled_rect.Width = 1 << 23; - if ((format_flags & StringFormatFlagsNoClip) || - scaled_rect.Height >= 1 << 23 || scaled_rect.Height < 0.5) scaled_rect.Height = 1 << 23; - if (scaled_rect.Width >= 0.5) { scaled_rect.Width -= margin_x * 2.0 * rel_width; @@ -5007,8 +4985,7 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string if (scaled_rect.Width >= 1 << 23 || scaled_rect.Width < 0.5) scaled_rect.Width = 1 << 23; if (scaled_rect.Height >= 1 << 23 || scaled_rect.Height < 0.5) scaled_rect.Height = 1 << 23; - if (!(format_flags & StringFormatFlagsNoClip) && - scaled_rect.Width != 1 << 23 && scaled_rect.Height != 1 << 23) + if (scaled_rect.Width != 1 << 23 && scaled_rect.Height != 1 << 23) { /* FIXME: If only the width or only the height is 0, we should probably still clip */ rgn = CreatePolygonRgn(corners, 4, ALTERNATE);

1 0

Dmitry Timoshkov : gdiplus: Add some tests for string format alignment.
by Alexandre Julliard 04 Mar '13

04 Mar '13

Module: wine Branch: master Commit: 464b8b4160862076aa2fad3cb58c7a49f62267e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=464b8b4160862076aa2fad3cb… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Mar 4 17:52:59 2013 +0900 gdiplus: Add some tests for string format alignment. --- dlls/gdiplus/tests/graphics.c | 142 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 142 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index c37d33f..08b2465 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -3909,16 +3909,24 @@ static void test_measure_string(void) static const WCHAR string[] = { 'A','0','1',0 }; HDC hdc; GpStringFormat *format; + CharacterRange range = { 0, 3 }; + GpRegion *region; GpGraphics *graphics; GpFontFamily *family; GpFont *font; GpStatus status; RectF bounds, rect; REAL width, height, width_1, width_2; + REAL margin_x, margin_y, width_rgn, height_rgn; int lines, glyphs; status = GdipCreateStringFormat(StringFormatFlagsNoWrap, LANG_NEUTRAL, &format); expect(Ok, status); + expect(Ok, status); + status = GdipSetStringFormatMeasurableCharacterRanges(format, 1, &range); + expect(Ok, status); + status = GdipCreateRegion(&region); + expect(Ok, status); status = GdipCreateFontFamilyFromName(tahomaW, NULL, &family); expect(Ok, status); @@ -3929,12 +3937,17 @@ static void test_measure_string(void) status = GdipCreateFont(family, 20, FontStyleRegular, UnitPixel, &font); expect(Ok, status); + margin_x = 20.0 / 6.0; + margin_y = 20.0 / 8.0; + set_rect_empty(&rect); set_rect_empty(&bounds); status = GdipMeasureString(graphics, string, -1, font, &rect, format, &bounds, &glyphs, &lines); expect(Ok, status); expect(3, glyphs); expect(1, lines); + expectf(0.0, bounds.X); + expectf(0.0, bounds.Y); width = bounds.Width; height = bounds.Height; @@ -3945,16 +3958,35 @@ static void test_measure_string(void) expect(Ok, status); expect(3, glyphs); expect(1, lines); + expectf(0.0, bounds.X); + expectf(0.0, bounds.Y); expectf(width, bounds.Width); todo_wine expectf(height / 2.0, bounds.Height); + status = GdipSetStringFormatFlags(format, StringFormatFlagsNoWrap | StringFormatFlagsNoClip); + + set_rect_empty(&rect); + rect.Height = height / 2.0; + set_rect_empty(&bounds); + status = GdipMeasureString(graphics, string, -1, font, &rect, format, &bounds, &glyphs, &lines); + expect(Ok, status); + expect(3, glyphs); + expect(1, lines); + expectf(0.0, bounds.X); + expectf(0.0, bounds.Y); + expectf(width, bounds.Width); +todo_wine + expectf(height, bounds.Height); + set_rect_empty(&rect); set_rect_empty(&bounds); status = GdipMeasureString(graphics, string, 1, font, &rect, format, &bounds, &glyphs, &lines); expect(Ok, status); expect(1, glyphs); expect(1, lines); + expectf(0.0, bounds.X); + expectf(0.0, bounds.Y); ok(bounds.Width < width / 2.0, "width of 1 glyph is wrong\n"); expectf(height, bounds.Height); width_1 = bounds.Width; @@ -3965,6 +3997,8 @@ todo_wine expect(Ok, status); expect(2, glyphs); expect(1, lines); + expectf(0.0, bounds.X); + expectf(0.0, bounds.Y); ok(bounds.Width < width, "width of 2 glyphs is wrong\n"); ok(bounds.Width > width_1, "width of 2 glyphs is wrong\n"); expectf(height, bounds.Height); @@ -3977,6 +4011,8 @@ todo_wine expect(Ok, status); expect(1, glyphs); expect(1, lines); + expectf(0.0, bounds.X); + expectf(0.0, bounds.Y); expectf_(width_1, bounds.Width, 0.01); expectf(height, bounds.Height); @@ -3988,6 +4024,8 @@ todo_wine expect(Ok, status); expect(2, glyphs); expect(1, lines); + expectf(0.0, bounds.X); + expectf(0.0, bounds.Y); expectf_(width_2, bounds.Width, 0.01); expectf(height, bounds.Height); @@ -3999,9 +4037,112 @@ todo_wine expect(Ok, status); expect(1, glyphs); expect(1, lines); + expectf(0.0, bounds.X); + expectf(0.0, bounds.Y); expectf_(width_1, bounds.Width, 0.01); expectf(height, bounds.Height); + rect.X = 5.0; + rect.Y = 5.0; + rect.Width = width * 2.0; + rect.Height = height * 2.0; + set_rect_empty(&bounds); + status = GdipMeasureString(graphics, string, -1, font, &rect, format, &bounds, &glyphs, &lines); + expect(Ok, status); + expect(3, glyphs); + expect(1, lines); + expectf(5.0, bounds.X); + expectf(5.0, bounds.Y); + expectf(width, bounds.Width); + expectf(height, bounds.Height); + + rect.X = 5.0; + rect.Y = 5.0; + rect.Width = 32000.0; + rect.Height = 32000.0; + status = GdipMeasureCharacterRanges(graphics, string, -1, font, &rect, format, 1, &region); + expect(Ok, status); + set_rect_empty(&bounds); + status = GdipGetRegionBounds(region, graphics, &bounds); + expect(Ok, status); + expectf_(5.0 + margin_x, bounds.X, 1.0); + expectf(5.0, bounds.Y); + expectf_(width - margin_x*2.0, bounds.Width, 1.0); +todo_wine + expectf_(height - margin_y, bounds.Height, 1.0); + + width_rgn = bounds.Width; + height_rgn = bounds.Height; + + GdipSetStringFormatAlign(format, StringAlignmentCenter); + GdipSetStringFormatLineAlign(format, StringAlignmentCenter); + + rect.X = 5.0; + rect.Y = 5.0; + rect.Width = width * 2.0; + rect.Height = height * 2.0; + set_rect_empty(&bounds); + status = GdipMeasureString(graphics, string, -1, font, &rect, format, &bounds, &glyphs, &lines); + expect(Ok, status); + expect(3, glyphs); + expect(1, lines); +todo_wine + expectf_(5.0 + width/2.0, bounds.X, 0.01); +todo_wine + expectf(5.0 + height/2.0, bounds.Y); + expectf(width, bounds.Width); + expectf(height, bounds.Height); + + rect.X = 5.0; + rect.Y = 5.0; + rect.Width = width_rgn * 2.0; + rect.Height = height_rgn * 2.0; + status = GdipMeasureCharacterRanges(graphics, string, -1, font, &rect, format, 1, &region); + expect(Ok, status); + set_rect_empty(&bounds); + status = GdipGetRegionBounds(region, graphics, &bounds); + expect(Ok, status); + expectf_(5.0 + width_rgn/2.0, bounds.X, 1.0); +todo_wine + expectf_(5.0 + height_rgn/2.0, bounds.Y, 1.0); + expectf_(width_rgn, bounds.Width, 1.0); + expectf_(height_rgn, bounds.Height, 1.0); + + GdipSetStringFormatAlign(format, StringAlignmentFar); + GdipSetStringFormatLineAlign(format, StringAlignmentFar); + + rect.X = 5.0; + rect.Y = 5.0; + rect.Width = width * 2.0; + rect.Height = height * 2.0; + set_rect_empty(&bounds); + status = GdipMeasureString(graphics, string, -1, font, &rect, format, &bounds, &glyphs, &lines); + expect(Ok, status); + expect(3, glyphs); + expect(1, lines); +todo_wine + expectf(5.0 + width, bounds.X); +todo_wine + expectf(5.0 + height, bounds.Y); + expectf(width, bounds.Width); + expectf(height, bounds.Height); + + rect.X = 5.0; + rect.Y = 5.0; + rect.Width = width_rgn * 2.0; + rect.Height = height_rgn * 2.0; + status = GdipMeasureCharacterRanges(graphics, string, -1, font, &rect, format, 1, &region); + expect(Ok, status); + set_rect_empty(&bounds); + status = GdipGetRegionBounds(region, graphics, &bounds); + expect(Ok, status); +todo_wine + expectf_(5.0 + width_rgn, bounds.X, 2.0); +todo_wine + expectf_(5.0 + height_rgn, bounds.Y, 1.0); + expectf_(width_rgn, bounds.Width, 1.0); + expectf_(height_rgn, bounds.Height, 1.0); + status = GdipDeleteFont(font); expect(Ok, status); @@ -4010,6 +4151,7 @@ todo_wine DeleteDC(hdc); GdipDeleteFontFamily(family); + GdipDeleteRegion(region); GdipDeleteStringFormat(format); }

1 0

Dmitry Timoshkov : gdiplus: GdipDrawString should not clip the string if StringFormatFlagsNoClip is specified .
by Alexandre Julliard 04 Mar '13

04 Mar '13

Module: wine Branch: master Commit: 9fb88c79994c8d5a1561ca446139bbf99386e68e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9fb88c79994c8d5a1561ca446… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Mar 4 17:52:24 2013 +0900 gdiplus: GdipDrawString should not clip the string if StringFormatFlagsNoClip is specified. --- dlls/gdiplus/graphics.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 806cfa9..a450ded 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -4907,7 +4907,7 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string GpPointF pt[3], rectcpy[4]; POINT corners[4]; REAL rel_width, rel_height, margin_x; - INT save_state; + INT save_state, format_flags = 0; REAL offsety = 0.0; struct draw_string_args args; RectF scaled_rect; @@ -4932,6 +4932,8 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string if(format){ TRACE("may be ignoring some format flags: attr %x\n", format->attr); + format_flags = format->attr; + /* Should be no need to explicitly test for StringAlignmentNear as * that is default behavior if no alignment is passed. */ if(format->vertalign != StringAlignmentNear){ @@ -4985,7 +4987,8 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string if (scaled_rect.Width >= 1 << 23 || scaled_rect.Width < 0.5) scaled_rect.Width = 1 << 23; if (scaled_rect.Height >= 1 << 23 || scaled_rect.Height < 0.5) scaled_rect.Height = 1 << 23; - if (scaled_rect.Width != 1 << 23 && scaled_rect.Height != 1 << 23) + if (!(format_flags & StringFormatFlagsNoClip) && + scaled_rect.Width != 1 << 23 && scaled_rect.Height != 1 << 23) { /* FIXME: If only the width or only the height is 0, we should probably still clip */ rgn = CreatePolygonRgn(corners, 4, ALTERNATE);

1 0