dlls/d3d8/device.c and friends -- remove dead code (RESEND)
Gerald Pfeifer
gerald at pfeifer.com
Tue Jan 1 10:46:18 CST 2008
I'd like to ping this one because after my patches today it is a
main inhibitor for us to enable -Wtype-limits (where applicable).
---------- Forwarded message ----------
From: Gerald Pfeifer <gerald at pfeifer.com>
To: <wine-patches at winehq.org>
Date: Mon, 3 Dec 2007 22:30:04 +0100 (CET)
Subject: dlls/d3d8/device.c and friends -- remove dead code
This is the same code in all three instances, and in all of those
MultisampleQuality is an unsigned type, so this check can never
trigger, plus we have a smilar FIXME for the > 0 case below which
thus catches the special case.
Gerald
ChangeLog:
Remove dead code.
Index: dlls/d3d8/device.c
===================================================================
RCS file: /home/wine/wine/dlls/d3d8/device.c,v
retrieving revision 1.238
diff -u -3 -p -r1.238 device.c
--- dlls/d3d8/device.c 20 Nov 2007 16:56:21 -0000 1.238
+++ dlls/d3d8/device.c 3 Dec 2007 20:27:36 -0000
@@ -635,11 +635,6 @@ static HRESULT WINAPI IDirect3DDevice8Im
IDirect3DSurface8Impl *object;
IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface;
TRACE("(%p) Relay\n", This);
- if(MultisampleQuality < 0) {
- FIXME("MultisampleQuality out of range %d, substituting 0\n", MultisampleQuality);
- /*FIXME: Find out what windows does with a MultisampleQuality < 0 */
- MultisampleQuality=0;
- }
if(MultisampleQuality > 0){
FIXME("MultisampleQuality set to %d, substituting 0\n" , MultisampleQuality);
@@ -351,11 +351,6 @@ static HRESULT WINAPI IDirect3DDevice9I
IDirect3DSurface9Impl *object;
IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface;
TRACE("(%p) Relay\n", This);
- if(MultisampleQuality < 0) {
- FIXME("MultisampleQuality out of range %d, substituting 0\n", MultisampleQuality);
- /*FIXME: Find out what windows does with a MultisampleQuality < 0 */
- MultisampleQuality=0;
- }
if(MultisampleQuality > 0){
FIXME("MultisampleQuality set to %d, bstituting 0\n", MultisampleQuality);
Index: dlls/wined3d/device.c
===================================================================
RCS file: /home/wine/wine/dlls/wined3d/device.c,v
retrieving revision 1.721
diff -u -3 -p -r1.721 device.c
--- dlls/wined3d/device.c 3 Dec 2007 15:19:18 -0000 1.721
+++ dlls/wined3d/device.c 3 Dec 2007 20:27:38 -0000
@@ -700,11 +700,6 @@ static HRESULT WINAPI IWineD3DDeviceImp
*This flag has the same behavior as the constant, D3DPRESENTFLAG_DISCARD_DEPTHSTENCIL, in D3DPRESENTFLAG.
***************************/
- if(MultisampleQuality < 0) {
- FIXME("Invalid multisample level %d\n", MultisampleQuality);
- return WINED3DERR_INVALIDCALL; /* TODO: Check that this is the case! */
- }
-
if(MultisampleQuality > 0) {
FIXME("MultisampleQuality set to %d, substituting 0\n", MultisampleQuality);
MultisampleQuality=0;
More information about the wine-patches
mailing list