Made ddraw and dinput separate dlls.
diff --git a/Make.rules.in b/Make.rules.in
index 8c74900..0fdd734 100644
--- a/Make.rules.in
+++ b/Make.rules.in
@@ -85,6 +85,8 @@
comctl32 \
comdlg32 \
dciman32 \
+ ddraw \
+ dinput \
dplayx \
dsound \
icmp \
diff --git a/configure b/configure
index f625d26..06a8fdd 100755
--- a/configure
+++ b/configure
@@ -6185,6 +6185,8 @@
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/commdlg/Makefile
dlls/crtdll/Makefile
dlls/dciman32/Makefile
+dlls/ddraw/Makefile
+dlls/dinput/Makefile
dlls/display/Makefile
dlls/dplayx/Makefile
dlls/dsound/Makefile
diff --git a/configure.in b/configure.in
index ef8024d..b7391c9 100644
--- a/configure.in
+++ b/configure.in
@@ -947,6 +947,8 @@
dlls/commdlg/Makefile
dlls/crtdll/Makefile
dlls/dciman32/Makefile
+dlls/ddraw/Makefile
+dlls/dinput/Makefile
dlls/display/Makefile
dlls/dplayx/Makefile
dlls/dsound/Makefile
diff --git a/dlls/Makefile.in b/dlls/Makefile.in
index 45a5bfd..82696c5 100644
--- a/dlls/Makefile.in
+++ b/dlls/Makefile.in
@@ -8,6 +8,8 @@
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 @@
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@ $@
diff --git a/dlls/ddraw/.cvsignore b/dlls/ddraw/.cvsignore
new file mode 100644
index 0000000..2586cb4
--- /dev/null
+++ b/dlls/ddraw/.cvsignore
@@ -0,0 +1,3 @@
+Makefile
+ddraw.spec.c
+libddraw.so.1.0
diff --git a/dlls/ddraw/Makefile.in b/dlls/ddraw/Makefile.in
new file mode 100644
index 0000000..abd64aa
--- /dev/null
+++ b/dlls/ddraw/Makefile.in
@@ -0,0 +1,23 @@
+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:
+
diff --git a/graphics/d3d_private.h b/dlls/ddraw/d3d_private.h
similarity index 100%
rename from graphics/d3d_private.h
rename to dlls/ddraw/d3d_private.h
diff --git a/graphics/d3dcommon.c b/dlls/ddraw/d3dcommon.c
similarity index 100%
rename from graphics/d3dcommon.c
rename to dlls/ddraw/d3dcommon.c
diff --git a/graphics/d3ddevices.c b/dlls/ddraw/d3ddevices.c
similarity index 100%
rename from graphics/d3ddevices.c
rename to dlls/ddraw/d3ddevices.c
diff --git a/graphics/d3dexecutebuffer.c b/dlls/ddraw/d3dexecutebuffer.c
similarity index 100%
rename from graphics/d3dexecutebuffer.c
rename to dlls/ddraw/d3dexecutebuffer.c
diff --git a/graphics/d3dlight.c b/dlls/ddraw/d3dlight.c
similarity index 100%
rename from graphics/d3dlight.c
rename to dlls/ddraw/d3dlight.c
diff --git a/graphics/d3dmaterial.c b/dlls/ddraw/d3dmaterial.c
similarity index 100%
rename from graphics/d3dmaterial.c
rename to dlls/ddraw/d3dmaterial.c
diff --git a/graphics/d3dtexture.c b/dlls/ddraw/d3dtexture.c
similarity index 100%
rename from graphics/d3dtexture.c
rename to dlls/ddraw/d3dtexture.c
diff --git a/graphics/d3dviewport.c b/dlls/ddraw/d3dviewport.c
similarity index 100%
rename from graphics/d3dviewport.c
rename to dlls/ddraw/d3dviewport.c
diff --git a/relay32/ddraw.spec b/dlls/ddraw/ddraw.spec
similarity index 100%
rename from relay32/ddraw.spec
rename to dlls/ddraw/ddraw.spec
diff --git a/graphics/ddraw.c b/dlls/ddraw/ddraw_main.c
similarity index 100%
rename from graphics/ddraw.c
rename to dlls/ddraw/ddraw_main.c
diff --git a/graphics/ddraw_private.h b/dlls/ddraw/ddraw_private.h
similarity index 100%
rename from graphics/ddraw_private.h
rename to dlls/ddraw/ddraw_private.h
diff --git a/dlls/dinput/.cvsignore b/dlls/dinput/.cvsignore
new file mode 100644
index 0000000..c1559dc
--- /dev/null
+++ b/dlls/dinput/.cvsignore
@@ -0,0 +1,3 @@
+Makefile
+dinput.spec.c
+libdinput.so.1.0
diff --git a/dlls/dinput/Makefile.in b/dlls/dinput/Makefile.in
new file mode 100644
index 0000000..b0abec7
--- /dev/null
+++ b/dlls/dinput/Makefile.in
@@ -0,0 +1,16 @@
+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:
+
diff --git a/relay32/dinput.spec b/dlls/dinput/dinput.spec
similarity index 100%
rename from relay32/dinput.spec
rename to dlls/dinput/dinput.spec
diff --git a/windows/dinput.c b/dlls/dinput/dinput_main.c
similarity index 99%
rename from windows/dinput.c
rename to dlls/dinput/dinput_main.c
index 3165bfa..32503f5 100644
--- a/windows/dinput.c
+++ b/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
diff --git a/graphics/Makefile.in b/graphics/Makefile.in
index c04a081..b9cd3d8 100644
--- a/graphics/Makefile.in
+++ b/graphics/Makefile.in
@@ -8,14 +8,6 @@
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 \
diff --git a/graphics/vga.c b/graphics/vga.c
index 1d5889c..078bd5c 100644
--- a/graphics/vga.c
+++ b/graphics/vga.c
@@ -23,6 +23,8 @@
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 @@
{
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;
diff --git a/relay32/Makefile.in b/relay32/Makefile.in
index c63a22e..abcf3a6 100644
--- a/relay32/Makefile.in
+++ b/relay32/Makefile.in
@@ -6,8 +6,6 @@
MODULE = relay32
SPEC_SRCS = \
- ddraw.spec \
- dinput.spec \
gdi32.spec \
kernel32.spec \
user32.spec \
diff --git a/windows/Makefile.in b/windows/Makefile.in
index c8fdf3d..f690067 100644
--- a/windows/Makefile.in
+++ b/windows/Makefile.in
@@ -13,7 +13,6 @@
defdlg.c \
defwnd.c \
dialog.c \
- dinput.c \
driver.c \
event.c \
focus.c \
