Added imports of user32/gdi32/kernel32 wherever necessary.

dlls/Makedll.rules.in

@@ -42,14 +42,9 @@ $(ALTNAMES:%=lib%.a): lib$(MODULE).a
 
 # Rules for checking that no imports are missing
 
-IMPORTLIBS = $(IMPORTS:%=$(DLLDIR)/lib%.$(LIBEXT))
-
-checklink:: lib$(MODULE).$(LIBEXT) $(IMPORTLIBS)
+checklink:: lib$(MODULE).$(LIBEXT)
 	$(CC) -o checklink $(TOPSRCDIR)/library/checklink.c -L. -l$(MODULE) -L$(TOPOBJDIR) -lwine -lwine_unicode $(EXTRALIBS) $(LIBS) && $(RM) checklink
 
-$(IMPORTLIBS): dummy
-	@cd $(DLLDIR) && $(MAKE) `basename $@`
-
 # Rules for installation
 
 .PHONY: install_so install_a

dlls/Makefile.in

@@ -114,6 +114,7 @@ EXTRADLLNAMES = \
 	win87em \
 	winaspi \
 	windebug \
+	wineps16 \
 	wing \
 	winsock \
 	wprocs
@@ -212,7 +213,7 @@ libdplayx.@LIBEXT@: dplayx/libdplayx.@LIBEXT@
 libdsound.@LIBEXT@: dsound/libdsound.@LIBEXT@
 	$(RM) $@ && $(LN_S) dsound/libdsound.@LIBEXT@ $@
 
-libgdi32.@LIBEXT@ libgdi.@LIBEXT@ libdispdib.@LIBEXT@ libwing.@LIBEXT@: gdi/libgdi32.@LIBEXT@
+libgdi32.@LIBEXT@ libdispdib.@LIBEXT@ libgdi.@LIBEXT@ libwing.@LIBEXT@: gdi/libgdi32.@LIBEXT@
 	$(RM) $@ && $(LN_S) gdi/libgdi32.@LIBEXT@ $@
 
 libicmp.@LIBEXT@: icmp/libicmp.@LIBEXT@
@@ -224,14 +225,14 @@ libimagehlp.@LIBEXT@: imagehlp/libimagehlp.@LIBEXT@
 libimm32.@LIBEXT@: imm32/libimm32.@LIBEXT@
 	$(RM) $@ && $(LN_S) imm32/libimm32.@LIBEXT@ $@
 
-libkernel32.@LIBEXT@ libcomm.@LIBEXT@ libkernel.@LIBEXT@ libsystem.@LIBEXT@ \
-  libstress.@LIBEXT@ libtoolhelp.@LIBEXT@ libwin87em.@LIBEXT@ libwindebug.@LIBEXT@ \
-  libwprocs.@LIBEXT@: kernel/libkernel32.@LIBEXT@
-	$(RM) $@ && $(LN_S) kernel/libkernel32.@LIBEXT@ $@
-
 libjoystick.drv.@LIBEXT@: winmm/joystick/libjoystick.drv.@LIBEXT@
 	$(RM) $@ && $(LN_S) winmm/joystick/libjoystick.drv.@LIBEXT@ $@
 
+libkernel32.@LIBEXT@ libcomm.@LIBEXT@ libkernel.@LIBEXT@ libstress.@LIBEXT@ \
+  libsystem.@LIBEXT@ libtoolhelp.@LIBEXT@ libwin87em.@LIBEXT@ libwindebug.@LIBEXT@ \
+  libwprocs.@LIBEXT@: kernel/libkernel32.@LIBEXT@
+	$(RM) $@ && $(LN_S) kernel/libkernel32.@LIBEXT@ $@
+
 liblz32.@LIBEXT@ liblzexpand.@LIBEXT@: lzexpand/liblz32.@LIBEXT@
 	$(RM) $@ && $(LN_S) lzexpand/liblz32.@LIBEXT@ $@
 
@@ -271,7 +272,8 @@ libmsvfw32.@LIBEXT@ libmsvideo.@LIBEXT@: msvideo/libmsvfw32.@LIBEXT@
 libodbc32.@LIBEXT@: odbc32/libodbc32.@LIBEXT@
 	$(RM) $@ && $(LN_S) odbc32/libodbc32.@LIBEXT@ $@
 
