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

mscoree: Use ifaces instead of vtbl pointers in ConfigFileHandler.

This commit is contained in:
Michael Stefaniuc 2010-12-10 09:31:35 +01:00 committed by Alexandre Julliard
parent bcf15c7b16
commit ac0826d51e
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/mscoree/config.c
View File

@ -46,8 +46,8 @@ enum parse_state
typedef struct ConfigFileHandler typedef struct ConfigFileHandler
{ {
const struct ISAXContentHandlerVtbl *lpVtbl; ISAXContentHandler ISAXContentHandler_iface;
const struct ISAXErrorHandlerVtbl *lpErrorVtbl; ISAXErrorHandler ISAXErrorHandler_iface;
LONG ref; LONG ref;
enum parse_state states[16]; enum parse_state states[16];
int statenum; int statenum;
@ -56,12 +56,12 @@ typedef struct ConfigFileHandler
static inline ConfigFileHandler *impl_from_ISAXContentHandler(ISAXContentHandler *iface) static inline ConfigFileHandler *impl_from_ISAXContentHandler(ISAXContentHandler *iface)
{ {
return (ConfigFileHandler *)((char*)iface - FIELD_OFFSET(ConfigFileHandler, lpVtbl)); return CONTAINING_RECORD(iface, ConfigFileHandler, ISAXContentHandler_iface);
} }
static inline ConfigFileHandler *impl_from_ISAXErrorHandler(ISAXErrorHandler *iface) static inline ConfigFileHandler *impl_from_ISAXErrorHandler(ISAXErrorHandler *iface)
{ {
return (ConfigFileHandler *)((char*)iface - FIELD_OFFSET(ConfigFileHandler, lpErrorVtbl)); return CONTAINING_RECORD(iface, ConfigFileHandler, ISAXErrorHandler_iface);
} }
static HRESULT WINAPI ConfigFileHandler_QueryInterface(ISAXContentHandler *iface, static HRESULT WINAPI ConfigFileHandler_QueryInterface(ISAXContentHandler *iface,
@ -399,8 +399,8 @@ static HRESULT parse_config(VARIANT input, parsed_config_file *result)
if (!handler) if (!handler)
return E_OUTOFMEMORY; return E_OUTOFMEMORY;
handler->lpVtbl = &ConfigFileHandlerVtbl; handler->ISAXContentHandler_iface.lpVtbl = &ConfigFileHandlerVtbl;
handler->lpErrorVtbl = &ConfigFileHandlerErrorVtbl; handler->ISAXErrorHandler_iface.lpVtbl = &ConfigFileHandlerErrorVtbl;
handler->ref = 1; handler->ref = 1;
handler->states[0] = STATE_ROOT; handler->states[0] = STATE_ROOT;
handler->statenum = 0; handler->statenum = 0;
@ -411,10 +411,10 @@ static HRESULT parse_config(VARIANT input, parsed_config_file *result)
if (SUCCEEDED(hr)) if (SUCCEEDED(hr))
{ {
hr = ISAXXMLReader_putContentHandler(reader, (ISAXContentHandler*)&handler->lpVtbl); hr = ISAXXMLReader_putContentHandler(reader, &handler->ISAXContentHandler_iface);
if (SUCCEEDED(hr)) if (SUCCEEDED(hr))
hr = ISAXXMLReader_putErrorHandler(reader, (ISAXErrorHandler*)&handler->lpErrorVtbl); hr = ISAXXMLReader_putErrorHandler(reader, &handler->ISAXErrorHandler_iface);
if (SUCCEEDED(hr)) if (SUCCEEDED(hr))
hr = ISAXXMLReader_parse(reader, input); hr = ISAXXMLReader_parse(reader, input);