December 2010 - Wine-commits

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

Nikolay Sivov : oleaut32: Get rid of useless comment lines.
by Alexandre Julliard 30 Dec '10

30 Dec '10

Module: wine Branch: master Commit: cd88a165a4edb07ba2a49a068f021f1d423e1dc4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd88a165a4edb07ba2a49a068… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Dec 29 03:29:02 2010 +0300 oleaut32: Get rid of useless comment lines. --- dlls/oleaut32/typelib2.c | 149 +--------------------------------------------- 1 files changed, 2 insertions(+), 147 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cd88a165a4edb07ba2a49…

1 0

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

30 Dec '10

Module: wine Branch: master Commit: d4248e95f574db8c634936093d8cfef8140e3a61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4248e95f574db8c634936093… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Dec 30 01:24:59 2010 +0100 mshtml: COM cleanup for the IHTMLElement iface. --- dlls/mshtml/htmlcomment.c | 2 +- dlls/mshtml/htmldoc.c | 4 +- dlls/mshtml/htmlelem.c | 215 +++++++++++++++++++++--------------------- dlls/mshtml/htmlelem2.c | 11 +- dlls/mshtml/htmlelem3.c | 6 +- dlls/mshtml/htmlelemcol.c | 10 +- dlls/mshtml/htmlimg.c | 3 +- dlls/mshtml/htmltextcont.c | 6 +- dlls/mshtml/htmlwindow.c | 2 +- dlls/mshtml/mshtml_private.h | 3 +- 10 files changed, 133 insertions(+), 129 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d4248e95f574db8c63493…

1 0

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

30 Dec '10

Module: wine Branch: master Commit: a75e2b27890264f4d69ae721407165fe28a12b3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a75e2b27890264f4d69ae7214… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Dec 30 01:27:28 2010 +0100 mshtml: COM cleanup for the IHTMLElement2 iface. --- dlls/mshtml/htmlanchor.c | 20 ++-- dlls/mshtml/htmlelem.c | 2 +- dlls/mshtml/htmlelem2.c | 219 +++++++++++++++++++++--------------------- dlls/mshtml/htmltextcont.c | 12 +- dlls/mshtml/mshtml_private.h | 3 +- 5 files changed, 128 insertions(+), 128 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a75e2b27890264f4d69ae…

1 0

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

30 Dec '10

Module: wine Branch: master Commit: 98d5a2e7f0fff8d4833b962a5436114679d7aa3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=98d5a2e7f0fff8d4833b962a5… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Dec 30 01:30:37 2010 +0100 mshtml: COM cleanup for the IHTMLElement3 iface. --- dlls/mshtml/htmlelem.c | 2 +- dlls/mshtml/htmlelem3.c | 109 +++++++++++++++++++++--------------------- dlls/mshtml/mshtml_private.h | 3 +- 3 files changed, 57 insertions(+), 57 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=98d5a2e7f0fff8d4833b9…

1 0

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

30 Dec '10

