June 2012 - Wine-Commits - list.winehq.org

Francois Gouget : msvcp90: Make a couple more numpunct_*_use_facet() functions static.
by Alexandre Julliard June 27, 2012

June 27, 2012

Module: wine Branch: master Commit: d16123919f6f1e23580e28760bfb1211066b4ee7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d16123919f6f1e23580e28760… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jun 27 09:15:22 2012 +0200 msvcp90: Make a couple more numpunct_*_use_facet() functions static. --- dlls/msvcp90/locale.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 25cffa4..5cba182 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -3801,7 +3801,7 @@ MSVCP_size_t __cdecl numpunct_wchar__Getcat(const locale_facet **facet, const lo return LC_NUMERIC; } -numpunct_wchar* numpunct_wchar_use_facet(const locale *loc) +static numpunct_wchar* numpunct_wchar_use_facet(const locale *loc) { static numpunct_wchar *obj = NULL; @@ -3847,7 +3847,7 @@ MSVCP_size_t __cdecl numpunct_short__Getcat(const locale_facet **facet, const lo return LC_NUMERIC; } -numpunct_wchar* numpunct_short_use_facet(const locale *loc) +static numpunct_wchar* numpunct_short_use_facet(const locale *loc) { static numpunct_wchar *obj = NULL;

1 0

Alexandre Julliard : gdiplus/tests: Add back some necessary casts.
by Alexandre Julliard June 27, 2012

June 27, 2012

Module: wine Branch: master Commit: 09a5f0f1c5daf66f2e3fa493caf86544b0d9416b URL: http://source.winehq.org/git/wine.git/?a=commit;h=09a5f0f1c5daf66f2e3fa493c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 28 01:37:49 2012 +0200 gdiplus/tests: Add back some necessary casts. --- dlls/gdiplus/tests/image.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 40673a0..b930b99 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -27,7 +27,7 @@ #include "gdiplus.h" #include "wine/test.h" -#define expect(expected, got) ok((got) == (expected), "Expected %d, got %d\n", (expected), (got)) +#define expect(expected, got) ok((got) == (expected), "Expected %d, got %d\n", (UINT)(expected), (UINT)(got)) #define expectf(expected, got) ok(fabs((expected) - (got)) < 0.0001, "Expected %f, got %f\n", (expected), (got)) static BOOL color_match(ARGB c1, ARGB c2, BYTE max_diff)

1 0

Michael Stefaniuc : d3drm: Get rid of unsafe_impl_from_IDirect3DRMFrame2().
by Alexandre Julliard June 27, 2012

June 27, 2012

Module: wine Branch: master Commit: 4754a3d60524dab82838b129f651770b1cf07d62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4754a3d60524dab82838b129f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jun 27 01:32:58 2012 +0200 d3drm: Get rid of unsafe_impl_from_IDirect3DRMFrame2(). --- dlls/d3drm/frame.c | 32 ++++++++++++++++---------------- 1 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index 0100221..10ddb72 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -88,7 +88,6 @@ static inline IDirect3DRMFrameImpl *impl_from_IDirect3DRMFrame3(IDirect3DRMFrame return CONTAINING_RECORD(iface, IDirect3DRMFrameImpl, IDirect3DRMFrame3_iface); } -static inline IDirect3DRMFrameImpl *unsafe_impl_from_IDirect3DRMFrame2(IDirect3DRMFrame2 *iface); static inline IDirect3DRMFrameImpl *unsafe_impl_from_IDirect3DRMFrame3(IDirect3DRMFrame3 *iface); static inline IDirect3DRMLightArrayImpl *impl_from_IDirect3DRMLightArray(IDirect3DRMLightArray *iface) @@ -604,14 +603,19 @@ static HRESULT WINAPI IDirect3DRMFrame2Impl_AddChild(IDirect3DRMFrame2* iface, LPDIRECT3DRMFRAME child) { IDirect3DRMFrameImpl *This = impl_from_IDirect3DRMFrame2(iface); - IDirect3DRMFrameImpl *frame = unsafe_impl_from_IDirect3DRMFrame2((LPDIRECT3DRMFRAME2)child); + IDirect3DRMFrame3 *frame; + HRESULT hr; TRACE("(%p/%p)->(%p)\n", iface, This, child); - if (!frame) + if (!child) + return D3DRMERR_BADOBJECT; + hr = IDirect3DRMFrame_QueryInterface(child, &IID_IDirect3DRMFrame3, (void**)&frame); + if (hr != S_OK) return D3DRMERR_BADOBJECT; + IDirect3DRMFrame_Release(child); - return IDirect3DRMFrame3_AddChild(&This->IDirect3DRMFrame3_iface, &frame->IDirect3DRMFrame3_iface); + return IDirect3DRMFrame3_AddChild(&This->IDirect3DRMFrame3_iface, frame); } static HRESULT WINAPI IDirect3DRMFrame2Impl_AddLight(IDirect3DRMFrame2* iface, @@ -928,14 +932,19 @@ static HRESULT WINAPI IDirect3DRMFrame2Impl_DeleteChild(IDirect3DRMFrame2* iface LPDIRECT3DRMFRAME frame) { IDirect3DRMFrameImpl *This = impl_from_IDirect3DRMFrame2(iface); - IDirect3DRMFrameImpl *child = unsafe_impl_from_IDirect3DRMFrame2((LPDIRECT3DRMFRAME2)frame); + IDirect3DRMFrame3 *child; + HRESULT hr; TRACE("(%p/%p)->(%p)\n", iface, This, frame); - if (!child) + if (!frame) return D3DRMERR_BADOBJECT; + hr = IDirect3DRMFrame_QueryInterface(frame, &IID_IDirect3DRMFrame3, (void**)&child); + if (hr != S_OK) + return D3DRMERR_BADOBJECT; + IDirect3DRMFrame_Release(frame); - return IDirect3DRMFrame3_DeleteChild(&This->IDirect3DRMFrame3_iface, &child->IDirect3DRMFrame3_iface); + return IDirect3DRMFrame3_DeleteChild(&This->IDirect3DRMFrame3_iface, child); } static HRESULT WINAPI IDirect3DRMFrame2Impl_DeleteLight(IDirect3DRMFrame2* iface, @@ -2650,15 +2659,6 @@ static const struct IDirect3DRMFrame3Vtbl Direct3DRMFrame3_Vtbl = IDirect3DRMFrame3Impl_GetMaterialOverride }; -static inline IDirect3DRMFrameImpl *unsafe_impl_from_IDirect3DRMFrame2(IDirect3DRMFrame2 *iface) -{ - if (!iface) - return NULL; - assert(iface->lpVtbl == &Direct3DRMFrame2_Vtbl); - - return impl_from_IDirect3DRMFrame2(iface); -} - static inline IDirect3DRMFrameImpl *unsafe_impl_from_IDirect3DRMFrame3(IDirect3DRMFrame3 *iface) { if (!iface)

1 0

Francois Gouget : start: Fix the command line handling.
by Alexandre Julliard June 27, 2012

June 27, 2012

Module: wine Branch: master Commit: e0f4d5caf95cbe21f4bdb5a1ab4e99b935bfb4e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0f4d5caf95cbe21f4bdb5a1a… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jun 27 09:19:58 2012 +0200 start: Fix the command line handling. --- po/ar.po | 143 ++++++++++++++++++---------------- po/bg.po | 143 ++++++++++++++++++---------------- po/ca.po | 161 +++++++++++++++++++-------------------- po/cs.po | 157 ++++++++++++++++++------------------- po/da.po | 161 +++++++++++++++++++-------------------- po/de.po | 160 +++++++++++++++++++-------------------- po/el.po | 143 ++++++++++++++++++---------------- po/en.po | 166 ++++++++++++++++++++++----------------- po/en_US.po | 166 ++++++++++++++++++++++----------------- po/eo.po | 143 ++++++++++++++++++---------------- po/es.po | 161 +++++++++++++++++++-------------------- po/fa.po | 143 ++++++++++++++++++---------------- po/fi.po | 162 +++++++++++++++++++-------------------- po/fr.po | 161 +++++++++++++++++++-------------------- po/he.po | 158 ++++++++++++++++++------------------- po/hi.po | 143 ++++++++++++++++++---------------- po/hu.po | 161 +++++++++++++++++++-------------------- po/it.po | 161 +++++++++++++++++++-------------------- po/ja.po | 161 +++++++++++++++++++-------------------- po/ko.po | 160 +++++++++++++++++++-------------------- po/lt.po | 161 +++++++++++++++++++-------------------- po/ml.po | 143 ++++++++++++++++++---------------- po/nb_NO.po | 158 ++++++++++++++++++------------------- po/nl.po | 169 +++++++++++++++++++---------------------- po/or.po | 143 ++++++++++++++++++---------------- po/pa.po | 143 ++++++++++++++++++---------------- po/pl.po | 162 +++++++++++++++++++-------------------- po/pt_BR.po | 161 +++++++++++++++++++-------------------- po/pt_PT.po | 161 +++++++++++++++++++-------------------- po/rm.po | 143 ++++++++++++++++++---------------- po/ro.po | 161 +++++++++++++++++++-------------------- po/ru.po | 159 ++++++++++++++++++-------------------- po/sk.po | 143 ++++++++++++++++++---------------- po/sl.po | 160 +++++++++++++++++++-------------------- po/sr_RS(a)cyrillic.po | 143 ++++++++++++++++++---------------- po/sr_RS(a)latin.po | 143 ++++++++++++++++++---------------- po/sv.po | 161 +++++++++++++++++++-------------------- po/te.po | 143 ++++++++++++++++++---------------- po/th.po | 143 ++++++++++++++++++---------------- po/tr.po | 160 +++++++++++++++++++-------------------- po/uk.po | 161 +++++++++++++++++++-------------------- po/wa.po | 143 ++++++++++++++++++---------------- po/wine.pot | 143 ++++++++++++++++++---------------- po/zh_CN.po | 143 ++++++++++++++++++---------------- po/zh_TW.po | 143 ++++++++++++++++++---------------- programs/cmd/cmd.rc | 23 ++++-- programs/start/start.c | 197 +++++++++++++++++++++++++++++++---------------- programs/start/start.rc | 23 ++++-- 48 files changed, 3685 insertions(+), 3465 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e0f4d5caf95cbe21f4bdb…

1 0

Michael Stefaniuc : qedit: Support COM aggregation for SampleGrabber.
by Alexandre Julliard June 27, 2012

June 27, 2012

Module: wine Branch: master Commit: 7367685021bda232d4950f2ae8f2b61ae8a0732d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7367685021bda232d4950f2ae… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jun 26 23:54:49 2012 +0200 qedit: Support COM aggregation for SampleGrabber. --- dlls/qedit/main.c | 3 + dlls/qedit/samplegrabber.c | 137 ++++++++++++++++++++++++------------------ dlls/qedit/tests/mediadet.c | 3 +- 3 files changed, 82 insertions(+), 61 deletions(-) diff --git a/dlls/qedit/main.c b/dlls/qedit/main.c index 734f326..6b0375e 100644 --- a/dlls/qedit/main.c +++ b/dlls/qedit/main.c @@ -105,6 +105,9 @@ static HRESULT WINAPI DSCF_CreateInstance(LPCLASSFACTORY iface, LPUNKNOWN pOuter TRACE("(%p)->(%p,%s,%p)\n",This,pOuter,debugstr_guid(riid),ppobj); *ppobj = NULL; + if (pOuter && !IsEqualGUID(&IID_IUnknown, riid)) + return E_INVALIDARG; + hres = This->pfnCreateInstance(pOuter, (LPVOID *) &punk); if (SUCCEEDED(hres)) { hres = IUnknown_QueryInterface(punk, riid, ppobj); diff --git a/dlls/qedit/samplegrabber.c b/dlls/qedit/samplegrabber.c index 6080b6e..c748c98 100644 --- a/dlls/qedit/samplegrabber.c +++ b/dlls/qedit/samplegrabber.c @@ -365,11 +365,13 @@ static inline SG_Pin *impl_from_IPin(IPin *iface) /* Sample Grabber filter implementation */ typedef struct _SG_Impl { + IUnknown IUnknown_inner; IBaseFilter IBaseFilter_iface; ISampleGrabber ISampleGrabber_iface; IMemInputPin IMemInputPin_iface; /* TODO: IMediaPosition, IMediaSeeking, IQualityControl */ - LONG refCount; + IUnknown *outer_unk; + LONG ref; CRITICAL_SECTION critSect; FILTER_INFO info; FILTER_STATE state; @@ -392,7 +394,11 @@ enum { OneShot_Past, }; -/* Get the SampleGrabber implementation This pointer from various interface pointers */ +static inline SG_Impl *impl_from_IUnknown(IUnknown *iface) +{ + return CONTAINING_RECORD(iface, SG_Impl, IUnknown_inner); +} + static inline SG_Impl *impl_from_IBaseFilter(IBaseFilter *iface) { return CONTAINING_RECORD(iface, SG_Impl, IBaseFilter_iface); @@ -431,61 +437,71 @@ static void SampleGrabber_cleanup(SG_Impl *This) DeleteCriticalSection(&This->critSect); } -/* Common helper AddRef called from all interfaces */ -static ULONG SampleGrabber_addref(SG_Impl *This) +/* SampleGrabber inner IUnknown */ +static HRESULT WINAPI SampleGrabber_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) { - ULONG refCount = InterlockedIncrement(&This->refCount); - TRACE("(%p) new ref = %u\n", This, refCount); - return refCount; + SG_Impl *This = impl_from_IUnknown(iface); + + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); + + *ppv = NULL; + if (IsEqualIID(riid, &IID_IUnknown)) + *ppv = &This->IUnknown_inner; + else if (IsEqualIID(riid, &IID_IPersist) || IsEqualIID(riid, &IID_IMediaFilter) || + IsEqualIID(riid, &IID_IBaseFilter)) + *ppv = &This->IBaseFilter_iface; + else if (IsEqualIID(riid, &IID_ISampleGrabber)) + *ppv = &This->ISampleGrabber_iface; + else if (IsEqualIID(riid, &IID_IMemInputPin)) + *ppv = &This->IMemInputPin_iface; + else if (IsEqualIID(riid, &IID_IMediaPosition)) + FIXME("IMediaPosition not implemented\n"); + else if (IsEqualIID(riid, &IID_IMediaSeeking)) + FIXME("IMediaSeeking not implemented\n"); + else if (IsEqualIID(riid, &IID_IQualityControl)) + FIXME("IQualityControl not implemented\n"); + else + WARN("(%p, %s,%p): not found\n", This, debugstr_guid(riid), ppv); + + if (!*ppv) + return E_NOINTERFACE; + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; } -/* Common helper Release called from all interfaces */ -static ULONG SampleGrabber_release(SG_Impl *This) +static ULONG WINAPI SampleGrabber_AddRef(IUnknown *iface) { - ULONG refCount = InterlockedDecrement(&This->refCount); - TRACE("(%p) new ref = %u\n", This, refCount); - if (refCount == 0) + SG_Impl *This = impl_from_IUnknown(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) new ref = %u\n", This, ref); + + return ref; +} + +static ULONG WINAPI SampleGrabber_Release(IUnknown *iface) +{ + SG_Impl *This = impl_from_IUnknown(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) new ref = %u\n", This, ref); + + if (ref == 0) { SampleGrabber_cleanup(This); CoTaskMemFree(This); return 0; } - return refCount; + return ref; } -/* Common helper QueryInterface called from all interfaces */ -static HRESULT SampleGrabber_query(SG_Impl *This, REFIID riid, void **ppvObject) +static const IUnknownVtbl samplegrabber_vtbl = { - TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppvObject); - - if (IsEqualIID(riid, &IID_IUnknown) || - IsEqualIID(riid, &IID_IPersist) || - IsEqualIID(riid, &IID_IMediaFilter) || - IsEqualIID(riid, &IID_IBaseFilter)) { - SampleGrabber_addref(This); - *ppvObject = &This->IBaseFilter_iface; - return S_OK; - } - else if (IsEqualIID(riid, &IID_ISampleGrabber)) { - SampleGrabber_addref(This); - *ppvObject = &This->ISampleGrabber_iface; - return S_OK; - } - else if (IsEqualIID(riid, &IID_IMemInputPin)) { - SampleGrabber_addref(This); - *ppvObject = &This->IMemInputPin_iface; - return S_OK; - } - else if (IsEqualIID(riid, &IID_IMediaPosition)) - FIXME("IMediaPosition not implemented\n"); - else if (IsEqualIID(riid, &IID_IMediaSeeking)) - FIXME("IMediaSeeking not implemented\n"); - else if (IsEqualIID(riid, &IID_IQualityControl)) - FIXME("IQualityControl not implemented\n"); - *ppvObject = NULL; - WARN("(%p, %s,%p): not found\n", This, debugstr_guid(riid), ppvObject); - return E_NOINTERFACE; -} + SampleGrabber_QueryInterface, + SampleGrabber_AddRef, + SampleGrabber_Release, +}; /* Helper that buffers data and/or calls installed sample callbacks */ static void SampleGrabber_callback(SG_Impl *This, IMediaSample *sample) @@ -554,7 +570,7 @@ static HRESULT WINAPI SampleGrabber_IBaseFilter_QueryInterface(IBaseFilter *iface, REFIID riid, void **ppv) { SG_Impl *This = impl_from_IBaseFilter(iface); - return SampleGrabber_query(This, riid, ppv); + return IUnknown_QueryInterface(This->outer_unk, riid, ppv); } /* IUnknown */ @@ -562,7 +578,7 @@ static ULONG WINAPI SampleGrabber_IBaseFilter_AddRef(IBaseFilter *iface) { SG_Impl *This = impl_from_IBaseFilter(iface); - return SampleGrabber_addref(This); + return IUnknown_AddRef(This->outer_unk); } /* IUnknown */ @@ -570,7 +586,7 @@ static ULONG WINAPI SampleGrabber_IBaseFilter_Release(IBaseFilter *iface) { SG_Impl *This = impl_from_IBaseFilter(iface); - return SampleGrabber_release(This); + return IUnknown_Release(This->outer_unk); } /* IPersist */ @@ -743,7 +759,7 @@ static HRESULT WINAPI SampleGrabber_ISampleGrabber_QueryInterface(ISampleGrabber *iface, REFIID riid, void **ppv) { SG_Impl *This = impl_from_ISampleGrabber(iface); - return SampleGrabber_query(This, riid, ppv); + return IUnknown_QueryInterface(This->outer_unk, riid, ppv); } /* IUnknown */ @@ -751,7 +767,7 @@ static ULONG WINAPI SampleGrabber_ISampleGrabber_AddRef(ISampleGrabber *iface) { SG_Impl *This = impl_from_ISampleGrabber(iface); - return SampleGrabber_addref(This); + return IUnknown_AddRef(This->outer_unk); } /* IUnknown */ @@ -759,7 +775,7 @@ static ULONG WINAPI SampleGrabber_ISampleGrabber_Release(ISampleGrabber *iface) { SG_Impl *This = impl_from_ISampleGrabber(iface); - return SampleGrabber_release(This); + return IUnknown_Release(This->outer_unk); } /* ISampleGrabber */ @@ -893,7 +909,7 @@ static HRESULT WINAPI SampleGrabber_IMemInputPin_QueryInterface(IMemInputPin *iface, REFIID riid, void **ppv) { SG_Impl *This = impl_from_IMemInputPin(iface); - return SampleGrabber_query(This, riid, ppv); + return IUnknown_QueryInterface(This->outer_unk, riid, ppv); } /* IUnknown */ @@ -901,7 +917,7 @@ static ULONG WINAPI SampleGrabber_IMemInputPin_AddRef(IMemInputPin *iface) { SG_Impl *This = impl_from_IMemInputPin(iface); - return SampleGrabber_addref(This); + return IUnknown_AddRef(This->outer_unk); } /* IUnknown */ @@ -909,7 +925,7 @@ static ULONG WINAPI SampleGrabber_IMemInputPin_Release(IMemInputPin *iface) { SG_Impl *This = impl_from_IMemInputPin(iface); - return SampleGrabber_release(This); + return IUnknown_Release(This->outer_unk); } /* IMemInputPin */ @@ -1454,9 +1470,6 @@ HRESULT SampleGrabber_create(IUnknown *pUnkOuter, LPVOID *ppv) TRACE("(%p,%p)\n", ppv, pUnkOuter); - if (pUnkOuter) - return CLASS_E_NOAGGREGATION; - obj = CoTaskMemAlloc(sizeof(SG_Impl)); if (NULL == obj) { *ppv = NULL; @@ -1464,7 +1477,8 @@ HRESULT SampleGrabber_create(IUnknown *pUnkOuter, LPVOID *ppv) } ZeroMemory(obj, sizeof(SG_Impl)); - obj->refCount = 1; + obj->ref = 1; + obj->IUnknown_inner.lpVtbl = &samplegrabber_vtbl; obj->IBaseFilter_iface.lpVtbl = &IBaseFilter_VTable; obj->ISampleGrabber_iface.lpVtbl = &ISampleGrabber_VTable; obj->IMemInputPin_iface.lpVtbl = &IMemInputPin_VTable; @@ -1494,7 +1508,12 @@ HRESULT SampleGrabber_create(IUnknown *pUnkOuter, LPVOID *ppv) obj->oneShot = OneShot_None; obj->bufferLen = -1; obj->bufferData = NULL; - *ppv = obj; + if (pUnkOuter) + obj->outer_unk = pUnkOuter; + else + obj->outer_unk = &obj->IUnknown_inner; + + *ppv = &obj->IUnknown_inner; return S_OK; } diff --git a/dlls/qedit/tests/mediadet.c b/dlls/qedit/tests/mediadet.c index 1d9a2f1..b86eaa9 100644 --- a/dlls/qedit/tests/mediadet.c +++ b/dlls/qedit/tests/mediadet.c @@ -346,8 +346,7 @@ static void test_samplegrabber(void) /* COM aggregation */ hr = CoCreateInstance(&CLSID_SampleGrabber, &unk_obj.IUnknown_iface, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void**)&unk_obj.inner_unk); - todo_wine ok(hr == S_OK, "CoCreateInstance failed: %08x\n", hr); - if (hr != S_OK) return; + ok(hr == S_OK, "CoCreateInstance failed: %08x\n", hr); hr = IUnknown_QueryInterface(unk_obj.inner_unk, &IID_ISampleGrabber, (void**)&sg); ok(hr == S_OK, "QueryInterface for IID_ISampleGrabber failed: %08x\n", hr);

