Author: dreimer
Date: Wed Apr 23 04:55:55 2008
New Revision: 33126
URL:
http://svn.reactos.org/svn/reactos?rev=33126&view=rev
Log:
Revert r33093. It breaks build for me and fixes no circular dependency for the rest.
Set the new added wine dlls to autosync in readme.wine.
Removed:
trunk/reactos/dll/win32/msi/msiserver_v2.idl
Modified:
trunk/reactos/dll/win32/msi/msi.rbuild
trunk/reactos/media/doc/README.WINE
Modified: trunk/reactos/dll/win32/msi/msi.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msi.rbuild?r…
==============================================================================
--- trunk/reactos/dll/win32/msi/msi.rbuild [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msi/msi.rbuild [iso-8859-1] Wed Apr 23 04:55:55 2008
@@ -1,6 +1,3 @@
-<module name="msi_msiserver_typelib" type="embeddedtypelib"
allowwarnings="true">
- <file>msiserver_v2.idl</file>
-</module>
<?xml version="1.0"?>
<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
<group>
@@ -9,11 +6,9 @@
<importlibrary definition="msi.spec.def" />
<include base="msi">.</include>
<include base="ReactOS">include/reactos/wine</include>
- <include base="msi" root="intermediate">.</include>
<define name="__WINESRC__" />
<define name="WINVER">0x600</define>
<define name="_WIN32_WINNT">0x600</define>
- <dependency>msi_msiserver_typelib</dependency>
<file>action.c</file>
<file>alter.c</file>
<file>appsearch.c</file>
@@ -57,6 +52,7 @@
<file>where.c</file>
<file>msiserver.idl</file>
<file>msi.rc</file>
+ <include base="msi" root="intermediate">.</include>
<file>msi.spec</file>
<library>wine</library>
<library>urlmon</library>
@@ -75,5 +71,9 @@
<library>odbccp32</library>
<library>uuid</library>
<library>ntdll</library>
+ <dependency>msi_msiserver_typelib</dependency>
</module>
-</group>
+<module name="msi_msiserver_typelib" type="embeddedtypelib"
allowwarnings="true">
+ <file>msiserver.idl</file>
+</module>
+</group>
Removed: trunk/reactos/dll/win32/msi/msiserver_v2.idl
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msiserver_v2…
==============================================================================
--- trunk/reactos/dll/win32/msi/msiserver_v2.idl [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msi/msiserver_v2.idl (removed)
@@ -1,1 +1,0 @@
-#include "msiserver.idl"
Modified: trunk/reactos/media/doc/README.WINE
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…
==============================================================================
--- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Wed Apr 23 04:55:55 2008
@@ -72,7 +72,7 @@
reactos/dll/win32/oleaut32 # Autosync
reactos/dll/win32/oledlg # Autosync
reactos/dll/win32/olepro32 # Autosync
-reactos/dll/win32/pdh # Out of sync
+reactos/dll/win32/pdh # Autosync
reactos/dll/win32/powrprof # Autosync
reactos/dll/win32/printui # Autosync
reactos/dll/win32/rasapi32 # Autosync
@@ -88,15 +88,15 @@
reactos/dll/win32/shdocvw # Synced to Wine-0_9_5
reactos/dll/win32/shfolder # Autosync
reactos/dll/win32/shlwapi # Autosync
-reactos/dll/win32/stdole2.tlb # Out of Sync
-reactos/dll/win32/tapi32 # Out of sync
+reactos/dll/win32/stdole2.tlb # Autosync
+reactos/dll/win32/tapi32 # Autosync
reactos/dll/win32/twain_32 # Out of sync
reactos/dll/win32/urlmon # Autosync
-reactos/dll/win32/usp10 # Out of sync
+reactos/dll/win32/usp10 # Autosync
reactos/dll/win32/uxtheme # Autosync
reactos/dll/win32/version # Autosync
reactos/dll/win32/wininet # Autosync
-reactos/dll/win32/winhttp # Out of Sync
+reactos/dll/win32/winhttp # Autosync
reactos/dll/win32/wintrust # Out of sync
reactos/dll/win32/winmm # Forked at Wine-20050628
reactos/dll/win32/winmm/midimap # Forked at Wine-20050628