August 2009 - Wine-commits - list.winehq.org

Henri Verbeet : d3d10: Add the ID3D10EffectDepthStencilViewVariable interface.
by Alexandre Julliard 28 Aug '09

28 Aug '09

Module: wine Branch: master Commit: 1c68cb3ce61df34b23c6257c4e8bd7da305d584f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c68cb3ce61df34b23c6257c4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Aug 28 10:23:10 2009 +0200 d3d10: Add the ID3D10EffectDepthStencilViewVariable interface. --- include/d3d10effect.h | 40 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 40 insertions(+), 0 deletions(-) diff --git a/include/d3d10effect.h b/include/d3d10effect.h index 517a877..c77eefd 100644 --- a/include/d3d10effect.h +++ b/include/d3d10effect.h @@ -457,6 +457,46 @@ DECLARE_INTERFACE_(ID3D10EffectRenderTargetViewVariable, ID3D10EffectVariable) }; #undef INTERFACE +DEFINE_GUID(IID_ID3D10EffectDepthStencilViewVariable, + 0x3e02c918, 0xcc79, 0x4985, 0xb6, 0x22, 0x2d, 0x92, 0xad, 0x70, 0x16, 0x23); + +#define INTERFACE ID3D10EffectDepthStencilViewVariable +DECLARE_INTERFACE_(ID3D10EffectDepthStencilViewVariable, ID3D10EffectVariable) +{ + /* ID3D10EffectVariable methods */ + STDMETHOD_(BOOL, IsValid)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectType *, GetType)(THIS) PURE; + STDMETHOD(GetDesc)(THIS_ D3D10_EFFECT_VARIABLE_DESC *desc) PURE; + STDMETHOD_(struct ID3D10EffectVariable *, GetAnnotationByIndex)(THIS_ UINT index) PURE; + STDMETHOD_(struct ID3D10EffectVariable *, GetAnnotationByName)(THIS_ LPCSTR name) PURE; + STDMETHOD_(struct ID3D10EffectVariable *, GetMemberByIndex)(THIS_ UINT index) PURE; + STDMETHOD_(struct ID3D10EffectVariable *, GetMemberByName)(THIS_ LPCSTR name) PURE; + STDMETHOD_(struct ID3D10EffectVariable *, GetMemberBySemantic)(THIS_ LPCSTR semantic) PURE; + STDMETHOD_(struct ID3D10EffectVariable *, GetElement)(THIS_ UINT index) PURE; + STDMETHOD_(struct ID3D10EffectConstantBuffer *, GetParentConstantBuffer)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectScalarVariable *, AsScalar)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectVectorVariable *, AsVector)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectMatrixVariable *, AsMatrix)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectStringVariable *, AsString)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectShaderResourceVariable *, AsShaderResource)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectRenderTargetViewVariable *, AsRenderTargetView)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectDepthStencilViewVariable *, AsDepthStencilView)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectConstantBuffer *, AsConstantBuffer)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectShaderVariable *, AsShader)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectBlendVariable *, AsBlend)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectDepthStencilVariable *, AsDepthStencil)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectRasterizerVariable *, AsRasterizer)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectSamplerVariable *, AsSampler)(THIS) PURE; + STDMETHOD(SetRawValue)(THIS_ void *data, UINT offset, UINT count) PURE; + STDMETHOD(GetRawValue)(THIS_ void *data, UINT offset, UINT count) PURE; + /* ID3D10EffectDepthStencilViewVariable methods */ + STDMETHOD(SetDepthStencil)(THIS_ ID3D10DepthStencilView *view) PURE; + STDMETHOD(GetDepthStencil)(THIS_ ID3D10DepthStencilView **view) PURE; + STDMETHOD(SetDepthStencilArray)(THIS_ ID3D10DepthStencilView **views, UINT offset, UINT count) PURE; + STDMETHOD(GetDepthStencilArray)(THIS_ ID3D10DepthStencilView **views, UINT offset, UINT count) PURE; +}; +#undef INTERFACE + DEFINE_GUID(IID_ID3D10EffectTechnique, 0xdb122ce8, 0xd1c9, 0x4292, 0xb2, 0x37, 0x24, 0xed, 0x3d, 0xe8, 0xb1, 0x75); #define INTERFACE ID3D10EffectTechnique

