Made ddraw and dinput separate dlls.

Make.rules.in

@@ -85,6 +85,8 @@ DLLS = \
 	comctl32 \
 	comdlg32 \
 	dciman32 \
+	ddraw \
+	dinput \
 	dplayx \
 	dsound \
 	icmp \

configure

@@ -6185,6 +6185,8 @@ dlls/comctl32/Makefile
 dlls/commdlg/Makefile
 dlls/crtdll/Makefile
 dlls/dciman32/Makefile
+dlls/ddraw/Makefile
+dlls/dinput/Makefile
 dlls/display/Makefile
 dlls/dplayx/Makefile
 dlls/dsound/Makefile
@@ -6401,6 +6403,8 @@ dlls/comctl32/Makefile
 dlls/commdlg/Makefile
 dlls/crtdll/Makefile
 dlls/dciman32/Makefile
+dlls/ddraw/Makefile
+dlls/dinput/Makefile
 dlls/display/Makefile
 dlls/dplayx/Makefile
 dlls/dsound/Makefile

configure.in

@@ -947,6 +947,8 @@ dlls/comctl32/Makefile
 dlls/commdlg/Makefile
 dlls/crtdll/Makefile
 dlls/dciman32/Makefile
+dlls/ddraw/Makefile
+dlls/dinput/Makefile
 dlls/display/Makefile
 dlls/dplayx/Makefile
 dlls/dsound/Makefile

dlls/Makefile.in

@@ -8,6 +8,8 @@ DLLFILES = \
 	comctl32/libcomctl32.@LIBEXT@ \
 	commdlg/libcomdlg32.@LIBEXT@ \
 	dciman32/libdciman32.@LIBEXT@ \
+	ddraw/libddraw.@LIBEXT@ \
+	dinput/libdinput.@LIBEXT@ \
 	dplayx/libdplayx.@LIBEXT@ \
 	dsound/libdsound.@LIBEXT@ \
 	icmp/libicmp.@LIBEXT@ \
@@ -94,6 +96,12 @@ libcomdlg32.@LIBEXT@ libcommdlg.@LIBEXT@: commdlg/libcomdlg32.@LIBEXT@
 libdciman32.@LIBEXT@: dciman32/libdciman32.@LIBEXT@
 	$(RM) $@ && $(LN_S) dciman32/libdciman32.@LIBEXT@ $@
 
+libddraw.@LIBEXT@: ddraw/libddraw.@LIBEXT@
+	$(RM) $@ && $(LN_S) ddraw/libddraw.@LIBEXT@ $@
+
+libdinput.@LIBEXT@: dinput/libdinput.@LIBEXT@
+	$(RM) $@ && $(LN_S) dinput/libdinput.@LIBEXT@ $@
+
 libdplayx.@LIBEXT@ libdplay.@LIBEXT@: dplayx/libdplayx.@LIBEXT@
 	$(RM) $@ && $(LN_S) dplayx/libdplayx.@LIBEXT@ $@
 

dlls/ddraw/.cvsignore

+Makefile
+ddraw.spec.c
+libddraw.so.1.0

dlls/ddraw/Makefile.in

+TOPSRCDIR = @top_srcdir@
+TOPOBJDIR = ../..
+SRCDIR    = @srcdir@
+VPATH     = @srcdir@
+MODULE    = ddraw
+SOVERSION = 1.0
+
+SPEC_SRCS = ddraw.spec
+
+C_SRCS = \
+	d3dcommon.c \
+	d3ddevices.c \
+	d3dexecutebuffer.c \
+	d3dlight.c \
+	d3dmaterial.c \
+	d3dtexture.c \
+	d3dviewport.c \
+	ddraw_main.c
+
+@MAKE_DLL_RULES@
+
+### Dependencies:
+

dlls/dinput/.cvsignore

+Makefile
+dinput.spec.c
+libdinput.so.1.0

dlls/dinput/Makefile.in

+TOPSRCDIR = @top_srcdir@
+TOPOBJDIR = ../..
+SRCDIR    = @srcdir@
+VPATH     = @srcdir@
+MODULE    = dinput
+SOVERSION = 1.0
+
+SPEC_SRCS = dinput.spec
+
+C_SRCS = \
+	dinput_main.c
+
+@MAKE_DLL_RULES@
+
+### Dependencies:
+

windows/dinput.c → dlls/dinput/dinput_main.c

@@ -53,7 +53,7 @@
 #include "wingdi.h"
 #include "winuser.h"
 
-DEFAULT_DEBUG_CHANNEL(dinput)
+DEFAULT_DEBUG_CHANNEL(dinput);
 
 /* Wine mouse driver object instances */
 #define WINE_MOUSE_X_AXIS_INSTANCE 0x0001

graphics/Makefile.in

@@ -8,14 +8,6 @@ MODULE    = graphics
 C_SRCS = \
 	bitblt.c \
 	cache.c \
-	d3dcommon.c \
-	d3ddevices.c \
-	d3dexecutebuffer.c \
-	d3dlight.c \
-	d3dmaterial.c \
-	d3dtexture.c \
-	d3dviewport.c \
-	ddraw.c \
 	dispdib.c \
 	driver.c \
 	env.c \

graphics/vga.c

@@ -23,6 +23,8 @@ static DDSURFACEDESC sdesc;
 static LONG vga_polling,vga_refresh;
 static HANDLE poll_timer;
 
+static HRESULT WINAPI (*pDirectDrawCreate)(LPGUID,LPDIRECTDRAW *,LPUNKNOWN);
+
 static void VGA_DeinstallTimer(void)
 {
     if (poll_timer) {
@@ -51,7 +53,12 @@ int VGA_SetMode(unsigned Xres,unsigned Yres,unsigned Depth)
 {
     if (lpddraw) VGA_Exit();
     if (!lpddraw) {
-        DirectDrawCreate(NULL,&lpddraw,NULL);
+        if (!pDirectDrawCreate)
+        {
+            HMODULE hmod = LoadLibraryA( "ddraw.dll" );
+            if (hmod) pDirectDrawCreate = GetProcAddress( hmod, "DirectDrawCreate" );
+        }
+        if (pDirectDrawCreate) pDirectDrawCreate(NULL,&lpddraw,NULL);
         if (!lpddraw) {
             ERR("DirectDraw is not available\n");
             return 1;

relay32/Makefile.in

@@ -6,8 +6,6 @@ VPATH     = @srcdir@
 MODULE    = relay32
 
 SPEC_SRCS = \
-	ddraw.spec \
-	dinput.spec \
 	gdi32.spec \
 	kernel32.spec \
 	user32.spec \

windows/Makefile.in

@@ -13,7 +13,6 @@ C_SRCS = \
 	defdlg.c \
 	defwnd.c \
 	dialog.c \
-	dinput.c \
 	driver.c \
 	event.c \
 	focus.c \