[ros-diffs] [tkreuzer] 46523: - Fix assert macro - Add crt="MSVC" to a number of modules to resolve _assert

Author: tkreuzer
Date: Sun Mar 28 21:56:11 2010
New Revision: 46523

URL: http://svn.reactos.org/svn/reactos?rev=46523&view=rev
Log:
- Fix assert macro
- Add crt="MSVC" to a number of modules to resolve _assert

Modified:
    branches/ros-amd64-bringup/reactos/dll/directx/qedit/qedit.rbuild
    branches/ros-amd64-bringup/reactos/dll/directx/quartz/quartz.rbuild
    branches/ros-amd64-bringup/reactos/dll/directx/wine/ddraw/ddraw.rbuild
    branches/ros-amd64-bringup/reactos/dll/win32/avifil32/avifil32.rbuild
    branches/ros-amd64-bringup/reactos/dll/win32/comctl32/comctl32.rbuild
    branches/ros-amd64-bringup/reactos/dll/win32/comdlg32/comdlg32.rbuild
    branches/ros-amd64-bringup/reactos/dll/win32/imaadp32.acm/imaadp32.acm.rbuild
    branches/ros-amd64-bringup/reactos/dll/win32/inetmib1/inetmib1.rbuild
    branches/ros-amd64-bringup/reactos/dll/win32/mciwave/mciwave.rbuild
    branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm32.rbuild
    branches/ros-amd64-bringup/reactos/dll/win32/msadp32.acm/msadp32.acm.rbuild
    branches/ros-amd64-bringup/reactos/dll/win32/msg711.acm/msg711.acm.rbuild
    branches/ros-amd64-bringup/reactos/dll/win32/msrle32/msrle32.rbuild
    branches/ros-amd64-bringup/reactos/dll/win32/odbccp32/odbccp32.rbuild
    branches/ros-amd64-bringup/reactos/dll/win32/ole32/ole32.rbuild
    branches/ros-amd64-bringup/reactos/dll/win32/riched20/riched20.rbuild
    branches/ros-amd64-bringup/reactos/dll/win32/winemp3.acm/winemp3.acm.rbuild
    branches/ros-amd64-bringup/reactos/dll/win32/wintrust/wintrust.rbuild
    branches/ros-amd64-bringup/reactos/include/crt/assert.h

Modified: branches/ros-amd64-bringup/reactos/dll/directx/qedit/qedit.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/d…
==============================================================================
--- branches/ros-amd64-bringup/reactos/dll/directx/qedit/qedit.rbuild [iso-8859-1]
(original)
+++ branches/ros-amd64-bringup/reactos/dll/directx/qedit/qedit.rbuild [iso-8859-1] Sun Mar
28 21:56:11 2010
@@ -1,4 +1,4 @@
-<module name="qedit" type="win32dll"
baseaddress="${BASEADDRESS_QEDIT}" installbase="system32"
installname="qedit.dll" allowwarnings="true">
+<module name="qedit" type="win32dll"
baseaddress="${BASEADDRESS_QEDIT}" installbase="system32"
installname="qedit.dll" allowwarnings="true"
crt="MSVCRT">
 	<autoregister infsection="OleControlDlls"
type="DllRegisterServer" />
 	<importlibrary definition="qedit.spec" />
 	<include base="qedit">.</include>

Modified: branches/ros-amd64-bringup/reactos/dll/directx/quartz/quartz.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/d…
==============================================================================
--- branches/ros-amd64-bringup/reactos/dll/directx/quartz/quartz.rbuild [iso-8859-1]
(original)
+++ branches/ros-amd64-bringup/reactos/dll/directx/quartz/quartz.rbuild [iso-8859-1] Sun
Mar 28 21:56:11 2010
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
-<module name="quartz" type="win32dll"
baseaddress="${BASEADDRESS_QUARTZ}" installbase="system32"
installname="quartz.dll" allowwarnings="true">
+<module name="quartz" type="win32dll"
baseaddress="${BASEADDRESS_QUARTZ}" installbase="system32"
installname="quartz.dll" allowwarnings="true"
crt="MSVCRT">
 	<autoregister infsection="OleControlDlls"
type="DllRegisterServer" />
 	<importlibrary definition="quartz.spec" />
 	<include base="quartz">.</include>