1 0

Henri Verbeet : d3d10: Add the ID3D10EffectRenderTargetViewVariable interface.
by Alexandre Julliard 28 Aug '09

28 Aug '09

Module: wine Branch: master Commit: 64f7a564a826e0ee49dfd0ddfac1d1b65c12f0eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=64f7a564a826e0ee49dfd0ddf… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Aug 28 10:23:09 2009 +0200 d3d10: Add the ID3D10EffectRenderTargetViewVariable interface. --- include/d3d10effect.h | 40 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 40 insertions(+), 0 deletions(-) diff --git a/include/d3d10effect.h b/include/d3d10effect.h index 9d6553a..517a877 100644 --- a/include/d3d10effect.h +++ b/include/d3d10effect.h @@ -417,6 +417,46 @@ DECLARE_INTERFACE_(ID3D10EffectShaderResourceVariable, ID3D10EffectVariable) }; #undef INTERFACE +DEFINE_GUID(IID_ID3D10EffectRenderTargetViewVariable, + 0x28ca0cc3, 0xc2c9, 0x40bb, 0xb5, 0x7f, 0x67, 0xb7, 0x37, 0x12, 0x2b, 0x17); + +#define INTERFACE ID3D10EffectRenderTargetViewVariable +DECLARE_INTERFACE_(ID3D10EffectRenderTargetViewVariable, ID3D10EffectVariable) +{ + /* ID3D10EffectVariable methods */ + STDMETHOD_(BOOL, IsValid)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectType *, GetType)(THIS) PURE; + STDMETHOD(GetDesc)(THIS_ D3D10_EFFECT_VARIABLE_DESC *desc) PURE; + STDMETHOD_(struct ID3D10EffectVariable *, GetAnnotationByIndex)(THIS_ UINT index) PURE; + STDMETHOD_(struct ID3D10EffectVariable *, GetAnnotationByName)(THIS_ LPCSTR name) PURE; + STDMETHOD_(struct ID3D10EffectVariable *, GetMemberByIndex)(THIS_ UINT index) PURE; + STDMETHOD_(struct ID3D10EffectVariable *, GetMemberByName)(THIS_ LPCSTR name) PURE; + STDMETHOD_(struct ID3D10EffectVariable *, GetMemberBySemantic)(THIS_ LPCSTR semantic) PURE; + STDMETHOD_(struct ID3D10EffectVariable *, GetElement)(THIS_ UINT index) PURE; + STDMETHOD_(struct ID3D10EffectConstantBuffer *, GetParentConstantBuffer)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectScalarVariable *, AsScalar)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectVectorVariable *, AsVector)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectMatrixVariable *, AsMatrix)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectStringVariable *, AsString)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectShaderResourceVariable *, AsShaderResource)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectRenderTargetViewVariable *, AsRenderTargetView)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectDepthStencilViewVariable *, AsDepthStencilView)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectConstantBuffer *, AsConstantBuffer)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectShaderVariable *, AsShader)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectBlendVariable *, AsBlend)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectDepthStencilVariable *, AsDepthStencil)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectRasterizerVariable *, AsRasterizer)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectSamplerVariable *, AsSampler)(THIS) PURE; + STDMETHOD(SetRawValue)(THIS_ void *data, UINT offset, UINT count) PURE; + STDMETHOD(GetRawValue)(THIS_ void *data, UINT offset, UINT count) PURE; + /* ID3D10EffectRenderTargetViewVariable methods */ + STDMETHOD(SetRenderTarget)(THIS_ ID3D10RenderTargetView *view) PURE; + STDMETHOD(GetRenderTarget)(THIS_ ID3D10RenderTargetView **view) PURE; + STDMETHOD(SetRenderTargetArray)(THIS_ ID3D10RenderTargetView **views, UINT offset, UINT count) PURE; + STDMETHOD(GetRenderTargetArray)(THIS_ ID3D10RenderTargetView **views, UINT offset, UINT count) PURE; +}; +#undef INTERFACE + DEFINE_GUID(IID_ID3D10EffectTechnique, 0xdb122ce8, 0xd1c9, 0x4292, 0xb2, 0x37, 0x24, 0xed, 0x3d, 0xe8, 0xb1, 0x75); #define INTERFACE ID3D10EffectTechnique