Module: wine Branch: master Commit: 700ab01b6df5756febfb26f2f03119913905479b URL: http://source.winehq.org/git/wine.git/?a=commit;h=700ab01b6df5756febfb26f2f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Dec 30 01:32:54 2010 +0100 mshtml: COM cleanup for the IHTMLFiltersCollection iface. --- dlls/mshtml/htmlelem.c | 41 +++++++++++++++++++++-------------------- 1 files changed, 21 insertions(+), 20 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index e9cb94b..b2fa53c 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -98,15 +98,15 @@ static const tag_desc_t *get_tag_desc(const WCHAR *tag_name) typedef struct { DispatchEx dispex; - const IHTMLFiltersCollectionVtbl *lpHTMLFiltersCollectionVtbl; + IHTMLFiltersCollection IHTMLFiltersCollection_iface; LONG ref; } HTMLFiltersCollection; -#define HTMLFILTERSCOLLECTION(x) ((IHTMLFiltersCollection*) &(x)->lpHTMLFiltersCollectionVtbl) - -#define HTMLFILTERSCOLLECTION_THIS(iface) \ - DEFINE_THIS(HTMLFiltersCollection, HTMLFiltersCollection, iface) +static inline HTMLFiltersCollection *impl_from_IHTMLFiltersCollection(IHTMLFiltersCollection *iface) +{ + return CONTAINING_RECORD(iface, HTMLFiltersCollection, IHTMLFiltersCollection_iface); +} IHTMLFiltersCollection *HTMLFiltersCollection_Create(void); @@ -1781,16 +1781,16 @@ HRESULT HTMLElement_Create(HTMLDocumentNode *doc, nsIDOMNode *nsnode, BOOL use_g /* interface IHTMLFiltersCollection */ static HRESULT WINAPI HTMLFiltersCollection_QueryInterface(IHTMLFiltersCollection *iface, REFIID riid, void **ppv) { - HTMLFiltersCollection *This = HTMLFILTERSCOLLECTION_THIS(iface); + HTMLFiltersCollection *This = impl_from_IHTMLFiltersCollection(iface); TRACE("%p %s %p\n", This, debugstr_guid( riid ), ppv ); if(IsEqualGUID(&IID_IUnknown, riid)) { TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); - *ppv = HTMLFILTERSCOLLECTION(This); + *ppv = &This->IHTMLFiltersCollection_iface; }else if(IsEqualGUID(&IID_IHTMLFiltersCollection, riid)) { TRACE("(%p)->(IID_IHTMLFiltersCollection %p)\n", This, ppv); - *ppv = HTMLFILTERSCOLLECTION(This); + *ppv = &This->IHTMLFiltersCollection_iface; }else if(dispex_query_interface(&This->dispex, riid, ppv)) { return *ppv ? S_OK : E_NOINTERFACE; } @@ -1806,7 +1806,7 @@ static HRESULT WINAPI HTMLFiltersCollection_QueryInterface(IHTMLFiltersCollectio static ULONG WINAPI HTMLFiltersCollection_AddRef(IHTMLFiltersCollection *iface) { - HTMLFiltersCollection *This = HTMLFILTERSCOLLECTION_THIS(iface); + HTMLFiltersCollection *This = impl_from_IHTMLFiltersCollection(iface); LONG ref = InterlockedIncrement(&This->ref); TRACE("(%p) ref=%d\n", This, ref); @@ -1816,7 +1816,7 @@ static ULONG WINAPI HTMLFiltersCollection_AddRef(IHTMLFiltersCollection *iface) static ULONG WINAPI HTMLFiltersCollection_Release(IHTMLFiltersCollection *iface) { - HTMLFiltersCollection *This = HTMLFILTERSCOLLECTION_THIS(iface); + HTMLFiltersCollection *This = impl_from_IHTMLFiltersCollection(iface); LONG ref = InterlockedDecrement(&This->ref); TRACE("(%p) ref=%d\n", This, ref); @@ -1831,14 +1831,14 @@ static ULONG WINAPI HTMLFiltersCollection_Release(IHTMLFiltersCollection *iface) static HRESULT WINAPI HTMLFiltersCollection_GetTypeInfoCount(IHTMLFiltersCollection *iface, UINT *pctinfo) { - HTMLFiltersCollection *This = HTMLFILTERSCOLLECTION_THIS(iface); + HTMLFiltersCollection *This = impl_from_IHTMLFiltersCollection(iface); return IDispatchEx_GetTypeInfoCount(DISPATCHEX(&This->dispex), pctinfo); } static HRESULT WINAPI HTMLFiltersCollection_GetTypeInfo(IHTMLFiltersCollection *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { - HTMLFiltersCollection *This = HTMLFILTERSCOLLECTION_THIS(iface); + HTMLFiltersCollection *This = impl_from_IHTMLFiltersCollection(iface); return IDispatchEx_GetTypeInfo(DISPATCHEX(&This->dispex), iTInfo, lcid, ppTInfo); } @@ -1846,7 +1846,7 @@ static HRESULT WINAPI HTMLFiltersCollection_GetIDsOfNames(IHTMLFiltersCollection REFIID riid, LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) { - HTMLFiltersCollection *This = HTMLFILTERSCOLLECTION_THIS(iface); + HTMLFiltersCollection *This = impl_from_IHTMLFiltersCollection(iface); return IDispatchEx_GetIDsOfNames(DISPATCHEX(&This->dispex), riid, rgszNames, cNames, lcid, rgDispId); } @@ -1854,14 +1854,14 @@ static HRESULT WINAPI HTMLFiltersCollection_Invoke(IHTMLFiltersCollection *iface LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) { - HTMLFiltersCollection *This = HTMLFILTERSCOLLECTION_THIS(iface); + HTMLFiltersCollection *This = impl_from_IHTMLFiltersCollection(iface); return IDispatchEx_Invoke(DISPATCHEX(&This->dispex), dispIdMember, riid, lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); } static HRESULT WINAPI HTMLFiltersCollection_get_length(IHTMLFiltersCollection *iface, LONG *p) { - HTMLFiltersCollection *This = HTMLFILTERSCOLLECTION_THIS(iface); + HTMLFiltersCollection *This = impl_from_IHTMLFiltersCollection(iface); if(!p) return E_POINTER; @@ -1874,14 +1874,14 @@ static HRESULT WINAPI HTMLFiltersCollection_get_length(IHTMLFiltersCollection *i static HRESULT WINAPI HTMLFiltersCollection_get__newEnum(IHTMLFiltersCollection *iface, IUnknown **p) { - HTMLFiltersCollection *This = HTMLFILTERSCOLLECTION_THIS(iface); + HTMLFiltersCollection *This = impl_from_IHTMLFiltersCollection(iface); FIXME("(%p)->(%p)\n", This, p); return E_NOTIMPL; } static HRESULT WINAPI HTMLFiltersCollection_item(IHTMLFiltersCollection *iface, VARIANT *pvarIndex, VARIANT *pvarResult) { - HTMLFiltersCollection *This = HTMLFILTERSCOLLECTION_THIS(iface); + HTMLFiltersCollection *This = impl_from_IHTMLFiltersCollection(iface); FIXME("(%p)->(%p, %p)\n", This, pvarIndex, pvarResult); return E_NOTIMPL; } @@ -1948,10 +1948,11 @@ IHTMLFiltersCollection *HTMLFiltersCollection_Create() { HTMLFiltersCollection *ret = heap_alloc(sizeof(HTMLFiltersCollection)); - ret->lpHTMLFiltersCollectionVtbl = &HTMLFiltersCollectionVtbl; + ret->IHTMLFiltersCollection_iface.lpVtbl = &HTMLFiltersCollectionVtbl; ret->ref = 1; - init_dispex(&ret->dispex, (IUnknown*)HTMLFILTERSCOLLECTION(ret), &HTMLFiltersCollection_dispex); + init_dispex(&ret->dispex, (IUnknown*)&ret->IHTMLFiltersCollection_iface, + &HTMLFiltersCollection_dispex); - return HTMLFILTERSCOLLECTION(ret); + return &ret->IHTMLFiltersCollection_iface; }

