Jérôme Gardou : wined3d: Initialize adapter device name even if opengl is not used.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: b7649efb2df134aaac523c8c2e6587a7cff0f1e7
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=b7649efb2df134aaac523c8c2e...

Author: Jérôme Gardou 
Date:   Tue Apr  2 15:04:57 2013 +0200

wined3d: Initialize adapter device name even if opengl is not used.

---

dlls/wined3d/directx.c |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index 6b6bc8e..4b42845 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -5237,6 +5237,8 @@ static BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, UINT ordinal)

static void wined3d_adapter_init_nogl(struct wined3d_adapter *adapter, UINT ordinal)
 {
+    DISPLAY_DEVICEW display_device;
+
     memset(adapter, 0, sizeof(*adapter));
     adapter->ordinal = ordinal;
     adapter->monitorPoint.x = -1;
@@ -5254,6 +5256,11 @@ static void wined3d_adapter_init_nogl(struct wined3d_adapter *adapter, UINT ordi
     adapter->fragment_pipe = &none_fragment_pipe;
     adapter->shader_backend = &none_shader_backend;
     adapter->blitter = &cpu_blit;
+
+    display_device.cb = sizeof(display_device);
+    EnumDisplayDevicesW(NULL, ordinal, &display_device, 0);
+    TRACE("DeviceName: %s\n", debugstr_w(display_device.DeviceName));
+    strcpyW(adapter->DeviceName, display_device.DeviceName);
 }

static void STDMETHODCALLTYPE wined3d_null_wined3d_object_destroyed(void *parent) {}