From fccf1c26a72577a5e446a78bcd3a0bfee2bd9aed Mon Sep 17 00:00:00 2001
From: Jason Filby <jason.filby@gmail.com>
Date: Sun, 2 Apr 2000 13:09:50 +0000
Subject: [PATCH] All video related files now loaded by win32k

svn path=/trunk/; revision=1100
---
 reactos/ntoskrnl/ldr/loader.c        | 11 ++---------
 reactos/subsys/win32k/main/dllmain.c |  8 ++++++--
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/reactos/ntoskrnl/ldr/loader.c b/reactos/ntoskrnl/ldr/loader.c
index 4aca0e1b014..e6c13edf747 100644
--- a/reactos/ntoskrnl/ldr/loader.c
+++ b/reactos/ntoskrnl/ldr/loader.c
@@ -1,4 +1,4 @@
-/* $Id: loader.c,v 1.51 2000/03/22 18:35:56 dwelch Exp $
+/* $Id: loader.c,v 1.52 2000/04/02 13:09:50 jfilby Exp $
  * 
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -200,14 +200,7 @@ VOID LdrLoadAutoConfigDrivers (VOID)
 	 * Raw console driver
 	 */
 	LdrLoadAutoConfigDriver( L"blue.sys" );
-        /*
-         * VideoPort driver
-         */
-        LdrLoadAutoConfigDriver( L"vidport.sys" );
-        /*
-         * VGA Miniport driver
-         */
-//        LdrLoadAutoConfigDriver( L"vgamp.sys" ); moving to win32k
+
 //   LdrLoadAutoConfigDriver(L"minixfs.sys");
 }
 
diff --git a/reactos/subsys/win32k/main/dllmain.c b/reactos/subsys/win32k/main/dllmain.c
index a8b6b170c75..9b08f846910 100644
--- a/reactos/subsys/win32k/main/dllmain.c
+++ b/reactos/subsys/win32k/main/dllmain.c
@@ -1,4 +1,4 @@
-/* $Id: dllmain.c,v 1.13 2000/02/22 20:53:11 ekohl Exp $
+/* $Id: dllmain.c,v 1.14 2000/04/02 13:09:50 jfilby Exp $
  * 
  *  Entry Point for win32k.sys
  */
@@ -57,7 +57,11 @@ BOOLEAN
 STDCALL
 W32kInitialize (VOID)
 {
-	DbgPrint("W32kInitialize called\n");
+	UNICODE_STRING DriverNameW;
+
+	// FIXME: Retrieve name from registry
+	RtlInitUnicodeString (&DriverNameW, L"\\??\\C:\\reactos\\system32\\drivers\\vidport.sys");
+	EngLoadImage(&DriverNameW);
 
 	return TRUE;
 }