kernel: Add an import lib for krnl386, and stop importing 16-bit functions from kernel32.

.gitignore

@@ -59,6 +59,7 @@ dlls/kernel32/nls/winerr_nor.mc.rc
 dlls/kernel32/nls/winerr_plk.mc.rc
 dlls/kernel32/nls/winerr_ptg.mc.rc
 dlls/libd3dx9.def
+dlls/libkernel.def
 dlls/libwinspool.def
 dlls/libxinput.def
 dlls/msdaps/msdaps.h

dlls/Makefile.in

@@ -27,6 +27,7 @@ STATIC_IMPLIBEXT = $(IMPLIBEXT:def=def.a)
 
 IMPORT_SYMLINKS = \
 	libd3dx9.$(IMPLIBEXT) \
+	libkernel.$(IMPLIBEXT) \
 	libwinspool.$(IMPLIBEXT) \
 	libxinput.$(IMPLIBEXT)
 
@@ -94,6 +95,7 @@ IMPORT_LIBS = \
 	inetcomm/libinetcomm.$(IMPLIBEXT) \
 	iphlpapi/libiphlpapi.$(IMPLIBEXT) \
 	kernel32/libkernel32.$(IMPLIBEXT) \
+	krnl386.exe16/libkernel.$(IMPLIBEXT) \
 	loadperf/libloadperf.$(IMPLIBEXT) \
 	lz32/liblz32.$(IMPLIBEXT) \
 	mapi32/libmapi32.$(IMPLIBEXT) \
