From 5417e5d19ca78496a679fbec07a1403d9227e76b Mon Sep 17 00:00:00 2001
From: Filip Navara <filip.navara@gmail.com>
Date: Mon, 30 May 2005 12:52:38 +0000
Subject: [PATCH] Add MSVFW32 and MSWSOCK to the build.

svn path=/trunk/; revision=15680
---
 reactos/baseaddress.xml                   |  4 +--
 reactos/bootdata/packages/reactos.dff     |  2 ++
 reactos/lib/directory.xml                 |  6 ++++
 reactos/lib/msvideo/Makefile              |  9 ------
 reactos/lib/msvideo/Makefile.ros-template | 21 -------------
 reactos/lib/msvideo/msvfw32.xml           | 21 +++++++++++++
 reactos/lib/mswsock/Makefile              | 37 -----------------------
 reactos/lib/mswsock/mswsock.xml           | 11 +++++++
 8 files changed, 42 insertions(+), 69 deletions(-)
 delete mode 100644 reactos/lib/msvideo/Makefile
 delete mode 100644 reactos/lib/msvideo/Makefile.ros-template
 create mode 100644 reactos/lib/msvideo/msvfw32.xml
 delete mode 100644 reactos/lib/mswsock/Makefile
 create mode 100644 reactos/lib/mswsock/mswsock.xml

diff --git a/reactos/baseaddress.xml b/reactos/baseaddress.xml
index ce4bddc9560..b24e3c3a917 100644
--- a/reactos/baseaddress.xml
+++ b/reactos/baseaddress.xml
@@ -75,6 +75,8 @@
 <property name="BASEADDRESS_DNSAPI" value="0x77f00000" />
 <property name="BASEADDRESS_MSVCRT" value="0x78000000" />
 <property name="BASEADDRESS_MSVCRT20" value="0x78500000" />
+<property name="BASEADDRESS_MSVFW32" value="0x77400000" />
+<property name="BASEADDRESS_MSWSOCK" value="0x71a30000" />
 <property name="BASEADDRESS_KERNEL32" value="0x7c800000" />
 <property name="BASEADDRESS_NTDLL" value="0x7C900000" />
 <property name="BASEADDRESS_FREETYPE" value="0x7F000000" />
@@ -84,9 +86,7 @@
 <property name="BASEADDRESS_HID" value="0x688F0000" />
 <property name="BASEADDRESS_PSXDLL" value="0x68eb0000" />
 <property name="BASEADDRESS_NETPLWIZ" value="0x6a240000" />
-<property name="BASEADDRESS_DISPLAY" value="DISPLAY" />
 <property name="BASEADDRESS_ACLUI" value="0x71550000" />
-<property name="BASEADDRESS_MSWSOCK" value="0x71a30000" />
 <property name="BASEADDRESS_WINFAX" value="0x722C0000" />
 <property name="BASEADDRESS_DEVMGR" value="0x72a90000" />
 <property name="BASEADDRESS_WINSCARD" value="0x723D0000" />
diff --git a/reactos/bootdata/packages/reactos.dff b/reactos/bootdata/packages/reactos.dff
index 86c1e625ab2..cea620eb87e 100755
--- a/reactos/bootdata/packages/reactos.dff
+++ b/reactos/bootdata/packages/reactos.dff
@@ -107,6 +107,8 @@ lib\msi\msi.dll                         1
 lib\msimg32\msimg32.dll                 1
 lib\msvcrt\msvcrt.dll                   1
 lib\msvcrt20\msvcrt20.dll               1
+lib\msvideo\msvfw32.dll                 1
+lib\mswsock\mswsock.dll                 1
 lib\netapi32\netapi32.dll               1
 lib\ntdll\ntdll.dll                     1
 lib\ole32\ole32.dll                     1
diff --git a/reactos/lib/directory.xml b/reactos/lib/directory.xml
index a8ce08f18df..b19a3697d0c 100644
--- a/reactos/lib/directory.xml
+++ b/reactos/lib/directory.xml
@@ -166,6 +166,12 @@
 <directory name="msvcrt20">
 	<xi:include href="msvcrt20/msvcrt20.xml" />
 </directory>
+<directory name="msvideo">
+	<xi:include href="msvideo/msvfw32.xml" />
+</directory>
+<directory name="mswsock">
+	<xi:include href="mswsock/mswsock.xml" />
+</directory>
 <directory name="netapi32">
 	<xi:include href="netapi32/netapi32.xml" />
 </directory>
