ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wined3d: Check for overflows.

This commit is contained in:
Marcus Meissner 2008-01-15 08:06:37 +01:00 committed by Alexandre Julliard
parent e59bf8c560
commit 293ec5843d
1 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
dlls/wined3d/device.c
View File

@ -3178,6 +3178,12 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetSamplerState(IWineD3DDevice *iface,
Sampler -= (WINED3DVERTEXTEXTURESAMPLER0 - MAX_FRAGMENT_SAMPLERS); Sampler -= (WINED3DVERTEXTEXTURESAMPLER0 - MAX_FRAGMENT_SAMPLERS);
} }
if (Sampler >= sizeof(This->stateBlock->samplerState)/sizeof(This->stateBlock->samplerState[0])) {
ERR("Current Sampler overflows sampleState0 array (sampler %d vs size %d)\n", Sampler,
sizeof(This->stateBlock->samplerState)/sizeof(This->stateBlock->samplerState[0])
);
return WINED3D_OK; /* Windows accepts overflowing this array ... we do not. */
}
/** /**
* SetSampler is designed to allow for more than the standard up to 8 textures * SetSampler is designed to allow for more than the standard up to 8 textures
* and Geforce has stopped supporting more than 6 standard textures in openGL. * and Geforce has stopped supporting more than 6 standard textures in openGL.
@ -3223,6 +3229,12 @@ static HRESULT WINAPI IWineD3DDeviceImpl_GetSamplerState(IWineD3DDevice *iface,
Sampler -= (WINED3DVERTEXTEXTURESAMPLER0 - MAX_FRAGMENT_SAMPLERS); Sampler -= (WINED3DVERTEXTEXTURESAMPLER0 - MAX_FRAGMENT_SAMPLERS);
} }
if (Sampler >= sizeof(This->stateBlock->samplerState)/sizeof(This->stateBlock->samplerState[0])) {
ERR("Current Sampler overflows sampleState0 array (sampler %d vs size %d)\n", Sampler,
sizeof(This->stateBlock->samplerState)/sizeof(This->stateBlock->samplerState[0])
);
return WINED3D_OK; /* Windows accepts overflowing this array ... we do not. */
}
*Value = This->stateBlock->samplerState[Sampler][Type]; *Value = This->stateBlock->samplerState[Sampler][Type];
TRACE("(%p) : Returning %#x\n", This, *Value); TRACE("(%p) : Returning %#x\n", This, *Value);
@ -4398,6 +4410,13 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetTexture(IWineD3DDevice *iface, DWORD
Stage -= (WINED3DVERTEXTEXTURESAMPLER0 - MAX_FRAGMENT_SAMPLERS); Stage -= (WINED3DVERTEXTEXTURESAMPLER0 - MAX_FRAGMENT_SAMPLERS);
} }
if (Stage >= sizeof(This->stateBlock->textures)/sizeof(This->stateBlock->textures[0])) {
ERR("Current stage overflows textures array (stage %d vs size %d)\n", Stage,
sizeof(This->stateBlock->textures)/sizeof(This->stateBlock->textures[0])
);
return WINED3D_OK; /* Windows accepts overflowing this array ... we do not. */
}
oldTexture = This->updateStateBlock->textures[Stage]; oldTexture = This->updateStateBlock->textures[Stage];
if(pTexture != NULL) { if(pTexture != NULL) {
@ -4490,6 +4509,13 @@ static HRESULT WINAPI IWineD3DDeviceImpl_GetTexture(IWineD3DDevice *iface, DWORD
Stage -= (WINED3DVERTEXTEXTURESAMPLER0 - MAX_FRAGMENT_SAMPLERS); Stage -= (WINED3DVERTEXTEXTURESAMPLER0 - MAX_FRAGMENT_SAMPLERS);
} }
if (Stage >= sizeof(This->stateBlock->textures)/sizeof(This->stateBlock->textures[0])) {
ERR("Current stage overflows textures array (stage %d vs size %d)\n", Stage,
sizeof(This->stateBlock->textures)/sizeof(This->stateBlock->textures[0])
);
return WINED3D_OK; /* Windows accepts overflowing this array ... we do not. */
}
*ppTexture=This->stateBlock->textures[Stage]; *ppTexture=This->stateBlock->textures[Stage];
if (*ppTexture) if (*ppTexture)
IWineD3DBaseTexture_AddRef(*ppTexture); IWineD3DBaseTexture_AddRef(*ppTexture);