1 0

Henri Verbeet : d3d10: Add the ID3D10EffectShaderResourceVariable interface .
by Alexandre Julliard 28 Aug '09

28 Aug '09

Module: wine Branch: master Commit: f3d6455a463120c23fb78b844e6f7c3790816f99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3d6455a463120c23fb78b844… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Aug 28 10:23:08 2009 +0200 d3d10: Add the ID3D10EffectShaderResourceVariable interface. --- include/d3d10effect.h | 40 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 40 insertions(+), 0 deletions(-) diff --git a/include/d3d10effect.h b/include/d3d10effect.h index 3528e17..9d6553a 100644 --- a/include/d3d10effect.h +++ b/include/d3d10effect.h @@ -377,6 +377,46 @@ DECLARE_INTERFACE_(ID3D10EffectStringVariable, ID3D10EffectVariable) }; #undef INTERFACE +DEFINE_GUID(IID_ID3D10EffectShaderResourceVariable, + 0xc0a7157b, 0xd872, 0x4b1d, 0x80, 0x73, 0xef, 0xc2, 0xac, 0xd4, 0xb1, 0xfc); + +#define INTERFACE ID3D10EffectShaderResourceVariable +DECLARE_INTERFACE_(ID3D10EffectShaderResourceVariable, ID3D10EffectVariable) +{ + /* ID3D10EffectVariable methods */ + STDMETHOD_(BOOL, IsValid)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectType *, GetType)(THIS) PURE; + STDMETHOD(GetDesc)(THIS_ D3D10_EFFECT_VARIABLE_DESC *desc) PURE; + STDMETHOD_(struct ID3D10EffectVariable *, GetAnnotationByIndex)(THIS_ UINT index) PURE; + STDMETHOD_(struct ID3D10EffectVariable *, GetAnnotationByName)(THIS_ LPCSTR name) PURE; + STDMETHOD_(struct ID3D10EffectVariable *, GetMemberByIndex)(THIS_ UINT index) PURE; + STDMETHOD_(struct ID3D10EffectVariable *, GetMemberByName)(THIS_ LPCSTR name) PURE; + STDMETHOD_(struct ID3D10EffectVariable *, GetMemberBySemantic)(THIS_ LPCSTR semantic) PURE; + STDMETHOD_(struct ID3D10EffectVariable *, GetElement)(THIS_ UINT index) PURE; + STDMETHOD_(struct ID3D10EffectConstantBuffer *, GetParentConstantBuffer)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectScalarVariable *, AsScalar)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectVectorVariable *, AsVector)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectMatrixVariable *, AsMatrix)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectStringVariable *, AsString)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectShaderResourceVariable *, AsShaderResource)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectRenderTargetViewVariable *, AsRenderTargetView)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectDepthStencilViewVariable *, AsDepthStencilView)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectConstantBuffer *, AsConstantBuffer)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectShaderVariable *, AsShader)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectBlendVariable *, AsBlend)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectDepthStencilVariable *, AsDepthStencil)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectRasterizerVariable *, AsRasterizer)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectSamplerVariable *, AsSampler)(THIS) PURE; + STDMETHOD(SetRawValue)(THIS_ void *data, UINT offset, UINT count) PURE; + STDMETHOD(GetRawValue)(THIS_ void *data, UINT offset, UINT count) PURE; + /* ID3D10EffectShaderResourceVariable methods */ + STDMETHOD(SetResource)(THIS_ ID3D10ShaderResourceView *resource) PURE; + STDMETHOD(GetResource)(THIS_ ID3D10ShaderResourceView **resource) PURE; + STDMETHOD(SetResourceArray)(THIS_ ID3D10ShaderResourceView **resources, UINT offset, UINT count) PURE; + STDMETHOD(GetResourceArray)(THIS_ ID3D10ShaderResourceView **resources, UINT offset, UINT count) PURE; +}; +#undef INTERFACE + DEFINE_GUID(IID_ID3D10EffectTechnique, 0xdb122ce8, 0xd1c9, 0x4292, 0xb2, 0x37, 0x24, 0xed, 0x3d, 0xe8, 0xb1, 0x75); #define INTERFACE ID3D10EffectTechnique

1 0

Henri Verbeet : d3d10: Add the ID3D10EffectStringVariable interface.
by Alexandre Julliard 28 Aug '09

