Erich E. Hoover : ddraw: Return a DLL in szDriver for GetDeviceIdentifier.

[Alexandre Julliard]

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

Author: Erich E. Hoover 
Date:   Mon Feb 10 21:27:33 2014 -0700

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 7aea03e..c4c0b33 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 643fe9b..2d7123b 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");