wine-commits April 2012

wine-commits@winehq.org

2 participants
718 discussions

Henri Verbeet : d3d9: Properly retrieve an interface pointer in IDirect3DDevice9Impl_GetStreamSource ().
by Alexandre Julliard 30 Apr '12

30 Apr '12

Module: wine Branch: master Commit: 9936ec0c1c0bb9facae4008be2c6f1c99b138857 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9936ec0c1c0bb9facae4008be… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Apr 29 20:52:03 2012 +0200 d3d9: Properly retrieve an interface pointer in IDirect3DDevice9Impl_GetStreamSource(). --- dlls/d3d9/device.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index e497ce7..3d8642d 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2492,6 +2492,7 @@ static HRESULT WINAPI IDirect3DDevice9Impl_GetStreamSource(IDirect3DDevice9Ex *i { IDirect3DDevice9Impl *This = impl_from_IDirect3DDevice9Ex(iface); struct wined3d_buffer *retStream = NULL; + IDirect3DVertexBuffer9Impl *buffer_impl; HRESULT hr; TRACE("iface %p, stream_idx %u, buffer %p, offset %p, stride %p.\n", @@ -2505,7 +2506,8 @@ static HRESULT WINAPI IDirect3DDevice9Impl_GetStreamSource(IDirect3DDevice9Ex *i hr = wined3d_device_get_stream_source(This->wined3d_device, StreamNumber, &retStream, OffsetInBytes, pStride); if (SUCCEEDED(hr) && retStream) { - *pStream = wined3d_buffer_get_parent(retStream); + buffer_impl = wined3d_buffer_get_parent(retStream); + *pStream = &buffer_impl->IDirect3DVertexBuffer9_iface; IDirect3DVertexBuffer9_AddRef(*pStream); wined3d_buffer_decref(retStream); }

1 0

Henri Verbeet : d3d9: Properly retrieve an interface pointer in IDirect3DDevice9Impl_GetIndices( ).
by Alexandre Julliard 30 Apr '12

30 Apr '12

Module: wine Branch: master Commit: c208d973f68360f87d3359037818ad1d7a518506 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c208d973f68360f87d3359037… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Apr 29 20:52:02 2012 +0200 d3d9: Properly retrieve an interface pointer in IDirect3DDevice9Impl_GetIndices(). --- dlls/d3d9/device.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 987867c..e497ce7 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2575,6 +2575,7 @@ static HRESULT WINAPI IDirect3DDevice9Impl_GetIndices(IDirect3DDevice9Ex *iface, { IDirect3DDevice9Impl *This = impl_from_IDirect3DDevice9Ex(iface); struct wined3d_buffer *retIndexData = NULL; + IDirect3DIndexBuffer9Impl *buffer_impl; HRESULT hr; TRACE("iface %p, buffer %p.\n", iface, ppIndexData); @@ -2587,7 +2588,8 @@ static HRESULT WINAPI IDirect3DDevice9Impl_GetIndices(IDirect3DDevice9Ex *iface, hr = wined3d_device_get_index_buffer(This->wined3d_device, &retIndexData); if (SUCCEEDED(hr) && retIndexData) { - *ppIndexData = wined3d_buffer_get_parent(retIndexData); + buffer_impl = wined3d_buffer_get_parent(retIndexData); + *ppIndexData = &buffer_impl->IDirect3DIndexBuffer9_iface; IDirect3DIndexBuffer9_AddRef(*ppIndexData); wined3d_buffer_decref(retIndexData); }

1 0

Francois Gouget : iphlpapi/tests: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard 30 Apr '12

30 Apr '12

Module: wine Branch: master Commit: e0212511fcc16601921eff2afcb3771c8786a538 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0212511fcc16601921eff2af… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Apr 29 11:34:20 2012 +0200 iphlpapi/tests: Fix compilation on systems that don't support nameless unions. --- dlls/iphlpapi/tests/iphlpapi.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 7ab5cff..002f30f 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -605,7 +605,7 @@ static void testSetTcpEntry(void) ret = pSetTcpEntry(&row); todo_wine ok( ret == ERROR_INVALID_PARAMETER, "got %u, expected %u\n", ret, ERROR_INVALID_PARAMETER); - row.dwState = MIB_TCP_STATE_DELETE_TCB; + U(row).dwState = MIB_TCP_STATE_DELETE_TCB; ret = pSetTcpEntry(&row); todo_wine ok( ret == ERROR_MR_MID_NOT_FOUND || broken(ret == ERROR_INVALID_PARAMETER), "got %u, expected %u\n", ret, ERROR_MR_MID_NOT_FOUND);

1 0

Nikolay Sivov : msxml3: Test for attribute value normalization.
by Alexandre Julliard 30 Apr '12

30 Apr '12

Module: wine Branch: master Commit: fc7aea37f65471b0cb68f837f7f801c761aa992b URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc7aea37f65471b0cb68f837f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Apr 28 13:20:06 2012 +0400 msxml3: Test for attribute value normalization. --- dlls/msxml3/tests/saxreader.c | 51 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 51 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index cb1a088..73c16b9 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -866,6 +866,34 @@ static struct call_entry xmlspaceattr_test_alternate[] = { { CH_ENDTEST } }; +/* attribute value normalization test */ +static const char attribute_normalize[] = + "<?xml version=\"1.0\" ?>\n" + "<a attr1=\" \r \n \tattr_value A \t \r \n\r\n \n\"/>\n"; + +static struct attribute_entry attribute_norm_attrs[] = { + { "", "attr1", "attr1", " attr_value A " }, + { NULL } +}; + +static struct call_entry attribute_norm[] = { + { CH_PUTDOCUMENTLOCATOR, 0, 0, S_OK }, + { CH_STARTDOCUMENT, 0, 0, S_OK }, + { CH_STARTELEMENT, 6, 4, S_OK, "", "a", "a", attribute_norm_attrs }, + { CH_ENDELEMENT, 6, 4, S_OK, "", "a", "a" }, + { CH_ENDDOCUMENT, 0, 0, S_OK }, + { CH_ENDTEST } +}; + +static struct call_entry attribute_norm_alt[] = { + { CH_PUTDOCUMENTLOCATOR, 1, 0, S_OK }, + { CH_STARTDOCUMENT, 1, 22, S_OK }, + { CH_STARTELEMENT, 8, 3, S_OK, "", "a", "a", attribute_norm_attrs }, + { CH_ENDELEMENT, 8, 3, S_OK, "", "a", "a" }, + { CH_ENDDOCUMENT, 9, 0, S_OK }, + { CH_ENDTEST } +}; + static const char xmlspace_attr[] = "<?xml version=\"1.0\" encoding=\"UTF-16\"?>" "<a xml:space=\"preserve\"> Some text data </a>"; @@ -2170,6 +2198,29 @@ static void test_saxreader(void) hr = ISAXXMLReader_putFeature(reader, _bstr_("http://xml.org/sax/features/namespace-prefixes"), VARIANT_TRUE); EXPECT_HR(hr, S_OK); + /* attribute normalization */ + CreateStreamOnHGlobal(NULL, TRUE, &stream); + size.QuadPart = strlen(attribute_normalize); + IStream_SetSize(stream, size); + IStream_Write(stream, attribute_normalize, strlen(attribute_normalize), &written); + pos.QuadPart = 0; + IStream_Seek(stream, pos, STREAM_SEEK_SET, NULL); + V_VT(&var) = VT_UNKNOWN|VT_DISPATCH; + V_UNKNOWN(&var) = (IUnknown*)stream; + + if (IsEqualGUID(table->clsid, &CLSID_SAXXMLReader40) || + IsEqualGUID(table->clsid, &CLSID_SAXXMLReader60)) + { + test_seq = attribute_norm_alt; + } + else + test_seq = attribute_norm; + + set_expected_seq(test_seq); + hr = ISAXXMLReader_parse(reader, var); + EXPECT_HR(hr, S_OK); + ok_sequence(sequences, CONTENT_HANDLER_INDEX, test_seq, "attribute value normalization", TRUE); + ISAXXMLReader_Release(reader); table++; }

1 0

Nikolay Sivov : msxml3: Use dispex support for IDispatch implementation of process instruction node .
by Alexandre Julliard 30 Apr '12

30 Apr '12

Module: wine Branch: master Commit: 9756cbf70f2a04f97a261425c1a1c1777ea26dfe URL: http://source.winehq.org/git/wine.git/?a=commit;h=9756cbf70f2a04f97a261425c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Apr 28 11:38:03 2012 +0400 msxml3: Use dispex support for IDispatch implementation of process instruction node. --- dlls/msxml3/pi.c | 49 +++++++------------------------------------------ 1 files changed, 7 insertions(+), 42 deletions(-) diff --git a/dlls/msxml3/pi.c b/dlls/msxml3/pi.c index 36ff563..a6034bb 100644 --- a/dlls/msxml3/pi.c +++ b/dlls/msxml3/pi.c @@ -126,12 +126,7 @@ static HRESULT WINAPI dom_pi_GetTypeInfoCount( UINT* pctinfo ) { dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); - - TRACE("(%p)->(%p)\n", This, pctinfo); - - *pctinfo = 1; - - return S_OK; + return IDispatchEx_GetTypeInfoCount(&This->node.dispex.IDispatchEx_iface, pctinfo); } static HRESULT WINAPI dom_pi_GetTypeInfo( @@ -140,10 +135,8 @@ static HRESULT WINAPI dom_pi_GetTypeInfo( ITypeInfo** ppTInfo ) { dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); - - TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); - - return get_typeinfo(IXMLDOMProcessingInstruction_tid, ppTInfo); + return IDispatchEx_GetTypeInfo(&This->node.dispex.IDispatchEx_iface, + iTInfo, lcid, ppTInfo); } static HRESULT WINAPI dom_pi_GetIDsOfNames( @@ -152,23 +145,8 @@ static HRESULT WINAPI dom_pi_GetIDsOfNames( UINT cNames, LCID lcid, DISPID* rgDispId ) { dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); - ITypeInfo *typeinfo; - HRESULT hr; - - TRACE("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames, - lcid, rgDispId); - - if(!rgszNames || cNames == 0 || !rgDispId) - return E_INVALIDARG; - - hr = get_typeinfo(IXMLDOMProcessingInstruction_tid, &typeinfo); - if(SUCCEEDED(hr)) - { - hr = ITypeInfo_GetIDsOfNames(typeinfo, rgszNames, cNames, rgDispId); - ITypeInfo_Release(typeinfo); - } - - return hr; + return IDispatchEx_GetIDsOfNames(&This->node.dispex.IDispatchEx_iface, + riid, rgszNames, cNames, lcid, rgDispId); } static HRESULT WINAPI dom_pi_Invoke( @@ -178,21 +156,8 @@ static HRESULT WINAPI dom_pi_Invoke( EXCEPINFO* pExcepInfo, UINT* puArgErr ) { dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); - ITypeInfo *typeinfo; - HRESULT hr; - - TRACE("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), - lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); - - hr = get_typeinfo(IXMLDOMProcessingInstruction_tid, &typeinfo); - if(SUCCEEDED(hr)) - { - hr = ITypeInfo_Invoke(typeinfo, &This->IXMLDOMProcessingInstruction_iface, dispIdMember, - wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); - ITypeInfo_Release(typeinfo); - } - - return hr; + return IDispatchEx_Invoke(&This->node.dispex.IDispatchEx_iface, + dispIdMember, riid, lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); } static HRESULT WINAPI dom_pi_get_nodeName(

1 0

Thomas Faber : jscript: Add missing port.h include for isnan.
by Alexandre Julliard 30 Apr '12

30 Apr '12

Module: wine Branch: master Commit: 58ad6fcf1fafb379b76c0fd66a5021ad9806bcaa URL: http://source.winehq.org/git/wine.git/?a=commit;h=58ad6fcf1fafb379b76c0fd66… Author: Thomas Faber <thfabba(a)gmx.de> Date: Sat Apr 28 09:08:21 2012 +0200 jscript: Add missing port.h include for isnan. --- dlls/jscript/array.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/array.c b/dlls/jscript/array.c index 54dc347..fe8d751 100644 --- a/dlls/jscript/array.c +++ b/dlls/jscript/array.c @@ -16,6 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "config.h" +#include "wine/port.h" + #include <math.h> #include "jscript.h"

1 0

Aric Stewart : quartz: Have DSoundRenderer use strmbase BasicAudio.
by Alexandre Julliard 30 Apr '12

30 Apr '12

Module: wine Branch: master Commit: f58c9661a46e89b9f2e7d8541b7ce8c9f510ca9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f58c9661a46e89b9f2e7d8541… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Apr 27 13:47:47 2012 -0500 quartz: Have DSoundRenderer use strmbase BasicAudio. --- dlls/quartz/dsoundrender.c | 69 ++++++-------------------------------------- 1 files changed, 9 insertions(+), 60 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 5d6dac2..071d702 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -53,8 +53,8 @@ static const IAMFilterMiscFlagsVtbl IAMFilterMiscFlags_Vtbl; typedef struct DSoundRenderImpl { BaseRenderer renderer; + BasicAudio basicAudio; - IBasicAudio IBasicAudio_iface; IReferenceClock IReferenceClock_iface; IAMDirectSound IAMDirectSound_iface; IAMFilterMiscFlags IAMFilterMiscFlags_iface; @@ -88,7 +88,7 @@ static inline DSoundRenderImpl *impl_from_IBaseFilter(IBaseFilter *iface) static inline DSoundRenderImpl *impl_from_IBasicAudio(IBasicAudio *iface) { - return CONTAINING_RECORD(iface, DSoundRenderImpl, IBasicAudio_iface); + return CONTAINING_RECORD(iface, DSoundRenderImpl, basicAudio.IBasicAudio_iface); } static inline DSoundRenderImpl *impl_from_IReferenceClock(IReferenceClock *iface) @@ -666,7 +666,7 @@ HRESULT DSoundRender_create(IUnknown * pUnkOuter, LPVOID * ppv) hr = BaseRenderer_Init(&pDSoundRender->renderer, &DSoundRender_Vtbl, (IUnknown*)pDSoundRender, &CLSID_DSoundRender, (DWORD_PTR)(__FILE__ ": DSoundRenderImpl.csFilter"), &BaseFuncTable); - pDSoundRender->IBasicAudio_iface.lpVtbl = &IBasicAudio_Vtbl; + BasicAudio_Init(&pDSoundRender->basicAudio,&IBasicAudio_Vtbl); pDSoundRender->IReferenceClock_iface.lpVtbl = &IReferenceClock_Vtbl; pDSoundRender->IAMDirectSound_iface.lpVtbl = &IAMDirectSound_Vtbl; pDSoundRender->IAMFilterMiscFlags_iface.lpVtbl = &IAMFilterMiscFlags_Vtbl; @@ -722,7 +722,7 @@ static HRESULT WINAPI DSoundRender_QueryInterface(IBaseFilter * iface, REFIID ri *ppv = NULL; if (IsEqualIID(riid, &IID_IBasicAudio)) - *ppv = &This->IBasicAudio_iface; + *ppv = &This->basicAudio.IBasicAudio_iface; else if (IsEqualIID(riid, &IID_IReferenceClock)) *ppv = &This->IReferenceClock_iface; else if (IsEqualIID(riid, &IID_IAMDirectSound)) @@ -771,8 +771,7 @@ static ULONG WINAPI DSoundRender_Release(IBaseFilter * iface) IDirectSound_Release(This->dsound); This->dsound = NULL; - This->IBasicAudio_iface.lpVtbl = NULL; - + BasicAudio_Destroy(&This->basicAudio); CloseHandle(This->blocked); TRACE("Destroying Audio Renderer\n"); @@ -830,56 +829,6 @@ static ULONG WINAPI Basicaudio_Release(IBasicAudio *iface) { return DSoundRender_Release(&This->renderer.filter.IBaseFilter_iface); } -/*** IDispatch methods ***/ -static HRESULT WINAPI Basicaudio_GetTypeInfoCount(IBasicAudio *iface, - UINT*pctinfo) { - DSoundRenderImpl *This = impl_from_IBasicAudio(iface); - - TRACE("(%p/%p)->(%p): stub !!!\n", This, iface, pctinfo); - - return S_OK; -} - -static HRESULT WINAPI Basicaudio_GetTypeInfo(IBasicAudio *iface, - UINT iTInfo, - LCID lcid, - ITypeInfo**ppTInfo) { - DSoundRenderImpl *This = impl_from_IBasicAudio(iface); - - TRACE("(%p/%p)->(%d, %d, %p): stub !!!\n", This, iface, iTInfo, lcid, ppTInfo); - - return S_OK; -} - -static HRESULT WINAPI Basicaudio_GetIDsOfNames(IBasicAudio *iface, - REFIID riid, - LPOLESTR*rgszNames, - UINT cNames, - LCID lcid, - DISPID*rgDispId) { - DSoundRenderImpl *This = impl_from_IBasicAudio(iface); - - TRACE("(%p/%p)->(%s (%p), %p, %d, %d, %p): stub !!!\n", This, iface, debugstr_guid(riid), riid, rgszNames, cNames, lcid, rgDispId); - - return S_OK; -} - -static HRESULT WINAPI Basicaudio_Invoke(IBasicAudio *iface, - DISPID dispIdMember, - REFIID riid, - LCID lcid, - WORD wFlags, - DISPPARAMS*pDispParams, - VARIANT*pVarResult, - EXCEPINFO*pExepInfo, - UINT*puArgErr) { - DSoundRenderImpl *This = impl_from_IBasicAudio(iface); - - TRACE("(%p/%p)->(%d, %s (%p), %d, %04x, %p, %p, %p, %p): stub !!!\n", This, iface, dispIdMember, debugstr_guid(riid), riid, lcid, wFlags, pDispParams, pVarResult, pExepInfo, puArgErr); - - return S_OK; -} - /*** IBasicAudio methods ***/ static HRESULT WINAPI Basicaudio_put_Volume(IBasicAudio *iface, LONG lVolume) { @@ -948,10 +897,10 @@ static const IBasicAudioVtbl IBasicAudio_Vtbl = Basicaudio_QueryInterface, Basicaudio_AddRef, Basicaudio_Release, - Basicaudio_GetTypeInfoCount, - Basicaudio_GetTypeInfo, - Basicaudio_GetIDsOfNames, - Basicaudio_Invoke, + BasicAudioImpl_GetTypeInfoCount, + BasicAudioImpl_GetTypeInfo, + BasicAudioImpl_GetIDsOfNames, + BasicAudioImpl_Invoke, Basicaudio_put_Volume, Basicaudio_get_Volume, Basicaudio_put_Balance,

1 0

Aric Stewart : strmbase: Implement BasicAudio.
by Alexandre Julliard 30 Apr '12

30 Apr '12

Module: wine Branch: master Commit: a01d6be69fb33d91eae1d03bcac3ae6eb1095870 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a01d6be69fb33d91eae1d03bc… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Apr 27 13:47:39 2012 -0500 strmbase: Implement BasicAudio. --- dlls/strmbase/Makefile.in | 1 + dlls/strmbase/audio.c | 86 +++++++++++++++++++++++++++++++++++++++++++++ include/wine/strmbase.h | 16 ++++++++ 3 files changed, 103 insertions(+), 0 deletions(-) diff --git a/dlls/strmbase/Makefile.in b/dlls/strmbase/Makefile.in index f89c2c0..3ac7c56 100644 --- a/dlls/strmbase/Makefile.in +++ b/dlls/strmbase/Makefile.in @@ -1,6 +1,7 @@ MODULE = libstrmbase.a C_SRCS = \ + audio.c \ dispatch.c \ dllfunc.c \ enumpins.c \ diff --git a/dlls/strmbase/audio.c b/dlls/strmbase/audio.c new file mode 100644 index 0000000..be99583 --- /dev/null +++ b/dlls/strmbase/audio.c @@ -0,0 +1,86 @@ +/* + * Generic Implementation of strmbase audio classes + * + * Copyright 2012 Aric Stewart, CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define COBJMACROS + +#include <assert.h> +#include "dshow.h" +#include "uuids.h" +#include "vfwmsgs.h" +#include "wine/debug.h" +#include "wine/unicode.h" +#include "wine/strmbase.h" + +WINE_DEFAULT_DEBUG_CHANNEL(strmbase); + +static inline BasicAudio *impl_from_IBasicAudio(IBasicAudio *iface) +{ + return CONTAINING_RECORD(iface, BasicAudio, IBasicAudio_iface); +} + +HRESULT WINAPI BasicAudio_Init(BasicAudio *pBasicAudio, const IBasicAudioVtbl *lpVtbl) +{ + pBasicAudio->IBasicAudio_iface.lpVtbl = lpVtbl; + BaseDispatch_Init(&pBasicAudio->baseDispatch, &IID_IBasicAudio); + + return S_OK; +} + +HRESULT WINAPI BasicAudio_Destroy(BasicAudio *pBasicAudio) +{ + return BaseDispatch_Destroy(&pBasicAudio->baseDispatch); +} + +HRESULT WINAPI BasicAudioImpl_GetTypeInfoCount(IBasicAudio *iface, UINT *pctinfo) +{ + BasicAudio *This = impl_from_IBasicAudio(iface); + + return BaseDispatchImpl_GetTypeInfoCount(&This->baseDispatch, pctinfo); +} + +HRESULT WINAPI BasicAudioImpl_GetTypeInfo(IBasicAudio *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) +{ + BasicAudio *This = impl_from_IBasicAudio(iface); + + return BaseDispatchImpl_GetTypeInfo(&This->baseDispatch, &IID_NULL, iTInfo, lcid, ppTInfo); +} + +HRESULT WINAPI BasicAudioImpl_GetIDsOfNames(IBasicAudio *iface, REFIID riid, LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) +{ + BasicAudio *This = impl_from_IBasicAudio(iface); + + return BaseDispatchImpl_GetIDsOfNames(&This->baseDispatch, riid, rgszNames, cNames, lcid, rgDispId); +} + +HRESULT WINAPI BasicAudioImpl_Invoke(IBasicAudio *iface, DISPID dispIdMember, REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExepInfo, UINT *puArgErr) +{ + BasicAudio *This = impl_from_IBasicAudio(iface); + HRESULT hr = S_OK; + ITypeInfo *pTypeInfo; + + hr = BaseDispatchImpl_GetTypeInfo(&This->baseDispatch, riid, 1, lcid, &pTypeInfo); + if (SUCCEEDED(hr)) + { + hr = ITypeInfo_Invoke(pTypeInfo, &This->IBasicAudio_iface, dispIdMember, wFlags, pDispParams, pVarResult, pExepInfo, puArgErr); + ITypeInfo_Release(pTypeInfo); + } + + return hr; +} diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 3e749a5..da6475d 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -635,6 +635,22 @@ HRESULT WINAPI BaseRendererImpl_ClearPendingSample(BaseRenderer *iface); HRESULT WINAPI BaseRenderer_Init(BaseRenderer *This, const IBaseFilterVtbl *Vtbl, IUnknown *pUnkOuter, const CLSID *pClsid, DWORD_PTR DebugInfo, const BaseRendererFuncTable* pBaseFuncsTable); +#ifdef __IBasicAudio_FWD_DEFINED__ +typedef struct tagBasicAudio +{ + IBasicAudio IBasicAudio_iface; + BaseDispatch baseDispatch; +} BasicAudio; + +HRESULT WINAPI BasicAudio_Init(BasicAudio *This, const IBasicAudioVtbl *Vtbl); +HRESULT WINAPI BasicAudio_Destroy(BasicAudio *pBasicAudio); + +HRESULT WINAPI BasicAudioImpl_GetTypeInfoCount(IBasicAudio *iface, UINT*pctinfo); +HRESULT WINAPI BasicAudioImpl_GetTypeInfo(IBasicAudio *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); +HRESULT WINAPI BasicAudioImpl_GetIDsOfNames(IBasicAudio *iface, REFIID riid, LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId); +HRESULT WINAPI BasicAudioImpl_Invoke(IBasicAudio *iface, DISPID dispIdMember, REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExepInfo, UINT *puArgErr); +#endif + /* Dll Functions */ BOOL WINAPI STRMBASE_DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv); HRESULT WINAPI STRMBASE_DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv);

1 0

Jacek Caban : oleaut32: Added BSTR cache implementation.
by Alexandre Julliard 30 Apr '12

30 Apr '12

Module: wine Branch: master Commit: d53bdeca62b42b881347f7faf58932377635b3ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=d53bdeca62b42b881347f7faf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 27 17:34:28 2012 +0200 oleaut32: Added BSTR cache implementation. --- dlls/oleaut32/oleaut.c | 233 +++++++++++++++++++++++++----------------------- 1 files changed, 122 insertions(+), 111 deletions(-) diff --git a/dlls/oleaut32/oleaut.c b/dlls/oleaut32/oleaut.c index 0586e15..8cbc819 100644 --- a/dlls/oleaut32/oleaut.c +++ b/dlls/oleaut32/oleaut.c @@ -42,8 +42,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole); -static BOOL BSTR_bCache = TRUE; /* Cache allocations to minimise alloc calls? */ - /****************************************************************************** * BSTR {OLEAUT32} * @@ -71,6 +69,70 @@ static BOOL BSTR_bCache = TRUE; /* Cache allocations to minimise alloc calls? */ * 'Inside OLE, second edition' by Kraig Brockshmidt. */ +static BOOL bstr_cache_enabled; + +static CRITICAL_SECTION cs_bstr_cache; +static CRITICAL_SECTION_DEBUG cs_bstr_cache_dbg = +{ + 0, 0, &cs_bstr_cache, + { &cs_bstr_cache_dbg.ProcessLocksList, &cs_bstr_cache_dbg.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": bstr_cache") } +}; +static CRITICAL_SECTION cs_bstr_cache = { &cs_bstr_cache_dbg, -1, 0, 0, 0, 0 }; + +typedef struct { + unsigned short head; + unsigned short cnt; + DWORD *buf[6]; +} bstr_cache_entry_t; + +#define BUCKET_SIZE 16 + +static bstr_cache_entry_t bstr_cache[0x10000/BUCKET_SIZE]; + +static inline size_t bstr_alloc_size(size_t size) +{ + return (size+sizeof(DWORD)+BUCKET_SIZE) & ~(BUCKET_SIZE-1); +} + +static inline bstr_cache_entry_t *get_cache_entry(size_t size) +{ + unsigned cache_idx = (size+sizeof(DWORD)-1)/BUCKET_SIZE; + return bstr_cache_enabled && cache_idx < sizeof(bstr_cache)/sizeof(*bstr_cache) + ? bstr_cache + cache_idx + : NULL; +} + +static DWORD *alloc_bstr(size_t size) +{ + bstr_cache_entry_t *cache_entry = get_cache_entry(size); + + if(cache_entry) { + DWORD *ret = NULL; + + EnterCriticalSection(&cs_bstr_cache); + + if(!cache_entry->cnt) { + cache_entry = get_cache_entry(size+BUCKET_SIZE); + if(cache_entry && !cache_entry->cnt) + cache_entry = NULL; + } + + if(cache_entry) { + ret = cache_entry->buf[cache_entry->head++]; + cache_entry->head %= sizeof(cache_entry->buf)/sizeof(*cache_entry->buf); + cache_entry->cnt--; + } + + LeaveCriticalSection(&cs_bstr_cache); + + if(ret) + return ret; + } + + return HeapAlloc(GetProcessHeap(), 0, bstr_alloc_size(size)); +} + /****************************************************************************** * SysStringLen [OLEAUT32.7] * @@ -177,24 +239,28 @@ BSTR WINAPI SysAllocString(LPCOLESTR str) */ void WINAPI SysFreeString(BSTR str) { - DWORD* bufferPointer; + bstr_cache_entry_t *cache_entry; + DWORD *ptr; - /* NULL is a valid parameter */ - if(!str) return; + if(!str) + return; - /* - * We have to be careful when we free a BSTR pointer, it points to - * the beginning of the string but it skips the byte count contained - * before the string. - */ - bufferPointer = (DWORD*)str; + ptr = (DWORD*)str-1; + cache_entry = get_cache_entry(*ptr+sizeof(WCHAR)); + if(cache_entry) { + EnterCriticalSection(&cs_bstr_cache); - bufferPointer--; + if(cache_entry->cnt < sizeof(cache_entry->buf)/sizeof(*cache_entry->buf)) { + cache_entry->buf[(cache_entry->head+cache_entry->cnt)%((sizeof(cache_entry->buf)/sizeof(*cache_entry->buf)))] = ptr; + cache_entry->cnt++; + LeaveCriticalSection(&cs_bstr_cache); + return; + } - /* - * Free the memory from its "real" origin. - */ - HeapFree(GetProcessHeap(), 0, bufferPointer); + LeaveCriticalSection(&cs_bstr_cache); + } + + HeapFree(GetProcessHeap(), 0, ptr); } /****************************************************************************** @@ -215,61 +281,28 @@ void WINAPI SysFreeString(BSTR str) */ BSTR WINAPI SysAllocStringLen(const OLECHAR *str, unsigned int len) { - DWORD bufferSize; - DWORD* newBuffer; - WCHAR* stringBuffer; + DWORD size, *ptr; + BSTR ret; /* Detect integer overflow. */ if (len >= ((UINT_MAX-sizeof(WCHAR)-sizeof(DWORD))/sizeof(WCHAR))) return NULL; - /* - * Find the length of the buffer passed-in, in bytes. - */ - bufferSize = len * sizeof (WCHAR); - - /* - * Allocate a new buffer to hold the string. - * don't forget to keep an empty spot at the beginning of the - * buffer for the character count and an extra character at the - * end for the NULL. - */ - newBuffer = HeapAlloc(GetProcessHeap(), 0, - bufferSize + sizeof(WCHAR) + sizeof(DWORD)); - /* - * If the memory allocation failed, return a null pointer. - */ - if (!newBuffer) - return NULL; - - /* - * Copy the length of the string in the placeholder. - */ - *newBuffer = bufferSize; - - /* - * Skip the byte count. - */ - newBuffer++; - - /* - * Copy the information in the buffer. - * Since it is valid to pass a NULL pointer here, we'll initialize the - * buffer to nul if it is the case. - */ - if (str != 0) - memcpy(newBuffer, str, bufferSize); - else - memset(newBuffer, 0, bufferSize); - - /* - * Make sure that there is a nul character at the end of the - * string. - */ - stringBuffer = (WCHAR*)newBuffer; - stringBuffer[len] = '\0'; + size = len*sizeof(WCHAR); + ptr = alloc_bstr(size + sizeof(WCHAR)); + if(!ptr) + return NULL; + + *ptr = size; + ret = (BSTR)(ptr+1); + if(str) { + memcpy(ret, str, size); + ret[len] = 0; + }else { + memset(ret, 0, size+sizeof(WCHAR)); + } - return stringBuffer; + return ret; } /****************************************************************************** @@ -299,12 +332,13 @@ int WINAPI SysReAllocStringLen(BSTR* old, const OLECHAR* str, unsigned int len) if (*old!=NULL) { BSTR old_copy = *old; DWORD newbytelen = len*sizeof(WCHAR); - DWORD *ptr = HeapReAlloc(GetProcessHeap(),0,((DWORD*)*old)-1,newbytelen+sizeof(WCHAR)+sizeof(DWORD)); + DWORD *ptr = HeapReAlloc(GetProcessHeap(),0,((DWORD*)*old)-1,bstr_alloc_size(newbytelen+sizeof(WCHAR))); *old = (BSTR)(ptr+1); *ptr = newbytelen; /* Subtle hidden feature: The old string data is still there * when 'in' is NULL! * Some Microsoft program needs it. + * FIXME: Is it a sideeffect of BSTR caching? */ if (str && old_copy!=str) memmove(*old, str, newbytelen); (*old)[len] = 0; @@ -340,55 +374,27 @@ int WINAPI SysReAllocStringLen(BSTR* old, const OLECHAR* str, unsigned int len) */ BSTR WINAPI SysAllocStringByteLen(LPCSTR str, UINT len) { - DWORD* newBuffer; - char* stringBuffer; + DWORD *ptr; + char *ret; /* Detect integer overflow. */ if (len >= (UINT_MAX-sizeof(WCHAR)-sizeof(DWORD))) return NULL; - /* - * Allocate a new buffer to hold the string. - * don't forget to keep an empty spot at the beginning of the - * buffer for the character count and an extra character at the - * end for the NULL. - */ - newBuffer = HeapAlloc(GetProcessHeap(), 0, - len + sizeof(WCHAR) + sizeof(DWORD)); - - /* - * If the memory allocation failed, return a null pointer. - */ - if (newBuffer==0) - return 0; - - /* - * Copy the length of the string in the placeholder. - */ - *newBuffer = len; - - /* - * Skip the byte count. - */ - newBuffer++; - - /* - * Copy the information in the buffer. - * Since it is valid to pass a NULL pointer here, we'll initialize the - * buffer to nul if it is the case. - */ - if (str != 0) - memcpy(newBuffer, str, len); - - /* - * Make sure that there is a nul character at the end of the - * string. - */ - stringBuffer = (char *)newBuffer; - stringBuffer[len] = 0; - stringBuffer[len+1] = 0; + ptr = alloc_bstr(len + sizeof(WCHAR)); + if(!ptr) + return NULL; + + *ptr = len; + ret = (char*)(ptr+1); + if(str) { + memcpy(ret, str, len); + ret[len] = ret[len+1] = 0; + }else { + memset(ret, 0, len+sizeof(WCHAR)); + } - return (LPWSTR)stringBuffer; + return (BSTR)ret; } /****************************************************************************** @@ -440,11 +446,12 @@ INT WINAPI SysReAllocString(LPBSTR old,LPCOLESTR str) * Nothing. * * NOTES - * See BSTR. + * SetOaNoCache does not release cached strings, so it leaks by design. */ void WINAPI SetOaNoCache(void) { - BSTR_bCache = FALSE; + TRACE("\n"); + bstr_cache_enabled = FALSE; } static const WCHAR _delimiter[] = {'!',0}; /* default delimiter apparently */ @@ -840,6 +847,10 @@ HRESULT WINAPI DllCanUnloadNow(void) */ BOOL WINAPI DllMain(HINSTANCE hInstDll, DWORD fdwReason, LPVOID lpvReserved) { + static const WCHAR oanocacheW[] = {'o','a','n','o','c','a','c','h','e',0}; + + bstr_cache_enabled = !GetEnvironmentVariableW(oanocacheW, NULL, 0); + return OLEAUTPS_DllMain( hInstDll, fdwReason, lpvReserved ); }

1 0

Eduardo García : Spanish translation for release 1.5.3
by Jeremy Newman 30 Apr '12

30 Apr '12

Module: website Branch: master Commit: 7a25ef63205d4b33649759a0714d6ab23d6a209c URL: http://source.winehq.org/git/website.git/?a=commit;h=7a25ef63205d4b33649759… Author: Eduardo García <eduardo.garcia(a)gmx.com> Date: Sat Apr 28 14:03:51 2012 +0200 Spanish translation for release 1.5.3 With regards. Eduardo >From 2843bc385ee522809235ddc969961153578f434a Mon Sep 17 00:00:00 2001 From: Eduardo García <eduardo.garcia(a)gmx.com> Date: Sat, 28 Apr 2012 13:55:34 +0200 Subject: Spanish translation for release 1.5.3 --- news/es/2012042701.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/es/2012042701.xml b/news/es/2012042701.xml new file mode 100644 index 0000000..8ac0cc9 --- /dev/null +++ b/news/es/2012042701.xml @@ -0,0 +1,17 @@ +<news> +<date>Abril 27, 2012</date> +<title>Wine 1.5.3 Liberado</title> +<body> + La versión de desarrollo Wine 1.5.3 se encuentra ahora disponible. + <a href="{$root}/announce/1.5.3">Novedades</a> en esta versión: +<ul> + <li>Soporte para la monitorización de límites de gráficos.</li> + <li>Varias correcciones en el Internet Explorer integrado.</li> + <li>Soporte para visualizar código ARM en el depurador de código de Wine.</li> + <li>Varias mejoras para DirectMusic.</li> + <li>Soporte mejorado para espacios de nombres en MSXML.</li> + <li>Corrección de errores varios.</li> +</ul> +El <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.3.tar.bz2">código fuente</a> ya está disponible. +Los paquetes binarios están en proceso de construcción, y pronto aparecerán en sus respectivos <a href="{$root}/download">lugares de descarga</a>. +</body></news>

1 0

← Newer
1
2
3
4
5
6
7
...
72
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 April 2012