28 Aug '09

Module: wine Branch: master Commit: 8219bb7b18a45e4e289549889df3af524b8e15bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=8219bb7b18a45e4e289549889… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Aug 28 10:23:07 2009 +0200 d3d10: Add the ID3D10EffectStringVariable interface. --- include/d3d10effect.h | 37 +++++++++++++++++++++++++++++++++++++ 1 files changed, 37 insertions(+), 0 deletions(-) diff --git a/include/d3d10effect.h b/include/d3d10effect.h index a97b5e9..3528e17 100644 --- a/include/d3d10effect.h +++ b/include/d3d10effect.h @@ -340,6 +340,43 @@ DECLARE_INTERFACE_(ID3D10EffectMatrixVariable, ID3D10EffectVariable) }; #undef INTERFACE +DEFINE_GUID(IID_ID3D10EffectStringVariable, 0x71417501, 0x8df9, 0x4e0a, 0xa7, 0x8a, 0x25, 0x5f, 0x97, 0x56, 0xba, 0xff); + +#define INTERFACE ID3D10EffectStringVariable +DECLARE_INTERFACE_(ID3D10EffectStringVariable, ID3D10EffectVariable) +{ + /* ID3D10EffectVariable methods */ + STDMETHOD_(BOOL, IsValid)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectType *, GetType)(THIS) PURE; + STDMETHOD(GetDesc)(THIS_ D3D10_EFFECT_VARIABLE_DESC *desc) PURE; + STDMETHOD_(struct ID3D10EffectVariable *, GetAnnotationByIndex)(THIS_ UINT index) PURE; + STDMETHOD_(struct ID3D10EffectVariable *, GetAnnotationByName)(THIS_ LPCSTR name) PURE; + STDMETHOD_(struct ID3D10EffectVariable *, GetMemberByIndex)(THIS_ UINT index) PURE; + STDMETHOD_(struct ID3D10EffectVariable *, GetMemberByName)(THIS_ LPCSTR name) PURE; + STDMETHOD_(struct ID3D10EffectVariable *, GetMemberBySemantic)(THIS_ LPCSTR semantic) PURE; + STDMETHOD_(struct ID3D10EffectVariable *, GetElement)(THIS_ UINT index) PURE; + STDMETHOD_(struct ID3D10EffectConstantBuffer *, GetParentConstantBuffer)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectScalarVariable *, AsScalar)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectVectorVariable *, AsVector)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectMatrixVariable *, AsMatrix)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectStringVariable *, AsString)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectShaderResourceVariable *, AsShaderResource)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectRenderTargetViewVariable *, AsRenderTargetView)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectDepthStencilViewVariable *, AsDepthStencilView)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectConstantBuffer *, AsConstantBuffer)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectShaderVariable *, AsShader)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectBlendVariable *, AsBlend)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectDepthStencilVariable *, AsDepthStencil)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectRasterizerVariable *, AsRasterizer)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectSamplerVariable *, AsSampler)(THIS) PURE; + STDMETHOD(SetRawValue)(THIS_ void *data, UINT offset, UINT count) PURE; + STDMETHOD(GetRawValue)(THIS_ void *data, UINT offset, UINT count) PURE; + /* ID3D10EffectStringVariable methods */ + STDMETHOD(GetString)(THIS_ LPCSTR *str) PURE; + STDMETHOD(GetStringArray)(THIS_ LPCSTR *strs, UINT offset, UINT count) PURE; +}; +#undef INTERFACE + DEFINE_GUID(IID_ID3D10EffectTechnique, 0xdb122ce8, 0xd1c9, 0x4292, 0xb2, 0x37, 0x24, 0xed, 0x3d, 0xe8, 0xb1, 0x75); #define INTERFACE ID3D10EffectTechnique

1 0

Juan Lang : quartz: Don't crash if sample allocation fails.
by Alexandre Julliard 28 Aug '09

28 Aug '09

