Marcus Meissner : wined3d: Don't just print a FIXME on error, handle it ( Coverity).
Alexandre Julliard
julliard at winehq.org
Mon Jun 13 11:49:16 CDT 2011
Module: wine
Branch: master
Commit: 2bcd4398182df76ea40ce84651d7b554f3660b9a
URL: http://source.winehq.org/git/wine.git/?a=commit;h=2bcd4398182df76ea40ce84651d7b554f3660b9a
Author: Marcus Meissner <marcus at jet.franken.de>
Date: Sat Jun 11 18:05:02 2011 +0200
wined3d: Don't just print a FIXME on error, handle it (Coverity).
---
dlls/wined3d/device.c | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index 5bc5a08..30d5b95 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -1872,12 +1872,13 @@ HRESULT CDECL wined3d_device_multiply_transform(struct wined3d_device *device,
* below means it will be recorded in a state block change, but it
* works regardless where it is recorded.
* If this is found to be wrong, change to StateBlock. */
+ if (state > HIGHEST_TRANSFORMSTATE)
+ {
+ WARN("Unhandled transform state %#x.\n", state);
+ return WINED3D_OK;
+ }
- if (state <= HIGHEST_TRANSFORMSTATE)
- mat = &device->updateStateBlock->state.transforms[state];
- else
- FIXME("Unhandled transform state %#x.\n", state);
-
+ mat = &device->updateStateBlock->state.transforms[state];
multiply_matrix(&temp, mat, matrix);
/* Apply change via set transform - will reapply to eg. lights this way. */
More information about the wine-cvs
mailing list