July 2008 - Wine-Commits - list.winehq.org

Piotr Caban : msxml3: Added stub implementation for SAXXMLReader interface.
by Alexandre Julliard July 9, 2008

July 9, 2008

Module: wine Branch: master Commit: 19267603c59074b203a0496cc3be942947d06d12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=19267603c59074b203a0496cc… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Tue Jul 8 20:52:04 2008 +0200 msxml3: Added stub implementation for SAXXMLReader interface. --- dlls/msxml3/saxreader.c | 242 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 242 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index 497132a..3539cbb 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -47,6 +47,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msxml); typedef struct _saxreader { const struct IVBSAXXMLReaderVtbl *lpVtbl; + const struct ISAXXMLReaderVtbl *lpSAXXMLReaderVtbl; LONG ref; xmlSAXHandler sax; } saxreader; @@ -56,6 +57,12 @@ static inline saxreader *impl_from_IVBSAXXMLReader( IVBSAXXMLReader *iface ) return (saxreader *)((char*)iface - FIELD_OFFSET(saxreader, lpVtbl)); } +static inline saxreader *impl_from_ISAXXMLReader( ISAXXMLReader *iface ) +{ + return (saxreader *)((char*)iface - FIELD_OFFSET(saxreader, lpSAXXMLReaderVtbl)); +} + +/*** IVBSAXXMLReader interface ***/ /*** IUnknown methods ***/ static HRESULT WINAPI saxxmlreader_QueryInterface(IVBSAXXMLReader* iface, REFIID riid, void **ppvObject) { @@ -71,6 +78,10 @@ static HRESULT WINAPI saxxmlreader_QueryInterface(IVBSAXXMLReader* iface, REFIID { *ppvObject = iface; } + else if( IsEqualGUID( riid, &IID_ISAXXMLReader )) + { + *ppvObject = (ISAXXMLReader*)&This->lpSAXXMLReaderVtbl; + } else { FIXME("interface %s not implemented\n", debugstr_guid(riid)); @@ -403,6 +414,236 @@ static const struct IVBSAXXMLReaderVtbl saxreader_vtbl = saxxmlreader_parseURL }; +/*** ISAXXMLReader interface ***/ +/*** IUnknown methods ***/ +static HRESULT WINAPI isaxxmlreader_QueryInterface(ISAXXMLReader* iface, REFIID riid, void **ppvObject) +{ + saxreader *This = impl_from_ISAXXMLReader( iface ); + return saxxmlreader_QueryInterface((IVBSAXXMLReader*)&This->lpVtbl, riid, ppvObject); +} + +static ULONG WINAPI isaxxmlreader_AddRef(ISAXXMLReader* iface) +{ + saxreader *This = impl_from_ISAXXMLReader( iface ); + return saxxmlreader_AddRef((IVBSAXXMLReader*)&This->lpVtbl); +} + +static ULONG WINAPI isaxxmlreader_Release(ISAXXMLReader* iface) +{ + saxreader *This = impl_from_ISAXXMLReader( iface ); + return saxxmlreader_Release((IVBSAXXMLReader*)&This->lpVtbl); +} + +/*** ISAXXMLReader methods ***/ +static HRESULT WINAPI isaxxmlreader_getFeature( + ISAXXMLReader* iface, + const WCHAR *pFeature, + VARIANT_BOOL *pValue) +{ + saxreader *This = impl_from_ISAXXMLReader( iface ); + + FIXME("(%p)->(%s %p) stub\n", This, debugstr_w(pFeature), pValue); + return E_NOTIMPL; +} + +static HRESULT WINAPI isaxxmlreader_putFeature( + ISAXXMLReader* iface, + const WCHAR *pFeature, + VARIANT_BOOL vfValue) +{ + saxreader *This = impl_from_ISAXXMLReader( iface ); + + FIXME("(%p)->(%s %x) stub\n", This, debugstr_w(pFeature), vfValue); + return E_NOTIMPL; +} + +static HRESULT WINAPI isaxxmlreader_getProperty( + ISAXXMLReader* iface, + const WCHAR *pProp, + VARIANT *pValue) +{ + saxreader *This = impl_from_ISAXXMLReader( iface ); + + FIXME("(%p)->(%s %p) stub\n", This, debugstr_w(pProp), pValue); + return E_NOTIMPL; +} + +static HRESULT WINAPI isaxxmlreader_putProperty( + ISAXXMLReader* iface, + const WCHAR *pProp, + VARIANT value) +{ + saxreader *This = impl_from_ISAXXMLReader( iface ); + + FIXME("(%p)->(%s) stub\n", This, debugstr_w(pProp)); + return E_NOTIMPL; +} + +static HRESULT WINAPI isaxxmlreader_getEntityResolver( + ISAXXMLReader* iface, + ISAXEntityResolver **ppEntityResolver) +{ + saxreader *This = impl_from_ISAXXMLReader( iface ); + + FIXME("(%p)->(%p) stub\n", This, ppEntityResolver); + return E_NOTIMPL; +} + +static HRESULT WINAPI isaxxmlreader_putEntityResolver( + ISAXXMLReader* iface, + ISAXEntityResolver *pEntityResolver) +{ + saxreader *This = impl_from_ISAXXMLReader( iface ); + + FIXME("(%p)->(%p) stub\n", This, pEntityResolver); + return E_NOTIMPL; +} + +static HRESULT WINAPI isaxxmlreader_getContentHandler( + ISAXXMLReader* iface, + ISAXContentHandler **pContentHandler) +{ + saxreader *This = impl_from_ISAXXMLReader( iface ); + + FIXME("(%p)->(%p) stub\n", This, pContentHandler); + return E_NOTIMPL; +} + +static HRESULT WINAPI isaxxmlreader_putContentHandler( + ISAXXMLReader* iface, + ISAXContentHandler *contentHandler) +{ + saxreader *This = impl_from_ISAXXMLReader( iface ); + + FIXME("(%p)->(%p) stub\n", This, contentHandler); + return E_NOTIMPL; +} + +static HRESULT WINAPI isaxxmlreader_getDTDHandler( + ISAXXMLReader* iface, + ISAXDTDHandler **pDTDHandler) +{ + saxreader *This = impl_from_ISAXXMLReader( iface ); + + FIXME("(%p)->(%p) stub\n", This, pDTDHandler); + return E_NOTIMPL; +} + +static HRESULT WINAPI isaxxmlreader_putDTDHandler( + ISAXXMLReader* iface, + ISAXDTDHandler *pDTDHandler) +{ + saxreader *This = impl_from_ISAXXMLReader( iface ); + + FIXME("(%p)->(%p) stub\n", This, pDTDHandler); + return E_NOTIMPL; +} + +static HRESULT WINAPI isaxxmlreader_getErrorHandler( + ISAXXMLReader* iface, + ISAXErrorHandler **pErrorHandler) +{ + saxreader *This = impl_from_ISAXXMLReader( iface ); + + FIXME("(%p)->(%p) stub\n", This, pErrorHandler); + return E_NOTIMPL; +} + +static HRESULT WINAPI isaxxmlreader_putErrorHandler( + ISAXXMLReader* iface, + ISAXErrorHandler *errorHandler) +{ + saxreader *This = impl_from_ISAXXMLReader( iface ); + + FIXME("(%p)->(%p) stub\n", This, errorHandler); + return E_NOTIMPL; +} + +static HRESULT WINAPI isaxxmlreader_getBaseURL( + ISAXXMLReader* iface, + const WCHAR **pBaseUrl) +{ + saxreader *This = impl_from_ISAXXMLReader( iface ); + + FIXME("(%p)->(%p) stub\n", This, pBaseUrl); + return E_NOTIMPL; +} + +static HRESULT WINAPI isaxxmlreader_putBaseURL( + ISAXXMLReader* iface, + const WCHAR *pBaseUrl) +{ + saxreader *This = impl_from_ISAXXMLReader( iface ); + + FIXME("(%p)->(%s) stub\n", This, debugstr_w(pBaseUrl)); + return E_NOTIMPL; +} + +static HRESULT WINAPI isaxxmlreader_getSecureBaseURL( + ISAXXMLReader* iface, + const WCHAR **pSecureBaseUrl) +{ + saxreader *This = impl_from_ISAXXMLReader( iface ); + + FIXME("(%p)->(%p) stub\n", This, pSecureBaseUrl); + return E_NOTIMPL; +} + +static HRESULT WINAPI isaxxmlreader_putSecureBaseURL( + ISAXXMLReader* iface, + const WCHAR *secureBaseUrl) +{ + saxreader *This = impl_from_ISAXXMLReader( iface ); + + FIXME("(%p)->(%s) stub\n", This, debugstr_w(secureBaseUrl)); + return E_NOTIMPL; +} + +static HRESULT WINAPI isaxxmlreader_parse( + ISAXXMLReader* iface, + VARIANT varInput) +{ + saxreader *This = impl_from_ISAXXMLReader( iface ); + + FIXME("(%p) stub\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI isaxxmlreader_parseURL( + ISAXXMLReader* iface, + const WCHAR *url) +{ + saxreader *This = impl_from_ISAXXMLReader( iface ); + + FIXME("(%p)->(%s) stub\n", This, debugstr_w(url)); + return E_NOTIMPL; +} + +static const struct ISAXXMLReaderVtbl isaxreader_vtbl = +{ + isaxxmlreader_QueryInterface, + isaxxmlreader_AddRef, + isaxxmlreader_Release, + isaxxmlreader_getFeature, + isaxxmlreader_putFeature, + isaxxmlreader_getProperty, + isaxxmlreader_putProperty, + isaxxmlreader_getEntityResolver, + isaxxmlreader_putEntityResolver, + isaxxmlreader_getContentHandler, + isaxxmlreader_putContentHandler, + isaxxmlreader_getDTDHandler, + isaxxmlreader_putDTDHandler, + isaxxmlreader_getErrorHandler, + isaxxmlreader_putErrorHandler, + isaxxmlreader_getBaseURL, + isaxxmlreader_putBaseURL, + isaxxmlreader_getSecureBaseURL, + isaxxmlreader_putSecureBaseURL, + isaxxmlreader_parse, + isaxxmlreader_parseURL +}; + HRESULT SAXXMLReader_create(IUnknown *pUnkOuter, LPVOID *ppObj) { saxreader *reader; @@ -414,6 +655,7 @@ HRESULT SAXXMLReader_create(IUnknown *pUnkOuter, LPVOID *ppObj) return E_OUTOFMEMORY; reader->lpVtbl = &saxreader_vtbl; + reader->lpSAXXMLReaderVtbl = &isaxreader_vtbl; reader->ref = 1; *ppObj = &reader->lpVtbl;

1 0

Maarten Lankhorst : quartz: Add tests for avi splitter.
by Alexandre Julliard July 9, 2008

July 9, 2008

Module: wine Branch: master Commit: 3adf811645daaa876e1d223f98fc5428d2f79f75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3adf811645daaa876e1d223f9… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Jul 4 18:43:31 2008 -0700 quartz: Add tests for avi splitter. --- dlls/quartz/tests/Makefile.in | 1 + dlls/quartz/tests/avisplitter.c | 463 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 464 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3adf811645daaa876e1d2…

1 0

Maarten Lankhorst : quartz: Add rewrite of avi splitter.
by Alexandre Julliard July 9, 2008

July 9, 2008

Module: wine Branch: master Commit: 19360d41a0239970a7730756d7764be8f08970c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=19360d41a0239970a7730756d… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Jul 4 18:44:14 2008 -0700 quartz: Add rewrite of avi splitter. --- dlls/quartz/avisplit.c | 839 +++++++++++++++++++++++++++++++++--------------- 1 files changed, 579 insertions(+), 260 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=19360d41a0239970a7730…

1 0

Maarten Lankhorst : quartz: Fix deadlock with transform filter.
by Alexandre Julliard July 9, 2008

July 9, 2008

Module: wine Branch: master Commit: 992fb02c732f8963cb70fd8167a7727911553d3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=992fb02c732f8963cb70fd816… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Jul 4 16:59:22 2008 -0700 quartz: Fix deadlock with transform filter. --- dlls/quartz/acmwrapper.c | 42 ++++++++++++++++++++++++++++++++---------- dlls/quartz/avidec.c | 28 ++++++++++++++++++++++------ dlls/quartz/dsoundrender.c | 19 ++++++++++++++++++- dlls/quartz/nullrenderer.c | 26 +++++++------------------- dlls/quartz/pin.c | 8 +------- dlls/quartz/transform.c | 14 +------------- dlls/quartz/videorenderer.c | 16 ++++++++++++++++ 7 files changed, 97 insertions(+), 56 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=992fb02c732f8963cb70f…

1 0

Stefan Dösinger : wined3d: Move fog to the vertex states.
by Alexandre Julliard July 9, 2008

July 9, 2008

Module: wine Branch: master Commit: ecc7b5fb18d39b4ff5dc565b14e4221296c18e97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecc7b5fb18d39b4ff5dc565b1… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jul 2 20:49:43 2008 -0500 wined3d: Move fog to the vertex states. --- dlls/wined3d/state.c | 17 +++++++++++------ 1 files changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index f3cb7a4..ea4a5c4 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -896,7 +896,6 @@ static void state_stencilwrite(DWORD state, IWineD3DStateBlockImpl *stateblock, } static void state_fog(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { - /* TODO: Put this into the vertex type block once that is in the state table */ BOOL fogenable = stateblock->renderState[WINED3DRS_FOGENABLE]; BOOL is_ps3 = use_ps(stateblock->wineD3DDevice) && ((IWineD3DPixelShaderImpl *)stateblock->pixelShader)->baseShader.hex_version >= WINED3DPS_VERSION(3,0); @@ -3850,16 +3849,16 @@ const struct StateEntry FFPStateTable[] = { /* 25, WINED3DRS_ALPHAFUNC */ STATE_RENDER(WINED3DRS_ALPHATESTENABLE), NULL }, { /* 26, WINED3DRS_DITHERENABLE */ STATE_RENDER(WINED3DRS_DITHERENABLE), NULL }, { /* 27, WINED3DRS_ALPHABLENDENABLE */ STATE_RENDER(WINED3DRS_ALPHABLENDENABLE), NULL }, - { /* 28, WINED3DRS_FOGENABLE */ STATE_RENDER(WINED3DRS_FOGENABLE), state_fog }, + { /* 28, WINED3DRS_FOGENABLE */ STATE_RENDER(WINED3DRS_FOGENABLE), NULL }, { /* 29, WINED3DRS_SPECULARENABLE */ STATE_RENDER(WINED3DRS_SPECULARENABLE), NULL }, { /* 30, WINED3DRS_ZVISIBLE */ 0 /* Not supported according to the msdn */, state_nogl }, { /* 31, WINED3DRS_SUBPIXEL */ STATE_RENDER(WINED3DRS_SUBPIXEL), NULL }, { /* 32, WINED3DRS_SUBPIXELX */ STATE_RENDER(WINED3DRS_SUBPIXELX), NULL }, { /* 33, WINED3DRS_STIPPLEDALPHA */ STATE_RENDER(WINED3DRS_STIPPLEDALPHA), NULL }, { /* 34, WINED3DRS_FOGCOLOR */ STATE_RENDER(WINED3DRS_FOGCOLOR), state_fogcolor }, - { /* 35, WINED3DRS_FOGTABLEMODE */ STATE_RENDER(WINED3DRS_FOGENABLE), state_fog }, - { /* 36, WINED3DRS_FOGSTART */ STATE_RENDER(WINED3DRS_FOGENABLE), state_fog }, - { /* 37, WINED3DRS_FOGEND */ STATE_RENDER(WINED3DRS_FOGENABLE), state_fog }, + { /* 35, WINED3DRS_FOGTABLEMODE */ STATE_RENDER(WINED3DRS_FOGENABLE), NULL }, + { /* 36, WINED3DRS_FOGSTART */ STATE_RENDER(WINED3DRS_FOGENABLE), NULL }, + { /* 37, WINED3DRS_FOGEND */ STATE_RENDER(WINED3DRS_FOGENABLE), NULL }, { /* 38, WINED3DRS_FOGDENSITY */ STATE_RENDER(WINED3DRS_FOGDENSITY), state_fogdensity }, { /* 39, WINED3DRS_STIPPLEENABLE */ STATE_RENDER(WINED3DRS_STIPPLEENABLE), state_stippleenable }, { /* 40, WINED3DRS_EDGEANTIALIAS */ STATE_RENDER(WINED3DRS_ALPHABLENDENABLE), NULL }, @@ -3963,7 +3962,7 @@ const struct StateEntry FFPStateTable[] = { /*137, WINED3DRS_LIGHTING */ STATE_RENDER(WINED3DRS_LIGHTING), state_lighting }, { /*138, WINED3DRS_EXTENTS */ STATE_RENDER(WINED3DRS_EXTENTS), state_extents }, { /*139, WINED3DRS_AMBIENT */ STATE_RENDER(WINED3DRS_AMBIENT), state_ambient }, - { /*140, WINED3DRS_FOGVERTEXMODE */ STATE_RENDER(WINED3DRS_FOGENABLE), state_fog }, + { /*140, WINED3DRS_FOGVERTEXMODE */ STATE_RENDER(WINED3DRS_FOGENABLE), NULL }, { /*141, WINED3DRS_COLORVERTEX */ STATE_RENDER(WINED3DRS_COLORVERTEX), state_colormat }, { /*142, WINED3DRS_LOCALVIEWER */ STATE_RENDER(WINED3DRS_LOCALVIEWER), state_localviewer }, { /*143, WINED3DRS_NORMALIZENORMALS */ STATE_RENDER(WINED3DRS_NORMALIZENORMALS), state_normalize }, @@ -5266,6 +5265,12 @@ const struct StateEntryTemplate ffp_vertexstate_template[] = { { STATE_TEXTURESTAGE(5,WINED3DTSS_TEXTURETRANSFORMFLAGS),{STATE_TRANSFORM(WINED3DTS_TEXTURE5), transform_texture }}, { STATE_TEXTURESTAGE(6,WINED3DTSS_TEXTURETRANSFORMFLAGS),{STATE_TRANSFORM(WINED3DTS_TEXTURE6), transform_texture }}, { STATE_TEXTURESTAGE(7,WINED3DTSS_TEXTURETRANSFORMFLAGS),{STATE_TRANSFORM(WINED3DTS_TEXTURE7), transform_texture }}, + /* Fog */ + { STATE_RENDER(WINED3DRS_FOGENABLE), { STATE_RENDER(WINED3DRS_FOGENABLE), state_fog }}, + { STATE_RENDER(WINED3DRS_FOGTABLEMODE), { STATE_RENDER(WINED3DRS_FOGENABLE), state_fog }}, + { STATE_RENDER(WINED3DRS_FOGSTART), { STATE_RENDER(WINED3DRS_FOGENABLE), state_fog }}, + { STATE_RENDER(WINED3DRS_FOGEND), { STATE_RENDER(WINED3DRS_FOGENABLE), state_fog }}, + { STATE_RENDER(WINED3DRS_FOGVERTEXMODE), { STATE_RENDER(WINED3DRS_FOGENABLE), state_fog }}, {0 /* Terminate */, { 0, 0 }}, };

1 0

Stefan Dösinger : wined3d: Move a few more states to the misc states.
by Alexandre Julliard July 9, 2008

July 9, 2008

Module: wine Branch: master Commit: cd9690d9d024def79f02abaab9e756a7854ef589 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd9690d9d024def79f02abaab… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jul 2 20:39:42 2008 -0500 wined3d: Move a few more states to the misc states. --- dlls/wined3d/state.c | 18 ++++++++++++------ 1 files changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 31e8288..f3cb7a4 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3844,18 +3844,18 @@ const struct StateEntry FFPStateTable[] = { /* 19, WINED3DRS_SRCBLEND */ STATE_RENDER(WINED3DRS_ALPHABLENDENABLE), NULL }, { /* 20, WINED3DRS_DESTBLEND */ STATE_RENDER(WINED3DRS_ALPHABLENDENABLE), NULL }, { /* 21, WINED3DRS_TEXTUREMAPBLEND */ 0 /* Handled in ddraw */, state_undefined }, - { /* 22, WINED3DRS_CULLMODE */ STATE_RENDER(WINED3DRS_CULLMODE), state_cullmode }, - { /* 23, WINED3DRS_ZFUNC */ STATE_RENDER(WINED3DRS_ZFUNC), state_zfunc }, + { /* 22, WINED3DRS_CULLMODE */ STATE_RENDER(WINED3DRS_CULLMODE), NULL }, + { /* 23, WINED3DRS_ZFUNC */ STATE_RENDER(WINED3DRS_ZFUNC), NULL }, { /* 24, WINED3DRS_ALPHAREF */ STATE_RENDER(WINED3DRS_ALPHATESTENABLE), NULL }, { /* 25, WINED3DRS_ALPHAFUNC */ STATE_RENDER(WINED3DRS_ALPHATESTENABLE), NULL }, - { /* 26, WINED3DRS_DITHERENABLE */ STATE_RENDER(WINED3DRS_DITHERENABLE), state_ditherenable }, + { /* 26, WINED3DRS_DITHERENABLE */ STATE_RENDER(WINED3DRS_DITHERENABLE), NULL }, { /* 27, WINED3DRS_ALPHABLENDENABLE */ STATE_RENDER(WINED3DRS_ALPHABLENDENABLE), NULL }, { /* 28, WINED3DRS_FOGENABLE */ STATE_RENDER(WINED3DRS_FOGENABLE), state_fog }, { /* 29, WINED3DRS_SPECULARENABLE */ STATE_RENDER(WINED3DRS_SPECULARENABLE), NULL }, { /* 30, WINED3DRS_ZVISIBLE */ 0 /* Not supported according to the msdn */, state_nogl }, - { /* 31, WINED3DRS_SUBPIXEL */ STATE_RENDER(WINED3DRS_SUBPIXEL), state_subpixel }, - { /* 32, WINED3DRS_SUBPIXELX */ STATE_RENDER(WINED3DRS_SUBPIXELX), state_subpixelx }, - { /* 33, WINED3DRS_STIPPLEDALPHA */ STATE_RENDER(WINED3DRS_STIPPLEDALPHA), state_stippledalpha }, + { /* 31, WINED3DRS_SUBPIXEL */ STATE_RENDER(WINED3DRS_SUBPIXEL), NULL }, + { /* 32, WINED3DRS_SUBPIXELX */ STATE_RENDER(WINED3DRS_SUBPIXELX), NULL }, + { /* 33, WINED3DRS_STIPPLEDALPHA */ STATE_RENDER(WINED3DRS_STIPPLEDALPHA), NULL }, { /* 34, WINED3DRS_FOGCOLOR */ STATE_RENDER(WINED3DRS_FOGCOLOR), state_fogcolor }, { /* 35, WINED3DRS_FOGTABLEMODE */ STATE_RENDER(WINED3DRS_FOGENABLE), state_fog }, { /* 36, WINED3DRS_FOGSTART */ STATE_RENDER(WINED3DRS_FOGENABLE), state_fog }, @@ -4933,6 +4933,12 @@ const struct StateEntryTemplate misc_state_template[] = { { STATE_RENDER(WINED3DRS_ALPHAFUNC), { STATE_RENDER(WINED3DRS_ALPHATESTENABLE), state_alpha }}, { STATE_RENDER(WINED3DRS_COLORKEYENABLE), { STATE_RENDER(WINED3DRS_ALPHATESTENABLE), state_alpha }}, { STATE_RENDER(WINED3DRS_LASTPIXEL), { STATE_RENDER(WINED3DRS_LASTPIXEL), state_lastpixel }}, + { STATE_RENDER(WINED3DRS_CULLMODE), { STATE_RENDER(WINED3DRS_CULLMODE), state_cullmode }}, + { STATE_RENDER(WINED3DRS_ZFUNC), { STATE_RENDER(WINED3DRS_ZFUNC), state_zfunc }}, + { STATE_RENDER(WINED3DRS_DITHERENABLE), { STATE_RENDER(WINED3DRS_DITHERENABLE), state_ditherenable }}, + { STATE_RENDER(WINED3DRS_SUBPIXEL), { STATE_RENDER(WINED3DRS_SUBPIXEL), state_subpixel }}, + { STATE_RENDER(WINED3DRS_SUBPIXELX), { STATE_RENDER(WINED3DRS_SUBPIXELX), state_subpixelx }}, + { STATE_RENDER(WINED3DRS_STIPPLEDALPHA), { STATE_RENDER(WINED3DRS_STIPPLEDALPHA), state_stippledalpha }}, {0 /* Terminate */, { 0, 0 }}, };

1 0

Stefan Dösinger : wined3d: WINED3DRS_LASTPIXEL -> misc states.
by Alexandre Julliard July 9, 2008

July 9, 2008

Module: wine Branch: master Commit: a4c85d788ad3d5a13df76c6e1c67b99c69e0699f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4c85d788ad3d5a13df76c6e1… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jul 2 20:20:44 2008 -0500 wined3d: WINED3DRS_LASTPIXEL -> misc states. --- dlls/wined3d/state.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 633fe2a..31e8288 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3838,7 +3838,7 @@ const struct StateEntry FFPStateTable[] = { /* 13, WINED3DRS_PLANEMASK */ STATE_RENDER(WINED3DRS_PLANEMASK), NULL }, { /* 14, WINED3DRS_ZWRITEENABLE */ STATE_RENDER(WINED3DRS_ZWRITEENABLE), NULL }, { /* 15, WINED3DRS_ALPHATESTENABLE */ STATE_RENDER(WINED3DRS_ALPHATESTENABLE), NULL }, - { /* 16, WINED3DRS_LASTPIXEL */ STATE_RENDER(WINED3DRS_LASTPIXEL), state_lastpixel }, + { /* 16, WINED3DRS_LASTPIXEL */ STATE_RENDER(WINED3DRS_LASTPIXEL), NULL }, { /* 17, WINED3DRS_TEXTUREMAG */ 0 /* Handled in ddraw */, state_undefined }, { /* 18, WINED3DRS_TEXTUREMIN */ 0 /* Handled in ddraw */, state_undefined }, { /* 19, WINED3DRS_SRCBLEND */ STATE_RENDER(WINED3DRS_ALPHABLENDENABLE), NULL }, @@ -4932,6 +4932,7 @@ const struct StateEntryTemplate misc_state_template[] = { { STATE_RENDER(WINED3DRS_ALPHAREF), { STATE_RENDER(WINED3DRS_ALPHATESTENABLE), state_alpha }}, { STATE_RENDER(WINED3DRS_ALPHAFUNC), { STATE_RENDER(WINED3DRS_ALPHATESTENABLE), state_alpha }}, { STATE_RENDER(WINED3DRS_COLORKEYENABLE), { STATE_RENDER(WINED3DRS_ALPHATESTENABLE), state_alpha }}, + { STATE_RENDER(WINED3DRS_LASTPIXEL), { STATE_RENDER(WINED3DRS_LASTPIXEL), state_lastpixel }}, {0 /* Terminate */, { 0, 0 }}, };

1 0

Stefan Dösinger : wined3d: Alpha states -> misc pipeline states.
by Alexandre Julliard July 9, 2008

July 9, 2008

Module: wine Branch: master Commit: 58ef02fa69adcac6de8c3d16306e8e242cf27015 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58ef02fa69adcac6de8c3d163… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jul 2 20:18:55 2008 -0500 wined3d: Alpha states -> misc pipeline states. --- dlls/wined3d/state.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 82f7734..633fe2a 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3837,7 +3837,7 @@ const struct StateEntry FFPStateTable[] = { /* 12, WINED3DRS_ROP2 */ STATE_RENDER(WINED3DRS_ROP2), NULL }, { /* 13, WINED3DRS_PLANEMASK */ STATE_RENDER(WINED3DRS_PLANEMASK), NULL }, { /* 14, WINED3DRS_ZWRITEENABLE */ STATE_RENDER(WINED3DRS_ZWRITEENABLE), NULL }, - { /* 15, WINED3DRS_ALPHATESTENABLE */ STATE_RENDER(WINED3DRS_ALPHATESTENABLE), state_alpha }, + { /* 15, WINED3DRS_ALPHATESTENABLE */ STATE_RENDER(WINED3DRS_ALPHATESTENABLE), NULL }, { /* 16, WINED3DRS_LASTPIXEL */ STATE_RENDER(WINED3DRS_LASTPIXEL), state_lastpixel }, { /* 17, WINED3DRS_TEXTUREMAG */ 0 /* Handled in ddraw */, state_undefined }, { /* 18, WINED3DRS_TEXTUREMIN */ 0 /* Handled in ddraw */, state_undefined }, @@ -3846,8 +3846,8 @@ const struct StateEntry FFPStateTable[] = { /* 21, WINED3DRS_TEXTUREMAPBLEND */ 0 /* Handled in ddraw */, state_undefined }, { /* 22, WINED3DRS_CULLMODE */ STATE_RENDER(WINED3DRS_CULLMODE), state_cullmode }, { /* 23, WINED3DRS_ZFUNC */ STATE_RENDER(WINED3DRS_ZFUNC), state_zfunc }, - { /* 24, WINED3DRS_ALPHAREF */ STATE_RENDER(WINED3DRS_ALPHATESTENABLE), state_alpha }, - { /* 25, WINED3DRS_ALPHAFUNC */ STATE_RENDER(WINED3DRS_ALPHATESTENABLE), state_alpha }, + { /* 24, WINED3DRS_ALPHAREF */ STATE_RENDER(WINED3DRS_ALPHATESTENABLE), NULL }, + { /* 25, WINED3DRS_ALPHAFUNC */ STATE_RENDER(WINED3DRS_ALPHATESTENABLE), NULL }, { /* 26, WINED3DRS_DITHERENABLE */ STATE_RENDER(WINED3DRS_DITHERENABLE), state_ditherenable }, { /* 27, WINED3DRS_ALPHABLENDENABLE */ STATE_RENDER(WINED3DRS_ALPHABLENDENABLE), NULL }, { /* 28, WINED3DRS_FOGENABLE */ STATE_RENDER(WINED3DRS_FOGENABLE), state_fog }, @@ -3863,7 +3863,7 @@ const struct StateEntry FFPStateTable[] = { /* 38, WINED3DRS_FOGDENSITY */ STATE_RENDER(WINED3DRS_FOGDENSITY), state_fogdensity }, { /* 39, WINED3DRS_STIPPLEENABLE */ STATE_RENDER(WINED3DRS_STIPPLEENABLE), state_stippleenable }, { /* 40, WINED3DRS_EDGEANTIALIAS */ STATE_RENDER(WINED3DRS_ALPHABLENDENABLE), NULL }, - { /* 41, WINED3DRS_COLORKEYENABLE */ STATE_RENDER(WINED3DRS_ALPHATESTENABLE), state_alpha }, + { /* 41, WINED3DRS_COLORKEYENABLE */ STATE_RENDER(WINED3DRS_ALPHATESTENABLE), NULL }, { /* 42, undefined */ 0, state_undefined }, { /* 43, WINED3DRS_BORDERCOLOR */ STATE_RENDER(WINED3DRS_BORDERCOLOR), state_bordercolor }, { /* 44, WINED3DRS_TEXTUREADDRESSU */ 0, /* Handled in ddraw */ state_undefined }, @@ -4928,6 +4928,10 @@ const struct StateEntryTemplate misc_state_template[] = { { STATE_RENDER(WINED3DRS_ROP2), { STATE_RENDER(WINED3DRS_ROP2), state_rop2 }}, { STATE_RENDER(WINED3DRS_PLANEMASK), { STATE_RENDER(WINED3DRS_PLANEMASK), state_planemask }}, { STATE_RENDER(WINED3DRS_ZWRITEENABLE), { STATE_RENDER(WINED3DRS_ZWRITEENABLE), state_zwritenable }}, + { STATE_RENDER(WINED3DRS_ALPHATESTENABLE), { STATE_RENDER(WINED3DRS_ALPHATESTENABLE), state_alpha }}, + { STATE_RENDER(WINED3DRS_ALPHAREF), { STATE_RENDER(WINED3DRS_ALPHATESTENABLE), state_alpha }}, + { STATE_RENDER(WINED3DRS_ALPHAFUNC), { STATE_RENDER(WINED3DRS_ALPHATESTENABLE), state_alpha }}, + { STATE_RENDER(WINED3DRS_COLORKEYENABLE), { STATE_RENDER(WINED3DRS_ALPHATESTENABLE), state_alpha }}, {0 /* Terminate */, { 0, 0 }}, };

1 0

Stefan Dösinger : wined3d: Textureperspective-> misc states.
by Alexandre Julliard July 9, 2008

July 9, 2008

Module: wine Branch: master Commit: b4445e8b98b558603e5e17d9e2268be94b3ac7af URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4445e8b98b558603e5e17d9e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jul 2 16:01:46 2008 -0500 wined3d: Textureperspective->misc states. --- dlls/wined3d/state.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 5bd8c62..91c402b 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3826,7 +3826,7 @@ const struct StateEntry FFPStateTable[] = { /* 1, WINED3DRS_TEXTUREHANDLE */ 0 /* Handled in ddraw */, state_undefined }, { /* 2, WINED3DRS_ANTIALIAS */ STATE_RENDER(WINED3DRS_ANTIALIAS), NULL }, { /* 3, WINED3DRS_TEXTUREADDRESS */ 0 /* Handled in ddraw */, state_undefined }, - { /* 4, WINED3DRS_TEXTUREPERSPECTIVE */ STATE_RENDER(WINED3DRS_TEXTUREPERSPECTIVE), state_perspective }, + { /* 4, WINED3DRS_TEXTUREPERSPECTIVE */ STATE_RENDER(WINED3DRS_TEXTUREPERSPECTIVE), NULL }, { /* 5, WINED3DRS_WRAPU */ STATE_RENDER(WINED3DRS_WRAPU), state_wrapu }, { /* 6, WINED3DRS_WRAPV */ STATE_RENDER(WINED3DRS_WRAPV), state_wrapv }, { /* 7, WINED3DRS_ZENABLE */ STATE_RENDER(WINED3DRS_ZENABLE), state_zenable }, @@ -4917,6 +4917,7 @@ const struct StateEntryTemplate misc_state_template[] = { { STATE_VIEWPORT, { STATE_VIEWPORT, viewport_miscpart }}, { STATE_INDEXBUFFER, { STATE_INDEXBUFFER, indexbuffer }}, { STATE_RENDER(WINED3DRS_ANTIALIAS), { STATE_RENDER(WINED3DRS_ANTIALIAS), state_antialias }}, + { STATE_RENDER(WINED3DRS_TEXTUREPERSPECTIVE), { STATE_RENDER(WINED3DRS_TEXTUREPERSPECTIVE), state_perspective }}, {0 /* Terminate */, { 0, 0 }}, };

1 0

Stefan Dösinger : wined3d: Move a few more states to the misc pipeline.
by Alexandre Julliard July 9, 2008

July 9, 2008

Module: wine Branch: master Commit: dd90d62356282c7815935c4efcc149edd5e7320f URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd90d62356282c7815935c4ef… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jul 2 16:08:40 2008 -0500 wined3d: Move a few more states to the misc pipeline. --- dlls/wined3d/state.c | 24 ++++++++++++++++-------- 1 files changed, 16 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 91c402b..ba2f134 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3829,14 +3829,14 @@ const struct StateEntry FFPStateTable[] = { /* 4, WINED3DRS_TEXTUREPERSPECTIVE */ STATE_RENDER(WINED3DRS_TEXTUREPERSPECTIVE), NULL }, { /* 5, WINED3DRS_WRAPU */ STATE_RENDER(WINED3DRS_WRAPU), state_wrapu }, { /* 6, WINED3DRS_WRAPV */ STATE_RENDER(WINED3DRS_WRAPV), state_wrapv }, - { /* 7, WINED3DRS_ZENABLE */ STATE_RENDER(WINED3DRS_ZENABLE), state_zenable }, - { /* 8, WINED3DRS_FILLMODE */ STATE_RENDER(WINED3DRS_FILLMODE), state_fillmode }, - { /* 9, WINED3DRS_SHADEMODE */ STATE_RENDER(WINED3DRS_SHADEMODE), state_shademode }, - { /* 10, WINED3DRS_LINEPATTERN */ STATE_RENDER(WINED3DRS_LINEPATTERN), state_linepattern }, - { /* 11, WINED3DRS_MONOENABLE */ STATE_RENDER(WINED3DRS_MONOENABLE), state_monoenable }, - { /* 12, WINED3DRS_ROP2 */ STATE_RENDER(WINED3DRS_ROP2), state_rop2 }, - { /* 13, WINED3DRS_PLANEMASK */ STATE_RENDER(WINED3DRS_PLANEMASK), state_planemask }, - { /* 14, WINED3DRS_ZWRITEENABLE */ STATE_RENDER(WINED3DRS_ZWRITEENABLE), state_zwritenable }, + { /* 7, WINED3DRS_ZENABLE */ STATE_RENDER(WINED3DRS_ZENABLE), NULL }, + { /* 8, WINED3DRS_FILLMODE */ STATE_RENDER(WINED3DRS_FILLMODE), NULL }, + { /* 9, WINED3DRS_SHADEMODE */ STATE_RENDER(WINED3DRS_SHADEMODE), NULL }, + { /* 10, WINED3DRS_LINEPATTERN */ STATE_RENDER(WINED3DRS_LINEPATTERN), NULL }, + { /* 11, WINED3DRS_MONOENABLE */ STATE_RENDER(WINED3DRS_MONOENABLE), NULL }, + { /* 12, WINED3DRS_ROP2 */ STATE_RENDER(WINED3DRS_ROP2), NULL }, + { /* 13, WINED3DRS_PLANEMASK */ STATE_RENDER(WINED3DRS_PLANEMASK), NULL }, + { /* 14, WINED3DRS_ZWRITEENABLE */ STATE_RENDER(WINED3DRS_ZWRITEENABLE), NULL }, { /* 15, WINED3DRS_ALPHATESTENABLE */ STATE_RENDER(WINED3DRS_ALPHATESTENABLE), state_alpha }, { /* 16, WINED3DRS_LASTPIXEL */ STATE_RENDER(WINED3DRS_LASTPIXEL), state_lastpixel }, { /* 17, WINED3DRS_TEXTUREMAG */ 0 /* Handled in ddraw */, state_undefined }, @@ -4918,6 +4918,14 @@ const struct StateEntryTemplate misc_state_template[] = { { STATE_INDEXBUFFER, { STATE_INDEXBUFFER, indexbuffer }}, { STATE_RENDER(WINED3DRS_ANTIALIAS), { STATE_RENDER(WINED3DRS_ANTIALIAS), state_antialias }}, { STATE_RENDER(WINED3DRS_TEXTUREPERSPECTIVE), { STATE_RENDER(WINED3DRS_TEXTUREPERSPECTIVE), state_perspective }}, + { STATE_RENDER(WINED3DRS_ZENABLE), { STATE_RENDER(WINED3DRS_ZENABLE), state_zenable }}, + { STATE_RENDER(WINED3DRS_FILLMODE), { STATE_RENDER(WINED3DRS_FILLMODE), state_fillmode }}, + { STATE_RENDER(WINED3DRS_SHADEMODE), { STATE_RENDER(WINED3DRS_SHADEMODE), state_shademode }}, + { STATE_RENDER(WINED3DRS_LINEPATTERN), { STATE_RENDER(WINED3DRS_LINEPATTERN), state_linepattern }}, + { STATE_RENDER(WINED3DRS_MONOENABLE), { STATE_RENDER(WINED3DRS_MONOENABLE), state_monoenable }}, + { STATE_RENDER(WINED3DRS_ROP2), { STATE_RENDER(WINED3DRS_ROP2), state_rop2 }}, + { STATE_RENDER(WINED3DRS_PLANEMASK), { STATE_RENDER(WINED3DRS_PLANEMASK), state_planemask }}, + { STATE_RENDER(WINED3DRS_ZWRITEENABLE), { STATE_RENDER(WINED3DRS_ZWRITEENABLE), state_zwritenable }}, {0 /* Terminate */, { 0, 0 }}, };

1 0