-libole32.@LIBEXT@ libole2.@LIBEXT@ libole2conv.@LIBEXT@ libole2nls.@LIBEXT@ libole2prox.@LIBEXT@ libole2thk.@LIBEXT@ libstorage.@LIBEXT@ libcompobj.@LIBEXT@: ole32/libole32.@LIBEXT@
+libole32.@LIBEXT@ libcompobj.@LIBEXT@ libole2.@LIBEXT@ libole2conv.@LIBEXT@ \
+  libole2nls.@LIBEXT@ libole2prox.@LIBEXT@ libole2thk.@LIBEXT@ libstorage.@LIBEXT@: ole32/libole32.@LIBEXT@
 	$(RM) $@ && $(LN_S) ole32/libole32.@LIBEXT@ $@
 
 liboleaut32.@LIBEXT@ libole2disp.@LIBEXT@ libtypelib.@LIBEXT@: oleaut32/liboleaut32.@LIBEXT@
@@ -328,7 +330,8 @@ libttydrv.@LIBEXT@: ttydrv/libttydrv.@LIBEXT@
 liburlmon.@LIBEXT@: urlmon/liburlmon.@LIBEXT@
 	$(RM) $@ && $(LN_S) urlmon/liburlmon.@LIBEXT@ $@
 
-libuser32.@LIBEXT@ libuser.@LIBEXT@ libkeyboard.@LIBEXT@ libddeml.@LIBEXT@ libdisplay.@LIBEXT@ libmouse.@LIBEXT@: user/libuser32.@LIBEXT@
+libuser32.@LIBEXT@ libddeml.@LIBEXT@ libdisplay.@LIBEXT@ libkeyboard.@LIBEXT@ \
+  libmouse.@LIBEXT@ libuser.@LIBEXT@: user/libuser32.@LIBEXT@
 	$(RM) $@ && $(LN_S) user/libuser32.@LIBEXT@ $@
 
 libversion.@LIBEXT@ libver.@LIBEXT@: version/libversion.@LIBEXT@
@@ -340,7 +343,7 @@ libw32skrnl.@LIBEXT@ libw32sys.@LIBEXT@ libwin32s16.@LIBEXT@: win32s/libw32skrnl
 libwineoss.drv.@LIBEXT@: winmm/wineoss/libwineoss.drv.@LIBEXT@
 	$(RM) $@ && $(LN_S) winmm/wineoss/libwineoss.drv.@LIBEXT@ $@
 
-libwineps.@LIBEXT@: wineps/libwineps.@LIBEXT@
+libwineps.@LIBEXT@ libwineps16.@LIBEXT@: wineps/libwineps.@LIBEXT@
 	$(RM) $@ && $(LN_S) wineps/libwineps.@LIBEXT@ $@
 
 libwininet.@LIBEXT@: wininet/libwininet.@LIBEXT@
@@ -369,33 +372,48 @@ libx11drv.@LIBEXT@: x11drv/libx11drv.@LIBEXT@
 
 # Inter-dll dependencies (only necessary for .so)
 
-avifil32/libavifil32.so: libmsvfw32.so libwinmm.so
-commdlg/libcomdlg32.so: libwinspool.drv.so
-dinput/libdinput.so: libuser32.so
-ddraw/libddraw.so: libx11drv.so
-dplayx/libdplayx.so: libole32.so
-dsound/libdsound.so: libwinmm.so
-msvideo/libmsvfw32.so: libwinmm.so
-ole32/libole32.so: librpcrt4.so libkernel32.so
-oleaut32/liboleaut32.so: libole32.so libcomctl32.so
-olecli/libolecli32.so: libolesvr32.so libole32.so
-olepro32/libolepro32.so: liboleaut32.so libole32.so
-opengl32/libopengl32.so: libx11drv.so libgdi32.so
-shell32/libshell32.so: libole32.so libshlwapi.so
+avifil32/libavifil32.so: libmsvfw32.so libkernel32.so
+comctl32/libcomctl32.so: libuser32.so libgdi32.so
+commdlg/libcomdlg32.so: libshell32.so libshlwapi.so libcomctl32.so libwinspool.drv.so libuser32.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: libole32.so libadvapi32.so libkernel32.so
+dsound/libdsound.so: libwinmm.so libkernel32.so
+msacm/libmsacm32.so: libwinmm.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
+olecli/libolecli32.so: libole32.so libolesvr32.so libgdi32.so
+olepro32/libolepro32.so: liboleaut32.so
+opengl32/libopengl32.so: libx11drv.so
+richedit/libriched32.so: libuser32.so
+serialui/libserialui.so: libuser32.so
+shell32/libshell32.so: libole32.so libshlwapi.so libcomctl32.so libadvapi32.so libuser32.so libgdi32.so libkernel32.so
 shfolder/libshfolder.so: libshell32.so