Modified: branches/ros-amd64-bringup/reactos/dll/directx/wine/ddraw/ddraw.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/d…
==============================================================================
--- branches/ros-amd64-bringup/reactos/dll/directx/wine/ddraw/ddraw.rbuild [iso-8859-1]
(original)
+++ branches/ros-amd64-bringup/reactos/dll/directx/wine/ddraw/ddraw.rbuild [iso-8859-1]
Sun Mar 28 21:56:11 2010
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
-<module name="ddraw" type="win32dll"
installbase="system32" installname="ddraw.dll" allowwarnings
="true">
+<module name="ddraw" type="win32dll"
installbase="system32" installname="ddraw.dll" allowwarnings
="true" crt="msvcrt">
 	<autoregister infsection="OleControlDlls"
type="DllRegisterServer" />
 	<importlibrary definition="ddraw.spec" />
 	<include base="ddraw">.</include>

Modified: branches/ros-amd64-bringup/reactos/dll/win32/avifil32/avifil32.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w…
==============================================================================
--- branches/ros-amd64-bringup/reactos/dll/win32/avifil32/avifil32.rbuild [iso-8859-1]
(original)
+++ branches/ros-amd64-bringup/reactos/dll/win32/avifil32/avifil32.rbuild [iso-8859-1] Sun
Mar 28 21:56:11 2010
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
-<module name="avifil32" type="win32dll"
baseaddress="${BASEADDRESS_AVIFIL32}" installbase="system32"
installname="avifil32.dll" allowwarnings="true">
+<module name="avifil32" type="win32dll"
baseaddress="${BASEADDRESS_AVIFIL32}" installbase="system32"
installname="avifil32.dll" allowwarnings="true"
crt="msvcrt">
 	<autoregister infsection="OleControlDlls"
type="DllRegisterServer" />
 	<importlibrary definition="avifil32.spec" />
 	<include base="avifil32">.</include>

Modified: branches/ros-amd64-bringup/reactos/dll/win32/comctl32/comctl32.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w…
==============================================================================
--- branches/ros-amd64-bringup/reactos/dll/win32/comctl32/comctl32.rbuild [iso-8859-1]
(original)
+++ branches/ros-amd64-bringup/reactos/dll/win32/comctl32/comctl32.rbuild [iso-8859-1] Sun
Mar 28 21:56:11 2010
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
-<module name="comctl32" type="win32dll"
baseaddress="${BASEADDRESS_COMCTL32}" installbase="system32"
installname="comctl32.dll" unicode="yes"
allowwarnings="true">
+<module name="comctl32" type="win32dll"
baseaddress="${BASEADDRESS_COMCTL32}" installbase="system32"
installname="comctl32.dll" unicode="yes"
allowwarnings="true" crt="msvcrt">
 	<autoregister infsection="OleControlDlls" type="DllInstall"
/>
 	<importlibrary definition="comctl32.spec" />
 	<include base="comctl32">.</include>

Modified: branches/ros-amd64-bringup/reactos/dll/win32/comdlg32/comdlg32.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w…
==============================================================================
--- branches/ros-amd64-bringup/reactos/dll/win32/comdlg32/comdlg32.rbuild [iso-8859-1]
(original)
+++ branches/ros-amd64-bringup/reactos/dll/win32/comdlg32/comdlg32.rbuild [iso-8859-1] Sun
Mar 28 21:56:11 2010
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
-<module name="comdlg32" type="win32dll"
baseaddress="${BASEADDRESS_COMDLG32}" installbase="system32"
installname="comdlg32.dll" allowwarnings="true">
+<module name="comdlg32" type="win32dll"
baseaddress="${BASEADDRESS_COMDLG32}" installbase="system32"
installname="comdlg32.dll" allowwarnings="true"
crt="msvcrt">
 	<importlibrary definition="comdlg32.spec" />
 	<include base="comdlg32">.</include>
 	<include base="ReactOS">include/reactos/wine</include>

