October 2010 - Wine-Commits

Alexandre Julliard : uninstaller: Remove unneeded carriage return in resource string.
by Alexandre Julliard Oct. 14, 2010

Oct. 14, 2010

Module: wine Branch: master Commit: d80db876113217ea9ce7201688b02f58fdcedd99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d80db876113217ea9ce720168… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 14 12:39:09 2010 +0200 uninstaller: Remove unneeded carriage return in resource string. --- programs/uninstaller/Bg.rc | 2 +- programs/uninstaller/Cy.rc | 2 +- programs/uninstaller/Da.rc | 2 +- programs/uninstaller/De.rc | 2 +- programs/uninstaller/En.rc | 2 +- programs/uninstaller/Eo.rc | 2 +- programs/uninstaller/Es.rc | 2 +- programs/uninstaller/Fi.rc | 2 +- programs/uninstaller/He.rc | 2 +- programs/uninstaller/Hu.rc | 2 +- programs/uninstaller/It.rc | 2 +- programs/uninstaller/Ja.rc | 2 +- programs/uninstaller/Ko.rc | 2 +- programs/uninstaller/Lt.rc | 2 +- programs/uninstaller/Nl.rc | 2 +- programs/uninstaller/No.rc | 2 +- programs/uninstaller/Pl.rc | 2 +- programs/uninstaller/Pt.rc | 4 ++-- programs/uninstaller/Ro.rc | 2 +- programs/uninstaller/Ru.rc | 2 +- programs/uninstaller/Si.rc | 2 +- programs/uninstaller/Sv.rc | 2 +- programs/uninstaller/Tr.rc | 2 +- programs/uninstaller/Uk.rc | 2 +- programs/uninstaller/Zh.rc | 4 ++-- 25 files changed, 27 insertions(+), 27 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d80db876113217ea9ce72…

1 0

Henri Verbeet : d3d10core: Implement device_parent_CreateVolume().
by Alexandre Julliard Oct. 14, 2010

Oct. 14, 2010

Module: wine Branch: master Commit: 07ace95fcdc6dfb7cf79c7659d18af6287169443 URL: http://source.winehq.org/git/wine.git/?a=commit;h=07ace95fcdc6dfb7cf79c7659… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 14 13:03:59 2010 +0200 d3d10core: Implement device_parent_CreateVolume(). --- dlls/d3d10core/device.c | 21 +++++++++++++++++++-- 1 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index f5c4e82..fd72ac7 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -1253,6 +1253,13 @@ static const struct IUnknownVtbl d3d10_device_inner_unknown_vtbl = d3d10_device_inner_Release, }; +static void STDMETHODCALLTYPE d3d10_subresource_destroyed(void *parent) {} + +const struct wined3d_parent_ops d3d10_subresource_parent_ops = +{ + d3d10_subresource_destroyed, +}; + /* IWineD3DDeviceParent IUnknown methods */ static inline struct d3d10_device *device_from_device_parent(IWineD3DDeviceParent *iface) @@ -1418,10 +1425,20 @@ static HRESULT STDMETHODCALLTYPE device_parent_CreateVolume(IWineD3DDeviceParent IUnknown *superior, UINT width, UINT height, UINT depth, enum wined3d_format_id format, WINED3DPOOL pool, DWORD usage, IWineD3DVolume **volume) { - FIXME("iface %p, superior %p, width %u, height %u, depth %u, format %#x, pool %#x, usage %#x, volume %p stub!\n", + HRESULT hr; + + TRACE("iface %p, superior %p, width %u, height %u, depth %u, format %#x, pool %#x, usage %#x, volume %p.\n", iface, superior, width, height, depth, format, pool, usage, volume); - return E_NOTIMPL; + hr = IWineD3DDevice_CreateVolume(device_from_device_parent(iface)->wined3d_device, + width, height, depth, usage, format, pool, NULL, &d3d10_subresource_parent_ops, volume); + if (FAILED(hr)) + { + WARN("Failed to create wined3d volume, hr %#x.\n", hr); + return hr; + } + + return S_OK; } static HRESULT STDMETHODCALLTYPE device_parent_CreateSwapChain(IWineD3DDeviceParent *iface,

1 0

Henri Verbeet : d3d10core: Add a stub ID3D10Texture3D implementation.
by Alexandre Julliard Oct. 14, 2010

Oct. 14, 2010