+shlwapi/libshlwapi.so: libadvapi32.so libuser32.so libkernel32.so
+ttydrv/libttydrv.so: libuser32.so libgdi32.so libkernel32.so
 urlmon/liburlmon.so: libole32.so
-version/libversion.so: liblz32.so
+user/libuser32.so: libgdi32.so
+version/libversion.so: liblz32.so libkernel32.so
 win32s/libw32skrnl.so: libkernel32.so
-winmm/joystick/libjoystick.drv.so: libwinmm.so
-winmm/mcianim/libmcianim.drv.so: libwinmm.so
-winmm/mciavi/libmciavi.drv.so: libwinmm.so
-winmm/mcicda/libmcicda.drv.so: libwinmm.so
-winmm/mciseq/libmciseq.drv.so: libwinmm.so
-winmm/mciwave/libmciwave.drv.so: libwinmm.so
-winmm/midimap/libmidimap.drv.so: libwinmm.so
-winmm/wavemap/libmsacm.drv.so: libwinmm.so
-winmm/wineoss/libwineoss.drv.so: libwinmm.so
+wineps/libwineps.so: libgdi32.so
+winmm/joystick/libjoystick.drv.so: libwinmm.so libuser32.so
+winmm/libwinmm.so: libuser32.so
+winmm/mcianim/libmcianim.drv.so: libwinmm.so libuser32.so libkernel32.so
+winmm/mciavi/libmciavi.drv.so: libwinmm.so libuser32.so libkernel32.so
+winmm/mcicda/libmcicda.drv.so: libwinmm.so libuser32.so libkernel32.so
+winmm/mciseq/libmciseq.drv.so: libwinmm.so libuser32.so libkernel32.so
+winmm/mciwave/libmciwave.drv.so: libwinmm.so libuser32.so libkernel32.so
+winmm/midimap/libmidimap.drv.so: libwinmm.so libuser32.so libkernel32.so
+winmm/wavemap/libmsacm.drv.so: libwinmm.so libuser32.so libkernel32.so
+winmm/wineoss/libwineoss.drv.so: libwinmm.so libuser32.so libkernel32.so
+winsock/libws2_32.so: libuser32.so
+winspool/libwinspool.drv.so: libgdi32.so
+wow32/libwow32.so: libkernel32.so
 wsock32/libwsock32.so: libws2_32.so
+x11drv/libx11drv.so: libuser32.so libgdi32.so libkernel32.so
 
 $(DLLFILES): dummy
 	@cd `dirname $@` && $(MAKE)

dlls/avifil32/Makefile.in

@@ -5,7 +5,7 @@ VPATH     = @srcdir@
 MODULE    = avifil32
 SOVERSION = 1.0
 ALTNAMES  = avifile
-IMPORTS   = msvfw32 winmm
+IMPORTS   = msvfw32 kernel32
 
 C_SRCS = \
 	avifile.c

dlls/avifil32/avifil32.spec

 name	avifil32
 type	win32
 
-import	msvfw32.dll
+import msvfw32.dll
+import kernel32.dll
 
 @ stub    AVIBuildFilter
 @ stub    AVIBuildFilterA

dlls/comctl32/Makefile.in

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

dlls/comctl32/comctl32.spec

@@ -3,6 +3,9 @@ type	win32
 init	COMCTL32_LibMain
 rsrc	comctl32
 
+import	user32.dll
+import	gdi32.dll
+
 # Functions exported by the Win95 comctl32.dll 
 # (these need to have these exact ordinals, because some win95 dlls 
 #  import comctl32.dll by ordinal)

dlls/commdlg/Makefile.in

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

dlls/commdlg/comdlg32.spec

@@ -8,6 +8,8 @@ import shlwapi.dll
 import comctl32.dll
 import user32.dll
 import winspool.drv
+import gdi32.dll
+import kernel32.dll
 
  0 stub ArrowBtnWndProc
  1 stdcall ChooseColorA(ptr) ChooseColorA

dlls/crtdll/Makefile.in

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

dlls/crtdll/crtdll.spec

@@ -3,7 +3,8 @@ name	crtdll
 type	win32
 init    CRTDLL_Init
 
