wine-commits December 2010

wine-commits@winehq.org

2 participants
1099 discussions

Alexandre Julliard : wrc: Store location information in strings.
by Alexandre Julliard 30 Dec '10

30 Dec '10

Module: wine Branch: master Commit: df45a347acc7f352df5ccef529f14601fc1fa806 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df45a347acc7f352df5ccef52… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 30 13:08:30 2010 +0100 wrc: Store location information in strings. --- tools/wrc/genres.c | 6 ++++++ tools/wrc/newstruc.c | 1 + tools/wrc/utils.c | 2 ++ tools/wrc/wrc.h | 12 ++++++++++++ tools/wrc/wrctypes.h | 8 ++++++++ 5 files changed, 29 insertions(+), 0 deletions(-) diff --git a/tools/wrc/genres.c b/tools/wrc/genres.c index 3d40180..6b2d7ed 100644 --- a/tools/wrc/genres.c +++ b/tools/wrc/genres.c @@ -312,11 +312,17 @@ static void put_string(res_t *res, const string_t *str, enum str_e type, int ist if (str->type == str_char) { if (!check_unicode_conversion( str, newstr, codepage )) + { + print_location( &str->loc ); error( "String %s does not convert identically to Unicode and back in codepage %d. " "Try using a Unicode string instead\n", str->str.cstr, codepage ); + } if (check_valid_utf8( str, codepage )) + { + print_location( &str->loc ); warning( "string \"%s\" seems to be UTF-8 but codepage %u is in use.\n", str->str.cstr, codepage ); + } } if (!isterm) put_word(res, newstr->size); for(cnt = 0; cnt < newstr->size; cnt++) diff --git a/tools/wrc/newstruc.c b/tools/wrc/newstruc.c index c157cb4..4651617 100644 --- a/tools/wrc/newstruc.c +++ b/tools/wrc/newstruc.c @@ -166,6 +166,7 @@ string_t *new_string(void) { string_t *ret = xmalloc( sizeof(*ret) ); memset( ret, 0, sizeof(*ret) ); + set_location( &ret->loc ); return ret; } diff --git a/tools/wrc/utils.c b/tools/wrc/utils.c index 5adebba..397c252 100644 --- a/tools/wrc/utils.c +++ b/tools/wrc/utils.c @@ -271,6 +271,8 @@ string_t *convert_string(const string_t *str, enum str_e type, int codepage) string_t *ret = xmalloc(sizeof(*ret)); int res; + ret->loc = str->loc; + if (!codepage && str->type != type) parser_error( "Current language is Unicode only, cannot convert string" ); diff --git a/tools/wrc/wrc.h b/tools/wrc/wrc.h index 0283546..4b90fd1 100644 --- a/tools/wrc/wrc.h +++ b/tools/wrc/wrc.h @@ -59,4 +59,16 @@ extern language_t *currentlanguage; void verify_translations(resource_t *top); void write_resfile(char *outname, resource_t *top); +static inline void set_location( location_t *loc ) +{ + loc->file = input_name; + loc->line = line_number; + loc->col = char_number; +} + +static inline void print_location( const location_t *loc ) +{ + if (loc->file) fprintf(stderr, "%s:%d:%d: ", loc->file, loc->line, loc->col ); +} + #endif diff --git a/tools/wrc/wrctypes.h b/tools/wrc/wrctypes.h index 5644d9d..4df9279 100644 --- a/tools/wrc/wrctypes.h +++ b/tools/wrc/wrctypes.h @@ -83,6 +83,13 @@ #define BYTESWAP_WORD(w) ((WORD)(((WORD)WRC_LOBYTE(w) << 8) + (WORD)WRC_HIBYTE(w))) #define BYTESWAP_DWORD(d) ((DWORD)(((DWORD)BYTESWAP_WORD(WRC_LOWORD(d)) << 16) + ((DWORD)BYTESWAP_WORD(WRC_HIWORD(d))))) +typedef struct +{ + const char *file; + int line; + int col; +} location_t; + /* Binary resource structure */ #define RES_BLOCKSIZE 512 @@ -103,6 +110,7 @@ typedef struct string { char *cstr; WCHAR *wstr; } str; + location_t loc; } string_t; /* Resources are identified either by name or by number */

1 0

Alexandre Julliard : wrc: Explicitly define structure creation functions instead of playing with macros .
by Alexandre Julliard 30 Dec '10

30 Dec '10

Module: wine Branch: master Commit: d0a6c806a9d1e55838afec2e2da521996f675ad3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0a6c806a9d1e55838afec2e2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 30 12:30:36 2010 +0100 wrc: Explicitly define structure creation functions instead of playing with macros. --- tools/wrc/newstruc.c | 155 +++++++++++++++++++++++++++++++++++++++++++------- tools/wrc/newstruc.h | 49 ++++++---------- 2 files changed, 153 insertions(+), 51 deletions(-) diff --git a/tools/wrc/newstruc.c b/tools/wrc/newstruc.c index 603eb0c..c157cb4 100644 --- a/tools/wrc/newstruc.c +++ b/tools/wrc/newstruc.c @@ -45,31 +45,144 @@ typedef struct } BITMAPOS2HEADER; #include <poppack.h> -/* Generate new_* functions that have no parameters (NOTE: no ';') */ -__NEW_STRUCT_FUNC(dialog) -__NEW_STRUCT_FUNC(name_id) -__NEW_STRUCT_FUNC(menu) -__NEW_STRUCT_FUNC(menu_item) -__NEW_STRUCT_FUNC(control) -__NEW_STRUCT_FUNC(icon) -__NEW_STRUCT_FUNC(cursor) -__NEW_STRUCT_FUNC(versioninfo) -__NEW_STRUCT_FUNC(ver_value) -__NEW_STRUCT_FUNC(ver_block) -__NEW_STRUCT_FUNC(stt_entry) -__NEW_STRUCT_FUNC(accelerator) -__NEW_STRUCT_FUNC(event) -__NEW_STRUCT_FUNC(raw_data) -__NEW_STRUCT_FUNC(lvc) -__NEW_STRUCT_FUNC(res_count) -__NEW_STRUCT_FUNC(string) -__NEW_STRUCT_FUNC(toolbar_item) -__NEW_STRUCT_FUNC(ani_any) - /* New instances for all types of structures */ /* Very inefficient (in size), but very functional :-] * Especially for type-checking. */ + +dialog_t *new_dialog(void) +{ + dialog_t *ret = xmalloc( sizeof(*ret) ); + memset( ret, 0, sizeof(*ret) ); + return ret; +} + +name_id_t *new_name_id(void) +{ + name_id_t *ret = xmalloc( sizeof(*ret) ); + memset( ret, 0, sizeof(*ret) ); + return ret; +} + +menu_t *new_menu(void) +{ + menu_t *ret = xmalloc( sizeof(*ret) ); + memset( ret, 0, sizeof(*ret) ); + return ret; +} + +menu_item_t *new_menu_item(void) +{ + menu_item_t *ret = xmalloc( sizeof(*ret) ); + memset( ret, 0, sizeof(*ret) ); + return ret; +} + +control_t *new_control(void) +{ + control_t *ret = xmalloc( sizeof(*ret) ); + memset( ret, 0, sizeof(*ret) ); + return ret; +} + +icon_t *new_icon(void) +{ + icon_t *ret = xmalloc( sizeof(*ret) ); + memset( ret, 0, sizeof(*ret) ); + return ret; +} + +cursor_t *new_cursor(void) +{ + cursor_t *ret = xmalloc( sizeof(*ret) ); + memset( ret, 0, sizeof(*ret) ); + return ret; +} + +versioninfo_t *new_versioninfo(void) +{ + versioninfo_t *ret = xmalloc( sizeof(*ret) ); + memset( ret, 0, sizeof(*ret) ); + return ret; +} + +ver_value_t *new_ver_value(void) +{ + ver_value_t *ret = xmalloc( sizeof(*ret) ); + memset( ret, 0, sizeof(*ret) ); + return ret; +} + +ver_block_t *new_ver_block(void) +{ + ver_block_t *ret = xmalloc( sizeof(*ret) ); + memset( ret, 0, sizeof(*ret) ); + return ret; +} + +stt_entry_t *new_stt_entry(void) +{ + stt_entry_t *ret = xmalloc( sizeof(*ret) ); + memset( ret, 0, sizeof(*ret) ); + return ret; +} + +accelerator_t *new_accelerator(void) +{ + accelerator_t *ret = xmalloc( sizeof(*ret) ); + memset( ret, 0, sizeof(*ret) ); + return ret; +} + +event_t *new_event(void) +{ + event_t *ret = xmalloc( sizeof(*ret) ); + memset( ret, 0, sizeof(*ret) ); + return ret; +} + +raw_data_t *new_raw_data(void) +{ + raw_data_t *ret = xmalloc( sizeof(*ret) ); + memset( ret, 0, sizeof(*ret) ); + return ret; +} + +lvc_t *new_lvc(void) +{ + lvc_t *ret = xmalloc( sizeof(*ret) ); + memset( ret, 0, sizeof(*ret) ); + return ret; +} + +res_count_t *new_res_count(void) +{ + res_count_t *ret = xmalloc( sizeof(*ret) ); + memset( ret, 0, sizeof(*ret) ); + return ret; +} + +string_t *new_string(void) +{ + string_t *ret = xmalloc( sizeof(*ret) ); + memset( ret, 0, sizeof(*ret) ); + return ret; +} + +toolbar_item_t *new_toolbar_item(void) +{ + toolbar_item_t *ret = xmalloc( sizeof(*ret) ); + memset( ret, 0, sizeof(*ret) ); + return ret; +} + +ani_any_t *new_ani_any(void) +{ + ani_any_t *ret = xmalloc( sizeof(*ret) ); + memset( ret, 0, sizeof(*ret) ); + return ret; +} + resource_t *new_resource(enum res_e t, void *res, int memopt, language_t *lan) { resource_t *r = xmalloc(sizeof(resource_t)); diff --git a/tools/wrc/newstruc.h b/tools/wrc/newstruc.h index 3bd4c29..c7a74eb 100644 --- a/tools/wrc/newstruc.h +++ b/tools/wrc/newstruc.h @@ -23,36 +23,25 @@ #include "wrctypes.h" -#define __NEW_STRUCT_FUNC(p) \ - p##_t *new_##p(void)\ - {\ - p##_t * ret = xmalloc(sizeof(*ret)); \ - memset( ret, 0, sizeof(*ret) ); \ - return ret; \ - } - -#define __NEW_STRUCT_PROTO(p) p##_t *new_##p(void) - -__NEW_STRUCT_PROTO(dialog); -__NEW_STRUCT_PROTO(name_id); -__NEW_STRUCT_PROTO(menu); -__NEW_STRUCT_PROTO(menu_item); -__NEW_STRUCT_PROTO(control); -__NEW_STRUCT_PROTO(icon); -__NEW_STRUCT_PROTO(cursor); -__NEW_STRUCT_PROTO(versioninfo); -__NEW_STRUCT_PROTO(ver_value); -__NEW_STRUCT_PROTO(ver_block); -__NEW_STRUCT_PROTO(stt_entry); -__NEW_STRUCT_PROTO(accelerator); -__NEW_STRUCT_PROTO(event); -__NEW_STRUCT_PROTO(raw_data); -__NEW_STRUCT_PROTO(lvc); -__NEW_STRUCT_PROTO(res_count); -__NEW_STRUCT_PROTO(string); -__NEW_STRUCT_PROTO(toolbar_item); -__NEW_STRUCT_PROTO(ani_any); - +dialog_t *new_dialog(void); +name_id_t *new_name_id(void); +menu_t *new_menu(void); +menu_item_t *new_menu_item(void); +control_t *new_control(void); +icon_t *new_icon(void); +cursor_t *new_cursor(void); +versioninfo_t *new_versioninfo(void); +ver_value_t *new_ver_value(void); +ver_block_t *new_ver_block(void); +stt_entry_t *new_stt_entry(void); +accelerator_t *new_accelerator(void); +event_t *new_event(void); +raw_data_t *new_raw_data(void); +lvc_t *new_lvc(void); +res_count_t *new_res_count(void); +string_t *new_string(void); +toolbar_item_t *new_toolbar_item(void); +ani_any_t *new_ani_any(void); resource_t *new_resource(enum res_e t, void *res, int memopt, language_t *lan); version_t *new_version(DWORD v); characts_t *new_characts(DWORD c);