Module: wine Branch: master Commit: 0d4e0bc9babdbb619dfd97719526cd841db10a61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d4e0bc9babdbb619dfd97719… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 14 13:04:01 2010 +0200 d3d10core: Add a stub ID3D10Texture3D implementation. --- dlls/d3d10core/d3d10core_private.h | 13 +++ dlls/d3d10core/device.c | 26 +++++- dlls/d3d10core/tests/device.c | 40 ++++++++- dlls/d3d10core/texture.c | 175 ++++++++++++++++++++++++++++++++++++ 4 files changed, 250 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0d4e0bc9babdbb619dfd9…

1 0

Henri Verbeet : wined3d: Consistently use Map/Unmap for mapping resources.
by Alexandre Julliard Oct. 14, 2010

Oct. 14, 2010

Module: wine Branch: master Commit: 95469309d6f82fe91e78c94e59984fcd75cefc2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=95469309d6f82fe91e78c94e5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 14 13:04:02 2010 +0200 wined3d: Consistently use Map/Unmap for mapping resources. --- dlls/d3d8/cubetexture.c | 5 ++- dlls/d3d8/surface.c | 4 +- dlls/d3d8/texture.c | 4 +- dlls/d3d8/volume.c | 5 ++- dlls/d3d8/volumetexture.c | 5 ++- dlls/d3d9/cubetexture.c | 5 ++- dlls/d3d9/surface.c | 4 +- dlls/d3d9/texture.c | 4 +- dlls/d3d9/volume.c | 4 +- dlls/d3d9/volumetexture.c | 6 ++-- dlls/ddraw/surface.c | 21 +++++------- dlls/wined3d/cubetexture.c | 12 +++--- dlls/wined3d/device.c | 33 ++++++++++--------- dlls/wined3d/surface.c | 70 ++++++++++++++++++++-------------------- dlls/wined3d/surface_base.c | 51 +++++++++++++++-------------- dlls/wined3d/surface_gdi.c | 64 ++++++++++--------------------------- dlls/wined3d/texture.c | 12 +++--- dlls/wined3d/volume.c | 11 ++++-- dlls/wined3d/volumetexture.c | 12 +++--- dlls/wined3d/wined3d_private.h | 2 +- include/wine/wined3d.idl | 20 ++++++------ 21 files changed, 166 insertions(+), 188 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=95469309d6f82fe91e78c…

1 0

Aric Stewart : strmbase: Add GetMediaType and GetMediaTypeVersion to BasePin function table.
by Alexandre Julliard Oct. 14, 2010

Oct. 14, 2010

