mlang: COM cleanup.
diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c
index 92fab82..8ead915 100644
--- a/dlls/mlang/mlang.c
+++ b/dlls/mlang/mlang.c
@@ -1421,11 +1421,11 @@
typedef struct tagMLang_impl
{
- const IMLangFontLinkVtbl *vtbl_IMLangFontLink;
- const IMultiLanguageVtbl *vtbl_IMultiLanguage;
- const IMultiLanguage3Vtbl *vtbl_IMultiLanguage3;
- const IMLangFontLink2Vtbl *vtbl_IMLangFontLink2;
- const IMLangLineBreakConsoleVtbl *vtbl_IMLangLineBreakConsole;
+ IMLangFontLink IMLangFontLink_iface;
+ IMultiLanguage IMultiLanguage_iface;
+ IMultiLanguage3 IMultiLanguage3_iface;
+ IMLangFontLink2 IMLangFontLink2_iface;
+ IMLangLineBreakConsole IMLangLineBreakConsole_iface;
LONG ref;
DWORD total_cp, total_scripts;
} MLang_impl;
@@ -1463,7 +1463,7 @@
{
MLang_AddRef(This);
TRACE("Returning IID_IMLangFontLink %p ref = %d\n", This, This->ref);
- *ppvObject = &(This->vtbl_IMLangFontLink);
+ *ppvObject = &This->IMLangFontLink_iface;
return S_OK;
}
@@ -1471,7 +1471,7 @@
{
MLang_AddRef(This);
TRACE("Returning IID_IMLangFontLink2 %p ref = %d\n", This, This->ref);
- *ppvObject = &(This->vtbl_IMLangFontLink2);
+ *ppvObject = &This->IMLangFontLink2_iface;
return S_OK;
}
@@ -1479,14 +1479,14 @@
{
MLang_AddRef(This);
TRACE("Returning IID_IMultiLanguage %p ref = %d\n", This, This->ref);
- *ppvObject = &(This->vtbl_IMultiLanguage);
+ *ppvObject = &This->IMultiLanguage_iface;
return S_OK;
}
if (IsEqualGUID(riid, &IID_IMultiLanguage2) )
{
MLang_AddRef(This);
- *ppvObject = &(This->vtbl_IMultiLanguage3);
+ *ppvObject = &This->IMultiLanguage3_iface;
TRACE("Returning IID_IMultiLanguage2 %p ref = %d\n", This, This->ref);
return S_OK;
}
@@ -1494,7 +1494,7 @@
if (IsEqualGUID(riid, &IID_IMultiLanguage3) )
{
MLang_AddRef(This);
- *ppvObject = &(This->vtbl_IMultiLanguage3);
+ *ppvObject = &This->IMultiLanguage3_iface;
TRACE("Returning IID_IMultiLanguage3 %p ref = %d\n", This, This->ref);
return S_OK;
}
@@ -1503,7 +1503,7 @@
{
MLang_AddRef(This);
TRACE("Returning IID_IMLangLineBreakConsole %p ref = %d\n", This, This->ref);
- *ppvObject = &(This->vtbl_IMLangLineBreakConsole);
+ *ppvObject = &This->IMLangLineBreakConsole_iface;
return S_OK;
}
@@ -1516,7 +1516,7 @@
typedef struct tagEnumCodePage_impl
{
- const IEnumCodePageVtbl *vtbl_IEnumCodePage;
+ IEnumCodePage IEnumCodePage_iface;
LONG ref;
MIMECPINFO *cpinfo;
DWORD total, pos;
@@ -1524,7 +1524,7 @@
static inline EnumCodePage_impl *impl_from_IEnumCodePage( IEnumCodePage *iface )
{
- return CONTAINING_RECORD( iface, EnumCodePage_impl, vtbl_IEnumCodePage );
+ return CONTAINING_RECORD( iface, EnumCodePage_impl, IEnumCodePage_iface );
}
static HRESULT WINAPI fnIEnumCodePage_QueryInterface(
@@ -1541,7 +1541,7 @@
{
IEnumCodePage_AddRef(iface);
TRACE("Returning IID_IEnumCodePage %p ref = %d\n", This, This->ref);
- *ppvObject = &(This->vtbl_IEnumCodePage);
+ *ppvObject = &This->IEnumCodePage_iface;
return S_OK;
}
@@ -1672,7 +1672,7 @@
grfFlags = MIMECONTF_MIME_LATEST;
ecp = HeapAlloc( GetProcessHeap(), 0, sizeof (EnumCodePage_impl) );
- ecp->vtbl_IEnumCodePage = &IEnumCodePage_vtbl;
+ ecp->IEnumCodePage_iface.lpVtbl = &IEnumCodePage_vtbl;
ecp->ref = 1;
ecp->pos = 0;
ecp->total = 0;
@@ -1700,7 +1700,7 @@
TRACE("enumerated %d codepages with flags %08x\n", ecp->total, grfFlags);
- *ppEnumCodePage = (IEnumCodePage*) ecp;
+ *ppEnumCodePage = &ecp->IEnumCodePage_iface;
return S_OK;
}
@@ -1709,7 +1709,7 @@
typedef struct tagEnumScript_impl
{
- const IEnumScriptVtbl *vtbl_IEnumScript;
+ IEnumScript IEnumScript_iface;
LONG ref;
SCRIPTINFO *script_info;
DWORD total, pos;
@@ -1717,7 +1717,7 @@
static inline EnumScript_impl *impl_from_IEnumScript( IEnumScript *iface )
{
- return CONTAINING_RECORD( iface, EnumScript_impl, vtbl_IEnumScript );
+ return CONTAINING_RECORD( iface, EnumScript_impl, IEnumScript_iface );
}
static HRESULT WINAPI fnIEnumScript_QueryInterface(
@@ -1734,7 +1734,7 @@
{
IEnumScript_AddRef(iface);
TRACE("Returning IID_IEnumScript %p ref = %d\n", This, This->ref);
- *ppvObject = &(This->vtbl_IEnumScript);
+ *ppvObject = &This->IEnumScript_iface;
return S_OK;
}
@@ -1849,7 +1849,7 @@
dwFlags = SCRIPTCONTF_SCRIPT_USER | SCRIPTCONTF_SCRIPT_HIDE | SCRIPTCONTF_SCRIPT_SYSTEM;
es = HeapAlloc( GetProcessHeap(), 0, sizeof (EnumScript_impl) );
- es->vtbl_IEnumScript = &IEnumScript_vtbl;
+ es->IEnumScript_iface.lpVtbl = &IEnumScript_vtbl;
es->ref = 1;
es->pos = 0;
/* do not enumerate unicode flavours */
@@ -1870,7 +1870,7 @@
TRACE("enumerated %d scripts with flags %08x\n", es->total, dwFlags);
- *ppEnumScript = (IEnumScript *)es;
+ *ppEnumScript = &es->IEnumScript_iface;
return S_OK;
}
@@ -1879,7 +1879,7 @@
static inline MLang_impl *impl_from_IMLangFontLink( IMLangFontLink *iface )
{
- return CONTAINING_RECORD( iface, MLang_impl, vtbl_IMLangFontLink );
+ return CONTAINING_RECORD( iface, MLang_impl, IMLangFontLink_iface );
}
static HRESULT WINAPI fnIMLangFontLink_QueryInterface(
@@ -2117,7 +2117,7 @@
static inline MLang_impl *impl_from_IMultiLanguage( IMultiLanguage *iface )
{
- return CONTAINING_RECORD( iface, MLang_impl, vtbl_IMultiLanguage );
+ return CONTAINING_RECORD( iface, MLang_impl, IMultiLanguage_iface );
}
static HRESULT WINAPI fnIMultiLanguage_QueryInterface(
@@ -2132,13 +2132,13 @@
static ULONG WINAPI fnIMultiLanguage_AddRef( IMultiLanguage* iface )
{
MLang_impl *This = impl_from_IMultiLanguage( iface );
- return IMLangFontLink_AddRef( ((IMLangFontLink*)This) );
+ return IMLangFontLink_AddRef( &This->IMLangFontLink_iface );
}
static ULONG WINAPI fnIMultiLanguage_Release( IMultiLanguage* iface )
{
MLang_impl *This = impl_from_IMultiLanguage( iface );
- return IMLangFontLink_Release( ((IMLangFontLink*)This) );
+ return IMLangFontLink_Release( &This->IMLangFontLink_iface );
}
static HRESULT WINAPI fnIMultiLanguage_GetNumberOfCodePageInfo(
@@ -2206,7 +2206,7 @@
PMIMECSETINFO pCharsetInfo)
{
MLang_impl *This = impl_from_IMultiLanguage( iface );
- return IMultiLanguage3_GetCharsetInfo((IMultiLanguage3*)&This->vtbl_IMultiLanguage3, Charset, pCharsetInfo);
+ return IMultiLanguage3_GetCharsetInfo( &This->IMultiLanguage3_iface, Charset, pCharsetInfo );
}
static HRESULT WINAPI fnIMultiLanguage_IsConvertible(
@@ -2310,7 +2310,7 @@
typedef struct tagEnumRfc1766_impl
{
- const IEnumRfc1766Vtbl *vtbl_IEnumRfc1766;
+ IEnumRfc1766 IEnumRfc1766_iface;
LONG ref;
RFC1766INFO *info;
DWORD total, pos;
@@ -2318,7 +2318,7 @@
static inline EnumRfc1766_impl *impl_from_IEnumRfc1766( IEnumRfc1766 *iface )
{
- return CONTAINING_RECORD( iface, EnumRfc1766_impl, vtbl_IEnumRfc1766 );
+ return CONTAINING_RECORD( iface, EnumRfc1766_impl, IEnumRfc1766_iface );
}
static HRESULT WINAPI fnIEnumRfc1766_QueryInterface(
@@ -2335,7 +2335,7 @@
{
IEnumRfc1766_AddRef(iface);
TRACE("Returning IID_IEnumRfc1766 %p ref = %d\n", This, This->ref);
- *ppvObject = &(This->vtbl_IEnumRfc1766);
+ *ppvObject = &This->IEnumRfc1766_iface;
return S_OK;
}
@@ -2494,7 +2494,7 @@
TRACE("%04x, %p\n", LangId, ppEnum);
rfc = HeapAlloc( GetProcessHeap(), 0, sizeof(EnumRfc1766_impl) );
- rfc->vtbl_IEnumRfc1766 = &IEnumRfc1766_vtbl;
+ rfc->IEnumRfc1766_iface.lpVtbl = &IEnumRfc1766_vtbl;
rfc->ref = 1;
rfc->pos = 0;
rfc->total = 0;
@@ -2524,7 +2524,7 @@
rfc->info = data.info;
rfc->total = data.total;
- *ppEnum = (IEnumRfc1766 *)rfc;
+ *ppEnum = &rfc->IEnumRfc1766_iface;
return S_OK;
}
@@ -2618,7 +2618,7 @@
static inline MLang_impl *impl_from_IMultiLanguage3( IMultiLanguage3 *iface )
{
- return CONTAINING_RECORD( iface, MLang_impl, vtbl_IMultiLanguage3 );
+ return CONTAINING_RECORD( iface, MLang_impl, IMultiLanguage3_iface );
}
static HRESULT WINAPI fnIMultiLanguage2_QueryInterface(
@@ -3279,7 +3279,7 @@
static inline MLang_impl *impl_from_IMLangFontLink2( IMLangFontLink2 *iface )
{
- return CONTAINING_RECORD( iface, MLang_impl, vtbl_IMLangFontLink2 );
+ return CONTAINING_RECORD( iface, MLang_impl, IMLangFontLink2_iface );
}
static HRESULT WINAPI fnIMLangFontLink2_QueryInterface(
@@ -3468,7 +3468,7 @@
static inline MLang_impl *impl_from_IMLangLineBreakConsole( IMLangLineBreakConsole *iface )
{
- return CONTAINING_RECORD( iface, MLang_impl, vtbl_IMLangLineBreakConsole );
+ return CONTAINING_RECORD( iface, MLang_impl, IMLangLineBreakConsole_iface );
}
static HRESULT WINAPI fnIMLangLineBreakConsole_QueryInterface(
@@ -3562,11 +3562,11 @@
return CLASS_E_NOAGGREGATION;
mlang = HeapAlloc( GetProcessHeap(), 0, sizeof (MLang_impl) );
- mlang->vtbl_IMLangFontLink = &IMLangFontLink_vtbl;
- mlang->vtbl_IMultiLanguage = &IMultiLanguage_vtbl;
- mlang->vtbl_IMultiLanguage3 = &IMultiLanguage3_vtbl;
- mlang->vtbl_IMLangFontLink2 = &IMLangFontLink2_vtbl;
- mlang->vtbl_IMLangLineBreakConsole = &IMLangLineBreakConsole_vtbl;
+ mlang->IMLangFontLink_iface.lpVtbl = &IMLangFontLink_vtbl;
+ mlang->IMultiLanguage_iface.lpVtbl = &IMultiLanguage_vtbl;
+ mlang->IMultiLanguage3_iface.lpVtbl = &IMultiLanguage3_vtbl;
+ mlang->IMLangFontLink2_iface.lpVtbl = &IMLangFontLink2_vtbl;
+ mlang->IMLangLineBreakConsole_iface.lpVtbl = &IMLangLineBreakConsole_vtbl;
mlang->total_cp = 0;
for (i = 0; i < sizeof(mlang_data)/sizeof(mlang_data[0]); i++)
