Francois Gouget : d3d9/tests: Fix a test failure on Windows XP with the default VGA driver.
Alexandre Julliard
julliard at winehq.org
Tue Nov 5 15:02:32 CST 2013
Module: wine
Branch: master
Commit: b43608721788a6b1c7564603a18cb72dbf5e843f
URL: http://source.winehq.org/git/wine.git/?a=commit;h=b43608721788a6b1c7564603a18cb72dbf5e843f
Author: Francois Gouget <fgouget at free.fr>
Date: Tue Nov 5 19:15:19 2013 +0100
d3d9/tests: Fix a test failure on Windows XP with the default VGA driver.
---
dlls/d3d9/tests/visual.c | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c
index 8d6fe02..a417078 100644
--- a/dlls/d3d9/tests/visual.c
+++ b/dlls/d3d9/tests/visual.c
@@ -216,7 +216,10 @@ static IDirect3DDevice9 *init_d3d9(void)
ok(hr == D3D_OK, "Failed to get adapter identifier description\n");
trace("Driver string: \"%s\"\n", identifier.Driver);
trace("Description string: \"%s\"\n", identifier.Description);
- ok(identifier.Description[0] != '\0', "Empty driver description\n");
+ /* Only Windows XP's default VGA driver should have an empty description */
+ ok(identifier.Description[0] != '\0' ||
+ broken(strcmp(identifier.Driver, "vga.dll") == 0),
+ "Empty driver description\n");
trace("Device name string: \"%s\"\n", identifier.DeviceName);
ok(identifier.DeviceName[0] != '\0', "Empty device name\n");
trace("Driver version %d.%d.%d.%d\n",
More information about the wine-cvs
mailing list