wine-commits October 2010

wine-commits@winehq.org

2 participants
1174 discussions

Henri Verbeet : wined3d: Recognize the SM4 sample_d opcode.
by Alexandre Julliard 14 Oct '10

14 Oct '10

Module: wine Branch: master Commit: 4eb8fd79602039c2c2d7eed05dbbf734ea1f5239 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4eb8fd79602039c2c2d7eed05… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 14 13:03:58 2010 +0200 wined3d: Recognize the SM4 sample_d opcode. --- dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/shader.c | 1 + dlls/wined3d/shader_sm4.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index a34b506..2f70a57 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5000,6 +5000,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_RET */ shader_hw_ret, /* WINED3DSIH_RSQ */ shader_hw_scalar_op, /* WINED3DSIH_SAMPLE */ NULL, + /* WINED3DSIH_SAMPLE_GRAD */ NULL, /* WINED3DSIH_SAMPLE_LOD */ NULL, /* WINED3DSIH_SETP */ NULL, /* WINED3DSIH_SGE */ shader_hw_map2gl, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index facb686..fb7d02e 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -5058,6 +5058,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_RET */ shader_glsl_ret, /* WINED3DSIH_RSQ */ shader_glsl_rsq, /* WINED3DSIH_SAMPLE */ NULL, + /* WINED3DSIH_SAMPLE_GRAD */ NULL, /* WINED3DSIH_SAMPLE_LOD */ NULL, /* WINED3DSIH_SETP */ NULL, /* WINED3DSIH_SGE */ shader_glsl_compare, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 2e57e9f..e3451a5 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -104,6 +104,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_RET */ "ret", /* WINED3DSIH_RSQ */ "rsq", /* WINED3DSIH_SAMPLE */ "sample", + /* WINED3DSIH_SAMPLE_GRAD */ "sample_d", /* WINED3DSIH_SAMPLE_LOD */ "sample_l", /* WINED3DSIH_SETP */ "setp", /* WINED3DSIH_SGE */ "sge", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 47cece3..ef7af43 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -86,6 +86,7 @@ enum wined3d_sm4_opcode WINED3D_SM4_OP_RSQ = 0x44, WINED3D_SM4_OP_SAMPLE = 0x45, WINED3D_SM4_OP_SAMPLE_LOD = 0x48, + WINED3D_SM4_OP_SAMPLE_GRAD = 0x49, WINED3D_SM4_OP_SINCOS = 0x4d, WINED3D_SM4_OP_UTOF = 0x56, }; @@ -165,6 +166,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM4_OP_RSQ, WINED3DSIH_RSQ, 1, 1}, {WINED3D_SM4_OP_SAMPLE, WINED3DSIH_SAMPLE, 1, 3}, {WINED3D_SM4_OP_SAMPLE_LOD, WINED3DSIH_SAMPLE_LOD, 1, 4}, + {WINED3D_SM4_OP_SAMPLE_GRAD,WINED3DSIH_SAMPLE_GRAD, 1, 5}, {WINED3D_SM4_OP_SINCOS, WINED3DSIH_SINCOS, 2, 1}, {WINED3D_SM4_OP_UTOF, WINED3DSIH_UTOF, 1, 1}, }; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c648bd9..fc1fd08 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -473,6 +473,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_RET, WINED3DSIH_RSQ, WINED3DSIH_SAMPLE, + WINED3DSIH_SAMPLE_GRAD, WINED3DSIH_SAMPLE_LOD, WINED3DSIH_SETP, WINED3DSIH_SGE,

1 0

Hans Leidekker : msi/tests: Move test coverage for standard actions to a separate module.
by Alexandre Julliard 14 Oct '10

14 Oct '10

Module: wine Branch: master Commit: 8db3c0e358c54e0ebc3f7b4b7461296d046029e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8db3c0e358c54e0ebc3f7b4b7… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Oct 14 11:06:13 2010 +0200 msi/tests: Move test coverage for standard actions to a separate module. --- dlls/msi/tests/Makefile.in | 1 + dlls/msi/tests/action.c | 5846 ++++++++++++++++++++++++++++++++++++++++++++ dlls/msi/tests/install.c | 4810 ------------------------------------ 3 files changed, 5847 insertions(+), 4810 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8db3c0e358c54e0ebc3f7…

1 0

Alexandre Julliard : uninstaller: Remove unneeded carriage return in resource string.
by Alexandre Julliard 14 Oct '10

14 Oct '10

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

Aric Stewart : strmbase: Remove non-standard custom allocator logic from strmbase.
by Alexandre Julliard 14 Oct '10

14 Oct '10

Module: wine Branch: master Commit: 60bf76db9aab827a17ec3692aacf58434f19b454 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60bf76db9aab827a17ec3692a… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Oct 13 11:02:14 2010 -0500 strmbase: Remove non-standard custom allocator logic from strmbase. Implement function overrides for parser.c where a custom allocator was needed. --- dlls/qcap/vfwcapture.c | 4 ++- dlls/quartz/filesource.c | 4 ++- dlls/quartz/parser.c | 46 +++++++++++++++++++++++++++++++++++++--- dlls/quartz/parser.h | 3 ++ dlls/strmbase/pin.c | 51 ++++++++++++-------------------------------- dlls/strmbase/transform.c | 4 ++- include/wine/strmbase.h | 11 +++++---- 7 files changed, 74 insertions(+), 49 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=60bf76db9aab827a17ec3…

1 0

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

14 Oct '10

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

Aric Stewart : strmbase: Standardize "class" function into functions tables in the structs.
by Alexandre Julliard 14 Oct '10

14 Oct '10

Module: wine Branch: master Commit: 3c2dfd186a674d934f89a1aeade5bab3621b59aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c2dfd186a674d934f89a1aea… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Oct 13 11:02:01 2010 -0500 strmbase: Standardize "class" function into functions tables in the structs. This allows the standardization of the "class" functions to use the class as the argument and will aid in expanding the implementation of these functions. --- dlls/qcap/vfwcapture.c | 30 +++++++++--- dlls/quartz/dsoundrender.c | 32 +++++++++---- dlls/quartz/filesource.c | 33 +++++++++---- dlls/quartz/nullrenderer.c | 30 +++++++++--- dlls/quartz/parser.c | 34 +++++++++---- dlls/quartz/videorenderer.c | 29 ++++++++--- dlls/strmbase/enumpins.c | 8 ++-- dlls/strmbase/filter.c | 13 ++--- dlls/strmbase/mediatype.c | 8 ++-- dlls/strmbase/pin.c | 57 +++++++++++----------- dlls/strmbase/transform.c | 50 ++++++++++++++------ include/wine/strmbase.h | 109 +++++++++++++++++++++++++++---------------- 12 files changed, 280 insertions(+), 153 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3c2dfd186a674d934f89a…

1 0

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

14 Oct '10

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

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

14 Oct '10

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

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

14 Oct '10

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

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

14 Oct '10

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

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 October 2010