Module: wine Branch: master Commit: e73f31a6ef0e9ee92d9d2c9776e5e5ebe6eebe6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e73f31a6ef0e9ee92d9d2c977… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Aug 27 09:04:50 2009 -0700 quartz: Don't crash if sample allocation fails. --- dlls/quartz/mpegsplit.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/quartz/mpegsplit.c b/dlls/quartz/mpegsplit.c index 14d01a1..e44a10f 100644 --- a/dlls/quartz/mpegsplit.c +++ b/dlls/quartz/mpegsplit.c @@ -202,20 +202,20 @@ static HRESULT FillBuffer(MPEGSplitterImpl *This, IMediaSample *pCurrentSample) LONGLONG rtSampleStart = pin->rtNext - MEDIATIME_FROM_BYTES(4); LONGLONG rtSampleStop = rtSampleStart + MEDIATIME_FROM_BYTES(length + 4); - hr = IMemAllocator_GetBuffer(pin->pAlloc, &sample, NULL, NULL, 0); - if (rtSampleStop > pin->rtStop) rtSampleStop = MEDIATIME_FROM_BYTES(ALIGNUP(BYTES_FROM_MEDIATIME(pin->rtStop), pin->cbAlign)); - IMediaSample_SetTime(sample, &rtSampleStart, &rtSampleStop); - IMediaSample_SetPreroll(sample, 0); - IMediaSample_SetDiscontinuity(sample, 0); - IMediaSample_SetSyncPoint(sample, 1); - pin->rtCurrent = rtSampleStart; - pin->rtNext = rtSampleStop; - + hr = IMemAllocator_GetBuffer(pin->pAlloc, &sample, NULL, NULL, 0); if (SUCCEEDED(hr)) + { + IMediaSample_SetTime(sample, &rtSampleStart, &rtSampleStop); + IMediaSample_SetPreroll(sample, 0); + IMediaSample_SetDiscontinuity(sample, 0); + IMediaSample_SetSyncPoint(sample, 1); + pin->rtCurrent = rtSampleStart; + pin->rtNext = rtSampleStop; hr = IAsyncReader_Request(pin->pReader, sample, 0); + } if (FAILED(hr)) FIXME("o_Ox%08x\n", hr); }

1 0

Rico Schüller : wined3d: Add WINED3D_SM4_OP_MIN.
by Alexandre Julliard 28 Aug '09

28 Aug '09

Module: wine Branch: master Commit: d0b7a70b38cebc73b60d16763662b979f4e7f9e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0b7a70b38cebc73b60d16763… Author: Rico Schüller <kgbricola(a)web.de> Date: Fri Aug 28 00:54:30 2009 +0200 wined3d: Add WINED3D_SM4_OP_MIN. --- dlls/wined3d/shader_sm4.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 6e71133..91aa882 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -53,6 +53,7 @@ enum wined3d_sm4_opcode WINED3D_SM4_OP_DP4 = 0x11, WINED3D_SM4_OP_EXP = 0x19, WINED3D_SM4_OP_LOG = 0x2f, + WINED3D_SM4_OP_MIN = 0x33, WINED3D_SM4_OP_MAX = 0x34, WINED3D_SM4_OP_MOV = 0x36, WINED3D_SM4_OP_MUL = 0x38, @@ -105,6 +106,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM4_OP_DP4, WINED3DSIH_DP4, 1, 2}, {WINED3D_SM4_OP_EXP, WINED3DSIH_EXP, 1, 1}, {WINED3D_SM4_OP_LOG, WINED3DSIH_LOG, 1, 1}, + {WINED3D_SM4_OP_MIN, WINED3DSIH_MIN, 1, 2}, {WINED3D_SM4_OP_MAX, WINED3DSIH_MAX, 1, 2}, {WINED3D_SM4_OP_MOV, WINED3DSIH_MOV, 1, 1}, {WINED3D_SM4_OP_MUL, WINED3DSIH_MUL, 1, 2},

1 0

Rico Schüller : wined3d: Add WINED3D_SM4_OP_MAX.
by Alexandre Julliard 28 Aug '09

28 Aug '09

