Roderick Colenbrander : wined3d: Return generic info for unhandled devices/ drivers.
Alexandre Julliard
julliard at winehq.org
Wed Sep 8 13:32:11 CDT 2010
Module: wine
Branch: master
Commit: d7472026a0ea37a9c9f7b11b820efa700ef3f19d
URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7472026a0ea37a9c9f7b11b820efa700ef3f19d
Author: Roderick Colenbrander <thunderbird2k at gmail.com>
Date: Wed Sep 8 00:20:11 2010 +0200
wined3d: Return generic info for unhandled devices/drivers.
---
dlls/wined3d/directx.c | 3 ++-
dlls/wined3d/wined3d_private.h | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index bf75ca6..f51f968 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -1103,7 +1103,7 @@ static void init_driver_info(struct wined3d_driver_info *driver_info,
OSVERSIONINFOW os_version;
WORD driver_os_version;
unsigned int i;
- enum wined3d_display_driver driver = DRIVER_NVIDIA_TNT;
+ enum wined3d_display_driver driver = DRIVER_UNKNOWN;
enum wined3d_driver_model driver_model;
const struct driver_version_information *version_info;
@@ -1220,6 +1220,7 @@ static void init_driver_info(struct wined3d_driver_info *driver_info,
else
{
driver_info->description = "Direct3D HAL";
+ driver_info->name = "Display";
driver_info->version_high = MAKEDWORD_VERSION(driver_os_version, 15);
driver_info->version_low = MAKEDWORD_VERSION(8, 6); /* Nvidia RIVA TNT, arbitrary */
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index ec989fd..30a5ea5 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -1244,7 +1244,8 @@ enum wined3d_display_driver
DRIVER_NVIDIA_TNT,
DRIVER_NVIDIA_GEFORCE2MX,
DRIVER_NVIDIA_GEFORCEFX,
- DRIVER_NVIDIA_GEFORCE6
+ DRIVER_NVIDIA_GEFORCE6,
+ DRIVER_UNKNOWN
};
enum wined3d_driver_model
More information about the wine-cvs
mailing list