Merged r37192-r37649 + minor changes

PSEH 2 compatibility for Visual C++ svn path=/branches/the-real-msvc/; revision=37657
modified dll/win32/advapi32/misc/shutdown.c
2025-10-06 16:32:42 +02:00 · 2008-11-26 12:27:07 +00:00 · 2008-11-05 23:16:46 +00:00 · 2008-11-05 14:22:12 +00:00 · 2008-11-05 10:02:13 +00:00 · 2008-10-30 00:52:39 +00:00
18481 changed files with 1658 additions and 874863 deletions
--- a/reactos/COPYING
+++ b/reactos/COPYING
--- a/reactos/COPYING.ARM
+++ b/reactos/COPYING.ARM
--- a/reactos/CREDITS
+++ b/reactos/CREDITS
--- a/reactos/Doxyfile
+++ b/reactos/Doxyfile
--- a/reactos/INSTALL
+++ b/reactos/INSTALL
--- a/reactos/LGPL.txt
+++ b/reactos/LGPL.txt
--- a/reactos/Makefile
+++ b/reactos/Makefile
--- a/reactos/README
+++ b/reactos/README
--- a/reactos/ReactOS-arm.rbuild
+++ b/reactos/ReactOS-arm.rbuild
--- a/reactos/ReactOS-generic.rbuild
+++ b/reactos/ReactOS-generic.rbuild
@@ -67,7 +67,7 @@
 	<include>include/dxsdk</include>
 	<include root="intermediate">include/dxsdk</include>
 	<include>include/crt</include>
-	<include>include/crt/mingw32</include>
+	<include>include/crt/msc</include>
 	<include>include/ddk</include>
 	<include>include/GL</include>
 	<include>include/ndk</include>
@@ -119,5 +119,5 @@
 		<xi:include href="tools/tools.rbuild" />
 	</directory>

-	<compilerflag compiler="cpp">-Wno-non-virtual-dtor</compilerflag>
+	<compilerflag>@warnings.rsp</compilerflag>
 </group>
--- a/reactos/ReactOS-i386.rbuild
+++ b/reactos/ReactOS-i386.rbuild
@@ -17,27 +17,41 @@
 	<property name="NTOSKRNL_SHARED" value="-file-alignment=0x1000 -section-alignment=0x1000 -shared"/>

 	<if property="OPTIMIZE" value="1">
+	<!--
 		<compilerflag>-Os</compilerflag>
 		<compilerflag>-ftracer</compilerflag>
 		<compilerflag>-momit-leaf-frame-pointer</compilerflag>
-	</if>
-	<if property="OPTIMIZE" value="2">
-		<compilerflag>-Os</compilerflag>
-	</if>
-	<if property="OPTIMIZE" value="3">
+	-->
 		<compilerflag>-O1</compilerflag>
 	</if>
-	<if property="OPTIMIZE" value="4">
+	<if property="OPTIMIZE" value="2">
+		<!--<compilerflag>-Os</compilerflag>-->
 		<compilerflag>-O2</compilerflag>
 	</if>
+	<if property="OPTIMIZE" value="3">
+		<!--<compilerflag>-O1</compilerflag>-->
+		<compilerflag>-Ox</compilerflag>
+		<compilerflag>-Os</compilerflag>
+	</if>
+	<if property="OPTIMIZE" value="4">
+		<!--<compilerflag>-O2</compilerflag>-->
+		<compilerflag>-Ox</compilerflag>
+		<compilerflag>-Os</compilerflag>
+	</if>
 	<if property="OPTIMIZE" value="5">
-		<compilerflag>-O3</compilerflag>
+		<!--<compilerflag>-O3</compilerflag>-->
+		<compilerflag>-Ox</compilerflag>
+		<compilerflag>-Os</compilerflag>
 	</if>