Module: wine Branch: master Commit: 7602829c4f5d255c1ecd7ecef386b4b2011e6137 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7602829c4f5d255c1ecd7ecef… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Oct 13 11:02:08 2010 -0500 strmbase: Add GetMediaType and GetMediaTypeVersion to BasePin function table. Allows for more widespread use of the BasePinImpl version of EnumMediaTypes. --- dlls/qcap/vfwcapture.c | 6 ++++-- dlls/quartz/dsoundrender.c | 4 +++- dlls/quartz/filesource.c | 13 ++++--------- dlls/quartz/nullrenderer.c | 4 +++- dlls/quartz/parser.c | 16 +++++----------- dlls/quartz/videorenderer.c | 4 +++- dlls/strmbase/pin.c | 2 +- dlls/strmbase/transform.c | 38 +++++++++++++++++--------------------- include/wine/strmbase.h | 3 +++ 9 files changed, 43 insertions(+), 47 deletions(-) diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c index 87dab5d..a0d7ad7 100644 --- a/dlls/qcap/vfwcapture.c +++ b/dlls/qcap/vfwcapture.c @@ -692,7 +692,9 @@ static HRESULT WINAPI VfwPin_DecideBufferSize(BaseOutputPin *iface, IMemAllocato static const BasePinFuncTable output_BaseFuncTable = { NULL, - BaseOutputPinImpl_AttemptConnection + BaseOutputPinImpl_AttemptConnection, + VfwPin_GetMediaTypeVersion, + VfwPin_GetMediaType }; static const BaseOutputPinFuncTable output_BaseOutputFuncTable = { @@ -784,7 +786,7 @@ VfwPin_EnumMediaTypes(IPin * iface, IEnumMediaTypes ** ppEnum) VfwPinImpl *This = (VfwPinImpl *)iface; hr = qcap_driver_get_format(This->driver_info, &pmt); if (SUCCEEDED(hr)) - hr = EnumMediaTypes_Construct((BasePin*)iface, VfwPin_GetMediaType, VfwPin_GetMediaTypeVersion, ppEnum); + hr = BasePinImpl_EnumMediaTypes(iface, ppEnum); TRACE("%p -- %x\n", This, hr); DeleteMediaType(pmt); diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index b28743d..a51da6c 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -386,7 +386,9 @@ static const BaseFilterFuncTable BaseFuncTable = { static const BasePinFuncTable input_BaseFuncTable = { DSoundRender_CheckMediaType, - NULL + NULL, + BasePinImpl_GetMediaTypeVersion, + BasePinImpl_GetMediaType }; static const BaseInputPinFuncTable input_BaseInputFuncTable = { diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index 613e1d4..a985d9b 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -760,13 +760,6 @@ static ULONG WINAPI FileAsyncReaderPin_Release(IPin * iface) return refCount; } -static HRESULT WINAPI FileAsyncReaderPin_EnumMediaTypes(IPin * iface, IEnumMediaTypes ** ppEnum) -{ - TRACE("(%p)\n", ppEnum); - - return EnumMediaTypes_Construct((BasePin*)iface, FileAsyncReaderPin_GetMediaType, BasePinImpl_GetMediaTypeVersion, ppEnum); -} - static const IPinVtbl FileAsyncReaderPin_Vtbl = { FileAsyncReaderPin_QueryInterface, @@ -781,7 +774,7 @@ static const IPinVtbl FileAsyncReaderPin_Vtbl = BasePinImpl_QueryDirection, BasePinImpl_QueryId, FileAsyncReaderPin_QueryAccept, - FileAsyncReaderPin_EnumMediaTypes, + BasePinImpl_EnumMediaTypes, BasePinImpl_QueryInternalConnections, BaseOutputPinImpl_EndOfStream, BaseOutputPinImpl_BeginFlush, @@ -839,7 +832,9 @@ static HRESULT WINAPI FileAsyncReaderPin_DecideBufferSize(BaseOutputPin *iface, static const BasePinFuncTable output_BaseFuncTable = { NULL, - FileAsyncReaderPin_AttemptConnection + FileAsyncReaderPin_AttemptConnection, + BasePinImpl_GetMediaTypeVersion, + FileAsyncReaderPin_GetMediaType }; static const BaseOutputPinFuncTable output_BaseOutputFuncTable = { diff --git a/dlls/quartz/nullrenderer.c b/dlls/quartz/nullrenderer.c index f1389b4..1764e23 100644 --- a/dlls/quartz/nullrenderer.c +++ b/dlls/quartz/nullrenderer.c @@ -108,7 +108,9 @@ static const BaseFilterFuncTable BaseFuncTable = { static const BasePinFuncTable input_BaseFuncTable = { NullRenderer_CheckMediaType, - NULL + NULL, + BasePinImpl_GetMediaTypeVersion, + BasePinImpl_GetMediaType }; static const BaseInputPinFuncTable input_BaseInputFuncTable = { diff --git a/dlls/quartz/parser.c b/dlls/quartz/parser.c index e73e5e2..e5e12ac 100644 --- a/dlls/quartz/parser.c +++ b/dlls/quartz/parser.c @@ -44,6 +44,7 @@ static HRESULT WINAPI Parser_ChangeStart(IMediaSeeking *iface); static HRESULT WINAPI Parser_ChangeStop(IMediaSeeking *iface); static HRESULT WINAPI Parser_ChangeRate(IMediaSeeking *iface); static HRESULT WINAPI Parser_OutputPin_DecideBufferSize(BaseOutputPin *iface, IMemAllocator *pAlloc, ALLOCATOR_PROPERTIES *ppropInputRequest); +static HRESULT WINAPI Parser_OutputPin_GetMediaType(BasePin *iface, int iPosition, AM_MEDIA_TYPE *pmt); static inline ParserImpl *impl_from_IMediaSeeking( IMediaSeeking *iface ) { @@ -409,7 +410,9 @@ HRESULT WINAPI Parser_QueryVendorInfo(IBaseFilter * iface, LPWSTR *pVendorInfo) static const BasePinFuncTable output_BaseFuncTable = { NULL, - BaseOutputPinImpl_AttemptConnection + BaseOutputPinImpl_AttemptConnection, + BasePinImpl_GetMediaTypeVersion, + Parser_OutputPin_GetMediaType }; static const BaseOutputPinFuncTable output_BaseOutputFuncTable = { @@ -618,15 +621,6 @@ static ULONG WINAPI Parser_OutputPin_Release(IPin * iface) return refCount; } -static HRESULT WINAPI Parser_OutputPin_EnumMediaTypes(IPin * iface, IEnumMediaTypes ** ppEnum) -{ - TRACE("(%p)\n", ppEnum); - - /* override this method to allow enumeration of your types */ - - return EnumMediaTypes_Construct((BasePin*)iface, Parser_OutputPin_GetMediaType, BasePinImpl_GetMediaTypeVersion, ppEnum); -} - static HRESULT WINAPI Parser_OutputPin_Connect(IPin * iface, IPin * pReceivePin, const AM_MEDIA_TYPE * pmt) { Parser_OutputPin *This = (Parser_OutputPin *)iface; @@ -664,7 +658,7 @@ static const IPinVtbl Parser_OutputPin_Vtbl = BasePinImpl_QueryDirection, BasePinImpl_QueryId, Parser_OutputPin_QueryAccept, - Parser_OutputPin_EnumMediaTypes, + BasePinImpl_EnumMediaTypes, BasePinImpl_QueryInternalConnections, BaseOutputPinImpl_EndOfStream, BaseOutputPinImpl_BeginFlush, diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index 159e2ee..b309b1c 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -556,7 +556,9 @@ static const BaseFilterFuncTable BaseFuncTable = { static const BasePinFuncTable input_BaseFuncTable = { VideoRenderer_CheckMediaType, - NULL + NULL, + BasePinImpl_GetMediaTypeVersion, + BasePinImpl_GetMediaType }; static const BaseInputPinFuncTable input_BaseInputFuncTable = { diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c index c996c44..96def2c 100644 --- a/dlls/strmbase/pin.c +++ b/dlls/strmbase/pin.c @@ -320,7 +320,7 @@ HRESULT WINAPI BasePinImpl_EnumMediaTypes(IPin * iface, IEnumMediaTypes ** ppEnu /* override this method to allow enumeration of your types */ - return EnumMediaTypes_Construct(This, BasePinImpl_GetMediaType, BasePinImpl_GetMediaTypeVersion , ppEnum); + return EnumMediaTypes_Construct(This, This->pFuncsTable->pfnGetMediaType, This->pFuncsTable->pfnGetMediaTypeVersion , ppEnum); } HRESULT WINAPI BasePinImpl_QueryInternalConnections(IPin * iface, IPin ** apPin, ULONG * cPin) diff --git a/dlls/strmbase/transform.c b/dlls/strmbase/transform.c index f3bc459..fce543d 100644 --- a/dlls/strmbase/transform.c +++ b/dlls/strmbase/transform.c @@ -108,6 +108,18 @@ static HRESULT WINAPI TransformFilter_Output_DecideBufferSize(BaseOutputPin *Thi return pTransformFilter->pFuncsTable->pfnDecideBufferSize(pTransformFilter, pAlloc, ppropInputRequest); } +static HRESULT WINAPI TransformFilter_Output_GetMediaType(BasePin *This, int iPosition, AM_MEDIA_TYPE *pmt) +{ + TransformFilter *pTransform = (TransformFilter *)This->pinInfo.pFilter; + + if (iPosition < 0) + return E_INVALIDARG; + if (iPosition > 0) + return VFW_S_NO_MORE_ITEMS; + CopyMediaType(pmt, &pTransform->pmt); + return S_OK; +} + static IPin* WINAPI TransformFilter_GetPin(BaseFilter *iface, int pos) { TransformFilter *This = (TransformFilter *)iface; @@ -134,6 +146,8 @@ static const BaseFilterFuncTable tfBaseFuncTable = { static const BasePinFuncTable tf_input_BaseFuncTable = { TransformFilter_Input_CheckMediaType, NULL, + BasePinImpl_GetMediaTypeVersion, + BasePinImpl_GetMediaType }; static const BaseInputPinFuncTable tf_input_BaseInputFuncTable = { @@ -143,6 +157,8 @@ static const BaseInputPinFuncTable tf_input_BaseInputFuncTable = { static const BasePinFuncTable tf_output_BaseFuncTable = { NULL, BaseOutputPinImpl_AttemptConnection, + BasePinImpl_GetMediaTypeVersion, + TransformFilter_Output_GetMediaType }; static const BaseOutputPinFuncTable tf_output_BaseOutputFuncTable = { @@ -508,26 +524,6 @@ static const IPinVtbl TransformFilter_InputPin_Vtbl = TransformFilter_InputPin_NewSegment }; -static HRESULT WINAPI TransformFilter_Output_GetMediaType(BasePin *This, int iPosition, AM_MEDIA_TYPE *pmt) -{ - TransformFilter *pTransform = (TransformFilter *)This->pinInfo.pFilter; - - if (iPosition < 0) - return E_INVALIDARG; - if (iPosition > 0) - return VFW_S_NO_MORE_ITEMS; - CopyMediaType(pmt, &pTransform->pmt); - return S_OK; -} - -static HRESULT WINAPI TransformFilter_Output_EnumMediaTypes(IPin * iface, IEnumMediaTypes ** ppEnum) -{ - BasePin *This = (BasePin *)iface; - TRACE("(%p/%p)->(%p)\n", This, iface, ppEnum); - - return EnumMediaTypes_Construct(This, TransformFilter_Output_GetMediaType, BasePinImpl_GetMediaTypeVersion, ppEnum); -} - static const IPinVtbl TransformFilter_OutputPin_Vtbl = { BaseOutputPinImpl_QueryInterface, @@ -542,7 +538,7 @@ static const IPinVtbl TransformFilter_OutputPin_Vtbl = BasePinImpl_QueryDirection, BasePinImpl_QueryId, TransformFilter_Output_QueryAccept, - TransformFilter_Output_EnumMediaTypes, + BasePinImpl_EnumMediaTypes, BasePinImpl_QueryInternalConnections, BaseOutputPinImpl_EndOfStream, BaseOutputPinImpl_BeginFlush, diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index f1614ef..3ca7d79 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -48,6 +48,9 @@ typedef struct BasePinFuncTable { BasePin_CheckMediaType pfnCheckMediaType; /* Required for Output Pins*/ BasePin_AttemptConnection pfnAttemptConnection; + /* Required for BasePinImpl_EnumMediaTypes */ + BasePin_GetMediaTypeVersion pfnGetMediaTypeVersion; + BasePin_GetMediaType pfnGetMediaType; } BasePinFuncTable; typedef struct BaseOutputPin

1 0

Joel Holdsworth : shdocvw: Replaced iexplore. bmp with a tango compliant toolstrip.
by Alexandre Julliard Oct. 14, 2010

Oct. 14, 2010

Module: wine Branch: master Commit: a19defdf4c4da88eb93144197e5dcc1866c50a51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a19defdf4c4da88eb93144197… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Wed Oct 13 22:14:04 2010 +0100 shdocvw: Replaced iexplore.bmp with a tango compliant toolstrip. --- dlls/shdocvw/Makefile.in | 3 + dlls/shdocvw/ietoolbar.bmp | Bin 3170 -> 24698 bytes dlls/shdocvw/ietoolbar.svg | 285 ++++++++++++++++++++++++++++++++++++++++++++ dlls/shdocvw/iexplore.c | 2 +- 4 files changed, 289 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a19defdf4c4da88eb9314…

1 0

Paul Vriens : taskmgr: Remove a useless commented line.
by Alexandre Julliard Oct. 14, 2010

Oct. 14, 2010

Module: wine Branch: master Commit: 0d4c5c87761975cdb6b310f07179429625167947 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d4c5c87761975cdb6b310f07… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Oct 13 21:06:22 2010 +0200 taskmgr: Remove a useless commented line. --- programs/taskmgr/Da.rc | 1 - programs/taskmgr/De.rc | 1 - programs/taskmgr/En.rc | 1 - programs/taskmgr/Fr.rc | 1 - programs/taskmgr/He.rc | 1 - programs/taskmgr/It.rc | 1 - programs/taskmgr/Ja.rc | 1 - programs/taskmgr/Ko.rc | 1 - programs/taskmgr/Lt.rc | 1 - programs/taskmgr/Nl.rc | 1 - programs/taskmgr/No.rc | 1 - programs/taskmgr/Pt.rc | 2 -- programs/taskmgr/Ro.rc | 1 - programs/taskmgr/Ru.rc | 1 - programs/taskmgr/Si.rc | 1 - programs/taskmgr/Sv.rc | 1 - programs/taskmgr/Tr.rc | 1 - programs/taskmgr/Uk.rc | 1 - programs/taskmgr/Zh.rc | 2 -- 19 files changed, 0 insertions(+), 21 deletions(-) diff --git a/programs/taskmgr/Da.rc b/programs/taskmgr/Da.rc index 8554bc5..92bf45d 100644 --- a/programs/taskmgr/Da.rc +++ b/programs/taskmgr/Da.rc @@ -210,7 +210,6 @@ BEGIN "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,191,111,10 END -/*IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210*/ IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" diff --git a/programs/taskmgr/De.rc b/programs/taskmgr/De.rc index c31e3b2..569fce6 100644 --- a/programs/taskmgr/De.rc +++ b/programs/taskmgr/De.rc @@ -205,7 +205,6 @@ BEGIN "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,191,121,10 END -/*IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210*/ IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" diff --git a/programs/taskmgr/En.rc b/programs/taskmgr/En.rc index 0074e7b..eddc1ee 100644 --- a/programs/taskmgr/En.rc +++ b/programs/taskmgr/En.rc @@ -207,7 +207,6 @@ BEGIN "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,191,111,10 END -/*IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210*/ IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" diff --git a/programs/taskmgr/Fr.rc b/programs/taskmgr/Fr.rc index f084f39..a3121d7 100644 --- a/programs/taskmgr/Fr.rc +++ b/programs/taskmgr/Fr.rc @@ -212,7 +212,6 @@ BEGIN "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,191,161,10 END -/*IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210*/ IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" diff --git a/programs/taskmgr/He.rc b/programs/taskmgr/He.rc index d5ce06b..02b5834 100644 --- a/programs/taskmgr/He.rc +++ b/programs/taskmgr/He.rc @@ -213,7 +213,6 @@ BEGIN "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,191,111,10 END -/*IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210*/ IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN EXSTYLE WS_EX_LAYOUTRTL diff --git a/programs/taskmgr/It.rc b/programs/taskmgr/It.rc index f7517c2..7e15983 100644 --- a/programs/taskmgr/It.rc +++ b/programs/taskmgr/It.rc @@ -211,7 +211,6 @@ BEGIN "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,191,111,10 END -/*IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210*/ IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" diff --git a/programs/taskmgr/Ja.rc b/programs/taskmgr/Ja.rc index 495996d..171aedf 100644 --- a/programs/taskmgr/Ja.rc +++ b/programs/taskmgr/Ja.rc @@ -211,7 +211,6 @@ BEGIN "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,191,111,10 END -/*IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210*/ IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 9, "MS Shell Dlg" diff --git a/programs/taskmgr/Ko.rc b/programs/taskmgr/Ko.rc index efe94ae..645d4fd 100644 --- a/programs/taskmgr/Ko.rc +++ b/programs/taskmgr/Ko.rc @@ -207,7 +207,6 @@ BEGIN "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,191,111,10 END -/*IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210*/ IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 9, "MS Shell Dlg" diff --git a/programs/taskmgr/Lt.rc b/programs/taskmgr/Lt.rc index 75847d6..062d931 100644 --- a/programs/taskmgr/Lt.rc +++ b/programs/taskmgr/Lt.rc @@ -210,7 +210,6 @@ BEGIN "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,191,120,10 END -/*IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210*/ IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" diff --git a/programs/taskmgr/Nl.rc b/programs/taskmgr/Nl.rc index 53e081b..e91fd63 100644 --- a/programs/taskmgr/Nl.rc +++ b/programs/taskmgr/Nl.rc @@ -202,7 +202,6 @@ BEGIN "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,191,125,10 END -/*IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210*/ IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" diff --git a/programs/taskmgr/No.rc b/programs/taskmgr/No.rc index 2e9c239..d03fb86 100644 --- a/programs/taskmgr/No.rc +++ b/programs/taskmgr/No.rc @@ -209,7 +209,6 @@ BEGIN "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,191,111,10 END -/*IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210*/ IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" diff --git a/programs/taskmgr/Pt.rc b/programs/taskmgr/Pt.rc index f169516..3ce7fe9 100644 --- a/programs/taskmgr/Pt.rc +++ b/programs/taskmgr/Pt.rc @@ -344,7 +344,6 @@ END LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN -/*IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210*/ IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" @@ -405,7 +404,6 @@ END LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE -/*IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210*/ IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" diff --git a/programs/taskmgr/Ro.rc b/programs/taskmgr/Ro.rc index fbc6e62..0a0a650 100644 --- a/programs/taskmgr/Ro.rc +++ b/programs/taskmgr/Ro.rc @@ -205,7 +205,6 @@ BEGIN "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,191,135,10 END -/*IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210*/ IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" diff --git a/programs/taskmgr/Ru.rc b/programs/taskmgr/Ru.rc index c0d87f3..81c2492 100644 --- a/programs/taskmgr/Ru.rc +++ b/programs/taskmgr/Ru.rc @@ -210,7 +210,6 @@ BEGIN "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,191,160,10 END -/*IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210*/ IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" diff --git a/programs/taskmgr/Si.rc b/programs/taskmgr/Si.rc index 20e5a1c..3ec4e21 100644 --- a/programs/taskmgr/Si.rc +++ b/programs/taskmgr/Si.rc @@ -209,7 +209,6 @@ BEGIN "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,191,120,10 END -/*IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210*/ IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" diff --git a/programs/taskmgr/Sv.rc b/programs/taskmgr/Sv.rc index 1a244a5..9fba1f8 100644 --- a/programs/taskmgr/Sv.rc +++ b/programs/taskmgr/Sv.rc @@ -207,7 +207,6 @@ BEGIN "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,191,130,10 END -/*IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210*/ IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" diff --git a/programs/taskmgr/Tr.rc b/programs/taskmgr/Tr.rc index 9573cde..77ca968 100644 --- a/programs/taskmgr/Tr.rc +++ b/programs/taskmgr/Tr.rc @@ -207,7 +207,6 @@ BEGIN "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,191,111,10 END -/*IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210*/ IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" diff --git a/programs/taskmgr/Uk.rc b/programs/taskmgr/Uk.rc index 81568c7..e2093ab 100644 --- a/programs/taskmgr/Uk.rc +++ b/programs/taskmgr/Uk.rc @@ -211,7 +211,6 @@ BEGIN "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,191,147,10 END -/*IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210*/ IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" diff --git a/programs/taskmgr/Zh.rc b/programs/taskmgr/Zh.rc index 6ae6ace..33d27fd 100644 --- a/programs/taskmgr/Zh.rc +++ b/programs/taskmgr/Zh.rc @@ -211,7 +211,6 @@ BEGIN "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,191,111,10 END -/*IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210*/ IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 9, "MS Shell Dlg" @@ -667,7 +666,6 @@ BEGIN "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,191,111,10 END -/*IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210*/ IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 9, "MS Shell Dlg"

1 0

Jacek Caban : mshtml: Fixed the first ReportData invocation when binding from objects created by BindToObject .
by Alexandre Julliard Oct. 14, 2010

Oct. 14, 2010

Module: wine Branch: master Commit: e0ef2d177443d7768c565e7c401e74b3be2feab8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0ef2d177443d7768c565e7c4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 14 00:51:18 2010 +0200 mshtml: Fixed the first ReportData invocation when binding from objects created by BindToObject. --- dlls/urlmon/binding.c | 3 ++- dlls/urlmon/tests/url.c | 6 +++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index ca2b91d..99aaf02 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -1566,7 +1566,8 @@ static HRESULT start_binding(IMoniker *mon, Binding *binding_ctx, LPCWSTR url, I set_binding_sink(binding->protocol, PROTSINK(binding), BINDINF(binding)); if(binding_ctx->redirect_url) IBindStatusCallback_OnProgress(binding->callback, 0, 0, BINDSTATUS_REDIRECTING, binding_ctx->redirect_url); - report_data(binding, 0, 0, 0); + report_data(binding, BSCF_FIRSTDATANOTIFICATION | (binding_ctx->download_state == END_DOWNLOAD ? BSCF_LASTDATANOTIFICATION : 0), + 0, 0); }else { hres = IInternetProtocol_Start(binding->protocol, url, PROTSINK(binding), BINDINF(binding), PI_APARTMENTTHREADED|PI_MIMEVERIFICATION, 0); diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index 03a95fd..818fff9 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -189,7 +189,7 @@ static IInternetProtocolSink *protocol_sink = NULL; static IBinding *current_binding; static HANDLE complete_event, complete_event2; static HRESULT binding_hres; -static BOOL have_IHttpNegotiate2, use_bscex; +static BOOL have_IHttpNegotiate2, use_bscex, is_async_prot; static BOOL test_redirect, use_cache_file, callback_read, no_callback, test_abort; static WCHAR cache_file_name[MAX_PATH]; @@ -1601,6 +1601,9 @@ static HRESULT WINAPI statusclb_OnDataAvailable(IBindStatusCallbackEx *iface, DW download_state); data_available = TRUE; + if(bind_to_object && !is_async_prot) + ok(grfBSCF == (BSCF_FIRSTDATANOTIFICATION|BSCF_LASTDATANOTIFICATION), "grfBSCF = %x\n", grfBSCF); + ok(pformatetc != NULL, "pformatetx == NULL\n"); if(pformatetc) { if (mime_type[0]) { @@ -2452,6 +2455,7 @@ static void init_bind_test(int protocol, DWORD flags, DWORD t) callback_read = !(flags & BINDTEST_NO_CALLBACK_READ); no_callback = (flags & BINDTEST_NO_CALLBACK) != 0; test_abort = (flags & BINDTEST_ABORT) != 0; + is_async_prot = protocol == HTTP_TEST || protocol == HTTPS_TEST || protocol == FTP_TEST || protocol == WINETEST_TEST; } static void test_BindToStorage(int protocol, DWORD flags, DWORD t)

1 0

Alexandre Julliard : comctl32: Use the appropriate color format when loading a DIB in ImageList_LoadImageW .
by Alexandre Julliard Oct. 14, 2010

Oct. 14, 2010

Module: wine Branch: master Commit: 1826530974621d0b9cbdad7397f4c292b2023bdd URL: http://source.winehq.org/git/wine.git/?a=commit;h=1826530974621d0b9cbdad739… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 14 10:13:58 2010 +0200 comctl32: Use the appropriate color format when loading a DIB in ImageList_LoadImageW. --- dlls/comctl32/imagelist.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index 9396b95..2e1581e 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -1907,8 +1907,11 @@ ImageList_LoadImageW (HINSTANCE hi, LPCWSTR lpbmp, INT cx, INT cGrow, } if (uType == IMAGE_BITMAP) { - BITMAP bmp; - GetObjectW (handle, sizeof(BITMAP), &bmp); + DIBSECTION dib; + UINT color; + + if (GetObjectW (handle, sizeof(dib), &dib) == sizeof(BITMAP)) color = ILC_COLOR; + else color = dib.dsBm.bmBitsPixel; /* To match windows behavior, if cx is set to zero and the flag DI_DEFAULTSIZE is specified, cx becomes the @@ -1919,13 +1922,12 @@ ImageList_LoadImageW (HINSTANCE hi, LPCWSTR lpbmp, INT cx, INT cGrow, if (uFlags & DI_DEFAULTSIZE) cx = GetSystemMetrics (SM_CXICON); else - cx = bmp.bmHeight; + cx = dib.dsBm.bmHeight; } - nImageCount = bmp.bmWidth / cx; + nImageCount = dib.dsBm.bmWidth / cx; - himl = ImageList_Create (cx, bmp.bmHeight, ILC_MASK | ILC_COLOR, - nImageCount, cGrow); + himl = ImageList_Create (cx, dib.dsBm.bmHeight, ILC_MASK | color, nImageCount, cGrow); if (!himl) { DeleteObject (handle); return NULL;

1 0

Aric Stewart : strmbase: Clean up the allocator negotiating for BaseOutputPin.
by Alexandre Julliard Oct. 14, 2010

Oct. 14, 2010

Module: wine Branch: master Commit: 8f3c3723bb83dae36540f4c8a14ffbbb1a77c470 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f3c3723bb83dae36540f4c8a… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Oct 13 10:46:27 2010 -0500 strmbase: Clean up the allocator negotiating for BaseOutputPin. --- dlls/qcap/vfwcapture.c | 26 +++++++++----- dlls/quartz/acmwrapper.c | 22 ++++++++++-- dlls/quartz/avidec.c | 23 ++++++++++--- dlls/quartz/filesource.c | 23 +++++++++++- dlls/quartz/parser.c | 21 +++++++++++- dlls/quartz/parser.h | 1 + dlls/strmbase/pin.c | 83 ++++++++++++++++++++++++++------------------ dlls/strmbase/transform.c | 15 ++++---- include/wine/strmbase.h | 10 ++++- 9 files changed, 160 insertions(+), 64 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8f3c3723bb83dae36540f…

1 0