1 0

Michael Stefaniuc : qedit: Basic COM cleanup for SampleGrabber.
by Alexandre Julliard June 27, 2012

June 27, 2012

Module: wine Branch: master Commit: 023f79a8dd4044a75256bc5adb1f0ee8ed65b431 URL: http://source.winehq.org/git/wine.git/?a=commit;h=023f79a8dd4044a75256bc5ad… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jun 26 23:50:54 2012 +0200 qedit: Basic COM cleanup for SampleGrabber. --- dlls/qedit/samplegrabber.c | 63 +++++++++++++++++++++++++------------------- 1 files changed, 36 insertions(+), 27 deletions(-) diff --git a/dlls/qedit/samplegrabber.c b/dlls/qedit/samplegrabber.c index 2d15ca3..0261dd6 100644 --- a/dlls/qedit/samplegrabber.c +++ b/dlls/qedit/samplegrabber.c @@ -360,9 +360,9 @@ typedef struct _SG_Pin { /* Sample Grabber filter implementation */ typedef struct _SG_Impl { - const IBaseFilterVtbl* IBaseFilter_Vtbl; - const ISampleGrabberVtbl* ISampleGrabber_Vtbl; - const IMemInputPinVtbl* IMemInputPin_Vtbl; + IBaseFilter IBaseFilter_iface; + ISampleGrabber ISampleGrabber_iface; + IMemInputPin IMemInputPin_iface; /* TODO: IMediaPosition, IMediaSeeking, IQualityControl */ LONG refCount; CRITICAL_SECTION critSect; @@ -390,17 +390,17 @@ enum { /* Get the SampleGrabber implementation This pointer from various interface pointers */ static inline SG_Impl *impl_from_IBaseFilter(IBaseFilter *iface) { - return (SG_Impl *)((char*)iface - FIELD_OFFSET(SG_Impl, IBaseFilter_Vtbl)); + return CONTAINING_RECORD(iface, SG_Impl, IBaseFilter_iface); } static inline SG_Impl *impl_from_ISampleGrabber(ISampleGrabber *iface) { - return (SG_Impl *)((char*)iface - FIELD_OFFSET(SG_Impl, ISampleGrabber_Vtbl)); + return CONTAINING_RECORD(iface, SG_Impl, ISampleGrabber_iface); } static inline SG_Impl *impl_from_IMemInputPin(IMemInputPin *iface) { - return (SG_Impl *)((char*)iface - FIELD_OFFSET(SG_Impl, IMemInputPin_Vtbl)); + return CONTAINING_RECORD(iface, SG_Impl, IMemInputPin_iface); } @@ -458,17 +458,17 @@ static HRESULT SampleGrabber_query(SG_Impl *This, REFIID riid, void **ppvObject) IsEqualIID(riid, &IID_IMediaFilter) || IsEqualIID(riid, &IID_IBaseFilter)) { SampleGrabber_addref(This); - *ppvObject = &(This->IBaseFilter_Vtbl); + *ppvObject = &This->IBaseFilter_iface; return S_OK; } else if (IsEqualIID(riid, &IID_ISampleGrabber)) { SampleGrabber_addref(This); - *ppvObject = &(This->ISampleGrabber_Vtbl); + *ppvObject = &This->ISampleGrabber_iface; return S_OK; } else if (IsEqualIID(riid, &IID_IMemInputPin)) { SampleGrabber_addref(This); - *ppvObject = &(This->IMemInputPin_Vtbl); + *ppvObject = &This->IMemInputPin_iface; return S_OK; } else if (IsEqualIID(riid, &IID_IMediaPosition)) @@ -546,23 +546,26 @@ static void SampleGrabber_callback(SG_Impl *This, IMediaSample *sample) /* IUnknown */ static HRESULT WINAPI -SampleGrabber_IBaseFilter_QueryInterface(IBaseFilter *iface, REFIID riid, void **ppvObject) +SampleGrabber_IBaseFilter_QueryInterface(IBaseFilter *iface, REFIID riid, void **ppv) { - return SampleGrabber_query(impl_from_IBaseFilter(iface), riid, ppvObject); + SG_Impl *This = impl_from_IBaseFilter(iface); + return SampleGrabber_query(This, riid, ppv); } /* IUnknown */ static ULONG WINAPI SampleGrabber_IBaseFilter_AddRef(IBaseFilter *iface) { - return SampleGrabber_addref(impl_from_IBaseFilter(iface)); + SG_Impl *This = impl_from_IBaseFilter(iface); + return SampleGrabber_addref(This); } /* IUnknown */ static ULONG WINAPI SampleGrabber_IBaseFilter_Release(IBaseFilter *iface) { - return SampleGrabber_release(impl_from_IBaseFilter(iface)); + SG_Impl *This = impl_from_IBaseFilter(iface); + return SampleGrabber_release(This); } /* IPersist */ @@ -732,23 +735,26 @@ SampleGrabber_IBaseFilter_QueryVendorInfo(IBaseFilter *iface, LPWSTR *vendor) /* IUnknown */ static HRESULT WINAPI -SampleGrabber_ISampleGrabber_QueryInterface(ISampleGrabber *iface, REFIID riid, void **ppvObject) +SampleGrabber_ISampleGrabber_QueryInterface(ISampleGrabber *iface, REFIID riid, void **ppv) { - return SampleGrabber_query(impl_from_ISampleGrabber(iface), riid, ppvObject); + SG_Impl *This = impl_from_ISampleGrabber(iface); + return SampleGrabber_query(This, riid, ppv); } /* IUnknown */ static ULONG WINAPI SampleGrabber_ISampleGrabber_AddRef(ISampleGrabber *iface) { - return SampleGrabber_addref(impl_from_ISampleGrabber(iface)); + SG_Impl *This = impl_from_ISampleGrabber(iface); + return SampleGrabber_addref(This); } /* IUnknown */ static ULONG WINAPI SampleGrabber_ISampleGrabber_Release(ISampleGrabber *iface) { - return SampleGrabber_release(impl_from_ISampleGrabber(iface)); + SG_Impl *This = impl_from_ISampleGrabber(iface); + return SampleGrabber_release(This); } /* ISampleGrabber */ @@ -879,23 +885,26 @@ SampleGrabber_ISampleGrabber_SetCallback(ISampleGrabber *iface, ISampleGrabberCB /* IUnknown */ static HRESULT WINAPI -SampleGrabber_IMemInputPin_QueryInterface(IMemInputPin *iface, REFIID riid, void **ppvObject) +SampleGrabber_IMemInputPin_QueryInterface(IMemInputPin *iface, REFIID riid, void **ppv) { - return SampleGrabber_query(impl_from_IMemInputPin(iface), riid, ppvObject); + SG_Impl *This = impl_from_IMemInputPin(iface); + return SampleGrabber_query(This, riid, ppv); } /* IUnknown */ static ULONG WINAPI SampleGrabber_IMemInputPin_AddRef(IMemInputPin *iface) { - return SampleGrabber_addref(impl_from_IMemInputPin(iface)); + SG_Impl *This = impl_from_IMemInputPin(iface); + return SampleGrabber_addref(This); } /* IUnknown */ static ULONG WINAPI SampleGrabber_IMemInputPin_Release(IMemInputPin *iface) { - return SampleGrabber_release(impl_from_IMemInputPin(iface)); + SG_Impl *This = impl_from_IMemInputPin(iface); + return SampleGrabber_release(This); } /* IMemInputPin */ @@ -1019,7 +1028,7 @@ SampleGrabber_IPin_QueryInterface(IPin *iface, REFIID riid, void **ppvObject) } else if (IsEqualIID(riid, &IID_IMemInputPin)) { SampleGrabber_addref(This->sg); - *ppvObject = &(This->sg->IMemInputPin_Vtbl); + *ppvObject = &This->sg->IMemInputPin_iface; return S_OK; } *ppvObject = NULL; @@ -1214,8 +1223,8 @@ SampleGrabber_IPin_QueryPinInfo(IPin *iface, PIN_INFO *info) TRACE("(%p)->(%p)\n", This, info); if (!info) return E_POINTER; - SampleGrabber_addref(This->sg); - info->pFilter = (IBaseFilter *)This->sg; + IBaseFilter_AddRef(&This->sg->IBaseFilter_iface); + info->pFilter = &This->sg->IBaseFilter_iface; info->dir = This->dir; lstrcpynW(info->achName,This->name,MAX_PIN_NAME); return S_OK; @@ -1440,9 +1449,9 @@ HRESULT SampleGrabber_create(IUnknown *pUnkOuter, LPVOID *ppv) ZeroMemory(obj, sizeof(SG_Impl)); obj->refCount = 1; - obj->IBaseFilter_Vtbl = &IBaseFilter_VTable; - obj->ISampleGrabber_Vtbl = &ISampleGrabber_VTable; - obj->IMemInputPin_Vtbl = &IMemInputPin_VTable; + obj->IBaseFilter_iface.lpVtbl = &IBaseFilter_VTable; + obj->ISampleGrabber_iface.lpVtbl = &ISampleGrabber_VTable; + obj->IMemInputPin_iface.lpVtbl = &IMemInputPin_VTable; obj->pin_in.lpVtbl = &IPin_In_VTable; obj->pin_in.dir = PINDIR_INPUT; obj->pin_in.name = pin_in_name;