Module: wine Branch: master Commit: 3717e9e162d09bcc1274dec8a4e2aece223dfd0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3717e9e162d09bcc1274dec8a… Author: Rico Schüller <kgbricola(a)web.de> Date: Fri Aug 28 00:54:08 2009 +0200 wined3d: Add WINED3D_SM4_OP_MAX. --- dlls/wined3d/shader_sm4.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 4e7a69e..6e71133 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -53,6 +53,7 @@ enum wined3d_sm4_opcode WINED3D_SM4_OP_DP4 = 0x11, WINED3D_SM4_OP_EXP = 0x19, WINED3D_SM4_OP_LOG = 0x2f, + WINED3D_SM4_OP_MAX = 0x34, WINED3D_SM4_OP_MOV = 0x36, WINED3D_SM4_OP_MUL = 0x38, WINED3D_SM4_OP_RET = 0x3e, @@ -104,6 +105,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM4_OP_DP4, WINED3DSIH_DP4, 1, 2}, {WINED3D_SM4_OP_EXP, WINED3DSIH_EXP, 1, 1}, {WINED3D_SM4_OP_LOG, WINED3DSIH_LOG, 1, 1}, + {WINED3D_SM4_OP_MAX, WINED3DSIH_MAX, 1, 2}, {WINED3D_SM4_OP_MOV, WINED3DSIH_MOV, 1, 1}, {WINED3D_SM4_OP_MUL, WINED3DSIH_MUL, 1, 2}, {WINED3D_SM4_OP_RET, WINED3DSIH_RET, 0, 0},

1 0

Vincent Povirk : windowscodecs: Implement conversion from 48bppRGB to 32bppBGRA.
by Alexandre Julliard 28 Aug '09

28 Aug '09

