Added import of ntdll.

debugger/Makefile.in

@@ -5,7 +5,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = none
 PROGRAMS  = winedbg
-IMPORTS   = user32 gdi32 advapi32 kernel32
+IMPORTS   = user32 gdi32 advapi32 kernel32 ntdll
 
 C_SRCS = \
 	break.c \

dlls/advapi32/Makefile.in

@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = advapi32
 SOVERSION = 1.0
-IMPORTS   = kernel32
+IMPORTS   = kernel32 ntdll
 
 C_SRCS = \
 	advapi.c \

dlls/commdlg/Makefile.in

@@ -5,7 +5,7 @@ VPATH     = @srcdir@
 MODULE    = comdlg32
 SOVERSION = 1.0
 ALTNAMES  = commdlg
-IMPORTS   = shell32 shlwapi comctl32 user32 winspool.drv gdi32 kernel32
+IMPORTS   = shell32 shlwapi comctl32 user32 winspool.drv gdi32 kernel32 ntdll
 
 C_SRCS = \
 	cdlg32.c \

dlls/crtdll/Makefile.in

@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = crtdll
 SOVERSION = 1.0
-IMPORTS   = kernel32
+IMPORTS   = kernel32 ntdll
 
 C_SRCS = \
 	crtdll_main.c \

dlls/dciman32/Makefile.in

@@ -4,6 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = dciman32
 SOVERSION = 1.0
+IMPORTS   = ntdll
 
 C_SRCS = dciman_main.c
 

dlls/dciman32/dciman32.spec

 name	dciman32
 type	win32
 
+import	ntdll.dll
+
 @ stub    DCIBeginAccess
 @ stub    DCICloseProvider
 @ stub    DCICreateOffscreen

dlls/kernel/Makefile.in

@@ -5,6 +5,7 @@ VPATH     = @srcdir@
 MODULE    = kernel32
 SOVERSION = 1.0
 ALTNAMES  = comm kernel stress system toolhelp windebug win87em wprocs
+IMPORTS   = ntdll
 
 C_SRCS = \
 	comm.c \

dlls/msnet32/Makefile.in

@@ -4,6 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = msnet32
 SOVERSION = 1.0
+IMPORTS   = ntdll
 
 C_SRCS = msnet_main.c
 

dlls/msnet32/msnet32.spec

 name msnet32
 type win32
 
+import ntdll.dll
+
   1 stub MSNET32_1
   2 stub MSNET32_2
   3 stub MSNET32_3

dlls/odbc32/Makefile.in

@@ -4,6 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = odbc32
 SOVERSION = 1.0
+IMPORTS   = ntdll
 
 C_SRCS = \
 	proxyodbc.c 

dlls/odbc32/odbc32.spec

@@ -2,6 +2,8 @@ name	odbc32
 type	win32
 init    MAIN_OdbcInit
 
+import	ntdll.dll
+
 001 stdcall SQLAllocConnect(long ptr) SQLAllocConnect
 002 stdcall SQLAllocEnv(ptr)  SQLAllocEnv
 003 stdcall SQLAllocStmt(long ptr) SQLAllocStmt

dlls/ole32/Makefile.in

@@ -5,7 +5,7 @@ VPATH     = @srcdir@
 MODULE    = ole32
 SOVERSION = 1.0
 ALTNAMES  = ole2 ole2nls ole2conv ole2prox ole2thk storage compobj
-IMPORTS   = advapi32 user32 gdi32 rpcrt4 kernel32
+IMPORTS   = advapi32 user32 gdi32 rpcrt4 kernel32 ntdll
 
 C_SRCS = \
 	antimoniker.c \

dlls/oledlg/Makefile.in

@@ -4,6 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = oledlg
 SOVERSION = 1.0
+IMPORTS   = ntdll
 
 C_SRCS = \
 	oledlg_main.c

dlls/oledlg/oledlg.spec

 name	oledlg
 type	win32
 
+import	ntdll.dll
+
   1 stdcall OleUIAddVerbMenuA(ptr str long long long long long long ptr) OleUIAddVerbMenuA
   2 stdcall OleUICanConvertOrActivateAs(ptr long long) OleUICanConvertOrActivateAs
   3 stdcall OleUIInsertObjectA(ptr) OleUIInsertObjectA

dlls/olesvr/Makefile.in