1 0

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

30 Dec '10

Module: wine Branch: master Commit: 6d4170bd404f8e6a04faa041fe6117fb92c16fec URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d4170bd404f8e6a04faa041f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Dec 30 01:36:57 2010 +0100 mshtml: COM cleanup for the IHTMLElementCollection iface. --- dlls/mshtml/htmlelemcol.c | 50 ++++++++++++++++++++++---------------------- 1 files changed, 25 insertions(+), 25 deletions(-) diff --git a/dlls/mshtml/htmlelemcol.c b/dlls/mshtml/htmlelemcol.c index b82a441..4807ca2 100644 --- a/dlls/mshtml/htmlelemcol.c +++ b/dlls/mshtml/htmlelemcol.c @@ -33,7 +33,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); typedef struct { DispatchEx dispex; - const IHTMLElementCollectionVtbl *lpHTMLElementCollectionVtbl; + IHTMLElementCollection IHTMLElementCollection_iface; IUnknown *ref_unk; HTMLElement **elems; @@ -42,8 +42,6 @@ typedef struct { LONG ref; } HTMLElementCollection; -#define HTMLELEMCOL(x) ((IHTMLElementCollection*) &(x)->lpHTMLElementCollectionVtbl) - typedef struct { HTMLElement **buf; DWORD len; @@ -90,27 +88,30 @@ static inline BOOL is_elem_node(nsIDOMNode *node) return type == ELEMENT_NODE || type == COMMENT_NODE; } -#define ELEMCOL_THIS(iface) DEFINE_THIS(HTMLElementCollection, HTMLElementCollection, iface) +static inline HTMLElementCollection *impl_from_IHTMLElementCollection(IHTMLElementCollection *iface) +{ + return CONTAINING_RECORD(iface, HTMLElementCollection, IHTMLElementCollection_iface); +} static HRESULT WINAPI HTMLElementCollection_QueryInterface(IHTMLElementCollection *iface, REFIID riid, void **ppv) { - HTMLElementCollection *This = ELEMCOL_THIS(iface); + HTMLElementCollection *This = impl_from_IHTMLElementCollection(iface); *ppv = NULL; if(IsEqualGUID(&IID_IUnknown, riid)) { TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); - *ppv = HTMLELEMCOL(This); + *ppv = &This->IHTMLElementCollection_iface; }else if(IsEqualGUID(&IID_IHTMLElementCollection, riid)) { TRACE("(%p)->(IID_IHTMLElementCollection %p)\n", This, ppv); - *ppv = HTMLELEMCOL(This); + *ppv = &This->IHTMLElementCollection_iface; }else if(dispex_query_interface(&This->dispex, riid, ppv)) { return *ppv ? S_OK : E_NOINTERFACE; } if(*ppv) { - IHTMLElementCollection_AddRef(HTMLELEMCOL(This)); + IHTMLElementCollection_AddRef(&This->IHTMLElementCollection_iface); return S_OK; } @@ -120,7 +121,7 @@ static HRESULT WINAPI HTMLElementCollection_QueryInterface(IHTMLElementCollectio static ULONG WINAPI HTMLElementCollection_AddRef(IHTMLElementCollection *iface) { - HTMLElementCollection *This = ELEMCOL_THIS(iface); + HTMLElementCollection *This = impl_from_IHTMLElementCollection(iface); LONG ref = InterlockedIncrement(&This->ref); TRACE("(%p) ref=%d\n", This, ref); @@ -130,7 +131,7 @@ static ULONG WINAPI HTMLElementCollection_AddRef(IHTMLElementCollection *iface) static ULONG WINAPI HTMLElementCollection_Release(IHTMLElementCollection *iface) { - HTMLElementCollection *This = ELEMCOL_THIS(iface); + HTMLElementCollection *This = impl_from_IHTMLElementCollection(iface); LONG ref = InterlockedDecrement(&This->ref); TRACE("(%p) ref=%d\n", This, ref); @@ -148,21 +149,21 @@ static ULONG WINAPI HTMLElementCollection_Release(IHTMLElementCollection *iface) static HRESULT WINAPI HTMLElementCollection_GetTypeInfoCount(IHTMLElementCollection *iface, UINT *pctinfo) { - HTMLElementCollection *This = ELEMCOL_THIS(iface); + HTMLElementCollection *This = impl_from_IHTMLElementCollection(iface); return IDispatchEx_GetTypeInfoCount(DISPATCHEX(&This->dispex), pctinfo); } static HRESULT WINAPI HTMLElementCollection_GetTypeInfo(IHTMLElementCollection *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { - HTMLElementCollection *This = ELEMCOL_THIS(iface); + HTMLElementCollection *This = impl_from_IHTMLElementCollection(iface); return IDispatchEx_GetTypeInfo(DISPATCHEX(&This->dispex), iTInfo, lcid, ppTInfo); } static HRESULT WINAPI HTMLElementCollection_GetIDsOfNames(IHTMLElementCollection *iface, REFIID riid, LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) { - HTMLElementCollection *This = ELEMCOL_THIS(iface); + HTMLElementCollection *This = impl_from_IHTMLElementCollection(iface); return IDispatchEx_GetIDsOfNames(DISPATCHEX(&This->dispex), riid, rgszNames, cNames, lcid, rgDispId); } @@ -170,7 +171,7 @@ static HRESULT WINAPI HTMLElementCollection_Invoke(IHTMLElementCollection *iface DISPID dispIdMember, REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) { - HTMLElementCollection *This = ELEMCOL_THIS(iface); + HTMLElementCollection *This = impl_from_IHTMLElementCollection(iface); return IDispatchEx_Invoke(DISPATCHEX(&This->dispex), dispIdMember, riid, lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); } @@ -178,7 +179,7 @@ static HRESULT WINAPI HTMLElementCollection_Invoke(IHTMLElementCollection *iface static HRESULT WINAPI HTMLElementCollection_toString(IHTMLElementCollection *iface, BSTR *String) { - HTMLElementCollection *This = ELEMCOL_THIS(iface); + HTMLElementCollection *This = impl_from_IHTMLElementCollection(iface); FIXME("(%p)->(%p)\n", This, String); return E_NOTIMPL; } @@ -186,7 +187,7 @@ static HRESULT WINAPI HTMLElementCollection_toString(IHTMLElementCollection *ifa static HRESULT WINAPI HTMLElementCollection_put_length(IHTMLElementCollection *iface, LONG v) { - HTMLElementCollection *This = ELEMCOL_THIS(iface); + HTMLElementCollection *This = impl_from_IHTMLElementCollection(iface); FIXME("(%p)->(%d)\n", This, v); return E_NOTIMPL; } @@ -194,7 +195,7 @@ static HRESULT WINAPI HTMLElementCollection_put_length(IHTMLElementCollection *i static HRESULT WINAPI HTMLElementCollection_get_length(IHTMLElementCollection *iface, LONG *p) { - HTMLElementCollection *This = ELEMCOL_THIS(iface); + HTMLElementCollection *This = impl_from_IHTMLElementCollection(iface); TRACE("(%p)->(%p)\n", This, p); @@ -205,7 +206,7 @@ static HRESULT WINAPI HTMLElementCollection_get_length(IHTMLElementCollection *i static HRESULT WINAPI HTMLElementCollection_get__newEnum(IHTMLElementCollection *iface, IUnknown **p) { - HTMLElementCollection *This = ELEMCOL_THIS(iface); + HTMLElementCollection *This = impl_from_IHTMLElementCollection(iface); FIXME("(%p)->(%p)\n", This, p); return E_NOTIMPL; } @@ -275,7 +276,7 @@ static HRESULT get_item_idx(HTMLElementCollection *This, UINT idx, IDispatch **r static HRESULT WINAPI HTMLElementCollection_item(IHTMLElementCollection *iface, VARIANT name, VARIANT index, IDispatch **pdisp) { - HTMLElementCollection *This = ELEMCOL_THIS(iface); + HTMLElementCollection *This = impl_from_IHTMLElementCollection(iface); HRESULT hres = S_OK; TRACE("(%p)->(%s %s %p)\n", This, debugstr_variant(&name), debugstr_variant(&index), pdisp); @@ -349,7 +350,7 @@ static HRESULT WINAPI HTMLElementCollection_item(IHTMLElementCollection *iface, static HRESULT WINAPI HTMLElementCollection_tags(IHTMLElementCollection *iface, VARIANT tagName, IDispatch **pdisp) { - HTMLElementCollection *This = ELEMCOL_THIS(iface); + HTMLElementCollection *This = impl_from_IHTMLElementCollection(iface); DWORD i; nsAString tag_str; const PRUnichar *tag; @@ -387,8 +388,6 @@ static HRESULT WINAPI HTMLElementCollection_tags(IHTMLElementCollection *iface, return S_OK; } -#undef ELEMCOL_THIS - static const IHTMLElementCollectionVtbl HTMLElementCollectionVtbl = { HTMLElementCollection_QueryInterface, HTMLElementCollection_AddRef, @@ -614,17 +613,18 @@ static IHTMLElementCollection *HTMLElementCollection_Create(IUnknown *ref_unk, { HTMLElementCollection *ret = heap_alloc_zero(sizeof(HTMLElementCollection)); - ret->lpHTMLElementCollectionVtbl = &HTMLElementCollectionVtbl; + ret->IHTMLElementCollection_iface.lpVtbl = &HTMLElementCollectionVtbl; ret->ref = 1; ret->elems = elems; ret->len = len; - init_dispex(&ret->dispex, (IUnknown*)HTMLELEMCOL(ret), &HTMLElementCollection_dispex); + init_dispex(&ret->dispex, (IUnknown*)&ret->IHTMLElementCollection_iface, + &HTMLElementCollection_dispex); IUnknown_AddRef(ref_unk); ret->ref_unk = ref_unk; TRACE("ret=%p len=%d\n", ret, len); - return HTMLELEMCOL(ret); + return &ret->IHTMLElementCollection_iface; }

1 0

Aurimas Fišeras : appwiz.cpl: Update Lithuanian translation.
by Alexandre Julliard 30 Dec '10

30 Dec '10

Module: wine Branch: master Commit: 09b14ce784b5c1b78547ae52565dbd50f897f4b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09b14ce784b5c1b78547ae525… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Wed Dec 29 19:44:33 2010 +0200 appwiz.cpl: Update Lithuanian translation. --- dlls/appwiz.cpl/Lt.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/appwiz.cpl/Lt.rc b/dlls/appwiz.cpl/Lt.rc index 3c8be8c..813c79a 100644 --- a/dlls/appwiz.cpl/Lt.rc +++ b/dlls/appwiz.cpl/Lt.rc @@ -48,6 +48,7 @@ STRINGTABLE { IDS_DOWNLOADING "Atsiunčiama..." IDS_INSTALLING "Įdiegiama..." + IDS_INVALID_SHA "Netikėta atsiųsto failo kontrolinė suma. Nutraukiamas pažeisto failo įdiegimas." } IDD_MAIN DIALOG 0, 0, 320, 220

1 0

Jacek Caban : shdocvw: Get rid of no longer used DOCHOST_THIS.
by Alexandre Julliard 30 Dec '10

30 Dec '10

Module: wine Branch: master Commit: ca3e5c47ce84b4ccbd2b4fd2f48b6cc5484dce1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca3e5c47ce84b4ccbd2b4fd2f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 29 19:05:39 2010 +0100 shdocvw: Get rid of no longer used DOCHOST_THIS. --- dlls/shdocvw/iexplore.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/shdocvw/iexplore.c b/dlls/shdocvw/iexplore.c index 745cb17..d966f79 100644 --- a/dlls/shdocvw/iexplore.c +++ b/dlls/shdocvw/iexplore.c @@ -44,8 +44,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); #define IDI_APPICON 1 -#define DOCHOST_THIS(iface) DEFINE_THIS2(InternetExplorer,doc_host,iface) - static const WCHAR szIEWinFrame[] = { 'I','E','F','r','a','m','e',0 }; /* Windows uses "Microsoft Internet Explorer" */

1 0

Anders Jonsson : appwiz.cpl: Update Swedish translation.
by Alexandre Julliard 30 Dec '10

30 Dec '10

Module: wine Branch: master Commit: db192b6d7b4d418f46feb0b8ab2439cb82cba301 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db192b6d7b4d418f46feb0b8a… Author: Anders Jonsson <anders.jonsson(a)norsjonet.se> Date: Wed Dec 29 20:33:18 2010 +0100 appwiz.cpl: Update Swedish translation. --- dlls/appwiz.cpl/Sv.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/appwiz.cpl/Sv.rc b/dlls/appwiz.cpl/Sv.rc index f9f852b..69a1d96 100644 --- a/dlls/appwiz.cpl/Sv.rc +++ b/dlls/appwiz.cpl/Sv.rc @@ -49,6 +49,7 @@ STRINGTABLE { IDS_DOWNLOADING "Hämtar..." IDS_INSTALLING "Installerar..." + IDS_INVALID_SHA "Oväntad kontrollsumma på hämtad fil. Avbryter installation av korrupt fil." } IDD_MAIN DIALOG 0, 0, 320, 220

1 0