Rico Schüller : wined3d: Filter out invalid stuff in SetStreamSourceFreq().
Alexandre Julliard
julliard at winehq.org
Mon Apr 7 14:46:58 CDT 2008
Module: wine
Branch: master
Commit: 73d98ccd4e8c7993826b440b114f6090061e0177
URL: http://source.winehq.org/git/wine.git/?a=commit;h=73d98ccd4e8c7993826b440b114f6090061e0177
Author: Rico Schüller <kgbricola at web.de>
Date: Sun Apr 6 18:50:02 2008 +0200
wined3d: Filter out invalid stuff in SetStreamSourceFreq().
---
dlls/wined3d/device.c | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index cd07bf2..cd39e20 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -2567,6 +2567,20 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetStreamSourceFreq(IWineD3DDevice *ifa
UINT oldFlags = This->updateStateBlock->streamFlags[StreamNumber];
UINT oldFreq = This->updateStateBlock->streamFreq[StreamNumber];
+ /* Verify input at least in d3d9 this is invalid*/
+ if( (Divider & WINED3DSTREAMSOURCE_INSTANCEDATA) && (Divider & WINED3DSTREAMSOURCE_INDEXEDDATA)){
+ WARN("INSTANCEDATA and INDEXEDDATA were set, returning D3DERR_INVALIDCALL\n");
+ return WINED3DERR_INVALIDCALL;
+ }
+ if( (Divider & WINED3DSTREAMSOURCE_INSTANCEDATA) && StreamNumber == 0 ){
+ WARN("INSTANCEDATA used on stream 0, returning D3DERR_INVALIDCALL\n");
+ return WINED3DERR_INVALIDCALL;
+ }
+ if( Divider == 0 ){
+ WARN("Divider is 0, returning D3DERR_INVALIDCALL\n");
+ return WINED3DERR_INVALIDCALL;
+ }
+
TRACE("(%p) StreamNumber(%d), Divider(%d)\n", This, StreamNumber, Divider);
This->updateStateBlock->streamFlags[StreamNumber] = Divider & (WINED3DSTREAMSOURCE_INSTANCEDATA | WINED3DSTREAMSOURCE_INDEXEDDATA );
More information about the wine-cvs
mailing list