Gerald Pfeifer : wined3d: Fix (and simplify) the ATI case in IWineD3DImpl_FillGLCaps.
Alexandre Julliard
julliard at winehq.org
Mon Jun 8 09:44:47 CDT 2009
Module: wine
Branch: master
Commit: 6d1a76fb106b71c18ab0368adb0f877af30c0a5a
URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d1a76fb106b71c18ab0368adb0f877af30c0a5a
Author: Gerald Pfeifer <gerald at pfeifer.com>
Date: Sun Jun 7 14:13:06 2009 +0200
wined3d: Fix (and simplify) the ATI case in IWineD3DImpl_FillGLCaps.
---
dlls/wined3d/directx.c | 18 ++++++------------
1 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index 6013cfe..05443fc 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -615,21 +615,15 @@ static BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info) {
major = minor = 0;
gl_string_cursor = strchr(gl_string, '-');
if (gl_string_cursor) {
- int error = 0;
gl_string_cursor++;
/* Check if version number is of the form x.y.z */
- if (*gl_string_cursor > '9' && *gl_string_cursor < '0')
- error = 1;
- if (!error && *(gl_string_cursor+2) > '9' && *(gl_string_cursor+2) < '0')
- error = 1;
- if (!error && *(gl_string_cursor+4) > '9' && *(gl_string_cursor+4) < '0')
- error = 1;
- if (!error && *(gl_string_cursor+1) != '.' && *(gl_string_cursor+3) != '.')
- error = 1;
-
- /* Mark version number as malformed */
- if (error)
+ if ( *gl_string_cursor < '0' || *gl_string_cursor > '9'
+ || *(gl_string_cursor+1) != '.'
+ || *(gl_string_cursor+2) < '0' || *(gl_string_cursor+2) > '9'
+ || *(gl_string_cursor+3) != '.'
+ || *(gl_string_cursor+4) < '0' || *(gl_string_cursor+4) > '9' )
+ /* Mark version number as malformed */
gl_string_cursor = 0;
}
More information about the wine-cvs
mailing list