Author: hpoussin Date: Thu Jan 17 19:12:44 2008 New Revision: 31843
URL: http://svn.reactos.org/svn/reactos?rev=31843&view=rev Log: Do not autoregister msi, as long as problem is not fixed (2nd stage break)
Modified: trunk/reactos/dll/win32/msi/msi.rbuild trunk/reactos/dll/win32/msi/msi_ros.diff
Modified: trunk/reactos/dll/win32/msi/msi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msi.rbuild?re... ============================================================================== --- trunk/reactos/dll/win32/msi/msi.rbuild (original) +++ trunk/reactos/dll/win32/msi/msi.rbuild Thu Jan 17 19:12:44 2008 @@ -2,7 +2,7 @@ <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <group> <module name="msi" type="win32dll" baseaddress="${BASEADDRESS_MSI}" installbase="system32" installname="msi.dll" allowwarnings="true"> - <autoregister infsection="OleControlDlls" type="DllRegisterServer" /> + <!--autoregister infsection="OleControlDlls" type="DllRegisterServer" /--> <importlibrary definition="msi.spec.def" /> <include base="msi">.</include> <include base="ReactOS">include/reactos/wine</include>
Modified: trunk/reactos/dll/win32/msi/msi_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msi_ros.diff?... ============================================================================== --- trunk/reactos/dll/win32/msi/msi_ros.diff (original) +++ trunk/reactos/dll/win32/msi/msi_ros.diff Thu Jan 17 19:12:44 2008 @@ -2589,19 +2589,6 @@ <file>streams.c</file> <file>string.c</file> <file>suminfo.c</file> -Index: msi.rc -=================================================================== ---- msi.rc (revision 31639) -+++ msi.rc (working copy) -@@ -47,7 +47,7 @@ - - LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL - --1 TYPELIB LOADONCALL DISCARDABLE msiserver.tlb -+/* 1 TYPELIB LOADONCALL DISCARDABLE msiserver.tlb */ - - /* @makedep: instadvert.bmp */ - 0x1001 BITMAP instadvert.bmp Index: msi_Ja.rc =================================================================== --- msi_Ja.rc (revision 31639)