From 2cb3aeb7b9f7eedacf77c562f93c9c7fac1c4eed Mon Sep 17 00:00:00 2001
From: "Erich E. Hoover" <erich.e.hoover@gmail.com>
Date: Mon, 10 Feb 2014 21:27:33 -0700
Subject: [PATCH] ddraw: Return a DLL in szDriver for GetDeviceIdentifier.

---
 dlls/ddraw/ddraw.c            | 2 +-
 dlls/ddraw/tests/ddrawmodes.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c
index 7aea03e406e..c4c0b330535 100644
--- a/dlls/ddraw/ddraw.c
+++ b/dlls/ddraw/ddraw.c
@@ -35,7 +35,7 @@ static BOOL restore_mode;
 /* Device identifier. Don't relay it to WineD3D */
 static const DDDEVICEIDENTIFIER2 deviceidentifier =
 {
-    "display",
+    "vga.dll", /* default 2D driver */
     "DirectDraw HAL",
     { { 0x00010001, 0x00010001 } },
     0, 0, 0, 0,
diff --git a/dlls/ddraw/tests/ddrawmodes.c b/dlls/ddraw/tests/ddrawmodes.c
index 643fe9b0926..2d7123bfb4b 100644
--- a/dlls/ddraw/tests/ddrawmodes.c
+++ b/dlls/ddraw/tests/ddrawmodes.c
@@ -988,6 +988,8 @@ static void testddraw7(void)
 
          if (hr==DD_OK)
          {
+             /* szDriver contains the name of the driver DLL */
+             ok(strstr(pdddi2->szDriver, ".dll")!=NULL, "szDriver does not contain DLL name\n");
              /* check how strings are copied into the structure */
              ok(pdddi2->szDriver[MAX_DDDEVICEID_STRING - 1]==0, "szDriver not cleared\n");
              ok(pdddi2->szDescription[MAX_DDDEVICEID_STRING - 1]==0, "szDescription not cleared\n");
-- 
2.11.4.GIT