@@ -5,6 +5,7 @@ VPATH     = @srcdir@
 MODULE    = olesvr32
 SOVERSION = 1.0
 ALTNAMES  = olesvr
+IMPORTS   = ntdll
 
 C_SRCS = \
 	olesvr_main.c

dlls/olesvr/olesvr32.spec

 name	olesvr32
 type	win32
 
+import	ntdll.dll
+
  1 stub WEP
  2 stdcall OleRegisterServer(str ptr ptr long long) OleRegisterServer
  3 stub OleRevokeServer

dlls/rasapi32/Makefile.in

@@ -5,6 +5,7 @@ VPATH     = @srcdir@
 MODULE    = rasapi32
 SOVERSION = 1.0
 ALTNAMES  = rasapi16
+IMPORTS   = ntdll
 
 C_SRCS = rasapi.c 
 

dlls/rasapi32/rasapi32.spec

 name	rasapi32
 type	win32
 
+import	ntdll.dll
+
 500 stub	RnaEngineRequest
 501 stub	DialEngineRequest
 502 stub	SuprvRequest

dlls/rpcrt4/Makefile.in

@@ -4,6 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = rpcrt4
 SOVERSION = 1.0
+IMPORTS   = ntdll
 
 C_SRCS = \
 	rpcrt4_main.c

dlls/rpcrt4/rpcrt4.spec

@@ -2,6 +2,7 @@ name	rpcrt4
 type	win32
 init	RPCRT4_LibMain
 
+import	ntdll.dll
 
 @ stdcall UuidCreate(ptr) UuidCreate
 @ stdcall RpcStringFreeA(ptr) RpcStringFreeA

dlls/user/Makefile.in

@@ -5,7 +5,7 @@ VPATH     = @srcdir@
 MODULE    = user32
 SOVERSION = 1.0
 ALTNAMES  = user keyboard ddeml display mouse
-IMPORTS   = gdi32 advapi32 kernel32
+IMPORTS   = gdi32 advapi32 kernel32 ntdll
 
 C_SRCS = \
 	bidi16.c \
@@ -42,7 +42,7 @@ EXTRASUBDIRS = \
 
 @MAKE_DLL_RULES@
 
-$(EXTRA_OBJS): $(TOOLSUBDIRS) dummy
+$(EXTRA_OBJS): dummy
 	@cd `dirname $@` && $(MAKE) `basename $@`
 
 # Special rules for 16-bit resource files

dlls/winsock/Makefile.in

@@ -5,7 +5,7 @@ VPATH     = @srcdir@
 MODULE    = ws2_32
 SOVERSION = 1.0
 ALTNAMES  = winsock
-IMPORTS   = user32 kernel32
+IMPORTS   = user32 kernel32 ntdll
 
 C_SRCS = \
 	async.c \

libtest/Makefile.in

@@ -26,35 +26,35 @@ all: $(PROGRAMS)
 @MAKE_RULES@
 
 expand: expand.o expand.spec.o
-	$(CC) -o expand $+ -L$(DLLDIR) -llz32 $(DLL_LINK) $(LIBS)
+	$(CC) -o expand $+ -L$(DLLDIR) -llz32 -lntdll $(DLL_LINK) $(LIBS)
 
 hello: hello.o hello.spec.o
-	$(CC) -o hello $+ -L$(DLLDIR) -lgdi32 -lkernel32 -luser32 $(DLL_LINK) $(LIBS)
+	$(CC) -o hello $+ -L$(DLLDIR) -luser32 -lgdi32 -lkernel32 -lntdll $(DLL_LINK) $(LIBS)
 
 hello2: hello2.o hello2.spec.o
-	$(CC) -o hello2 $+ -L$(DLLDIR) -lgdi32 -lkernel32 -luser32 $(DLL_LINK) $(LIBS)
+	$(CC) -o hello2 $+ -L$(DLLDIR) -luser32 -lgdi32 -lkernel32 -lntdll $(DLL_LINK) $(LIBS)
 
 hello3: hello3.o hello3.spec.o
-	$(CC) -o hello3 $+  -L$(DLLDIR) -ladvapi32 -lcomctl32 -lcomdlg32 -lgdi32 -lkernel32 -lole32 -lrpcrt4 -lshell32 -lshlwapi -luser32 -lwinspool.drv $(DLL_LINK) $(LIBS)
+	$(CC) -o hello3 $+  -L$(DLLDIR) -ladvapi32 -lcomctl32 -lcomdlg32 -lgdi32 -lkernel32 -lole32 -lrpcrt4 -lshell32 -lshlwapi -luser32 -lwinspool.drv -lntdll $(DLL_LINK) $(LIBS)
 
 hello3.spec.c: hello3res.res
 
 hello4: hello4.o hello4.spec.o
