Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-05-30 22:49:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge 46523 from amd64 branch:

Browse source 
- Fix assert macro
- Add crt="MSVC" to a number of modules to resolve _assert

svn path=/trunk/; revision=47533
This commit is contained in:
Timo Kreuzer 2010-06-03 12:47:40 +00:00
parent 520f691995
commit 447be42c33
19 changed files with 19 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
reactos/dll/directx/qedit/qedit.rbuild
View file

@ -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>

2
reactos/dll/directx/quartz/quartz.rbuild
View file

@ -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>

2
reactos/dll/directx/wine/ddraw/ddraw.rbuild
View file

@ -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>

2
reactos/dll/win32/avifil32/avifil32.rbuild
View file

@ -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>

2
reactos/dll/win32/comctl32/comctl32.rbuild
View file

@ -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>

2
reactos/dll/win32/comdlg32/comdlg32.rbuild
View file

@ -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>

2
reactos/dll/win32/imaadp32.acm/imaadp32.acm.rbuild
View file

@ -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>

2
reactos/dll/win32/inetmib1/inetmib1.rbuild
View file

@ -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>

2
reactos/dll/win32/mciwave/mciwave.rbuild
View file

@ -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>

2
reactos/dll/win32/msacm32/msacm32.rbuild
View file

@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
<group xmlns:xi="http://www.w3.org/2001/XInclude">
<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>

2
reactos/dll/win32/msadp32.acm/msadp32.acm.rbuild
View file

@ -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>

2
reactos/dll/win32/msg711.acm/msg711.acm.rbuild
View file

@ -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>

2
reactos/dll/win32/msrle32/msrle32.rbuild
View file

@ -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>

2
reactos/dll/win32/odbccp32/odbccp32.rbuild
View file

@ -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>

2
reactos/dll/win32/ole32/ole32.rbuild
View file

@ -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>

2
reactos/dll/win32/riched20/riched20.rbuild
View file

@ -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>

2
reactos/dll/win32/winemp3.acm/winemp3.acm.rbuild
View file

@ -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>

2
reactos/dll/win32/wintrust/wintrust.rbuild
View file

@ -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>

3
reactos/include/crt/assert.h
View file

@ -28,8 +28,7 @@ extern "C" {
#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