-import	ntdll
+import kernel32.dll
+import ntdll.dll
 
 @ cdecl ??2@YAPAXI@Z(long) CRTDLL_new
 @ cdecl ??3@YAXPAX@Z(long) CRTDLL_delete

dlls/ddraw/Makefile.in

@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = ddraw
 SOVERSION = 1.0
-IMPORTS   = x11drv
+IMPORTS   = ole32 user32 x11drv gdi32 kernel32
 
 MESA_SRCS = \
 	d3dcommon.c \

dlls/ddraw/ddraw.spec

 name ddraw
 type win32
 
-import kernel32.dll
-import user32.dll
 import ole32.dll
+import user32.dll
 import x11drv.dll
+import gdi32.dll
+import kernel32.dll
 
 @ stub DDHAL32_VidMemAlloc
 @ stub DDHAL32_VidMemFree

dlls/dinput/Makefile.in

@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = dinput
 SOVERSION = 1.0
-IMPORTS   = user32
+IMPORTS   = user32 kernel32
 
 C_SRCS = \
 	dinput_main.c

dlls/dinput/dinput.spec

@@ -2,6 +2,7 @@ name dinput
 type win32
 
 import user32.dll
+import kernel32.dll
 
 @ stdcall DirectInputCreateA(long long ptr ptr) DirectInputCreateA
 @ stub DirectInputCreateW

dlls/dplay/Makefile.in

@@ -4,6 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = dplay
 SOVERSION = 1.0
+IMPORTS   = dplayx
 
 C_SRCS = dplay_main.c
 

dlls/dplayx/Makefile.in

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

dlls/dplayx/dplayx.spec

@@ -3,6 +3,8 @@ type win32
 init DPLAYX_LibMain
 
 import ole32.dll
+import advapi32.dll
+import kernel32.dll
 
   1 stdcall DirectPlayCreate(ptr ptr ptr) DirectPlayCreate
   2 stdcall DirectPlayEnumerateA(ptr ptr) DirectPlayEnumerateA

dlls/dsound/Makefile.in

@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = dsound
 SOVERSION = 1.0
-IMPORTS   = winmm
+IMPORTS   = winmm kernel32
 
 C_SRCS = \
 	dsound_main.c

dlls/dsound/dsound.spec

 name dsound
 type win32
 import winmm
+import kernel32
 
 0 stub DirectSoundUnknown
 1 stdcall DirectSoundCreate(ptr ptr ptr) DirectSoundCreate

dlls/msacm/Makefile.in

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

dlls/msacm/msacm32.spec

@@ -2,6 +2,8 @@ name msacm32
 type win32
 init MSACM32_LibMain
 
+import winmm.dll
+
  1 stub XRegThunkEntry
  2 stdcall acmDriverAddA(ptr long long long long) acmDriverAddA
  3 stdcall acmDriverAddW(ptr long long long long) acmDriverAddW

dlls/msvideo/Makefile.in

@@ -5,7 +5,7 @@ VPATH     = @srcdir@
 MODULE    = msvfw32
 SOVERSION = 1.0
 ALTNAMES  = msvideo
-IMPORTS   = winmm
+IMPORTS   = winmm user32 gdi32 kernel32
 
 C_SRCS = \
 	msvideo_main.c \

dlls/msvideo/msvfw32.spec

 name	msvfw32
 type	win32
 
-import	winmm.dll
+import winmm.dll
+import user32.dll
+import gdi32.dll
+import kernel32.dll
 
 # Yes, ICCompress,ICDecompress,MCIWnd* and ICDraw* are cdecl (VFWAPIV).
 # The rest is stdcall (VFWAPI) however. -Marcus Meissner, 990124

dlls/ole32/Makefile.in

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

dlls/ole32/ole32.spec

 name	ole32
 type	win32
 
-import  rpcrt4
-import	kernel32
+import advapi32.dll
+import user32.dll
+import gdi32.dll
+import rpcrt4.dll
+import kernel32.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 comctl32
+IMPORTS   = ole32 gdi32 kernel32
 
 C_SRCS = \
 	connpt.c \

dlls/oleaut32/oleaut32.spec

@@ -2,6 +2,8 @@ name oleaut32
 type win32
 
 import ole32.dll
+import gdi32.dll
+import kernel32.dll
 
 1 stub DllGetClassObject
 2 stdcall SysAllocString(wstr) SysAllocString

dlls/olecli/Makefile.in