-	$(CC) -o hello4 $+ -L$(DLLDIR) -lgdi32 -lkernel32 -luser32 $(DLL_LINK) $(LIBS)
+	$(CC) -o hello4 $+ -L$(DLLDIR) -luser32 -lgdi32 -lkernel32 -lntdll $(DLL_LINK) $(LIBS)
 
 hello5: hello5.o hello5.spec.o
-	$(CC) -o hello5 $+ $(DLL_LINK) $(LIBS)
+	$(CC) -o hello5 $+ -L$(DLLDIR) -lntdll $(DLL_LINK) $(LIBS)
 
 new: new.o new.spec.o
-	$(CC) -o new $+ -L$(DLLDIR) -lgdi32 -lkernel32 -luser32 $(DLL_LINK) $(LIBS)
+	$(CC) -o new $+ -L$(DLLDIR) -luser32 -lgdi32 -lkernel32 -lntdll $(DLL_LINK) $(LIBS)
 
 rolex: rolex.o rolex.spec.o
-	$(CC) -o rolex $+ -L$(DLLDIR) -lgdi32 -lkernel32 -luser32 $(DLL_LINK) $(LIBS)
+	$(CC) -o rolex $+ -L$(DLLDIR) -luser32 -lgdi32 -lkernel32 -lntdll $(DLL_LINK) $(LIBS)
 
 vartest: vartest.o vartest.spec.o
-	$(CC) -o vartest $+ -L$(DLLDIR) -ladvapi32 -lcomctl32 -lgdi32 -lkernel32 -lole32 -loleaut32 -lrpcrt4 -luser32 $(DLL_LINK) $(LIBS)
+	$(CC) -o vartest $+ -L$(DLLDIR) -ladvapi32 -lcomctl32 -lgdi32 -lkernel32 -lole32 -loleaut32 -lrpcrt4 -luser32 -lntdll $(DLL_LINK) $(LIBS)
 
 volinfo: volinfo.o volinfo.spec.o
-	$(CC) -o volinfo $+ $(DLL_LINK) $(LIBS)
+	$(CC) -o volinfo $+ -L$(DLLDIR) -lntdll $(DLL_LINK) $(LIBS)
 
 ### Dependencies:

miscemu/wine.spec

@@ -2,3 +2,5 @@ name	wine
 mode	cuiexe_no_main
 type	win32
 init	wine_initial_task
+
+import	ntdll.dll

programs/Makefile.in

@@ -9,8 +9,8 @@ SUBDIRS = \
 	clock \
 	cmdlgtst \
 	control \
-	osversioncheck \
 	notepad \
+	osversioncheck \
 	progman \
 	regapi \
 	regtest \

programs/avitools/Makefile.in

@@ -5,7 +5,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = none
 PROGRAMS  = icinfo aviinfo aviplay
-IMPORTS   = msvfw32 winmm ddraw x11drv user32 gdi32 kernel32
+IMPORTS   = msvfw32 winmm ddraw x11drv user32 gdi32 kernel32 ntdll
 
 SPEC_SRCS = \
 	icinfo.spec \

programs/clock/Makefile.in

@@ -5,7 +5,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = none
 PROGRAMS  = clock
-IMPORTS   = advapi32 comctl32 shlwapi shell32 comdlg32 ole32 rpcrt4 winspool.drv user32 gdi32 kernel32
+IMPORTS   = advapi32 comctl32 shlwapi shell32 comdlg32 ole32 rpcrt4 winspool.drv user32 gdi32 kernel32 ntdll
 
 LICENSELANG = En
 

programs/cmdlgtst/Makefile.in

@@ -5,7 +5,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = none
 PROGRAMS  = cmdlgtst
-IMPORTS   = advapi32 comctl32 comdlg32 shell32 shlwapi ole32 rpcrt4 winspool.drv user32 gdi32 kernel32
+IMPORTS   = advapi32 comctl32 comdlg32 shell32 shlwapi ole32 rpcrt4 winspool.drv user32 gdi32 kernel32 ntdll
 
 C_SRCS = \
 	cmdlgtst.c

