Prepare import of mshtml (1/2)

svn path=/trunk/; revision=32912

diff --git a/reactos/baseaddress.rbuild b/reactos/baseaddress.rbuild
index df914e0..65faaf1 100644 (file)
--- a/reactos/baseaddress.rbuild
+++ b/reactos/baseaddress.rbuild
@@ -116,6 +116,7 @@
   <property name="BASEADDRESS_LSASRV" value="0x76540000" />
   <property name="BASEADDRESS_MIDIMAP" value="0x76600000" />
   <property name="BASEADDRESS_ODBC32" value="0x76660000" />
+  <property name="BASEADDRESS_MSHTML" value="0x76660000" />
   <property name="BASEADDRESS_ODBCCP32" value="0x76380000" />
   <property name="BASEADDRESS_WAVEMAP" value="0x76610000" />
   <property name="BASEADDRESS_MPR" value="0x76620000" />

diff --git a/reactos/boot/bootdata/packages/reactos.dff b/reactos/boot/bootdata/packages/reactos.dff
index 0051dd6..91cf125 100644 (file)
--- a/reactos/boot/bootdata/packages/reactos.dff
+++ b/reactos/boot/bootdata/packages/reactos.dff
@@ -212,6 +212,7 @@ dll\win32\mpr\mpr.dll                               1
 dll\win32\msacm32\msacm32.dll                       1
 dll\win32\msafd\msafd.dll                           1
 dll\win32\msgina\msgina.dll                         1
+dll\win32\mshtml\mshtml.dll                         1
 dll\win32\msi\msi.dll                               1
 dll\win32\msimg32\msimg32.dll                       1
 dll\win32\msvcrt\msvcrt.dll                         1
@@ -567,6 +568,7 @@ modules\rostests\winetests\kernel32\kernel32_winetest.exe                  7   o
 modules\rostests\winetests\lz32\lz32_winetest.exe                          7   optional
 modules\rostests\winetests\mapi32\mapi32_winetest.exe                      7   optional
 modules\rostests\winetests\mlang\mlang_winetest.exe                        7   optional
+modules\rostests\winetests\mshtml\mshtml_winetest.exe                      7   optional
 modules\rostests\winetests\msi\msi_winetest.exe                            7   optional
 modules\rostests\winetests\msvcrt\msvcrt_winetest.exe                      7   optional
 modules\rostests\winetests\netapi32\netapi32_winetest.exe                  7   optional

diff --git a/reactos/dll/win32/win32.rbuild b/reactos/dll/win32/win32.rbuild
index 8e8ac10..bc7132a 100644 (file)
--- a/reactos/dll/win32/win32.rbuild
+++ b/reactos/dll/win32/win32.rbuild
@@ -145,6 +145,9 @@
 <directory name="msgina">
        <xi:include href="msgina/msgina.rbuild" />
 </directory>
+<directory name="mshtml">
+       <xi:include href="mshtml/mshtml.rbuild" />
+</directory>
 <directory name="msi">
        <xi:include href="msi/msi.rbuild" />
 </directory>

diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE
index 96ca7cf..a890842 100644 (file)
--- a/reactos/media/doc/README.WINE
+++ b/reactos/media/doc/README.WINE
@@ -53,6 +53,7 @@ reactos/dll/win32/mapi32          # Autosync
 reactos/dll/win32/mlang           # Autosync
 reactos/dll/win32/mpr             # Autosync
 reactos/dll/win32/msacm32         # Out of sync
+reactos/dll/win32/mshtml          # Autosync
 reactos/dll/win32/msimg32         # Autosync
 reactos/dll/win32/msi             # Autosync
 reactos/dll/win32/msvcrt20        # Autosync