Re-use the loader directory for the main wine loader, and get rid of

the miscemu directory.

DEVELOPERS-HINTS

@@ -169,7 +169,7 @@ Support programs, libraries, etc:
 	libs/uuid/		- Windows-compatible UUID numbers
 	libs/wine/		- Wine bootstrap library
 	libs/wpp/		- C preprocessor
-	miscemu/		- the main Wine program
+	loader/			- the main Wine loader
 	server/			- the Wine server
 	tools/			- relay code builder, resource compiler, etc.
 
@@ -181,7 +181,6 @@ Note: these directories will ultimately get moved into their
 respective dlls.
 
 	files/			- KERNEL file I/O
-	loader/			- KERNEL loader code
 	memory/			- KERNEL memory management
 	misc/			- KERNEL shell, registry, winsock, etc.
 	msdos/			- KERNEL DOS support

Makefile.in

@@ -32,7 +32,7 @@ SUBDIRS = \
 	documentation \
 	include \
 	libs \
-	miscemu \
+	loader \
 	programs \
 	server \
 	tools
@@ -40,7 +40,7 @@ SUBDIRS = \
 # Sub-directories to install for install-lib
 INSTALLLIBSUBDIRS = \
 	documentation \
-	miscemu \
+	loader \
 	programs \
 	server
 
@@ -105,13 +105,13 @@ uninstall:: $(INSTALLBOTHSUBDIRS:%=%/__uninstall__)
 
 all: $(SUBDIRS)
 dlls: libs tools
-miscemu server: libs tools
+loader server: libs tools
 programs: dlls libs tools
 tools: libs
 
 dlls/__install-lib__ dlls/__install-dev__: libs tools
 libs/__install-lib__ libs/__install-dev__: libs
-miscemu/__install__ server/__install__: libs tools
+loader/__install__ server/__install__: libs tools
 programs/__install__: libs tools dlls/__install-lib__
 tools/__install__: tools
 

configure.ac

@@ -1387,7 +1387,6 @@ WINE_CONFIG_EXTRA_DIR(files)
 WINE_CONFIG_EXTRA_DIR(graphics)
 WINE_CONFIG_EXTRA_DIR(graphics/x11drv)
 WINE_CONFIG_EXTRA_DIR(include/wine)
-WINE_CONFIG_EXTRA_DIR(loader)
 WINE_CONFIG_EXTRA_DIR(memory)
 WINE_CONFIG_EXTRA_DIR(misc)
 WINE_CONFIG_EXTRA_DIR(msdos)
@@ -1568,7 +1567,7 @@ libs/unicode/Makefile
 libs/uuid/Makefile
 libs/wine/Makefile
 libs/wpp/Makefile
-miscemu/Makefile
+loader/Makefile
 programs/Makefile
 programs/avitools/Makefile
 programs/clock/Makefile

tools/winapi/msvcmaker

@@ -88,7 +88,7 @@ sub read_spec_file {
 }
 
 my @gdi32_dirs = qw(dlls/gdi/enhmfdrv dlls/gdi/mfdrv graphics objects);
-my @ntdll_dirs = qw(files loader/ne loader memory misc msdos scheduler win32);
+my @ntdll_dirs = qw(files memory misc msdos);
 my @user32_dirs = qw(controls dlls/user/dde windows);
 
 push @makefile_in_files, "tools/winebuild/Makefile.in";

tools/winapi_check/modules.dat

@@ -199,25 +199,17 @@ dlls/iphlpapi
 
 dlls/kernel
 files
-loader/ne
-loader
 memory
 misc
 msdos
-scheduler
-win32
 
 % dlls/kernel/kernel32.spec
 
 dlls/kernel
 files
-loader/ne
-loader
 memory
 msdos
 misc
-scheduler
-win32
 
 % dlls/mapi32/mapi32.spec
 
@@ -263,8 +255,6 @@ misc
 % dlls/kernel/toolhelp.spec
 
 dlls/kernel
-loader/ne
-loader
 memory
 
 % dlls/kernel/win87em.spec
@@ -342,8 +332,6 @@ dlls/netapi32
 % dlls/ntdll/ntdll.spec
 
 dlls/ntdll
-misc
-scheduler
 
 % dlls/odbc32/odbc32.spec
 
@@ -534,7 +522,6 @@ windows
 controls
 dlls/user
 dlls/user/dde
-loader
 objects
 windows
 

tools/winewrapper

@@ -70,7 +70,7 @@ else
 fi
 WINEDLLPATH="$topdir/dlls:$topdir/programs"
 WINESERVER="$topdir/server/wineserver"
-WINELOADER="$topdir/miscemu/wine"
+WINELOADER="$topdir/loader/wine"
 export LD_LIBRARY_PATH WINEDLLPATH WINESERVER WINELOADER
 
 # any local settings ?