programs/control/Makefile.in

@@ -5,7 +5,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = none
 PROGRAMS  = control
-IMPORTS   = advapi32 comctl32 shlwapi shell32 ole32 rpcrt4 user32 gdi32 kernel32
+IMPORTS   = advapi32 comctl32 shlwapi shell32 ole32 rpcrt4 user32 gdi32 kernel32 ntdll
 
 C_SRCS = control.c
 

programs/notepad/Makefile.in

@@ -5,7 +5,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = none
 PROGRAMS  = notepad
-IMPORTS   = advapi32 comctl32 shlwapi shell32 ole32 rpcrt4 comdlg32 winspool.drv user32 gdi32 kernel32
+IMPORTS   = advapi32 comctl32 shlwapi shell32 ole32 rpcrt4 comdlg32 winspool.drv user32 gdi32 kernel32 ntdll
 
 LICENSELANG = En
 

programs/osversioncheck/Makefile.in

@@ -5,7 +5,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = none
 PROGRAMS  = osversioncheck
-IMPORTS   = kernel32
+IMPORTS   = kernel32 ntdll
 
 C_SRCS = osversioncheck.c
 

programs/progman/Makefile.in

@@ -5,7 +5,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = none
 PROGRAMS  = progman
-IMPORTS   = shlwapi shell32 comdlg32 ole32 rpcrt4 winspool.drv user32 gdi32 kernel32
+IMPORTS   = shlwapi shell32 comdlg32 ole32 rpcrt4 winspool.drv user32 gdi32 kernel32 ntdll
 
 LICENSELANG = En
 

programs/regapi/Makefile.in

@@ -5,7 +5,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = none
 PROGRAMS  = regapi
-IMPORTS   = kernel32
+IMPORTS   = kernel32 ntdll
 
 C_SRCS = \
 	regapi.c

programs/regtest/Makefile.in

@@ -5,7 +5,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = none
 PROGRAMS  = regtest
-IMPORTS   = kernel32
+IMPORTS   = kernel32 ntdll
 
 C_SRCS = regtest.c
 

programs/uninstaller/Makefile.in

@@ -5,7 +5,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = none
 PROGRAMS  = uninstaller
-IMPORTS   = user32 gdi32 kernel32
+IMPORTS   = user32 gdi32 kernel32 ntdll
 
 LICENSELANG = En
 

programs/view/Makefile.in

@@ -5,7 +5,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = none
 PROGRAMS  = view
-IMPORTS   = advapi32 comctl32 comdlg32 shell32 shlwapi ole32 rpcrt4 winspool.drv user32 gdi32 kernel32
+IMPORTS   = advapi32 comctl32 comdlg32 shell32 shlwapi ole32 rpcrt4 winspool.drv user32 gdi32 kernel32 ntdll
 
 C_SRCS = \
 	init.c \

programs/wcmd/Makefile.in

@@ -5,7 +5,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = none
 PROGRAMS  = wcmd
-IMPORTS   = user32 gdi32 kernel32
+IMPORTS   = user32 gdi32 kernel32 ntdll
 
 C_SRCS = \
 	batch.c \

programs/winemine/Makefile.in

@@ -5,7 +5,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = none
 PROGRAMS  = winemine
-IMPORTS   = user32 gdi32 kernel32
+IMPORTS   = user32 gdi32 kernel32 ntdll
 
 LICENSELANG = En
 

programs/winhelp/Makefile.in

@@ -5,7 +5,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = none
 PROGRAMS  = winhelp hlp2sgml
-IMPORTS   = advapi32 comctl32 shlwapi shell32 ole32 rpcrt4 comdlg32 winspool.drv user32 gdi32 kernel32
+IMPORTS   = advapi32 comctl32 shlwapi shell32 ole32 rpcrt4 comdlg32 winspool.drv user32 gdi32 kernel32 ntdll
 
 C_SRCS = \
 	winhelp.c \

programs/winver/Makefile.in

@@ -5,7 +5,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = none
 PROGRAMS  = winver
-IMPORTS   = advapi32 comctl32 shlwapi shell32 ole32 rpcrt4 user32 gdi32 kernel32
+IMPORTS   = advapi32 comctl32 shlwapi shell32 ole32 rpcrt4 user32 gdi32 kernel32 ntdll
 
 C_SRCS = winver.c