X-Git-Url: http://git.jankratochvil.net/?a=blobdiff_plain;f=subsys%2Fwin32k%2Fmisc%2Fdriver.c;h=c701f6f1609e1675bd9e62515fd38a82cf46342c;hb=refs%2Ftags%2FHEAD-2003050101;hp=881a1680fa01742d4ace89d3dde09a4c772749f9;hpb=e3ed2d773259cc445c7ff8181ebd934931365328;p=reactos.git

diff --git a/subsys/win32k/misc/driver.c b/subsys/win32k/misc/driver.c
index 881a168..c701f6f 100644
--- a/subsys/win32k/misc/driver.c
+++ b/subsys/win32k/misc/driver.c
@@ -11,14 +11,16 @@
 #include <ddk/ntddk.h>
 #include <windows.h>
 #include <win32k/driver.h>
+#include <win32k/misc.h>
 #include <wchar.h>
-//#include "../../ntoskrnl/include/internal/module.h"
 #include <ddk/winddi.h>
 #include <ddk/ntddvid.h>
 
 #define NDEBUG
 #include <debug.h>
 
+#define DRIVER_TAG TAG('G', 'D', 'R', 'V')
+
 typedef struct _GRAPHICS_DRIVER
 {
   PWSTR  Name;
@@ -32,14 +34,16 @@ static PGRAPHICS_DRIVER  GenericDriver = 0;
 
 BOOL  DRIVER_RegisterDriver(LPCWSTR  Name, PGD_ENABLEDRIVER  EnableDriver)
 {
-  PGRAPHICS_DRIVER  Driver = ExAllocatePool(NonPagedPool, sizeof(*Driver));
+  PGRAPHICS_DRIVER  Driver = ExAllocatePoolWithTag(NonPagedPool, sizeof(*Driver), DRIVER_TAG);
   DPRINT( "DRIVER_RegisterDriver( Name: %S )\n", Name );
   if (!Driver)  return  FALSE;
   Driver->ReferenceCount = 0;
   Driver->EnableDriver = EnableDriver;
   if (Name)
   {
-    Driver->Name = ExAllocatePool(PagedPool, (wcslen(Name) + 1) * sizeof(WCHAR));
+    Driver->Name = ExAllocatePoolWithTag(PagedPool,
+                                         (wcslen(Name) + 1) * sizeof(WCHAR),
+                                         DRIVER_TAG);
     wcscpy(Driver->Name, Name);
     Driver->Next  = DriverList;
     DriverList = Driver;
@@ -56,16 +60,69 @@ BOOL  DRIVER_RegisterDriver(LPCWSTR  Name, PGD_ENABLEDRIVER  EnableDriver)
   return  TRUE;
 }
 
-PGD_ENABLEDRIVER  DRIVER_FindDDIDriver(LPCWSTR  Name)
+PGD_ENABLEDRIVER DRIVER_FindDDIDriver(LPCWSTR Name)
 {
+  static WCHAR DefaultPath[] = L"\\SystemRoot\\System32\\";
+  static WCHAR DefaultExtension[] = L".DLL";
   SYSTEM_LOAD_IMAGE GdiDriverInfo;
   GRAPHICS_DRIVER *Driver = DriverList;
   NTSTATUS Status;
+  WCHAR *FullName;
+  LPCWSTR p;
+  BOOL PathSeparatorFound;
+  BOOL DotFound;
+  UINT Size;
+
+  DotFound = FALSE;  
+  PathSeparatorFound = FALSE;
+  p = Name;
+  while (L'\0' != *p)
+  {
+    if (L'\\' == *p || L'/' == *p)
+    {
+      PathSeparatorFound = TRUE;
+      DotFound = FALSE;
+    }
+    else if (L'.' == *p)
+    {
+      DotFound = TRUE;
+    }
+    p++;
+  }
+
+  Size = (wcslen(Name) + 1) * sizeof(WCHAR);
+  if (! PathSeparatorFound)
+  {
+    Size += sizeof(DefaultPath) - sizeof(WCHAR);
+  }
+  if (! DotFound)
+  {
+    Size += sizeof(DefaultExtension) - sizeof(WCHAR);
+  }
+  FullName = ExAllocatePoolWithTag(PagedPool, Size, DRIVER_TAG);
+  if (NULL == FullName)
+  {
+    DPRINT1("Out of memory\n");
+    return NULL;
+  }
+  if (PathSeparatorFound)
+  {
+    FullName[0] = L'\0';
+  }
+  else
+  {
+    wcscpy(FullName, DefaultPath);
+  }
+  wcscat(FullName, Name);
+  if (! DotFound)
+  {
+    wcscat(FullName, DefaultExtension);
+  }
 
   /* First see if the driver hasn't already been loaded */
-  while (Driver && Name)
+  while (Driver && FullName)
   {
-    if (!_wcsicmp( Driver->Name, Name)) 
+    if (!_wcsicmp( Driver->Name, FullName)) 
     {
       return Driver->EnableDriver;
     }
@@ -73,8 +130,9 @@ PGD_ENABLEDRIVER  DRIVER_FindDDIDriver(LPCWSTR  Name)
   }
 
   /* If not, then load it */
-  RtlInitUnicodeString (&GdiDriverInfo.ModuleName, (LPWSTR)Name);
+  RtlInitUnicodeString (&GdiDriverInfo.ModuleName, (LPWSTR)FullName);
   Status = ZwSetSystemInformation (SystemLoadImage, &GdiDriverInfo, sizeof(SYSTEM_LOAD_IMAGE));
+  ExFreePool(FullName);
   if (!NT_SUCCESS(Status)) return NULL;
 
   DRIVER_RegisterDriver( L"DISPLAY", GdiDriverInfo.EntryPoint);
@@ -169,6 +227,9 @@ HANDLE DRIVER_FindMPDriver(LPCWSTR  Name)
   HANDLE DisplayHandle;
   NTSTATUS Status;
 
+  /* Switch to process context in which handle is to be valid */
+  KeAttachProcess(W32kDeviceProcess);
+
   RtlInitUnicodeStringFromLiteral(&DeviceName, L"\\??\\DISPLAY1");
   InitializeObjectAttributes(&ObjectAttributes,
 			     &DeviceName,
@@ -181,6 +242,9 @@ HANDLE DRIVER_FindMPDriver(LPCWSTR  Name)
 		      &Iosb,
 		      0,
 		      FILE_SYNCHRONOUS_IO_ALERT);
+
+  KeDetachProcess();
+
   if (!NT_SUCCESS(Status))
     {
       DPRINT("ZwOpenFile() failed (Status %lx)\n", Status);