1 0

Michael Stefaniuc : qedit: COM cleanup for the IPin iface (SampleGrabber).
by Alexandre Julliard June 27, 2012

June 27, 2012

Module: wine Branch: master Commit: 703d0a33ce0ac81a9b550564136700263eb002eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=703d0a33ce0ac81a9b5505641… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jun 26 23:52:22 2012 +0200 qedit: COM cleanup for the IPin iface (SampleGrabber). --- dlls/qedit/samplegrabber.c | 98 +++++++++++++++++++++++++------------------ 1 files changed, 57 insertions(+), 41 deletions(-) diff --git a/dlls/qedit/samplegrabber.c b/dlls/qedit/samplegrabber.c index 0261dd6..6080b6e 100644 --- a/dlls/qedit/samplegrabber.c +++ b/dlls/qedit/samplegrabber.c @@ -351,13 +351,18 @@ static IEnumMediaTypes *mediaenum_create(const AM_MEDIA_TYPE *mtype) /* Sample Grabber pin implementation */ typedef struct _SG_Pin { - const IPinVtbl* lpVtbl; + IPin IPin_iface; PIN_DIRECTION dir; WCHAR const *name; struct _SG_Impl *sg; IPin *pair; } SG_Pin; +static inline SG_Pin *impl_from_IPin(IPin *iface) +{ + return CONTAINING_RECORD(iface, SG_Pin, IPin_iface); +} + /* Sample Grabber filter implementation */ typedef struct _SG_Impl { IBaseFilter IBaseFilter_iface; @@ -661,8 +666,8 @@ SampleGrabber_IBaseFilter_EnumPins(IBaseFilter *iface, IEnumPins **pins) TRACE("(%p)->(%p)\n", This, pins); if (!pins) return E_POINTER; - pin[0] = (IPin*)&This->pin_in.lpVtbl; - pin[1] = (IPin*)&This->pin_out.lpVtbl; + pin[0] = &This->pin_in.IPin_iface; + pin[1] = &This->pin_out.IPin_iface; *pins = pinsenum_create(iface, pin, 2); return *pins ? S_OK : E_OUTOFMEMORY; } @@ -677,14 +682,14 @@ SampleGrabber_IBaseFilter_FindPin(IBaseFilter *iface, LPCWSTR id, IPin **pin) return E_POINTER; if (!lstrcmpiW(id,pin_in_name)) { - SampleGrabber_addref(This); - *pin = (IPin*)&(This->pin_in.lpVtbl); + *pin = &This->pin_in.IPin_iface; + IPin_AddRef(*pin); return S_OK; } else if (!lstrcmpiW(id,pin_out_name)) { - SampleGrabber_addref(This); - *pin = (IPin*)&(This->pin_out.lpVtbl); + *pin = &This->pin_out.IPin_iface; + IPin_AddRef(*pin); return S_OK; } *pin = NULL; @@ -1003,37 +1008,37 @@ SampleGrabber_IMemInputPin_ReceiveCanBlock(IMemInputPin *iface) static ULONG WINAPI SampleGrabber_IPin_AddRef(IPin *iface) { - return SampleGrabber_addref(((SG_Pin *)iface)->sg); + SG_Pin *This = impl_from_IPin(iface); + return ISampleGrabber_AddRef(&This->sg->ISampleGrabber_iface); } /* IUnknown */ static ULONG WINAPI SampleGrabber_IPin_Release(IPin *iface) { - return SampleGrabber_release(((SG_Pin *)iface)->sg); + SG_Pin *This = impl_from_IPin(iface); + return ISampleGrabber_Release(&This->sg->ISampleGrabber_iface); } /* IUnknown */ static HRESULT WINAPI -SampleGrabber_IPin_QueryInterface(IPin *iface, REFIID riid, void **ppvObject) +SampleGrabber_IPin_QueryInterface(IPin *iface, REFIID riid, void **ppv) { - SG_Pin *This = (SG_Pin *)iface; - TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppvObject); + SG_Pin *This = impl_from_IPin(iface); + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); - if (IsEqualIID(riid, &IID_IUnknown) || - IsEqualIID(riid, &IID_IPin)) { - SampleGrabber_addref(This->sg); - *ppvObject = This; - return S_OK; - } - else if (IsEqualIID(riid, &IID_IMemInputPin)) { - SampleGrabber_addref(This->sg); - *ppvObject = &This->sg->IMemInputPin_iface; - return S_OK; + *ppv = NULL; + if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IPin)) + *ppv = iface; + else if (IsEqualIID(riid, &IID_IMemInputPin)) + *ppv = &This->sg->IMemInputPin_iface; + else { + WARN("(%p, %s,%p): not found\n", This, debugstr_guid(riid), ppv); + return E_NOINTERFACE; } - *ppvObject = NULL; - WARN("(%p, %s,%p): not found\n", This, debugstr_guid(riid), ppvObject); - return E_NOINTERFACE; + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; } /* IPin - input pin */ @@ -1048,8 +1053,9 @@ SampleGrabber_In_IPin_Connect(IPin *iface, IPin *receiver, const AM_MEDIA_TYPE * static HRESULT WINAPI SampleGrabber_Out_IPin_Connect(IPin *iface, IPin *receiver, const AM_MEDIA_TYPE *type) { - SG_Pin *This = (SG_Pin *)iface; + SG_Pin *This = impl_from_IPin(iface); HRESULT hr; + TRACE("(%p)->(%p, %p)\n", This, receiver, type); if (!receiver) return E_POINTER; @@ -1079,7 +1085,7 @@ SampleGrabber_Out_IPin_Connect(IPin *iface, IPin *receiver, const AM_MEDIA_TYPE !IsEqualGUID(&type->formattype, &GUID_NULL) && !type->pbFormat) return VFW_E_TYPE_NOT_ACCEPTED; - hr = IPin_ReceiveConnection(receiver,(IPin*)&This->lpVtbl,type); + hr = IPin_ReceiveConnection(receiver, &This->IPin_iface, type); if (FAILED(hr)) return hr; This->pair = receiver; @@ -1096,7 +1102,8 @@ SampleGrabber_Out_IPin_Connect(IPin *iface, IPin *receiver, const AM_MEDIA_TYPE static HRESULT WINAPI SampleGrabber_In_IPin_ReceiveConnection(IPin *iface, IPin *connector, const AM_MEDIA_TYPE *type) { - SG_Pin *This = (SG_Pin *)iface; + SG_Pin *This = impl_from_IPin(iface); + TRACE("(%p)->(%p, %p)\n", This, connector, type); if (!connector) return E_POINTER; @@ -1151,7 +1158,8 @@ SampleGrabber_Out_IPin_ReceiveConnection(IPin *iface, IPin *connector, const AM_ static HRESULT WINAPI SampleGrabber_In_IPin_Disconnect(IPin *iface) { - SG_Pin *This = (SG_Pin *)iface; + SG_Pin *This = impl_from_IPin(iface); + TRACE("(%p)->() pair = %p\n", This, This->pair); if (This->sg->state != State_Stopped) return VFW_E_NOT_STOPPED; @@ -1166,7 +1174,8 @@ SampleGrabber_In_IPin_Disconnect(IPin *iface) static HRESULT WINAPI SampleGrabber_Out_IPin_Disconnect(IPin *iface) { - SG_Pin *This = (SG_Pin *)iface; + SG_Pin *This = impl_from_IPin(iface); + TRACE("(%p)->() pair = %p\n", This, This->pair); if (This->sg->state != State_Stopped) return VFW_E_NOT_STOPPED; @@ -1185,7 +1194,8 @@ SampleGrabber_Out_IPin_Disconnect(IPin *iface) static HRESULT WINAPI SampleGrabber_IPin_ConnectedTo(IPin *iface, IPin **pin) { - SG_Pin *This = (SG_Pin *)iface; + SG_Pin *This = impl_from_IPin(iface); + TRACE("(%p)->(%p) pair = %p\n", This, pin, This->pair); if (!pin) return E_POINTER; @@ -1201,7 +1211,8 @@ SampleGrabber_IPin_ConnectedTo(IPin *iface, IPin **pin) static HRESULT WINAPI SampleGrabber_IPin_ConnectionMediaType(IPin *iface, AM_MEDIA_TYPE *mtype) { - SG_Pin *This = (SG_Pin *)iface; + SG_Pin *This = impl_from_IPin(iface); + TRACE("(%p)->(%p)\n", This, mtype); if (!mtype) return E_POINTER; @@ -1219,7 +1230,8 @@ SampleGrabber_IPin_ConnectionMediaType(IPin *iface, AM_MEDIA_TYPE *mtype) static HRESULT WINAPI SampleGrabber_IPin_QueryPinInfo(IPin *iface, PIN_INFO *info) { - SG_Pin *This = (SG_Pin *)iface; + SG_Pin *This = impl_from_IPin(iface); + TRACE("(%p)->(%p)\n", This, info); if (!info) return E_POINTER; @@ -1234,7 +1246,8 @@ SampleGrabber_IPin_QueryPinInfo(IPin *iface, PIN_INFO *info) static HRESULT WINAPI SampleGrabber_IPin_QueryDirection(IPin *iface, PIN_DIRECTION *dir) { - SG_Pin *This = (SG_Pin *)iface; + SG_Pin *This = impl_from_IPin(iface); + TRACE("(%p)->(%p)\n", This, dir); if (!dir) return E_POINTER; @@ -1246,7 +1259,8 @@ SampleGrabber_IPin_QueryDirection(IPin *iface, PIN_DIRECTION *dir) static HRESULT WINAPI SampleGrabber_IPin_QueryId(IPin *iface, LPWSTR *id) { - SG_Pin *This = (SG_Pin *)iface; + SG_Pin *This = impl_from_IPin(iface); + int len; TRACE("(%p)->(%p)\n", This, id); if (!id) @@ -1269,7 +1283,8 @@ SampleGrabber_IPin_QueryAccept(IPin *iface, const AM_MEDIA_TYPE *mtype) static HRESULT WINAPI SampleGrabber_IPin_EnumMediaTypes(IPin *iface, IEnumMediaTypes **mtypes) { - SG_Pin *This = (SG_Pin *)iface; + SG_Pin *This = impl_from_IPin(iface); + TRACE("(%p)->(%p)\n", This, mtypes); if (!mtypes) return E_POINTER; @@ -1281,15 +1296,16 @@ SampleGrabber_IPin_EnumMediaTypes(IPin *iface, IEnumMediaTypes **mtypes) static HRESULT WINAPI SampleGrabber_In_IPin_QueryInternalConnections(IPin *iface, IPin **pins, ULONG *nPins) { - SG_Pin *This = (SG_Pin *)iface; + SG_Pin *This = impl_from_IPin(iface); + TRACE("(%p)->(%p, %p) size = %u\n", This, pins, nPins, (nPins ? *nPins : 0)); if (!nPins) return E_POINTER; if (*nPins) { if (!pins) return E_POINTER; - IPin_AddRef((IPin*)&This->sg->pin_out.lpVtbl); - *pins = (IPin*)&This->sg->pin_out.lpVtbl; + IPin_AddRef(&This->sg->pin_out.IPin_iface); + *pins = &This->sg->pin_out.IPin_iface; *nPins = 1; return S_OK; } @@ -1452,12 +1468,12 @@ HRESULT SampleGrabber_create(IUnknown *pUnkOuter, LPVOID *ppv) obj->IBaseFilter_iface.lpVtbl = &IBaseFilter_VTable; obj->ISampleGrabber_iface.lpVtbl = &ISampleGrabber_VTable; obj->IMemInputPin_iface.lpVtbl = &IMemInputPin_VTable; - obj->pin_in.lpVtbl = &IPin_In_VTable; + obj->pin_in.IPin_iface.lpVtbl = &IPin_In_VTable; obj->pin_in.dir = PINDIR_INPUT; obj->pin_in.name = pin_in_name; obj->pin_in.sg = obj; obj->pin_in.pair = NULL; - obj->pin_out.lpVtbl = &IPin_Out_VTable; + obj->pin_out.IPin_iface.lpVtbl = &IPin_Out_VTable; obj->pin_out.dir = PINDIR_OUTPUT; obj->pin_out.name = pin_out_name; obj->pin_out.sg = obj;

1 0

André Hentschel : advapi32: Remove 'stub' from TRACEs of implemented functions.
by Alexandre Julliard June 27, 2012

June 27, 2012

Module: wine Branch: master Commit: 06da4b2201cad7db841200c9f681542c12b69b12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=06da4b2201cad7db841200c9f… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jun 26 23:38:13 2012 +0200 advapi32: Remove 'stub' from TRACEs of implemented functions. --- dlls/advapi32/registry.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index fc03c1c..bf2e98a 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -2486,7 +2486,7 @@ LSTATUS WINAPI RegConnectRegistryW( LPCWSTR lpMachineName, HKEY hKey, { LONG ret; - TRACE("(%s,%p,%p): stub\n",debugstr_w(lpMachineName),hKey,phkResult); + TRACE("(%s,%p,%p)\n",debugstr_w(lpMachineName), hKey, phkResult); if (!lpMachineName || !*lpMachineName) { /* Use the local machine name */ @@ -2679,7 +2679,7 @@ LSTATUS WINAPI RegLoadMUIStringW(HKEY hKey, LPCWSTR pwszValue, LPWSTR pwszBuffer LONG result; TRACE("(hKey = %p, pwszValue = %s, pwszBuffer = %p, cbBuffer = %d, pcbData = %p, " - "dwFlags = %d, pwszBaseDir = %s) stub\n", hKey, debugstr_w(pwszValue), pwszBuffer, + "dwFlags = %d, pwszBaseDir = %s)\n", hKey, debugstr_w(pwszValue), pwszBuffer, cbBuffer, pcbData, dwFlags, debugstr_w(pwszBaseDir)); /* Parameter sanity checks. */

1 0

Lucas Zawacki : Portuguese translation for release 1.5.7
by Jeremy Newman June 26, 2012

June 26, 2012

Module: website Branch: master Commit: d9a15e9b16c15d9619662b55b4770994e2920098 URL: http://source.winehq.org/git/website.git/?a=commit;h=d9a15e9b16c15d9619662b… Author: Lucas Zawacki <lfzawacki(a)gmail.com> Date: Tue Jun 26 14:06:54 2012 -0300 Portuguese translation for release 1.5.7 --- news/pt/2012062201.xml | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/news/pt/2012062201.xml b/news/pt/2012062201.xml new file mode 100644 index 0000000..d868dc9 --- /dev/null +++ b/news/pt/2012062201.xml @@ -0,0 +1,18 @@ +<news> +<date>22 de Junho de 2012</date> +<title>Wine 1.5.7 lançado</title> +<body> + A versão de desenvolvimento 1.5.7 já está disponível. + <a href="{$root}/announce/1.5.7">Novidades</a> desta versão: +<ul> + <li>Nova versão da engine Gecko baseada no Firefox 13.</li> + <li>Suporte dinâmico a dispositivos com UDisks2.</li> + <li>Mais classes de streaming implementadas no runtime C++.</li> + <li>Suporte a metadados em arquivos TIFF.</li> + <li>Concretização da implementação de WBEM.</li> + <li>Melhor suporte a tamanho de papéis de impressora.</li> + <li>Várias correções de bugs.</li> +</ul> +O código fonte está <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.7.tar.bz2">disponível agora</a>. +Pacotes binários estão em processo de construção e em breve estarão em suas respectivas <a href="{$root}/download">sessões da área de downloads</a>. +</body></news>

1 0

Erich Hoover : hhctrl.ocx: Keep parsing failure from causing a segmentation fault.
by Alexandre Julliard June 26, 2012

June 26, 2012

Module: wine Branch: master Commit: b72ac222ea8b59eae17efbdff57cbfd82e3badd6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b72ac222ea8b59eae17efbdff… Author: Erich Hoover <ehoover(a)mines.edu> Date: Mon Jun 25 08:54:47 2012 -0600 hhctrl.ocx: Keep parsing failure from causing a segmentation fault. --- dlls/hhctrl.ocx/index.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/hhctrl.ocx/index.c b/dlls/hhctrl.ocx/index.c index 3cf69de..2cc79a6 100644 --- a/dlls/hhctrl.ocx/index.c +++ b/dlls/hhctrl.ocx/index.c @@ -191,6 +191,8 @@ static IndexItem *parse_li(HHInfo *info, stream_t *stream) strbuf_zero(&node); } + if(!ret) + FIXME("Failed to parse <li> tag!\n"); strbuf_free(&node); strbuf_free(&node_name); @@ -227,9 +229,11 @@ static void parse_hhindex(HHInfo *info, IStream *str, IndexItem *item) if(!strcasecmp(node_name.buf, "li")) { item->next = parse_li(info, &stream); - item->next->merge = item->merge; - item = item->next; - item->indentLevel = indent_level; + if(item->next) { + item->next->merge = item->merge; + item = item->next; + item->indentLevel = indent_level; + } }else if(!strcasecmp(node_name.buf, "ul")) { indent_level++; }else if(!strcasecmp(node_name.buf, "/ul")) {

1 0