Module: wine Branch: master Commit: 7f73787947aa03827d489884218f56d9992fb2c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f73787947aa03827d4898842… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Aug 27 13:37:25 2009 -0500 windowscodecs: Implement conversion from 48bppRGB to 32bppBGRA. --- dlls/windowscodecs/converter.c | 48 +++++++++++++++++++++++++++++++++++++++- dlls/windowscodecs/regsvr.c | 1 + 2 files changed, 48 insertions(+), 1 deletions(-) diff --git a/dlls/windowscodecs/converter.c b/dlls/windowscodecs/converter.c index 9351da4..61619dd 100644 --- a/dlls/windowscodecs/converter.c +++ b/dlls/windowscodecs/converter.c @@ -49,7 +49,8 @@ enum pixelformat { format_16bppBGR565, format_24bppBGR, format_32bppBGR, - format_32bppBGRA + format_32bppBGRA, + format_48bppRGB, }; typedef HRESULT (*copyfunc)(struct FormatConverter *This, const WICRect *prc, @@ -581,6 +582,50 @@ static HRESULT copypixels_to_32bppBGRA(struct FormatConverter *This, const WICRe if (prc) return IWICBitmapSource_CopyPixels(This->source, prc, cbStride, cbBufferSize, pbBuffer); return S_OK; + case format_48bppRGB: + if (prc) + { + HRESULT res; + UINT x, y; + BYTE *srcdata; + UINT srcstride, srcdatasize; + const BYTE *srcrow; + const BYTE *srcpixel; + BYTE *dstrow; + DWORD *dstpixel; + + srcstride = 6 * prc->Width; + srcdatasize = srcstride * prc->Height; + + srcdata = HeapAlloc(GetProcessHeap(), 0, srcdatasize); + if (!srcdata) return E_OUTOFMEMORY; + + res = IWICBitmapSource_CopyPixels(This->source, prc, srcstride, srcdatasize, srcdata); + + if (SUCCEEDED(res)) + { + srcrow = srcdata; + dstrow = pbBuffer; + for (y=0; y<prc->Height; y++) { + srcpixel=srcrow; + dstpixel=(DWORD*)dstrow; + for (x=0; x<prc->Width; x++) { + BYTE red, green, blue; + red = *srcpixel++; srcpixel++; + green = *srcpixel++; srcpixel++; + blue = *srcpixel++; srcpixel++; + *dstpixel++=0xff000000|red<<16|green<<8|blue; + } + srcrow += srcstride; + dstrow += cbStride; + } + } + + HeapFree(GetProcessHeap(), 0, srcdata); + + return res; + } + return S_OK; default: return WINCODEC_ERR_UNSUPPORTEDOPERATION; } @@ -616,6 +661,7 @@ static const struct pixelformatinfo supported_formats[] = { {format_24bppBGR, &GUID_WICPixelFormat24bppBGR, NULL}, {format_32bppBGR, &GUID_WICPixelFormat32bppBGR, copypixels_to_32bppBGR}, {format_32bppBGRA, &GUID_WICPixelFormat32bppBGRA, copypixels_to_32bppBGRA}, + {format_48bppRGB, &GUID_WICPixelFormat48bppRGB, NULL}, {0} }; diff --git a/dlls/windowscodecs/regsvr.c b/dlls/windowscodecs/regsvr.c index 0a71048..865c7b7 100644 --- a/dlls/windowscodecs/regsvr.c +++ b/dlls/windowscodecs/regsvr.c @@ -931,6 +931,7 @@ static GUID const * const converter_formats[] = { &GUID_WICPixelFormat24bppBGR, &GUID_WICPixelFormat32bppBGR, &GUID_WICPixelFormat32bppBGRA, + &GUID_WICPixelFormat48bppRGB, NULL };

1 0

Vincent Povirk : windowscodecs: Implement conversion from 64bppRGBA to 32bppBGRA.
by Alexandre Julliard 28 Aug '09

28 Aug '09

Module: wine Branch: master Commit: 0a495723c029a68e5a2daa9be0dae81cc9888249 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a495723c029a68e5a2daa9be… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Aug 27 13:40:23 2009 -0500 windowscodecs: Implement conversion from 64bppRGBA to 32bppBGRA. --- dlls/windowscodecs/converter.c | 47 ++++++++++++++++++++++++++++++++++++++++ dlls/windowscodecs/regsvr.c | 1 + 2 files changed, 48 insertions(+), 0 deletions(-) diff --git a/dlls/windowscodecs/converter.c b/dlls/windowscodecs/converter.c index 61619dd..15c7b0f 100644 --- a/dlls/windowscodecs/converter.c +++ b/dlls/windowscodecs/converter.c @@ -51,6 +51,7 @@ enum pixelformat { format_32bppBGR, format_32bppBGRA, format_48bppRGB, + format_64bppRGBA, }; typedef HRESULT (*copyfunc)(struct FormatConverter *This, const WICRect *prc, @@ -626,6 +627,51 @@ static HRESULT copypixels_to_32bppBGRA(struct FormatConverter *This, const WICRe return res; } return S_OK; + case format_64bppRGBA: + if (prc) + { + HRESULT res; + UINT x, y; + BYTE *srcdata; + UINT srcstride, srcdatasize; + const BYTE *srcrow; + const BYTE *srcpixel; + BYTE *dstrow; + DWORD *dstpixel; + + srcstride = 8 * prc->Width; + srcdatasize = srcstride * prc->Height; + + srcdata = HeapAlloc(GetProcessHeap(), 0, srcdatasize); + if (!srcdata) return E_OUTOFMEMORY; + + res = IWICBitmapSource_CopyPixels(This->source, prc, srcstride, srcdatasize, srcdata); + + if (SUCCEEDED(res)) + { + srcrow = srcdata; + dstrow = pbBuffer; + for (y=0; y<prc->Height; y++) { + srcpixel=srcrow; + dstpixel=(DWORD*)dstrow; + for (x=0; x<prc->Width; x++) { + BYTE red, green, blue, alpha; + red = *srcpixel++; srcpixel++; + green = *srcpixel++; srcpixel++; + blue = *srcpixel++; srcpixel++; + alpha = *srcpixel++; srcpixel++; + *dstpixel++=alpha<<24|red<<16|green<<8|blue; + } + srcrow += srcstride; + dstrow += cbStride; + } + } + + HeapFree(GetProcessHeap(), 0, srcdata); + + return res; + } + return S_OK; default: return WINCODEC_ERR_UNSUPPORTEDOPERATION; } @@ -662,6 +708,7 @@ static const struct pixelformatinfo supported_formats[] = { {format_32bppBGR, &GUID_WICPixelFormat32bppBGR, copypixels_to_32bppBGR}, {format_32bppBGRA, &GUID_WICPixelFormat32bppBGRA, copypixels_to_32bppBGRA}, {format_48bppRGB, &GUID_WICPixelFormat48bppRGB, NULL}, + {format_64bppRGBA, &GUID_WICPixelFormat64bppRGBA, NULL}, {0} }; diff --git a/dlls/windowscodecs/regsvr.c b/dlls/windowscodecs/regsvr.c index 865c7b7..6544372 100644 --- a/dlls/windowscodecs/regsvr.c +++ b/dlls/windowscodecs/regsvr.c @@ -932,6 +932,7 @@ static GUID const * const converter_formats[] = { &GUID_WICPixelFormat32bppBGR, &GUID_WICPixelFormat32bppBGRA, &GUID_WICPixelFormat48bppRGB, + &GUID_WICPixelFormat64bppRGBA, NULL };

1 0

Vincent Povirk : windowscodecs: Implement conversion from 16bppGray to 32bppBGRA.
by Alexandre Julliard 28 Aug '09

28 Aug '09

Module: wine Branch: master Commit: 363a0fdda903171882c41a5cbb2c09c3cf36237f URL: http://source.winehq.org/git/wine.git/?a=commit;h=363a0fdda903171882c41a5cb… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Aug 27 13:30:39 2009 -0500 windowscodecs: Implement conversion from 16bppGray to 32bppBGRA. --- dlls/windowscodecs/converter.c | 44 ++++++++++++++++++++++++++++++++++++++++ dlls/windowscodecs/regsvr.c | 1 + 2 files changed, 45 insertions(+), 0 deletions(-) diff --git a/dlls/windowscodecs/converter.c b/dlls/windowscodecs/converter.c index 50dcab4..9351da4 100644 --- a/dlls/windowscodecs/converter.c +++ b/dlls/windowscodecs/converter.c @@ -44,6 +44,7 @@ enum pixelformat { format_2bppGray, format_4bppGray, format_8bppGray, + format_16bppGray, format_16bppBGR555, format_16bppBGR565, format_24bppBGR, @@ -380,6 +381,48 @@ static HRESULT copypixels_to_32bppBGRA(struct FormatConverter *This, const WICRe return res; } return S_OK; + case format_16bppGray: + if (prc) + { + HRESULT res; + UINT x, y; + BYTE *srcdata; + UINT srcstride, srcdatasize; + const BYTE *srcrow; + const BYTE *srcbyte; + BYTE *dstrow; + DWORD *dstpixel; + + srcstride = prc->Width * 2; + srcdatasize = srcstride * prc->Height; + + srcdata = HeapAlloc(GetProcessHeap(), 0, srcdatasize); + if (!srcdata) return E_OUTOFMEMORY; + + res = IWICBitmapSource_CopyPixels(This->source, prc, srcstride, srcdatasize, srcdata); + + if (SUCCEEDED(res)) + { + srcrow = srcdata; + dstrow = pbBuffer; + for (y=0; y<prc->Height; y++) { + srcbyte=(const BYTE*)srcrow; + dstpixel=(DWORD*)dstrow; + for (x=0; x<prc->Width; x++) + { + *dstpixel++ = 0xff000000|(*srcbyte<<16)|(*srcbyte<<8)|*srcbyte; + srcbyte+=2; + } + srcrow += srcstride; + dstrow += cbStride; + } + } + + HeapFree(GetProcessHeap(), 0, srcdata); + + return res; + } + return S_OK; case format_16bppBGR555: if (prc) { @@ -567,6 +610,7 @@ static const struct pixelformatinfo supported_formats[] = { {format_2bppGray, &GUID_WICPixelFormat2bppGray, NULL}, {format_4bppGray, &GUID_WICPixelFormat4bppGray, NULL}, {format_8bppGray, &GUID_WICPixelFormat8bppGray, NULL}, + {format_16bppGray, &GUID_WICPixelFormat16bppGray, NULL}, {format_16bppBGR555, &GUID_WICPixelFormat16bppBGR555, NULL}, {format_16bppBGR565, &GUID_WICPixelFormat16bppBGR565, NULL}, {format_24bppBGR, &GUID_WICPixelFormat24bppBGR, NULL}, diff --git a/dlls/windowscodecs/regsvr.c b/dlls/windowscodecs/regsvr.c index 03253b8..0a71048 100644 --- a/dlls/windowscodecs/regsvr.c +++ b/dlls/windowscodecs/regsvr.c @@ -925,6 +925,7 @@ static GUID const * const converter_formats[] = { &GUID_WICPixelFormat2bppGray, &GUID_WICPixelFormat4bppGray, &GUID_WICPixelFormat8bppGray, + &GUID_WICPixelFormat16bppGray, &GUID_WICPixelFormat16bppBGR555, &GUID_WICPixelFormat16bppBGR565, &GUID_WICPixelFormat24bppBGR,

1 0