Modified: branches/ros-amd64-bringup/reactos/dll/win32/imaadp32.acm/imaadp32.acm.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w…
==============================================================================
--- branches/ros-amd64-bringup/reactos/dll/win32/imaadp32.acm/imaadp32.acm.rbuild
[iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/dll/win32/imaadp32.acm/imaadp32.acm.rbuild
[iso-8859-1] Sun Mar 28 21:56:11 2010
@@ -1,4 +1,4 @@
-<module name="imaadp32.acm" type="win32dll"
baseaddress="${BASEADDRESS_IMAADP32ACM}" installbase="system32"
installname="imaadp32.acm" allowwarnings="true"
entrypoint="0">
+<module name="imaadp32.acm" type="win32dll"
baseaddress="${BASEADDRESS_IMAADP32ACM}" installbase="system32"
installname="imaadp32.acm" allowwarnings="true"
entrypoint="0" crt="msvcrt">
 	<importlibrary definition="imaadp32.acm.spec" />
 	<include base="imaadp32.acm">.</include>
 	<include base="ReactOS">include/reactos/wine</include>

Modified: branches/ros-amd64-bringup/reactos/dll/win32/inetmib1/inetmib1.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w…
==============================================================================
--- branches/ros-amd64-bringup/reactos/dll/win32/inetmib1/inetmib1.rbuild [iso-8859-1]
(original)
+++ branches/ros-amd64-bringup/reactos/dll/win32/inetmib1/inetmib1.rbuild [iso-8859-1] Sun
Mar 28 21:56:11 2010
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
-<module name="inetmib1" type="win32dll"
baseaddress="${BASEADDRESS_INETMIB1}" installbase="system32"
installname="inetmib1.dll" allowwarnings="true">
+<module name="inetmib1" type="win32dll"
baseaddress="${BASEADDRESS_INETMIB1}" installbase="system32"
installname="inetmib1.dll" allowwarnings="true"
crt="msvcrt">
 	<importlibrary definition="inetmib1.spec" />
 	<include base="inetmib1">.</include>
 	<include base="ReactOS">include/reactos/wine</include>

Modified: branches/ros-amd64-bringup/reactos/dll/win32/mciwave/mciwave.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w…
==============================================================================
--- branches/ros-amd64-bringup/reactos/dll/win32/mciwave/mciwave.rbuild [iso-8859-1]
(original)
+++ branches/ros-amd64-bringup/reactos/dll/win32/mciwave/mciwave.rbuild [iso-8859-1] Sun
Mar 28 21:56:11 2010
@@ -1,4 +1,4 @@
-<module name="mciwave" type="win32dll"
baseaddress="${BASEADDRESS_MCIWAVE}" installbase="system32"
installname="mciwave.dll" allowwarnings="true"
entrypoint="0">
+<module name="mciwave" type="win32dll"
baseaddress="${BASEADDRESS_MCIWAVE}" installbase="system32"
installname="mciwave.dll" allowwarnings="true"
entrypoint="0" crt="msvcrt">
 	<importlibrary definition="mciwave.spec" />
 	<include base="mciwave">.</include>
 	<include base="ReactOS">include/reactos/wine</include>

Modified: branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm32.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w…
==============================================================================
--- branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm32.rbuild [iso-8859-1]
(original)
+++ branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm32.rbuild [iso-8859-1] Sun
Mar 28 21:56:11 2010
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
-<module name="msacm32" type="win32dll"
baseaddress="${BASEADDRESS_MSACM32}" installbase="system32"
installname="msacm32.dll" unicode="yes">
+<module name="msacm32" type="win32dll"
baseaddress="${BASEADDRESS_MSACM32}" installbase="system32"
installname="msacm32.dll" unicode="yes" crt="msvcrt">
 	<importlibrary definition="msacm32.spec" />
 	<include base="msacm32">.</include>
 	<include base="ReactOS">include/reactos/wine</include>

Modified: branches/ros-amd64-bringup/reactos/dll/win32/msadp32.acm/msadp32.acm.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w…
==============================================================================
--- branches/ros-amd64-bringup/reactos/dll/win32/msadp32.acm/msadp32.acm.rbuild
[iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/dll/win32/msadp32.acm/msadp32.acm.rbuild
[iso-8859-1] Sun Mar 28 21:56:11 2010
@@ -1,4 +1,4 @@
-<module name="msadp32.acm" type="win32dll"
baseaddress="${BASEADDRESS_MSADP32ACM}" installbase="system32"
installname="msadp32.acm" allowwarnings="true"
entrypoint="0">
+<module name="msadp32.acm" type="win32dll"
baseaddress="${BASEADDRESS_MSADP32ACM}" installbase="system32"
installname="msadp32.acm" allowwarnings="true"
entrypoint="0" crt="msvcrt">
 	<importlibrary definition="msadp32.acm.spec" />
 	<include base="msadp32.acm">.</include>
 	<include base="ReactOS">include/reactos/wine</include>

Modified: branches/ros-amd64-bringup/reactos/dll/win32/msg711.acm/msg711.acm.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w…
==============================================================================
--- branches/ros-amd64-bringup/reactos/dll/win32/msg711.acm/msg711.acm.rbuild [iso-8859-1]
(original)
+++ branches/ros-amd64-bringup/reactos/dll/win32/msg711.acm/msg711.acm.rbuild [iso-8859-1]
Sun Mar 28 21:56:11 2010
@@ -1,4 +1,4 @@
-<module name="msg711.acm" type="win32dll"
baseaddress="${BASEADDRESS_MSG711ACM}" installbase="system32"
installname="msg711.acm" allowwarnings="true"
entrypoint="0">
+<module name="msg711.acm" type="win32dll"
baseaddress="${BASEADDRESS_MSG711ACM}" installbase="system32"
installname="msg711.acm" allowwarnings="true" entrypoint="0"
crt="msvcrt">
 	<importlibrary definition="msg711.acm.spec" />
 	<include base="msg711.acm">.</include>
 	<include base="ReactOS">include/reactos/wine</include>

Modified: branches/ros-amd64-bringup/reactos/dll/win32/msrle32/msrle32.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w…
==============================================================================
--- branches/ros-amd64-bringup/reactos/dll/win32/msrle32/msrle32.rbuild [iso-8859-1]
(original)
+++ branches/ros-amd64-bringup/reactos/dll/win32/msrle32/msrle32.rbuild [iso-8859-1] Sun
Mar 28 21:56:11 2010
@@ -1,4 +1,4 @@
-<module name="msrle32" type="win32dll"
baseaddress="${BASEADDRESS_MSRLE32}" installbase="system32"
installname="msrle32.dll" allowwarnings="true">
+<module name="msrle32" type="win32dll"
baseaddress="${BASEADDRESS_MSRLE32}" installbase="system32"
installname="msrle32.dll" allowwarnings="true"
crt="msvcrt">
 	<importlibrary definition="msrle32.spec" />
 	<include base="msrle32">.</include>
 	<include base="ReactOS">include/reactos/wine</include>

Modified: branches/ros-amd64-bringup/reactos/dll/win32/odbccp32/odbccp32.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w…
==============================================================================
--- branches/ros-amd64-bringup/reactos/dll/win32/odbccp32/odbccp32.rbuild [iso-8859-1]
(original)
+++ branches/ros-amd64-bringup/reactos/dll/win32/odbccp32/odbccp32.rbuild [iso-8859-1] Sun
Mar 28 21:56:11 2010
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
-<module name="odbccp32" type="win32dll"
baseaddress="${BASEADDRESS_ODBCCP32}" installbase="system32"
installname="odbccp32.dll" allowwarnings="true"
entrypoint="0">
+<module name="odbccp32" type="win32dll"
baseaddress="${BASEADDRESS_ODBCCP32}" installbase="system32"
installname="odbccp32.dll" allowwarnings="true"
entrypoint="0" crt="MSVCRT">
 	<importlibrary definition="odbccp32.spec" />
 	<include base="odbccp32">.</include>
 	<include base="ReactOS">include/reactos/wine</include>

Modified: branches/ros-amd64-bringup/reactos/dll/win32/ole32/ole32.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w…
==============================================================================
--- branches/ros-amd64-bringup/reactos/dll/win32/ole32/ole32.rbuild [iso-8859-1]
(original)
+++ branches/ros-amd64-bringup/reactos/dll/win32/ole32/ole32.rbuild [iso-8859-1] Sun Mar
28 21:56:11 2010
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
-<module name="ole32" type="win32dll"
baseaddress="${BASEADDRESS_OLE32}" installbase="system32"
installname="ole32.dll" allowwarnings="true">
+<module name="ole32" type="win32dll"
baseaddress="${BASEADDRESS_OLE32}" installbase="system32"
installname="ole32.dll" allowwarnings="true"
crt="MSVCRT">
 	<autoregister infsection="OleControlDlls"
type="DllRegisterServer" />
 	<importlibrary definition="ole32.spec" />
 	<include base="ole32">.</include>

Modified: branches/ros-amd64-bringup/reactos/dll/win32/riched20/riched20.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w…
==============================================================================
--- branches/ros-amd64-bringup/reactos/dll/win32/riched20/riched20.rbuild [iso-8859-1]
(original)
+++ branches/ros-amd64-bringup/reactos/dll/win32/riched20/riched20.rbuild [iso-8859-1] Sun
Mar 28 21:56:11 2010
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
-<module name="riched20" type="win32dll"
baseaddress="${BASEADDRESS_RICHED20}" installbase="system32"
installname="riched20.dll" allowwarnings="true">
+<module name="riched20" type="win32dll"
baseaddress="${BASEADDRESS_RICHED20}" installbase="system32"
installname="riched20.dll" allowwarnings="true"
crt="MSVCRT">
 	<importlibrary definition="riched20.spec" />
 	<include base="riched20">.</include>
 	<include base="ReactOS">include/reactos/wine</include>

Modified: branches/ros-amd64-bringup/reactos/dll/win32/winemp3.acm/winemp3.acm.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w…
==============================================================================
--- branches/ros-amd64-bringup/reactos/dll/win32/winemp3.acm/winemp3.acm.rbuild
[iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/dll/win32/winemp3.acm/winemp3.acm.rbuild
[iso-8859-1] Sun Mar 28 21:56:11 2010
@@ -1,4 +1,4 @@
-<module name="winemp3.acm" type="win32dll"
installbase="system32" installname="winemp3.acm"
allowwarnings="true" entrypoint="0">
+<module name="winemp3.acm" type="win32dll"
installbase="system32" installname="winemp3.acm"
allowwarnings="true" entrypoint="0" crt="MSVCRT">
 	<importlibrary definition="winemp3.acm.spec" />
 	<include base="winemp3.acm">.</include>
 	<include base="ReactOS">include/reactos/wine</include>

Modified: branches/ros-amd64-bringup/reactos/dll/win32/wintrust/wintrust.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w…
==============================================================================
--- branches/ros-amd64-bringup/reactos/dll/win32/wintrust/wintrust.rbuild [iso-8859-1]
(original)
+++ branches/ros-amd64-bringup/reactos/dll/win32/wintrust/wintrust.rbuild [iso-8859-1] Sun
Mar 28 21:56:11 2010
@@ -1,4 +1,4 @@
-<module name="wintrust" type="win32dll"
baseaddress="${BASEADDRESS_WINTRUST}" installbase="system32"
installname="wintrust.dll" allowwarnings="true">
+<module name="wintrust" type="win32dll"
baseaddress="${BASEADDRESS_WINTRUST}" installbase="system32"
installname="wintrust.dll" allowwarnings="true"
crt="MSVCRT">
 	<autoregister infsection="OleControlDlls"
type="DllRegisterServer" />
 	<importlibrary definition="wintrust.spec" />
 	<include base="wintrust">.</include>

Modified: branches/ros-amd64-bringup/reactos/include/crt/assert.h
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu…
==============================================================================
--- branches/ros-amd64-bringup/reactos/include/crt/assert.h [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/include/crt/assert.h [iso-8859-1] Sun Mar 28
21:56:11 2010
@@ -28,8 +28,7 @@
 #endif
 
 #ifndef assert
-//#define assert(_Expression) (void)((!!(_Expression)) ||
(_assert(#_Expression,__FILE__,__LINE__),0))
-#define assert(_Expression) (void)((!!(_Expression)))// ||
(_wassert(_CRT_WIDE(#_Expression),_CRT_WIDE(__FILE__),__LINE__),0))
+#define assert(_Expression) (void)((!!(_Expression)) ||
(_assert(#_Expression,__FILE__,__LINE__),0))
 #endif
 
 #ifndef wassert