@@ -5,7 +5,7 @@ VPATH     = @srcdir@
 MODULE    = olecli32
 SOVERSION = 1.0
 ALTNAMES  = olecli
-IMPORTS   = olesvr32 ole32
+IMPORTS   = ole32 olesvr32 gdi32
 
 C_SRCS = \
 	olecli_main.c

dlls/olecli/olecli32.spec

@@ -3,6 +3,7 @@ type win32
 
 import ole32.dll
 import olesvr32.dll
+import gdi32.dll
 
    1 stub WEP
    2 stub OleDelete

dlls/olepro32/Makefile.in

@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = olepro32
 SOVERSION = 1.0
-IMPORTS	  = oleaut32 ole32
+IMPORTS   = oleaut32
 
 C_SRCS = olepro32stubs.c
 

dlls/opengl32/Makefile.in

@@ -4,9 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = opengl32
 SOVERSION = 1.0
-IMPORTS   = \
-	x11drv \
-	gdi32
+IMPORTS   = x11drv
 
 C_SRCS = \
 	wgl.c \

dlls/richedit/Makefile.in

@@ -4,6 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = riched32
 SOVERSION = 1.0
+IMPORTS   = user32
 
 C_SRCS = \
 	charlist.c \

dlls/richedit/reader.c

@@ -92,12 +92,6 @@ extern HANDLE RICHED32_hHeap;
 
 # define	maxCSStack		10
 
-#ifndef THINK_C
-extern char	*malloc ();
-#else
-extern void	*malloc(size_t);
-#endif
-
 static int      _RTFGetChar();
 static void	_RTFGetToken ();
 static void	_RTFGetToken2 ();

dlls/richedit/riched32.spec

@@ -2,4 +2,6 @@ name	riched32
 type	win32
 init	RICHED32_LibMain
 
+import	user32.dll
+
 2 stdcall DllGetVersion (ptr) RICHED32_DllGetVersion

dlls/serialui/Makefile.in

@@ -4,6 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = serialui
 SOVERSION = 1.0
+IMPORTS   = user32
 
 C_SRCS = \
 	confdlg.c

dlls/serialui/serialui.spec

@@ -3,6 +3,8 @@ type	win32
 init	SERIALUI_LibMain
 rsrc	serialui_rc
 
+import	user32.dll
+
 2 stdcall EnumPropPages(ptr ptr ptr) SERIALUI_EnumPropPages
 3 stdcall drvCommConfigDialog(ptr long ptr) SERIALUI_CommConfigDialog
 4 stdcall drvSetDefaultCommConfig(str ptr long) SERIALUI_SetDefaultCommConfig

dlls/shell32/Makefile.in

@@ -5,7 +5,7 @@ VPATH     = @srcdir@
 MODULE    = shell32
 SOVERSION = 1.0
 ALTNAMES  = shell
-IMPORTS   = ole32 shlwapi
+IMPORTS   = ole32 shlwapi comctl32 advapi32 user32 gdi32 kernel32
 
 C_SRCS = \
 	brsfolder.c \

dlls/shell32/shell32.spec

@@ -3,12 +3,15 @@ type	win32
 init	Shell32LibMain
 rsrc	shres
 
-import	shlwapi.dll
-import	user32.dll
-import	comctl32.dll
-
 # fixme: avoid this import
-import	ole32.dll
+import ole32.dll
+
+import shlwapi.dll
+import comctl32.dll
+import advapi32.dll
+import user32.dll
+import gdi32.dll
+import kernel32.dll
 
 # Functions exported by the Win95 shell32.dll 
 # (these need to have these exact ordinals, for some 

dlls/shlwapi/Makefile.in

@@ -4,6 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = shlwapi
 SOVERSION = 1.0
+IMPORTS   = advapi32 user32 kernel32
 
 C_SRCS = \
 	ordinal.c \

dlls/ttydrv/Makefile.in

@@ -5,6 +5,7 @@ VPATH     = @srcdir@
 MODULE    = ttydrv
 SOVERSION = 1.0
 EXTRALIBS = $(LIBS)
+IMPORTS   = user32 gdi32 kernel32
 
 C_SRCS = \
 	ttydrv_main.c

dlls/ttydrv/ttydrv.spec

@@ -2,4 +2,6 @@ name	ttydrv
 type	win32
 init	TTYDRV_Init
 
-import  gdi32.dll
+import	user32.dll
+import	gdi32.dll
+import	kernel32.dll

