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

wined3d: Better version string parsing for VENDOR_NVIDIA in 

IWineD3DImpl_FillGLCaps.
This commit is contained in:
H. Verbeet 2006-01-19 12:39:37 +01:00 committed by Alexandre Julliard
parent a9f96938dc
commit b884072687
1 changed files with 31 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
dlls/wined3d/directx.c
View File

@ -268,30 +268,38 @@ static BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info, Display* display)
switch (gl_info->gl_vendor) { switch (gl_info->gl_vendor) {
case VENDOR_NVIDIA: case VENDOR_NVIDIA:
gl_string_cursor = strstr(gl_string, "NVIDIA"); gl_string_cursor = strstr(gl_string, "NVIDIA");
if (!gl_string_cursor) {
ERR_(d3d_caps)("Invalid nVidia version string: %s\n", debugstr_a(gl_string));
break;
}
gl_string_cursor = strstr(gl_string_cursor, " "); gl_string_cursor = strstr(gl_string_cursor, " ");
while (*gl_string_cursor && ' ' == *gl_string_cursor) ++gl_string_cursor; if (!gl_string_cursor) {
if (*gl_string_cursor) { ERR_(d3d_caps)("Invalid nVidia version string: %s\n", debugstr_a(gl_string));
char tmp[16]; break;
int cursor = 0; }
while (*gl_string_cursor == ' ') {
++gl_string_cursor;
}
if (!*gl_string_cursor) {
ERR_(d3d_caps)("Invalid nVidia version string: %s\n", debugstr_a(gl_string));
break;
}
major = atoi(gl_string_cursor);
while (*gl_string_cursor <= '9' && *gl_string_cursor >= '0') { while (*gl_string_cursor <= '9' && *gl_string_cursor >= '0') {
tmp[cursor++] = *gl_string_cursor;
++gl_string_cursor; ++gl_string_cursor;
} }
tmp[cursor] = 0;
major = atoi(tmp);
if (*gl_string_cursor != '.') WARN_(d3d_caps)("malformed GL_VERSION (%s)\n", debugstr_a(gl_string)); if (*gl_string_cursor++ != '.') {
++gl_string_cursor; ERR_(d3d_caps)("Invalid nVidia version string: %s\n", debugstr_a(gl_string));
break;
}
minor = atoi(gl_string_cursor);
cursor = 0;
while (*gl_string_cursor <= '9' && *gl_string_cursor >= '0') {
tmp[cursor++] = *gl_string_cursor;
++gl_string_cursor;
}
tmp[cursor] = 0;
minor = atoi(tmp);
}
break; break;
case VENDOR_ATI: case VENDOR_ATI: