Added a few missing imports.

dlls/Makefile.in

@@ -374,24 +374,24 @@ libx11drv.@LIBEXT@: x11drv/libx11drv.@LIBEXT@
 
 advapi32/libadvapi32.so: libkernel32.so
 avifil32/libavifil32.so: libmsvfw32.so libkernel32.so
-comctl32/libcomctl32.so: libuser32.so libgdi32.so libkernel32.so
+comctl32/libcomctl32.so: libuser32.so libgdi32.so libadvapi32.so libkernel32.so
 commdlg/libcomdlg32.so: libshell32.so libshlwapi.so libcomctl32.so libuser32.so libwinspool.drv.so libgdi32.so libkernel32.so
 crtdll/libcrtdll.so: libkernel32.so
 ddraw/libddraw.so: libole32.so libuser32.so libx11drv.so libgdi32.so libkernel32.so
 dinput/libdinput.so: libuser32.so libkernel32.so
 dplay/libdplay.so: libdplayx.so
-dplayx/libdplayx.so: libwinmm.so libole32.so libadvapi32.so libkernel32.so
+dplayx/libdplayx.so: libwinmm.so libole32.so libuser32.so libadvapi32.so libkernel32.so
 dsound/libdsound.so: libwinmm.so libkernel32.so
-gdi/libgdi32.so: libkernel32.so
+gdi/libgdi32.so: libadvapi32.so libkernel32.so
 icmp/libicmp.so: libkernel32.so
 imagehlp/libimagehlp.so: libkernel32.so
 imm32/libimm32.so: libkernel32.so
 lzexpand/liblz32.so: libkernel32.so
 mpr/libmpr.so: libkernel32.so
-msacm/libmsacm32.so: libwinmm.so libkernel32.so
+msacm/libmsacm32.so: libwinmm.so libuser32.so libkernel32.so
 msvideo/libmsvfw32.so: libwinmm.so libuser32.so libgdi32.so libkernel32.so
 ole32/libole32.so: libadvapi32.so libuser32.so libgdi32.so librpcrt4.so libkernel32.so
-oleaut32/liboleaut32.so: libole32.so libgdi32.so libkernel32.so
+oleaut32/liboleaut32.so: libole32.so libuser32.so libgdi32.so libkernel32.so
 olecli/libolecli32.so: libole32.so libolesvr32.so libgdi32.so
 olepro32/libolepro32.so: liboleaut32.so
 opengl32/libopengl32.so: libx11drv.so libkernel32.so
@@ -405,10 +405,10 @@ shlwapi/libshlwapi.so: libadvapi32.so libuser32.so libgdi32.so libkernel32.so
 tapi32/libtapi32.so: libkernel32.so
 ttydrv/libttydrv.so: libuser32.so libgdi32.so libkernel32.so
 urlmon/liburlmon.so: libole32.so
-user/libuser32.so: libgdi32.so libkernel32.so
+user/libuser32.so: libgdi32.so libadvapi32.so libkernel32.so
 version/libversion.so: liblz32.so libkernel32.so
 win32s/libw32skrnl.so: libkernel32.so
-winaspi/libwnaspi32.so: libkernel32.so
+winaspi/libwnaspi32.so: libadvapi32.so libkernel32.so
 wineps/libwineps.so: libuser32.so libgdi32.so libkernel32.so
 wininet/libwininet.so: libuser32.so libkernel32.so
 winmm/joystick/libjoystick.drv.so: libwinmm.so libuser32.so

dlls/comctl32/Makefile.in

@@ -5,7 +5,7 @@ VPATH     = @srcdir@
 MODULE    = comctl32
 SOVERSION = 1.0
 WRCEXTRA  = -s -p$(MODULE)
-IMPORTS   = user32 gdi32 kernel32
+IMPORTS   = user32 gdi32 advapi32 kernel32
 
 C_SRCS = \
 	animate.c \

dlls/comctl32/comctl32.spec

@@ -5,6 +5,7 @@ rsrc	comctl32
 
 import	user32.dll
 import	gdi32.dll
+import	advapi32.dll
 import	kernel32.dll
 
 # Functions exported by the Win95 comctl32.dll 

dlls/dplayx/Makefile.in

@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = dplayx
 SOVERSION = 1.0
-IMPORTS   = winmm ole32 advapi32 kernel32
+IMPORTS   = winmm ole32 user32 advapi32 kernel32
 
 C_SRCS = \
 	dpclassfactory.c \

dlls/dplayx/dplayx.spec

@@ -4,6 +4,7 @@ init DPLAYX_LibMain
 
 import winmm.dll
 import ole32.dll
+import user32.dll
 import advapi32.dll
 import kernel32.dll
 

dlls/gdi/Makefile.in

@@ -5,7 +5,7 @@ VPATH     = @srcdir@
 MODULE    = gdi32
 SOVERSION = 1.0
 ALTNAMES  = gdi dispdib wing
-IMPORTS   = kernel32
+IMPORTS   = advapi32 kernel32
 
 C_SRCS = \
 	bidi16.c \

dlls/gdi/gdi32.spec

@@ -2,6 +2,7 @@ name    gdi32
 type    win32
 init    MAIN_GdiInit
 
+import	advapi32.dll
 import	kernel32.dll
 
 # ordinal exports

dlls/msacm/Makefile.in

@@ -5,7 +5,7 @@ VPATH     = @srcdir@
 MODULE    = msacm32
 SOVERSION = 1.0
 ALTNAMES  = msacm
-IMPORTS   = winmm kernel32
+IMPORTS   = winmm user32 kernel32
 
 C_SRCS = \
 	driver.c \

dlls/msacm/msacm32.spec

@@ -4,6 +4,7 @@ init MSACM32_LibMain
 rsrc msacm
 
 import winmm.dll
+import user32.dll
 import kernel32.dll
 
  1 stub XRegThunkEntry

dlls/ole32/ole32.spec

@@ -6,6 +6,7 @@ import user32.dll
 import gdi32.dll
 import rpcrt4.dll
 import kernel32.dll
+import ntdll.dll
 
   1 stub BindMoniker                # stdcall (ptr long ptr ptr) return 0,ERR_NOTIMPLEMENTED
   2 stdcall CLSIDFromProgID(wstr ptr) CLSIDFromProgID

dlls/oleaut32/Makefile.in

@@ -5,7 +5,7 @@ VPATH     = @srcdir@
 MODULE    = oleaut32
 SOVERSION = 1.0
 ALTNAMES  = ole2disp typelib
-IMPORTS   = ole32 gdi32 kernel32
+IMPORTS   = ole32 user32 gdi32 kernel32
 
 C_SRCS = \
 	connpt.c \

dlls/oleaut32/oleaut32.spec

@@ -2,6 +2,7 @@ name oleaut32
 type win32
 
 import ole32.dll
+import user32.dll
 import gdi32.dll
 import kernel32.dll
 

dlls/shell32/shell32.spec

@@ -19,11 +19,8 @@ import kernel32.dll
 # This list was updated to dll version 4.72
 
    2 stdcall SHChangeNotifyRegister(long long long long long long) SHChangeNotifyRegister
-   3 stub CheckEscapesA@8
    4 stdcall SHChangeNotifyDeregister (long) SHChangeNotifyDeregister
    5 stub SHChangeNotifyUpdateEntryList@16
-   6 stub CheckEscapesW@8
-   7 stdcall CommandLineToArgvW(wstr ptr) CommandLineToArgvW
    9 stub PifMgr_OpenProperties@16
   10 stub PifMgr_GetProperties@20
   11 stub PifMgr_SetProperties@20
@@ -54,7 +51,6 @@ import kernel32.dll
   39 stdcall PathIsUNC (ptr) PathIsUNCAW
   40 stdcall PathIsRelative (ptr) PathIsRelativeAW
   43 stdcall PathIsExe (ptr) PathIsExeAW
-  44 stub DoEnvironmentSubstA@8
   45 stdcall PathFileExists(ptr) PathFileExistsAW
   46 stdcall PathMatchSpec (ptr ptr) PathMatchSpecAW
   47 stdcall PathMakeUniqueName (ptr long ptr ptr ptr)PathMakeUniqueNameAW
@@ -325,12 +321,15 @@ import kernel32.dll
 # version 4.0 (win95)
 # _WIN32_IE >= 0x0200
 #
+@ stub CheckEscapesA
+@ stub CheckEscapesW
+@ stdcall CommandLineToArgvW(wstr ptr) CommandLineToArgvW
 @ stdcall Control_FillCache_RunDLL(long long long long)Control_FillCache_RunDLL
-@ stub Control_FillCache_RunDLLA@16
-@ stub Control_FillCache_RunDLLW@16
+@ stub Control_FillCache_RunDLLA
+@ stub Control_FillCache_RunDLLW
 @ stdcall Control_RunDLL(long long long long)Control_RunDLL
-@ stub Control_RunDLLA@16
-@ stub Control_RunDLLW@16
+@ stub Control_RunDLLA
+@ stub Control_RunDLLW
 @ stdcall DllInstall(long wstr)SHELL32_DllInstall
 @ stdcall DoEnvironmentSubstA(str str)DoEnvironmentSubstA
 @ stdcall DoEnvironmentSubstW(wstr wstr)DoEnvironmentSubstW

dlls/user/Makefile.in

@@ -6,7 +6,7 @@ MODULE    = user32
 SOVERSION = 1.0
 WRCEXTRA  = -w16 -m
 ALTNAMES  = user keyboard ddeml display mouse
-IMPORTS   = gdi32 kernel32
+IMPORTS   = gdi32 advapi32 kernel32
 
 C_SRCS = \
 	bidi16.c \

dlls/user/user32.spec

@@ -4,7 +4,9 @@ init	USER_Init
 rsrc	user32
 
 import	gdi32.dll
+import	advapi32.dll
 import	kernel32.dll
+import	ntdll.dll
 
 @ stdcall ActivateKeyboardLayout(long long) ActivateKeyboardLayout
 @ stdcall AdjustWindowRect(ptr long long) AdjustWindowRect

dlls/winaspi/Makefile.in

@@ -5,7 +5,7 @@ VPATH     = @srcdir@
 MODULE    = wnaspi32
 SOVERSION = 1.0
 ALTNAMES  = winaspi
-IMPORTS   = kernel32
+IMPORTS   = advapi32 kernel32
 
 C_SRCS = \
 	aspi.c \

dlls/winaspi/wnaspi32.spec

@@ -2,6 +2,7 @@ name	wnaspi32
 type	win32
 init	WNASPI32_LibMain
 
+import	advapi32.dll
 import	kernel32.dll
 
 # we have several ordinal clashes here, it seems...

dlls/winsock/ws2_32.spec

@@ -8,6 +8,7 @@ init WSOCK32_LibMain
 
 import user32.dll
 import kernel32.dll
+import ntdll.dll
 
 #  EXPORTS ***********
 1   stdcall  accept(long ptr ptr) WSOCK32_accept