dlls/user/Makefile.in

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

dlls/user/user32.spec

@@ -3,6 +3,8 @@ type	win32
 init	USER_Init
 rsrc	user32
 
+import	gdi32.dll
+
   1 stdcall ActivateKeyboardLayout(long long) ActivateKeyboardLayout
   2 stdcall AdjustWindowRect(ptr long long) AdjustWindowRect
   3 stdcall AdjustWindowRectEx(ptr long long long) AdjustWindowRectEx

dlls/user/user_main.c

@@ -5,6 +5,7 @@
 #include "windef.h"
 #include "wingdi.h"
 #include "winuser.h"
+#include "winreg.h"
 #include "wine/winbase16.h"
 
 #include "dce.h"
@@ -19,6 +20,34 @@
 #include "sysmetrics.h"
 #include "user.h"
 #include "win.h"
+#include "debugtools.h"
+
+
+/* load the graphics driver */
+static BOOL load_driver(void)
+{
+    char buffer[MAX_PATH];
+    HKEY hkey;
+    DWORD type, count;
+
+    if (RegCreateKeyExA( HKEY_LOCAL_MACHINE, "Software\\Wine\\Wine\\Config\\Wine", 0, NULL,
+                         REG_OPTION_VOLATILE, KEY_ALL_ACCESS, NULL, &hkey, NULL ))
+    {
+        MESSAGE("load_driver: Cannot create config registry key\n" );
+        return FALSE;
+    }
+    count = sizeof(buffer);
+    if (RegQueryValueExA( hkey, "GraphicsDriver", 0, &type, buffer, &count ))
+        strcpy( buffer, "x11drv" );  /* default value */
+    RegCloseKey( hkey );
+
+    if (!LoadLibraryA( buffer ))
+    {
+        MESSAGE( "Could not load graphics driver '%s'\n", buffer );
+        return FALSE;
+    }
+    return TRUE;
+}
 
 
 /***********************************************************************
@@ -38,6 +67,9 @@ BOOL WINAPI USER_Init(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
      /* Global atom table initialisation */
     if (!ATOM_Init( USER_HeapSel )) return FALSE;
 
+    /* Load the graphics driver */
+    if (!load_driver()) return FALSE;
+
     /* Initialize window handling (critical section) */
     WIN_Init();
 

dlls/version/Makefile.in

@@ -5,7 +5,7 @@ VPATH     = @srcdir@
 MODULE    = version
 SOVERSION = 1.0
 ALTNAMES  = ver
-IMPORTS   = lz32
+IMPORTS   = lz32 kernel32
 
 C_SRCS = \
 	info.c \

dlls/version/version.spec

 name version
 type win32
 
-import kernel32.dll
 import lz32.dll
+import kernel32.dll
 
 @ stdcall GetFileVersionInfoA(str long long ptr) GetFileVersionInfoA
 @ stdcall GetFileVersionInfoSizeA(str ptr) GetFileVersionInfoSizeA

dlls/wineps/Makefile.in

@@ -5,6 +5,7 @@ VPATH     = @srcdir@
 MODULE    = wineps
 SOVERSION = 1.0
 ALTNAMES  = wineps16
+IMPORTS   = gdi32
 
 C_SRCS = \
 	afm.c \

dlls/wineps/wineps.spec

@@ -2,3 +2,4 @@ name	wineps
 type	win32
 init	PSDRV_Init
 
+import	gdi32.dll

dlls/winmm/Makefile.in

@@ -5,6 +5,7 @@ VPATH     = @srcdir@
 MODULE    = winmm
 SOVERSION = 1.0
 ALTNAMES  = mmsystem sound
+IMPORTS   = user32
 
 C_SRCS = \
 	joystick.c \

dlls/winmm/joystick/Makefile.in

@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = joystick.drv
 SOVERSION = 1.0
-IMPORTS   = winmm
+IMPORTS   = winmm user32
 
 C_SRCS = \
 	joystick.c

dlls/winmm/joystick/joystick.drv.spec

@@ -3,5 +3,6 @@ file joystick.drv
 type win32
 
 import winmm.dll
+import user32.dll
 
-  1 stdcall DriverProc(long long long long long) JSTCK_DriverProc
+@ stdcall DriverProc(long long long long long) JSTCK_DriverProc

dlls/winmm/mcianim/Makefile.in

@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = mcianim.drv
 SOVERSION = 1.0