+	<!--
 	<compilerflag>-mpreferred-stack-boundary=2</compilerflag>
 	<compilerflag>-fno-strict-aliasing</compilerflag>
 	<compilerflag>-Wno-strict-aliasing</compilerflag>
 	<compilerflag>-Wpointer-arith</compilerflag>
+	-->
+	<compilerflag>-Oy-</compilerflag>
+	<compilerflag>-GS-</compilerflag>
 	<linkerflag>-disable-stdcall-fixup</linkerflag>

 </project>
--- a/reactos/ReactOS-ppc.rbuild
+++ b/reactos/ReactOS-ppc.rbuild
--- a/reactos/apistatus.lst
+++ b/reactos/apistatus.lst
--- a/reactos/base/applications/applications.rbuild
+++ b/reactos/base/applications/applications.rbuild
--- a/reactos/base/applications/cacls/cacls.c
+++ b/reactos/base/applications/cacls/cacls.c
--- a/reactos/base/applications/cacls/cacls.rbuild
+++ b/reactos/base/applications/cacls/cacls.rbuild
--- a/reactos/base/applications/cacls/cacls.rc
+++ b/reactos/base/applications/cacls/cacls.rc
--- a/reactos/base/applications/cacls/lang/bg-BG.rc
+++ b/reactos/base/applications/cacls/lang/bg-BG.rc
--- a/reactos/base/applications/cacls/lang/ca-ES.rc
+++ b/reactos/base/applications/cacls/lang/ca-ES.rc
--- a/reactos/base/applications/cacls/lang/cs-CZ.rc
+++ b/reactos/base/applications/cacls/lang/cs-CZ.rc
--- a/reactos/base/applications/cacls/lang/de-DE.rc
+++ b/reactos/base/applications/cacls/lang/de-DE.rc
--- a/reactos/base/applications/cacls/lang/el-GR.rc
+++ b/reactos/base/applications/cacls/lang/el-GR.rc
--- a/reactos/base/applications/cacls/lang/en-US.rc
+++ b/reactos/base/applications/cacls/lang/en-US.rc
--- a/reactos/base/applications/cacls/lang/fr-FR.rc
+++ b/reactos/base/applications/cacls/lang/fr-FR.rc
--- a/reactos/base/applications/cacls/lang/id-ID.rc
+++ b/reactos/base/applications/cacls/lang/id-ID.rc
--- a/reactos/base/applications/cacls/lang/it-IT.rc
+++ b/reactos/base/applications/cacls/lang/it-IT.rc
--- a/reactos/base/applications/cacls/lang/ko-KR.rc
+++ b/reactos/base/applications/cacls/lang/ko-KR.rc
--- a/reactos/base/applications/cacls/lang/nl-NL.rc
+++ b/reactos/base/applications/cacls/lang/nl-NL.rc
--- a/reactos/base/applications/cacls/lang/no-NO.rc
+++ b/reactos/base/applications/cacls/lang/no-NO.rc
--- a/reactos/base/applications/cacls/lang/pl-PL.rc
+++ b/reactos/base/applications/cacls/lang/pl-PL.rc
--- a/reactos/base/applications/cacls/lang/pt-BR.rc
+++ b/reactos/base/applications/cacls/lang/pt-BR.rc
--- a/reactos/base/applications/cacls/lang/ru-RU.rc
+++ b/reactos/base/applications/cacls/lang/ru-RU.rc
--- a/reactos/base/applications/cacls/lang/sk-SK.rc
+++ b/reactos/base/applications/cacls/lang/sk-SK.rc
--- a/reactos/base/applications/cacls/lang/uk-UA.rc
+++ b/reactos/base/applications/cacls/lang/uk-UA.rc
--- a/reactos/base/applications/cacls/lang/zh-CN.rc
+++ b/reactos/base/applications/cacls/lang/zh-CN.rc
--- a/reactos/base/applications/cacls/lang/zh-TW.rc
+++ b/reactos/base/applications/cacls/lang/zh-TW.rc
--- a/reactos/base/applications/cacls/precomp.h
+++ b/reactos/base/applications/cacls/precomp.h
--- a/reactos/base/applications/cacls/resource.h
+++ b/reactos/base/applications/cacls/resource.h
--- a/reactos/base/applications/cacls/rsrc.rc
+++ b/reactos/base/applications/cacls/rsrc.rc
--- a/reactos/base/applications/calc/about.c
+++ b/reactos/base/applications/calc/about.c
--- a/reactos/base/applications/calc/calc.h
+++ b/reactos/base/applications/calc/calc.h
--- a/reactos/base/applications/calc/calc.rbuild
+++ b/reactos/base/applications/calc/calc.rbuild
--- a/reactos/base/applications/calc/convert.c
+++ b/reactos/base/applications/calc/convert.c
--- a/reactos/base/applications/calc/copying.txt
+++ b/reactos/base/applications/calc/copying.txt
--- a/reactos/base/applications/calc/fun_mpfr.c
+++ b/reactos/base/applications/calc/fun_mpfr.c
--- a/reactos/base/applications/calc/function.c
+++ b/reactos/base/applications/calc/function.c
--- a/reactos/base/applications/calc/help.txt
+++ b/reactos/base/applications/calc/help.txt
--- a/reactos/base/applications/calc/lang/bg-BG.rc
+++ b/reactos/base/applications/calc/lang/bg-BG.rc
--- a/reactos/base/applications/calc/lang/cs-CZ.rc
+++ b/reactos/base/applications/calc/lang/cs-CZ.rc
--- a/reactos/base/applications/calc/lang/de-DE.rc
+++ b/reactos/base/applications/calc/lang/de-DE.rc
--- a/reactos/base/applications/calc/lang/en-US.rc
+++ b/reactos/base/applications/calc/lang/en-US.rc
--- a/reactos/base/applications/calc/lang/es-ES.rc
+++ b/reactos/base/applications/calc/lang/es-ES.rc
--- a/reactos/base/applications/calc/lang/it-IT.rc
+++ b/reactos/base/applications/calc/lang/it-IT.rc
--- a/reactos/base/applications/calc/lang/ko-KR.rc
+++ b/reactos/base/applications/calc/lang/ko-KR.rc
--- a/reactos/base/applications/calc/lang/nl-NL.rc
+++ b/reactos/base/applications/calc/lang/nl-NL.rc
--- a/reactos/base/applications/calc/lang/no-NO.rc
+++ b/reactos/base/applications/calc/lang/no-NO.rc
--- a/reactos/base/applications/calc/lang/pl-PL.rc
+++ b/reactos/base/applications/calc/lang/pl-PL.rc
--- a/reactos/base/applications/calc/lang/ru-RU.rc
+++ b/reactos/base/applications/calc/lang/ru-RU.rc
--- a/reactos/base/applications/calc/lang/sk-SK.rc
+++ b/reactos/base/applications/calc/lang/sk-SK.rc
--- a/reactos/base/applications/calc/lang/uk-UA.rc
+++ b/reactos/base/applications/calc/lang/uk-UA.rc
--- a/reactos/base/applications/calc/readme.txt
+++ b/reactos/base/applications/calc/readme.txt
--- a/reactos/base/applications/calc/res/ROS_logo.bmp
+++ b/reactos/base/applications/calc/res/ROS_logo.bmp
--- a/reactos/base/applications/calc/res/calc.ico
+++ b/reactos/base/applications/calc/res/calc.ico
--- a/reactos/base/applications/calc/res/calc_sm.ico
+++ b/reactos/base/applications/calc/res/calc_sm.ico
--- a/reactos/base/applications/calc/resource.h
+++ b/reactos/base/applications/calc/resource.h
--- a/reactos/base/applications/calc/resource.rc
+++ b/reactos/base/applications/calc/resource.rc
--- a/reactos/base/applications/calc/rpn.c
+++ b/reactos/base/applications/calc/rpn.c
--- a/reactos/base/applications/calc/rpn_mpfr.c
+++ b/reactos/base/applications/calc/rpn_mpfr.c
--- a/reactos/base/applications/calc/todo.txt
+++ b/reactos/base/applications/calc/todo.txt
--- a/reactos/base/applications/calc/utl.c
+++ b/reactos/base/applications/calc/utl.c
--- a/reactos/base/applications/calc/utl_mpfr.c
+++ b/reactos/base/applications/calc/utl_mpfr.c
--- a/reactos/base/applications/calc/whatsnew.txt
+++ b/reactos/base/applications/calc/whatsnew.txt
--- a/reactos/base/applications/calc/winmain.c
+++ b/reactos/base/applications/calc/winmain.c
--- a/reactos/base/applications/calc/wmmsg.h
+++ b/reactos/base/applications/calc/wmmsg.h
--- a/reactos/base/applications/charmap/about.c
+++ b/reactos/base/applications/charmap/about.c
--- a/reactos/base/applications/charmap/charmap.c
+++ b/reactos/base/applications/charmap/charmap.c
--- a/reactos/base/applications/charmap/charmap.rbuild
+++ b/reactos/base/applications/charmap/charmap.rbuild
--- a/reactos/base/applications/charmap/charmap.rc
+++ b/reactos/base/applications/charmap/charmap.rc
--- a/reactos/base/applications/charmap/lang/bg-BG.rc
+++ b/reactos/base/applications/charmap/lang/bg-BG.rc
--- a/reactos/base/applications/charmap/lang/ca-ES.rc
+++ b/reactos/base/applications/charmap/lang/ca-ES.rc
--- a/reactos/base/applications/charmap/lang/cs-CZ.rc
+++ b/reactos/base/applications/charmap/lang/cs-CZ.rc
--- a/reactos/base/applications/charmap/lang/de-DE.rc
+++ b/reactos/base/applications/charmap/lang/de-DE.rc
--- a/reactos/base/applications/charmap/lang/el-GR.rc
+++ b/reactos/base/applications/charmap/lang/el-GR.rc
--- a/reactos/base/applications/charmap/lang/en-US.rc
+++ b/reactos/base/applications/charmap/lang/en-US.rc
--- a/reactos/base/applications/charmap/lang/es-ES.rc
+++ b/reactos/base/applications/charmap/lang/es-ES.rc
--- a/reactos/base/applications/charmap/lang/fr-FR.rc
+++ b/reactos/base/applications/charmap/lang/fr-FR.rc
--- a/reactos/base/applications/charmap/lang/id-ID.rc
+++ b/reactos/base/applications/charmap/lang/id-ID.rc
--- a/reactos/base/applications/charmap/lang/it-IT.rc
+++ b/reactos/base/applications/charmap/lang/it-IT.rc
--- a/reactos/base/applications/charmap/lang/ko-KR.rc
+++ b/reactos/base/applications/charmap/lang/ko-KR.rc
--- a/reactos/base/applications/charmap/lang/lt-LT.rc
+++ b/reactos/base/applications/charmap/lang/lt-LT.rc
--- a/reactos/base/applications/charmap/lang/nl-NL.rc
+++ b/reactos/base/applications/charmap/lang/nl-NL.rc
--- a/reactos/base/applications/charmap/lang/no-NO.rc
+++ b/reactos/base/applications/charmap/lang/no-NO.rc
--- a/reactos/base/applications/charmap/lang/pl-PL.rc
+++ b/reactos/base/applications/charmap/lang/pl-PL.rc
--- a/reactos/base/applications/charmap/lang/pt-BR.rc
+++ b/reactos/base/applications/charmap/lang/pt-BR.rc
--- a/reactos/base/applications/charmap/lang/ru-RU.rc
+++ b/reactos/base/applications/charmap/lang/ru-RU.rc
--- a/reactos/base/applications/charmap/lang/sk-SK.rc
+++ b/reactos/base/applications/charmap/lang/sk-SK.rc
--- a/reactos/base/applications/charmap/lang/uk-UA.rc
+++ b/reactos/base/applications/charmap/lang/uk-UA.rc
--- a/reactos/base/applications/charmap/lrgcell.c
+++ b/reactos/base/applications/charmap/lrgcell.c
--- a/reactos/base/applications/charmap/map.c
+++ b/reactos/base/applications/charmap/map.c
--- a/reactos/base/applications/charmap/precomp.h
+++ b/reactos/base/applications/charmap/precomp.h
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
KJK::Hyperion	093930a90a	Merged r37192-r37649 + minor changes PSEH 2 compatibility for Visual C++ svn path=/branches/the-real-msvc/; revision=37657	2008-11-26 12:27:07 +00:00
KJK::Hyperion	cba9af5894	modified dll/win32/advapi32/misc/shutdown.c modified dll/win32/advapi32/reg/reg.c modified dll/win32/advapi32/sec/misc.c Don't use potentially uninitialized variables. Courtesy of Visual C++ modified dll/win32/advapi32/service/eventlog.c Fixed constness warning svn path=/branches/the-real-msvc/; revision=37219	2008-11-05 23:16:46 +00:00
KJK::Hyperion	4cb9febfe4	Merging r37076-r37192 from trunk Basic compilation fixes Regressions :\| svn path=/branches/the-real-msvc/; revision=37202	2008-11-05 14:22:12 +00:00
KJK::Hyperion	463ac7c104	Big grab bag commit modified dll/cpl/appwiz-new/appwiz.rc modified dll/cpl/appwiz/appwiz.rc modified dll/cpl/appwiz/createlink.c Don't blame the compiler for the build environment modified dll/win32/advapi32/advapi32.h modified dll/win32/advapi32/service/sctrl.c GetExceptionCode -> _SEH_GetExceptionCode modified dll/win32/advapi32/reg/reg.c Two TRACE statements were printing the wrong value. Spotted by Visual C++ modified include/crt/msc/stddef.h Implemented offsetof modified include/ddk/tdikrnl.h modified include/psdk/winternl.h Use the correct placement of extended attributes modified include/psdk/rpc.h Disable SEH for all compilers. Our build environment only supports PSEH at the moment modified include/psdk/rpcndr.h Mask before casting in NdrFcShort. Fixes a warning in Visual C++ modified include/reactos/wine/port.h Enable interlocked intrinsics for Visual C++ too modified lib/3rdparty/adns/adns_win32/adns_unix_calls.c modified lib/3rdparty/adns/src/setup.c alloca is called _alloca modified lib/3rdparty/adns/src/internal.h Removed broken workaround modified lib/3rdparty/libwine/debug.c Fix a Visual C++ warning modified lib/3rdparty/libwine/debug_ros.c Add the proper decorations to libwine_malloc & libwine_free modified lib/3rdparty/libwine/string.c strcasecmp is inlined in the headers as a stub that calls _stricmp: define _stricmp instead svn path=/branches/the-real-msvc/; revision=37200	2008-11-05 10:02:13 +00:00
KJK::Hyperion	5b3c650bd6	Merging 37059-37076 due to rbuild changes svn path=/branches/the-real-msvc/; revision=37077	2008-10-30 00:52:39 +00:00
KJK::Hyperion	4245f11189	Daily merge from trunk (36960-37059). You guys sure commit a lot svn path=/branches/the-real-msvc/; revision=37060	2008-10-29 14:36:57 +00:00
KJK::Hyperion	91754bc90f	added include/crt/mingw32/intrin.h added include/crt/mingw32/intrin_arm.h added include/crt/mingw32/intrin_ppc.h added include/crt/mingw32/intrin_x86.h added include/crt/mingw32/intrin_x86_64.h deleted include/psdk/intrin.h.bak deleted include/psdk/intrin_arm.h deleted include/psdk/intrin_ppc.h deleted include/psdk/intrin_x86.h deleted include/psdk/intrin_x86_64.h Moved <intrin.h> from PSDK to MinGW backend, where it belongs modified ReactOS-generic.rbuild modified tools/rbuild/backend/mingw/modulehandler.cpp Don't compile against an external CRT, it's just not worth it ReactOS is compiled with MinGW: to support new compilers, port MinGW modified tools/rbuild/backend/mingw/mingw.cpp Disable more warnings. This should really go in a standard header file or a response file svn path=/branches/the-real-msvc/; revision=37057	2008-10-29 13:43:31 +00:00
KJK::Hyperion	d516c8f8bb	modified base/system/smss/smss.h Fix compilation with Visual C++ modified lib/rtl/debug.c Call va_end in debug printing macros modified lib/rtl/res.c Don't mix int and ULONG modified lib/rtl/rtl.h <intrin.h> moved from PSDK to MinGW runtime, now always safe to include svn path=/branches/the-real-msvc/; revision=37055	2008-10-29 13:30:26 +00:00
KJK::Hyperion	75178913ee	deleted wine/mmsystem.h deleted wine/prsht.h deleted wine/winbase.h deleted wine/winnetwk.h deleted wine/winnt.h deleted wine/winuser.h Our SDK is in good enough shape to compile Wine: drop the #include_next hacks Wine compatibility fixes should go either in the SDK headers themselves or in the Wine porting SDK svn path=/branches/the-real-msvc/; revision=37054	2008-10-29 13:19:21 +00:00
KJK::Hyperion	97db021888	modified _mingw.h added msc added msc/_msc_float.h added msc/stdarg.h added msc/stdbool.h added msc/stddef.h Ported the MinGW runtime to Visual C++ We can now assume ReactOS is always compiled with MinGW, with one of two possible backends (GNUC/MSC) Backend headers copied from the GCC ones for now TODO: rewrite the Visual C++ intrin.h instead of using a hacked version of Visual C++'s native one (which I won't commit to avoid an obvious copyright violation) TODO: rename include/crt/mingw32 to include/crt/gnuc TODO: move the GCC intrin.h to include/crt/gnuc modified assert.h modified setjmp.h modified stdio.h modified stdlib.h modified string.h Use Visual C++-compatible placement of function attributes modified float.h Use a cleaner alternative to #include_next for Visual C++ modified math.h Refactored, translated inline assembler to Visual C++ TODO: review, ensure the translation is correct, ensure the refactoring didn't break something svn path=/branches/the-real-msvc/; revision=37053	2008-10-29 13:17:12 +00:00
KJK::Hyperion	3a22d13497	modified math/i386/ci.c Translate inline assembler to Visual C++ syntax modified string/ctype.c MinGW headers define towlower/towupper as taking & returning wint_t svn path=/branches/the-real-msvc/; revision=37052	2008-10-29 13:04:45 +00:00
KJK::Hyperion	d3a8b2c5b5	modified crt1.c Translated inline assembler in __mingw_CRTStartup mingw_main now compiles with Visual C++ modified mingw.rbuild deleted strcasecmp.c deleted strncasecmp.c deleted wcscmpi.c strcasecmp, strncasecmp and wcscmpi are inlined in MinGW headers, no need to define them as library functions svn path=/branches/the-real-msvc/; revision=37051	2008-10-29 13:03:03 +00:00
KJK::Hyperion	365510599d	modified winbase.h Include <intrin.h> for compiler intrinsics modified winuser.h Removed duplicate accessibility definitions svn path=/branches/the-real-msvc/; revision=37050	2008-10-29 12:58:41 +00:00
KJK::Hyperion	b751e3eacd	No stubs in hal, don't use the spec file svn path=/branches/the-real-msvc/; revision=37049	2008-10-29 12:56:57 +00:00