ReactOS.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
List overview
Download
Ros-diffs
April 2015
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
ros-diffs@reactos.org
17 participants
481 discussions
Start a n
N
ew thread
[dquintana] 67484: Note to self: review diffs and remove temporary changes BEFORE commiting (not after).
by dquintana@svn.reactos.org
Author: dquintana Date: Thu Apr 30 22:09:11 2015 New Revision: 67484 URL:
http://svn.reactos.org/svn/reactos?rev=67484&view=rev
Log: Note to self: review diffs and remove temporary changes BEFORE commiting (not after). Modified: trunk/reactos/dll/win32/fmifs/precomp.h trunk/reactos/dll/win32/framedyn/chstring.cpp trunk/reactos/drivers/network/ndis/include/ndissys.h trunk/reactos/include/ddk/stdunk.h trunk/reactos/include/psdk/kcom.h trunk/reactos/lib/sdk/cpprt/i386/cpprt.s Modified: trunk/reactos/dll/win32/fmifs/precomp.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fmifs/precomp.h?…
============================================================================== --- trunk/reactos/dll/win32/fmifs/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/fmifs/precomp.h [iso-8859-1] Thu Apr 30 22:09:11 2015 @@ -13,10 +13,9 @@ /* INCLUDES ******************************************************************/ -#define WIN32_NO_STATUS - #include <stdio.h> +#define WIN32_NO_STATUS /* PSDK/NDK Headers */ #include <windef.h> Modified: trunk/reactos/dll/win32/framedyn/chstring.cpp URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/framedyn/chstrin…
============================================================================== --- trunk/reactos/dll/win32/framedyn/chstring.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/framedyn/chstring.cpp [iso-8859-1] Thu Apr 30 22:09:11 2015 @@ -54,19 +54,6 @@ } } -#if _MSC_VER >= 51900 -void __cdecl operator delete(void* ptr, unsigned int) -{ - // In Windows 2k3, they check for ptr being null. - // ISO, POSIX and even MSDN explains that it is allowed - // to call free with NULL pointer... - if (ptr) - { - free(ptr); - } -} -#endif - // Implement our own new operator so that we can throw our own exception in case // of allocation failure. // It could have been done using set_new_handler(), but well. MS guys didn't do it Modified: trunk/reactos/drivers/network/ndis/include/ndissys.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/inclu…
============================================================================== --- trunk/reactos/drivers/network/ndis/include/ndissys.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/include/ndissys.h [iso-8859-1] Thu Apr 30 22:09:11 2015 @@ -9,13 +9,6 @@ */ #ifndef __NDISSYS_H #define __NDISSYS_H - -/* portability fixes */ -#ifdef _M_AMD64 -#define KfReleaseSpinLock KeReleaseSpinLock -#define KefAcquireSpinLockAtDpcLevel KeAcquireSpinLockAtDpcLevel -#define KefReleaseSpinLockFromDpcLevel KeReleaseSpinLockFromDpcLevel -#endif #include <ndis.h> @@ -61,4 +54,11 @@ ExGetCurrentProcessorCpuUsage( PULONG CpuUsage); +/* portability fixes */ +#ifdef _M_AMD64 +#define KfReleaseSpinLock KeReleaseSpinLock +#define KefAcquireSpinLockAtDpcLevel KeAcquireSpinLockAtDpcLevel +#define KefReleaseSpinLockFromDpcLevel KeReleaseSpinLockFromDpcLevel +#endif + #endif /* __NDISSYS_H */ Modified: trunk/reactos/include/ddk/stdunk.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/stdunk.h?rev=6…
============================================================================== --- trunk/reactos/include/ddk/stdunk.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/stdunk.h [iso-8859-1] Thu Apr 30 22:09:11 2015 @@ -206,7 +206,7 @@ inline void __cdecl operator delete( - PVOID ptr, UINT unk) + PVOID ptr, UINT) { ExFreePool(ptr); } Modified: trunk/reactos/include/psdk/kcom.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/kcom.h?rev=67…
============================================================================== --- trunk/reactos/include/psdk/kcom.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/kcom.h [iso-8859-1] Thu Apr 30 22:09:11 2015 @@ -235,7 +235,7 @@ } inline void __cdecl operator delete( - PVOID pVoid, UINT unk) + PVOID pVoid, UINT) { if (pVoid) ExFreePool(pVoid); } Modified: trunk/reactos/lib/sdk/cpprt/i386/cpprt.s URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/cpprt/i386/cpprt.s…
============================================================================== --- trunk/reactos/lib/sdk/cpprt/i386/cpprt.s [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/cpprt/i386/cpprt.s [iso-8859-1] Thu Apr 30 22:09:11 2015 @@ -27,7 +27,7 @@ ; void __stdcall `eh vector constructor iterator'(void *,unsigned int,int,void (__thiscall*)(void *),void (__thiscall*)(void *)) DEFINE_ALIAS ??_L@YGXPAXIHP6EX0@Z1@Z, ?MSVCRTEX_eh_vector_constructor_iterator@@YGXPAXIHP6EX0@Z1@Z -; void __stdcall `eh vector constructor iterator'(void *,unsigned int,int,void (__thiscall*)(void *),void (__thiscall*)(void *)) +; void __stdcall `eh vector constructor iterator'(void *,unsigned int,unsigned int,void (__thiscall*)(void *),void (__thiscall*)(void *)) DEFINE_ALIAS ??_L@YGXPAXIIP6EX0@Z1@Z, ?MSVCRTEX_eh_vector_constructor_iterator@@YGXPAXIHP6EX0@Z1@Z ; void __stdcall `eh vector destructor iterator'(void *,unsigned int,int,void (__thiscall*)(void *)) @@ -38,6 +38,5 @@ ; void __cdecl operator delete(void *,unsigned int) DEFINE_ALIAS ??3@YAXPAXI@Z, ??3@YAXPAX@Z -DEFINE_ALIAS ??3@YAXPAXII@Z, ??3@YAXPAX@Z END
9 years, 7 months
1
0
0
0
[dquintana] 67483: This commit brings support for compiling ReactOS with Visual Studio 2015 RC (and possibly the final release). [BUILD] msvc.cmake: Disable thread-local static initialization. CMak...
by dquintana@svn.reactos.org
Author: dquintana Date: Thu Apr 30 21:48:26 2015 New Revision: 67483 URL:
http://svn.reactos.org/svn/reactos?rev=67483&view=rev
Log: This commit brings support for compiling ReactOS with Visual Studio 2015 RC (and possibly the final release). [BUILD] msvc.cmake: Disable thread-local static initialization. CMakeLists.txt: Disable PCH for VS2015. configure.cmd: Make it aware of cl.exe version 19.x [CPPRT] Add alias for the new variants of the delete operators. [BROWSEUI] [MFIFS] [FRAMEDYN] [NDIS] [DDK] [PSDK] [STLPORT] Add explicit declarations of the new delete operators for those modules that don't use the WITH_RUNTIME option. [WIDL] [WPP] Do not alias the snprintf family of functions to the _snprintf variants, since VS14 already declares them internally. Modified: trunk/reactos/CMakeLists.txt trunk/reactos/cmake/msvc.cmake trunk/reactos/configure.cmd trunk/reactos/dll/win32/browseui/utility.cpp trunk/reactos/dll/win32/fmifs/precomp.h trunk/reactos/dll/win32/framedyn/chstring.cpp trunk/reactos/drivers/network/ndis/include/ndissys.h trunk/reactos/include/ddk/stdunk.h trunk/reactos/include/psdk/kcom.h trunk/reactos/lib/3rdparty/stlport/test/eh/nc_alloc.cpp trunk/reactos/lib/sdk/cpprt/i386/cpprt.s trunk/reactos/tools/widl/CMakeLists.txt trunk/reactos/tools/wpp/CMakeLists.txt Modified: trunk/reactos/CMakeLists.txt URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/CMakeLists.txt?rev=67483&r…
============================================================================== --- trunk/reactos/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/CMakeLists.txt [iso-8859-1] Thu Apr 30 21:48:26 2015 @@ -137,7 +137,7 @@ add_definitions(-D_WINKD_=1) endif() - if(CMAKE_VERSION MATCHES "ReactOS") + if(CMAKE_VERSION MATCHES "ReactOS" AND MSVC_VERSION LESS 1900) set(PCH 1 CACHE BOOL "Whether to use precompiled headers") else() set(PCH 0 CACHE BOOL "Whether to use precompiled headers") Modified: trunk/reactos/cmake/msvc.cmake URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/msvc.cmake?rev=67483…
============================================================================== --- trunk/reactos/cmake/msvc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/msvc.cmake [iso-8859-1] Thu Apr 30 21:48:26 2015 @@ -31,6 +31,11 @@ # VS 12+ requires /FS when used in parallel compilations if(MSVC_VERSION GREATER 1799 AND NOT MSVC_IDE) add_compile_flags("/FS") +endif () + +# VS14+ tries to use thread-safe initialization +if(MSVC_VERSION GREATER 1899) + add_compile_flags("/Zc:threadSafeInit-") endif () # Disable overly sensitive warnings as well as those that generally aren't Modified: trunk/reactos/configure.cmd URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/configure.cmd?rev=67483&r1…
============================================================================== --- trunk/reactos/configure.cmd [iso-8859-1] (original) +++ trunk/reactos/configure.cmd [iso-8859-1] Thu Apr 30 21:48:26 2015 @@ -56,6 +56,7 @@ cl 2>&1 | find "16.00." > NUL && set VS_VERSION=10 cl 2>&1 | find "17.00." > NUL && set VS_VERSION=11 cl 2>&1 | find "18.00." > NUL && set VS_VERSION=12 + cl 2>&1 | find "19.00." > NUL && set VS_VERSION=14 if not defined VS_VERSION ( echo Error: Visual Studio version too old or version detection failed. exit /b Modified: trunk/reactos/dll/win32/browseui/utility.cpp URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/utility…
============================================================================== --- trunk/reactos/dll/win32/browseui/utility.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/utility.cpp [iso-8859-1] Thu Apr 30 21:48:26 2015 @@ -9,3 +9,8 @@ { LocalFree(p); } + +void operator delete(void *p, unsigned int) +{ + LocalFree(p); +} Modified: trunk/reactos/dll/win32/fmifs/precomp.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fmifs/precomp.h?…
============================================================================== --- trunk/reactos/dll/win32/fmifs/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/fmifs/precomp.h [iso-8859-1] Thu Apr 30 21:48:26 2015 @@ -13,9 +13,10 @@ /* INCLUDES ******************************************************************/ +#define WIN32_NO_STATUS + #include <stdio.h> -#define WIN32_NO_STATUS /* PSDK/NDK Headers */ #include <windef.h> Modified: trunk/reactos/dll/win32/framedyn/chstring.cpp URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/framedyn/chstrin…
============================================================================== --- trunk/reactos/dll/win32/framedyn/chstring.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/framedyn/chstring.cpp [iso-8859-1] Thu Apr 30 21:48:26 2015 @@ -54,6 +54,19 @@ } } +#if _MSC_VER >= 51900 +void __cdecl operator delete(void* ptr, unsigned int) +{ + // In Windows 2k3, they check for ptr being null. + // ISO, POSIX and even MSDN explains that it is allowed + // to call free with NULL pointer... + if (ptr) + { + free(ptr); + } +} +#endif + // Implement our own new operator so that we can throw our own exception in case // of allocation failure. // It could have been done using set_new_handler(), but well. MS guys didn't do it Modified: trunk/reactos/drivers/network/ndis/include/ndissys.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/inclu…
============================================================================== --- trunk/reactos/drivers/network/ndis/include/ndissys.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/include/ndissys.h [iso-8859-1] Thu Apr 30 21:48:26 2015 @@ -9,6 +9,13 @@ */ #ifndef __NDISSYS_H #define __NDISSYS_H + +/* portability fixes */ +#ifdef _M_AMD64 +#define KfReleaseSpinLock KeReleaseSpinLock +#define KefAcquireSpinLockAtDpcLevel KeAcquireSpinLockAtDpcLevel +#define KefReleaseSpinLockFromDpcLevel KeReleaseSpinLockFromDpcLevel +#endif #include <ndis.h> @@ -54,11 +61,4 @@ ExGetCurrentProcessorCpuUsage( PULONG CpuUsage); -/* portability fixes */ -#ifdef _M_AMD64 -#define KfReleaseSpinLock KeReleaseSpinLock -#define KefAcquireSpinLockAtDpcLevel KeAcquireSpinLockAtDpcLevel -#define KefReleaseSpinLockFromDpcLevel KeReleaseSpinLockFromDpcLevel -#endif - #endif /* __NDISSYS_H */ Modified: trunk/reactos/include/ddk/stdunk.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/stdunk.h?rev=6…
============================================================================== --- trunk/reactos/include/ddk/stdunk.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/stdunk.h [iso-8859-1] Thu Apr 30 21:48:26 2015 @@ -204,6 +204,13 @@ ExFreePool(ptr); } +inline void __cdecl +operator delete( + PVOID ptr, UINT unk) +{ + ExFreePool(ptr); +} + #endif /* ALLOCATION_OPERATORS_DEFINED */ Modified: trunk/reactos/include/psdk/kcom.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/kcom.h?rev=67…
============================================================================== --- trunk/reactos/include/psdk/kcom.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/kcom.h [iso-8859-1] Thu Apr 30 21:48:26 2015 @@ -234,6 +234,12 @@ if (pVoid) ExFreePool(pVoid); } +inline void __cdecl operator delete( + PVOID pVoid, UINT unk) +{ + if (pVoid) ExFreePool(pVoid); +} + #endif /* _NEW_DELETE_OPERATORS_ */ #if defined(_SYS_GUID_OPERATOR_EQ_) Modified: trunk/reactos/lib/3rdparty/stlport/test/eh/nc_alloc.cpp URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/stlport/test/…
============================================================================== --- trunk/reactos/lib/3rdparty/stlport/test/eh/nc_alloc.cpp [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/stlport/test/eh/nc_alloc.cpp [iso-8859-1] Thu Apr 30 21:48:26 2015 @@ -264,6 +264,14 @@ } } +#if defined (EH_DELETE_HAS_THROW_SPEC) +void _STLP_CALL operator delete(void* s, unsigned int) throw() +#else +void _STLP_CALL operator delete(void* s, unsigned int) +#endif +{ + ::operator delete(s); +} /*=================================================================================== ClearAllocationSet (private helper) Modified: trunk/reactos/lib/sdk/cpprt/i386/cpprt.s URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/cpprt/i386/cpprt.s…
============================================================================== --- trunk/reactos/lib/sdk/cpprt/i386/cpprt.s [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/cpprt/i386/cpprt.s [iso-8859-1] Thu Apr 30 21:48:26 2015 @@ -27,7 +27,17 @@ ; void __stdcall `eh vector constructor iterator'(void *,unsigned int,int,void (__thiscall*)(void *),void (__thiscall*)(void *)) DEFINE_ALIAS ??_L@YGXPAXIHP6EX0@Z1@Z, ?MSVCRTEX_eh_vector_constructor_iterator@@YGXPAXIHP6EX0@Z1@Z +; void __stdcall `eh vector constructor iterator'(void *,unsigned int,int,void (__thiscall*)(void *),void (__thiscall*)(void *)) +DEFINE_ALIAS ??_L@YGXPAXIIP6EX0@Z1@Z, ?MSVCRTEX_eh_vector_constructor_iterator@@YGXPAXIHP6EX0@Z1@Z + ; void __stdcall `eh vector destructor iterator'(void *,unsigned int,int,void (__thiscall*)(void *)) DEFINE_ALIAS ??_M@YGXPAXIHP6EX0@Z@Z, ?MSVCRTEX_eh_vector_destructor_iterator@@YGXPAXIHP6EX0@Z@Z +; void __stdcall `eh vector destructor iterator'(void *,unsigned int,unsigned int,void (__thiscall*)(void *)) +DEFINE_ALIAS ??_M@YGXPAXIIP6EX0@Z@Z, ?MSVCRTEX_eh_vector_destructor_iterator@@YGXPAXIHP6EX0@Z@Z + +; void __cdecl operator delete(void *,unsigned int) +DEFINE_ALIAS ??3@YAXPAXI@Z, ??3@YAXPAX@Z +DEFINE_ALIAS ??3@YAXPAXII@Z, ??3@YAXPAX@Z + END Modified: trunk/reactos/tools/widl/CMakeLists.txt URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/CMakeLists.txt?…
============================================================================== --- trunk/reactos/tools/widl/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/tools/widl/CMakeLists.txt [iso-8859-1] Thu Apr 30 21:48:26 2015 @@ -1,10 +1,12 @@ if(MSVC) - add_definitions(-Dsnprintf=_snprintf) + if(MSVC_VERSION LESS 1900) + add_definitions(-Dsnprintf=_snprintf) - # Add this definition for WDK only, VS 9 doesn't like that - if(DEFINED ENV{DDKBUILDENV}) - add_definitions(-Dvsnprintf=_vsnprintf) + # Add this definition for WDK only, VS 9 doesn't like that + if(DEFINED ENV{DDKBUILDENV}) + add_definitions(-Dvsnprintf=_vsnprintf) + endif() endif() list(APPEND SOURCE getopt.c) Modified: trunk/reactos/tools/wpp/CMakeLists.txt URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wpp/CMakeLists.txt?r…
============================================================================== --- trunk/reactos/tools/wpp/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/tools/wpp/CMakeLists.txt [iso-8859-1] Thu Apr 30 21:48:26 2015 @@ -1,13 +1,15 @@ if(MSVC) - add_definitions( - -Dsnprintf=_snprintf - -Dstrtoull=_strtoui64 - -Dstrtoll=_strtoi64) + if(MSVC_VERSION LESS 1900) + add_definitions( + -Dsnprintf=_snprintf + -Dstrtoull=_strtoui64 + -Dstrtoll=_strtoi64) - # Add this definition for WDK only, VS 9 doesn't like that - if(DEFINED ENV{DDKBUILDENV}) - add_definitions(-Dvsnprintf=_vsnprintf) + # Add this definition for WDK only, VS 9 doesn't like that + if(DEFINED ENV{DDKBUILDENV}) + add_definitions(-Dvsnprintf=_vsnprintf) + endif() endif() endif()
9 years, 7 months
1
0
0
0
[tkreuzer] 67482: [CRT/KERNEL32] Add some more ARM stubs
by tkreuzer@svn.reactos.org
Author: tkreuzer Date: Thu Apr 30 21:07:08 2015 New Revision: 67482 URL:
http://svn.reactos.org/svn/reactos?rev=67482&view=rev
Log: [CRT/KERNEL32] Add some more ARM stubs Added: trunk/reactos/dll/win32/kernel32/client/arm/ (with props) trunk/reactos/dll/win32/kernel32/client/arm/fiber.S (with props) trunk/reactos/dll/win32/kernel32/client/arm/thread.S (with props) trunk/reactos/lib/sdk/crt/except/arm/__jump_unwind.s (with props) Propchange: trunk/reactos/dll/win32/kernel32/client/arm/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Thu Apr 30 21:07:08 2015 @@ -0,0 +1 @@ +((CORE|ROSTESTS|ROSAPPS)-\d+)(,? ?((CORE|ROSTESTS|ROSAPPS)-\d+))*(,? ?(and |or )?((CORE|ROSTESTS|ROSAPPS)-\d+))? Propchange: trunk/reactos/dll/win32/kernel32/client/arm/ ------------------------------------------------------------------------------ bugtraq:message = See issue %BUGID% for more details. Propchange: trunk/reactos/dll/win32/kernel32/client/arm/ ------------------------------------------------------------------------------ bugtraq:url =
https://jira.reactos.org/browse/%BUGID%
Propchange: trunk/reactos/dll/win32/kernel32/client/arm/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/dll/win32/kernel32/client/arm/fiber.S URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/…
============================================================================== --- trunk/reactos/dll/win32/kernel32/client/arm/fiber.S (added) +++ trunk/reactos/dll/win32/kernel32/client/arm/fiber.S [iso-8859-1] Thu Apr 30 21:07:08 2015 @@ -0,0 +1,24 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS system libraries + * FILE: dll/win32//kernel32/client/arm/fiber.S + * PURPOSE: Fiber context switch code for the amd64 architecture + * PROGRAMMER: + */ + +#include <ksarm.h> + + TEXTAREA + + LEAF_ENTRY BaseFiberStartup + __assertfail + bx lr + LEAF_END BaseFiberStartup + + LEAF_ENTRY SwitchToFiber + __assertfail + bx lr + LEAF_END SwitchToFiber + + END +/* EOF */ Propchange: trunk/reactos/dll/win32/kernel32/client/arm/fiber.S ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/kernel32/client/arm/thread.S URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/…
============================================================================== --- trunk/reactos/dll/win32/kernel32/client/arm/thread.S (added) +++ trunk/reactos/dll/win32/kernel32/client/arm/thread.S [iso-8859-1] Thu Apr 30 21:07:08 2015 @@ -0,0 +1,27 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS system libraries + * FILE: lib/kernel32/thread/arm/thread.S + * PURPOSE: Thread and process start thunks + * PROGRAMMER: + */ + +#include <ksarm.h> + + IMPORT BaseThreadStartup + IMPORT BaseProcessStartup + + TEXTAREA + + LEAF_ENTRY BaseThreadStartupThunk + __assertfail + bx lr + LEAF_END BaseThreadStartupThunk + + LEAF_ENTRY BaseProcessStartThunk + __assertfail + bx lr + LEAF_END BaseProcessStartThunk + + END +/* EOF */ Propchange: trunk/reactos/dll/win32/kernel32/client/arm/thread.S ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/lib/sdk/crt/except/arm/__jump_unwind.s URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/except/arm/__j…
============================================================================== --- trunk/reactos/lib/sdk/crt/except/arm/__jump_unwind.s (added) +++ trunk/reactos/lib/sdk/crt/except/arm/__jump_unwind.s [iso-8859-1] Thu Apr 30 21:07:08 2015 @@ -0,0 +1,21 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS CRT library + * PURPOSE: Implementation of __jmp_unwind + * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) + */ + +/* INCLUDES ******************************************************************/ + +#include <kxarm.h> + +/* CODE **********************************************************************/ + TEXTAREA + + LEAF_ENTRY __jmp_unwind + __assertfail + bx lr + LEAF_END __jmp_unwind + + END +/* EOF */ Propchange: trunk/reactos/lib/sdk/crt/except/arm/__jump_unwind.s ------------------------------------------------------------------------------ svn:eol-style = native
9 years, 7 months
1
0
0
0
[tkreuzer] 67481: [CRT] Add a number of ARM
by tkreuzer@svn.reactos.org
Author: tkreuzer Date: Thu Apr 30 21:04:29 2015 New Revision: 67481 URL:
http://svn.reactos.org/svn/reactos?rev=67481&view=rev
Log: [CRT] Add a number of ARM Added: trunk/reactos/lib/sdk/crt/math/arm/_controlfp.s (with props) trunk/reactos/lib/sdk/crt/math/arm/_fpreset.s (with props) trunk/reactos/lib/sdk/crt/math/arm/_logb.s (with props) trunk/reactos/lib/sdk/crt/math/arm/_statusfp.s (with props) trunk/reactos/lib/sdk/crt/math/arm/atan.s (with props) trunk/reactos/lib/sdk/crt/math/arm/atan2.s (with props) trunk/reactos/lib/sdk/crt/math/arm/ceil.s (with props) trunk/reactos/lib/sdk/crt/math/arm/exp.s (with props) trunk/reactos/lib/sdk/crt/math/arm/fabs.s (with props) trunk/reactos/lib/sdk/crt/math/arm/fmod.s (with props) trunk/reactos/lib/sdk/crt/math/arm/ldexp.s (with props) trunk/reactos/lib/sdk/crt/math/arm/log.s (with props) trunk/reactos/lib/sdk/crt/math/arm/sqrt.s (with props) trunk/reactos/lib/sdk/crt/math/arm/tan.s (with props) Modified: trunk/reactos/lib/sdk/crt/math/arm/__dtou64.s trunk/reactos/lib/sdk/crt/math/arm/__rt_div.c trunk/reactos/lib/sdk/crt/math/arm/__rt_div_worker.h trunk/reactos/lib/sdk/crt/math/arm/__rt_sdiv.c trunk/reactos/lib/sdk/crt/math/arm/__rt_sdiv64.s trunk/reactos/lib/sdk/crt/math/arm/__rt_sdiv64_worker.c trunk/reactos/lib/sdk/crt/math/arm/__rt_srsh.s trunk/reactos/lib/sdk/crt/math/arm/__rt_udiv.c trunk/reactos/lib/sdk/crt/math/arm/__rt_udiv64.s trunk/reactos/lib/sdk/crt/math/arm/__rt_udiv64_worker.c trunk/reactos/lib/sdk/crt/math/arm/__u64tod.s trunk/reactos/lib/sdk/crt/math/arm/floor.s trunk/reactos/lib/sdk/crt/math/arm/log10.s trunk/reactos/lib/sdk/crt/math/arm/pow.s Modified: trunk/reactos/lib/sdk/crt/math/arm/__dtou64.s URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/arm/__dto…
============================================================================== --- trunk/reactos/lib/sdk/crt/math/arm/__dtou64.s [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/arm/__dtou64.s [iso-8859-1] Thu Apr 30 21:04:29 2015 @@ -1,6 +1,6 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS system libraries + * COPYRIGHT: BSD - See COPYING.ARM in the top level directory + * PROJECT: ReactOS CRT library * PURPOSE: Implementation of __dtou64 * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) */ @@ -10,9 +10,13 @@ #include <kxarm.h> /* CODE **********************************************************************/ + TEXTAREA LEAF_ENTRY __dtou64 + + __assertfail + bx lr LEAF_END __dtou64 Modified: trunk/reactos/lib/sdk/crt/math/arm/__rt_div.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/arm/__rt_…
============================================================================== --- trunk/reactos/lib/sdk/crt/math/arm/__rt_div.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/arm/__rt_div.c [iso-8859-1] Thu Apr 30 21:04:29 2015 @@ -1,6 +1,6 @@ /* - * COPYRIGHT: BSD, see COPYING.ARM in the top level directory - * PROJECT: ReactOS crt library + * COPYRIGHT: BSD - See COPYING.ARM in the top level directory + * PROJECT: ReactOS CRT library * FILE: lib/sdk/crt/math/arm/__rt_udiv.c * PURPOSE: Implementation of __rt_udiv * PROGRAMMER: Timo Kreuzer Modified: trunk/reactos/lib/sdk/crt/math/arm/__rt_div_worker.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/arm/__rt_…
============================================================================== --- trunk/reactos/lib/sdk/crt/math/arm/__rt_div_worker.h [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/arm/__rt_div_worker.h [iso-8859-1] Thu Apr 30 21:04:29 2015 @@ -1,6 +1,6 @@ /* - * COPYRIGHT: BSD, see COPYING.ARM in the top level directory - * PROJECT: ReactOS crt library + * COPYRIGHT: BSD - See COPYING.ARM in the top level directory + * PROJECT: ReactOS CRT library * FILE: lib/sdk/crt/math/arm/__rt_udiv.c * PURPOSE: Implementation of __rt_udiv * PROGRAMMER: Timo Kreuzer Modified: trunk/reactos/lib/sdk/crt/math/arm/__rt_sdiv.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/arm/__rt_…
============================================================================== --- trunk/reactos/lib/sdk/crt/math/arm/__rt_sdiv.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/arm/__rt_sdiv.c [iso-8859-1] Thu Apr 30 21:04:29 2015 @@ -1,6 +1,6 @@ /* - * COPYRIGHT: BSD, see COPYING.ARM in the top level directory - * PROJECT: ReactOS crt library + * COPYRIGHT: BSD - See COPYING.ARM in the top level directory + * PROJECT: ReactOS CRT library * FILE: lib/sdk/crt/math/arm/__rt_sdiv.c * PURPOSE: Implementation of __rt_sdiv * PROGRAMMER: Timo Kreuzer Modified: trunk/reactos/lib/sdk/crt/math/arm/__rt_sdiv64.s URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/arm/__rt_…
============================================================================== --- trunk/reactos/lib/sdk/crt/math/arm/__rt_sdiv64.s [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/arm/__rt_sdiv64.s [iso-8859-1] Thu Apr 30 21:04:29 2015 @@ -1,6 +1,6 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS system libraries + * COPYRIGHT: BSD - See COPYING.ARM in the top level directory + * PROJECT: ReactOS CRT library * PURPOSE: Implementation of __rt_sdiv64 * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) */ @@ -12,6 +12,7 @@ IMPORT __rt_sdiv64_worker /* CODE **********************************************************************/ + TEXTAREA NESTED_ENTRY __rt_sdiv64 @@ -30,7 +31,7 @@ Return /* Move result data into the appropriate registers and return */ ldmia sp!,{r0,r1,r2,r3,pc} - ENTRY_END __rt_sdiv64 + NESTED_END __rt_sdiv64 END /* EOF */ Modified: trunk/reactos/lib/sdk/crt/math/arm/__rt_sdiv64_worker.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/arm/__rt_…
============================================================================== --- trunk/reactos/lib/sdk/crt/math/arm/__rt_sdiv64_worker.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/arm/__rt_sdiv64_worker.c [iso-8859-1] Thu Apr 30 21:04:29 2015 @@ -1,6 +1,6 @@ /* - * COPYRIGHT: BSD, see COPYING.ARM in the top level directory - * PROJECT: ReactOS crt library + * COPYRIGHT: BSD - See COPYING.ARM in the top level directory + * PROJECT: ReactOS CRT library * FILE: lib/sdk/crt/math/arm/__rt_sdiv_worker.c * PURPOSE: Implementation of __rt_sdiv_worker * PROGRAMMER: Timo Kreuzer Modified: trunk/reactos/lib/sdk/crt/math/arm/__rt_srsh.s URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/arm/__rt_…
============================================================================== --- trunk/reactos/lib/sdk/crt/math/arm/__rt_srsh.s [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/arm/__rt_srsh.s [iso-8859-1] Thu Apr 30 21:04:29 2015 @@ -1,6 +1,6 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS system libraries + * COPYRIGHT: BSD - See COPYING.ARM in the top level directory + * PROJECT: ReactOS CRT library * PURPOSE: Implementation of __rt_srsh * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) */ @@ -10,9 +10,13 @@ #include <kxarm.h> /* CODE **********************************************************************/ + TEXTAREA LEAF_ENTRY __rt_srsh + + __assertfail + bx lr LEAF_END __rt_srsh Modified: trunk/reactos/lib/sdk/crt/math/arm/__rt_udiv.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/arm/__rt_…
============================================================================== --- trunk/reactos/lib/sdk/crt/math/arm/__rt_udiv.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/arm/__rt_udiv.c [iso-8859-1] Thu Apr 30 21:04:29 2015 @@ -1,7 +1,6 @@ /* - * COPYRIGHT: BSD, see COPYING.ARM in the top level directory - * PROJECT: ReactOS crt library - * FILE: lib/sdk/crt/math/arm/__rt_udiv.c + * COPYRIGHT: BSD - See COPYING.ARM in the top level directory + * PROJECT: ReactOS CRT library * PURPOSE: Implementation of __rt_udiv * PROGRAMMER: Timo Kreuzer * REFERENCE:
http://research.microsoft.com/en-us/um/redmond/projects/invisible/src/crt/m…
Modified: trunk/reactos/lib/sdk/crt/math/arm/__rt_udiv64.s URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/arm/__rt_…
============================================================================== --- trunk/reactos/lib/sdk/crt/math/arm/__rt_udiv64.s [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/arm/__rt_udiv64.s [iso-8859-1] Thu Apr 30 21:04:29 2015 @@ -1,6 +1,6 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS system libraries + * COPYRIGHT: BSD - See COPYING.ARM in the top level directory + * PROJECT: ReactOS CRT library * PURPOSE: Implementation of __rt_udiv64 * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) */ @@ -12,6 +12,7 @@ IMPORT __rt_udiv64_worker /* CODE **********************************************************************/ + TEXTAREA NESTED_ENTRY __rt_udiv64 @@ -30,7 +31,7 @@ Return /* Move result data into the appropriate registers and return */ ldmia sp!,{r0,r1,r2,r3,pc} - ENTRY_END __rt_udiv64 + NESTED_END __rt_udiv64 END /* EOF */ Modified: trunk/reactos/lib/sdk/crt/math/arm/__rt_udiv64_worker.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/arm/__rt_…
============================================================================== --- trunk/reactos/lib/sdk/crt/math/arm/__rt_udiv64_worker.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/arm/__rt_udiv64_worker.c [iso-8859-1] Thu Apr 30 21:04:29 2015 @@ -1,7 +1,6 @@ /* - * COPYRIGHT: BSD, see COPYING.ARM in the top level directory - * PROJECT: ReactOS crt library - * FILE: lib/sdk/crt/math/arm/__rt_udiv64_worker.c + * COPYRIGHT: BSD - See COPYING.ARM in the top level directory + * PROJECT: ReactOS CRT library * PURPOSE: Implementation of __rt_udiv64_worker * PROGRAMMER: Timo Kreuzer * REFERENCE:
http://research.microsoft.com/en-us/um/redmond/projects/invisible/src/crt/m…
Modified: trunk/reactos/lib/sdk/crt/math/arm/__u64tod.s URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/arm/__u64…
============================================================================== --- trunk/reactos/lib/sdk/crt/math/arm/__u64tod.s [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/arm/__u64tod.s [iso-8859-1] Thu Apr 30 21:04:29 2015 @@ -1,6 +1,6 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS system libraries + * COPYRIGHT: BSD - See COPYING.ARM in the top level directory + * PROJECT: ReactOS CRT library * PURPOSE: Implementation of __u64tod * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) */ @@ -10,9 +10,13 @@ #include <kxarm.h> /* CODE **********************************************************************/ + TEXTAREA LEAF_ENTRY __u64tod + + __assertfail + bx lr LEAF_END __u64tod Added: trunk/reactos/lib/sdk/crt/math/arm/_controlfp.s URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/arm/_cont…
============================================================================== --- trunk/reactos/lib/sdk/crt/math/arm/_controlfp.s (added) +++ trunk/reactos/lib/sdk/crt/math/arm/_controlfp.s [iso-8859-1] Thu Apr 30 21:04:29 2015 @@ -0,0 +1,24 @@ +/* + * COPYRIGHT: BSD - See COPYING.ARM in the top level directory + * PROJECT: ReactOS CRT library + * PURPOSE: Implementation of _controlfp + * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) + */ + +/* INCLUDES ******************************************************************/ + +#include <kxarm.h> + +/* CODE **********************************************************************/ + + TEXTAREA + + LEAF_ENTRY _controlfp + + __assertfail + bx lr + + LEAF_END _controlfp + + END +/* EOF */ Propchange: trunk/reactos/lib/sdk/crt/math/arm/_controlfp.s ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/lib/sdk/crt/math/arm/_fpreset.s URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/arm/_fpre…
============================================================================== --- trunk/reactos/lib/sdk/crt/math/arm/_fpreset.s (added) +++ trunk/reactos/lib/sdk/crt/math/arm/_fpreset.s [iso-8859-1] Thu Apr 30 21:04:29 2015 @@ -0,0 +1,24 @@ +/* + * COPYRIGHT: BSD - See COPYING.ARM in the top level directory + * PROJECT: ReactOS CRT library + * PURPOSE: Implementation of _fpreset + * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) + */ + +/* INCLUDES ******************************************************************/ + +#include <kxarm.h> + +/* CODE **********************************************************************/ + + TEXTAREA + + LEAF_ENTRY _fpreset + + __assertfail + bx lr + + LEAF_END _fpreset + + END +/* EOF */ Propchange: trunk/reactos/lib/sdk/crt/math/arm/_fpreset.s ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/lib/sdk/crt/math/arm/_logb.s URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/arm/_logb…
============================================================================== --- trunk/reactos/lib/sdk/crt/math/arm/_logb.s (added) +++ trunk/reactos/lib/sdk/crt/math/arm/_logb.s [iso-8859-1] Thu Apr 30 21:04:29 2015 @@ -0,0 +1,24 @@ +/* + * COPYRIGHT: BSD - See COPYING.ARM in the top level directory + * PROJECT: ReactOS CRT library + * PURPOSE: Implementation of _logb + * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) + */ + +/* INCLUDES ******************************************************************/ + +#include <kxarm.h> + +/* CODE **********************************************************************/ + + TEXTAREA + + LEAF_ENTRY _logb + + __assertfail + bx lr + + LEAF_END _logb + + END +/* EOF */ Propchange: trunk/reactos/lib/sdk/crt/math/arm/_logb.s ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/lib/sdk/crt/math/arm/_statusfp.s URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/arm/_stat…
============================================================================== --- trunk/reactos/lib/sdk/crt/math/arm/_statusfp.s (added) +++ trunk/reactos/lib/sdk/crt/math/arm/_statusfp.s [iso-8859-1] Thu Apr 30 21:04:29 2015 @@ -0,0 +1,24 @@ +/* + * COPYRIGHT: BSD - See COPYING.ARM in the top level directory + * PROJECT: ReactOS CRT library + * PURPOSE: Implementation of _statusfp + * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) + */ + +/* INCLUDES ******************************************************************/ + +#include <kxarm.h> + +/* CODE **********************************************************************/ + + TEXTAREA + + LEAF_ENTRY _statusfp + + __assertfail + bx lr + + LEAF_END _statusfp + + END +/* EOF */ Propchange: trunk/reactos/lib/sdk/crt/math/arm/_statusfp.s ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/lib/sdk/crt/math/arm/atan.s URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/arm/atan.…
============================================================================== --- trunk/reactos/lib/sdk/crt/math/arm/atan.s (added) +++ trunk/reactos/lib/sdk/crt/math/arm/atan.s [iso-8859-1] Thu Apr 30 21:04:29 2015 @@ -0,0 +1,24 @@ +/* + * COPYRIGHT: BSD - See COPYING.ARM in the top level directory + * PROJECT: ReactOS CRT library + * PURPOSE: Implementation of atan + * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) + */ + +/* INCLUDES ******************************************************************/ + +#include <kxarm.h> + +/* CODE **********************************************************************/ + + TEXTAREA + + LEAF_ENTRY atan + + __assertfail + bx lr + + LEAF_END atan + + END +/* EOF */ Propchange: trunk/reactos/lib/sdk/crt/math/arm/atan.s ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/lib/sdk/crt/math/arm/atan2.s URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/arm/atan2…
============================================================================== --- trunk/reactos/lib/sdk/crt/math/arm/atan2.s (added) +++ trunk/reactos/lib/sdk/crt/math/arm/atan2.s [iso-8859-1] Thu Apr 30 21:04:29 2015 @@ -0,0 +1,24 @@ +/* + * COPYRIGHT: BSD - See COPYING.ARM in the top level directory + * PROJECT: ReactOS CRT library + * PURPOSE: Implementation of atan2 + * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) + */ + +/* INCLUDES ******************************************************************/ + +#include <kxarm.h> + +/* CODE **********************************************************************/ + + TEXTAREA + + LEAF_ENTRY atan2 + + __assertfail + bx lr + + LEAF_END atan2 + + END +/* EOF */ Propchange: trunk/reactos/lib/sdk/crt/math/arm/atan2.s ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/lib/sdk/crt/math/arm/ceil.s URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/arm/ceil.…
============================================================================== --- trunk/reactos/lib/sdk/crt/math/arm/ceil.s (added) +++ trunk/reactos/lib/sdk/crt/math/arm/ceil.s [iso-8859-1] Thu Apr 30 21:04:29 2015 @@ -0,0 +1,33 @@ +/* + * COPYRIGHT: BSD - See COPYING.ARM in the top level directory + * PROJECT: ReactOS CRT library + * PURPOSE: Implementation of ceil + * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) + * Original implementation: dawncrow + * SOURCE: MinGW-w64\mingw-w64-crt\math\ceil.S + */ + +/* INCLUDES ******************************************************************/ + +#include <kxarm.h> + +/* CODE **********************************************************************/ + + TEXTAREA + + LEAF_ENTRY ceil + + vmrs r1, fpscr + + bic r0, r1, #0x00c00000 + orr r0, r0, #0x00400000 /* Round towards Plus Infinity */ + vmsr fpscr, r0 + vcvtr.s32.f64 s0, d0 + vcvt.f64.s32 d0, s0 + vmsr fpscr, r1 + bx lr + + LEAF_END ceil + + END +/* EOF */ Propchange: trunk/reactos/lib/sdk/crt/math/arm/ceil.s ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/lib/sdk/crt/math/arm/exp.s URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/arm/exp.s…
============================================================================== --- trunk/reactos/lib/sdk/crt/math/arm/exp.s (added) +++ trunk/reactos/lib/sdk/crt/math/arm/exp.s [iso-8859-1] Thu Apr 30 21:04:29 2015 @@ -0,0 +1,24 @@ +/* + * COPYRIGHT: BSD - See COPYING.ARM in the top level directory + * PROJECT: ReactOS CRT library + * PURPOSE: Implementation of exp + * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) + */ + +/* INCLUDES ******************************************************************/ + +#include <kxarm.h> + +/* CODE **********************************************************************/ + + TEXTAREA + + LEAF_ENTRY exp + + __assertfail + bx lr + + LEAF_END exp + + END +/* EOF */ Propchange: trunk/reactos/lib/sdk/crt/math/arm/exp.s ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/lib/sdk/crt/math/arm/fabs.s URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/arm/fabs.…
============================================================================== --- trunk/reactos/lib/sdk/crt/math/arm/fabs.s (added) +++ trunk/reactos/lib/sdk/crt/math/arm/fabs.s [iso-8859-1] Thu Apr 30 21:04:29 2015 @@ -0,0 +1,24 @@ +/* + * COPYRIGHT: BSD - See COPYING.ARM in the top level directory + * PROJECT: ReactOS CRT library + * PURPOSE: Implementation of fabs + * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) + */ + +/* INCLUDES ******************************************************************/ + +#include <kxarm.h> + +/* CODE **********************************************************************/ + + TEXTAREA + + LEAF_ENTRY fabs + + __assertfail + bx lr + + LEAF_END fabs + + END +/* EOF */ Propchange: trunk/reactos/lib/sdk/crt/math/arm/fabs.s ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/lib/sdk/crt/math/arm/floor.s URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/arm/floor…
============================================================================== --- trunk/reactos/lib/sdk/crt/math/arm/floor.s [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/arm/floor.s [iso-8859-1] Thu Apr 30 21:04:29 2015 @@ -1,18 +1,30 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS system libraries + * COPYRIGHT: BSD - See COPYING.ARM in the top level directory + * PROJECT: ReactOS CRT library * PURPOSE: Implementation of floor * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) + * Original implementation: dawncrow + * SOURCE: MinGW-w64\mingw-w64-crt\math\floor.S */ /* INCLUDES ******************************************************************/ -#include <kxarm.h> +#include <ksarm.h> /* CODE **********************************************************************/ + TEXTAREA LEAF_ENTRY floor + + vmrs r1, fpscr + bic r0, r1, #0x00c00000 + orr r0, r0, #0x00800000 /* Round towards Minus Infinity */ + vmsr fpscr, r0 + vcvtr.s32.f64 s0, d0 + vcvt.f64.s32 d0, s0 + vmsr fpscr, r1 + bx lr LEAF_END floor Added: trunk/reactos/lib/sdk/crt/math/arm/fmod.s URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/arm/fmod.…
============================================================================== --- trunk/reactos/lib/sdk/crt/math/arm/fmod.s (added) +++ trunk/reactos/lib/sdk/crt/math/arm/fmod.s [iso-8859-1] Thu Apr 30 21:04:29 2015 @@ -0,0 +1,24 @@ +/* + * COPYRIGHT: BSD - See COPYING.ARM in the top level directory + * PROJECT: ReactOS CRT library + * PURPOSE: Implementation of fmod + * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) + */ + +/* INCLUDES ******************************************************************/ + +#include <kxarm.h> + +/* CODE **********************************************************************/ + + TEXTAREA + + LEAF_ENTRY fmod + + __assertfail + bx lr + + LEAF_END fmod + + END +/* EOF */ Propchange: trunk/reactos/lib/sdk/crt/math/arm/fmod.s ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/lib/sdk/crt/math/arm/ldexp.s URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/arm/ldexp…
============================================================================== --- trunk/reactos/lib/sdk/crt/math/arm/ldexp.s (added) +++ trunk/reactos/lib/sdk/crt/math/arm/ldexp.s [iso-8859-1] Thu Apr 30 21:04:29 2015 @@ -0,0 +1,24 @@ +/* + * COPYRIGHT: BSD - See COPYING.ARM in the top level directory + * PROJECT: ReactOS CRT library + * PURPOSE: Implementation of ldexp + * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) + */ + +/* INCLUDES ******************************************************************/ + +#include <kxarm.h> + +/* CODE **********************************************************************/ + + TEXTAREA + + LEAF_ENTRY ldexp + + __assertfail + bx lr + + LEAF_END ldexp + + END +/* EOF */ Propchange: trunk/reactos/lib/sdk/crt/math/arm/ldexp.s ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/lib/sdk/crt/math/arm/log.s URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/arm/log.s…
============================================================================== --- trunk/reactos/lib/sdk/crt/math/arm/log.s (added) +++ trunk/reactos/lib/sdk/crt/math/arm/log.s [iso-8859-1] Thu Apr 30 21:04:29 2015 @@ -0,0 +1,24 @@ +/* + * COPYRIGHT: BSD - See COPYING.ARM in the top level directory + * PROJECT: ReactOS CRT library + * PURPOSE: Implementation of log + * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) + */ + +/* INCLUDES ******************************************************************/ + +#include <kxarm.h> + +/* CODE **********************************************************************/ + + TEXTAREA + + LEAF_ENTRY log + + __assertfail + bx lr + + LEAF_END log + + END +/* EOF */ Propchange: trunk/reactos/lib/sdk/crt/math/arm/log.s ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/lib/sdk/crt/math/arm/log10.s URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/arm/log10…
============================================================================== --- trunk/reactos/lib/sdk/crt/math/arm/log10.s [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/arm/log10.s [iso-8859-1] Thu Apr 30 21:04:29 2015 @@ -1,6 +1,6 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS system libraries + * COPYRIGHT: BSD - See COPYING.ARM in the top level directory + * PROJECT: ReactOS CRT library * PURPOSE: Implementation of log10 * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) */ @@ -10,9 +10,13 @@ #include <kxarm.h> /* CODE **********************************************************************/ + TEXTAREA LEAF_ENTRY log10 + + __assertfail + bx lr LEAF_END log10 Modified: trunk/reactos/lib/sdk/crt/math/arm/pow.s URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/arm/pow.s…
============================================================================== --- trunk/reactos/lib/sdk/crt/math/arm/pow.s [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/arm/pow.s [iso-8859-1] Thu Apr 30 21:04:29 2015 @@ -1,6 +1,6 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS system libraries + * COPYRIGHT: BSD - See COPYING.ARM in the top level directory + * PROJECT: ReactOS CRT library * PURPOSE: Implementation of pow * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) */ @@ -10,9 +10,13 @@ #include <kxarm.h> /* CODE **********************************************************************/ + TEXTAREA LEAF_ENTRY pow + + __assertfail + bx lr LEAF_END pow Added: trunk/reactos/lib/sdk/crt/math/arm/sqrt.s URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/arm/sqrt.…
============================================================================== --- trunk/reactos/lib/sdk/crt/math/arm/sqrt.s (added) +++ trunk/reactos/lib/sdk/crt/math/arm/sqrt.s [iso-8859-1] Thu Apr 30 21:04:29 2015 @@ -0,0 +1,24 @@ +/* + * COPYRIGHT: BSD - See COPYING.ARM in the top level directory + * PROJECT: ReactOS CRT library + * PURPOSE: Implementation of sqrt + * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) + */ + +/* INCLUDES ******************************************************************/ + +#include <kxarm.h> + +/* CODE **********************************************************************/ + + TEXTAREA + + LEAF_ENTRY sqrt + + __assertfail + bx lr + + LEAF_END sqrt + + END +/* EOF */ Propchange: trunk/reactos/lib/sdk/crt/math/arm/sqrt.s ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/lib/sdk/crt/math/arm/tan.s URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/arm/tan.s…
============================================================================== --- trunk/reactos/lib/sdk/crt/math/arm/tan.s (added) +++ trunk/reactos/lib/sdk/crt/math/arm/tan.s [iso-8859-1] Thu Apr 30 21:04:29 2015 @@ -0,0 +1,24 @@ +/* + * COPYRIGHT: BSD - See COPYING.ARM in the top level directory + * PROJECT: ReactOS CRT library + * PURPOSE: Implementation of tan + * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) + */ + +/* INCLUDES ******************************************************************/ + +#include <kxarm.h> + +/* CODE **********************************************************************/ + + TEXTAREA + + LEAF_ENTRY tan + + __assertfail + bx lr + + LEAF_END tan + + END +/* EOF */ Propchange: trunk/reactos/lib/sdk/crt/math/arm/tan.s ------------------------------------------------------------------------------ svn:eol-style = native
9 years, 7 months
1
0
0
0
[akhaldi] 67480: [COMCTL32] Export DrawShadowText() and mention that it's exported only in v6. Dedicated to Stefano Toncich aka Tonix.
by akhaldi@svn.reactos.org
Author: akhaldi Date: Thu Apr 30 15:56:19 2015 New Revision: 67480 URL:
http://svn.reactos.org/svn/reactos?rev=67480&view=rev
Log: [COMCTL32] Export DrawShadowText() and mention that it's exported only in v6. Dedicated to Stefano Toncich aka Tonix. Modified: trunk/reactos/dll/win32/comctl32/comctl32.spec Modified: trunk/reactos/dll/win32/comctl32/comctl32.spec URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl3…
============================================================================== --- trunk/reactos/dll/win32/comctl32/comctl32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/comctl32.spec [iso-8859-1] Thu Apr 30 15:56:19 2015 @@ -178,3 +178,6 @@ 419 stdcall -noname GetTextExtentPointWrap(long wstr long ptr) gdi32.GetTextExtentPointW 420 stdcall -noname GetTextExtentPoint32Wrap(long wstr long ptr) gdi32.GetTextExtentPoint32W 421 stdcall -noname TextOutWrap(long long long wstr long) gdi32.TextOutW + +; Exported in v6 but not v5 +@ stdcall DrawShadowText(long wstr long ptr long long long long long)
9 years, 7 months
1
0
0
0
[aandrejevic] 67479: [FAST486] When a segment isn't present, the exception should always be #NP (unless it was the stack segment, in which case the exception should be #SS).
by aandrejevic@svn.reactos.org
Author: aandrejevic Date: Wed Apr 29 20:41:41 2015 New Revision: 67479 URL:
http://svn.reactos.org/svn/reactos?rev=67479&view=rev
Log: [FAST486] When a segment isn't present, the exception should always be #NP (unless it was the stack segment, in which case the exception should be #SS). Modified: trunk/reactos/lib/fast486/common.inl Modified: trunk/reactos/lib/fast486/common.inl URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/common.inl?rev…
============================================================================== --- trunk/reactos/lib/fast486/common.inl [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/common.inl [iso-8859-1] Wed Apr 29 20:41:41 2015 @@ -625,7 +625,7 @@ if (!GdtEntry.Present) { - Fast486ExceptionWithErrorCode(State, Exception, Selector); + Fast486ExceptionWithErrorCode(State, FAST486_EXCEPTION_NP, Selector); return FALSE; } @@ -679,7 +679,7 @@ if (!GdtEntry.Present) { - Fast486ExceptionWithErrorCode(State, Exception, Selector); + Fast486ExceptionWithErrorCode(State, FAST486_EXCEPTION_NP, Selector); return FALSE; } }
9 years, 7 months
1
0
0
0
[aandrejevic] 67478: [NTVDM] The fix in r67477 was incorrect. When loading an executable high, we need to allocate all of the memory and copy the program itself to the highest part of it. I know it...
by aandrejevic@svn.reactos.org
Author: aandrejevic Date: Wed Apr 29 03:18:02 2015 New Revision: 67478 URL:
http://svn.reactos.org/svn/reactos?rev=67478&view=rev
Log: [NTVDM] The fix in r67477 was incorrect. When loading an executable high, we need to allocate all of the memory and copy the program itself to the highest part of it. I know it sounds illogical but that's how it works... Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/…
============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c [iso-8859-1] Wed Apr 29 03:18:02 2015 @@ -292,12 +292,13 @@ WORD Segment = 0; WORD EnvBlock = 0; WORD MaxAllocSize; - DWORD i, FileSize, ExeSize; + WORD ExeSegment; + DWORD i, FileSize, BaseSize, TotalSize; PIMAGE_DOS_HEADER Header; PDWORD RelocationTable; PWORD RelocWord; LPSTR CmdLinePtr = (LPSTR)CommandLine; - BYTE OldStrategy = DosAllocStrategy; + BOOLEAN LoadHigh = FALSE; DPRINT1("DosLoadExecutable(%d, %s, %s, %s, 0x%08X, 0x%08X)\n", LoadType, @@ -372,45 +373,46 @@ Header = (PIMAGE_DOS_HEADER)Address; /* Get the base size of the file, in paragraphs (rounded up) */ - ExeSize = (((Header->e_cp - 1) * 512) + Header->e_cblp + 0x0F) >> 4; + BaseSize = TotalSize = (((Header->e_cp - 1) * 512) + Header->e_cblp + 0x0F) >> 4; /* Add the PSP size, in paragraphs */ - ExeSize += sizeof(DOS_PSP) >> 4; + TotalSize += sizeof(DOS_PSP) >> 4; /* Add the maximum size that should be allocated */ - ExeSize += Header->e_maxalloc; + TotalSize += Header->e_maxalloc; + + if (Header->e_minalloc == 0 && Header->e_maxalloc == 0) + { + /* This program should be loaded high */ + LoadHigh = TRUE; + TotalSize = 0xFFFF; + } /* Make sure it does not pass 0xFFFF */ - if (ExeSize > 0xFFFF) ExeSize = 0xFFFF; - - if (Header->e_minalloc == 0 && Header->e_maxalloc == 0) - { - /* This program should be loaded high */ - DosAllocStrategy = DOS_ALLOC_LAST_FIT; - } + if (TotalSize > 0xFFFF) TotalSize = 0xFFFF; /* Try to allocate that much memory */ - Segment = DosAllocateMemory((WORD)ExeSize, &MaxAllocSize); + Segment = DosAllocateMemory((WORD)TotalSize, &MaxAllocSize); if (Segment == 0) { /* Check if there's at least enough memory for the minimum size */ - if (MaxAllocSize < (ExeSize - Header->e_maxalloc + Header->e_minalloc)) + if (MaxAllocSize < (BaseSize + (sizeof(DOS_PSP) >> 4) + Header->e_minalloc)) { Result = DosLastError; goto Cleanup; } /* Allocate that minimum amount */ - ExeSize = MaxAllocSize; - Segment = DosAllocateMemory((WORD)ExeSize, NULL); + TotalSize = MaxAllocSize; + Segment = DosAllocateMemory((WORD)TotalSize, NULL); ASSERT(Segment != 0); } /* Initialize the PSP */ DosInitializePsp(Segment, CommandLine, - (WORD)ExeSize, + (WORD)TotalSize, EnvBlock, ReturnAddress); @@ -418,11 +420,14 @@ DosChangeMemoryOwner(Segment, Segment); DosChangeMemoryOwner(EnvBlock, Segment); - /* Copy the program to Segment:0100 */ - RtlCopyMemory(SEG_OFF_TO_PTR(Segment, 0x100), + /* Find the EXE segment */ + if (!LoadHigh) ExeSegment = Segment + (sizeof(DOS_PSP) >> 4); + else ExeSegment = Segment + TotalSize - BaseSize; + + /* Copy the program to the code segment */ + RtlCopyMemory(SEG_OFF_TO_PTR(ExeSegment, 0), Address + (Header->e_cparhdr << 4), - min(FileSize - (Header->e_cparhdr << 4), - (ExeSize << 4) - sizeof(DOS_PSP))); + min(FileSize - (Header->e_cparhdr << 4), BaseSize << 4)); /* Get the relocation table */ RelocationTable = (PDWORD)(Address + Header->e_lfarlc); @@ -431,11 +436,11 @@ for (i = 0; i < Header->e_crlc; i++) { /* Get a pointer to the word that needs to be patched */ - RelocWord = (PWORD)SEG_OFF_TO_PTR(Segment + HIWORD(RelocationTable[i]), - 0x100 + LOWORD(RelocationTable[i])); + RelocWord = (PWORD)SEG_OFF_TO_PTR(ExeSegment + HIWORD(RelocationTable[i]), + LOWORD(RelocationTable[i])); /* Add the number of the EXE segment to it */ - *RelocWord += Segment + (sizeof(DOS_PSP) >> 4); + *RelocWord += ExeSegment; } if (LoadType == DOS_LOAD_AND_EXECUTE) @@ -445,14 +450,13 @@ setES(Segment); /* Set the stack to the location from the header */ - setSS(Segment + (sizeof(DOS_PSP) >> 4) + Header->e_ss); + setSS(ExeSegment + Header->e_ss); setSP(Header->e_sp); /* Execute */ CurrentPsp = Segment; DiskTransferArea = MAKELONG(0x80, Segment); - CpuExecute(Segment + Header->e_cs + (sizeof(DOS_PSP) >> 4), - Header->e_ip); + CpuExecute(ExeSegment + Header->e_cs, Header->e_ip); } } else @@ -523,9 +527,6 @@ if (EnvBlock) DosFreeMemory(EnvBlock); if (Segment) DosFreeMemory(Segment); } - - /* Restore the old allocation strategy */ - DosAllocStrategy = OldStrategy; /* Unmap the file*/ if (Address != NULL) UnmapViewOfFile(Address);
9 years, 7 months
1
0
0
0
[aandrejevic] 67477: [NTVDM] If both e_minalloc and e_maxalloc are 0, the program should be loaded high.
by aandrejevic@svn.reactos.org
Author: aandrejevic Date: Wed Apr 29 01:21:58 2015 New Revision: 67477 URL:
http://svn.reactos.org/svn/reactos?rev=67477&view=rev
Log: [NTVDM] If both e_minalloc and e_maxalloc are 0, the program should be loaded high. Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/…
============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c [iso-8859-1] Wed Apr 29 01:21:58 2015 @@ -297,6 +297,7 @@ PDWORD RelocationTable; PWORD RelocWord; LPSTR CmdLinePtr = (LPSTR)CommandLine; + BYTE OldStrategy = DosAllocStrategy; DPRINT1("DosLoadExecutable(%d, %s, %s, %s, 0x%08X, 0x%08X)\n", LoadType, @@ -382,6 +383,12 @@ /* Make sure it does not pass 0xFFFF */ if (ExeSize > 0xFFFF) ExeSize = 0xFFFF; + if (Header->e_minalloc == 0 && Header->e_maxalloc == 0) + { + /* This program should be loaded high */ + DosAllocStrategy = DOS_ALLOC_LAST_FIT; + } + /* Try to allocate that much memory */ Segment = DosAllocateMemory((WORD)ExeSize, &MaxAllocSize); @@ -516,6 +523,9 @@ if (EnvBlock) DosFreeMemory(EnvBlock); if (Segment) DosFreeMemory(Segment); } + + /* Restore the old allocation strategy */ + DosAllocStrategy = OldStrategy; /* Unmap the file*/ if (Address != NULL) UnmapViewOfFile(Address);
9 years, 7 months
1
0
0
0
[aandrejevic] 67476: [NTVDM] Also check for BlockData == 0 in RosResizeMemory. This, however, wasn't a crash since we were lucky enough to cast the segment to a WORD before the access.
by aandrejevic@svn.reactos.org
Author: aandrejevic Date: Wed Apr 29 00:58:22 2015 New Revision: 67476 URL:
http://svn.reactos.org/svn/reactos?rev=67476&view=rev
Log: [NTVDM] Also check for BlockData == 0 in RosResizeMemory. This, however, wasn't a crash since we were lucky enough to cast the segment to a WORD before the access. Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/memory.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/memory.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/…
============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/memory.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/memory.c [iso-8859-1] Wed Apr 29 00:58:22 2015 @@ -210,7 +210,9 @@ NewSize); /* Make sure this is a valid, allocated block */ - if ((Mcb->BlockType != 'M' && Mcb->BlockType != 'Z') || Mcb->OwnerPsp == 0) + if (BlockData == 0 + || (Mcb->BlockType != 'M' && Mcb->BlockType != 'Z') + || Mcb->OwnerPsp == 0) { Success = FALSE; DosLastError = ERROR_INVALID_HANDLE;
9 years, 7 months
1
0
0
0
[aandrejevic] 67475: [NTVDM] Don't crash when DosFreeMemory is called with BlockData == 0.
by aandrejevic@svn.reactos.org
Author: aandrejevic Date: Wed Apr 29 00:47:06 2015 New Revision: 67475 URL:
http://svn.reactos.org/svn/reactos?rev=67475&view=rev
Log: [NTVDM] Don't crash when DosFreeMemory is called with BlockData == 0. Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/memory.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/memory.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/…
============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/memory.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/memory.c [iso-8859-1] Wed Apr 29 00:47:06 2015 @@ -319,6 +319,7 @@ PDOS_MCB Mcb = SEGMENT_TO_MCB(BlockData - 1); DPRINT("DosFreeMemory: BlockData 0x%04X\n", BlockData); + if (BlockData == 0) return FALSE; /* Make sure the MCB is valid */ if (Mcb->BlockType != 'M' && Mcb->BlockType != 'Z')
9 years, 7 months
1
0
0
0
← Newer
1
2
3
4
...
49
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
Results per page:
10
25
50
100
200