-IMPORTS   = winmm
+IMPORTS   = winmm user32 kernel32
 
 C_SRCS = \
 	mcianim.c

dlls/winmm/mcianim/mcianim.drv.spec

@@ -3,5 +3,7 @@ file mcianim.drv
 type win32
 
 import winmm.dll
+import user32.dll
+import kernel32.dll
 
-  1 stdcall DriverProc(long long long long long) MCIANIM_DriverProc
+@ stdcall DriverProc(long long long long long) MCIANIM_DriverProc

dlls/winmm/mciavi/Makefile.in

@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = mciavi.drv
 SOVERSION = 1.0
-IMPORTS   = winmm
+IMPORTS   = winmm user32 kernel32
 
 C_SRCS = \
 	mciavi.c

dlls/winmm/mciavi/mciavi.drv.spec

@@ -3,5 +3,7 @@ file mciavi.drv
 type win32
 
 import winmm.dll
+import user32.dll
+import kernel32.dll
 
-  1 stdcall DriverProc(long long long long long) MCIAVI_DriverProc
+@ stdcall DriverProc(long long long long long) MCIAVI_DriverProc

dlls/winmm/mcicda/Makefile.in

@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = mcicda.drv
 SOVERSION = 1.0
-IMPORTS   = winmm
+IMPORTS   = winmm user32 kernel32
 
 C_SRCS = \
 	mcicda.c

dlls/winmm/mcicda/mcicda.drv.spec

@@ -3,5 +3,7 @@ file mcicda.drv
 type win32
 
 import winmm.dll
+import user32.dll
+import kernel32.dll
 
-  1 stdcall DriverProc(long long long long long) MCICDA_DriverProc
+@ stdcall DriverProc(long long long long long) MCICDA_DriverProc

dlls/winmm/mciseq/Makefile.in

@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = mciseq.drv
 SOVERSION = 1.0
-IMPORTS   = winmm
+IMPORTS   = winmm user32 kernel32
 
 C_SRCS = \
 	mcimidi.c

dlls/winmm/mciseq/mciseq.drv.spec

@@ -3,5 +3,7 @@ file mciseq.drv
 type win32
 
 import winmm.dll
+import user32.dll
+import kernel32.dll
 
-  1 stdcall DriverProc(long long long long long) MCIMIDI_DriverProc
+@ stdcall DriverProc(long long long long long) MCIMIDI_DriverProc

dlls/winmm/mciwave/Makefile.in

@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = mciwave.drv
 SOVERSION = 1.0
-IMPORTS   = winmm
+IMPORTS   = winmm user32 kernel32
 
 C_SRCS = \
 	mciwave.c

dlls/winmm/mciwave/mciwave.drv.spec

@@ -3,5 +3,7 @@ file mciwave.drv
 type win32
 
 import winmm.dll
+import user32.dll
+import kernel32.dll
 
-  1 stdcall DriverProc(long long long long long) MCIWAVE_DriverProc
+@ stdcall DriverProc(long long long long long) MCIWAVE_DriverProc

dlls/winmm/midimap/Makefile.in

@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = midimap.drv
 SOVERSION = 1.0
-IMPORTS   = winmm
+IMPORTS   = winmm user32 kernel32
 
 C_SRCS = \
 	midimap.c

dlls/winmm/midimap/midimap.drv.spec

@@ -3,7 +3,9 @@ file midimap.drv
 type win32
 
 import winmm.dll
+import user32.dll
+import kernel32.dll
 
-  1 stdcall DriverProc(long long long long long) MIDIMAP_DriverProc
-  2 stdcall midMessage(long long long long long) MIDIMAP_midMessage
-  3 stdcall modMessage(long long long long long) MIDIMAP_modMessage
+@ stdcall DriverProc(long long long long long) MIDIMAP_DriverProc
+@ stdcall midMessage(long long long long long) MIDIMAP_midMessage
+@ stdcall modMessage(long long long long long) MIDIMAP_modMessage

dlls/winmm/wavemap/Makefile.in

@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = msacm.drv
 SOVERSION = 1.0
-IMPORTS   = winmm
+IMPORTS   = winmm user32 kernel32
 
 C_SRCS = \
 	wavemap.c

dlls/winmm/wavemap/msacm.drv.spec

@@ -3,7 +3,9 @@ file msacm.drv
 type win32
 
 import winmm.dll
+import user32.dll
+import kernel32.dll
 
