From d8e34ebc21b131701bf7370c319e997d1aef1c4e Mon Sep 17 00:00:00 2001
From: Alexandre Julliard <julliard@winehq.org>
Date: Tue, 19 Aug 2003 03:27:45 +0000
Subject: [PATCH] Renamed system.dll to system.drv.

---
 dlls/Makefile.in                             | 4 ++--
 dlls/kernel/.cvsignore                       | 2 +-
 dlls/kernel/Makefile.in                      | 4 ++--
 dlls/kernel/kernel_main.c                    | 6 +++---
 dlls/kernel/{system.spec => system.drv.spec} | 0
 loader/loadorder.c                           | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)
 rename dlls/kernel/{system.spec => system.drv.spec} (100%)

diff --git a/dlls/Makefile.in b/dlls/Makefile.in
index a2298753c38..eea9cd4837e 100644
--- a/dlls/Makefile.in
+++ b/dlls/Makefile.in
@@ -178,7 +178,7 @@ WIN16_FILES = \
 	sound.dll$(DLLEXT) \
 	storage.dll$(DLLEXT) \
 	stress.dll$(DLLEXT) \
-	system.dll$(DLLEXT) \
+	system.drv$(DLLEXT) \
 	toolhelp.dll$(DLLEXT) \
 	typelib.dll$(DLLEXT) \
 	user.exe$(DLLEXT) \
@@ -438,7 +438,7 @@ joystick.drv$(DLLEXT): winmm/joystick/joystick.drv$(DLLEXT)
 	$(RM) $@ && $(LN_S) winmm/joystick/joystick.drv$(DLLEXT) $@
 
 kernel32.dll$(DLLEXT) comm.dll$(DLLEXT) krnl386.exe$(DLLEXT) \
-  stress.dll$(DLLEXT) system.dll$(DLLEXT) toolhelp.dll$(DLLEXT) \
+  stress.dll$(DLLEXT) system.drv$(DLLEXT) toolhelp.dll$(DLLEXT) \
   win87em.dll$(DLLEXT) windebug.dll$(DLLEXT): kernel/kernel32.dll$(DLLEXT)
 	$(RM) $@ && $(LN_S) kernel/kernel32.dll$(DLLEXT) $@
 
diff --git a/dlls/kernel/.cvsignore b/dlls/kernel/.cvsignore
index c1d7f27b931..fae603de492 100644
--- a/dlls/kernel/.cvsignore
+++ b/dlls/kernel/.cvsignore
@@ -6,7 +6,7 @@ kernel32.spec.c
 kernel32.spec.def
 krnl386.exe.spec.c
 stress.spec.c
-system.spec.c
+system.drv.spec.c
 toolhelp.spec.c
 version16.res
 win87em.spec.c
diff --git a/dlls/kernel/Makefile.in b/dlls/kernel/Makefile.in
index ac7449b1cdf..4a8ca0a200a 100644
--- a/dlls/kernel/Makefile.in
+++ b/dlls/kernel/Makefile.in
@@ -5,7 +5,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = kernel32.dll
 IMPORTS   = ntdll
-ALTNAMES  = krnl386.exe comm.dll stress.dll system.dll toolhelp.dll windebug.dll win87em.dll
+ALTNAMES  = krnl386.exe comm.dll stress.dll system.drv toolhelp.dll windebug.dll win87em.dll
 LDIMPORTS = ntdll.dll
 EXTRALIBS = $(LIBUNICODE)
 DLLMAIN   = MAIN_KernelInit
@@ -14,7 +14,7 @@ SPEC_SRCS16 = \
 	comm.spec \
 	krnl386.exe.spec \
 	stress.spec \
-	system.spec \
+	system.drv.spec \
 	toolhelp.spec \
 	win87em.spec \
 	windebug.spec
diff --git a/dlls/kernel/kernel_main.c b/dlls/kernel/kernel_main.c
index 0163ece960e..b01f4d1781e 100644
--- a/dlls/kernel/kernel_main.c
+++ b/dlls/kernel/kernel_main.c
@@ -157,10 +157,10 @@ static BOOL process_attach(void)
         NE_SetEntryPoint( hModule, 193, DOSMEM_BiosDataSeg ); /* KERNEL.193: __0040H */
         NE_SetEntryPoint( hModule, 194, DOSMEM_BiosSysSeg );  /* KERNEL.194: __F000H */
 #undef SET_ENTRY_POINT
-    }
 
-    /* Force loading of some dlls */
-    LoadLibrary16( "system" );
+        /* Force loading of some dlls */
+        LoadLibrary16( "system.drv" );
+    }
 
     /* Create 16-bit task */
     TASK_CreateMainTask();
diff --git a/dlls/kernel/system.spec b/dlls/kernel/system.drv.spec
similarity index 100%
rename from dlls/kernel/system.spec
rename to dlls/kernel/system.drv.spec
diff --git a/loader/loadorder.c b/loader/loadorder.c
index fe8e76dbf82..840945fccd5 100644
--- a/loader/loadorder.c
+++ b/loader/loadorder.c
@@ -67,7 +67,7 @@ static module_loadorder_t default_order_list[] =
     { "mouse",        { LOADORDER_BI, 0, 0 } },
     { "ntdll",        { LOADORDER_BI, 0, 0 } },
     { "odbc32",       { LOADORDER_BI, 0, 0 } },
-    { "system",       { LOADORDER_BI, 0, 0 } },
+    { "system.drv",   { LOADORDER_BI, 0, 0 } },
     { "toolhelp",     { LOADORDER_BI, 0, 0 } },
     { "ttydrv",       { LOADORDER_BI, 0, 0 } },
     { "user.exe",     { LOADORDER_BI, 0, 0 } },