diff --git a/reactos/lib/msvideo/Makefile b/reactos/lib/msvideo/Makefile
deleted file mode 100644
index fa2e9d9f853..00000000000
--- a/reactos/lib/msvideo/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-# $Id$
-
-PATH_TO_TOP = ../..
-
-TARGET_TYPE = winedll
-
-include $(PATH_TO_TOP)/rules.mak
-
-include $(TOOLS_PATH)/helper.mk
diff --git a/reactos/lib/msvideo/Makefile.ros-template b/reactos/lib/msvideo/Makefile.ros-template
deleted file mode 100644
index 2ece54d9ba9..00000000000
--- a/reactos/lib/msvideo/Makefile.ros-template
+++ /dev/null
@@ -1,21 +0,0 @@
-# $Id$
-
-TARGET_NAME = msvfw32
-
-TARGET_OBJECTS = @C_SRCS@
-
-TARGET_CFLAGS = @EXTRADEFS@ -D__REACTOS__
-
-TARGET_SDKLIBS = @IMPORTS@ wine.a wine_uuid.a ntdll.a
-
-TARGET_BASE = $(TARGET_BASE_LIB_WINMM)
-
-TARGET_RC_SRCS = @RC_SRCS@
-TARGET_RC_BINSRC = @RC_BINSRC@
-TARGET_RC_BINARIES = @RC_BINARIES@
-
-default: all
-
-DEP_OBJECTS = $(TARGET_OBJECTS)
-
-include $(TOOLS_PATH)/depend.mk
diff --git a/reactos/lib/msvideo/msvfw32.xml b/reactos/lib/msvideo/msvfw32.xml
new file mode 100644
index 00000000000..741d2f87659
--- /dev/null
+++ b/reactos/lib/msvideo/msvfw32.xml
@@ -0,0 +1,21 @@
+<module name="msvfw32" type="win32dll" baseaddress="${BASEADDRESS_MSVFW32}" installbase="system32" installname="msvfw32.dll">
+	<importlibrary definition="msvfw32.spec.def" />
+	<include base="ReactOS">include/wine</include>
+	<define name="UNICODE" />
+	<define name="_UNICODE" />
+	<define name="__REACTOS__" />
+	<define name="__USE_W32API" />
+	<define name="_WIN32_IE">0x600</define>
+	<define name="_WIN32_WINNT">0x501</define>
+	<define name="WINVER">0x501</define>
+	<library>winmm</library>
+	<library>gdi32</library>
+	<library>comctl32</library>
+	<library>kernel32</library>
+	<library>ntdll</library>
+	<file>drawdib.c</file>
+	<file>mciwnd.c</file>
+	<file>msvfw32.rc</file>
+	<file>msvideo_main.c</file>
+	<file>msvfw32.spec</file>
+</module>
diff --git a/reactos/lib/mswsock/Makefile b/reactos/lib/mswsock/Makefile
deleted file mode 100644
index 2a06f804fe2..00000000000
--- a/reactos/lib/mswsock/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id$
-
-PATH_TO_TOP = ../..
-
-TARGET_TYPE = dynlink
-
-TARGET_NAME = mswsock
-
-TARGET_BASE = $(TARGET_BASE_LIB_MSWSOCK)
-
-TARGET_CFLAGS = \
- -I./include \
- -Wall \
- -Werror \
- -fno-builtin \
- -DUNICODE \
- -DLE \
- -DDBG \
- -D__USE_W32API
-
-TARGET_LFLAGS = -nostartfiles -nostdlib
-
-TARGET_SDKLIBS = kernel32.a ws2_32.a
-
-TARGET_OBJECTS = stubs.o extensions.o
-
-TARGET_CLEAN = $(DEP_FILES)
-
-include $(PATH_TO_TOP)/rules.mak
-
-include $(TOOLS_PATH)/helper.mk
-
-# Automatic dependency tracking
-DEP_OBJECTS := $(TARGET_OBJECTS)
-include $(PATH_TO_TOP)/tools/depend.mk
-
-# EOF
diff --git a/reactos/lib/mswsock/mswsock.xml b/reactos/lib/mswsock/mswsock.xml
new file mode 100644
index 00000000000..5a92f06c740
--- /dev/null
+++ b/reactos/lib/mswsock/mswsock.xml
@@ -0,0 +1,11 @@
+<module name="mswsock" type="win32dll" baseaddress="${BASEADDRESS_MSWSOCK}" installbase="system32" installname="mswsock.dll">
+	<importlibrary definition="mswsock.def" />
+	<define name="UNICODE" />
+	<define name="LE" />
+	<define name="__USE_W32API" />
+	<library>kernel32</library>
+	<library>ws2_32</library>
+	<file>extensions.c</file>
+	<file>stubs.c</file>
+	<file>mswsock.rc</file>
+</module>