inetcomm: COM cleanup for the IMimeInternational iface.

This commit is contained in:
Michael Stefaniuc 2011-06-05 23:43:04 +02:00 committed by Alexandre Julliard
parent a052e29556
commit ef4d631b19
1 changed files with 6 additions and 6 deletions

View File

@ -49,7 +49,7 @@ typedef struct
typedef struct typedef struct
{ {
const IMimeInternationalVtbl *lpVtbl; IMimeInternational IMimeInternational_iface;
LONG refs; LONG refs;
CRITICAL_SECTION cs; CRITICAL_SECTION cs;
@ -58,9 +58,9 @@ typedef struct
HCHARSET default_charset; HCHARSET default_charset;
} internat_impl; } internat_impl;
static inline internat_impl *impl_from_IMimeInternational( IMimeInternational *iface ) static inline internat_impl *impl_from_IMimeInternational(IMimeInternational *iface)
{ {
return (internat_impl *)((char*)iface - FIELD_OFFSET(internat_impl, lpVtbl)); return CONTAINING_RECORD(iface, internat_impl, IMimeInternational_iface);
} }
static inline HRESULT get_mlang(IMultiLanguage **ml) static inline HRESULT get_mlang(IMultiLanguage **ml)
@ -524,7 +524,7 @@ static internat_impl *global_internat;
HRESULT MimeInternational_Construct(IMimeInternational **internat) HRESULT MimeInternational_Construct(IMimeInternational **internat)
{ {
global_internat = HeapAlloc(GetProcessHeap(), 0, sizeof(*global_internat)); global_internat = HeapAlloc(GetProcessHeap(), 0, sizeof(*global_internat));
global_internat->lpVtbl = &mime_internat_vtbl; global_internat->IMimeInternational_iface.lpVtbl = &mime_internat_vtbl;
global_internat->refs = 0; global_internat->refs = 0;
InitializeCriticalSection(&global_internat->cs); InitializeCriticalSection(&global_internat->cs);
@ -532,7 +532,7 @@ HRESULT MimeInternational_Construct(IMimeInternational **internat)
global_internat->next_charset_handle = 0; global_internat->next_charset_handle = 0;
global_internat->default_charset = NULL; global_internat->default_charset = NULL;
*internat = (IMimeInternational*)&global_internat->lpVtbl; *internat = &global_internat->IMimeInternational_iface;
IMimeInternational_AddRef(*internat); IMimeInternational_AddRef(*internat);
return S_OK; return S_OK;
@ -542,7 +542,7 @@ HRESULT WINAPI MimeOleGetInternat(IMimeInternational **internat)
{ {
TRACE("(%p)\n", internat); TRACE("(%p)\n", internat);
*internat = (IMimeInternational *)&global_internat->lpVtbl; *internat = &global_internat->IMimeInternational_iface;
IMimeInternational_AddRef(*internat); IMimeInternational_AddRef(*internat);
return S_OK; return S_OK;
} }