-  1 stdcall DriverProc(long long long long long) WAVEMAP_DriverProc
-  2 stdcall widMessage(long long long long long) WAVEMAP_widMessage
-  3 stdcall wodMessage(long long long long long) WAVEMAP_wodMessage
+@ stdcall DriverProc(long long long long long) WAVEMAP_DriverProc
+@ stdcall widMessage(long long long long long) WAVEMAP_widMessage
+@ stdcall wodMessage(long long long long long) WAVEMAP_wodMessage

dlls/winmm/wineoss/Makefile.in

@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = wineoss.drv
 SOVERSION = 1.0
-IMPORTS   = winmm
+IMPORTS   = winmm user32 kernel32
 
 C_SRCS = \
 	audio.c \

dlls/winmm/wineoss/wineoss.drv.spec

@@ -3,6 +3,8 @@ file wineoss.drv
 type win32
 
 import winmm.dll
+import user32.dll
+import kernel32.dll
 
   1 stdcall DriverProc(long long long long long) OSS_DriverProc
   2 stdcall auxMessage(long long long long long) OSS_auxMessage

dlls/winmm/winmm.spec

@@ -3,6 +3,8 @@ type win32
 init WINMM_LibMain
 rsrc winmm_res
 
+import user32.dll
+
 # ordinal exports
 1 stdcall @(ptr long long) PlaySoundA
 3 stub @

dlls/winsock/Makefile.in

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

dlls/winsock/ws2_32.spec

@@ -6,6 +6,8 @@ name ws2_32
 type win32
 init WSOCK32_LibMain
 
+import user32.dll
+
 #  EXPORTS ***********
 1   stdcall  accept(long ptr ptr) WSOCK32_accept
 2   stdcall  bind(long ptr long) WSOCK32_bind

dlls/winspool/Makefile.in

@@ -4,6 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = winspool.drv
 SOVERSION = 1.0
+IMPORTS   = gdi32
 
 C_SRCS = \
 	info.c \

dlls/winspool/winspool.drv.spec

@@ -3,6 +3,8 @@ type	win32
 file	winspool.drv
 init	WINSPOOL_EntryPoint
 
+import	gdi32.dll
+
 101 stub ADVANCEDSETUPDIALOG
 102 stub AbortPrinter
 103 stdcall AddFormA(long long ptr) AddFormA

dlls/wow32/Makefile.in

@@ -4,6 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = wow32
 SOVERSION = 1.0
+IMPORTS   = kernel32
 
 C_SRCS = wow_main.c
 

dlls/x11drv/Makefile.in

@@ -5,6 +5,7 @@ VPATH     = @srcdir@
 MODULE    = x11drv
 SOVERSION = 1.0
 EXTRALIBS = $(X_LIBS) $(XLIB)
+IMPORTS   = user32 gdi32 kernel32
 
 C_SRCS = \
 	x11drv_main.c

dlls/x11drv/x11drv.spec

@@ -2,4 +2,6 @@ name	x11drv
 type	win32
 init	X11DRV_Init
 
-import  gdi32.dll
+import	user32.dll
+import	gdi32.dll
+import	kernel32.dll

if1632/thunk.c

@@ -169,7 +169,7 @@ void THUNK_InitCallout(void)
     HMODULE hModule;
     NE_MODULE *pModule;
 
-    hModule = GetModuleHandleA( "USER32" );
+    hModule = LoadLibraryA( "user32.dll" );
     if ( hModule )
     {
 #define GETADDR( name )  \
@@ -199,7 +199,7 @@ void THUNK_InitCallout(void)
 #undef GETADDR
     }
 
-    pModule = NE_GetPtr( GetModuleHandle16( "USER" ) );
+    pModule = NE_GetPtr( LoadLibrary16( "USER.EXE" ) );
     if ( pModule )
     {
 #define GETADDR( var, name, thk )  \

scheduler/process.c

@@ -247,17 +247,6 @@ static BOOL process_init( char *argv[] )
  */
 static int load_system_dlls(void)
 {
-    char driver[MAX_PATH];
-
-    PROFILE_GetWineIniString( "Wine", "GraphicsDriver", "x11drv", driver, sizeof(driver) );
-    if (!LoadLibraryA( driver ))
-    {
-        MESSAGE( "Could not load graphics driver '%s'\n", driver );
-        return 0;
-    }
-
-    if (!LoadLibraryA("USER32.DLL")) return 0;
-
     /* Get pointers to USER routines called by KERNEL */
     THUNK_InitCallout();