@@ -500,6 +502,9 @@ iphlpapi/libiphlpapi.def iphlpapi/libiphlpapi.a: iphlpapi/iphlpapi.spec $(WINEBU
 kernel32/libkernel32.def kernel32/libkernel32.a: kernel32/kernel32.spec $(WINEBUILD)
 	@cd kernel32 && $(MAKE) `basename $@`
 
+krnl386.exe16/libkernel.def krnl386.exe16/libkernel.a: krnl386.exe16/krnl386.exe16.spec $(WINEBUILD)
+	@cd krnl386.exe16 && $(MAKE) `basename $@`
+
 loadperf/libloadperf.def loadperf/libloadperf.a: loadperf/loadperf.spec $(WINEBUILD)
 	@cd loadperf && $(MAKE) `basename $@`
 
@@ -767,6 +772,12 @@ libd3dx9.a: d3dx9_36/libd3dx9.a
 libd3dx9.def: d3dx9_36/libd3dx9.def
 	$(RM) $@ && $(LN_S) d3dx9_36/libd3dx9.def $@
 
+libkernel.a: krnl386.exe16/libkernel.a
+	$(RM) $@ && $(LN_S) krnl386.exe16/libkernel.a $@
+
+libkernel.def: krnl386.exe16/libkernel.def
+	$(RM) $@ && $(LN_S) krnl386.exe16/libkernel.def $@
+
 libwinspool.a: winspool.drv/libwinspool.a
 	$(RM) $@ && $(LN_S) winspool.drv/libwinspool.a $@
 

dlls/commdlg.dll16/Makefile.in

@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = commdlg.dll16
-IMPORTS   = comdlg32 user32 gdi32 kernel32
+IMPORTS   = comdlg32 user32 gdi32 kernel32 kernel
 EXTRADLLFLAGS = -Wb,--subsystem,win16,--main-module,comdlg32.dll
 
 C_SRCS = \

dlls/compobj.dll16/Makefile.in

@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = compobj.dll16
-IMPORTS   = uuid ole32 advapi32 kernel32
+IMPORTS   = uuid ole32 advapi32 kernel32 kernel
 EXTRADLLFLAGS = -Wb,--subsystem,win16,--main-module,ole32.dll
 
 C_SRCS = compobj.c

dlls/ddeml.dll16/Makefile.in

@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = ddeml.dll16
-IMPORTS   = user32 kernel32
+IMPORTS   = user32 kernel32 kernel
 
 EXTRADLLFLAGS = -Wb,--subsystem,win16
 

dlls/gdi.exe16/Makefile.in

@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = gdi.exe16
-IMPORTS   = user32 advapi32 gdi32 kernel32
+IMPORTS   = user32 advapi32 gdi32 kernel32 kernel
 
 EXTRADLLFLAGS = -Wb,--subsystem,win16,--main-module,gdi32.dll,--heap,65520
 EXTRARCFLAGS  = -O res16

dlls/krnl386.exe16/Makefile.in

@@ -3,7 +3,9 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = krnl386.exe16
+IMPORTLIB = kernel
 IMPORTS   = kernel32 ntdll
+EXTRAIMPLIBFLAGS = --subsystem win16
 EXTRADLLFLAGS = -Wb,--subsystem,win16,--dll-name,kernel
 EXTRARCFLAGS  = -O res16
 

dlls/krnl386.exe16/krnl386.exe16.spec

@@ -744,7 +744,7 @@
 # or 'wine_' (for user-visible functions) to avoid namespace conflicts.
 
 # 16-bit relays
-@ cdecl -arch=win32 -private __wine_emulate_instruction(ptr ptr)
+@ cdecl -arch=win32 __wine_emulate_instruction(ptr ptr)
 
 # VxDs
 @ cdecl -arch=win32 -private __wine_vxd_open(wstr long ptr)

dlls/lzexpand.dll16/Makefile.in

@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = lzexpand.dll16
-IMPORTS   = lz32 kernel32
+IMPORTS   = lz32 kernel32 kernel
 EXTRADLLFLAGS = -Wb,--subsystem,win16,--main-module,lz32.dll
 
 C_SRCS = lzexpand.c

dlls/mmsystem.dll16/Makefile.in

@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = mmsystem.dll16
-IMPORTS   = winmm user32 kernel32
+IMPORTS   = winmm user32 kernel32 kernel
 
 EXTRADLLFLAGS = -Wb,--subsystem,win16,--main-module,winmm.dll
 

dlls/msvideo.dll16/Makefile.in

@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = msvideo.dll16
-IMPORTS   = msvfw32 version advapi32 kernel32
+IMPORTS   = msvfw32 version advapi32 kernel32 kernel
 
 EXTRADLLFLAGS = -Wb,--subsystem,win16,--main-module,msvfw32.dll
 

dlls/ntoskrnl.exe/Makefile.in

@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = ntoskrnl.exe
 IMPORTLIB = ntoskrnl.exe
-IMPORTS   = kernel32 ntdll
+IMPORTS   = kernel32 kernel ntdll
 
 C_SRCS = \
 	ntoskrnl.c

dlls/ole2.dll16/Makefile.in

@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = ole2.dll16
-IMPORTS   = uuid ole32 user32 gdi32 kernel32
+IMPORTS   = uuid ole32 user32 gdi32 kernel32 kernel
 EXTRADLLFLAGS = -Wb,--subsystem,win16,--main-module,ole32.dll
 
 C_SRCS = \

dlls/ole2disp.dll16/Makefile.in

@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = ole2disp.dll16
-IMPORTS   = kernel32
+IMPORTS   = kernel32 kernel
 EXTRADLLFLAGS = -Wb,--subsystem,win16,--main-module,oleaut32.dll
 
 C_SRCS = ole2disp.c

dlls/olecli.dll16/Makefile.in

@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = olecli.dll16
-IMPORTS   = gdi32 kernel32
+IMPORTS   = gdi32 kernel32 kernel
 EXTRADLLFLAGS = -Wb,--subsystem,win16,--main-module,olecli32.dll
 
 C_SRCS = olecli.c

dlls/setupx.dll16/Makefile.in

@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = setupx.dll16
-IMPORTS   = setupapi user32 advapi32 kernel32
+IMPORTS   = setupapi user32 advapi32 kernel32 kernel
 
 EXTRADLLFLAGS = -Wb,--subsystem,win16,--main-module,setupapi.dll
 

dlls/shell.dll16/Makefile.in

@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = shell.dll16
-IMPORTS   = shell32 user32 advapi32 kernel32
+IMPORTS   = shell32 user32 advapi32 kernel32 kernel
 
 EXTRADLLFLAGS = -Wb,--subsystem,win16,--main-module,shell32.dll
 EXTRARCFLAGS  = -O res16

dlls/storage.dll16/Makefile.in

@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = storage.dll16
-IMPORTS   = uuid ole32 kernel32 ntdll
+IMPORTS   = uuid ole32 kernel32 kernel ntdll
 EXTRADLLFLAGS = -Wb,--subsystem,win16,--main-module,ole32.dll
 
 C_SRCS = storage.c

dlls/system.drv16/Makefile.in

@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = system.drv16
-IMPORTS   = kernel32 ntdll
+IMPORTS   = kernel32 kernel ntdll
 EXTRADLLFLAGS = -Wb,--subsystem,win16
 
 C_SRCS = system.c

dlls/toolhelp.dll16/Makefile.in

@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = toolhelp.dll16
-IMPORTS   = kernel32 ntdll
+IMPORTS   = kernel32 kernel ntdll
 EXTRADLLFLAGS = -Wb,--subsystem,win16
 
 C_SRCS = toolhelp.c

dlls/typelib.dll16/Makefile.in

@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = typelib.dll16
-IMPORTS   = oleaut32 advapi32 kernel32
+IMPORTS   = oleaut32 advapi32 kernel32 kernel
 EXTRADLLFLAGS = -Wb,--subsystem,win16,--main-module,oleaut32.dll
 
 C_SRCS = typelib.c

dlls/user.exe16/Makefile.in

@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = user.exe16
-IMPORTS   = user32 gdi32 kernel32 ntdll
+IMPORTS   = user32 gdi32 kernel32 kernel ntdll
 EXTRADLLFLAGS = -Wb,--subsystem,win16,--main-module,user32.dll,--heap,65520
 EXTRARCFLAGS  = -O res16
 

dlls/ver.dll16/Makefile.in

@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = ver.dll16
-IMPORTS   = version lz32 kernel32
+IMPORTS   = version lz32 kernel32 kernel
 
 EXTRADLLFLAGS = -Wb,--subsystem,win16,--main-module,version.dll
 

dlls/w32skrnl/Makefile.in

@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = w32skrnl.dll
-IMPORTS   = kernel32 ntdll
+IMPORTS   = kernel32 kernel ntdll
 
 C_SRCS = w32skernel.c
 

dlls/w32sys.dll16/Makefile.in

@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = w32sys.dll16
-IMPORTS   = kernel32
+IMPORTS   = kernel32 kernel
 EXTRADLLFLAGS = -Wb,--subsystem,win16,--main-module,w32skrnl.dll
 
 C_SRCS = w32sys.c

dlls/win32s16.dll16/Makefile.in

@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = win32s16.dll16
-IMPORTS   = kernel32
+IMPORTS   = kernel32 kernel
 EXTRADLLFLAGS = -Wb,--subsystem,win16,--main-module,w32skrnl.dll
 
 C_SRCS = win32s16.c

dlls/winaspi.dll16/Makefile.in

@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = winaspi.dll16
-IMPORTS   = advapi32 kernel32
+IMPORTS   = advapi32 kernel32 kernel
 EXTRADLLFLAGS = -Wb,--subsystem,win16,--main-module,wnaspi32.dll
 
 C_SRCS = winaspi.c

dlls/winedos/Makefile.in

@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = winedos.dll
-IMPORTS   = user32 kernel32 ntdll
+IMPORTS   = user32 kernel32 kernel ntdll
 
 C_SRCS = \
 	devices.c \

dlls/wing.dll16/Makefile.in

@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = wing.dll16
-IMPORTS   = gdi32 kernel32
+IMPORTS   = gdi32 kernel32 kernel
 EXTRADLLFLAGS = -Wb,--subsystem,win16
 
 C_SRCS = wing.c

dlls/winsock.dll16/Makefile.in

@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = winsock.dll16
-IMPORTS   = ws2_32 kernel32
+IMPORTS   = ws2_32 kernel32 kernel
 DELAYIMPORTS = user32
 EXTRADLLFLAGS = -Wb,--subsystem,win16,--main-module,ws2_32.dll
 

dlls/wow32/Makefile.in

@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = wow32.dll
 IMPORTLIB = wow32
-IMPORTS   = kernel32
+IMPORTS   = kernel32 kernel
 
 C_SRCS = wow_main.c
 

programs/winevdm/Makefile.in

@@ -5,7 +5,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = winevdm.exe
 APPMODE   = -mconsole
-IMPORTS   = user32 kernel32
+IMPORTS   = user32 kernel32 kernel
 
 C_SRCS = \
 	winevdm.c

programs/winhelp.exe16/Makefile.in

@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = winhelp.exe16
 APPMODE   = -mwindows -Wb,--subsystem,win16
-IMPORTS   = kernel32
+IMPORTS   = kernel32 kernel
 
 C_SRCS = winhelp.c
 

programs/winoldap.mod16/Makefile.in

@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = winoldap.mod16
 APPMODE   = -mwindows -Wb,--subsystem,win16
-IMPORTS   = kernel32 ntdll
+IMPORTS   = kernel32 kernel ntdll
 
 C_SRCS = winoldap.c