1 0

Alexandre Julliard : wrc: Copy the strmake utility function from winegcc.
by Alexandre Julliard 30 Dec '10

30 Dec '10

Module: wine Branch: master Commit: 5fabc5cca7179dac98c0413b8c8945ae38bf3ef0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fabc5cca7179dac98c0413b8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 29 19:54:54 2010 +0100 wrc: Copy the strmake utility function from winegcc. --- tools/wrc/genres.c | 19 ++----------------- tools/wrc/utils.c | 19 +++++++++++++++++++ tools/wrc/utils.h | 1 + tools/wrc/wrc.c | 7 +------ 4 files changed, 23 insertions(+), 23 deletions(-) diff --git a/tools/wrc/genres.c b/tools/wrc/genres.c index 7871c79..3d40180 100644 --- a/tools/wrc/genres.c +++ b/tools/wrc/genres.c @@ -1741,23 +1741,8 @@ char *prep_nid_for_label(const name_id_t *nid) */ char *make_c_name(const char *base, const name_id_t *nid, const language_t *lan) { - int nlen; - char *buf; - char *ret; - char lanbuf[6]; - - sprintf(lanbuf, "%d", lan ? MAKELANGID(lan->id, lan->sub) : 0); - buf = prep_nid_for_label(nid); - nlen = strlen(buf) + strlen(lanbuf); - nlen += strlen(base) + 4; /* three time '_' and '\0' */ - ret = xmalloc(nlen); - strcpy(ret, "_"); - strcat(ret, base); - strcat(ret, "_"); - strcat(ret, buf); - strcat(ret, "_"); - strcat(ret, lanbuf); - return ret; + char *buf = prep_nid_for_label(nid); + return strmake( "_%s_%s_%d", base, buf, lan ? MAKELANGID(lan->id, lan->sub) : 0); } /* diff --git a/tools/wrc/utils.c b/tools/wrc/utils.c index c9445b3..5adebba 100644 --- a/tools/wrc/utils.c +++ b/tools/wrc/utils.c @@ -192,6 +192,25 @@ void *xrealloc(void *p, size_t size) return res; } +char *strmake( const char* fmt, ... ) +{ + int n; + size_t size = 100; + va_list ap; + + for (;;) + { + char *p = xmalloc( size ); + va_start( ap, fmt ); + n = vsnprintf( p, size, fmt, ap ); + va_end( ap ); + if (n == -1) size *= 2; + else if ((size_t)n >= size) size = n + 1; + else return p; + free( p ); + } +} + char *xstrdup(const char *str) { char *s; diff --git a/tools/wrc/utils.h b/tools/wrc/utils.h index ced55ab..19daa09 100644 --- a/tools/wrc/utils.h +++ b/tools/wrc/utils.h @@ -33,6 +33,7 @@ char *xstrdup(const char *str); #define __attribute__(X) #endif +char *strmake(const char* fmt, ...) __attribute__((__format__ (__printf__, 1, 2 ))); int parser_error(const char *s, ...) __attribute__((format (printf, 1, 2))); int parser_warning(const char *s, ...) __attribute__((format (printf, 1, 2))); void internal_error(const char *file, int line, const char *s, ...) __attribute__((format (printf, 3, 4), noreturn)); diff --git a/tools/wrc/wrc.c b/tools/wrc/wrc.c index 99285db..bbeba83 100644 --- a/tools/wrc/wrc.c +++ b/tools/wrc/wrc.c @@ -270,12 +270,7 @@ static int load_file( const char *input_name, const char *output_name ) exit(0); } - if (output_name && output_name[0]) - { - name = xmalloc( strlen(output_name) + 8 ); - strcpy( name, output_name ); - strcat( name, ".XXXXXX" ); - } + if (output_name && output_name[0]) name = strmake( "%s.XXXXXX", output_name ); else name = xstrdup( "wrc.XXXXXX" ); if ((fd = mkstemps( name, 0 )) == -1)

1 0

Michael Stefaniuc : rpcrt4: COM cleanup for StdProxyImpl.
by Alexandre Julliard 30 Dec '10

30 Dec '10

Module: wine Branch: master Commit: 18a3b3f2f701bcb4905b8395e8d98bbc060150b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=18a3b3f2f701bcb4905b8395e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Dec 30 11:57:18 2010 +0100 rpcrt4: COM cleanup for StdProxyImpl. --- dlls/rpcrt4/cproxy.c | 51 +++++++++++++++++++++++++------------------------ 1 files changed, 26 insertions(+), 25 deletions(-) diff --git a/dlls/rpcrt4/cproxy.c b/dlls/rpcrt4/cproxy.c index 6bf0a43..d0c56c7 100644 --- a/dlls/rpcrt4/cproxy.c +++ b/dlls/rpcrt4/cproxy.c @@ -44,7 +44,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole); /* I don't know what MS's std proxy structure looks like, so this probably doesn't match, but that shouldn't matter */ typedef struct { - const IRpcProxyBufferVtbl *lpVtbl; + IRpcProxyBuffer IRpcProxyBuffer_iface; LPVOID *PVtbl; LONG RefCount; const IID* piid; @@ -58,9 +58,14 @@ typedef struct { static const IRpcProxyBufferVtbl StdProxy_Vtbl; +static inline StdProxyImpl *impl_from_IRpcProxyBuffer(IRpcProxyBuffer *iface) +{ + return CONTAINING_RECORD(iface, StdProxyImpl, IRpcProxyBuffer_iface); +} + static inline StdProxyImpl *impl_from_proxy_obj( void *iface ) { - return (StdProxyImpl *)((char*)iface - FIELD_OFFSET(StdProxyImpl, PVtbl)); + return CONTAINING_RECORD(iface, StdProxyImpl, PVtbl); } #if defined(__i386__) @@ -197,7 +202,7 @@ HRESULT StdProxy_Construct(REFIID riid, if (!This) return E_OUTOFMEMORY; if (!pUnkOuter) pUnkOuter = (IUnknown *)This; - This->lpVtbl = &StdProxy_Vtbl; + This->IRpcProxyBuffer_iface.lpVtbl = &StdProxy_Vtbl; This->PVtbl = vtbl->Vtbl; /* one reference for the proxy */ This->RefCount = 1; @@ -220,7 +225,7 @@ HRESULT StdProxy_Construct(REFIID riid, } } - *ppProxy = (LPRPCPROXYBUFFER)&This->lpVtbl; + *ppProxy = &This->IRpcProxyBuffer_iface; *ppvObj = &This->PVtbl; IUnknown_AddRef((IUnknown *)*ppvObj); IPSFactoryBuffer_AddRef(pPSFactory); @@ -230,25 +235,11 @@ HRESULT StdProxy_Construct(REFIID riid, return S_OK; } -static void StdProxy_Destruct(LPRPCPROXYBUFFER iface) -{ - StdProxyImpl *This = (StdProxyImpl *)iface; - - if (This->pChannel) - IRpcProxyBuffer_Disconnect(iface); - - if (This->base_object) IUnknown_Release( This->base_object ); - if (This->base_proxy) IRpcProxyBuffer_Release( This->base_proxy ); - - IPSFactoryBuffer_Release(This->pPSFactory); - HeapFree(GetProcessHeap(),0,This); -} - static HRESULT WINAPI StdProxy_QueryInterface(LPRPCPROXYBUFFER iface, REFIID riid, LPVOID *obj) { - StdProxyImpl *This = (StdProxyImpl *)iface; + StdProxyImpl *This = impl_from_IRpcProxyBuffer(iface); TRACE("(%p)->QueryInterface(%s,%p)\n",This,debugstr_guid(riid),obj); if (IsEqualGUID(&IID_IUnknown,riid) || @@ -259,7 +250,7 @@ static HRESULT WINAPI StdProxy_QueryInterface(LPRPCPROXYBUFFER iface, } if (IsEqualGUID(&IID_IRpcProxyBuffer,riid)) { - *obj = &This->lpVtbl; + *obj = &This->IRpcProxyBuffer_iface; InterlockedIncrement(&This->RefCount); return S_OK; } @@ -269,7 +260,7 @@ static HRESULT WINAPI StdProxy_QueryInterface(LPRPCPROXYBUFFER iface, static ULONG WINAPI StdProxy_AddRef(LPRPCPROXYBUFFER iface) { - StdProxyImpl *This = (StdProxyImpl *)iface; + StdProxyImpl *This = impl_from_IRpcProxyBuffer(iface); TRACE("(%p)->AddRef()\n",This); return InterlockedIncrement(&This->RefCount); @@ -278,19 +269,29 @@ static ULONG WINAPI StdProxy_AddRef(LPRPCPROXYBUFFER iface) static ULONG WINAPI StdProxy_Release(LPRPCPROXYBUFFER iface) { ULONG refs; - StdProxyImpl *This = (StdProxyImpl *)iface; + StdProxyImpl *This = impl_from_IRpcProxyBuffer(iface); TRACE("(%p)->Release()\n",This); refs = InterlockedDecrement(&This->RefCount); if (!refs) - StdProxy_Destruct((LPRPCPROXYBUFFER)&This->lpVtbl); + { + if (This->pChannel) + IRpcProxyBuffer_Disconnect(&This->IRpcProxyBuffer_iface); + + if (This->base_object) IUnknown_Release( This->base_object ); + if (This->base_proxy) IRpcProxyBuffer_Release( This->base_proxy ); + + IPSFactoryBuffer_Release(This->pPSFactory); + HeapFree(GetProcessHeap(),0,This); + } + return refs; } static HRESULT WINAPI StdProxy_Connect(LPRPCPROXYBUFFER iface, LPRPCCHANNELBUFFER pChannel) { - StdProxyImpl *This = (StdProxyImpl *)iface; + StdProxyImpl *This = impl_from_IRpcProxyBuffer(iface); TRACE("(%p)->Connect(%p)\n",This,pChannel); This->pChannel = pChannel; @@ -301,7 +302,7 @@ static HRESULT WINAPI StdProxy_Connect(LPRPCPROXYBUFFER iface, static VOID WINAPI StdProxy_Disconnect(LPRPCPROXYBUFFER iface) { - StdProxyImpl *This = (StdProxyImpl *)iface; + StdProxyImpl *This = impl_from_IRpcProxyBuffer(iface); TRACE("(%p)->Disconnect()\n",This); if (This->base_proxy) IRpcProxyBuffer_Disconnect( This->base_proxy );

1 0

Michael Stefaniuc : hlink: Use an iface instead of a vtbl pointer in CFImpl .
by Alexandre Julliard 30 Dec '10

30 Dec '10

Module: wine Branch: master Commit: 5b502e3e0233156f11305901b3bd4da01abe5bae URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b502e3e0233156f11305901b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Dec 30 01:52:04 2010 +0100 hlink: Use an iface instead of a vtbl pointer in CFImpl. --- dlls/hlink/hlink_main.c | 21 +++++++++++++-------- 1 files changed, 13 insertions(+), 8 deletions(-) diff --git a/dlls/hlink/hlink_main.c b/dlls/hlink/hlink_main.c index 0300fc0..d547daa 100644 --- a/dlls/hlink/hlink_main.c +++ b/dlls/hlink/hlink_main.c @@ -34,10 +34,15 @@ typedef HRESULT (CALLBACK *LPFNCREATEINSTANCE)(IUnknown*, REFIID, LPVOID*); typedef struct { - const IClassFactoryVtbl *lpVtbl; - LPFNCREATEINSTANCE lpfnCI; + IClassFactory IClassFactory_iface; + LPFNCREATEINSTANCE lpfnCI; } CFImpl; +static inline CFImpl *impl_from_IClassFactory(IClassFactory *iface) +{ + return CONTAINING_RECORD(iface, CFImpl, IClassFactory_iface); +} + BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { TRACE("%p %d %p\n", hinstDLL, fdwReason, lpvReserved); @@ -500,7 +505,7 @@ cleanup: static HRESULT WINAPI HLinkCF_fnQueryInterface ( LPCLASSFACTORY iface, REFIID riid, LPVOID *ppvObj) { - CFImpl *This = (CFImpl *)iface; + CFImpl *This = impl_from_IClassFactory(iface); TRACE("(%p)->(%s)\n",This,debugstr_guid(riid)); @@ -530,7 +535,7 @@ static ULONG WINAPI HLinkCF_fnRelease(LPCLASSFACTORY iface) static HRESULT WINAPI HLinkCF_fnCreateInstance( LPCLASSFACTORY iface, LPUNKNOWN pUnkOuter, REFIID riid, LPVOID *ppvObject) { - CFImpl *This = (CFImpl *)iface; + CFImpl *This = impl_from_IClassFactory(iface); TRACE("%p->(%p,%s,%p)\n", This, pUnkOuter, debugstr_guid(riid), ppvObject); @@ -554,8 +559,8 @@ static const IClassFactoryVtbl hlcfvt = HLinkCF_fnLockServer }; -static CFImpl HLink_cf = { &hlcfvt, HLink_Constructor }; -static CFImpl HLinkBrowseContext_cf = { &hlcfvt, HLinkBrowseContext_Constructor }; +static CFImpl HLink_cf = { { &hlcfvt }, HLink_Constructor }; +static CFImpl HLinkBrowseContext_cf = { { &hlcfvt }, HLinkBrowseContext_Constructor }; /*********************************************************************** * DllGetClassObject (HLINK.@) @@ -571,9 +576,9 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv) *ppv = NULL; if (IsEqualIID(rclsid, &CLSID_StdHlink)) - pcf = (IClassFactory*) &HLink_cf; + pcf = &HLink_cf.IClassFactory_iface; else if (IsEqualIID(rclsid, &CLSID_StdHlinkBrowseContext)) - pcf = (IClassFactory*) &HLinkBrowseContext_cf; + pcf = &HLinkBrowseContext_cf.IClassFactory_iface; else return CLASS_E_CLASSNOTAVAILABLE;

1 0

Michael Stefaniuc : urlmon: Use an iface instead of a vtbl pointer in ClassFactory.
by Alexandre Julliard 30 Dec '10

30 Dec '10

Module: wine Branch: master Commit: 81f44f501fc338457d41a150c01f0eb0df42d4f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81f44f501fc338457d41a150c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Dec 30 01:51:12 2010 +0100 urlmon: Use an iface instead of a vtbl pointer in ClassFactory. --- dlls/urlmon/urlmon_main.c | 71 +++++++++++++++++++++++--------------------- 1 files changed, 37 insertions(+), 34 deletions(-) diff --git a/dlls/urlmon/urlmon_main.c b/dlls/urlmon/urlmon_main.c index f8ce287..57eeaf9 100644 --- a/dlls/urlmon/urlmon_main.c +++ b/dlls/urlmon/urlmon_main.c @@ -189,12 +189,15 @@ HRESULT WINAPI DllCanUnloadNow(void) * Urlmon ClassFactory */ typedef struct { - const IClassFactoryVtbl *lpClassFactoryVtbl; + IClassFactory IClassFactory_iface; HRESULT (*pfnCreateInstance)(IUnknown *pUnkOuter, LPVOID *ppObj); } ClassFactory; -#define CLASSFACTORY(x) ((IClassFactory*) &(x)->lpClassFactoryVtbl) +static inline ClassFactory *impl_from_IClassFactory(IClassFactory *iface) +{ + return CONTAINING_RECORD(iface, ClassFactory, IClassFactory_iface); +} static HRESULT WINAPI CF_QueryInterface(IClassFactory *iface, REFIID riid, LPVOID *ppv) { @@ -233,7 +236,7 @@ static ULONG WINAPI CF_Release(IClassFactory *iface) static HRESULT WINAPI CF_CreateInstance(IClassFactory *iface, IUnknown *pOuter, REFIID riid, LPVOID *ppobj) { - ClassFactory *This = (ClassFactory*)iface; + ClassFactory *This = impl_from_IClassFactory(iface); HRESULT hres; LPUNKNOWN punk; @@ -268,27 +271,27 @@ static const IClassFactoryVtbl ClassFactoryVtbl = CF_LockServer }; -static const ClassFactory FileProtocolCF = - { &ClassFactoryVtbl, FileProtocol_Construct}; -static const ClassFactory FtpProtocolCF = - { &ClassFactoryVtbl, FtpProtocol_Construct}; -static const ClassFactory GopherProtocolCF = - { &ClassFactoryVtbl, GopherProtocol_Construct}; -static const ClassFactory HttpProtocolCF = - { &ClassFactoryVtbl, HttpProtocol_Construct}; -static const ClassFactory HttpSProtocolCF = - { &ClassFactoryVtbl, HttpSProtocol_Construct}; -static const ClassFactory MkProtocolCF = - { &ClassFactoryVtbl, MkProtocol_Construct}; -static const ClassFactory SecurityManagerCF = - { &ClassFactoryVtbl, SecManagerImpl_Construct}; -static const ClassFactory ZoneManagerCF = - { &ClassFactoryVtbl, ZoneMgrImpl_Construct}; -static const ClassFactory StdURLMonikerCF = - { &ClassFactoryVtbl, StdURLMoniker_Construct}; -static const ClassFactory MimeFilterCF = - { &ClassFactoryVtbl, MimeFilter_Construct}; - +static ClassFactory FileProtocolCF = + { { &ClassFactoryVtbl }, FileProtocol_Construct}; +static ClassFactory FtpProtocolCF = + { { &ClassFactoryVtbl }, FtpProtocol_Construct}; +static ClassFactory GopherProtocolCF = + { { &ClassFactoryVtbl }, GopherProtocol_Construct}; +static ClassFactory HttpProtocolCF = + { { &ClassFactoryVtbl }, HttpProtocol_Construct}; +static ClassFactory HttpSProtocolCF = + { { &ClassFactoryVtbl }, HttpSProtocol_Construct}; +static ClassFactory MkProtocolCF = + { { &ClassFactoryVtbl }, MkProtocol_Construct}; +static ClassFactory SecurityManagerCF = + { { &ClassFactoryVtbl }, SecManagerImpl_Construct}; +static ClassFactory ZoneManagerCF = + { { &ClassFactoryVtbl }, ZoneMgrImpl_Construct}; +static ClassFactory StdURLMonikerCF = + { { &ClassFactoryVtbl }, StdURLMoniker_Construct}; +static ClassFactory MimeFilterCF = + { { &ClassFactoryVtbl }, MimeFilter_Construct}; + struct object_creation_info { const CLSID *clsid; @@ -305,16 +308,16 @@ static const WCHAR wszMk[] = {'m','k',0}; static const struct object_creation_info object_creation[] = { - { &CLSID_FileProtocol, CLASSFACTORY(&FileProtocolCF), wszFile }, - { &CLSID_FtpProtocol, CLASSFACTORY(&FtpProtocolCF), wszFtp }, - { &CLSID_GopherProtocol, CLASSFACTORY(&GopherProtocolCF), wszGopher }, - { &CLSID_HttpProtocol, CLASSFACTORY(&HttpProtocolCF), wszHttp }, - { &CLSID_HttpSProtocol, CLASSFACTORY(&HttpSProtocolCF), wszHttps }, - { &CLSID_MkProtocol, CLASSFACTORY(&MkProtocolCF), wszMk }, - { &CLSID_InternetSecurityManager, CLASSFACTORY(&SecurityManagerCF), NULL }, - { &CLSID_InternetZoneManager, CLASSFACTORY(&ZoneManagerCF), NULL }, - { &CLSID_StdURLMoniker, CLASSFACTORY(&StdURLMonikerCF), NULL }, - { &CLSID_DeCompMimeFilter, CLASSFACTORY(&MimeFilterCF), NULL } + { &CLSID_FileProtocol, &FileProtocolCF.IClassFactory_iface, wszFile }, + { &CLSID_FtpProtocol, &FtpProtocolCF.IClassFactory_iface, wszFtp }, + { &CLSID_GopherProtocol, &GopherProtocolCF.IClassFactory_iface, wszGopher }, + { &CLSID_HttpProtocol, &HttpProtocolCF.IClassFactory_iface, wszHttp }, + { &CLSID_HttpSProtocol, &HttpSProtocolCF.IClassFactory_iface, wszHttps }, + { &CLSID_MkProtocol, &MkProtocolCF.IClassFactory_iface, wszMk }, + { &CLSID_InternetSecurityManager, &SecurityManagerCF.IClassFactory_iface, NULL }, + { &CLSID_InternetZoneManager, &ZoneManagerCF.IClassFactory_iface, NULL }, + { &CLSID_StdURLMoniker, &StdURLMonikerCF.IClassFactory_iface, NULL }, + { &CLSID_DeCompMimeFilter, &MimeFilterCF.IClassFactory_iface, NULL } }; static void init_session(BOOL init)

1 0

Michael Stefaniuc : mshtml: COM cleanup for the remaining ifaces in nsChannel.
by Alexandre Julliard 30 Dec '10

30 Dec '10

Module: wine Branch: master Commit: f5df0b3ed771c8e837d828854b7598a272640d3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5df0b3ed771c8e837d828854… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Dec 30 01:49:21 2010 +0100 mshtml: COM cleanup for the remaining ifaces in nsChannel. --- dlls/mshtml/mshtml_private.h | 7 +--- dlls/mshtml/nsio.c | 56 +++++++++++++++++++++-------------------- 2 files changed, 31 insertions(+), 32 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index c712209..f0fb3cf 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -484,8 +484,8 @@ typedef enum { typedef struct { nsIHttpChannel nsIHttpChannel_iface; - const nsIUploadChannelVtbl *lpUploadChannelVtbl; - const nsIHttpChannelInternalVtbl *lpIHttpChannelInternalVtbl; + nsIUploadChannel nsIUploadChannel_iface; + nsIHttpChannelInternal nsIHttpChannelInternal_iface; LONG ref; @@ -633,9 +633,6 @@ struct HTMLDocumentNode { #define NSRUNNABLE(x) ((nsIRunnable*) &(x)->lpIRunnableVtbl) -#define NSUPCHANNEL(x) ((nsIUploadChannel*) &(x)->lpUploadChannelVtbl) -#define NSHTTPINTERNAL(x) ((nsIHttpChannelInternal*) &(x)->lpIHttpChannelInternalVtbl) - #define HTTPNEG(x) ((IHttpNegotiate2*) &(x)->lpHttpNegotiate2Vtbl) #define STATUSCLB(x) ((IBindStatusCallback*) &(x)->lpBindStatusCallbackVtbl) #define BINDINFO(x) ((IInternetBindInfo*) &(x)->lpInternetBindInfoVtbl); diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 153c9eb..7f1cad0 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -420,10 +420,10 @@ static nsresult NSAPI nsChannel_QueryInterface(nsIHttpChannel *iface, nsIIDRef r *result = is_http_channel(This) ? &This->nsIHttpChannel_iface : NULL; }else if(IsEqualGUID(&IID_nsIUploadChannel, riid)) { TRACE("(%p)->(IID_nsIUploadChannel %p)\n", This, result); - *result = NSUPCHANNEL(This); + *result = &This->nsIUploadChannel_iface; }else if(IsEqualGUID(&IID_nsIHttpChannelInternal, riid)) { TRACE("(%p)->(IID_nsIHttpChannelInternal %p)\n", This, result); - *result = is_http_channel(This) ? NSHTTPINTERNAL(This) : NULL; + *result = is_http_channel(This) ? &This->nsIHttpChannelInternal_iface : NULL; }else { TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), result); *result = NULL; @@ -1272,31 +1272,34 @@ static const nsIHttpChannelVtbl nsChannelVtbl = { nsChannel_IsNoCacheResponse }; -#define NSUPCHANNEL_THIS(iface) DEFINE_THIS(nsChannel, UploadChannel, iface) +static inline nsChannel *impl_from_nsIUploadChannel(nsIUploadChannel *iface) +{ + return CONTAINING_RECORD(iface, nsChannel, nsIUploadChannel_iface); +} static nsresult NSAPI nsUploadChannel_QueryInterface(nsIUploadChannel *iface, nsIIDRef riid, void **result) { - nsChannel *This = NSUPCHANNEL_THIS(iface); + nsChannel *This = impl_from_nsIUploadChannel(iface); return nsIChannel_QueryInterface(&This->nsIHttpChannel_iface, riid, result); } static nsrefcnt NSAPI nsUploadChannel_AddRef(nsIUploadChannel *iface) { - nsChannel *This = NSUPCHANNEL_THIS(iface); + nsChannel *This = impl_from_nsIUploadChannel(iface); return nsIChannel_AddRef(&This->nsIHttpChannel_iface); } static nsrefcnt NSAPI nsUploadChannel_Release(nsIUploadChannel *iface) { - nsChannel *This = NSUPCHANNEL_THIS(iface); + nsChannel *This = impl_from_nsIUploadChannel(iface); return nsIChannel_Release(&This->nsIHttpChannel_iface); } static nsresult NSAPI nsUploadChannel_SetUploadStream(nsIUploadChannel *iface, nsIInputStream *aStream, const nsACString *aContentType, PRInt32 aContentLength) { - nsChannel *This = NSUPCHANNEL_THIS(iface); + nsChannel *This = impl_from_nsIUploadChannel(iface); const char *content_type; static const WCHAR content_typeW[] = @@ -1338,7 +1341,7 @@ static nsresult NSAPI nsUploadChannel_SetUploadStream(nsIUploadChannel *iface, static nsresult NSAPI nsUploadChannel_GetUploadStream(nsIUploadChannel *iface, nsIInputStream **aUploadStream) { - nsChannel *This = NSUPCHANNEL_THIS(iface); + nsChannel *This = impl_from_nsIUploadChannel(iface); TRACE("(%p)->(%p)\n", This, aUploadStream); @@ -1349,8 +1352,6 @@ static nsresult NSAPI nsUploadChannel_GetUploadStream(nsIUploadChannel *iface, return NS_OK; } -#undef NSUPCHANNEL_THIS - static const nsIUploadChannelVtbl nsUploadChannelVtbl = { nsUploadChannel_QueryInterface, nsUploadChannel_AddRef, @@ -1359,30 +1360,33 @@ static const nsIUploadChannelVtbl nsUploadChannelVtbl = { nsUploadChannel_GetUploadStream }; -#define NSHTTPINTERNAL_THIS(iface) DEFINE_THIS(nsChannel, IHttpChannelInternal, iface) +static inline nsChannel *impl_from_nsIHttpChannelInternal(nsIHttpChannelInternal *iface) +{ + return CONTAINING_RECORD(iface, nsChannel, nsIHttpChannelInternal_iface); +} static nsresult NSAPI nsHttpChannelInternal_QueryInterface(nsIHttpChannelInternal *iface, nsIIDRef riid, void **result) { - nsChannel *This = NSHTTPINTERNAL_THIS(iface); + nsChannel *This = impl_from_nsIHttpChannelInternal(iface); return nsIChannel_QueryInterface(&This->nsIHttpChannel_iface, riid, result); } static nsrefcnt NSAPI nsHttpChannelInternal_AddRef(nsIHttpChannelInternal *iface) { - nsChannel *This = NSHTTPINTERNAL_THIS(iface); + nsChannel *This = impl_from_nsIHttpChannelInternal(iface); return nsIChannel_AddRef(&This->nsIHttpChannel_iface); } static nsrefcnt NSAPI nsHttpChannelInternal_Release(nsIHttpChannelInternal *iface) { - nsChannel *This = NSHTTPINTERNAL_THIS(iface); + nsChannel *This = impl_from_nsIHttpChannelInternal(iface); return nsIChannel_Release(&This->nsIHttpChannel_iface); } static nsresult NSAPI nsHttpChannelInternal_GetDocumentURI(nsIHttpChannelInternal *iface, nsIURI **aDocumentURI) { - nsChannel *This = NSHTTPINTERNAL_THIS(iface); + nsChannel *This = impl_from_nsIHttpChannelInternal(iface); FIXME("(%p)->()\n", This); @@ -1391,7 +1395,7 @@ static nsresult NSAPI nsHttpChannelInternal_GetDocumentURI(nsIHttpChannelInterna static nsresult NSAPI nsHttpChannelInternal_SetDocumentURI(nsIHttpChannelInternal *iface, nsIURI *aDocumentURI) { - nsChannel *This = NSHTTPINTERNAL_THIS(iface); + nsChannel *This = impl_from_nsIHttpChannelInternal(iface); FIXME("(%p)->()\n", This); @@ -1400,7 +1404,7 @@ static nsresult NSAPI nsHttpChannelInternal_SetDocumentURI(nsIHttpChannelInterna static nsresult NSAPI nsHttpChannelInternal_GetRequestVersion(nsIHttpChannelInternal *iface, PRUint32 *major, PRUint32 *minor) { - nsChannel *This = NSHTTPINTERNAL_THIS(iface); + nsChannel *This = impl_from_nsIHttpChannelInternal(iface); FIXME("(%p)->()\n", This); @@ -1409,7 +1413,7 @@ static nsresult NSAPI nsHttpChannelInternal_GetRequestVersion(nsIHttpChannelInte static nsresult NSAPI nsHttpChannelInternal_GetResponseVersion(nsIHttpChannelInternal *iface, PRUint32 *major, PRUint32 *minor) { - nsChannel *This = NSHTTPINTERNAL_THIS(iface); + nsChannel *This = impl_from_nsIHttpChannelInternal(iface); FIXME("(%p)->()\n", This); @@ -1418,7 +1422,7 @@ static nsresult NSAPI nsHttpChannelInternal_GetResponseVersion(nsIHttpChannelInt static nsresult NSAPI nsHttpChannelInternal_SetCookie(nsIHttpChannelInternal *iface, const char *aCookieHeader) { - nsChannel *This = NSHTTPINTERNAL_THIS(iface); + nsChannel *This = impl_from_nsIHttpChannelInternal(iface); FIXME("(%p)->()\n", This); @@ -1427,7 +1431,7 @@ static nsresult NSAPI nsHttpChannelInternal_SetCookie(nsIHttpChannelInternal *if static nsresult NSAPI nsHttpChannelInternal_SetupFallbackChannel(nsIHttpChannelInternal *iface, const char *aFallbackKey) { - nsChannel *This = NSHTTPINTERNAL_THIS(iface); + nsChannel *This = impl_from_nsIHttpChannelInternal(iface); FIXME("(%p)->()\n", This); @@ -1436,7 +1440,7 @@ static nsresult NSAPI nsHttpChannelInternal_SetupFallbackChannel(nsIHttpChannelI static nsresult NSAPI nsHttpChannelInternal_GetForceAllowThirdPartyCookie(nsIHttpChannelInternal *iface, PRBool *aForceThirdPartyCookie) { - nsChannel *This = NSHTTPINTERNAL_THIS(iface); + nsChannel *This = impl_from_nsIHttpChannelInternal(iface); FIXME("(%p)->()\n", This); @@ -1445,7 +1449,7 @@ static nsresult NSAPI nsHttpChannelInternal_GetForceAllowThirdPartyCookie(nsIHtt static nsresult NSAPI nsHttpChannelInternal_SetForceAllowThirdPartyCookie(nsIHttpChannelInternal *iface, PRBool aForceThirdPartyCookie) { - nsChannel *This = NSHTTPINTERNAL_THIS(iface); + nsChannel *This = impl_from_nsIHttpChannelInternal(iface); FIXME("(%p)->()\n", This); @@ -1454,15 +1458,13 @@ static nsresult NSAPI nsHttpChannelInternal_SetForceAllowThirdPartyCookie(nsIHtt static nsresult NSAPI nsHttpChannelInternal_GetCanceled(nsIHttpChannelInternal *iface, PRBool *aCanceled) { - nsChannel *This = NSHTTPINTERNAL_THIS(iface); + nsChannel *This = impl_from_nsIHttpChannelInternal(iface); FIXME("(%p)->(%p)\n", This, aCanceled); return NS_ERROR_NOT_IMPLEMENTED; } -#undef NSHTTPINTERNAL_THIS - static const nsIHttpChannelInternalVtbl nsHttpChannelInternalVtbl = { nsHttpChannelInternal_QueryInterface, nsHttpChannelInternal_AddRef, @@ -2804,8 +2806,8 @@ static nsresult NSAPI nsIOService_NewChannelFromURI(nsIIOService *iface, nsIURI ret = heap_alloc_zero(sizeof(nsChannel)); ret->nsIHttpChannel_iface.lpVtbl = &nsChannelVtbl; - ret->lpUploadChannelVtbl = &nsUploadChannelVtbl; - ret->lpIHttpChannelInternalVtbl = &nsHttpChannelInternalVtbl; + ret->nsIUploadChannel_iface.lpVtbl = &nsUploadChannelVtbl; + ret->nsIHttpChannelInternal_iface.lpVtbl = &nsHttpChannelInternalVtbl; ret->ref = 1; ret->uri = wine_uri; ret->request_method = METHOD_GET;

1 0

Michael Stefaniuc : mshtml: COM cleanup for the nsIHttpChannel iface.
by Alexandre Julliard 30 Dec '10

30 Dec '10

Module: wine Branch: master Commit: a29101b026c7b28c473b37d0b6c34ff5754036ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=a29101b026c7b28c473b37d0b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Dec 30 01:43:11 2010 +0100 mshtml: COM cleanup for the nsIHttpChannel iface. --- dlls/mshtml/mshtml_private.h | 4 +- dlls/mshtml/navigate.c | 13 ++-- dlls/mshtml/nsio.c | 132 +++++++++++++++++++++--------------------- 3 files changed, 75 insertions(+), 74 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a29101b026c7b28c473b3…

1 0

Michael Stefaniuc : mshtml: COM cleanup for the IHTMLDOMChildrenCollection iface.
by Alexandre Julliard 30 Dec '10

30 Dec '10

Module: wine Branch: master Commit: 6c075b6d4297fb8d0d347eb6e2cf528fac15f558 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c075b6d4297fb8d0d347eb6e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Dec 30 01:41:56 2010 +0100 mshtml: COM cleanup for the IHTMLDOMChildrenCollection iface. --- dlls/mshtml/htmlnode.c | 45 +++++++++++++++++++++++---------------------- 1 files changed, 23 insertions(+), 22 deletions(-) diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index d6de2c8..3685d45 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -37,7 +37,7 @@ static HRESULT create_node(HTMLDocumentNode*,nsIDOMNode*,HTMLDOMNode**); typedef struct { DispatchEx dispex; - const IHTMLDOMChildrenCollectionVtbl *lpIHTMLDOMChildrenCollectionVtbl; + IHTMLDOMChildrenCollection IHTMLDOMChildrenCollection_iface; LONG ref; @@ -47,22 +47,23 @@ typedef struct { nsIDOMNodeList *nslist; } HTMLDOMChildrenCollection; -#define HTMLCHILDCOL(x) ((IHTMLDOMChildrenCollection*) &(x)->lpIHTMLDOMChildrenCollectionVtbl) - -#define HTMLCHILDCOL_THIS(iface) DEFINE_THIS(HTMLDOMChildrenCollection, IHTMLDOMChildrenCollection, iface) +static inline HTMLDOMChildrenCollection *impl_from_IHTMLDOMChildrenCollection(IHTMLDOMChildrenCollection *iface) +{ + return CONTAINING_RECORD(iface, HTMLDOMChildrenCollection, IHTMLDOMChildrenCollection_iface); +} static HRESULT WINAPI HTMLDOMChildrenCollection_QueryInterface(IHTMLDOMChildrenCollection *iface, REFIID riid, void **ppv) { - HTMLDOMChildrenCollection *This = HTMLCHILDCOL_THIS(iface); + HTMLDOMChildrenCollection *This = impl_from_IHTMLDOMChildrenCollection(iface); *ppv = NULL; if(IsEqualGUID(&IID_IUnknown, riid)) { TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); - *ppv = HTMLCHILDCOL(This); + *ppv = &This->IHTMLDOMChildrenCollection_iface; }else if(IsEqualGUID(&IID_IHTMLDOMChildrenCollection, riid)) { TRACE("(%p)->(IID_IHTMLDOMChildrenCollection %p)\n", This, ppv); - *ppv = HTMLCHILDCOL(This); + *ppv = &This->IHTMLDOMChildrenCollection_iface; }else if(dispex_query_interface(&This->dispex, riid, ppv)) { return *ppv ? S_OK : E_NOINTERFACE; } @@ -78,7 +79,7 @@ static HRESULT WINAPI HTMLDOMChildrenCollection_QueryInterface(IHTMLDOMChildrenC static ULONG WINAPI HTMLDOMChildrenCollection_AddRef(IHTMLDOMChildrenCollection *iface) { - HTMLDOMChildrenCollection *This = HTMLCHILDCOL_THIS(iface); + HTMLDOMChildrenCollection *This = impl_from_IHTMLDOMChildrenCollection(iface); LONG ref = InterlockedIncrement(&This->ref); TRACE("(%p) ref=%d\n", This, ref); @@ -88,7 +89,7 @@ static ULONG WINAPI HTMLDOMChildrenCollection_AddRef(IHTMLDOMChildrenCollection static ULONG WINAPI HTMLDOMChildrenCollection_Release(IHTMLDOMChildrenCollection *iface) { - HTMLDOMChildrenCollection *This = HTMLCHILDCOL_THIS(iface); + HTMLDOMChildrenCollection *This = impl_from_IHTMLDOMChildrenCollection(iface); LONG ref = InterlockedDecrement(&This->ref); TRACE("(%p) ref=%d\n", This, ref); @@ -103,21 +104,21 @@ static ULONG WINAPI HTMLDOMChildrenCollection_Release(IHTMLDOMChildrenCollection static HRESULT WINAPI HTMLDOMChildrenCollection_GetTypeInfoCount(IHTMLDOMChildrenCollection *iface, UINT *pctinfo) { - HTMLDOMChildrenCollection *This = HTMLCHILDCOL_THIS(iface); + HTMLDOMChildrenCollection *This = impl_from_IHTMLDOMChildrenCollection(iface); return IDispatchEx_GetTypeInfoCount(DISPATCHEX(&This->dispex), pctinfo); } static HRESULT WINAPI HTMLDOMChildrenCollection_GetTypeInfo(IHTMLDOMChildrenCollection *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { - HTMLDOMChildrenCollection *This = HTMLCHILDCOL_THIS(iface); + HTMLDOMChildrenCollection *This = impl_from_IHTMLDOMChildrenCollection(iface); return IDispatchEx_GetTypeInfo(DISPATCHEX(&This->dispex), iTInfo, lcid, ppTInfo); } static HRESULT WINAPI HTMLDOMChildrenCollection_GetIDsOfNames(IHTMLDOMChildrenCollection *iface, REFIID riid, LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) { - HTMLDOMChildrenCollection *This = HTMLCHILDCOL_THIS(iface); + HTMLDOMChildrenCollection *This = impl_from_IHTMLDOMChildrenCollection(iface); return IDispatchEx_GetIDsOfNames(DISPATCHEX(&This->dispex), riid, rgszNames, cNames, lcid, rgDispId); } @@ -125,14 +126,14 @@ static HRESULT WINAPI HTMLDOMChildrenCollection_Invoke(IHTMLDOMChildrenCollectio REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) { - HTMLDOMChildrenCollection *This = HTMLCHILDCOL_THIS(iface); + HTMLDOMChildrenCollection *This = impl_from_IHTMLDOMChildrenCollection(iface); return IDispatchEx_Invoke(DISPATCHEX(&This->dispex), dispIdMember, riid, lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); } static HRESULT WINAPI HTMLDOMChildrenCollection_get_length(IHTMLDOMChildrenCollection *iface, LONG *p) { - HTMLDOMChildrenCollection *This = HTMLCHILDCOL_THIS(iface); + HTMLDOMChildrenCollection *This = impl_from_IHTMLDOMChildrenCollection(iface); PRUint32 length=0; TRACE("(%p)->(%p)\n", This, p); @@ -144,14 +145,14 @@ static HRESULT WINAPI HTMLDOMChildrenCollection_get_length(IHTMLDOMChildrenColle static HRESULT WINAPI HTMLDOMChildrenCollection__newEnum(IHTMLDOMChildrenCollection *iface, IUnknown **p) { - HTMLDOMChildrenCollection *This = HTMLCHILDCOL_THIS(iface); + HTMLDOMChildrenCollection *This = impl_from_IHTMLDOMChildrenCollection(iface); FIXME("(%p)->(%p)\n", This, p); return E_NOTIMPL; } static HRESULT WINAPI HTMLDOMChildrenCollection_item(IHTMLDOMChildrenCollection *iface, LONG index, IDispatch **ppItem) { - HTMLDOMChildrenCollection *This = HTMLCHILDCOL_THIS(iface); + HTMLDOMChildrenCollection *This = impl_from_IHTMLDOMChildrenCollection(iface); nsIDOMNode *nsnode = NULL; HTMLDOMNode *node; PRUint32 length=0; @@ -184,8 +185,6 @@ static HRESULT WINAPI HTMLDOMChildrenCollection_item(IHTMLDOMChildrenCollection return S_OK; } -#undef HTMLCHILDCOL_THIS - static const IHTMLDOMChildrenCollectionVtbl HTMLDOMChildrenCollectionVtbl = { HTMLDOMChildrenCollection_QueryInterface, HTMLDOMChildrenCollection_AddRef, @@ -239,7 +238,8 @@ static HRESULT HTMLDOMChildrenCollection_invoke(DispatchEx *dispex, DISPID id, L IDispatch *disp = NULL; HRESULT hres; - hres = IHTMLDOMChildrenCollection_item(HTMLCHILDCOL(This), id - DISPID_CHILDCOL_0, &disp); + hres = IHTMLDOMChildrenCollection_item(&This->IHTMLDOMChildrenCollection_iface, + id - DISPID_CHILDCOL_0, &disp); if(0&&FAILED(hres)) return hres; @@ -279,16 +279,17 @@ static IHTMLDOMChildrenCollection *create_child_collection(HTMLDocumentNode *doc HTMLDOMChildrenCollection *ret; ret = heap_alloc_zero(sizeof(*ret)); - ret->lpIHTMLDOMChildrenCollectionVtbl = &HTMLDOMChildrenCollectionVtbl; + ret->IHTMLDOMChildrenCollection_iface.lpVtbl = &HTMLDOMChildrenCollectionVtbl; ret->ref = 1; nsIDOMNodeList_AddRef(nslist); ret->nslist = nslist; ret->doc = doc; - init_dispex(&ret->dispex, (IUnknown*)HTMLCHILDCOL(ret), &HTMLDOMChildrenCollection_dispex); + init_dispex(&ret->dispex, (IUnknown*)&ret->IHTMLDOMChildrenCollection_iface, + &HTMLDOMChildrenCollection_dispex); - return HTMLCHILDCOL(ret); + return &ret->IHTMLDOMChildrenCollection_iface; } static inline HTMLDOMNode *impl_from_IHTMLDOMNode(IHTMLDOMNode *iface)

1 0

Michael Stefaniuc : mshtml: COM cleanup for the IHTMLDOMNode2 iface.
by Alexandre Julliard 30 Dec '10

30 Dec '10

Module: wine Branch: master Commit: e068287c21850f1b6d2614bc7cb44bd63f28f6bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=e068287c21850f1b6d2614bc7… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Dec 30 01:40:18 2010 +0100 mshtml: COM cleanup for the IHTMLDOMNode2 iface. --- dlls/mshtml/htmlnode.c | 27 ++++++++++++++------------- dlls/mshtml/mshtml_private.h | 4 +--- 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index 34a6c24..d6de2c8 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -838,40 +838,43 @@ static const IHTMLDOMNodeVtbl HTMLDOMNodeVtbl = { HTMLDOMNode_get_nextSibling }; -#define HTMLDOMNODE2_THIS(iface) DEFINE_THIS(HTMLDOMNode, HTMLDOMNode2, iface) +static inline HTMLDOMNode *impl_from_IHTMLDOMNode2(IHTMLDOMNode2 *iface) +{ + return CONTAINING_RECORD(iface, HTMLDOMNode, IHTMLDOMNode2_iface); +} static HRESULT WINAPI HTMLDOMNode2_QueryInterface(IHTMLDOMNode2 *iface, REFIID riid, void **ppv) { - HTMLDOMNode *This = HTMLDOMNODE2_THIS(iface); + HTMLDOMNode *This = impl_from_IHTMLDOMNode2(iface); return IHTMLDOMNode_QueryInterface(&This->IHTMLDOMNode_iface, riid, ppv); } static ULONG WINAPI HTMLDOMNode2_AddRef(IHTMLDOMNode2 *iface) { - HTMLDOMNode *This = HTMLDOMNODE2_THIS(iface); + HTMLDOMNode *This = impl_from_IHTMLDOMNode2(iface); return IHTMLDOMNode_AddRef(&This->IHTMLDOMNode_iface); } static ULONG WINAPI HTMLDOMNode2_Release(IHTMLDOMNode2 *iface) { - HTMLDOMNode *This = HTMLDOMNODE2_THIS(iface); + HTMLDOMNode *This = impl_from_IHTMLDOMNode2(iface); return IHTMLDOMNode_Release(&This->IHTMLDOMNode_iface); } static HRESULT WINAPI HTMLDOMNode2_GetTypeInfoCount(IHTMLDOMNode2 *iface, UINT *pctinfo) { - HTMLDOMNode *This = HTMLDOMNODE2_THIS(iface); + HTMLDOMNode *This = impl_from_IHTMLDOMNode2(iface); return IDispatchEx_GetTypeInfoCount(DISPATCHEX(&This->dispex), pctinfo); } static HRESULT WINAPI HTMLDOMNode2_GetTypeInfo(IHTMLDOMNode2 *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { - HTMLDOMNode *This = HTMLDOMNODE2_THIS(iface); + HTMLDOMNode *This = impl_from_IHTMLDOMNode2(iface); return IDispatchEx_GetTypeInfo(DISPATCHEX(&This->dispex), iTInfo, lcid, ppTInfo); } @@ -879,7 +882,7 @@ static HRESULT WINAPI HTMLDOMNode2_GetIDsOfNames(IHTMLDOMNode2 *iface, REFIID ri LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) { - HTMLDOMNode *This = HTMLDOMNODE2_THIS(iface); + HTMLDOMNode *This = impl_from_IHTMLDOMNode2(iface); return IDispatchEx_GetIDsOfNames(DISPATCHEX(&This->dispex), riid, rgszNames, cNames, lcid, rgDispId); } @@ -887,14 +890,14 @@ static HRESULT WINAPI HTMLDOMNode2_Invoke(IHTMLDOMNode2 *iface, DISPID dispIdMem REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) { - HTMLDOMNode *This = HTMLDOMNODE2_THIS(iface); + HTMLDOMNode *This = impl_from_IHTMLDOMNode2(iface); return IDispatchEx_Invoke(DISPATCHEX(&This->dispex), dispIdMember, riid, lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); } static HRESULT WINAPI HTMLDOMNode2_get_ownerDocument(IHTMLDOMNode2 *iface, IDispatch **p) { - HTMLDOMNode *This = HTMLDOMNODE2_THIS(iface); + HTMLDOMNode *This = impl_from_IHTMLDOMNode2(iface); TRACE("(%p)->(%p)\n", This, p); @@ -908,8 +911,6 @@ static HRESULT WINAPI HTMLDOMNode2_get_ownerDocument(IHTMLDOMNode2 *iface, IDisp return S_OK; } -#undef HTMLDOMNODE2_THIS - static const IHTMLDOMNode2Vtbl HTMLDOMNode2Vtbl = { HTMLDOMNode2_QueryInterface, HTMLDOMNode2_AddRef, @@ -944,7 +945,7 @@ HRESULT HTMLDOMNode_QI(HTMLDOMNode *This, REFIID riid, void **ppv) *ppv = &This->IHTMLDOMNode_iface; }else if(IsEqualGUID(&IID_IHTMLDOMNode2, riid)) { TRACE("(%p)->(IID_IHTMLDOMNode2 %p)\n", This, ppv); - *ppv = HTMLDOMNODE2(This); + *ppv = &This->IHTMLDOMNode2_iface; }else if(dispex_query_interface(&This->dispex, riid, ppv)) { return *ppv ? S_OK : E_NOINTERFACE; } @@ -987,7 +988,7 @@ static const NodeImplVtbl HTMLDOMNodeImplVtbl = { void HTMLDOMNode_Init(HTMLDocumentNode *doc, HTMLDOMNode *node, nsIDOMNode *nsnode) { node->IHTMLDOMNode_iface.lpVtbl = &HTMLDOMNodeVtbl; - node->lpHTMLDOMNode2Vtbl = &HTMLDOMNode2Vtbl; + node->IHTMLDOMNode2_iface.lpVtbl = &HTMLDOMNode2Vtbl; node->ref = 1; node->doc = doc; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index ae7c121..e936bce 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -532,7 +532,7 @@ typedef struct { struct HTMLDOMNode { DispatchEx dispex; IHTMLDOMNode IHTMLDOMNode_iface; - const IHTMLDOMNode2Vtbl *lpHTMLDOMNode2Vtbl; + IHTMLDOMNode2 IHTMLDOMNode2_iface; const NodeImplVtbl *vtbl; LONG ref; @@ -642,8 +642,6 @@ struct HTMLDocumentNode { #define STATUSCLB(x) ((IBindStatusCallback*) &(x)->lpBindStatusCallbackVtbl) #define BINDINFO(x) ((IInternetBindInfo*) &(x)->lpInternetBindInfoVtbl); -#define HTMLDOMNODE2(x) ((IHTMLDOMNode2*) &(x)->lpHTMLDOMNode2Vtbl) - #define HTMLTEXTCONT(x) ((IHTMLTextContainer*) &(x)->lpHTMLTextContainerVtbl) #define HTMLFRAMEBASE(x) ((IHTMLFrameBase*) &(x)->lpIHTMLFrameBaseVtbl) #define HTMLFRAMEBASE2(x) ((IHTMLFrameBase2*) &(x)->lpIHTMLFrameBase2Vtbl)

1 0

← Newer
1
2
3
4
5
6
7
8
9
...
110
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2010