Ros-diffs

ros-diffs@reactos.org

81390 discussions

[fireball] 38300: - Replace all deprecated functions with underscored names. - Add _CRT_SECURE_NO_DEPRECATE to VC project file to suppress security warnings.
by fireball＠svn.reactos.org 23 Dec '08

23 Dec '08

Author: fireball Date: Tue Dec 23 08:19:19 2008 New Revision: 38300 URL: http://svn.reactos.org/svn/reactos?rev=38300&view=rev Log: - Replace all deprecated functions with underscored names. - Add _CRT_SECURE_NO_DEPRECATE to VC project file to suppress security warnings. Modified: trunk/reactos/tools/rbuild/automaticdependency.cpp trunk/reactos/tools/rbuild/backend/backend.cpp trunk/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp trunk/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp trunk/reactos/tools/rbuild/compilationunit.cpp trunk/reactos/tools/rbuild/directory.cpp trunk/reactos/tools/rbuild/module.cpp trunk/reactos/tools/rbuild/rbuild.vcproj trunk/reactos/tools/rbuild/testsupportcode.cpp Modified: trunk/reactos/tools/rbuild/automaticdependency.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/automaticdepe… ============================================================================== --- trunk/reactos/tools/rbuild/automaticdependency.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/automaticdependency.cpp [iso-8859-1] Tue Dec 23 08:19:19 2008 @@ -60,7 +60,7 @@ if ( !f ) throw FileNotFoundException ( filename ); - if ( fstat ( fileno ( f ), &statbuf ) != 0 ) + if ( fstat ( _fileno ( f ), &statbuf ) != 0 ) { fclose ( f ); throw AccessDeniedException ( filename ); Modified: trunk/reactos/tools/rbuild/backend/backend.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/backe… ============================================================================== --- trunk/reactos/tools/rbuild/backend/backend.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/backend.cpp [iso-8859-1] Tue Dec 23 08:19:19 2008 @@ -32,7 +32,7 @@ Backend::Factory::Factory ( const std::string& name_, const std::string& description_ ) { string name(name_); - strlwr ( &name[0] ); + _strlwr ( &name[0] ); if ( !ref++ ) factories = new map<string,Factory*>; (*factories)[name] = this; @@ -55,7 +55,7 @@ Configuration& configuration ) { string sname ( name ); - strlwr ( &sname[0] ); + _strlwr ( &sname[0] ); if ( !factories || !factories->size () ) throw InvalidOperationException ( __FILE__, __LINE__, Modified: trunk/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/codeb… ============================================================================== --- trunk/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp [iso-8859-1] Tue Dec 23 08:19:19 2008 @@ -268,7 +268,7 @@ string::size_type pos = file.find_last_of (sSep); if ( pos != string::npos ) file.erase ( 0, pos+1 ); - if ( !stricmp ( Right(file,3).c_str(), ".rc" ) ) + if ( !_stricmp ( Right(file,3).c_str(), ".rc" ) ) file = ReplaceExtension ( file, ".res" ); else file = ReplaceExtension ( file, ".obj" ); @@ -429,7 +429,7 @@ string fullpath = files[i]->file.relative_path + sSep + files[i]->file.name; string file = string(".") + &fullpath[cbproj_path.size()]; - if ( !stricmp ( Right(file,3).c_str(), ".rc" ) ) + if ( !_stricmp ( Right(file,3).c_str(), ".rc" ) ) resource_files.push_back ( file ); else source_files.push_back ( file ); Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1] Tue Dec 23 08:19:19 2008 @@ -621,7 +621,7 @@ if ( !f ) throw FileNotFoundException ( NormalizeFilename ( xmlbuildfile.topIncludeFilename ) ); - if ( fstat ( fileno ( f ), &statbuf ) != 0 ) + if ( fstat ( _fileno ( f ), &statbuf ) != 0 ) { fclose ( f ); throw AccessDeniedException ( NormalizeFilename ( xmlbuildfile.topIncludeFilename ) ); @@ -1064,7 +1064,7 @@ { usePipe = (exitcode == 0); fclose ( f ); - unlink ( pipe_detectionObjectFilename.c_str () ); + _unlink ( pipe_detectionObjectFilename.c_str () ); } else usePipe = false; @@ -1097,7 +1097,7 @@ { use_pch = true; fclose ( f ); - unlink ( path.c_str () ); + _unlink ( path.c_str () ); } else use_pch = false; Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] Tue Dec 23 08:19:19 2008 @@ -63,7 +63,7 @@ GetTargetMacro ( const Module& module, bool with_dollar ) { string s ( module.name ); - strupr ( &s[0] ); + _strupr ( &s[0] ); s += "_TARGET"; if ( with_dollar ) return ssprintf ( "$(%s)", s.c_str() ); @@ -2399,13 +2399,13 @@ const char * crtAttr = module.CRT.c_str (); const char * crtLib = NULL; - if ( stricmp ( crtAttr, "libc" ) == 0 ) + if ( _stricmp ( crtAttr, "libc" ) == 0 ) crtLib = "crt"; - else if ( stricmp ( crtAttr, "msvcrt" ) == 0 ) + else if ( _stricmp ( crtAttr, "msvcrt" ) == 0 ) crtLib = "msvcrt"; - else if ( stricmp ( crtAttr, "libcntpr" ) == 0 ) + else if ( _stricmp ( crtAttr, "libcntpr" ) == 0 ) crtLib = "libcntpr"; - else if ( stricmp ( crtAttr, "ntdll" ) == 0 ) + else if ( _stricmp ( crtAttr, "ntdll" ) == 0 ) crtLib = "ntdll"; if ( crtLib ) Modified: trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/msvc/… ============================================================================== --- trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp [iso-8859-1] Tue Dec 23 08:19:19 2008 @@ -340,7 +340,7 @@ string::size_type pos = file.find_last_of (DEF_SSEP); if ( pos != string::npos ) file.erase ( 0, pos+1 ); - if ( !stricmp ( Right(file,3).c_str(), ".rc" ) ) + if ( !_stricmp ( Right(file,3).c_str(), ".rc" ) ) file = ReplaceExtension ( file, ".res" ); else file = ReplaceExtension ( file, ".obj" ); Modified: trunk/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/msvc/… ============================================================================== --- trunk/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp [iso-8859-1] Tue Dec 23 08:19:19 2008 @@ -108,11 +108,11 @@ string file = path + std::string("\\") + files[i]->file.name; source_files.push_back ( file ); - if ( !stricmp ( Right(file,2).c_str(), ".c" ) ) + if ( !_stricmp ( Right(file,2).c_str(), ".c" ) ) c_srcs.push_back ( file ); - if ( !stricmp ( Right(file,2).c_str(), ".h" ) ) + if ( !_stricmp ( Right(file,2).c_str(), ".h" ) ) header_files.push_back ( file ); - if ( !stricmp ( Right(file,3).c_str(), ".rc" ) ) + if ( !_stricmp ( Right(file,3).c_str(), ".rc" ) ) resource_files.push_back ( file ); } const vector<Include*>& incs = data.includes; Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/msvc/… ============================================================================== --- trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp [iso-8859-1] Tue Dec 23 08:19:19 2008 @@ -159,9 +159,9 @@ module.output->relative_path ); string file = path + std::string("\\") + files[i]->file.name; - if ( !stricmp ( Right(file,3).c_str(), ".rc" ) ) + if ( !_stricmp ( Right(file,3).c_str(), ".rc" ) ) resource_files.push_back ( file ); - else if ( !stricmp ( Right(file,2).c_str(), ".h" ) ) + else if ( !_stricmp ( Right(file,2).c_str(), ".h" ) ) header_files.push_back ( file ); else source_files.push_back ( file ); Modified: trunk/reactos/tools/rbuild/compilationunit.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/compilationun… ============================================================================== --- trunk/reactos/tools/rbuild/compilationunit.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/compilationunit.cpp [iso-8859-1] Tue Dec 23 08:19:19 2008 @@ -88,7 +88,7 @@ { const File& file = *files[i]; string fileExtension = GetExtension ( file.file ); - if ( !stricmp ( fileExtension.c_str (), extension.c_str () ) ) + if ( !_stricmp ( fileExtension.c_str (), extension.c_str () ) ) return true; } return false; Modified: trunk/reactos/tools/rbuild/directory.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/directory.cpp… ============================================================================== --- trunk/reactos/tools/rbuild/directory.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/directory.cpp [iso-8859-1] Tue Dec 23 08:19:19 2008 @@ -26,7 +26,7 @@ #endif//_MSC_VER #ifdef WIN32 -#define MKDIR(s) mkdir(s) +#define MKDIR(s) _mkdir(s) #else #define MKDIR(s) mkdir(s, 0755) #endif Modified: trunk/reactos/tools/rbuild/module.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/module.cpp?re… ============================================================================== --- trunk/reactos/tools/rbuild/module.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/module.cpp [iso-8859-1] Tue Dec 23 08:19:19 2008 @@ -238,9 +238,9 @@ if ( att != NULL ) { const char* p = att->value.c_str(); - if ( !stricmp ( p, "true" ) || !stricmp ( p, "yes" ) ) + if ( !_stricmp ( p, "true" ) || !_stricmp ( p, "yes" ) ) return true; - else if ( !stricmp ( p, "false" ) || !stricmp ( p, "no" ) ) + else if ( !_stricmp ( p, "false" ) || !_stricmp ( p, "no" ) ) return false; else { @@ -358,26 +358,26 @@ { CRT = att->value; - if ( stricmp ( CRT.c_str (), "auto" ) == 0 ) + if ( _stricmp ( CRT.c_str (), "auto" ) == 0 ) CRT = GetDefaultModuleCRT (); } else CRT = GetDefaultModuleCRT (); const char * crtAttr = CRT.c_str (); - if ( crtAttr == NULL || stricmp ( crtAttr, "none" ) == 0 ) + if ( crtAttr == NULL || _stricmp ( crtAttr, "none" ) == 0 ) dynamicCRT = false; - else if ( stricmp ( crtAttr, "libc" ) == 0 ) + else if ( _stricmp ( crtAttr, "libc" ) == 0 ) dynamicCRT = false; - else if ( stricmp ( crtAttr, "msvcrt" ) == 0 ) + else if ( _stricmp ( crtAttr, "msvcrt" ) == 0 ) dynamicCRT = true; - else if ( stricmp ( crtAttr, "libcntpr" ) == 0 ) + else if ( _stricmp ( crtAttr, "libcntpr" ) == 0 ) dynamicCRT = false; - else if ( stricmp ( crtAttr, "ntdll" ) == 0 ) + else if ( _stricmp ( crtAttr, "ntdll" ) == 0 ) dynamicCRT = true; - else if ( stricmp ( crtAttr, "static" ) == 0 ) + else if ( _stricmp ( crtAttr, "static" ) == 0 ) dynamicCRT = false; - else if ( stricmp ( crtAttr, "dll" ) == 0 ) + else if ( _stricmp ( crtAttr, "dll" ) == 0 ) dynamicCRT = true; else { @@ -609,9 +609,9 @@ const XMLAttribute* att = e.GetAttribute ( "first", false ); if ( att != NULL ) { - if ( !stricmp ( att->value.c_str(), "true" ) ) + if ( !_stricmp ( att->value.c_str(), "true" ) ) first = true; - else if ( stricmp ( att->value.c_str(), "false" ) ) + else if ( _stricmp ( att->value.c_str(), "false" ) ) { throw XMLInvalidBuildFileException ( e.location, @@ -626,11 +626,11 @@ { // check for c++ file string ext = GetExtension ( e.value ); - if ( !stricmp ( ext.c_str(), ".cpp" ) ) + if ( !_stricmp ( ext.c_str(), ".cpp" ) ) cplusplus = true; - else if ( !stricmp ( ext.c_str(), ".cc" ) ) + else if ( !_stricmp ( ext.c_str(), ".cc" ) ) cplusplus = true; - else if ( !stricmp ( ext.c_str(), ".cxx" ) ) + else if ( !_stricmp ( ext.c_str(), ".cxx" ) ) cplusplus = true; } File* pFile = new File ( directory, @@ -1857,9 +1857,9 @@ if ( att != NULL ) { const char* p = att->value.c_str(); - if ( !stricmp ( p, "true" ) || !stricmp ( p, "yes" ) ) + if ( !_stricmp ( p, "true" ) || !_stricmp ( p, "yes" ) ) isInternal = true; - else if ( !stricmp ( p, "false" ) || !stricmp ( p, "no" ) ) + else if ( !_stricmp ( p, "false" ) || !_stricmp ( p, "no" ) ) isInternal = false; else { Modified: trunk/reactos/tools/rbuild/rbuild.vcproj URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/rbuild.vcproj… ============================================================================== --- trunk/reactos/tools/rbuild/rbuild.vcproj [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/rbuild.vcproj [iso-8859-1] Tue Dec 23 08:19:19 2008 @@ -133,7 +133,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..,../../lib/inflib,../../include/reactos;../../include" - PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;INFLIB_HOST;_CRT_SECURE_NO_WARNINGS" + PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;INFLIB_HOST;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE" BasicRuntimeChecks="3" RuntimeLibrary="1" DefaultCharIsUnsigned="true" Modified: trunk/reactos/tools/rbuild/testsupportcode.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/testsupportco… ============================================================================== --- trunk/reactos/tools/rbuild/testsupportcode.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/testsupportcode.cpp [iso-8859-1] Tue Dec 23 08:19:19 2008 @@ -293,7 +293,7 @@ bool TestSupportCode::IsTestFile ( string& filename ) const { - if ( stricmp ( GetFilename ( filename ).c_str (), "setup.c" ) == 0 ) + if ( _stricmp ( GetFilename ( filename ).c_str (), "setup.c" ) == 0 ) return false; return true; }

1 0

[cgutman] 38299: - Enable memtrack on debug builds only
by cgutman＠svn.reactos.org 23 Dec '08

23 Dec '08

Author: cgutman Date: Tue Dec 23 07:28:02 2008 New Revision: 38299 URL: http://svn.reactos.org/svn/reactos?rev=38299&view=rev Log: - Enable memtrack on debug builds only Modified: branches/aicom-network-fixes/drivers/network/tcpip/include/memtrack.h branches/aicom-network-fixes/lib/drivers/ip/network/memtrack.c branches/aicom-network-fixes/lib/drivers/oskittcp/include/memtrack.h Modified: branches/aicom-network-fixes/drivers/network/tcpip/include/memtrack.h URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/tcpip/include/memtrack.h [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/tcpip/include/memtrack.h [iso-8859-1] Tue Dec 23 07:28:02 2008 @@ -15,6 +15,7 @@ #define AllocatePacketWithBuffer(x,y,z) AllocatePacketWithBufferX(x,y,z,__FILE__,__LINE__) #define FreeNdisPacket(x) FreeNdisPacketX(x,__FILE__,__LINE__) +#ifdef DBG #define MTMARK() TrackDumpFL(__FILE__, __LINE__) #define exAllocatePool(x,y) ExAllocatePoolX(x,y,__FILE__,__LINE__) #define exAllocatePoolWithTag(x,y,z) ExAllocatePoolX(x,y,__FILE__,__LINE__) @@ -62,5 +63,20 @@ } #define MEMTRACK_MAX_TAGS_TO_TRACK 64 +#else +#define MTMARK() +#define Track(x,y) +#define TrackingInit() +#define TrackDump() +#define Untrack(x) +#define TrackTag(x) +#define exAllocatePoolWithTag(x,y,z) ExAllocatePoolWithTag(x,y,z) +#define exAllocatePool(x,y) ExAllocatePool(x,y) +#define exFreePool(x) ExFreePool(x) +#define exAllocateFromNPagedLookasideList(x) ExAllocateFromNPagedLookasideList(x) +#define exFreeToNPagedLookasideList(x,y) ExFreeToNPagedLookasideList(x,y) +#define TrackWithTag(w,x,y,z) +#define UntrackFL(w,x,y,z) +#endif #endif/*MEMMTRAC_H*/ Modified: branches/aicom-network-fixes/lib/drivers/ip/network/memtrack.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/lib/drivers… ============================================================================== --- branches/aicom-network-fixes/lib/drivers/ip/network/memtrack.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/lib/drivers/ip/network/memtrack.c [iso-8859-1] Tue Dec 23 07:28:02 2008 @@ -2,6 +2,7 @@ #include "precomp.h" +#ifdef DBG #define TRACK_TAG TAG('T','r','C','K') static LIST_ENTRY AllocatedObjectsList; @@ -163,3 +164,4 @@ TcpipReleaseSpinLock( &AllocatedObjectsLock, OldIrql ); } +#endif /* DBG */ Modified: branches/aicom-network-fixes/lib/drivers/oskittcp/include/memtrack.h URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/lib/drivers… ============================================================================== --- branches/aicom-network-fixes/lib/drivers/oskittcp/include/memtrack.h [iso-8859-1] (original) +++ branches/aicom-network-fixes/lib/drivers/oskittcp/include/memtrack.h [iso-8859-1] Tue Dec 23 07:28:02 2008 @@ -8,6 +8,7 @@ #define FBSD_MALLOC FOURCC('d','s','b','f') #define EXALLOC_TAG FOURCC('E','x','A','l') +#ifdef DBG #define MTMARK() TrackDumpFL(__FILE__, __LINE__) #define NdisAllocateBuffer(x,y,z,a,b) { \ NdisAllocateBuffer(x,y,z,a,b); \ @@ -59,5 +60,21 @@ } #define MEMTRACK_MAX_TAGS_TO_TRACK 64 +#else +#define MTMARK() +#define Track(x,y) +#define TrackingInit() +#define TrackDump() +#define Untrack(x) +#define TrackTag(x) +#define FreeNdisPacket FreeNdisPacketX +#define exFreePool(x) ExFreePool(x) +#define exAllocatePool(x,y) ExAllocatePool(x,y) +#define exAllocatePoolWithTag(x,y,z) ExAllocatePoolWithTag(x,y,z) +#define exAllocateFromNPagedLookasideList(x) ExAllocateFromNPagedLookasideList(x) +#define exFreeToNPagedLookasideList(x,y) ExFreeToNPagedLookasideList(x,y) +#define TrackWithTag(w,x,y,z) +#define UntrackFL(w,x,y,z) +#endif #endif/*MEMMTRAC_H*/

1 0

[cgutman] 38298: Huge memtrack commit (part 2 of 2)
by cgutman＠svn.reactos.org 23 Dec '08

23 Dec '08

Author: cgutman Date: Tue Dec 23 06:40:58 2008 New Revision: 38298 URL: http://svn.reactos.org/svn/reactos?rev=38298&view=rev Log: Huge memtrack commit (part 2 of 2) Modified: branches/aicom-network-fixes/lib/drivers/ip/network/address.c branches/aicom-network-fixes/lib/drivers/ip/network/ip.c branches/aicom-network-fixes/lib/drivers/ip/network/loopback.c branches/aicom-network-fixes/lib/drivers/ip/network/memtrack.c branches/aicom-network-fixes/lib/drivers/ip/network/neighbor.c branches/aicom-network-fixes/lib/drivers/ip/network/ports.c branches/aicom-network-fixes/lib/drivers/ip/network/receive.c branches/aicom-network-fixes/lib/drivers/ip/network/router.c branches/aicom-network-fixes/lib/drivers/ip/network/transmit.c branches/aicom-network-fixes/lib/drivers/ip/transport/tcp/accept.c branches/aicom-network-fixes/lib/drivers/ip/transport/tcp/event.c branches/aicom-network-fixes/lib/drivers/ip/transport/tcp/tcp.c branches/aicom-network-fixes/lib/drivers/oskittcp/include/memtrack.h Modified: branches/aicom-network-fixes/lib/drivers/ip/network/address.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/lib/drivers… ============================================================================== --- branches/aicom-network-fixes/lib/drivers/ip/network/address.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/lib/drivers/ip/network/address.c [iso-8859-1] Tue Dec 23 06:40:58 2008 @@ -106,7 +106,7 @@ * Nothing */ { - PoolFreeBuffer(Object); + exFreePool(Object); } Modified: branches/aicom-network-fixes/lib/drivers/ip/network/ip.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/lib/drivers… ============================================================================== --- branches/aicom-network-fixes/lib/drivers/ip/network/ip.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/lib/drivers/ip/network/ip.c [iso-8859-1] Tue Dec 23 06:40:58 2008 @@ -33,7 +33,7 @@ * Object = Pointer to an IP packet structure */ { - TcpipFreeToNPagedLookasideList(&IPPacketList, Object); + exFreeToNPagedLookasideList(&IPPacketList, Object); } @@ -70,7 +70,7 @@ { PIP_PACKET IPPacket; - IPPacket = TcpipAllocateFromNPagedLookasideList(&IPPacketList); + IPPacket = exAllocateFromNPagedLookasideList(&IPPacketList); if (!IPPacket) return NULL; Modified: branches/aicom-network-fixes/lib/drivers/ip/network/loopback.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/lib/drivers… ============================================================================== --- branches/aicom-network-fixes/lib/drivers/ip/network/loopback.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/lib/drivers/ip/network/loopback.c [iso-8859-1] Tue Dec 23 06:40:58 2008 @@ -45,7 +45,7 @@ Adapter = WorkItem->Adapter; BytesTransferred = WorkItem->BytesTransferred; - ExFreePool( WorkItem ); + exFreePool( WorkItem ); IPPacket.NdisPacket = Packet; @@ -88,7 +88,7 @@ TcpipAcquireSpinLock( &LoopWorkLock, &OldIrql ); - WQItem = ExAllocatePool( NonPagedPool, sizeof(LAN_WQ_ITEM) ); + WQItem = exAllocatePool( NonPagedPool, sizeof(LAN_WQ_ITEM) ); if( !WQItem ) { TcpipReleaseSpinLock( &LoopWorkLock, OldIrql ); return; Modified: branches/aicom-network-fixes/lib/drivers/ip/network/memtrack.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/lib/drivers… ============================================================================== --- branches/aicom-network-fixes/lib/drivers/ip/network/memtrack.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/lib/drivers/ip/network/memtrack.c [iso-8859-1] Tue Dec 23 06:40:58 2008 @@ -1,7 +1,6 @@ #define MEMTRACK_NO_POOL #include "precomp.h" -#ifdef MEMTRACK #define TRACK_TAG TAG('T','r','C','K') @@ -29,12 +28,24 @@ 0 ); } -VOID ShowTrackedThing( PCHAR What, PALLOCATION_TRACKER Thing, - PCHAR File, UINT Line ) { - /* if( ShowTag( Thing->Tag ) ) */ - if( File ) { +VOID ShowTrackedThing( PCHAR What, PALLOCATION_TRACKER Thing, BOOLEAN ForceShow ) { + + if (ForceShow) + { + DbgPrint("[%s] Thing %08x %c%c%c%c (%s:%d)\n", + What, + Thing->Thing, + ((PCHAR)&Thing->Tag)[3], + ((PCHAR)&Thing->Tag)[2], + ((PCHAR)&Thing->Tag)[1], + ((PCHAR)&Thing->Tag)[0], + Thing->FileName, + Thing->LineNo); + } + else + { TI_DbgPrint(MAX_TRACE, - ("[%s] Thing %08x %c%c%c%c (%s:%d) (Called from %s:%d)\n", + ("[%s] Thing %08x %c%c%c%c (%s:%d)\n", What, Thing->Thing, ((PCHAR)&Thing->Tag)[3], @@ -42,19 +53,7 @@ ((PCHAR)&Thing->Tag)[1], ((PCHAR)&Thing->Tag)[0], Thing->FileName, - Thing->LineNo, - File, Line)); - } else { - TI_DbgPrint(MAX_TRACE, - ( "[%s] Thing %08x %c%c%c%c (%s:%d)\n", - What, - Thing->Thing, - ((PCHAR)&Thing->Tag)[3], - ((PCHAR)&Thing->Tag)[2], - ((PCHAR)&Thing->Tag)[1], - ((PCHAR)&Thing->Tag)[0], - Thing->FileName, - Thing->LineNo )); + Thing->LineNo)); } } @@ -66,6 +65,15 @@ PLIST_ENTRY Entry; PALLOCATION_TRACKER ThingInList; + if (!TrackedThing) return; + + TrackedThing->Tag = Tag; + TrackedThing->Thing = Thing; + TrackedThing->FileName = FileName; + TrackedThing->LineNo = LineNo; + + ShowTrackedThing( "Alloc", TrackedThing, FALSE ); + TcpipAcquireSpinLock( &AllocatedObjectsLock, &OldIrql ); Entry = AllocatedObjectsList.Flink; while( Entry != &AllocatedObjectsList ) { @@ -74,25 +82,21 @@ RemoveEntryList(Entry); TcpipReleaseSpinLock( &AllocatedObjectsLock, OldIrql ); - ShowTrackedThing( "Alloc", ThingInList, FileName, LineNo ); - PoolFreeBuffer( ThingInList ); + ShowTrackedThing( "Alloc", ThingInList, FALSE ); + TrackDumpFL( FileName, LineNo ); DbgPrint("TRACK: SPECIFIED ALREADY ALLOCATED ITEM %x\n", Thing); + ShowTrackedThing( "Double Alloc (Item in list)", ThingInList, TRUE ); + ShowTrackedThing( "Double Alloc (Item not in list)", TrackedThing, TRUE ); TcpipBugCheck( 0 ); + + ExFreeToNPagedLookasideList( &AllocatedObjectsLookasideList, + ThingInList ); } Entry = Entry->Flink; } - if( TrackedThing ) { - TrackedThing->Tag = Tag; - TrackedThing->Thing = Thing; - TrackedThing->FileName = FileName; - TrackedThing->LineNo = LineNo; - - - InsertHeadList( &AllocatedObjectsList, &TrackedThing->Entry ); - ShowTrackedThing( "Alloc", TrackedThing, FileName, LineNo ); - } + InsertHeadList( &AllocatedObjectsList, &TrackedThing->Entry ); TcpipReleaseSpinLock( &AllocatedObjectsLock, OldIrql ); @@ -107,7 +111,7 @@ return TagsToShow[i] ? TRUE : FALSE; } -VOID UntrackFL( PCHAR File, DWORD Line, PVOID Thing ) { +VOID UntrackFL( PCHAR File, DWORD Line, PVOID Thing, DWORD Tag ) { KIRQL OldIrql; PLIST_ENTRY Entry; PALLOCATION_TRACKER ThingInList; @@ -119,19 +123,25 @@ if( ThingInList->Thing == Thing ) { RemoveEntryList(Entry); - ShowTrackedThing( "Free ", ThingInList, File, Line ); + ShowTrackedThing( "Free ", ThingInList, FALSE ); + + if ( ThingInList->Tag != Tag ) { + DbgPrint("UNTRACK: TAG DOES NOT MATCH (%x)\n", Thing); + ShowTrackedThing("Tag Mismatch (Item in list)", ThingInList, TRUE); + TcpipBugCheck( 0 ); + } ExFreeToNPagedLookasideList( &AllocatedObjectsLookasideList, ThingInList ); TcpipReleaseSpinLock( &AllocatedObjectsLock, OldIrql ); + /* TrackDumpFL( File, Line ); */ return; } Entry = Entry->Flink; } TcpipReleaseSpinLock( &AllocatedObjectsLock, OldIrql ); - TrackDumpFL( File, Line ); DbgPrint("UNTRACK: SPECIFIED ALREADY FREE ITEM %x\n", Thing); TcpipBugCheck( 0 ); } @@ -147,10 +157,9 @@ Entry = AllocatedObjectsList.Flink; while( Entry != &AllocatedObjectsList ) { Thing = CONTAINING_RECORD(Entry, ALLOCATION_TRACKER, Entry); - ShowTrackedThing( "Dump ", Thing, 0, 0 ); + ShowTrackedThing( "Dump ", Thing, FALSE ); Entry = Entry->Flink; } TcpipReleaseSpinLock( &AllocatedObjectsLock, OldIrql ); } -#endif/*MEMTRACK*/ Modified: branches/aicom-network-fixes/lib/drivers/ip/network/neighbor.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/lib/drivers… ============================================================================== --- branches/aicom-network-fixes/lib/drivers/ip/network/neighbor.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/lib/drivers/ip/network/neighbor.c [iso-8859-1] Tue Dec 23 06:40:58 2008 @@ -21,7 +21,7 @@ ASSERT_KM_POINTER(Packet->Complete); Packet->Complete( Packet->Context, Packet->Packet, Status ); TI_DbgPrint(MID_TRACE, ("Completed\n")); - PoolFreeBuffer( Packet ); + exFreePool( Packet ); TI_DbgPrint(MID_TRACE, ("Freed\n")); } @@ -89,7 +89,7 @@ ErrorCode ); } - PoolFreeBuffer( Packet ); + exFreePool( Packet ); } } @@ -283,7 +283,7 @@ "LinkAddress (0x%X) LinkAddressLength (%d) State (0x%X)\n", Interface, Address, LinkAddress, LinkAddressLength, State)); - NCE = ExAllocatePool + NCE = exAllocatePool (NonPagedPool, sizeof(NEIGHBOR_CACHE_ENTRY) + LinkAddressLength); if (NCE == NULL) { @@ -466,7 +466,7 @@ (DEBUG_NCACHE, ("Called. NCE (0x%X) NdisPacket (0x%X).\n", NCE, NdisPacket)); - Packet = PoolAllocateBuffer( sizeof(NEIGHBOR_PACKET) ); + Packet = exAllocatePool( NonPagedPool, sizeof(NEIGHBOR_PACKET) ); if( !Packet ) return FALSE; /* FIXME: Should we limit the number of queued packets? */ @@ -529,7 +529,7 @@ *PrevNCE = CurNCE->Next; NBFlushPacketQueue( CurNCE, TRUE, NDIS_STATUS_REQUEST_ABORTED ); - ExFreePool(CurNCE); + exFreePool(CurNCE); break; } Modified: branches/aicom-network-fixes/lib/drivers/ip/network/ports.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/lib/drivers… ============================================================================== --- branches/aicom-network-fixes/lib/drivers/ip/network/ports.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/lib/drivers/ip/network/ports.c [iso-8859-1] Tue Dec 23 06:40:58 2008 @@ -17,7 +17,7 @@ PortSet->PortsToOversee = PortsToManage; PortSet->ProtoBitBuffer = - PoolAllocateBuffer( (PortSet->PortsToOversee + 7) / 8 ); + exAllocatePool( NonPagedPool, (PortSet->PortsToOversee + 7) / 8 ); if(!PortSet->ProtoBitBuffer) return STATUS_INSUFFICIENT_RESOURCES; RtlInitializeBitMap( &PortSet->ProtoBitmap, PortSet->ProtoBitBuffer, @@ -28,7 +28,7 @@ } VOID PortsShutdown( PPORT_SET PortSet ) { - PoolFreeBuffer( PortSet->ProtoBitBuffer ); + exFreePool( PortSet->ProtoBitBuffer ); } VOID DeallocatePort( PPORT_SET PortSet, ULONG Port ) { Modified: branches/aicom-network-fixes/lib/drivers/ip/network/receive.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/lib/drivers… ============================================================================== --- branches/aicom-network-fixes/lib/drivers/ip/network/receive.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/lib/drivers/ip/network/receive.c [iso-8859-1] Tue Dec 23 06:40:58 2008 @@ -41,7 +41,7 @@ TI_DbgPrint(DEBUG_IP, ("Called. First (%d) Last (%d).\n", First, Last)); - Hole = TcpipAllocateFromNPagedLookasideList(&IPHoleList); + Hole = exAllocateFromNPagedLookasideList(&IPHoleList); if (!Hole) { TI_DbgPrint(MIN_TRACE, ("Insufficient resources.\n")); return NULL; @@ -82,7 +82,7 @@ TI_DbgPrint(DEBUG_IP, ("Freeing hole descriptor at (0x%X).\n", CurrentH)); /* And free the hole descriptor */ - TcpipFreeToNPagedLookasideList(&IPHoleList, CurrentH); + exFreeToNPagedLookasideList(&IPHoleList, CurrentH); CurrentEntry = NextEntry; } @@ -103,13 +103,13 @@ TI_DbgPrint(DEBUG_IP, ("Freeing fragment at (0x%X).\n", CurrentF)); /* And free the fragment descriptor */ - TcpipFreeToNPagedLookasideList(&IPFragmentList, CurrentF); + exFreeToNPagedLookasideList(&IPFragmentList, CurrentF); CurrentEntry = NextEntry; } TI_DbgPrint(DEBUG_IP, ("Freeing IPDR data at (0x%X).\n", IPDR)); - TcpipFreeToNPagedLookasideList(&IPDRList, IPDR); + exFreeToNPagedLookasideList(&IPDRList, IPDR); } @@ -311,7 +311,7 @@ TI_DbgPrint(DEBUG_IP, ("Starting new assembly.\n")); /* We don't have a reassembly structure, create one */ - IPDR = TcpipAllocateFromNPagedLookasideList(&IPDRList); + IPDR = exAllocateFromNPagedLookasideList(&IPDRList); if (!IPDR) /* We don't have the resources to process this packet, discard it */ return; @@ -322,7 +322,7 @@ Hole = CreateHoleDescriptor(0, 65536); if (!Hole) { /* We don't have the resources to process this packet, discard it */ - TcpipFreeToNPagedLookasideList(&IPDRList, IPDR); + exFreeToNPagedLookasideList(&IPDRList, IPDR); return; } AddrInitIPv4(&IPDR->SrcAddr, IPv4Header->SrcAddr); @@ -390,7 +390,7 @@ /* Put the new hole descriptor in the list */ InsertTailList(&IPDR->HoleListHead, &Hole->ListEntry); } else - TcpipFreeToNPagedLookasideList(&IPHoleList, Hole); + exFreeToNPagedLookasideList(&IPHoleList, Hole); /* If this is the first fragment, save the IP header */ if (FragFirst == 0) { @@ -404,7 +404,7 @@ /* Create a buffer, copy the data into it and put it in the fragment list */ - Fragment = TcpipAllocateFromNPagedLookasideList(&IPFragmentList); + Fragment = exAllocateFromNPagedLookasideList(&IPFragmentList); if (!Fragment) { /* We don't have the resources to process this packet, discard it */ Cleanup(&IPDR->Lock, OldIrql, IPDR, NULL); Modified: branches/aicom-network-fixes/lib/drivers/ip/network/router.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/lib/drivers… ============================================================================== --- branches/aicom-network-fixes/lib/drivers/ip/network/router.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/lib/drivers/ip/network/router.c [iso-8859-1] Tue Dec 23 06:40:58 2008 @@ -51,7 +51,7 @@ * Object = Pointer to an forward information base structure */ { - PoolFreeBuffer(Object); + exFreePool(Object); } @@ -213,7 +213,7 @@ A2S(Netmask), A2S(&Router->Address))); - FIBE = PoolAllocateBuffer(sizeof(FIB_ENTRY)); + FIBE = exAllocatePool(NonPagedPool, sizeof(FIB_ENTRY)); if (!FIBE) { TI_DbgPrint(MIN_TRACE, ("Insufficient resources.\n")); return NULL; Modified: branches/aicom-network-fixes/lib/drivers/ip/network/transmit.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/lib/drivers… ============================================================================== --- branches/aicom-network-fixes/lib/drivers/ip/network/transmit.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/lib/drivers/ip/network/transmit.c [iso-8859-1] Tue Dec 23 06:40:58 2008 @@ -212,14 +212,14 @@ if (!PrepareNextFragment(IFC)) { FreeNdisPacket(IFC->NdisPacket); - ExFreePool(IFC); + exFreePool(IFC); return NDIS_STATUS_FAILURE; } if (!NT_SUCCESS((NdisStatus = IPSendFragment(IFC->NdisPacket, NCE, IFC)))) { FreeNdisPacket(IFC->NdisPacket); - ExFreePool(IFC); + exFreePool(IFC); } return NdisStatus; Modified: branches/aicom-network-fixes/lib/drivers/ip/transport/tcp/accept.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/lib/drivers… ============================================================================== --- branches/aicom-network-fixes/lib/drivers/ip/transport/tcp/accept.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/lib/drivers/ip/transport/tcp/accept.c [iso-8859-1] Tue Dec 23 06:40:58 2008 @@ -115,7 +115,7 @@ if( Bucket->AssociatedEndpoint == Connection ) { RemoveEntryList( &Bucket->Entry ); - ExFreePool( Bucket ); + exFreePool( Bucket ); break; } @@ -142,7 +142,7 @@ (PTDI_REQUEST_KERNEL)Request ); if( Status == STATUS_PENDING ) { - Bucket = ExAllocatePool( NonPagedPool, sizeof(*Bucket) ); + Bucket = exAllocatePool( NonPagedPool, sizeof(*Bucket) ); if( Bucket ) { Bucket->AssociatedEndpoint = Connection; Modified: branches/aicom-network-fixes/lib/drivers/ip/transport/tcp/event.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/lib/drivers… ============================================================================== --- branches/aicom-network-fixes/lib/drivers/ip/transport/tcp/event.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/lib/drivers/ip/transport/tcp/event.c [iso-8859-1] Tue Dec 23 06:40:58 2008 @@ -119,7 +119,7 @@ ("Called TSLEEP: tok = %x, pri = %d, wmesg = %s, tmio = %x\n", token, priority, msg, tmio)); - SleepingThread = PoolAllocateBuffer( sizeof( *SleepingThread ) ); + SleepingThread = exAllocatePool( NonPagedPool, sizeof( *SleepingThread ) ); if( SleepingThread ) { KeInitializeEvent( &SleepingThread->Event, NotificationEvent, FALSE ); SleepingThread->SleepToken = token; @@ -146,7 +146,7 @@ TcpipRecursiveMutexEnter( &TCPLock, TRUE ); - PoolFreeBuffer( SleepingThread ); + exFreePool( SleepingThread ); } else return OSK_ENOBUFS; @@ -238,22 +238,22 @@ if ( ! Found ) { if ( ArrayAllocated <= ArrayUsed ) { NewSize = ( 0 == ArrayAllocated ? 16 : 2 * ArrayAllocated ); - NewArray = PoolAllocateBuffer( 2 * NewSize * sizeof( OSK_UINT ) ); + NewArray = exAllocatePool( NonPagedPool, 2 * NewSize * sizeof( OSK_UINT ) ); if ( NULL != NewArray ) { if ( 0 != ArrayAllocated ) { memcpy( NewArray, Sizes, ArrayAllocated * sizeof( OSK_UINT ) ); - PoolFreeBuffer( Sizes ); + exFreePool( Sizes ); memcpy( NewArray + NewSize, Counts, ArrayAllocated * sizeof( OSK_UINT ) ); - PoolFreeBuffer( Counts ); + exFreePool( Counts ); } Sizes = NewArray; Counts = NewArray + NewSize; ArrayAllocated = NewSize; } else if ( 0 != ArrayAllocated ) { - PoolFreeBuffer( Sizes ); - PoolFreeBuffer( Counts ); + exFreePool( Sizes ); + exFreePool( Counts ); ArrayAllocated = 0; } } @@ -281,7 +281,7 @@ v = ExAllocateFromNPagedLookasideList( &LargeLookasideList ); Signature = SIGNATURE_LARGE; } else { - v = PoolAllocateBuffer( Bytes + sizeof(ULONG) ); + v = ExAllocatePool( NonPagedPool, Bytes + sizeof(ULONG) ); Signature = SIGNATURE_OTHER; } if( v ) { @@ -297,7 +297,7 @@ void *data, OSK_PCHAR File, OSK_UINT Line ) { ULONG Signature; - UntrackFL( (PCHAR)File, Line, data ); + UntrackFL( (PCHAR)File, Line, data, FOURCC('f','b','s','d') ); data = (void *)((char *) data - sizeof(ULONG)); Signature = *((ULONG *) data); if ( SIGNATURE_SMALL == Signature ) { @@ -305,7 +305,7 @@ } else if ( SIGNATURE_LARGE == Signature ) { ExFreeToNPagedLookasideList( &LargeLookasideList, data ); } else if ( SIGNATURE_OTHER == Signature ) { - PoolFreeBuffer( data ); + ExFreePool( data ); } else { ASSERT( FALSE ); } Modified: branches/aicom-network-fixes/lib/drivers/ip/transport/tcp/tcp.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/lib/drivers… ============================================================================== --- branches/aicom-network-fixes/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1] Tue Dec 23 06:40:58 2008 @@ -53,7 +53,7 @@ Complete( Bucket->Request.RequestContext, Status, 0 ); /* Frees the bucket allocated in TCPConnect */ - PoolFreeBuffer( Bucket ); + exFreePool( Bucket ); } } @@ -90,7 +90,7 @@ break; } else { Complete( Bucket->Request.RequestContext, Status, 0 ); - PoolFreeBuffer( Bucket ); + exFreePool( Bucket ); } } } @@ -142,7 +142,7 @@ Complete( Bucket->Request.RequestContext, STATUS_SUCCESS, Received ); - PoolFreeBuffer( Bucket ); + exFreePool( Bucket ); } else if( Status == STATUS_PENDING ) { InsertHeadList ( &Connection->ReceiveRequest, &Bucket->Entry ); @@ -152,7 +152,7 @@ ("Completing Receive request: %x %x\n", Bucket->Request, Status)); Complete( Bucket->Request.RequestContext, Status, 0 ); - PoolFreeBuffer( Bucket ); + exFreePool( Bucket ); } } } @@ -201,7 +201,7 @@ Complete( Bucket->Request.RequestContext, STATUS_SUCCESS, Sent ); - PoolFreeBuffer( Bucket ); + exFreePool( Bucket ); } else if( Status == STATUS_PENDING ) { InsertHeadList ( &Connection->SendRequest, &Bucket->Entry ); @@ -211,7 +211,7 @@ ("Completing Send request: %x %x\n", Bucket->Request, Status)); Complete( Bucket->Request.RequestContext, Status, 0 ); - PoolFreeBuffer( Bucket ); + exFreePool( Bucket ); } } } @@ -238,7 +238,7 @@ Bucket = CONTAINING_RECORD( Entry, TDI_BUCKET, Entry ); Complete = Bucket->Request.RequestNotifyObject; Complete( Bucket->Request.RequestContext, IrpStatus[i], 0 ); - PoolFreeBuffer( Bucket ); + exFreePool( Bucket ); } } } @@ -260,7 +260,7 @@ PCONNECTION_ENDPOINT TCPAllocateConnectionEndpoint( PVOID ClientContext ) { PCONNECTION_ENDPOINT Connection = - ExAllocatePool(NonPagedPool, sizeof(CONNECTION_ENDPOINT)); + exAllocatePool(NonPagedPool, sizeof(CONNECTION_ENDPOINT)); if (!Connection) return Connection; @@ -283,7 +283,7 @@ VOID TCPFreeConnectionEndpoint( PCONNECTION_ENDPOINT Connection ) { TCPClose( Connection ); - ExFreePool( Connection ); + exFreePool( Connection ); } NTSTATUS TCPSocket( PCONNECTION_ENDPOINT Connection, @@ -545,7 +545,7 @@ TI_DbgPrint(DEBUG_TCP,("TCPConnect: Called\n")); - Bucket = ExAllocatePool( NonPagedPool, sizeof(*Bucket) ); + Bucket = exAllocatePool( NonPagedPool, sizeof(*Bucket) ); if( !Bucket ) return STATUS_NO_MEMORY; TcpipRecursiveMutexEnter( &TCPLock, TRUE ); @@ -695,7 +695,7 @@ /* Keep this request around ... there was no data yet */ if( Status == STATUS_PENDING ) { /* Freed in TCPSocketState */ - Bucket = ExAllocatePool( NonPagedPool, sizeof(*Bucket) ); + Bucket = exAllocatePool( NonPagedPool, sizeof(*Bucket) ); if( !Bucket ) { TI_DbgPrint(DEBUG_TCP,("Failed to allocate bucket\n")); TcpipRecursiveMutexLeave( &TCPLock ); @@ -754,7 +754,7 @@ /* Keep this request around ... there was no data yet */ if( Status == STATUS_PENDING ) { /* Freed in TCPSocketState */ - Bucket = ExAllocatePool( NonPagedPool, sizeof(*Bucket) ); + Bucket = exAllocatePool( NonPagedPool, sizeof(*Bucket) ); if( !Bucket ) { TI_DbgPrint(DEBUG_TCP,("Failed to allocate bucket\n")); TcpipRecursiveMutexLeave( &TCPLock ); @@ -845,7 +845,7 @@ if( Bucket->Request.RequestContext == Irp ) { RemoveEntryList( &Bucket->Entry ); - PoolFreeBuffer( Bucket ); + exFreePool( Bucket ); break; } } Modified: branches/aicom-network-fixes/lib/drivers/oskittcp/include/memtrack.h URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/lib/drivers… ============================================================================== --- branches/aicom-network-fixes/lib/drivers/oskittcp/include/memtrack.h [iso-8859-1] (original) +++ branches/aicom-network-fixes/lib/drivers/oskittcp/include/memtrack.h [iso-8859-1] Tue Dec 23 06:40:58 2008 @@ -8,7 +8,6 @@ #define FBSD_MALLOC FOURCC('d','s','b','f') #define EXALLOC_TAG FOURCC('E','x','A','l') -#ifdef MEMTRACK #define MTMARK() TrackDumpFL(__FILE__, __LINE__) #define NdisAllocateBuffer(x,y,z,a,b) { \ NdisAllocateBuffer(x,y,z,a,b); \ @@ -60,19 +59,5 @@ } #define MEMTRACK_MAX_TAGS_TO_TRACK 64 -#else -#define MTMARK() -#define Track(x,y) -#define TrackingInit() -#define TrackDump() -#define Untrack(x) -#define TrackTag(x) -#define FreeNdisPacket FreeNdisPacketX -#define exFreePool(x) ExFreePool(x) -#define exAllocatePool(x,y) ExAllocatePool(x,y) -#define exAllocatePoolWithTag(x,y,z) ExAllocatePoolWithTag(x,y,z) -#define TrackWithTag(a,b,c,d) -#define UntrackFL(a,b,c) -#endif #endif/*MEMMTRAC_H*/

1 0

[cgutman] 38297: Huge memtrack commit (part 1 of 2) - Add checking for proper tags - Enable memtrack by default - Display the conflicting entries when an error occurs - Remove pool* routines and replace with ex* routines
by cgutman＠svn.reactos.org 23 Dec '08

23 Dec '08

Author: cgutman Date: Tue Dec 23 06:39:55 2008 New Revision: 38297 URL: http://svn.reactos.org/svn/reactos?rev=38297&view=rev Log: Huge memtrack commit (part 1 of 2) - Add checking for proper tags - Enable memtrack by default - Display the conflicting entries when an error occurs - Remove pool* routines and replace with ex* routines Removed: branches/aicom-network-fixes/drivers/network/tcpip/tcpip/pool.c Modified: branches/aicom-network-fixes/drivers/network/tcpip/datalink/lan.c branches/aicom-network-fixes/drivers/network/tcpip/include/memtrack.h branches/aicom-network-fixes/drivers/network/tcpip/include/pool.h branches/aicom-network-fixes/drivers/network/tcpip/tcpip.rbuild branches/aicom-network-fixes/drivers/network/tcpip/tcpip/buffer.c branches/aicom-network-fixes/drivers/network/tcpip/tcpip/dispatch.c branches/aicom-network-fixes/drivers/network/tcpip/tcpip/fileobjs.c branches/aicom-network-fixes/drivers/network/tcpip/tcpip/iinfo.c branches/aicom-network-fixes/drivers/network/tcpip/tcpip/main.c branches/aicom-network-fixes/drivers/network/tcpip/tcpip/mockbuffer.c branches/aicom-network-fixes/drivers/network/tcpip/tcpip/ninfo.c Modified: branches/aicom-network-fixes/drivers/network/tcpip/datalink/lan.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/tcpip/datalink/lan.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/tcpip/datalink/lan.c [iso-8859-1] Tue Dec 23 06:39:55 2008 @@ -703,7 +703,7 @@ UnicodeString.MaximumLength = Information->DataLength; String->Buffer = - (PWCHAR)exAllocatePool( NonPagedPool, + (PWCHAR)ExAllocatePool( NonPagedPool, UnicodeString.MaximumLength + sizeof(WCHAR) ); if( !String->Buffer ) return STATUS_NO_MEMORY; Modified: branches/aicom-network-fixes/drivers/network/tcpip/include/memtrack.h URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/tcpip/include/memtrack.h [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/tcpip/include/memtrack.h [iso-8859-1] Tue Dec 23 06:39:55 2008 @@ -10,15 +10,17 @@ #define FBSD_MALLOC FOURCC('d','s','b','f') #define EXALLOC_TAG FOURCC('E','x','A','l') #define IRP_TAG FOURCC('P','I','R','P') +#define NPLOOK_TAG FOURCC('N','P','L','A') #define AllocatePacketWithBuffer(x,y,z) AllocatePacketWithBufferX(x,y,z,__FILE__,__LINE__) #define FreeNdisPacket(x) FreeNdisPacketX(x,__FILE__,__LINE__) -#ifdef MEMTRACK #define MTMARK() TrackDumpFL(__FILE__, __LINE__) #define exAllocatePool(x,y) ExAllocatePoolX(x,y,__FILE__,__LINE__) #define exAllocatePoolWithTag(x,y,z) ExAllocatePoolX(x,y,__FILE__,__LINE__) #define exFreePool(x) ExFreePoolX(x,__FILE__,__LINE__) +#define exAllocateFromNPagedLookasideList(x) ExAllocateFromNPagedLookasideListX(x,__FILE__,__LINE__) +#define exFreeToNPagedLookasideList(x,y) ExFreeToNPagedLookasideListX(x,y,__FILE__,__LINE__) typedef struct _ALLOCATION_TRACKER { LIST_ENTRY Entry; @@ -31,35 +33,34 @@ VOID TrackingInit(); VOID TrackWithTag( DWORD Tag, PVOID Thing, PCHAR File, DWORD Line ); #define Track(Tag,Thing) TrackWithTag(Tag,Thing,__FILE__,__LINE__) -VOID UntrackFL( PCHAR File, DWORD Line, PVOID Thing ); +VOID UntrackFL( PCHAR File, DWORD Line, PVOID Thing, DWORD Tag ); #define Untrack(Thing) UntrackFL(__FILE__,__LINE__,Thing) VOID TrackDumpFL( PCHAR File, DWORD Line ); #define TrackDump() TrackDumpFL(__FILE__,__LINE__) VOID TrackTag( DWORD Tag ); +static __inline PVOID ExAllocateFromNPagedLookasideListX( PNPAGED_LOOKASIDE_LIST List, PCHAR File, ULONG Line ) { + PVOID Out = ExAllocateFromNPagedLookasideList( List ); + if( Out ) TrackWithTag( NPLOOK_TAG, Out, File, Line ); + return Out; +} + +static __inline VOID ExFreeToNPagedLookasideListX( PNPAGED_LOOKASIDE_LIST List, PVOID Thing, PCHAR File, ULONG Line ) { + UntrackFL(File, Line, Thing, NPLOOK_TAG); + ExFreeToNPagedLookasideList( List, Thing ); +} + static __inline PVOID ExAllocatePoolX( POOL_TYPE type, SIZE_T size, PCHAR File, ULONG Line ) { - PVOID Out = PoolAllocateBuffer( size ); + PVOID Out = ExAllocatePool( type, size ); if( Out ) TrackWithTag( EXALLOC_TAG, Out, File, Line ); return Out; } + static __inline VOID ExFreePoolX( PVOID Data, PCHAR File, ULONG Line ) { - UntrackFL(File, Line, Data); - PoolFreeBuffer(Data); + UntrackFL(File, Line, Data, EXALLOC_TAG); + ExFreePool( Data ); } #define MEMTRACK_MAX_TAGS_TO_TRACK 64 -#else -#define MTMARK() -#define Track(x,y) -#define TrackingInit() -#define TrackDump() -#define Untrack(x) -#define TrackTag(x) -#define exAllocatePoolWithTag(x,y,z) ExAllocatePoolWithTag(x,y,z) -#define exAllocatePool(x,y) PoolAllocateBuffer(y) -#define exFreePool(x) PoolFreeBuffer(x) -#define TrackWithTag(w,x,y,z) -#define UntrackFL(x,y,z) -#endif #endif/*MEMMTRAC_H*/ Modified: branches/aicom-network-fixes/drivers/network/tcpip/include/pool.h URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/tcpip/include/pool.h [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/tcpip/include/pool.h [iso-8859-1] Tue Dec 23 06:39:55 2008 @@ -7,16 +7,6 @@ #ifndef __POOL_H #define __POOL_H - -PVOID PoolAllocateBuffer( - ULONG Size); - -VOID PoolFreeBuffer( - PVOID Buffer); - -PVOID TcpipAllocateFromNPagedLookasideList( PNPAGED_LOOKASIDE_LIST List ); -VOID TcpipFreeToNPagedLookasideList( PNPAGED_LOOKASIDE_LIST List, - PVOID Thing ); NDIS_STATUS PrependPacket( PNDIS_PACKET Packet, PCHAR Data, UINT Len, BOOLEAN Copy ); Modified: branches/aicom-network-fixes/drivers/network/tcpip/tcpip.rbuild URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/tcpip/tcpip.rbuild [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/tcpip/tcpip.rbuild [iso-8859-1] Tue Dec 23 06:39:55 2008 @@ -33,7 +33,6 @@ <file>lock.c</file> <file>main.c</file> <file>ninfo.c</file> - <file>pool.c</file> <file>proto.c</file> <file>tinfo.c</file> <file>wait.c</file> Modified: branches/aicom-network-fixes/drivers/network/tcpip/tcpip/buffer.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/tcpip/tcpip/buffer.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/tcpip/tcpip/buffer.c [iso-8859-1] Tue Dec 23 06:39:55 2008 @@ -318,7 +318,7 @@ PCHAR NewBuf; if( Copy ) { - NewBuf = ExAllocatePool( NonPagedPool, Length ); + NewBuf = exAllocatePool( NonPagedPool, Length ); if( !NewBuf ) return NDIS_STATUS_RESOURCES; RtlCopyMemory( NewBuf, Data, Length ); } else NewBuf = Data; @@ -350,25 +350,22 @@ NDIS_STATUS Status; PCHAR NewData; - NewData = ExAllocatePool( NonPagedPool, Len ); + NewData = exAllocatePool( NonPagedPool, Len ); if( !NewData ) return NDIS_STATUS_RESOURCES; - TrackWithTag(EXALLOC_TAG, NewData, File, Line); if( Data ) RtlCopyMemory(NewData, Data, Len); NdisAllocatePacket( &Status, &Packet, GlobalPacketPool ); if( Status != NDIS_STATUS_SUCCESS ) { - UntrackFL( File, Line, NewData ); - ExFreePool( NewData ); + exFreePool( NewData ); return Status; } TrackWithTag(NDIS_PACKET_TAG, Packet, File, Line); NdisAllocateBuffer( &Status, &Buffer, GlobalBufferPool, NewData, Len ); if( Status != NDIS_STATUS_SUCCESS ) { - UntrackFL( File, Line, NewData ); - ExFreePool( NewData ); - UntrackFL( File, Line, Packet ); + exFreePool( NewData ); + UntrackFL( File, Line, Packet, NDIS_PACKET_TAG ); FreeNdisPacket( Packet ); return Status; } @@ -404,14 +401,13 @@ NdisGetNextBuffer(Buffer, &NextBuffer); NdisQueryBuffer(Buffer, &Data, &Length); TI_DbgPrint(DEBUG_PBUFFER, ("Freeing ndis buffer (0x%X)\n", Buffer)); - UntrackFL(File,Line,Buffer); + UntrackFL(File,Line,Buffer,NDIS_BUFFER_TAG); NdisFreeBuffer(Buffer); TI_DbgPrint(DEBUG_PBUFFER, ("Freeing exal buffer (0x%X)\n", Data)); - UntrackFL(File,Line,Data); - ExFreePool(Data); + exFreePool(Data); } /* Finally free the NDIS packet discriptor */ - UntrackFL(File,Line,Packet); + UntrackFL(File,Line,Packet,NDIS_PACKET_TAG); NdisFreePacket(Packet); } Modified: branches/aicom-network-fixes/drivers/network/tcpip/tcpip/dispatch.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/tcpip/tcpip/dispatch.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/tcpip/tcpip/dispatch.c [iso-8859-1] Tue Dec 23 06:39:55 2008 @@ -1281,7 +1281,7 @@ QueryContext->Irp->IoStatus.Information = ByteCount; QueryContext->Irp->IoStatus.Status = Status; - ExFreePool(QueryContext); + exFreePool(QueryContext); } @@ -1344,7 +1344,7 @@ IrpSp->Parameters.DeviceIoControl.Type3InputBuffer; OutputBuffer = Irp->UserBuffer; - QueryContext = ExAllocatePool(NonPagedPool, sizeof(TI_QUERY_CONTEXT)); + QueryContext = exAllocatePool(NonPagedPool, sizeof(TI_QUERY_CONTEXT)); if (QueryContext) { _SEH_TRY { InputMdl = IoAllocateMdl(InputBuffer, @@ -1407,7 +1407,7 @@ IoFreeMdl(OutputMdl); } - ExFreePool(QueryContext); + exFreePool(QueryContext); } else Status = STATUS_INSUFFICIENT_RESOURCES; } else if( InputBufferLength == @@ -1420,7 +1420,7 @@ Size = 0; - QueryContext = ExAllocatePool(NonPagedPool, sizeof(TI_QUERY_CONTEXT)); + QueryContext = exAllocatePool(NonPagedPool, sizeof(TI_QUERY_CONTEXT)); if (!QueryContext) return STATUS_INSUFFICIENT_RESOURCES; _SEH_TRY { @@ -1440,7 +1440,7 @@ if( !NT_SUCCESS(Status) || !InputMdl ) { if( InputMdl ) IoFreeMdl( InputMdl ); - ExFreePool(QueryContext); + exFreePool(QueryContext); return Status; } Modified: branches/aicom-network-fixes/drivers/network/tcpip/tcpip/fileobjs.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/tcpip/tcpip/fileobjs.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/tcpip/tcpip/fileobjs.c [iso-8859-1] Tue Dec 23 06:39:55 2008 @@ -123,7 +123,7 @@ * Object = Pointer to address file object to free */ { - ExFreePool(Object); + exFreePool(Object); } @@ -135,7 +135,7 @@ * Object = Pointer to address file object to free */ { - ExFreePool(Object); + exFreePool(Object); } @@ -190,7 +190,7 @@ /* Abort the request and free its resources */ TcpipReleaseSpinLock(&AddrFile->Lock, OldIrql); (*SendRequest->Complete)(SendRequest->Context, STATUS_ADDRESS_CLOSED, 0); - ExFreePool(SendRequest); + exFreePool(SendRequest); TcpipAcquireSpinLock(&AddrFile->Lock, &OldIrql); CurrentEntry = NextEntry; } @@ -247,7 +247,7 @@ TI_DbgPrint(MID_TRACE, ("Called (Proto %d).\n", Protocol)); - AddrFile = ExAllocatePool(NonPagedPool, sizeof(ADDRESS_FILE)); + AddrFile = exAllocatePool(NonPagedPool, sizeof(ADDRESS_FILE)); if (!AddrFile) { TI_DbgPrint(MIN_TRACE, ("Insufficient resources.\n")); return STATUS_INSUFFICIENT_RESOURCES; @@ -272,7 +272,7 @@ Matched = AddrLocateADEv4(IPv4Address, &AddrFile->Address); if (!Matched) { - ExFreePool(AddrFile); + exFreePool(AddrFile); TI_DbgPrint(MIN_TRACE, ("Non-local address given (0x%X).\n", DN2H(IPv4Address))); return STATUS_INVALID_PARAMETER; } @@ -290,7 +290,7 @@ AddrFile->Port != Address->Address[0].Address[0].sin_port) || AddrFile->Port == 0xffff) { - ExFreePool(AddrFile); + exFreePool(AddrFile); return STATUS_INVALID_PARAMETER; } @@ -306,7 +306,7 @@ AddrFile->Port != Address->Address[0].Address[0].sin_port) || AddrFile->Port == 0xffff) { - ExFreePool(AddrFile); + exFreePool(AddrFile); return STATUS_INVALID_PARAMETER; } @@ -389,7 +389,7 @@ TCPFreePort( AddrFile->Port ); if( AddrFile->Listener ) { TCPClose( AddrFile->Listener ); - ExFreePool( AddrFile->Listener ); + exFreePool( AddrFile->Listener ); } break; @@ -518,7 +518,7 @@ PCONTROL_CHANNEL ControlChannel; TI_DbgPrint(MID_TRACE, ("Called.\n")); - ControlChannel = ExAllocatePool(NonPagedPool, sizeof(*ControlChannel)); + ControlChannel = exAllocatePool(NonPagedPool, sizeof(*ControlChannel)); if (!ControlChannel) { TI_DbgPrint(MIN_TRACE, ("Insufficient resources.\n")); @@ -558,7 +558,7 @@ PCONTROL_CHANNEL ControlChannel = Request->Handle.ControlChannel; NTSTATUS Status = STATUS_SUCCESS; - ExFreePool(ControlChannel); + exFreePool(ControlChannel); Request->Handle.ControlChannel = NULL; return Status; Modified: branches/aicom-network-fixes/drivers/network/tcpip/tcpip/iinfo.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/tcpip/tcpip/iinfo.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/tcpip/tcpip/iinfo.c [iso-8859-1] Tue Dec 23 06:39:55 2008 @@ -26,7 +26,7 @@ Interface, IF, ID->tei_entity, ID->tei_instance)); OutData = - (PIFENTRY)ExAllocatePool( NonPagedPool, + (PIFENTRY)exAllocatePool( NonPagedPool, sizeof(IFENTRY) + MAX_IFDESCR_LEN ); if( !OutData ) return TDI_NO_RESOURCES; /* Out of memory */ @@ -71,7 +71,7 @@ ID->tei_entity, ID->tei_instance, Size)); Status = InfoCopyOut( (PCHAR)OutData, Size, Buffer, BufferSize ); - ExFreePool( OutData ); + exFreePool( OutData ); TI_DbgPrint(DEBUG_INFO,("Returning %x\n", Status)); @@ -86,7 +86,7 @@ DWORD NumNeighbors = NBCopyNeighbors( Interface, NULL ); DWORD MemSize = NumNeighbors * sizeof(IPARP_ENTRY); PIPARP_ENTRY ArpEntries = - ExAllocatePoolWithTag + exAllocatePoolWithTag ( NonPagedPool, MemSize, FOURCC('A','R','P','t') ); if( !ArpEntries ) return STATUS_NO_MEMORY; @@ -94,7 +94,7 @@ Status = InfoCopyOut( (PVOID)ArpEntries, MemSize, Buffer, BufferSize ); - ExFreePool( ArpEntries ); + exFreePool( ArpEntries ); return Status; } Modified: branches/aicom-network-fixes/drivers/network/tcpip/tcpip/main.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/tcpip/tcpip/main.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/tcpip/tcpip/main.c [iso-8859-1] Tue Dec 23 06:39:55 2008 @@ -131,7 +131,7 @@ #endif CP /* Allocate resources here. We release them again if something failed */ - Context = ExAllocatePool(NonPagedPool, sizeof(TRANSPORT_CONTEXT)); + Context = exAllocatePool(NonPagedPool, sizeof(TRANSPORT_CONTEXT)); if (!Context) { TI_DbgPrint(MIN_TRACE, ("Insufficient resources.\n")); return STATUS_INSUFFICIENT_RESOURCES; @@ -169,7 +169,7 @@ TI_DbgPrint(MIN_TRACE, ("AddressType: %\n", Address->Address[0].AddressType)); } - PoolFreeBuffer(Context); + exFreePool(Context); return STATUS_INVALID_PARAMETER; } CP @@ -186,12 +186,12 @@ Status = TiGetProtocolNumber(&IrpSp->FileObject->FileName, &Protocol); if (!NT_SUCCESS(Status)) { TI_DbgPrint(MIN_TRACE, ("Raw IP protocol number is invalid.\n")); - PoolFreeBuffer(Context); + exFreePool(Context); return STATUS_INVALID_PARAMETER; } } else { TI_DbgPrint(MIN_TRACE, ("Invalid device object at (0x%X).\n", DeviceObject)); - PoolFreeBuffer(Context); + exFreePool(Context); return STATUS_INVALID_PARAMETER; } CP @@ -213,7 +213,7 @@ if (EaInfo->EaValueLength < sizeof(PVOID)) { TI_DbgPrint(MIN_TRACE, ("Parameters are invalid.\n")); - PoolFreeBuffer(Context); + exFreePool(Context); return STATUS_INVALID_PARAMETER; } @@ -221,7 +221,7 @@ if (DeviceObject != TCPDeviceObject) { TI_DbgPrint(MIN_TRACE, ("Bad device object.\n")); - PoolFreeBuffer(Context); + exFreePool(Context); return STATUS_INVALID_PARAMETER; } @@ -244,7 +244,7 @@ } if (!NT_SUCCESS(Status)) - PoolFreeBuffer(Context); + exFreePool(Context); TI_DbgPrint(DEBUG_IRP, ("Leaving. Status = (0x%X).\n", Status)); @@ -353,7 +353,7 @@ case IRP_MJ_CLOSE: Context = (PTRANSPORT_CONTEXT)IrpSp->FileObject->FsContext; if (Context) - PoolFreeBuffer(Context); + exFreePool(Context); Status = STATUS_SUCCESS; break; @@ -608,7 +608,7 @@ IoDeleteDevice(IPDeviceObject); if (EntityList) - PoolFreeBuffer(EntityList); + exFreePool(EntityList); TI_DbgPrint(MAX_TRACE, ("Leaving.\n")); } @@ -714,7 +714,7 @@ /* Setup network layer and transport layer entities */ KeInitializeSpinLock(&EntityListLock); - EntityList = ExAllocatePool(NonPagedPool, sizeof(TDIEntityID) * MAX_TDI_ENTITIES ); + EntityList = exAllocatePool(NonPagedPool, sizeof(TDIEntityID) * MAX_TDI_ENTITIES ); if (!EntityList) { TI_DbgPrint(MIN_TRACE, ("Insufficient resources.\n")); ChewShutdown(); @@ -746,7 +746,7 @@ IoDeleteDevice(RawIPDeviceObject); IoDeleteDevice(UDPDeviceObject); IoDeleteDevice(TCPDeviceObject); - ExFreePool(EntityList); + exFreePool(EntityList); return STATUS_INSUFFICIENT_RESOURCES; } @@ -758,7 +758,7 @@ IoDeleteDevice(RawIPDeviceObject); IoDeleteDevice(UDPDeviceObject); IoDeleteDevice(TCPDeviceObject); - ExFreePool(EntityList); + exFreePool(EntityList); NdisFreePacketPool(GlobalPacketPool); return STATUS_INSUFFICIENT_RESOURCES; } @@ -787,7 +787,7 @@ IoDeleteDevice(RawIPDeviceObject); IoDeleteDevice(UDPDeviceObject); IoDeleteDevice(TCPDeviceObject); - ExFreePool(EntityList); + exFreePool(EntityList); NdisFreePacketPool(GlobalPacketPool); NdisFreeBufferPool(GlobalBufferPool); return Status; @@ -802,7 +802,7 @@ IoDeleteDevice(RawIPDeviceObject); IoDeleteDevice(UDPDeviceObject); IoDeleteDevice(TCPDeviceObject); - ExFreePool(EntityList); + exFreePool(EntityList); NdisFreePacketPool(GlobalPacketPool); NdisFreeBufferPool(GlobalBufferPool); return Status; @@ -818,7 +818,7 @@ IoDeleteDevice(RawIPDeviceObject); IoDeleteDevice(UDPDeviceObject); IoDeleteDevice(TCPDeviceObject); - ExFreePool(EntityList); + exFreePool(EntityList); NdisFreePacketPool(GlobalPacketPool); NdisFreeBufferPool(GlobalBufferPool); return Status; @@ -846,7 +846,7 @@ IoDeleteDevice(RawIPDeviceObject); IoDeleteDevice(UDPDeviceObject); IoDeleteDevice(TCPDeviceObject); - ExFreePool(EntityList); + exFreePool(EntityList); NdisFreePacketPool(GlobalPacketPool); NdisFreeBufferPool(GlobalBufferPool); return Status; @@ -865,7 +865,7 @@ IoDeleteDevice(RawIPDeviceObject); IoDeleteDevice(UDPDeviceObject); IoDeleteDevice(TCPDeviceObject); - ExFreePool(EntityList); + exFreePool(EntityList); NdisFreePacketPool(GlobalPacketPool); NdisFreeBufferPool(GlobalBufferPool); LANUnregisterProtocol(); Modified: branches/aicom-network-fixes/drivers/network/tcpip/tcpip/mockbuffer.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/tcpip/tcpip/mockbuffer.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/tcpip/tcpip/mockbuffer.c [iso-8859-1] Tue Dec 23 06:39:55 2008 @@ -430,7 +430,7 @@ NDIS_STATUS Status; PCHAR NewData; - NewData = ExAllocatePool( NonPagedPool, Len ); + NewData = exAllocatePool( NonPagedPool, Len ); if( !NewData ) return NDIS_STATUS_NOT_ACCEPTED; // XXX TrackWithTag(EXALLOC_TAG, NewData, File, Line); @@ -439,14 +439,14 @@ NdisAllocatePacket( &Status, &Packet, GlobalPacketPool ); if( Status != NDIS_STATUS_SUCCESS ) { - ExFreePool( NewData ); + exFreePool( NewData ); return Status; } TrackWithTag(NDIS_PACKET_TAG, Packet, File, Line); NdisAllocateBuffer( &Status, &Buffer, GlobalBufferPool, NewData, Len ); if( Status != NDIS_STATUS_SUCCESS ) { - ExFreePool( NewData ); + exFreePool( NewData ); FreeNdisPacket( Packet ); } TrackWithTag(NDIS_BUFFER_TAG, Buffer, File, Line); @@ -482,8 +482,7 @@ XNdisQueryBuffer(Buffer, &Data, &Length); UntrackFL(File,Line,Buffer); NdisFreeBuffer(Buffer); - UntrackFL(File,Line,Data); - ExFreePool(Data); + exFreePool(Data); } /* Finally free the NDIS packet discriptor */ Modified: branches/aicom-network-fixes/drivers/network/tcpip/tcpip/ninfo.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/tcpip/tcpip/ninfo.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/tcpip/tcpip/ninfo.c [iso-8859-1] Tue Dec 23 06:39:55 2008 @@ -21,7 +21,7 @@ UINT Count = 0; UINT IfCount = CountInterfaces(); PIPADDR_ENTRY IpAddress = - ExAllocatePool( NonPagedPool, sizeof( IPADDR_ENTRY ) * IfCount ); + exAllocatePool( NonPagedPool, sizeof( IPADDR_ENTRY ) * IfCount ); PIPADDR_ENTRY IpCurrent = IpAddress; IF_LIST_ITER(CurrentIF); @@ -58,7 +58,7 @@ Status = InfoCopyOut( (PCHAR)IpAddress, sizeof(*IpAddress) * IfCount, Buffer, BufferSize ); - ExFreePool( IpAddress ); + exFreePool( IpAddress ); TI_DbgPrint(DEBUG_INFO, ("Returning %08x\n", Status)); @@ -72,17 +72,17 @@ UINT RtCount = CountFIBs(); UINT Size = sizeof( IPROUTE_ENTRY ) * RtCount; PFIB_ENTRY RCache = - ExAllocatePool( NonPagedPool, sizeof( FIB_ENTRY ) * RtCount ), + exAllocatePool( NonPagedPool, sizeof( FIB_ENTRY ) * RtCount ), RCacheCur = RCache; - PIPROUTE_ENTRY RouteEntries = ExAllocatePool( NonPagedPool, Size ), + PIPROUTE_ENTRY RouteEntries = exAllocatePool( NonPagedPool, Size ), RtCurrent = RouteEntries; TI_DbgPrint(DEBUG_INFO, ("Called, routes = %d, RCache = %08x\n", RtCount, RCache)); if( !RCache || !RouteEntries ) { - if( RCache ) ExFreePool( RCache ); - if( RouteEntries ) ExFreePool( RouteEntries ); + if( RCache ) exFreePool( RCache ); + if( RouteEntries ) exFreePool( RouteEntries ); return TDI_NO_RESOURCES; } @@ -133,8 +133,8 @@ Status = InfoCopyOut( (PCHAR)RouteEntries, Size, Buffer, BufferSize ); - ExFreePool( RouteEntries ); - ExFreePool( RCache ); + exFreePool( RouteEntries ); + exFreePool( RCache ); TI_DbgPrint(DEBUG_INFO, ("Returning %08x\n", Status)); Removed: branches/aicom-network-fixes/drivers/network/tcpip/tcpip/pool.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/tcpip/tcpip/pool.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/tcpip/tcpip/pool.c (removed) @@ -1,68 +1,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS TCP/IP protocol driver - * FILE: tcpip/pool.c - * PURPOSE: Routines for controling pools - * PROGRAMMERS: Casper S. Hornstrup (chorns(a)users.sourceforge.net) - * REVISIONS: - * CSH 01/08-2000 Created - */ - -#include "precomp.h" - - -PVOID PoolAllocateBuffer( - ULONG Size) -/* - * FUNCTION: Returns a buffer from the free buffer pool - * RETURNS: - * Pointer to buffer, NULL if there was not enough - * free resources - */ -{ - PVOID Buffer; - - /* FIXME: Get buffer from a free buffer pool with enough room */ - - Buffer = ExAllocatePool(NonPagedPool, Size); - - TI_DbgPrint(DEBUG_MEMORY, ("Allocated (%i) bytes at (0x%X).\n", Size, Buffer)); - - return Buffer; -} - - -VOID PoolFreeBuffer( - PVOID Buffer) -/* - * FUNCTION: Returns a buffer to the free buffer pool - * ARGUMENTS: - * Buffer = Buffer to return to free buffer pool - */ -{ - /* FIXME: Put buffer in free buffer pool */ - - TI_DbgPrint(DEBUG_MEMORY, ("Freeing buffer at (0x%X).\n", Buffer)); - - ExFreePool(Buffer); -} - -PVOID TcpipAllocateFromNPagedLookasideList( PNPAGED_LOOKASIDE_LIST List ) { - PVOID Buffer; - - Buffer = ExAllocateFromNPagedLookasideList( List ); - - TI_DbgPrint(DEBUG_MEMORY, ("Allocated from Nonpaged Lookaside List at (0x%X).\n", Buffer)); - - return Buffer; -} - -VOID TcpipFreeToNPagedLookasideList( PNPAGED_LOOKASIDE_LIST List, - PVOID Thing ) { - - TI_DbgPrint(DEBUG_MEMORY, ("Freeing buffer (0x%X) to Nonpaged Lookaside List.\n", Thing)); - - ExFreeToNPagedLookasideList( List, Thing ); -} - -/* EOF */

1 0

[jimtabor] 38296: - More updates to global server information structure.
by jimtabor＠svn.reactos.org 23 Dec '08

23 Dec '08

Author: jimtabor Date: Mon Dec 22 22:51:03 2008 New Revision: 38296 URL: http://svn.reactos.org/svn/reactos?rev=38296&view=rev Log: - More updates to global server information structure. Modified: trunk/reactos/include/reactos/win32k/ntuser.h Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] Mon Dec 22 22:51:03 2008 @@ -277,6 +277,14 @@ COLORREF SysColors[COLOR_MENUBAR+1]; // GetSysColor HBRUSH SysColorBrushes[COLOR_MENUBAR+1]; // GetSysColorBrush HPEN SysColorPens[COLOR_MENUBAR+1]; // ReactOS exclusive + HBRUSH hbrGray; + POINTL ptCursor; + // + DWORD cxSysFontChar; + DWORD cySysFontChar; + DWORD cxMsgFontChar; + DWORD cyMsgFontChar; + TEXTMETRICW tmSysFont; // RECTL rcScreen; WORD BitCount; @@ -284,7 +292,7 @@ BYTE BitsPixel; BYTE Planes; WORD reserved; - DWORD PUSIFlags; + DWORD PUSIFlags; // PERUSERSERVERINFO Flags. ULONG uCaretWidth; LANGID UILangID; UINT LastRITWasKeyboard : 1;

1 0

[hyperion] 38295: modified include/reactos/libs/pseh/pseh2.h modified lib/pseh/framebased-gcchack.c modified lib/pseh/i386/framebased-gcchack.S (Re)added arguments to _SEH2_EXCEPT nested routines, so that using _SEH2_GetExceptionCode and _SEH2_GetExceptionInformation in exception filters doesn't force the creation of function trampolines (and related horrid inline code) Reimplemented some internal library routines in C
by hyperion＠svn.reactos.org 23 Dec '08

23 Dec '08

Author: hyperion Date: Mon Dec 22 20:45:25 2008 New Revision: 38295 URL: http://svn.reactos.org/svn/reactos?rev=38295&view=rev Log: modified include/reactos/libs/pseh/pseh2.h modified lib/pseh/framebased-gcchack.c modified lib/pseh/i386/framebased-gcchack.S (Re)added arguments to _SEH2_EXCEPT nested routines, so that using _SEH2_GetExceptionCode and _SEH2_GetExceptionInformation in exception filters doesn't force the creation of function trampolines (and related horrid inline code) Reimplemented some internal library routines in C Modified: trunk/reactos/include/reactos/libs/pseh/pseh2.h trunk/reactos/lib/pseh/framebased-gcchack.c trunk/reactos/lib/pseh/i386/framebased-gcchack.S Modified: trunk/reactos/include/reactos/libs/pseh/pseh2.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/pseh/… ============================================================================== --- trunk/reactos/include/reactos/libs/pseh/pseh2.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/libs/pseh/pseh2.h [iso-8859-1] Mon Dec 22 20:45:25 2008 @@ -46,7 +46,6 @@ { _SEH2Registration_t SF_Registration; volatile struct __SEH2TryLevel * volatile SF_TopTryLevel; - struct _EXCEPTION_POINTERS * volatile SF_ExceptionInformation; volatile unsigned long SF_Code; } _SEH2Frame_t; @@ -140,15 +139,23 @@ #define __SEH_FORCE_NEST \ __asm__ __volatile__("#%0" : : "r" (&_SEHFrame)) -#define __SEH_DECLARE_EXCEPT_PFN(NAME_) int (__cdecl * NAME_)(void) -#define __SEH_DECLARE_EXCEPT(NAME_) int __cdecl NAME_(void) -#define __SEH_DEFINE_EXCEPT(NAME_) int __cdecl NAME_(void) - -#define __SEH_DECLARE_FINALLY_PFN(NAME_) void (__cdecl * NAME_)(void) -#define __SEH_DECLARE_FINALLY(NAME_) void __cdecl NAME_(void) -#define __SEH_DEFINE_FINALLY(NAME_) void __cdecl NAME_(void) - -#define __SEH_RETURN_EXCEPT(R_) return (int)(R_) +#define __SEH_EXCEPT_RET long +#define __SEH_EXCEPT_ARGS __attribute__((unused)) _SEH2Frame_t * _SEH2FrameP, __attribute__((unused)) struct _EXCEPTION_POINTERS * _SEHExceptionInformation +#define __SEH_EXCEPT_ARGS_ , __SEH_EXCEPT_ARGS +#define __SEH_EXCEPT_PFN __SEH_DECLARE_EXCEPT_PFN +#define __SEH_DECLARE_EXCEPT_PFN(NAME_) __SEH_EXCEPT_RET (__cdecl * NAME_)(__SEH_EXCEPT_ARGS) +#define __SEH_DECLARE_EXCEPT(NAME_) __SEH_EXCEPT_RET __cdecl NAME_(__SEH_EXCEPT_ARGS) +#define __SEH_DEFINE_EXCEPT(NAME_) __SEH_EXCEPT_RET __cdecl NAME_(__SEH_EXCEPT_ARGS) + +#define __SEH_FINALLY_RET void +#define __SEH_FINALLY_ARGS void +#define __SEH_FINALLY_ARGS_ +#define __SEH_FINALLY_PFN __SEH_DECLARE_FINALLY_PFN +#define __SEH_DECLARE_FINALLY_PFN(NAME_) __SEH_FINALLY_RET (__cdecl * NAME_)(__SEH_FINALLY_ARGS) +#define __SEH_DECLARE_FINALLY(NAME_) __SEH_FINALLY_RET __cdecl NAME_(__SEH_FINALLY_ARGS) +#define __SEH_DEFINE_FINALLY(NAME_) __SEH_FINALLY_RET __cdecl NAME_(__SEH_FINALLY_ARGS) + +#define __SEH_RETURN_EXCEPT(R_) return (long)(R_) #define __SEH_RETURN_FINALLY() return #define __SEH_BEGIN_TRY \ @@ -175,9 +182,9 @@ #define __SEH_LEAVE_TRYLEVEL() __SEH_SET_TRYLEVEL(_SEHPrevTryLevelP) #define __SEH_END_SCOPE_CHAIN \ - static const int _SEH2ScopeKind = 1; \ - static _SEH2Frame_t * const _SEH2FrameP = 0; \ - static _SEH2TryLevel_t * const _SEH2TryLevelP = 0; + static __attribute__((unused)) const int _SEH2ScopeKind = 1; \ + static __attribute__((unused)) _SEH2Frame_t * const _SEH2FrameP = 0; \ + static __attribute__((unused)) _SEH2TryLevel_t * const _SEH2TryLevelP = 0; #define __SEH_BEGIN_SCOPE \ for(;;) \ @@ -287,35 +294,39 @@ \ _SEHBeforeTry:; \ \ - if(__builtin_constant_p((__VA_ARGS__))) \ - { \ - if((__VA_ARGS__) > 0) \ + { \ + __attribute__((unused)) struct _EXCEPTION_POINTERS * volatile _SEHExceptionInformation; \ + \ + if(__builtin_constant_p((__VA_ARGS__))) \ { \ - _SEHTryLevel.ST_Filter = (void *)1; \ + if((__VA_ARGS__) > 0) \ + { \ + _SEHTryLevel.ST_Filter = (void *)1; \ + _SEHTryLevel.ST_Body = &&_SEHBeginExcept; \ + __SEH_USE_LABEL(_SEHBeginExcept); \ + } \ + else if((__VA_ARGS__) < 0) \ + { \ + _SEHTryLevel.ST_Filter = (void *)-1; \ + _SEHTryLevel.ST_Body = NULL; \ + } \ + else \ + { \ + _SEHTryLevel.ST_Filter = (void *)0; \ + _SEHTryLevel.ST_Body = NULL; \ + } \ + } \ + else \ + { \ + __SEH_DEFINE_EXCEPT(_SEHExcept) \ + { \ + __SEH_RETURN_EXCEPT((__VA_ARGS__)); \ + } \ + \ + _SEHTryLevel.ST_Filter = &_SEHExcept; \ _SEHTryLevel.ST_Body = &&_SEHBeginExcept; \ __SEH_USE_LABEL(_SEHBeginExcept); \ } \ - else if((__VA_ARGS__) < 0) \ - { \ - _SEHTryLevel.ST_Filter = (void *)-1; \ - _SEHTryLevel.ST_Body = NULL; \ - } \ - else \ - { \ - _SEHTryLevel.ST_Filter = (void *)0; \ - _SEHTryLevel.ST_Body = NULL; \ - } \ - } \ - else \ - { \ - __SEH_DEFINE_EXCEPT(_SEHExcept) \ - { \ - __SEH_RETURN_EXCEPT((__VA_ARGS__)); \ - } \ - \ - _SEHTryLevel.ST_Filter = &_SEHExcept; \ - _SEHTryLevel.ST_Body = &&_SEHBeginExcept; \ - __SEH_USE_LABEL(_SEHBeginExcept); \ } \ \ __SEH_BARRIER; \ @@ -347,8 +358,6 @@ _SEHBeginExcept:; \ { \ { \ - _SEH2Frame_t * const _SEH2FrameP = _SEHTopTryLevel ? &_SEHFrame : _SEHCurFrameP; \ - (void)_SEH2FrameP; \ __SEH_BARRIER; #define _SEH2_END \ @@ -360,7 +369,7 @@ } \ __SEH_END_SCOPE; -#define _SEH2_GetExceptionInformation() ((_SEH2FrameP)->SF_ExceptionInformation) +#define _SEH2_GetExceptionInformation() (_SEHExceptionInformation) #define _SEH2_GetExceptionCode() ((_SEH2FrameP)->SF_Code) #define _SEH2_AbnormalTermination() (_SEHAbnormalTermination) Modified: trunk/reactos/lib/pseh/framebased-gcchack.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/pseh/framebased-gcchac… ============================================================================== --- trunk/reactos/lib/pseh/framebased-gcchack.c [iso-8859-1] (original) +++ trunk/reactos/lib/pseh/framebased-gcchack.c [iso-8859-1] Mon Dec 22 20:45:25 2008 @@ -20,14 +20,15 @@ DEALINGS IN THE SOFTWARE. */ -#define _NTSYSTEM_ +#define _NTSYSTEM_ /* removes dllimport attribute from RtlUnwind */ + #define STRICT #define WIN32_LEAN_AND_MEAN #include <windows.h> #include <pseh/pseh2.h> - #include <excpt.h> +#include <intrin.h> #ifndef EXCEPTION_EXIT_UNWIND #define EXCEPTION_EXIT_UNWIND 4 @@ -37,17 +38,28 @@ #define EXCEPTION_UNWINDING 2 #endif -extern _SEH2Registration_t * __cdecl _SEH2CurrentRegistration(void); - -extern int __SEH2Except(void *, void *); -extern void __SEH2Finally(void *, void *); extern DECLSPEC_NORETURN int __SEH2Handle(void *, void *, void *); - -extern void __cdecl __SEH2EnterFrame(_SEH2Registration_t *); -extern void __cdecl __SEH2LeaveFrame(void); - extern int __cdecl __SEH2FrameHandler(struct _EXCEPTION_RECORD *, void *, struct _CONTEXT *, void *); extern int __cdecl __SEH2NestedHandler(struct _EXCEPTION_RECORD *, void *, struct _CONTEXT *, void *); + +FORCEINLINE +_SEH2Registration_t * __cdecl _SEH2CurrentRegistration(void) +{ + return (_SEH2Registration_t *)__readfsdword(0); +} + +FORCEINLINE +void __cdecl __SEH2EnterFrame(_SEH2Registration_t * frame) +{ + frame->SER_Prev = _SEH2CurrentRegistration(); + __writefsdword(0, (unsigned long)frame); +} + +FORCEINLINE +void __cdecl __SEH2LeaveFrame(void) +{ + __writefsdword(0, (unsigned long)_SEH2CurrentRegistration()->SER_Prev); +} FORCEINLINE void _SEH2GlobalUnwind(void * target) @@ -67,11 +79,12 @@ ); } -FORCEINLINE -int _SEH2Except(_SEH2Frame_t * frame, volatile _SEH2TryLevel_t * trylevel) +static +__SEH_EXCEPT_RET _SEH2Except(_SEH2Frame_t * frame, volatile _SEH2TryLevel_t * trylevel, struct _EXCEPTION_POINTERS * ep) { void * filter = trylevel->ST_Filter; void * context = NULL; + __SEH_EXCEPT_RET ret; if(filter == (void *)0) return 0; @@ -88,10 +101,22 @@ filter = _SEHFunctionFromTrampoline((_SEHTrampoline_t *)filter); } - return __SEH2Except(filter, context); -} - -FORCEINLINE + __asm__ __volatile__ + ( + "push %[ep]\n" + "push %[frame]\n" + "call *%[filter]\n" + "pop %%edx\n" + "pop %%edx\n" : + [ret] "=a" (ret) : + "c" (context), [filter] "r" (filter), [frame] "g" (frame), [ep] "g" (ep) : + "edx", "flags", "memory" + ); + + return ret; +} + +static void _SEH2Finally(_SEH2Frame_t * frame, volatile _SEH2TryLevel_t * trylevel) { if(trylevel->ST_Filter == NULL && trylevel->ST_Body != NULL) @@ -105,7 +130,7 @@ body = _SEHFunctionFromTrampoline((_SEHTrampoline_t *)body); } - __SEH2Finally(body, context); + __asm__ __volatile__("call *%1\n" : : "c" (context), "r" (body) : "eax", "edx", "flags", "memory"); } } @@ -179,11 +204,10 @@ ep.ContextRecord = ContextRecord; frame->SF_Code = ExceptionRecord->ExceptionCode; - frame->SF_ExceptionInformation = &ep; for(trylevel = frame->SF_TopTryLevel; trylevel != NULL; trylevel = trylevel->ST_Next) { - ret = _SEH2Except(frame, trylevel); + ret = _SEH2Except(frame, trylevel, &ep); if(ret < 0) return ExceptionContinueExecution; Modified: trunk/reactos/lib/pseh/i386/framebased-gcchack.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/pseh/i386/framebased-g… ============================================================================== --- trunk/reactos/lib/pseh/i386/framebased-gcchack.S [iso-8859-1] (original) +++ trunk/reactos/lib/pseh/i386/framebased-gcchack.S [iso-8859-1] Mon Dec 22 20:45:25 2008 @@ -21,32 +21,6 @@ .text .intel_syntax noprefix -.func _SEH2CurrentRegistration -.globl __SEH2CurrentRegistration -__SEH2CurrentRegistration: - mov eax, [fs:0] - ret -.endfunc - -.func __SEH2EnterFrame -.globl ___SEH2EnterFrame -___SEH2EnterFrame: - mov eax, [esp+4] - mov ecx, [fs:0] - mov [eax], ecx - mov [fs:0], eax - ret -.endfunc - -.func __SEH2LeaveFrame -.globl ___SEH2LeaveFrame -___SEH2LeaveFrame: - mov eax, [fs:0] - mov eax, [eax] - mov [fs:0], eax - ret -.endfunc - .func __SEH2Handle .globl ___SEH2Handle ___SEH2Handle: @@ -54,28 +28,6 @@ mov ebp, [esp+8] mov esp, [esp+12] jmp eax -.endfunc - -.func __SEH2Except -.globl ___SEH2Except -___SEH2Except: - mov eax, [esp+4] - mov ecx, [esp+8] - - call eax - - ret -.endfunc - -.func __SEH2Finally -.globl ___SEH2Finally -___SEH2Finally: - mov eax, [esp+4] - mov ecx, [esp+8] - - call eax - - ret .endfunc .func __SEH2FrameHandler

1 0

[tkreuzer] 38294: For some unknown reason wmc likes to include string.h from the wine folder and we cannot link it on linux hosts. This hack should hopefully resolve the issue.
by tkreuzer＠svn.reactos.org 23 Dec '08

23 Dec '08

Author: tkreuzer Date: Mon Dec 22 20:36:25 2008 New Revision: 38294 URL: http://svn.reactos.org/svn/reactos?rev=38294&view=rev Log: For some unknown reason wmc likes to include string.h from the wine folder and we cannot link it on linux hosts. This hack should hopefully resolve the issue. Removed: trunk/reactos/include/reactos/wine/string.h Modified: trunk/reactos/include/crt/string.h Modified: trunk/reactos/include/crt/string.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/string.h?rev=3… ============================================================================== --- trunk/reactos/include/crt/string.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/string.h [iso-8859-1] Mon Dec 22 20:36:25 2008 @@ -160,4 +160,11 @@ #endif #include <sec_api/string_s.h> + +// HACK +#define strcasecmp _stricmp +#define strncasecmp _strnicmp +#define stricmp _stricmp +#define wcsicmp _wcsicmp + #endif Removed: trunk/reactos/include/reactos/wine/string.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/strin… ============================================================================== --- trunk/reactos/include/reactos/wine/string.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/string.h (removed) @@ -1,12 +1,0 @@ -#ifndef __WINE_STRING_H -#define __WINE_STRING_H - -#include_next <string.h> - -#define strcasecmp _stricmp -#define strncasecmp _strnicmp -#define stricmp _stricmp -#define wcsicmp _wcsicmp - - -#endif /* !__WINE_STRING_H */

1 0

[tkreuzer] 38293: sorry forgot this file, another wine compatibility header
by tkreuzer＠svn.reactos.org 23 Dec '08

23 Dec '08

Author: tkreuzer Date: Mon Dec 22 20:22:44 2008 New Revision: 38293 URL: http://svn.reactos.org/svn/reactos?rev=38293&view=rev Log: sorry forgot this file, another wine compatibility header Added: trunk/reactos/include/reactos/wine/string.h (with props) Added: trunk/reactos/include/reactos/wine/string.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/strin… ============================================================================== --- trunk/reactos/include/reactos/wine/string.h (added) +++ trunk/reactos/include/reactos/wine/string.h [iso-8859-1] Mon Dec 22 20:22:44 2008 @@ -1,0 +1,12 @@ +#ifndef __WINE_STRING_H +#define __WINE_STRING_H + +#include_next <string.h> + +#define strcasecmp _stricmp +#define strncasecmp _strnicmp +#define stricmp _stricmp +#define wcsicmp _wcsicmp + + +#endif /* !__WINE_STRING_H */ Propchange: trunk/reactos/include/reactos/wine/string.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[tkreuzer] 38292: CRT header compatibility update. asser.h: - prototypes for _assert and _wassert, add wassert macro, TODO: reenable assert macro conio.h: - Add deprecation macros and some cleanup crtdbg.h: - Add _ASSERT_WRN, ASSERTE_WRN, ASSERT_EXPR_WRN ctype.h: - cleaup and fix _pctype and __pctype_func - add _CRTIMP where needed - add deprecation macros dos.h: - enable _enable and _disable io.h: - enable use of _INTEGRAL_MAX_BITS - remove some defines, other cleanup math.h: - remove system_he
by tkreuzer＠svn.reactos.org 23 Dec '08

23 Dec '08

Author: tkreuzer Date: Mon Dec 22 20:15:24 2008 New Revision: 38292 URL: http://svn.reactos.org/svn/reactos?rev=38292&view=rev Log: CRT header compatibility update. asser.h: - prototypes for _assert and _wassert, add wassert macro, TODO: reenable assert macro conio.h: - Add deprecation macros and some cleanup crtdbg.h: - Add _ASSERT_WRN, ASSERTE_WRN, ASSERT_EXPR_WRN ctype.h: - cleaup and fix _pctype and __pctype_func - add _CRTIMP where needed - add deprecation macros dos.h: - enable _enable and _disable io.h: - enable use of _INTEGRAL_MAX_BITS - remove some defines, other cleanup math.h: - remove system_header - rename include guard to _INC_MATH - fix definition of _HUGE - add _CRTIMP where needed stdio.h: - fix _iob[] and stdstram defines - add _CRTIMP where needed - enable non-conforming swprintf defines - remove some mingw specific stuff string.h: - add _CRTIMP and deprecation macros sys/stat.h: - some cleanup sys/timeb.h: - add struct timeb - remove #defines - add deprecation macros sys/utime.h: - remove unneeded inline functions, cleanup time.h: - remove #defines - add _CRTIMP and deprecation macros wchar.h: - fix _iob[], stdstream, _pctype and __pctype_func - add _wfinddate_t, _wfinddatai64_t and _stat - add _CRTIMP where needed - remove defines Modified: trunk/reactos/include/crt/assert.h trunk/reactos/include/crt/conio.h trunk/reactos/include/crt/crtdbg.h trunk/reactos/include/crt/ctype.h trunk/reactos/include/crt/dos.h trunk/reactos/include/crt/io.h trunk/reactos/include/crt/math.h trunk/reactos/include/crt/stdio.h trunk/reactos/include/crt/string.h trunk/reactos/include/crt/sys/stat.h trunk/reactos/include/crt/sys/timeb.h trunk/reactos/include/crt/sys/utime.h trunk/reactos/include/crt/time.h trunk/reactos/include/crt/wchar.h Modified: trunk/reactos/include/crt/assert.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/assert.h?rev=3… ============================================================================== --- trunk/reactos/include/crt/assert.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/assert.h [iso-8859-1] Mon Dec 22 20:15:24 2008 @@ -20,14 +20,20 @@ extern "C" { #endif -//extern void __cdecl _wassert(const wchar_t *_Message,const wchar_t *_File,unsigned _Line); + _CRTIMP void __cdecl _assert(const char *_Message,const char *_File,unsigned _Line); + _CRTIMP void __cdecl _wassert(const wchar_t *_Message,const wchar_t *_File,unsigned _Line); #ifdef __cplusplus } #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)) +#endif + +#ifndef wassert +#define wassert(_Expression) (void)((!!(_Expression)) || (_wassert(_CRT_WIDE(#_Expression),_CRT_WIDE(__FILE__),__LINE__),0)) #endif #endif Modified: trunk/reactos/include/crt/conio.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/conio.h?rev=38… ============================================================================== --- trunk/reactos/include/crt/conio.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/conio.h [iso-8859-1] Mon Dec 22 20:15:24 2008 @@ -12,11 +12,11 @@ extern "C" { #endif - _CRTIMP char *_cgets(char *_Buffer); + _CRTIMP char * __cdecl _cgets(char *_Buffer); _CRTIMP int __cdecl _cprintf(const char *_Format,...); _CRTIMP int __cdecl _cputs(const char *_Str); - _CRTIMP int __cdecl _cscanf(const char *_Format,...); - _CRTIMP int __cdecl _cscanf_l(const char *_Format,_locale_t _Locale,...); + _CRT_INSECURE_DEPRECATE(_cscanf_s) _CRTIMP int __cdecl _cscanf(const char *_Format,...); + _CRT_INSECURE_DEPRECATE(_cscanf_s_l) _CRTIMP int __cdecl _cscanf_l(const char *_Format,_locale_t _Locale,...); _CRTIMP int __cdecl _getch(void); _CRTIMP int __cdecl _getche(void); _CRTIMP int __cdecl _vcprintf(const char *_Format,va_list _ArgList); @@ -27,6 +27,12 @@ _CRTIMP int __cdecl _cprintf_p_l(const char *_Format,_locale_t _Locale,...); _CRTIMP int __cdecl _vcprintf_p_l(const char *_Format,_locale_t _Locale,va_list _ArgList); _CRTIMP int __cdecl _kbhit(void); + _CRTIMP int __cdecl _putch(int _Ch); + _CRTIMP int __cdecl _ungetch(int _Ch); + _CRTIMP int __cdecl _getch_nolock(void); + _CRTIMP int __cdecl _getche_nolock(void); + _CRTIMP int __cdecl _putch_nolock(int _Ch); + _CRTIMP int __cdecl _ungetch_nolock(int _Ch); #if defined(_X86_) && !defined(__x86_64) int __cdecl _inp(unsigned short); @@ -37,12 +43,6 @@ unsigned long __cdecl _outpd(unsigned short,unsigned long); #endif - _CRTIMP int __cdecl _putch(int _Ch); - _CRTIMP int __cdecl _ungetch(int _Ch); - _CRTIMP int __cdecl _getch_nolock(void); - _CRTIMP int __cdecl _getche_nolock(void); - _CRTIMP int __cdecl _putch_nolock(int _Ch); - _CRTIMP int __cdecl _ungetch_nolock(int _Ch); #ifndef _WCONIO_DEFINED #define _WCONIO_DEFINED @@ -58,8 +58,8 @@ _CRTIMP wint_t __cdecl _ungetwch(wint_t _WCh); _CRTIMP int __cdecl _cputws(const wchar_t *_String); _CRTIMP int __cdecl _cwprintf(const wchar_t *_Format,...); - _CRTIMP int __cdecl _cwscanf(const wchar_t *_Format,...); - _CRTIMP int __cdecl _cwscanf_l(const wchar_t *_Format,_locale_t _Locale,...); + _CRT_INSECURE_DEPRECATE(_cwscanf_s) _CRTIMP int __cdecl _cwscanf(const wchar_t *_Format,...); + _CRT_INSECURE_DEPRECATE(_cwscanf_s_l) _CRTIMP int __cdecl _cwscanf_l(const wchar_t *_Format,_locale_t _Locale,...); _CRTIMP int __cdecl _vcwprintf(const wchar_t *_Format,va_list _ArgList); _CRTIMP int __cdecl _cwprintf_p(const wchar_t *_Format,...); _CRTIMP int __cdecl _vcwprintf_p(const wchar_t *_Format,va_list _ArgList); @@ -71,31 +71,38 @@ _CRTIMP wint_t __cdecl _getwch_nolock(void); _CRTIMP wint_t __cdecl _getwche_nolock(void); _CRTIMP wint_t __cdecl _ungetwch_nolock(wint_t _WCh); +#endif /* _WCONIO_DEFINED */ + +#ifndef _MT +#define _putwch() _putwch_nolock() +#define _getwch() _getwch_nolock() +#define _getwche() _getwche_nolock() +#define _ungetwch() _ungetwch_nolock() #endif #ifndef NO_OLDNAMES - char *__cdecl cgets(char *_Buffer); - int __cdecl cprintf(const char *_Format,...); - int __cdecl cputs(const char *_Str); - int __cdecl cscanf(const char *_Format,...); - int __cdecl getch(void); - int __cdecl getche(void); - int __cdecl kbhit(void); - int __cdecl putch(int _Ch); - int __cdecl ungetch(int _Ch); + _CRT_NONSTDC_DEPRECATE(_cgets) _CRT_INSECURE_DEPRECATE(_cgets_s) _CRTIMP char *__cdecl cgets(char *_Buffer); + _CRT_NONSTDC_DEPRECATE(_cprintf) _CRTIMP int __cdecl cprintf(const char *_Format,...); + _CRT_NONSTDC_DEPRECATE(_cputs) _CRTIMP int __cdecl cputs(const char *_Str); + _CRT_NONSTDC_DEPRECATE(_cscanf) _CRTIMP int __cdecl cscanf(const char *_Format,...); + _CRT_NONSTDC_DEPRECATE(_getch) _CRTIMP int __cdecl getch(void); + _CRT_NONSTDC_DEPRECATE(_getche) _CRTIMP int __cdecl getche(void); + _CRT_NONSTDC_DEPRECATE(_kbhit) _CRTIMP int __cdecl kbhit(void); + _CRT_NONSTDC_DEPRECATE(_putch) _CRTIMP int __cdecl putch(int _Ch); + _CRT_NONSTDC_DEPRECATE(_ungetch) _CRTIMP int __cdecl ungetch(int _Ch); #if (defined(_X86_) && !defined(__x86_64)) - int __cdecl inp(unsigned short); - unsigned short __cdecl inpw(unsigned short); - int __cdecl outp(unsigned short,int); - unsigned short __cdecl outpw(unsigned short,unsigned short); + _CRT_NONSTDC_DEPRECATE(_inp) _CRTIMP int __cdecl inp(unsigned short); + _CRT_NONSTDC_DEPRECATE(_inpw) _CRTIMP unsigned short __cdecl inpw(unsigned short); + _CRT_NONSTDC_DEPRECATE(_outp) _CRTIMP int __cdecl outp(unsigned short,int); + _CRT_NONSTDC_DEPRECATE(_outpw) _CRTIMP unsigned short __cdecl outpw(unsigned short,unsigned short); #endif +#endif /* !NO_OLDNAMES */ -#endif #ifdef __cplusplus } #endif #include <sec_api/conio_s.h> -#endif +#endif /* _INC_CONIO */ Modified: trunk/reactos/include/crt/crtdbg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/crtdbg.h?rev=3… ============================================================================== --- trunk/reactos/include/crt/crtdbg.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/crtdbg.h [iso-8859-1] Mon Dec 22 20:15:24 2008 @@ -97,12 +97,24 @@ #define _ASSERT(expr) ((void)0) #endif +#ifndef _ASSERT_WRN +#define _ASSERT_WRN(expr) ((void)0) +#endif + #ifndef _ASSERTE #define _ASSERTE(expr) ((void)0) #endif +#ifndef _ASSERTE_WRN +#define _ASSERTE_WRN(expr) ((void)0) +#endif + #ifndef _ASSERT_EXPR #define _ASSERT_EXPR(expr,expr_str) ((void)0) +#endif + +#ifndef _ASSERT_EXPR_WRN +#define _ASSERT_EXPR_WRN(expr,expr_str) ((void)0) #endif #ifndef _ASSERT_BASE Modified: trunk/reactos/include/crt/ctype.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/ctype.h?rev=38… ============================================================================== --- trunk/reactos/include/crt/ctype.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/ctype.h [iso-8859-1] Mon Dec 22 20:15:24 2008 @@ -17,69 +17,36 @@ #endif #ifndef _CRT_CTYPEDATA_DEFINED -#define _CRT_CTYPEDATA_DEFINED -#ifndef _CTYPE_DISABLE_MACROS - -#ifndef __PCTYPE_FUNC -#define __PCTYPE_FUNC __pctype_func() -#ifdef _MSVCRT_ -#define __pctype_func() (_pctype) -#else -#define __pctype_func() (*_imp___pctype) -#endif -#endif - -#ifndef _pctype -#ifdef _MSVCRT_ - extern const unsigned short *_pctype; -#else - extern const unsigned short **_imp___pctype; -#define _pctype (*_imp___pctype) -#endif -#endif - -#endif -#endif +# define _CRT_CTYPEDATA_DEFINED +# ifndef _CTYPE_DISABLE_MACROS +# ifndef __PCTYPE_FUNC +# ifdef _DLL +# define __PCTYPE_FUNC __pctype_func() +# else +# define __PCTYPE_FUNC _pctype +# endif +# endif /* !__PCTYPE_FUNC */ + _CRTIMP const unsigned short * __cdecl __pctype_func(void); +# ifndef _M_CEE_PURE + _CRTDATA(extern const unsigned short *_pctype); +# else +# define _pctype (__pctype_func()) +# endif /* !_M_CEE_PURE */ +# endif /* !_CTYPE_DISABLE_MACROS */ +#endif /* !_CRT_CTYPEDATA_DEFINED */ #ifndef _CRT_WCTYPEDATA_DEFINED #define _CRT_WCTYPEDATA_DEFINED -#ifndef _CTYPE_DISABLE_MACROS -#ifndef _wctype -#ifdef _MSVCRT_ - extern unsigned short *_wctype; -#else - extern unsigned short **_imp___wctype; -#define _wctype (*_imp___wctype) -#endif -#endif -#ifdef _MSVCRT_ -#define __pwctype_func() (_pwctype) -#ifndef _pwctype - extern const unsigned short *_pwctype; -#endif -#else -#define __pwctype_func() (*_imp___pwctype) -#ifndef _pwctype - extern const unsigned short **_imp___pwctype; -#define _pwctype (*_imp___pwctype) -#endif -#endif -#endif -#endif - - /* CRT stuff */ -#if 1 - extern const unsigned char __newclmap[]; - extern const unsigned char __newcumap[]; - extern pthreadlocinfo __ptlocinfo; - extern pthreadmbcinfo __ptmbcinfo; - extern int __globallocalestatus; - extern int __locale_changed; - extern struct threadlocaleinfostruct __initiallocinfo; - extern _locale_tstruct __initiallocalestructinfo; - pthreadlocinfo __cdecl __updatetlocinfo(void); - pthreadmbcinfo __cdecl __updatetmbcinfo(void); -#endif +# ifndef _CTYPE_DISABLE_MACROS + _CRTDATA(extern unsigned short *_wctype); + _CRTIMP const wctype_t * __cdecl __pwctype_func(void); +# ifndef _M_CEE_PURE + _CRTDATA(extern const wctype_t *_pwctype); +# else +# define _pwctype (__pwctype_func()) +# endif /* !_M_CEE_PURE */ +# endif /* !_CTYPE_DISABLE_MACROS */ +#endif /* !_CRT_WCTYPEDATA_DEFINED */ #define _UPPER 0x1 #define _LOWER 0x2 @@ -96,7 +63,6 @@ #ifndef _CTYPE_DEFINED #define _CTYPE_DEFINED - _CRTIMP int __cdecl _isctype(int _C,int _Type); _CRTIMP int __cdecl _isctype_l(int _C,int _Type,_locale_t _Locale); _CRTIMP int __cdecl isalpha(int _C); @@ -131,51 +97,49 @@ _CRTIMP int __cdecl __toascii(int _C); _CRTIMP int __cdecl __iscsymf(int _C); _CRTIMP int __cdecl __iscsym(int _C); - #if (defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || !defined (NO_OLDNAMES) int __cdecl isblank(int _C); #endif -#endif +#endif /* !_CTYPE_DEFINED */ #ifndef _WCTYPE_DEFINED #define _WCTYPE_DEFINED - - int __cdecl iswalpha(wint_t _C); + _CRTIMP int __cdecl iswalpha(wint_t _C); _CRTIMP int __cdecl _iswalpha_l(wint_t _C,_locale_t _Locale); - int __cdecl iswupper(wint_t _C); + _CRTIMP int __cdecl iswupper(wint_t _C); _CRTIMP int __cdecl _iswupper_l(wint_t _C,_locale_t _Locale); - int __cdecl iswlower(wint_t _C); + _CRTIMP int __cdecl iswlower(wint_t _C); _CRTIMP int __cdecl _iswlower_l(wint_t _C,_locale_t _Locale); - int __cdecl iswdigit(wint_t _C); + _CRTIMP int __cdecl iswdigit(wint_t _C); _CRTIMP int __cdecl _iswdigit_l(wint_t _C,_locale_t _Locale); - int __cdecl iswxdigit(wint_t _C); + _CRTIMP int __cdecl iswxdigit(wint_t _C); _CRTIMP int __cdecl _iswxdigit_l(wint_t _C,_locale_t _Locale); - int __cdecl iswspace(wint_t _C); + _CRTIMP int __cdecl iswspace(wint_t _C); _CRTIMP int __cdecl _iswspace_l(wint_t _C,_locale_t _Locale); - int __cdecl iswpunct(wint_t _C); + _CRTIMP int __cdecl iswpunct(wint_t _C); _CRTIMP int __cdecl _iswpunct_l(wint_t _C,_locale_t _Locale); - int __cdecl iswalnum(wint_t _C); + _CRTIMP int __cdecl iswalnum(wint_t _C); _CRTIMP int __cdecl _iswalnum_l(wint_t _C,_locale_t _Locale); - int __cdecl iswprint(wint_t _C); + _CRTIMP int __cdecl iswprint(wint_t _C); _CRTIMP int __cdecl _iswprint_l(wint_t _C,_locale_t _Locale); - int __cdecl iswgraph(wint_t _C); + _CRTIMP int __cdecl iswgraph(wint_t _C); _CRTIMP int __cdecl _iswgraph_l(wint_t _C,_locale_t _Locale); - int __cdecl iswcntrl(wint_t _C); + _CRTIMP int __cdecl iswcntrl(wint_t _C); _CRTIMP int __cdecl _iswcntrl_l(wint_t _C,_locale_t _Locale); - int __cdecl iswascii(wint_t _C); - int __cdecl isleadbyte(int _C); + _CRTIMP int __cdecl iswascii(wint_t _C); + _CRTIMP int __cdecl isleadbyte(int _C); _CRTIMP int __cdecl _isleadbyte_l(int _C,_locale_t _Locale); - wint_t __cdecl towupper(wint_t _C); + _CRTIMP wint_t __cdecl towupper(wint_t _C); _CRTIMP wint_t __cdecl _towupper_l(wint_t _C,_locale_t _Locale); - wint_t __cdecl towlower(wint_t _C); + _CRTIMP wint_t __cdecl towlower(wint_t _C); _CRTIMP wint_t __cdecl _towlower_l(wint_t _C,_locale_t _Locale); - int __cdecl iswctype(wint_t _C,wctype_t _Type); + _CRTIMP int __cdecl iswctype(wint_t _C,wctype_t _Type); _CRTIMP int __cdecl _iswctype_l(wint_t _C,wctype_t _Type,_locale_t _Locale); _CRTIMP int __cdecl __iswcsymf(wint_t _C); _CRTIMP int __cdecl _iswcsymf_l(wint_t _C,_locale_t _Locale); _CRTIMP int __cdecl __iswcsym(wint_t _C); _CRTIMP int __cdecl _iswcsym_l(wint_t _C,_locale_t _Locale); - int __cdecl is_wctype(wint_t _C,wctype_t _Type); + _CRTIMP int __cdecl is_wctype(wint_t _C,wctype_t _Type); #if (defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || !defined (NO_OLDNAMES) int __cdecl iswblank(wint_t _C); @@ -261,12 +225,12 @@ #define _iswcsym_l(_c,_p) (_iswalnum_l(_c,_p) || ((_c)=='_')) #endif -#ifndef NO_OLDNAMES +#ifndef NO_OLDNAMES #ifndef _CTYPE_DEFINED - int __cdecl isascii(int _C); - int __cdecl toascii(int _C); - int __cdecl iscsymf(int _C); - int __cdecl iscsym(int _C); + _CRT_NONSTDC_DEPRECATE(__isascii) _CRTIMP int __cdecl isascii(int _C); + _CRT_NONSTDC_DEPRECATE(__toascii) _CRTIMP int __cdecl toascii(int _C); + _CRT_NONSTDC_DEPRECATE(__iscsymf) _CRTIMP int __cdecl iscsymf(int _C); + _CRT_NONSTDC_DEPRECATE(__iscsym) _CRTIMP int __cdecl iscsym(int _C); #else #define isascii __isascii #define toascii __toascii @@ -278,4 +242,5 @@ #ifdef __cplusplus } #endif -#endif + +#endif /* !_INC_CTYPE */ Modified: trunk/reactos/include/crt/dos.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/dos.h?rev=3829… ============================================================================== --- trunk/reactos/include/crt/dos.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/dos.h [iso-8859-1] Mon Dec 22 20:15:24 2008 @@ -39,8 +39,8 @@ #endif #if (defined(_X86_) && !defined(__x86_64)) -// void __cdecl _disable(void); -// void __cdecl _enable(void); + void __cdecl _disable(void); + void __cdecl _enable(void); #endif #ifndef NO_OLDNAMES Modified: trunk/reactos/include/crt/io.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/io.h?rev=38292… ============================================================================== --- trunk/reactos/include/crt/io.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/io.h [iso-8859-1] Mon Dec 22 20:15:24 2008 @@ -1,3 +1,4 @@ + /** * This file has no copyright assigned and is placed in the Public Domain. * This file is part of the w64 mingw-runtime package. @@ -25,6 +26,15 @@ #ifndef _FINDDATA_T_DEFINED + struct _finddata_t { + unsigned attrib; + time_t time_create; + time_t time_access; + time_t time_write; + _fsize_t size; + char name[260]; + }; + struct _finddata32_t { unsigned attrib; __time32_t time_create; @@ -34,16 +44,16 @@ char name[260]; }; - struct _finddata_t { +#if _INTEGRAL_MAX_BITS >= 64 + + struct _finddatai64_t { unsigned attrib; time_t time_create; time_t time_access; time_t time_write; - _fsize_t size; - char name[260]; - }; - -/*#if _INTEGRAL_MAX_BITS >= 64*/ + __int64 size; + char name[260]; + }; struct _finddata32i64_t { unsigned attrib; @@ -71,35 +81,21 @@ __int64 size; char name[260]; }; - - struct _finddatai64_t { +#endif /* _INTEGRAL_MAX_BITS >= 64 */ + +#define _FINDDATA_T_DEFINED +#endif + +#ifndef _WFINDDATA_T_DEFINED + + struct _wfinddata_t { unsigned attrib; time_t time_create; time_t time_access; time_t time_write; - __int64 size; - char name[260]; - }; - -/* #endif */ - -#ifdef _WIN64 -#define _findfirst64i32 _findfirst -#define _findnext64i32 _findnext -#define _findfirsti64 _findfirst64 -#define _findnexti64 _findnext64 - -#else /* !_WIN64 */ -//#define _findfirst32 _findfirst -//#define _findnext32 _findnext -//#define _findfirst32i64 _findfirsti64 -//#define _findnext32i64 _findnexti64 -#endif /* !_WIN64 */ - -#define _FINDDATA_T_DEFINED -#endif - -#ifndef _WFINDDATA_T_DEFINED + _fsize_t size; + wchar_t name[260]; + }; struct _wfinddata32_t { unsigned attrib; @@ -110,16 +106,16 @@ wchar_t name[260]; }; - struct _wfinddata_t { +#if _INTEGRAL_MAX_BITS >= 64 + + struct _wfinddatai64_t { unsigned attrib; time_t time_create; time_t time_access; time_t time_write; - _fsize_t size; - wchar_t name[260]; - }; - -/* #if _INTEGRAL_MAX_BITS >= 64 */ + __int64 size; + wchar_t name[260]; + }; struct _wfinddata32i64_t { unsigned attrib; @@ -147,17 +143,7 @@ __int64 size; wchar_t name[260]; }; - - struct _wfinddatai64_t { - unsigned attrib; - time_t time_create; - time_t time_access; - time_t time_write; - __int64 size; - wchar_t name[260]; - }; - -/* #endif */ +#endif #define _WFINDDATA_T_DEFINED #endif @@ -216,11 +202,16 @@ #if _INTEGRAL_MAX_BITS >= 64 _CRTIMP __int64 __cdecl _filelengthi64(int _FileHandle); _CRTIMP intptr_t __cdecl _findfirst32i64(const char *_Filename,struct _finddata32i64_t *_FindData); + _CRTIMP intptr_t __cdecl _findfirst64i32(const char *_Filename,struct _finddata64i32_t *_FindData); _CRTIMP intptr_t __cdecl _findfirst64(const char *_Filename,struct __finddata64_t *_FindData); + _CRTIMP int __cdecl _findnext32i64(intptr_t _FindHandle,struct _finddata32i64_t *_FindData); + _CRTIMP int __cdecl _findnext64i32(intptr_t _FindHandle,struct _finddata64i32_t *_FindData); + _CRTIMP int __cdecl _findnext64(intptr_t _FindHandle,struct __finddata64_t *_FindData); + _CRTIMP __int64 __cdecl _lseeki64(int _FileHandle,__int64 _Offset,int _Origin); + _CRTIMP __int64 __cdecl _telli64(int _FileHandle); #ifdef __cplusplus #include <string.h> #endif - intptr_t __cdecl _findfirst64i32(const char *_Filename,struct _finddata64i32_t *_FindData); __CRT_INLINE intptr_t __cdecl _findfirst64i32(const char *_Filename,struct _finddata64i32_t *_FindData) { struct __finddata64_t fd; @@ -233,9 +224,6 @@ strncpy(_FindData->name,fd.name,260); return ret; } - _CRTIMP int __cdecl _findnext32i64(intptr_t _FindHandle,struct _finddata32i64_t *_FindData); - _CRTIMP int __cdecl _findnext64(intptr_t _FindHandle,struct __finddata64_t *_FindData); - int __cdecl _findnext64i32(intptr_t _FindHandle,struct _finddata64i32_t *_FindData); __CRT_INLINE int __cdecl _findnext64i32(intptr_t _FindHandle,struct _finddata64i32_t *_FindData) { struct __finddata64_t fd; @@ -248,11 +236,9 @@ strncpy(_FindData->name,fd.name,260); return ret; } - __int64 __cdecl _lseeki64(int _FileHandle,__int64 _Offset,int _Origin); - __int64 __cdecl _telli64(int _FileHandle); -#endif +#endif + #ifndef NO_OLDNAMES - #ifndef _UWIN int __cdecl chdir (const char *); char *__cdecl getcwd (char *, int); @@ -261,7 +247,6 @@ int __cdecl rmdir (const char*); int __cdecl chmod (const char *, int); #endif /* _UWIN */ - #endif /* Not NO_OLDNAMES */ _CRTIMP errno_t __cdecl _sopen_s(int *_FileHandle,const char *_Filename,int _OpenFlag,int _ShareFlag,int _PermissionMode); @@ -304,7 +289,7 @@ extern "C++" _CRTIMP int __cdecl _wsopen(const wchar_t *_Filename,int _OpenFlag,int _ShareFlag,int _PermissionMode = 0); #endif -#endif +#endif /* !_WIO_DEFINED */ int __cdecl __lock_fhandle(int _Filehandle); void __cdecl _unlock_fhandle(int _Filehandle); Modified: trunk/reactos/include/crt/math.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/math.h?rev=382… ============================================================================== --- trunk/reactos/include/crt/math.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/math.h [iso-8859-1] Mon Dec 22 20:15:24 2008 @@ -3,12 +3,8 @@ * This file is part of the w64 mingw-runtime package. * No warranty is given; refer to the file DISCLAIMER within this package. */ -#ifndef _MATH_H_ -#define _MATH_H_ - -#if __GNUC__ >= 3 -#pragma GCC system_header -#endif +#ifndef _INC_MATH +#define _INC_MATH #include <crtdefs.h> @@ -48,14 +44,7 @@ #define EDOM 33 #define ERANGE 34 -#ifndef _HUGE -#ifdef _MSVCRT_ - extern double *_HUGE; -#else - extern double *_imp___HUGE; -#define _HUGE (*_imp___HUGE) -#endif -#endif + _CRTIMP extern double _HUGE; #define HUGE_VAL _HUGE @@ -94,19 +83,19 @@ #endif _CRTIMP double __cdecl _cabs(struct _complex _ComplexA); - double __cdecl ceil(double _X); - double __cdecl floor(double _X); - double __cdecl frexp(double _X,int *_Y); - double __cdecl _hypot(double _X,double _Y); + _CRTIMP double __cdecl ceil(double _X); + _CRTIMP double __cdecl floor(double _X); + _CRTIMP double __cdecl frexp(double _X,int *_Y); + _CRTIMP double __cdecl _hypot(double _X,double _Y); _CRTIMP double __cdecl _j0(double _X); _CRTIMP double __cdecl _j1(double _X); _CRTIMP double __cdecl _jn(int _X,double _Y); - double __cdecl ldexp(double _X,int _Y); + _CRTIMP double __cdecl ldexp(double _X,int _Y); #ifndef _CRT_MATHERR_DEFINED #define _CRT_MATHERR_DEFINED int __cdecl _matherr(struct _exception *_Except); #endif - double __cdecl modf(double _X,double *_Y); + _CRTIMP double __cdecl modf(double _X,double *_Y); _CRTIMP double __cdecl _y0(double _X); _CRTIMP double __cdecl _y1(double _X); _CRTIMP double __cdecl _yn(int _X,double _Y); @@ -767,5 +756,4 @@ #endif -#endif /* End _MATH_H_ */ - +#endif /* !_INC_MATH */ Modified: trunk/reactos/include/crt/stdio.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/stdio.h?rev=38… ============================================================================== --- trunk/reactos/include/crt/stdio.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/stdio.h [iso-8859-1] Mon Dec 22 20:15:24 2008 @@ -91,17 +91,10 @@ #endif #ifndef _STDIO_DEFINED -#ifdef _WIN64 _CRTIMP FILE *__cdecl __iob_func(void); -#else -#ifdef _MSVCRT_ -extern FILE _iob[]; /* A pointer to an array of FILE */ -#define __iob_func() (_iob) -#else -extern FILE (*_imp___iob)[]; /* A pointer to an array of FILE */ -#define __iob_func() (*_imp___iob) + _CRTDATA(extern FILE _iob[];) +#ifdef _M_CEE_PURE #define _iob __iob_func() -#endif #endif #endif @@ -121,11 +114,10 @@ #ifndef _STDSTREAM_DEFINED #define _STDSTREAM_DEFINED - -#define stdin (&__iob_func()[0]) -#define stdout (&__iob_func()[1]) -#define stderr (&__iob_func()[2]) -#endif +#define stdin (&_iob[0]) +#define stdout (&_iob[1]) +#define stderr (&_iob[1]) +#endif /* !_STDSTREAM_DEFINED */ #define _IOREAD 0x0001 #define _IOWRT 0x0002 @@ -139,9 +131,6 @@ #define _IOERR 0x0020 #define _IOSTRG 0x0040 #define _IORW 0x0080 -#ifdef _POSIX_ -#define _IOAPPEND 0x0200 -#endif #define _TWO_DIGIT_EXPONENT 0x1 @@ -154,21 +143,21 @@ #else _CRTIMP FILE *__cdecl _fsopen(const char *_Filename,const char *_Mode,int _ShFlag); #endif - void __cdecl clearerr(FILE *_File); - int __cdecl fclose(FILE *_File); + _CRTIMP void __cdecl clearerr(FILE *_File); + _CRTIMP int __cdecl fclose(FILE *_File); _CRTIMP int __cdecl _fcloseall(void); #ifdef _POSIX_ FILE *__cdecl fdopen(int _FileHandle,const char *_Mode); #else _CRTIMP FILE *__cdecl _fdopen(int _FileHandle,const char *_Mode); #endif - int __cdecl feof(FILE *_File); - int __cdecl ferror(FILE *_File); - int __cdecl fflush(FILE *_File); - int __cdecl fgetc(FILE *_File); + _CRTIMP int __cdecl feof(FILE *_File); + _CRTIMP int __cdecl ferror(FILE *_File); + _CRTIMP int __cdecl fflush(FILE *_File); + _CRTIMP int __cdecl fgetc(FILE *_File); _CRTIMP int __cdecl _fgetchar(void); - int __cdecl fgetpos(FILE *_File ,fpos_t *_Pos); - char *__cdecl fgets(char *_Buf,int _MaxCount,FILE *_File); + _CRTIMP int __cdecl fgetpos(FILE *_File ,fpos_t *_Pos); + _CRTIMP char *__cdecl fgets(char *_Buf,int _MaxCount,FILE *_File); #ifdef _POSIX_ int __cdecl fileno(FILE *_File); #else @@ -176,68 +165,61 @@ #endif _CRTIMP char *__cdecl _tempnam(const char *_DirName,const char *_FilePrefix); _CRTIMP int __cdecl _flushall(void); - FILE *__cdecl fopen(const char *_Filename,const char *_Mode); - FILE *fopen64(const char *filename,const char *mode); - int __cdecl fprintf(FILE *_File,const char *_Format,...); - int __cdecl fputc(int _Ch,FILE *_File); + _CRTIMP FILE *__cdecl fopen(const char *_Filename,const char *_Mode); + _CRTIMP int __cdecl fprintf(FILE *_File,const char *_Format,...); + _CRTIMP int __cdecl fputc(int _Ch,FILE *_File); _CRTIMP int __cdecl _fputchar(int _Ch); - int __cdecl fputs(const char *_Str,FILE *_File); - size_t __cdecl fread(void *_DstBuf,size_t _ElementSize,size_t _Count,FILE *_File); - FILE *__cdecl freopen(const char *_Filename,const char *_Mode,FILE *_File); - int __cdecl fscanf(FILE *_File,const char *_Format,...); - int __cdecl fsetpos(FILE *_File,const fpos_t *_Pos); - int __cdecl fseek(FILE *_File,long _Offset,int _Origin); - int fseeko64(FILE* stream, _off64_t offset, int whence); - long __cdecl ftell(FILE *_File); - _off64_t ftello64(FILE * stream); - int __cdecl _fseeki64(FILE *_File,__int64 _Offset,int _Origin); - __int64 __cdecl _ftelli64(FILE *_File); - size_t __cdecl fwrite(const void *_Str,size_t _Size,size_t _Count,FILE *_File); - int __cdecl getc(FILE *_File); - int __cdecl getchar(void); + _CRTIMP int __cdecl fputs(const char *_Str,FILE *_File); + _CRTIMP size_t __cdecl fread(void *_DstBuf,size_t _ElementSize,size_t _Count,FILE *_File); + _CRTIMP _CRT_INSECURE_DEPRECATE(freopen_s) FILE *__cdecl freopen(const char *_Filename,const char *_Mode,FILE *_File); + _CRTIMP _CRT_INSECURE_DEPRECATE(fscanf_s) int __cdecl fscanf(FILE *_File,const char *_Format,...); + _CRTIMP int __cdecl fsetpos(FILE *_File,const fpos_t *_Pos); + _CRTIMP int __cdecl fseek(FILE *_File,long _Offset,int _Origin); + _CRTIMP long __cdecl ftell(FILE *_File); + _CRTIMP int __cdecl _fseeki64(FILE *_File,__int64 _Offset,int _Origin); + _CRTIMP __int64 __cdecl _ftelli64(FILE *_File); + _CRTIMP size_t __cdecl fwrite(const void *_Str,size_t _Size,size_t _Count,FILE *_File); + _CRTIMP int __cdecl getc(FILE *_File); + _CRTIMP int __cdecl getchar(void); _CRTIMP int __cdecl _getmaxstdio(void); - char *__cdecl gets(char *_Buffer); - int __cdecl _getw(FILE *_File); + _CRTIMP char *__cdecl gets(char *_Buffer); // FIXME: non-standard + _CRTIMP int __cdecl _getw(FILE *_File); #ifndef _CRT_PERROR_DEFINED #define _CRT_PERROR_DEFINED - void __cdecl perror(const char *_ErrMsg); + _CRTIMP void __cdecl perror(const char *_ErrMsg); #endif _CRTIMP int __cdecl _pclose(FILE *_File); _CRTIMP FILE *__cdecl _popen(const char *_Command,const char *_Mode); -#if !defined(NO_OLDNAMES) && !defined(popen) -#define popen _popen -#define pclose _pclose -#endif - int __cdecl printf(const char *_Format,...); - int __cdecl putc(int _Ch,FILE *_File); - int __cdecl putchar(int _Ch); - int __cdecl puts(const char *_Str); + _CRTIMP int __cdecl printf(const char *_Format,...); + _CRTIMP int __cdecl putc(int _Ch,FILE *_File); + _CRTIMP int __cdecl putchar(int _Ch); + _CRTIMP int __cdecl puts(const char *_Str); _CRTIMP int __cdecl _putw(int _Word,FILE *_File); #ifndef _CRT_DIRECTORY_DEFINED #define _CRT_DIRECTORY_DEFINED - int __cdecl remove(const char *_Filename); - int __cdecl rename(const char *_OldFilename,const char *_NewFilename); + _CRTIMP int __cdecl remove(const char *_Filename); + _CRTIMP int __cdecl rename(const char *_OldFilename,const char *_NewFilename); _CRTIMP int __cdecl _unlink(const char *_Filename); -#ifndef NO_OLDNAMES - int __cdecl unlink(const char *_Filename); -#endif -#endif - void __cdecl rewind(FILE *_File); +#ifndef NO_OLDNAMES + _CRTIMP _CRT_NONSTDC_DEPRECATE(_unlink) int __cdecl unlink(const char *_Filename); +#endif +#endif + _CRTIMP void __cdecl rewind(FILE *_File); _CRTIMP int __cdecl _rmtmp(void); - int __cdecl scanf(const char *_Format,...); - void __cdecl setbuf(FILE *_File,char *_Buffer); + _CRTIMP _CRT_INSECURE_DEPRECATE_CORE(scanf_s) int __cdecl scanf(const char *_Format,...); + _CRTIMP _CRT_INSECURE_DEPRECATE(setvbuf) void __cdecl setbuf(FILE *_File,char *_Buffer); _CRTIMP int __cdecl _setmaxstdio(int _Max); _CRTIMP unsigned int __cdecl _set_output_format(unsigned int _Format); _CRTIMP unsigned int __cdecl _get_output_format(void); - int __cdecl setvbuf(FILE *_File,char *_Buf,int _Mode,size_t _Size); + _CRTIMP int __cdecl setvbuf(FILE *_File,char *_Buf,int _Mode,size_t _Size); _CRTIMP int __cdecl _scprintf(const char *_Format,...); - int __cdecl sscanf(const char *_Src,const char *_Format,...); - _CRTIMP int __cdecl _snscanf(const char *_Src,size_t _MaxCount,const char *_Format,...); - FILE *__cdecl tmpfile(void); - char *__cdecl tmpnam(char *_Buffer); - int __cdecl ungetc(int _Ch,FILE *_File); - int __cdecl vfprintf(FILE *_File,const char *_Format,va_list _ArgList); - int __cdecl vprintf(const char *_Format,va_list _ArgList); + _CRTIMP _CRT_INSECURE_DEPRECATE_CORE(sscanf_s) int __cdecl sscanf(const char *_Src,const char *_Format,...); + _CRTIMP _CRT_INSECURE_DEPRECATE_CORE(_snscanf_s) int __cdecl _snscanf(const char *_Src,size_t _MaxCount,const char *_Format,...); + _CRTIMP _CRT_INSECURE_DEPRECATE(tmpfile_s) FILE *__cdecl tmpfile(void); + _CRTIMP char *__cdecl tmpnam(char *_Buffer); + _CRTIMP_ALT int __cdecl ungetc(int _Ch,FILE *_File); + _CRTIMP int __cdecl vfprintf(FILE *_File,const char *_Format,va_list _ArgList); + _CRTIMP int __cdecl vprintf(const char *_Format,va_list _ArgList); /* Make sure macros are not defined. */ #if __MINGW_GNUC_PREREQ(4,4) #pragma push_macro("vsnprintf") @@ -245,27 +227,13 @@ #endif #undef vsnprintf #undef snprintf - - extern -#ifdef gnu_printf - __attribute__((format(gnu_printf, 3, 0))) __attribute__((nonnull (3))) -#endif - int __mingw_vsnprintf(char *_DstBuf,size_t _MaxCount,const char *_Format,va_list _ArgList); - extern -#ifdef gnu_printf - __attribute__((format(gnu_printf, 3, 4))) __attribute__((nonnull (3))) -#endif - int __mingw_snprintf(char* s, size_t n, const char* format, ...); - int __cdecl vsnprintf(char *_DstBuf,size_t _MaxCount,const char *_Format,va_list _ArgList); + _CRTIMP _CRT_INSECURE_DEPRECATE(vsnprintf_s) int __cdecl vsnprintf(char *_DstBuf,size_t _MaxCount,const char *_Format,va_list _ArgList); _CRTIMP int __cdecl _snprintf(char *_Dest,size_t _Count,const char *_Format,...); _CRTIMP int __cdecl _vsnprintf(char *_Dest,size_t _Count,const char *_Format,va_list _Args); int __cdecl sprintf(char *_Dest,const char *_Format,...); int __cdecl vsprintf(char *_Dest,const char *_Format,va_list _Args); #ifndef __NO_ISOCEXT /* externs in libmingwex.a */ int __cdecl snprintf(char* s, size_t n, const char* format, ...); - __CRT_INLINE int __cdecl vsnprintf (char* s, size_t n, const char* format,va_list arg) { - return _vsnprintf ( s, n, format, arg); - } int __cdecl vscanf(const char * __restrict__ Format, va_list argp); int __cdecl vfscanf (FILE * __restrict__ fp, const char * Format,va_list argp); int __cdecl vsscanf (const char * __restrict__ _Str,const char * __restrict__ Format,va_list argp); @@ -275,26 +243,22 @@ #pragma pop_macro("snprintf") #pragma pop_macro("vsnprintf") #endif -/* Check if vsnprintf and snprintf are defaulting to gnu-style. */ -#if defined(USE_MINGW_GNU_SNPRINTF) && USE_MINGW_GNU_SNPRINTF - #ifndef vsnprint - #define vsnprintf __mingw_vsnprintf - #endif - #ifndef snprintf - #define snprintf __mingw_snprintf - #endif -#else - #ifndef vsnprint - #define vsnprintf _vsnprintf - #endif - #ifndef snprintf - #define snprintf _snprintf - #endif + +#ifndef vsnprintf + #define vsnprintf _vsnprintf +#endif +#ifndef snprintf + #define snprintf _snprintf #endif _CRTIMP int __cdecl _vscprintf(const char *_Format,va_list _ArgList); +#ifdef _SAFECRT_IMPL +#define _set_printf_count_output(i) +#define _get_printf_count_output() (FALSE) +#else _CRTIMP int __cdecl _set_printf_count_output(int _Value); _CRTIMP int __cdecl _get_printf_count_output(void); +#endif #ifndef _WSTDIO_DEFINED @@ -307,24 +271,24 @@ #else _CRTIMP FILE *__cdecl _wfsopen(const wchar_t *_Filename,const wchar_t *_Mode,int _ShFlag); #endif - wint_t __cdecl fgetwc(FILE *_File); + _CRTIMP wint_t __cdecl fgetwc(FILE *_File); _CRTIMP wint_t __cdecl _fgetwchar(void); - wint_t __cdecl fputwc(wchar_t _Ch,FILE *_File); + _CRTIMP wint_t __cdecl fputwc(wchar_t _Ch,FILE *_File); _CRTIMP wint_t __cdecl _fputwchar(wchar_t _Ch); - wint_t __cdecl getwc(FILE *_File); - wint_t __cdecl getwchar(void); - wint_t __cdecl putwc(wchar_t _Ch,FILE *_File); - wint_t __cdecl putwchar(wchar_t _Ch); - wint_t __cdecl ungetwc(wint_t _Ch,FILE *_File); - wchar_t *__cdecl fgetws(wchar_t *_Dst,int _SizeInWords,FILE *_File); - int __cdecl fputws(const wchar_t *_Str,FILE *_File); + _CRTIMP wint_t __cdecl getwc(FILE *_File); + _CRTIMP wint_t __cdecl getwchar(void); + _CRTIMP wint_t __cdecl putwc(wchar_t _Ch,FILE *_File); + _CRTIMP wint_t __cdecl putwchar(wchar_t _Ch); + _CRTIMP wint_t __cdecl ungetwc(wint_t _Ch,FILE *_File); + _CRTIMP wchar_t *__cdecl fgetws(wchar_t *_Dst,int _SizeInWords,FILE *_File); + _CRTIMP int __cdecl fputws(const wchar_t *_Str,FILE *_File); _CRTIMP wchar_t *__cdecl _getws(wchar_t *_String); _CRTIMP int __cdecl _putws(const wchar_t *_Str); - int __cdecl fwprintf(FILE *_File,const wchar_t *_Format,...); - int __cdecl wprintf(const wchar_t *_Format,...); + _CRTIMP int __cdecl fwprintf(FILE *_File,const wchar_t *_Format,...); + _CRTIMP int __cdecl wprintf(const wchar_t *_Format,...); _CRTIMP int __cdecl _scwprintf(const wchar_t *_Format,...); - int __cdecl vfwprintf(FILE *_File,const wchar_t *_Format,va_list _ArgList); - int __cdecl vwprintf(const wchar_t *_Format,va_list _ArgList); + _CRTIMP int __cdecl vfwprintf(FILE *_File,const wchar_t *_Format,va_list _ArgList); + _CRTIMP int __cdecl vwprintf(const wchar_t *_Format,va_list _ArgList); _CRTIMP int __cdecl swprintf(wchar_t*, const wchar_t*, ...); _CRTIMP int __cdecl vswprintf(wchar_t*, const wchar_t*,va_list); _CRTIMP int __cdecl _swprintf_c(wchar_t *_DstBuf,size_t _SizeInWords,const wchar_t *_Format,...); @@ -334,9 +298,9 @@ #ifndef __NO_ISOCEXT /* externs in libmingwex.a */ _CRTIMP int __cdecl snwprintf (wchar_t* s, size_t n, const wchar_t* format, ...); __CRT_INLINE int __cdecl vsnwprintf (wchar_t* s, size_t n, const wchar_t* format, va_list arg) { return _vsnwprintf(s,n,format,arg); } - int __cdecl vwscanf (const wchar_t *, va_list); - int __cdecl vfwscanf (FILE *,const wchar_t *,va_list); - int __cdecl vswscanf (const wchar_t *,const wchar_t *,va_list); + _CRTIMP int __cdecl vwscanf (const wchar_t *, va_list); + _CRTIMP int __cdecl vfwscanf (FILE *,const wchar_t *,va_list); + _CRTIMP int __cdecl vswscanf (const wchar_t *,const wchar_t *,va_list); #endif _CRTIMP int __cdecl _swprintf(wchar_t *_Dest,const wchar_t *_Format,...); _CRTIMP int __cdecl _vswprintf(wchar_t *_Dest,const wchar_t *_Format,va_list _Args); @@ -345,21 +309,21 @@ #include <vadefs.h> #endif -//#ifdef _CRT_NON_CONFORMING_SWPRINTFS -//#ifndef __cplusplus -//#define swprintf _swprintf -//#define vswprintf _vswprintf -//#define _swprintf_l __swprintf_l -//#define _vswprintf_l __vswprintf_l -//#endif -//#endif +#ifdef _CRT_NON_CONFORMING_SWPRINTFS +#ifndef __cplusplus +#define swprintf _swprintf +#define vswprintf _vswprintf +#define _swprintf_l __swprintf_l +#define _vswprintf_l __vswprintf_l +#endif +#endif _CRTIMP wchar_t *__cdecl _wtempnam(const wchar_t *_Directory,const wchar_t *_FilePrefix); _CRTIMP int __cdecl _vscwprintf(const wchar_t *_Format,va_list _ArgList); - int __cdecl fwscanf(FILE *_File,const wchar_t *_Format,...); - int __cdecl swscanf(const wchar_t *_Src,const wchar_t *_Format,...); + _CRTIMP int __cdecl fwscanf(FILE *_File,const wchar_t *_Format,...); + _CRTIMP int __cdecl swscanf(const wchar_t *_Src,const wchar_t *_Format,...); _CRTIMP int __cdecl _snwscanf(const wchar_t *_Src,size_t _MaxCount,const wchar_t *_Format,...); - int __cdecl wscanf(const wchar_t *_Format,...); + _CRTIMP int __cdecl wscanf(const wchar_t *_Format,...); _CRTIMP FILE *__cdecl _wfdopen(int _FileHandle ,const wchar_t *_Mode); _CRTIMP FILE *__cdecl _wfopen(const wchar_t *_Filename,const wchar_t *_Mode); _CRTIMP FILE *__cdecl _wfreopen(const wchar_t *_Filename,const wchar_t *_Mode,FILE *_OldFile); Modified: trunk/reactos/include/crt/string.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/string.h?rev=3… ============================================================================== --- trunk/reactos/include/crt/string.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/string.h [iso-8859-1] Mon Dec 22 20:15:24 2008 @@ -28,32 +28,32 @@ #ifndef _CRT_MEMORY_DEFINED #define _CRT_MEMORY_DEFINED _CRTIMP void *__cdecl _memccpy(void *_Dst,const void *_Src,int _Val,size_t _MaxCount); - _CONST_RETURN void *__cdecl memchr(const void *_Buf ,int _Val,size_t _MaxCount); + _CRTIMP _CONST_RETURN void *__cdecl memchr(const void *_Buf ,int _Val,size_t _MaxCount); _CRTIMP int __cdecl _memicmp(const void *_Buf1,const void *_Buf2,size_t _Size); _CRTIMP int __cdecl _memicmp_l(const void *_Buf1,const void *_Buf2,size_t _Size,_locale_t _Locale); int __cdecl memcmp(const void *_Buf1,const void *_Buf2,size_t _Size); - void *__cdecl memcpy(void *_Dst,const void *_Src,size_t _Size); + _CRT_INSECURE_DEPRECATE_MEMORY(memcpy_s) void *__cdecl memcpy(void *_Dst,const void *_Src,size_t _Size); void *__cdecl memset(void *_Dst,int _Val,size_t _Size); #ifndef NO_OLDNAMES - void *__cdecl memccpy(void *_Dst,const void *_Src,int _Val,size_t _Size); - int __cdecl memicmp(const void *_Buf1,const void *_Buf2,size_t _Size); + _CRTIMP _CRT_NONSTDC_DEPRECATE(_memccpy) void *__cdecl memccpy(void *_Dst,const void *_Src,int _Val,size_t _Size); + _CRTIMP _CRT_NONSTDC_DEPRECATE(_memicmp) int __cdecl memicmp(const void *_Buf1,const void *_Buf2,size_t _Size); #endif #endif + char *__cdecl _strset(char *_Str,int _Val); char *__cdecl strcpy(char *_Dest,const char *_Source); char *__cdecl strcat(char *_Dest,const char *_Source); int __cdecl strcmp(const char *_Str1,const char *_Str2); size_t __cdecl strlen(const char *_Str); -#if 0 - size_t __cdecl strnlen(const char *_Str,size_t _MaxCount); -#endif - void *__cdecl memmove(void *_Dst,const void *_Src,size_t _Size); + _CRTIMP size_t __cdecl strnlen(const char *_Str,size_t _MaxCount); + + _CRT_INSECURE_DEPRECATE_MEMORY(memmove_s) void *__cdecl memmove(void *_Dst,const void *_Src,size_t _Size); _CRTIMP char *__cdecl _strdup(const char *_Src); - _CONST_RETURN char *__cdecl strchr(const char *_Str,int _Val); + _CRTIMP _CONST_RETURN char *__cdecl strchr(const char *_Str,int _Val); _CRTIMP int __cdecl _stricmp(const char *_Str1,const char *_Str2); _CRTIMP int __cdecl _strcmpi(const char *_Str1,const char *_Str2); _CRTIMP int __cdecl _stricmp_l(const char *_Str1,const char *_Str2,_locale_t _Locale); - int __cdecl strcoll(const char *_Str1,const char *_Str2); + _CRTIMP int __cdecl strcoll(const char *_Str1,const char *_Str2); _CRTIMP int __cdecl _strcoll_l(const char *_Str1,const char *_Str2,_locale_t _Locale); _CRTIMP int __cdecl _stricoll(const char *_Str1,const char *_Str2); _CRTIMP int __cdecl _stricoll_l(const char *_Str1,const char *_Str2,_locale_t _Locale); @@ -61,9 +61,9 @@ _CRTIMP int __cdecl _strncoll_l(const char *_Str1,const char *_Str2,size_t _MaxCount,_locale_t _Locale); _CRTIMP int __cdecl _strnicoll (const char *_Str1,const char *_Str2,size_t _MaxCount); _CRTIMP int __cdecl _strnicoll_l(const char *_Str1,const char *_Str2,size_t _MaxCount,_locale_t _Locale); - size_t __cdecl strcspn(const char *_Str,const char *_Control); - _CRTIMP char *__cdecl _strerror(const char *_ErrMsg); - char *__cdecl strerror(int); + _CRTIMP size_t __cdecl strcspn(const char *_Str,const char *_Control); + _CRTIMP _CRT_INSECURE_DEPRECATE(_strerror_s) char *__cdecl _strerror(const char *_ErrMsg); + _CRTIMP _CRT_INSECURE_DEPRECATE(strerror_s) char *__cdecl strerror(int); _CRTIMP char *__cdecl _strlwr(char *_String); char *strlwr_l(char *_String,_locale_t _Locale); char *__cdecl strncat(char *_Dest,const char *_Source,size_t _Count); @@ -71,67 +71,67 @@ _CRTIMP int __cdecl _strnicmp(const char *_Str1,const char *_Str2,size_t _MaxCount); _CRTIMP int __cdecl _strnicmp_l(const char *_Str1,const char *_Str2,size_t _MaxCount,_locale_t _Locale); char *strncpy(char *_Dest,const char *_Source,size_t _Count); - _CRTIMP char *__cdecl _strnset(char *_Str,int _Val,size_t _MaxCount); - _CONST_RETURN char *__cdecl strpbrk(const char *_Str,const char *_Control); - _CONST_RETURN char *__cdecl strrchr(const char *_Str,int _Ch); + _CRTIMP _CRT_INSECURE_DEPRECATE_CORE(_strnset_s) char *__cdecl _strnset(char *_Str,int _Val,size_t _MaxCount); + _CRTIMP _CONST_RETURN char *__cdecl strpbrk(const char *_Str,const char *_Control); + _CRTIMP _CONST_RETURN char *__cdecl strrchr(const char *_Str,int _Ch); _CRTIMP char *__cdecl _strrev(char *_Str); - size_t __cdecl strspn(const char *_Str,const char *_Control); - _CONST_RETURN char *__cdecl strstr(const char *_Str,const char *_SubStr); - char *__cdecl strtok(char *_Str,const char *_Delim); + _CRTIMP size_t __cdecl strspn(const char *_Str,const char *_Control); + _CRTIMP _CONST_RETURN char *__cdecl strstr(const char *_Str,const char *_SubStr); + _CRTIMP _CRT_INSECURE_DEPRECATE_CORE(strtok_s) char *__cdecl strtok(char *_Str,const char *_Delim); _CRTIMP char *__cdecl _strupr(char *_String); _CRTIMP char *_strupr_l(char *_String,_locale_t _Locale); - size_t __cdecl strxfrm(char *_Dst,const char *_Src,size_t _MaxCount); + _CRTIMP size_t __cdecl strxfrm(char *_Dst,const char *_Src,size_t _MaxCount); _CRTIMP size_t __cdecl _strxfrm_l(char *_Dst,const char *_Src,size_t _MaxCount,_locale_t _Locale); #ifndef NO_OLDNAMES - char *__cdecl strdup(const char *_Src); - int __cdecl strcmpi(const char *_Str1,const char *_Str2); - int __cdecl stricmp(const char *_Str1,const char *_Str2); - char *__cdecl strlwr(char *_Str); - int __cdecl strnicmp(const char *_Str1,const char *_Str,size_t _MaxCount); - __CRT_INLINE int __cdecl strncasecmp (const char *__sz1, const char *__sz2, size_t __sizeMaxCompare) { return _strnicmp (__sz1, __sz2, __sizeMaxCompare); } - __CRT_INLINE int __cdecl strcasecmp (const char *__sz1, const char *__sz2) { return _stricmp (__sz1, __sz2); } - char *__cdecl strnset(char *_Str,int _Val,size_t _MaxCount); - char *__cdecl strrev(char *_Str); - char *__cdecl strset(char *_Str,int _Val); - char *__cdecl strupr(char *_Str); + _CRTIMP _CRT_NONSTDC_DEPRECATE(_strdup) char *__cdecl strdup(const char *_Src); + _CRTIMP _CRT_NONSTDC_DEPRECATE(_strcmpi) int __cdecl strcmpi(const char *_Str1,const char *_Str2); + _CRTIMP _CRT_NONSTDC_DEPRECATE(_stricmp) int __cdecl stricmp(const char *_Str1,const char *_Str2); + _CRTIMP _CRT_NONSTDC_DEPRECATE(_strlwr) char *__cdecl strlwr(char *_Str); + _CRTIMP _CRT_NONSTDC_DEPRECATE(_strnicmp) int __cdecl strnicmp(const char *_Str1,const char *_Str,size_t _MaxCount); +// __CRT_INLINE int __cdecl strncasecmp (const char *__sz1, const char *__sz2, size_t __sizeMaxCompare) { return _strnicmp (__sz1, __sz2, __sizeMaxCompare); } +// __CRT_INLINE int __cdecl strcasecmp (const char *__sz1, const char *__sz2) { return _stricmp (__sz1, __sz2); } + _CRTIMP _CRT_NONSTDC_DEPRECATE(_strnset) char *__cdecl strnset(char *_Str,int _Val,size_t _MaxCount); + _CRTIMP _CRT_NONSTDC_DEPRECATE(_strrev) char *__cdecl strrev(char *_Str); + _CRTIMP _CRT_NONSTDC_DEPRECATE(_strset) char *__cdecl strset(char *_Str,int _Val); + _CRTIMP _CRT_NONSTDC_DEPRECATE(_strupr) char *__cdecl strupr(char *_Str); #endif #ifndef _WSTRING_DEFINED #define _WSTRING_DEFINED _CRTIMP wchar_t *__cdecl _wcsdup(const wchar_t *_Str); - wchar_t *__cdecl wcscat(wchar_t *_Dest,const wchar_t *_Source); - _CONST_RETURN wchar_t *__cdecl wcschr(const wchar_t *_Str,wchar_t _Ch); - int __cdecl wcscmp(const wchar_t *_Str1,const wchar_t *_Str2); - wchar_t *__cdecl wcscpy(wchar_t *_Dest,const wchar_t *_Source); - size_t __cdecl wcscspn(const wchar_t *_Str,const wchar_t *_Control); - size_t __cdecl wcslen(const wchar_t *_Str); - size_t __cdecl wcsnlen(const wchar_t *_Src,size_t _MaxCount); - wchar_t *wcsncat(wchar_t *_Dest,const wchar_t *_Source,size_t _Count); - int __cdecl wcsncmp(const wchar_t *_Str1,const wchar_t *_Str2,size_t _MaxCount); - wchar_t *wcsncpy(wchar_t *_Dest,const wchar_t *_Source,size_t _Count); - _CONST_RETURN wchar_t *__cdecl wcspbrk(const wchar_t *_Str,const wchar_t *_Control); - _CONST_RETURN wchar_t *__cdecl wcsrchr(const wchar_t *_Str,wchar_t _Ch); - size_t __cdecl wcsspn(const wchar_t *_Str,const wchar_t *_Control); - _CONST_RETURN wchar_t *__cdecl wcsstr(const wchar_t *_Str,const wchar_t *_SubStr); - wchar_t *__cdecl wcstok(wchar_t *_Str,const wchar_t *_Delim); - _CRTIMP wchar_t *__cdecl _wcserror(int _ErrNum); - _CRTIMP wchar_t *__cdecl __wcserror(const wchar_t *_Str); + _CRTIMP wchar_t *__cdecl wcscat(wchar_t *_Dest,const wchar_t *_Source); + _CRTIMP _CONST_RETURN wchar_t *__cdecl wcschr(const wchar_t *_Str,wchar_t _Ch); + _CRTIMP int __cdecl wcscmp(const wchar_t *_Str1,const wchar_t *_Str2); + _CRTIMP wchar_t *__cdecl wcscpy(wchar_t *_Dest,const wchar_t *_Source); + _CRTIMP size_t __cdecl wcscspn(const wchar_t *_Str,const wchar_t *_Control); + _CRTIMP size_t __cdecl wcslen(const wchar_t *_Str); + _CRTIMP size_t __cdecl wcsnlen(const wchar_t *_Src,size_t _MaxCount); + _CRTIMP wchar_t *wcsncat(wchar_t *_Dest,const wchar_t *_Source,size_t _Count); + _CRTIMP int __cdecl wcsncmp(const wchar_t *_Str1,const wchar_t *_Str2,size_t _MaxCount); + _CRTIMP wchar_t *wcsncpy(wchar_t *_Dest,const wchar_t *_Source,size_t _Count); + _CRTIMP _CONST_RETURN wchar_t *__cdecl wcspbrk(const wchar_t *_Str,const wchar_t *_Control); + _CRTIMP _CONST_RETURN wchar_t *__cdecl wcsrchr(const wchar_t *_Str,wchar_t _Ch); + _CRTIMP size_t __cdecl wcsspn(const wchar_t *_Str,const wchar_t *_Control); + _CRTIMP _CONST_RETURN wchar_t *__cdecl wcsstr(const wchar_t *_Str,const wchar_t *_SubStr); + _CRTIMP _CRT_INSECURE_DEPRECATE_CORE(wcstok_s) wchar_t *__cdecl wcstok(wchar_t *_Str,const wchar_t *_Delim); + _CRTIMP _CRT_INSECURE_DEPRECATE(_wcserror_s) wchar_t *__cdecl _wcserror(int _ErrNum); + _CRTIMP _CRT_INSECURE_DEPRECATE(__wcserror_s) wchar_t *__cdecl __wcserror(const wchar_t *_Str); _CRTIMP int __cdecl _wcsicmp(const wchar_t *_Str1,const wchar_t *_Str2); _CRTIMP int __cdecl _wcsicmp_l(const wchar_t *_Str1,const wchar_t *_Str2,_locale_t _Locale); _CRTIMP int __cdecl _wcsnicmp(const wchar_t *_Str1,const wchar_t *_Str2,size_t _MaxCount); _CRTIMP int __cdecl _wcsnicmp_l(const wchar_t *_Str1,const wchar_t *_Str2,size_t _MaxCount,_locale_t _Locale); - _CRTIMP wchar_t *__cdecl _wcsnset(wchar_t *_Str,wchar_t _Val,size_t _MaxCount); + _CRTIMP _CRT_INSECURE_DEPRECATE_CORE(_wcsnset_s) wchar_t *__cdecl _wcsnset(wchar_t *_Str,wchar_t _Val,size_t _MaxCount); _CRTIMP wchar_t *__cdecl _wcsrev(wchar_t *_Str); - _CRTIMP wchar_t *__cdecl _wcsset(wchar_t *_Str,wchar_t _Val); + _CRTIMP _CRT_INSECURE_DEPRECATE_CORE(_wcsset_s) wchar_t *__cdecl _wcsset(wchar_t *_Str,wchar_t _Val); _CRTIMP wchar_t *__cdecl _wcslwr(wchar_t *_String); _CRTIMP wchar_t *_wcslwr_l(wchar_t *_String,_locale_t _Locale); _CRTIMP wchar_t *__cdecl _wcsupr(wchar_t *_String); _CRTIMP wchar_t *_wcsupr_l(wchar_t *_String,_locale_t _Locale); - size_t __cdecl wcsxfrm(wchar_t *_Dst,const wchar_t *_Src,size_t _MaxCount); + _CRTIMP size_t __cdecl wcsxfrm(wchar_t *_Dst,const wchar_t *_Src,size_t _MaxCount); _CRTIMP size_t __cdecl _wcsxfrm_l(wchar_t *_Dst,const wchar_t *_Src,size_t _MaxCount,_locale_t _Locale); - int __cdecl wcscoll(const wchar_t *_Str1,const wchar_t *_Str2); + _CRTIMP int __cdecl wcscoll(const wchar_t *_Str1,const wchar_t *_Str2); _CRTIMP int __cdecl _wcscoll_l(const wchar_t *_Str1,const wchar_t *_Str2,_locale_t _Locale); _CRTIMP int __cdecl _wcsicoll(const wchar_t *_Str1,const wchar_t *_Str2); _CRTIMP int __cdecl _wcsicoll_l(const wchar_t *_Str1,const wchar_t *_Str2,_locale_t _Locale); @@ -141,18 +141,19 @@ _CRTIMP int __cdecl _wcsnicoll_l(const wchar_t *_Str1,const wchar_t *_Str2,size_t _MaxCount,_locale_t _Locale); #ifndef NO_OLDNAMES - wchar_t *__cdecl wcsdup(const wchar_t *_Str); + _CRTIMP _CRT_NONSTDC_DEPRECATE(_wcsdup) wchar_t *__cdecl wcsdup(const wchar_t *_Str); #define wcswcs wcsstr - int __cdecl wcsicmp(const wchar_t *_Str1,const wchar_t *_Str2); - int __cdecl wcsnicmp(const wchar_t *_Str1,const wchar_t *_Str2,size_t _MaxCount); - wchar_t *__cdecl wcsnset(wchar_t *_Str,wchar_t _Val,size_t _MaxCount); - wchar_t *__cdecl wcsrev(wchar_t *_Str); - wchar_t *__cdecl wcsset(wchar_t *_Str,wchar_t _Val); - wchar_t *__cdecl wcslwr(wchar_t *_Str); - wchar_t *__cdecl wcsupr(wchar_t *_Str); - int __cdecl wcsicoll(const wchar_t *_Str1,const wchar_t *_Str2); + _CRTIMP _CRT_NONSTDC_DEPRECATE(_wcsicmp) int __cdecl wcsicmp(const wchar_t *_Str1,const wchar_t *_Str2); + _CRTIMP _CRT_NONSTDC_DEPRECATE(_wcsnicmp) int __cdecl wcsnicmp(const wchar_t *_Str1,const wchar_t *_Str2,size_t _MaxCount); + _CRTIMP _CRT_NONSTDC_DEPRECATE(_wcsnset) wchar_t *__cdecl wcsnset(wchar_t *_Str,wchar_t _Val,size_t _MaxCount); + _CRTIMP _CRT_NONSTDC_DEPRECATE(_wcsrev) wchar_t *__cdecl wcsrev(wchar_t *_Str); + _CRTIMP _CRT_NONSTDC_DEPRECATE(_wcsset) wchar_t *__cdecl wcsset(wchar_t *_Str,wchar_t _Val); + _CRTIMP _CRT_NONSTDC_DEPRECATE(_wcslwr) wchar_t *__cdecl wcslwr(wchar_t *_Str); + _CRTIMP _CRT_NONSTDC_DEPRECATE(_wcsupr) wchar_t *__cdecl wcsupr(wchar_t *_Str); + _CRTIMP _CRT_NONSTDC_DEPRECATE(_wcsicoll) int __cdecl wcsicoll(const wchar_t *_Str1,const wchar_t *_Str2); #endif -#endif + +#endif /* !_WSTRING_DEFINED */ #ifdef __cplusplus } Modified: trunk/reactos/include/crt/sys/stat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/sys/stat.h?rev… ============================================================================== --- trunk/reactos/include/crt/sys/stat.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/sys/stat.h [iso-8859-1] Mon Dec 22 20:15:24 2008 @@ -11,7 +11,6 @@ #endif #include <crtdefs.h> -#include <io.h> #pragma pack(push,_CRT_PACKING) @@ -22,6 +21,7 @@ #include <sys/types.h> #ifndef _STAT_DEFINED +#define _STAT_DEFINED struct _stat32 { _dev_t st_dev; @@ -67,8 +67,7 @@ }; #endif -/* #if _INTEGRAL_MAX_BITS >= 64 */ - +#if _INTEGRAL_MAX_BITS >= 64 struct _stat32i64 { _dev_t st_dev; _ino_t st_ino; @@ -125,11 +124,10 @@ time_t st_ctime; }; -/* #endif */ +#endif /* _INTEGRAL_MAX_BITS >= 64 */ #define __stat64 _stat64 -#define _STAT_DEFINED #endif /* !_STAT_DEFINED */ #define _S_IFMT 0xF000 @@ -149,58 +147,71 @@ #if _INTEGRAL_MAX_BITS >= 64 _CRTIMP int __cdecl _fstat64(int _FileDes,struct _stat64 *_Stat); _CRTIMP int __cdecl _fstat32i64(int _FileDes,struct _stat32i64 *_Stat); - int __cdecl _fstat64i32(int _FileDes,struct _stat64i32 *_Stat); - __CRT_INLINE int __cdecl _fstat64i32(int _FileDes,struct _stat64i32 *_Stat) - { - struct _stat64 st; - int ret=_fstat64(_FileDes,&st); - _Stat->st_dev=st.st_dev; - _Stat->st_ino=st.st_ino; - _Stat->st_mode=st.st_mode; - _Stat->st_nlink=st.st_nlink; - _Stat->st_uid=st.st_uid; - _Stat->st_gid=st.st_gid; - _Stat->st_rdev=st.st_rdev; - _Stat->st_size=(_off_t) st.st_size; - _Stat->st_atime=st.st_atime; - _Stat->st_mtime=st.st_mtime; - _Stat->st_ctime=st.st_ctime; - return ret; - } - + _CRTIMP int __cdecl _fstat64i32(int _FileDes,struct _stat64i32 *_Stat); _CRTIMP int __cdecl _stat64(const char *_Name,struct _stat64 *_Stat); _CRTIMP int __cdecl _stat32i64(const char *_Name,struct _stat32i64 *_Stat); - int __cdecl _stat64i32(const char *_Name,struct _stat64i32 *_Stat); - __CRT_INLINE int __cdecl _stat64i32(const char *_Name,struct _stat64i32 *_Stat) - { - struct _stat64 st; - int ret=_stat64(_Name,&st); - _Stat->st_dev=st.st_dev; - _Stat->st_ino=st.st_ino; - _Stat->st_mode=st.st_mode; - _Stat->st_nlink=st.st_nlink; - _Stat->st_uid=st.st_uid; - _Stat->st_gid=st.st_gid; - _Stat->st_rdev=st.st_rdev; - _Stat->st_size=(_off_t) st.st_size; - _Stat->st_atime=st.st_atime; - _Stat->st_mtime=st.st_mtime; - _Stat->st_ctime=st.st_ctime; - return ret; - } -#endif + _CRTIMP int __cdecl _stat64i32(const char *_Name,struct _stat64i32 *_Stat); +#endif /* _INTEGRAL_MAX_BITS >= 64 */ #ifndef _WSTAT_DEFINED #define _WSTAT_DEFINED _CRTIMP int __cdecl _wstat(const wchar_t *_Name,struct _stat *_Stat); _CRTIMP int __cdecl _wstat32(const wchar_t *_Name,struct _stat32 *_Stat); - _CRTIMP int __cdecl _wstati64(const wchar_t *_Name,struct _stati64 *_Stat); #if _INTEGRAL_MAX_BITS >= 64 _CRTIMP int __cdecl _wstat32i64(const wchar_t *_Name,struct _stat32i64 *_Stat); _CRTIMP int __cdecl _wstat64i32(const wchar_t *_Name,struct _stat64i32 *_Stat); _CRTIMP int __cdecl _wstat64(const wchar_t *_Name,struct _stat64 *_Stat); #endif #endif + + +/** Compatibility definitons *************************************************/ + +#if !defined(RC_INVOKED) + +#ifdef _USE_32BIT_TIME_T + #define _fstat32 _fstat + #define _fstat32i64 _fstati64 + #define _fstat64i32 _fstat64 +#else + #define _fstat64i32 _fstat + __CRT_INLINE int __cdecl _fstat32(int _FileDes, struct _stat32 *_Stat) + { + struct _stat _Stat64; + int ret = _fstat(_FileDes, &_Stat64); + _Stat->st_dev = _Stat64.st_dev; + _Stat->st_ino = _Stat64.st_ino; + _Stat->st_mode = _Stat64.st_mode; + _Stat->st_nlink = _Stat64.st_nlink; + _Stat->st_uid = _Stat64.st_uid; + _Stat->st_gid = _Stat64.st_gid; + _Stat->st_rdev = _Stat64.st_rdev; + _Stat->st_size = _Stat64.st_size; + _Stat->st_atime = _Stat64.st_atime; + _Stat->st_mtime = _Stat64.st_mtime; + _Stat->st_ctime = _Stat64.st_ctime; + return ret; + } + __CRT_INLINE int __cdecl _fstat32i64(int _FileDes, struct _stat32i64 *_Stat) + { + struct _stat64 _Stat64; + int ret = _fstat64(_FileDes, &_Stat64); + _Stat->st_dev = _Stat64.st_dev; + _Stat->st_ino = _Stat64.st_ino; + _Stat->st_mode = _Stat64.st_mode; + _Stat->st_nlink = _Stat64.st_nlink; + _Stat->st_uid = _Stat64.st_uid; + _Stat->st_gid = _Stat64.st_gid; + _Stat->st_rdev = _Stat64.st_rdev; + _Stat->st_size = _Stat64.st_size; + _Stat->st_atime = _Stat64.st_atime; + _Stat->st_mtime = _Stat64.st_mtime; + _Stat->st_ctime = _Stat64.st_ctime; + return ret; + } +#endif /* _USE_32BIT_TIME_T */ + +#endif /* !defined(RC_INVOKED) */ #ifndef NO_OLDNAMES #define _S_IFBLK 0x3000 /* Block: Is this ever set under w32? */ @@ -231,13 +242,10 @@ #define S_ISBLK(m) (((m) & S_IFMT) == S_IFBLK) #define S_ISREG(m) (((m) & S_IFMT) == S_IFREG) -#endif - -#if !defined (RC_INVOKED) && !defined (NO_OLDNAMES) -int __cdecl stat(const char *_Filename,struct stat *_Stat); -int __cdecl fstat(int _Desc,struct stat *_Stat); -int __cdecl wstat(const wchar_t *_Filename,struct stat *_Stat); - +#if !defined (RC_INVOKED) + _CRTIMP int __cdecl stat(const char *_Filename,struct stat *_Stat); + _CRTIMP int __cdecl fstat(int _Desc,struct stat *_Stat); + _CRTIMP int __cdecl wstat(const wchar_t *_Filename,struct stat *_Stat); __CRT_INLINE int __cdecl fstat(int _Desc,struct stat *_Stat) { return _fstat(_Desc,(struct _stat *)_Stat); } @@ -252,6 +260,9 @@ #endif +#endif /* !NO_OLDNAMES */ + + #ifdef __cplusplus } #endif Modified: trunk/reactos/include/crt/sys/timeb.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/sys/timeb.h?re… ============================================================================== --- trunk/reactos/include/crt/sys/timeb.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/sys/timeb.h [iso-8859-1] Mon Dec 22 20:15:24 2008 @@ -20,6 +20,13 @@ #ifndef _TIMEB_DEFINED #define _TIMEB_DEFINED + + struct _timeb { + time_t time; + unsigned short millitm; + short timezone; + short dstflag; + }; struct __timeb32 { __time32_t time; @@ -46,41 +53,20 @@ }; #endif -#ifdef _USE_32BIT_TIME_T -#define _timeb __timeb32 -#define _ftime _ftime32 -#else -#define _timeb __timeb64 -#define _ftime _ftime64 -#endif +#endif /* !_TIMEB_DEFINED */ + + _CRTIMP void __cdecl _ftime(struct _timeb *_Time); + _CRT_INSECURE_DEPRECATE(_ftime32_s) _CRTIMP void __cdecl _ftime32(struct __timeb32 *_Time); + _CRTIMP errno_t __cdecl _ftime32_s(struct __timeb32 *_Time); +#if _INTEGRAL_MAX_BITS >= 64 + _CRT_INSECURE_DEPRECATE(_ftime64_s) _CRTIMP void __cdecl _ftime64(struct __timeb64 *_Time); + _CRTIMP errno_t __cdecl _ftime64_s(struct __timeb64 *_Time); #endif - _CRTIMP void __cdecl _ftime32(struct __timeb32 *_Time); -#if _INTEGRAL_MAX_BITS >= 64 - _CRTIMP void __cdecl _ftime64(struct __timeb64 *_Time); -#endif - -#ifndef TIMESPEC_DEFINED -#define TIMESPEC_DEFINED -struct timespec { - time_t tv_sec; /* Seconds */ - long tv_nsec; /* Nanoseconds */ -}; - -struct itimerspec { - struct timespec it_interval; /* Timer period */ - struct timespec it_value; /* Timer expiration */ -}; -#endif - -#if !defined (RC_INVOKED) && !defined (NO_OLDNAMES) -#ifdef _USE_32BIT_TIME_T +#ifndef NO_OLDNAMES +#if !defined (RC_INVOKED) __CRT_INLINE void __cdecl ftime(struct timeb *_Tmb) { - _ftime32((struct __timeb32 *)_Tmb); -} -#else -__CRT_INLINE void __cdecl ftime(struct timeb *_Tmb) { - _ftime64((struct __timeb64 *)_Tmb); + _ftime((struct _timeb *)_Tmb); } #endif #endif @@ -92,4 +78,5 @@ #pragma pack(pop) #include <sec_api/sys/timeb_s.h> -#endif + +#endif /* !_INC_TIMEB */ Modified: trunk/reactos/include/crt/sys/utime.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/sys/utime.h?re… ============================================================================== --- trunk/reactos/include/crt/sys/utime.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/sys/utime.h [iso-8859-1] Mon Dec 22 20:15:24 2008 @@ -49,13 +49,13 @@ __time32_t modtime; }; #endif -#endif +#endif /* !_UTIMBUF_DEFINED */ - _CRTIMP int __cdecl _utime(const char *_Filename,struct _utimbuf *_Utimbuf); + _CRTIMP int __cdecl _utime(const char *_Filename,struct _utimbuf *_Time); _CRTIMP int __cdecl _utime32(const char *_Filename,struct __utimbuf32 *_Time); - _CRTIMP int __cdecl _futime(int _Desc,struct _utimbuf *_Utimbuf); + _CRTIMP int __cdecl _futime(int _FileDes,struct _utimbuf *_Time); _CRTIMP int __cdecl _futime32(int _FileDes,struct __utimbuf32 *_Time); - _CRTIMP int __cdecl _wutime(const wchar_t *_Filename,struct _utimbuf *_Utimbuf); + _CRTIMP int __cdecl _wutime(const wchar_t *_Filename,struct _utimbuf *_Time); _CRTIMP int __cdecl _wutime32(const wchar_t *_Filename,struct __utimbuf32 *_Time); #if _INTEGRAL_MAX_BITS >= 64 _CRTIMP int __cdecl _utime64(const char *_Filename,struct __utimbuf64 *_Time); @@ -63,37 +63,24 @@ _CRTIMP int __cdecl _wutime64(const wchar_t *_Filename,struct __utimbuf64 *_Time); #endif -// Do it like this to keep compatibility to MSVC while using msvcrt.dll #ifndef RC_INVOKED - #ifdef _USE_32BIT_TIME_T - __CRT_INLINE int __cdecl _utime32(const char *_Filename,struct __utimbuf32 *_Utimbuf) { - return _utime(_Filename,(struct _utimbuf *)_Utimbuf); - } - __CRT_INLINE int __cdecl _futime32(int _Desc,struct __utimbuf32 *_Utimbuf) { - return _futime(_Desc,(struct _utimbuf *)_Utimbuf); - } - __CRT_INLINE int __cdecl _wutime32(const wchar_t *_Filename,struct __utimbuf32 *_Utimbuf) { - return _wutime(_Filename,(struct _utimbuf *)_Utimbuf); - } - #else // !_USE_32BIT_TIME_T - #ifndef _WIN64 - __CRT_INLINE int __cdecl _utime(const char *_Filename,struct _utimbuf *_Utimbuf) { - return _utime64(_Filename,(struct __utimbuf64 *)_Utimbuf); - } - __CRT_INLINE int __cdecl _futime(int _Desc,struct _utimbuf *_Utimbuf) { - return _futime64(_Desc,(struct __utimbuf64 *)_Utimbuf); - } - __CRT_INLINE int __cdecl _wutime(const wchar_t *_Filename,struct _utimbuf *_Utimbuf) { - return _wutime64(_Filename,(struct __utimbuf64 *)_Utimbuf); - } - #endif - #endif // _USE_32BIT_TIME_T -#endif // RC_INVOKED +#ifdef _USE_32BIT_TIME_T +__CRT_INLINE int __cdecl _utime32(const char *_Filename,struct __utimbuf32 *_Utimbuf) { + return _utime(_Filename,(struct _utimbuf *)_Utimbuf); +} +__CRT_INLINE int __cdecl _futime32(int _Desc,struct __utimbuf32 *_Utimbuf) { + return _futime(_Desc,(struct _utimbuf *)_Utimbuf); +} +__CRT_INLINE int __cdecl _wutime32(const wchar_t *_Filename,struct __utimbuf32 *_Utimbuf) { + return _wutime(_Filename,(struct _utimbuf *)_Utimbuf); +} +#endif #ifndef NO_OLDNAMES __CRT_INLINE int __cdecl utime(const char *_Filename,struct utimbuf *_Utimbuf) { return _utime(_Filename,(struct _utimbuf *)_Utimbuf); } +#endif #endif #ifdef __cplusplus Modified: trunk/reactos/include/crt/time.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/time.h?rev=382… ============================================================================== --- trunk/reactos/include/crt/time.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/time.h [iso-8859-1] Mon Dec 22 20:15:24 2008 @@ -69,17 +69,6 @@ #define NULL ((void *)0) #endif #endif - -/* -#ifdef _USE_32BIT_TIME_T -#define _localtime32 localtime -#define _difftime32 difftime -#define _ctime32 ctime -#define _gmtime32 gmtime -#define _mktime32 mktime -#define _time32 time -#endif -*/ #ifndef _TM_DEFINED #define _TM_DEFINED @@ -107,70 +96,88 @@ _CRTIMP errno_t __cdecl _get_dstbias(long *_Daylight_savings_bias); _CRTIMP errno_t __cdecl _get_timezone(long *_Timezone); _CRTIMP errno_t __cdecl _get_tzname(size_t *_ReturnValue,char *_Buffer,size_t _SizeInBytes,int _Index); - char *__cdecl asctime(const struct tm *_Tm); - _CRTIMP char *__cdecl _ctime32(const __time32_t *_Time); - clock_t __cdecl clock(void); + + _CRTIMP _CRT_INSECURE_DEPRECATE(asctime_s) char *__cdecl asctime(const struct tm *_Tm); + _CRTIMP _CRT_INSECURE_DEPRECATE(_ctime32_s) char *__cdecl _ctime32(const __time32_t *_Time); + _CRTIMP clock_t __cdecl clock(void); _CRTIMP double __cdecl _difftime32(__time32_t _Time1,__time32_t _Time2); - _CRTIMP struct tm *__cdecl _gmtime32(const __time32_t *_Time); - _CRTIMP struct tm *__cdecl _localtime32(const __time32_t *_Time); - size_t __cdecl strftime(char *_Buf,size_t _SizeInBytes,const char *_Format,const struct tm *_Tm); + _CRTIMP _CRT_INSECURE_DEPRECATE(_gmtime32_s) struct tm *__cdecl _gmtime32(const __time32_t *_Time); + _CRTIMP _CRT_INSECURE_DEPRECATE(_localtime32_s) struct tm *__cdecl _localtime32(const __time32_t *_Time); + _CRTIMP size_t __cdecl strftime(char *_Buf,size_t _SizeInBytes,const char *_Format,const struct tm *_Tm); _CRTIMP size_t __cdecl _strftime_l(char *_Buf,size_t _Max_size,const char *_Format,const struct tm *_Tm,_locale_t _Locale); _CRTIMP char *__cdecl _strdate(char *_Buffer); _CRTIMP char *__cdecl _strtime(char *_Buffer); _CRTIMP __time32_t __cdecl _time32(__time32_t *_Time); _CRTIMP __time32_t __cdecl _mktime32(struct tm *_Tm); _CRTIMP __time32_t __cdecl _mkgmtime32(struct tm *_Tm); -#if defined (_POSIX_) || defined(__GNUC__) - void __cdecl tzset(void); -#endif _CRTIMP void __cdecl _tzset(void); + _CRT_OBSOLETE(GetLocalTime) unsigned __cdecl _getsystime(struct tm *_Tm); + _CRT_OBSOLETE(GetLocalTime) unsigned __cdecl _setsystime(struct tm *_Tm,unsigned _MilliSec); + + _CRTIMP errno_t __cdecl _ctime32_s(char *_Buf,size_t _SizeInBytes,const __time32_t *_Time); + _CRTIMP errno_t __cdecl _gmtime32_s(struct tm *_Tm,const __time32_t *_Time); + _CRTIMP errno_t __cdecl _localtime32_s(struct tm *_Tm,const __time32_t *_Time); + _CRTIMP errno_t __cdecl _strdate_s(char *_Buf,size_t _SizeInBytes); + _CRTIMP errno_t __cdecl _strtime_s(char *_Buf ,size_t _SizeInBytes); #if _INTEGRAL_MAX_BITS >= 64 - double __cdecl _difftime64(__time64_t _Time1,__time64_t _Time2); - _CRTIMP char *__cdecl _ctime64(const __time64_t *_Time); - _CRTIMP struct tm *__cdecl _gmtime64(const __time64_t *_Time); - _CRTIMP struct tm *__cdecl _localtime64(const __time64_t *_Time); + _CRTIMP double __cdecl _difftime64(__time64_t _Time1,__time64_t _Time2); + _CRTIMP _CRT_INSECURE_DEPRECATE(_ctime64_s) char *__cdecl _ctime64(const __time64_t *_Time); + _CRTIMP _CRT_INSECURE_DEPRECATE(_gmtime64_s) struct tm *__cdecl _gmtime64(const __time64_t *_Time); + _CRTIMP _CRT_INSECURE_DEPRECATE(_localtime64_s) struct tm *__cdecl _localtime64(const __time64_t *_Time); _CRTIMP __time64_t __cdecl _mktime64(struct tm *_Tm); _CRTIMP __time64_t __cdecl _mkgmtime64(struct tm *_Tm); _CRTIMP __time64_t __cdecl _time64(__time64_t *_Time); -#endif - unsigned __cdecl _getsystime(struct tm *_Tm); - unsigned __cdecl _setsystime(struct tm *_Tm,unsigned _MilliSec); + + _CRTIMP errno_t __cdecl _ctime64_s(char *_Buf,size_t _SizeInBytes,const __time64_t *_Time); + _CRTIMP errno_t __cdecl _gmtime64_s(struct tm *_Tm,const __time64_t *_Time); + _CRTIMP errno_t __cdecl _localtime64_s(struct tm *_Tm,const __time64_t *_Time); +#endif #ifndef _WTIME_DEFINED - _CRTIMP wchar_t *__cdecl _wasctime(const struct tm *_Tm); - _CRTIMP wchar_t *__cdecl _wctime32(const __time32_t *_Time); - size_t __cdecl wcsftime(wchar_t *_Buf,size_t _SizeInWords,const wchar_t *_Format,const struct tm *_Tm); +#define _WTIME_DEFINED + _CRTIMP _CRT_INSECURE_DEPRECATE(_wasctime_s) wchar_t *__cdecl _wasctime(const struct tm *_Tm); + _CRTIMP wchar_t *__cdecl _wctime(const time_t *_Time); + _CRTIMP _CRT_INSECURE_DEPRECATE(_wctime32_s) wchar_t *__cdecl _wctime32(const __time32_t *_Time); + _CRTIMP size_t __cdecl wcsftime(wchar_t *_Buf,size_t _SizeInWords,const wchar_t *_Format,const struct tm *_Tm); _CRTIMP size_t __cdecl _wcsftime_l(wchar_t *_Buf,size_t _SizeInWords,const wchar_t *_Format,const struct tm *_Tm,_locale_t _Locale); _CRTIMP wchar_t *__cdecl _wstrdate(wchar_t *_Buffer); _CRTIMP wchar_t *__cdecl _wstrtime(wchar_t *_Buffer); + + _CRTIMP errno_t __cdecl _wasctime_s(wchar_t *_Buf,size_t _SizeInWords,const struct tm *_Tm); + _CRTIMP errno_t __cdecl _wctime32_s(wchar_t *_Buf,size_t _SizeInWords,const __time32_t *_Time); + _CRTIMP errno_t __cdecl _wstrdate_s(wchar_t *_Buf,size_t _SizeInWords); + _CRTIMP errno_t __cdecl _wstrtime_s(wchar_t *_Buf,size_t _SizeInWords); #if _INTEGRAL_MAX_BITS >= 64 - _CRTIMP wchar_t *__cdecl _wctime64(const __time64_t *_Time); + _CRTIMP _CRT_INSECURE_DEPRECATE(_wctime64_s) wchar_t *__cdecl _wctime64(const __time64_t *_Time); + _CRTIMP errno_t __cdecl _wctime64_s(wchar_t *_Buf,size_t _SizeInWords,const __time64_t *_Time); #endif #if !defined (RC_INVOKED) && !defined (_INC_WTIME_INL) #define _INC_WTIME_INL #ifdef _USE_32BIT_TIME_T -__CRT_INLINE wchar_t *__cdecl _wctime(const time_t *_Time) { return _wctime32(_Time); } +/* Do it like this to be compatible to msvcrt.dll on 32 bit windows XP and before */ +__CRT_INLINE wchar_t *__cdecl _wctime32(const time_t *_Time) { return _wctime(_Time); } +__CRT_INLINE errno_t _wctime32_s(wchar_t *_Buffer, size_t _SizeInWords,const __time32_t *_Time) { return _wctime32_s(_Buffer, _SizeInWords, _Time); } #else __CRT_INLINE wchar_t *__cdecl _wctime(const time_t *_Time) { return _wctime64(_Time); } -#endif -#endif - -#define _WTIME_DEFINED +__CRT_INLINE errno_t _wctime_s(wchar_t *_Buffer, size_t _SizeInWords,const time_t *_Time) { return _wctime64_s(_Buffer, _SizeInWords, _Time); } +#endif +#endif + #endif /* !_WTIME_DEFINED */ + _CRTIMP double __cdecl difftime(time_t _Time1,time_t _Time2); + _CRTIMP char *__cdecl ctime(const time_t *_Time); + _CRTIMP struct tm *__cdecl gmtime(const time_t *_Time); + _CRTIMP struct tm *__cdecl localtime(const time_t *_Time); + _CRTIMP struct tm *__cdecl localtime_r(const time_t *_Time,struct tm *); + + _CRTIMP time_t __cdecl mktime(struct tm *_Tm); + _CRTIMP time_t __cdecl _mkgmtime(struct tm *_Tm); + _CRTIMP time_t __cdecl time(time_t *_Time); + #ifndef RC_INVOKED -double __cdecl difftime(time_t _Time1,time_t _Time2); -char *__cdecl ctime(const time_t *_Time); -struct tm *__cdecl gmtime(const time_t *_Time); -struct tm *__cdecl localtime(const time_t *_Time); -struct tm *__cdecl localtime_r(const time_t *_Time,struct tm *); - -_CRTIMP time_t __cdecl mktime(struct tm *_Tm); -_CRTIMP time_t __cdecl _mkgmtime(struct tm *_Tm); -_CRTIMP time_t __cdecl time(time_t *_Time); - #ifdef _USE_32BIT_TIME_T #if 0 __CRT_INLINE double __cdecl difftime(time_t _Time1,time_t _Time2) { return _difftime32(_Time1,_Time2); } Modified: trunk/reactos/include/crt/wchar.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/wchar.h?rev=38… ============================================================================== --- trunk/reactos/include/crt/wchar.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/wchar.h [iso-8859-1] Mon Dec 22 20:15:24 2008 @@ -41,28 +41,19 @@ #endif #ifndef _STDIO_DEFINED -#ifdef _WIN64 _CRTIMP FILE *__cdecl __iob_func(void); -#else -#ifdef _MSVCRT_ -extern FILE _iob[]; /* A pointer to an array of FILE */ -#define __iob_func() (_iob) -#else -extern FILE (*_imp___iob)[]; /* A pointer to an array of FILE */ -#define __iob_func() (*_imp___iob) + _CRTDATA(extern FILE _iob[];) +#ifdef _M_CEE_PURE #define _iob __iob_func() #endif #endif -#define _iob __iob_func() -#endif - #ifndef _STDSTREAM_DEFINED -#define stdin (&__iob_func()[0]) -#define stdout (&__iob_func()[1]) -#define stderr (&__iob_func()[2]) #define _STDSTREAM_DEFINED -#endif +#define stdin (&_iob[0]) +#define stdout (&_iob[1]) +#define stderr (&_iob[1]) +#endif /* !_STDSTREAM_DEFINED */ #ifndef _FSIZE_T_DEFINED typedef unsigned long _fsize_t; @@ -70,6 +61,15 @@ #endif #ifndef _WFINDDATA_T_DEFINED + struct _wfinddata_t { + unsigned attrib; + time_t time_create; + time_t time_access; + time_t time_write; + _fsize_t size; + wchar_t name[260]; + }; + struct _wfinddata32_t { unsigned attrib; __time32_t time_create; @@ -79,7 +79,15 @@ wchar_t name[260]; }; -/* #if _INTEGRAL_MAX_BITS >= 64 */ +#if _INTEGRAL_MAX_BITS >= 64 + struct _wfinddatai64_t { + unsigned attrib; + time_t time_create; + time_t time_access; + time_t time_write; + __int64 size; + wchar_t name[260]; + }; struct _wfinddata32i64_t { unsigned attrib; @@ -107,28 +115,10 @@ __int64 size; wchar_t name[260]; }; -/* #endif */ - -#ifdef _USE_32BIT_TIME_T -#define _wfinddata_t _wfinddata32_t -#define _wfinddatai64_t _wfinddata32i64_t - -#define _wfindfirst _wfindfirst32 -#define _wfindnext _wfindnext32 -#define _wfindfirsti64 _wfindfirst32i64 -#define _wfindnexti64 _wfindnext32i64 -#else -#define _wfinddata_t _wfinddata64i32_t -#define _wfinddatai64_t _wfinddata64_t - -#define _wfindfirst _wfindfirst64i32 -#define _wfindnext _wfindnext64i32 -#define _wfindfirsti64 _wfindfirst64 -#define _wfindnexti64 _wfindnext64 #endif #define _WFINDDATA_T_DEFINED -#endif +#endif /* !_WFINDDATA_T_DEFINED */ #ifndef NULL #ifdef __cplusplus @@ -139,58 +129,36 @@ #endif #ifndef _CRT_CTYPEDATA_DEFINED -#define _CRT_CTYPEDATA_DEFINED -#ifndef _CTYPE_DISABLE_MACROS - -#ifndef __PCTYPE_FUNC -#define __PCTYPE_FUNC __pctype_func() -#ifdef _MSVCRT_ -#define __pctype_func() (_pctype) -#else -#define __pctype_func() (*_imp___pctype) -#endif -#endif - -#ifndef _pctype -#ifdef _MSVCRT_ - extern unsigned short *_pctype; -#else - extern unsigned short **_imp___pctype; -#define _pctype (*_imp___pctype) -#endif -#endif -#endif -#endif +# define _CRT_CTYPEDATA_DEFINED +# ifndef _CTYPE_DISABLE_MACROS +# ifndef __PCTYPE_FUNC +# ifdef _DLL +# define __PCTYPE_FUNC __pctype_func() +# else +# define __PCTYPE_FUNC _pctype +# endif +# endif /* !__PCTYPE_FUNC */ + _CRTIMP const unsigned short * __cdecl __pctype_func(void); +# ifndef _M_CEE_PURE + _CRTDATA(extern unsigned short *_pctype); +# else +# define _pctype (__pctype_func()) +# endif /* !_M_CEE_PURE */ +# endif /* !_CTYPE_DISABLE_MACROS */ +#endif /* !_CRT_CTYPEDATA_DEFINED */ #ifndef _CRT_WCTYPEDATA_DEFINED #define _CRT_WCTYPEDATA_DEFINED -#ifndef _CTYPE_DISABLE_MACROS -#ifndef _wctype -#ifdef _MSVCRT_ - extern unsigned short *_wctype; -#else - extern unsigned short **_imp___wctype; -#define _wctype (*_imp___wctype) -#endif -#endif - -#ifdef _MSVCRT_ -#define __pwctype_func() (_pwctype) -#else -#define __pwctype_func() (*_imp___pwctype) -#endif - -#ifndef _pwctype -#ifdef _MSVCRT_ - extern unsigned short *_pwctype; -#else - extern unsigned short **_imp___pwctype; -#define _pwctype (*_imp___pwctype) -#endif -#endif - -#endif -#endif +# ifndef _CTYPE_DISABLE_MACROS + _CRTDATA(extern unsigned short *_wctype); + _CRTIMP const wctype_t * __cdecl __pwctype_func(void); +# ifndef _M_CEE_PURE + _CRTDATA(extern const wctype_t *_pwctype); +# else +# define _pwctype (__pwctype_func()) +# endif /* !_M_CEE_PURE */ +# endif /* !_CTYPE_DISABLE_MACROS */ +#endif /* !_CRT_WCTYPEDATA_DEFINED */ #define _UPPER 0x1 #define _LOWER 0x2 @@ -207,48 +175,46 @@ #ifndef _WCTYPE_DEFINED #define _WCTYPE_DEFINED - - int __cdecl iswalpha(wint_t _C); + _CRTIMP int __cdecl iswalpha(wint_t _C); _CRTIMP int __cdecl _iswalpha_l(wint_t _C,_locale_t _Locale); - int __cdecl iswupper(wint_t _C); + _CRTIMP int __cdecl iswupper(wint_t _C); _CRTIMP int __cdecl _iswupper_l(wint_t _C,_locale_t _Locale); - int __cdecl iswlower(wint_t _C); + _CRTIMP int __cdecl iswlower(wint_t _C); _CRTIMP int __cdecl _iswlower_l(wint_t _C,_locale_t _Locale); - int __cdecl iswdigit(wint_t _C); + _CRTIMP int __cdecl iswdigit(wint_t _C); _CRTIMP int __cdecl _iswdigit_l(wint_t _C,_locale_t _Locale); - int __cdecl iswxdigit(wint_t _C); + _CRTIMP int __cdecl iswxdigit(wint_t _C); _CRTIMP int __cdecl _iswxdigit_l(wint_t _C,_locale_t _Locale); - int __cdecl iswspace(wint_t _C); + _CRTIMP int __cdecl iswspace(wint_t _C); _CRTIMP int __cdecl _iswspace_l(wint_t _C,_locale_t _Locale); - int __cdecl iswpunct(wint_t _C); + _CRTIMP int __cdecl iswpunct(wint_t _C); _CRTIMP int __cdecl _iswpunct_l(wint_t _C,_locale_t _Locale); - int __cdecl iswalnum(wint_t _C); + _CRTIMP int __cdecl iswalnum(wint_t _C); _CRTIMP int __cdecl _iswalnum_l(wint_t _C,_locale_t _Locale); - int __cdecl iswprint(wint_t _C); + _CRTIMP int __cdecl iswprint(wint_t _C); _CRTIMP int __cdecl _iswprint_l(wint_t _C,_locale_t _Locale); - int __cdecl iswgraph(wint_t _C); + _CRTIMP int __cdecl iswgraph(wint_t _C); _CRTIMP int __cdecl _iswgraph_l(wint_t _C,_locale_t _Locale); - int __cdecl iswcntrl(wint_t _C); + _CRTIMP int __cdecl iswcntrl(wint_t _C); _CRTIMP int __cdecl _iswcntrl_l(wint_t _C,_locale_t _Locale); - int __cdecl iswascii(wint_t _C); - int __cdecl isleadbyte(int _C); + _CRTIMP int __cdecl iswascii(wint_t _C); + _CRTIMP int __cdecl isleadbyte(int _C); _CRTIMP int __cdecl _isleadbyte_l(int _C,_locale_t _Locale); - wint_t __cdecl towupper(wint_t _C); + _CRTIMP wint_t __cdecl towupper(wint_t _C); _CRTIMP wint_t __cdecl _towupper_l(wint_t _C,_locale_t _Locale); - wint_t __cdecl towlower(wint_t _C); + _CRTIMP wint_t __cdecl towlower(wint_t _C); _CRTIMP wint_t __cdecl _towlower_l(wint_t _C,_locale_t _Locale); - int __cdecl iswctype(wint_t _C,wctype_t _Type); + _CRTIMP int __cdecl iswctype(wint_t _C,wctype_t _Type); _CRTIMP int __cdecl _iswctype_l(wint_t _C,wctype_t _Type,_locale_t _Locale); _CRTIMP int __cdecl __iswcsymf(wint_t _C); _CRTIMP int __cdecl _iswcsymf_l(wint_t _C,_locale_t _Locale); _CRTIMP int __cdecl __iswcsym(wint_t _C); _CRTIMP int __cdecl _iswcsym_l(wint_t _C,_locale_t _Locale); - int __cdecl is_wctype(wint_t _C,wctype_t _Type); + _CRTIMP int __cdecl is_wctype(wint_t _C,wctype_t _Type); #endif #ifndef _WDIRECT_DEFINED #define _WDIRECT_DEFINED - _CRTIMP wchar_t *__cdecl _wgetcwd(wchar_t *_DstBuf,int _SizeInWords); _CRTIMP wchar_t *__cdecl _wgetdcwd(int _Drive,wchar_t *_DstBuf,int _SizeInWords); wchar_t *__cdecl _wgetdcwd_nolock(int _Drive,wchar_t *_DstBuf,int _SizeInWords); @@ -259,7 +225,6 @@ #ifndef _WIO_DEFINED #define _WIO_DEFINED - _CRTIMP int __cdecl _waccess(const wchar_t *_Filename,int _AccessMode); _CRTIMP int __cdecl _wchmod(const wchar_t *_Filename,int _Mode); _CRTIMP int __cdecl _wcreat(const wchar_t *_Filename,int _PermissionMode); @@ -270,10 +235,10 @@ _CRTIMP wchar_t *__cdecl _wmktemp(wchar_t *_TemplateName); #if _INTEGRAL_MAX_BITS >= 64 _CRTIMP intptr_t __cdecl _wfindfirst32i64(const wchar_t *_Filename,struct _wfinddata32i64_t *_FindData); - intptr_t __cdecl _wfindfirst64i32(const wchar_t *_Filename,struct _wfinddata64i32_t *_FindData); + _CRTIMP intptr_t __cdecl _wfindfirst64i32(const wchar_t *_Filename,struct _wfinddata64i32_t *_FindData); _CRTIMP intptr_t __cdecl _wfindfirst64(const wchar_t *_Filename,struct _wfinddata64_t *_FindData); _CRTIMP int __cdecl _wfindnext32i64(intptr_t _FindHandle,struct _wfinddata32i64_t *_FindData); - int __cdecl _wfindnext64i32(intptr_t _FindHandle,struct _wfinddata64i32_t *_FindData); + _CRTIMP int __cdecl _wfindnext64i32(intptr_t _FindHandle,struct _wfinddata64i32_t *_FindData); _CRTIMP int __cdecl _wfindnext64(intptr_t _FindHandle,struct _wfinddata64_t *_FindData); #endif _CRTIMP errno_t __cdecl _wsopen_s(int *_FileHandle,const wchar_t *_Filename,int _OpenFlag,int _ShareFlag,int _PermissionFlag); @@ -293,7 +258,6 @@ #ifndef _WPROCESS_DEFINED #define _WPROCESS_DEFINED - _CRTIMP intptr_t __cdecl _wexecl(const wchar_t *_Filename,const wchar_t *_ArgList,...); _CRTIMP intptr_t __cdecl _wexecle(const wchar_t *_Filename,const wchar_t *_ArgList,...); _CRTIMP intptr_t __cdecl _wexeclp(const wchar_t *_Filename,const wchar_t *_ArgList,...); @@ -386,28 +350,6 @@ #ifndef _STAT_DEFINED #define _STAT_DEFINED -#ifdef _USE_32BIT_TIME_T -#ifdef WIN64 -#define _fstat _fstat32 -#define _stat _stat32 -#define _wstat _wstat32 -#else -#define _fstat32 _fstat -#define _stat32 _stat -#define _wstat32 _wstat -#endif -#define _fstati64 _fstat32i64 -#define _stati64 _stat32i64 -#define _wstati64 _wstat32i64 -#else -#define _fstat _fstat64i32 -#define _fstati64 _fstat64 -#define _stat _stat64i32 -#define _stati64 _stat64 -#define _wstat _wstat64i32 -#define _wstati64 _wstat64 -#endif - struct _stat32 { _dev_t st_dev; _ino_t st_ino; @@ -420,6 +362,20 @@ __time32_t st_atime; __time32_t st_mtime; __time32_t st_ctime; + }; + + struct _stat { + _dev_t st_dev; + _ino_t st_ino; + unsigned short st_mode; + short st_nlink; + short st_uid; + short st_gid; + _dev_t st_rdev; + _off_t st_size; + time_t st_atime; + time_t st_mtime; + time_t st_ctime; }; #ifndef NO_OLDNAMES @@ -489,11 +445,11 @@ #ifndef _WSTAT_DEFINED #define _WSTAT_DEFINED - + _CRTIMP int __cdecl _wstat(const wchar_t *_Name,struct _stat *_Stat); _CRTIMP int __cdecl _wstat32(const wchar_t *_Name,struct _stat32 *_Stat); #if _INTEGRAL_MAX_BITS >= 64 _CRTIMP int __cdecl _wstat32i64(const wchar_t *_Name,struct _stat32i64 *_Stat); - int __cdecl _wstat64i32(const wchar_t *_Name,struct _stat64i32 *_Stat); + _CRTIMP int __cdecl _wstat64i32(const wchar_t *_Name,struct _stat64i32 *_Stat); _CRTIMP int __cdecl _wstat64(const wchar_t *_Name,struct _stat64 *_Stat); #endif #endif @@ -533,24 +489,24 @@ _CRTIMP FILE *__cdecl _wfsopen(const wchar_t *_Filename,const wchar_t *_Mode,int _ShFlag); #endif - wint_t __cdecl fgetwc(FILE *_File); + _CRTIMP_ALT wint_t __cdecl fgetwc(FILE *_File); _CRTIMP wint_t __cdecl _fgetwchar(void); - wint_t __cdecl fputwc(wchar_t _Ch,FILE *_File); + _CRTIMP wint_t __cdecl fputwc(wchar_t _Ch,FILE *_File); _CRTIMP wint_t __cdecl _fputwchar(wchar_t _Ch); - wint_t __cdecl getwc(FILE *_File); - wint_t __cdecl getwchar(void); - wint_t __cdecl putwc(wchar_t _Ch,FILE *_File); - wint_t __cdecl putwchar(wchar_t _Ch); - wint_t __cdecl ungetwc(wint_t _Ch,FILE *_File); - wchar_t *__cdecl fgetws(wchar_t *_Dst,int _SizeInWords,FILE *_File); - int __cdecl fputws(const wchar_t *_Str,FILE *_File); + _CRTIMP wint_t __cdecl getwc(FILE *_File); + _CRTIMP wint_t __cdecl getwchar(void); + _CRTIMP wint_t __cdecl putwc(wchar_t _Ch,FILE *_File); + _CRTIMP wint_t __cdecl putwchar(wchar_t _Ch); + _CRTIMP_ALT wint_t __cdecl ungetwc(wint_t _Ch,FILE *_File); + _CRTIMP wchar_t *__cdecl fgetws(wchar_t *_Dst,int _SizeInWords,FILE *_File); + _CRTIMP int __cdecl fputws(const wchar_t *_Str,FILE *_File); _CRTIMP wchar_t *__cdecl _getws(wchar_t *_String); _CRTIMP int __cdecl _putws(const wchar_t *_Str); - int __cdecl fwprintf(FILE *_File,const wchar_t *_Format,...); - int __cdecl wprintf(const wchar_t *_Format,...); + _CRTIMP int __cdecl fwprintf(FILE *_File,const wchar_t *_Format,...); + _CRTIMP int __cdecl wprintf(const wchar_t *_Format,...); _CRTIMP int __cdecl _scwprintf(const wchar_t *_Format,...); - int __cdecl vfwprintf(FILE *_File,const wchar_t *_Format,va_list _ArgList); - int __cdecl vwprintf(const wchar_t *_Format,va_list _ArgList); + _CRTIMP int __cdecl vfwprintf(FILE *_File,const wchar_t *_Format,va_list _ArgList); + _CRTIMP int __cdecl vwprintf(const wchar_t *_Format,va_list _ArgList); _CRTIMP int __cdecl swprintf(wchar_t*, const wchar_t*, ...); _CRTIMP int __cdecl vswprintf(wchar_t*, const wchar_t*,va_list); _CRTIMP int __cdecl _swprintf_c(wchar_t *_DstBuf,size_t _SizeInWords,const wchar_t *_Format,...); @@ -558,11 +514,11 @@ _CRTIMP int __cdecl _snwprintf(wchar_t *_Dest,size_t _Count,const wchar_t *_Format,...); _CRTIMP int __cdecl _vsnwprintf(wchar_t *_Dest,size_t _Count,const wchar_t *_Format,va_list _Args); #ifndef __NO_ISOCEXT /* externs in libmingwex.a */ - int __cdecl snwprintf (wchar_t *s, size_t n, const wchar_t * format, ...); + _CRTIMP int __cdecl snwprintf (wchar_t *s, size_t n, const wchar_t * format, ...); __CRT_INLINE int __cdecl vsnwprintf (wchar_t *s, size_t n, const wchar_t *format, va_list arg) { return _vsnwprintf(s,n,format,arg); } - int __cdecl vwscanf (const wchar_t *, va_list); - int __cdecl vfwscanf (FILE *,const wchar_t *,va_list); - int __cdecl vswscanf (const wchar_t *,const wchar_t *,va_list); + _CRTIMP int __cdecl vwscanf (const wchar_t *, va_list); + _CRTIMP int __cdecl vfwscanf (FILE *,const wchar_t *,va_list); + _CRTIMP int __cdecl vswscanf (const wchar_t *,const wchar_t *,va_list); #endif _CRTIMP int __cdecl _fwprintf_p(FILE *_File,const wchar_t *_Format,...); _CRTIMP int __cdecl _wprintf_p(const wchar_t *_Format,...);

1 0

[tkreuzer] 38291: Replace all deprecate functions like wcsicmp with the new ones, like _wcsicmp in our own code. Define __WINESRC__ or _CRT_NONSTDC_NO_DEPRECATE where neccessary in 3rd party code to silence warnings about deprecated functions, that the upcoming crt header update will create. Remove allowwarnings="true" from telnet.
by tkreuzer＠svn.reactos.org 23 Dec '08

23 Dec '08

Author: tkreuzer Date: Mon Dec 22 19:23:25 2008 New Revision: 38291 URL: http://svn.reactos.org/svn/reactos?rev=38291&view=rev Log: Replace all deprecate functions like wcsicmp with the new ones, like _wcsicmp in our own code. Define __WINESRC__ or _CRT_NONSTDC_NO_DEPRECATE where neccessary in 3rd party code to silence warnings about deprecated functions, that the upcoming crt header update will create. Remove allowwarnings="true" from telnet. Modified: trunk/reactos/base/applications/network/net/main.c trunk/reactos/base/applications/network/net/net.h trunk/reactos/base/applications/network/net/process.c trunk/reactos/base/applications/network/telnet/telnet.rbuild trunk/reactos/base/services/umpnpmgr/umpnpmgr.c trunk/reactos/base/system/services/rpcserver.c trunk/reactos/base/system/userinit/userinit.c trunk/reactos/dll/cpl/mmsys/sounds.c trunk/reactos/dll/cpl/sysdm/startrec.c trunk/reactos/dll/win32/msgina/msgina.rbuild trunk/reactos/dll/win32/netcfgx/netcfg_iface.c trunk/reactos/dll/win32/netcfgx/tcpipconf_notify.c trunk/reactos/dll/win32/netshell/connectmanager.c trunk/reactos/dll/win32/netshell/lanconnectui.c trunk/reactos/dll/win32/netshell/lanstatusui.c trunk/reactos/dll/win32/newdev/newdev.c trunk/reactos/dll/win32/newdev/wizard.c trunk/reactos/dll/win32/ntmarta/ntmarta.rbuild trunk/reactos/dll/win32/shell32/pidl.c trunk/reactos/dll/win32/shell32/shelllink.c trunk/reactos/dll/win32/shell32/shlexec.c trunk/reactos/dll/win32/shell32/shv_item_new.c Modified: trunk/reactos/base/applications/network/net/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/net/main.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/net/main.c [iso-8859-1] Mon Dec 22 19:23:25 2008 @@ -20,91 +20,91 @@ return 1; } - if (stricmp(argv[1],"ACCOUNTS")==0) + if (_stricmp(argv[1],"ACCOUNTS")==0) { - return unimplement(); + return unimplemented(); } - if (stricmp(argv[1],"COMPUTER")==0) + if (_stricmp(argv[1],"COMPUTER")==0) { - return unimplement(); + return unimplemented(); } - if (stricmp(argv[1],"CONFIG")==0) + if (_stricmp(argv[1],"CONFIG")==0) { - return unimplement(); + return unimplemented(); } - if (stricmp(argv[1],"CONTINUE")==0) + if (_stricmp(argv[1],"CONTINUE")==0) { - return unimplement(); + return unimplemented(); } - if (stricmp(argv[1],"FILE")==0) + if (_stricmp(argv[1],"FILE")==0) { - return unimplement(); + return unimplemented(); } - if (stricmp(argv[1],"GROUP")==0) + if (_stricmp(argv[1],"GROUP")==0) { - return unimplement(); + return unimplemented(); } - if (stricmp(argv[1],"HELP")==0) + if (_stricmp(argv[1],"HELP")==0) { return cmdHelp(argc,&argv[1]); } - if (stricmp(argv[1],"HELPMSG")==0) + if (_stricmp(argv[1],"HELPMSG")==0) { - return unimplement(); + return unimplemented(); } - if (stricmp(argv[1],"LOCALGROUP")==0) + if (_stricmp(argv[1],"LOCALGROUP")==0) { - return unimplement(); + return unimplemented(); } - if (stricmp(argv[1],"NAME")==0) + if (_stricmp(argv[1],"NAME")==0) { - return unimplement(); + return unimplemented(); } - if (stricmp(argv[1],"PRINT")==0) + if (_stricmp(argv[1],"PRINT")==0) { - return unimplement(); + return unimplemented(); } - if (stricmp(argv[1],"SEND")==0) + if (_stricmp(argv[1],"SEND")==0) { - return unimplement(); + return unimplemented(); } - if (stricmp(argv[1],"SESSION")==0) + if (_stricmp(argv[1],"SESSION")==0) { - return unimplement(); + return unimplemented(); } - if (stricmp(argv[1],"SHARE")==0) + if (_stricmp(argv[1],"SHARE")==0) { - return unimplement(); + return unimplemented(); } - if (stricmp(argv[1],"START")==0) + if (_stricmp(argv[1],"START")==0) { return cmdStart(argc, &argv[1]); } - if (stricmp(argv[1],"STATISTICS")==0) + if (_stricmp(argv[1],"STATISTICS")==0) { - return unimplement(); + return unimplemented(); } - if (stricmp(argv[1],"STOP")==0) + if (_stricmp(argv[1],"STOP")==0) { return cmdStop(argc, &argv[1]); } - if (stricmp(argv[1],"TIME")==0) + if (_stricmp(argv[1],"TIME")==0) { - return unimplement(); + return unimplemented(); } - if (stricmp(argv[1],"USE")==0) + if (_stricmp(argv[1],"USE")==0) { - return unimplement(); + return unimplemented(); } - if (stricmp(argv[1],"USER")==0) + if (_stricmp(argv[1],"USER")==0) { - return unimplement(); + return unimplemented(); } - if (stricmp(argv[1],"VIEW")==0) + if (_stricmp(argv[1],"VIEW")==0) { - return unimplement(); + return unimplemented(); } help(); @@ -112,9 +112,9 @@ } -int unimplement() +int unimplemented() { - puts("This command is not implement yet"); + puts("This command is not implemented yet"); return 1; } Modified: trunk/reactos/base/applications/network/net/net.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/net/net.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/net/net.h [iso-8859-1] Mon Dec 22 19:23:25 2008 @@ -14,7 +14,7 @@ #include <windows.h> void help(); -int unimplement(); +int unimplemented(); INT cmdHelp(INT argc, CHAR **argv); Modified: trunk/reactos/base/applications/network/net/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/net/process.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/net/process.c [iso-8859-1] Mon Dec 22 19:23:25 2008 @@ -208,7 +208,7 @@ } /* Compare now */ - if (strnicmp(name,&buffer[t],strlen(&buffer[t]))==0) + if (_strnicmp(name,&buffer[t],strlen(&buffer[t]))==0) { if (save != NULL) { Modified: trunk/reactos/base/applications/network/telnet/telnet.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/telnet/telnet.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/telnet/telnet.rbuild [iso-8859-1] Mon Dec 22 19:23:25 2008 @@ -1,10 +1,11 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> -<module name="telnet" type="win32cui" installbase="system32" installname="telnet.exe" allowwarnings ="true"> +<module name="telnet" type="win32cui" installbase="system32" installname="telnet.exe" > <include base="telnet">.</include> <library>kernel32</library> <library>ws2_32</library> <library>user32</library> + <define name="_CRT_NONSTDC_NO_DEPRECATE" /> <directory name="src"> <file>ansiprsr.cpp</file> <file>keytrans.cpp</file> Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/umpnpmgr/ump… ============================================================================== --- trunk/reactos/base/services/umpnpmgr/umpnpmgr.c [iso-8859-1] (original) +++ trunk/reactos/base/services/umpnpmgr/umpnpmgr.c [iso-8859-1] Mon Dec 22 19:23:25 2008 @@ -2062,7 +2062,7 @@ NextOption = wcschr(CurrentOption, L' '); if (NextOption) *NextOption = L'\0'; - if (wcsicmp(CurrentOption, L"CONSOLE") == 0) + if (_wcsicmp(CurrentOption, L"CONSOLE") == 0) { DPRINT("Found %S. Switching to console boot\n", CurrentOption); ConsoleBoot = TRUE; Modified: trunk/reactos/base/system/services/rpcserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/rpcse… ============================================================================== --- trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] Mon Dec 22 19:23:25 2008 @@ -151,12 +151,12 @@ if (lpDatabaseName == NULL) lpDatabaseName = SERVICES_ACTIVE_DATABASEW; - if (wcsicmp(lpDatabaseName,SERVICES_FAILED_DATABASEW)==0) + if (_wcsicmp(lpDatabaseName,SERVICES_FAILED_DATABASEW)==0) { DPRINT1("Database %S, does not exist\n",lpDatabaseName); return ERROR_DATABASE_DOES_NOT_EXIST; } - else if (wcsicmp(lpDatabaseName, SERVICES_ACTIVE_DATABASEW) != 0) + else if (_wcsicmp(lpDatabaseName, SERVICES_ACTIVE_DATABASEW) != 0) { DPRINT1("Invalid Database name %S.\n",lpDatabaseName); return ERROR_INVALID_NAME; @@ -332,7 +332,7 @@ /* Can be more than one Dependencies in the DependOnService string */ while (wcslen(lpszValueBuf + dwDependServiceStrPtr) > 0) { - if (wcsicmp(lpszValueBuf + dwDependServiceStrPtr, lpService->lpServiceName) == 0) + if (_wcsicmp(lpszValueBuf + dwDependServiceStrPtr, lpService->lpServiceName) == 0) { /* Get the current enumed service pointer */ lpCurrentService = ScmGetServiceEntryByName(lpszNameBuf); @@ -1344,7 +1344,7 @@ /* First check, if it's already good */ if (ServiceNameLen > 12 && - !wcsnicmp(L"\\SystemRoot\\", CanonName, 12)) + !_wcsnicmp(L"\\SystemRoot\\", CanonName, 12)) { *RelativeName = LocalAlloc(LMEM_ZEROINIT, ServiceNameLen * sizeof(WCHAR) + sizeof(WCHAR)); if (*RelativeName == NULL) @@ -1362,7 +1362,7 @@ /* If it has %SystemRoot% prefix, substitute it to \System*/ if (ServiceNameLen > 13 && - !wcsnicmp(L"%SystemRoot%\\", CanonName, 13)) + !_wcsnicmp(L"%SystemRoot%\\", CanonName, 13)) { /* There is no +sizeof(wchar_t) because the name is less by 1 wchar */ *RelativeName = LocalAlloc(LMEM_ZEROINIT, ServiceNameLen * sizeof(WCHAR)); @@ -1432,7 +1432,7 @@ Expanded[ExpandedLen] = 0; if (ServiceNameLen > ExpandedLen && - !wcsnicmp(Expanded, CanonName, ExpandedLen)) + !_wcsnicmp(Expanded, CanonName, ExpandedLen)) { /* Only \SystemRoot\ is missing */ *RelativeName = LocalAlloc(LMEM_ZEROINIT, @@ -1504,7 +1504,7 @@ ExpandedLen = LinkTarget.Length / sizeof(WCHAR); if ((ServiceNameLen > ExpandedLen) && - !wcsnicmp(LinkTarget.Buffer, CanonName, ExpandedLen)) + !_wcsnicmp(LinkTarget.Buffer, CanonName, ExpandedLen)) { *RelativeName = LocalAlloc(LMEM_ZEROINIT, (ServiceNameLen - ExpandedLen) * sizeof(WCHAR) + 13*sizeof(WCHAR)); @@ -1584,7 +1584,7 @@ /* 12 is wcslen(L"\\SystemRoot\\") */ if (ServiceNameLen > 12 && - !wcsnicmp(L"\\SystemRoot\\", lpServiceName, 12)) + !_wcsnicmp(L"\\SystemRoot\\", lpServiceName, 12)) { /* SystemRoot prefix is already included */ @@ -1609,7 +1609,7 @@ /* Check if it has %SystemRoot% (len=13) */ if (ServiceNameLen > 13 && - !wcsnicmp(L"%%SystemRoot%%\\", lpServiceName, 13)) + !_wcsnicmp(L"%%SystemRoot%%\\", lpServiceName, 13)) { /* Substitute %SystemRoot% with \\SystemRoot\\ */ *lpCanonName = LocalAlloc(LMEM_ZEROINIT, ServiceNameLen * sizeof(WCHAR) + sizeof(WCHAR)); @@ -1828,7 +1828,7 @@ /* Fill the display name */ if (lpDisplayName != NULL && *lpDisplayName != 0 && - wcsicmp(lpService->lpDisplayName, lpDisplayName) != 0) + _wcsicmp(lpService->lpDisplayName, lpDisplayName) != 0) { lpService->lpDisplayName = (WCHAR*) HeapAlloc(GetProcessHeap(), 0, (wcslen(lpDisplayName) + 1) * sizeof(WCHAR)); Modified: trunk/reactos/base/system/userinit/userinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/useri… ============================================================================== --- trunk/reactos/base/system/userinit/userinit.c [iso-8859-1] (original) +++ trunk/reactos/base/system/userinit/userinit.c [iso-8859-1] Mon Dec 22 19:23:25 2008 @@ -120,7 +120,7 @@ NextOption = wcschr(CurrentOption, L' '); if (NextOption) *NextOption = L'\0'; - if (wcsicmp(CurrentOption, L"CONSOLE") == 0) + if (_wcsicmp(CurrentOption, L"CONSOLE") == 0) { TRACE("Found 'CONSOLE' boot option\n"); ret = TRUE; Modified: trunk/reactos/dll/cpl/mmsys/sounds.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/sounds.c?rev… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/sounds.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/sounds.c [iso-8859-1] Mon Dec 22 19:23:25 2008 @@ -697,7 +697,7 @@ if (lResult != CB_ERR) { wcscpy(&szPath[length-1], FileData.cFileName); - SendDlgItemMessageW(hwndDlg, IDC_SOUND_LIST, CB_SETITEMDATA, (WPARAM)lResult, (LPARAM)wcsdup(szPath)); + SendDlgItemMessageW(hwndDlg, IDC_SOUND_LIST, CB_SETITEMDATA, (WPARAM)lResult, (LPARAM)_wcsdup(szPath)); } }while(FindNextFileW(hFile, &FileData) != 0); Modified: trunk/reactos/dll/cpl/sysdm/startrec.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/startrec.c?r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/startrec.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/startrec.c [iso-8859-1] Mon Dec 22 19:23:25 2008 @@ -140,9 +140,9 @@ break; } - if (!wcsnicmp(szName, L"BootType", 8)) - { - if (!wcsnicmp(szValue, L"ReactOS", 7)) + if (!_wcsnicmp(szName, L"BootType", 8)) + { + if (!_wcsnicmp(szValue, L"ReactOS", 7)) { //FIXME store as enum pRecord->BootType = 1; @@ -152,11 +152,11 @@ pRecord->BootType = 0; } } - else if (!wcsnicmp(szName, L"SystemPath", 10)) + else if (!_wcsnicmp(szName, L"SystemPath", 10)) { wcscpy(pRecord->szBootPath, szValue); } - else if (!wcsnicmp(szName, L"Options", 7)) + else if (!_wcsnicmp(szName, L"Options", 7)) { //FIXME store flags as values wcscpy(pRecord->szOptions, szValue); @@ -329,12 +329,12 @@ return FALSE; } - if (!wcsnicmp(szName, L"timeout", 7)) + if (!_wcsnicmp(szName, L"timeout", 7)) { TimeOut = _wtoi(szValue); } - if (!wcsnicmp(szName, L"default", 7)) + if (!_wcsnicmp(szName, L"default", 7)) { wcscpy(szDefaultOS, szValue); } Modified: trunk/reactos/dll/win32/msgina/msgina.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/msgina.rb… ============================================================================== --- trunk/reactos/dll/win32/msgina/msgina.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/msgina.rbuild [iso-8859-1] Mon Dec 22 19:23:25 2008 @@ -2,6 +2,7 @@ <importlibrary definition="msgina.spec" /> <include base="msgina">.</include> <include base="msgina">include</include> + <include base="ReactOS">include/reactos/wine</include> <library>ntdll</library> <library>wine</library> <library>kernel32</library> Modified: trunk/reactos/dll/win32/netcfgx/netcfg_iface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/netcfg_i… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/netcfg_iface.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/netcfg_iface.c [iso-8859-1] Mon Dec 22 19:23:25 2008 @@ -430,7 +430,7 @@ { while(pHead) { - if (!wcsicmp(pHead->szId, pszwComponentId)) + if (!_wcsicmp(pHead->szId, pszwComponentId)) { return INetCfgComponent_Constructor(NULL, &IID_INetCfgComponent, (LPVOID*)pComponent, pHead, iface); } Modified: trunk/reactos/dll/win32/netcfgx/tcpipconf_notify.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/tcpipcon… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/tcpipconf_notify.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/tcpipconf_notify.c [iso-8859-1] Mon Dec 22 19:23:25 2008 @@ -2812,7 +2812,7 @@ { szBuffer[(sizeof(szBuffer)/sizeof(WCHAR))-1] = L'\0'; } - if (!wcsicmp(szBuffer, pStr)) + if (!_wcsicmp(szBuffer, pStr)) { bFound = TRUE; break; Modified: trunk/reactos/dll/win32/netshell/connectmanager.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/connect… ============================================================================== --- trunk/reactos/dll/win32/netshell/connectmanager.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/connectmanager.c [iso-8859-1] Mon Dec 22 19:23:25 2008 @@ -527,7 +527,7 @@ { szBuffer[(sizeof(szBuffer)/sizeof(WCHAR))-1] = L'\0'; } - if (!wcsicmp(szBuffer, szNetCfg)) + if (!_wcsicmp(szBuffer, szNetCfg)) { *pIndex = pCurrentAdapter->Index; return TRUE; Modified: trunk/reactos/dll/win32/netshell/lanconnectui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lanconn… ============================================================================== --- trunk/reactos/dll/win32/netshell/lanconnectui.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lanconnectui.c [iso-8859-1] Mon Dec 22 19:23:25 2008 @@ -97,7 +97,7 @@ hr = INetCfgComponent_GetDisplayName(pNCg, &pName); if (SUCCEEDED(hr)) { - if (!wcsicmp(pName, This->pProperties->pszwDeviceName)) + if (!_wcsicmp(pName, This->pProperties->pszwDeviceName)) { *pOut = pNCg; IEnumNetCfgComponent_Release(pEnumCfg); Modified: trunk/reactos/dll/win32/netshell/lanstatusui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lanstat… ============================================================================== --- trunk/reactos/dll/win32/netshell/lanstatusui.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lanstatusui.c [iso-8859-1] Mon Dec 22 19:23:25 2008 @@ -591,7 +591,7 @@ break; } RegCloseKey(hSubKey); - if (!wcsicmp(pGuid, szNetCfg)) + if (!_wcsicmp(pGuid, szNetCfg)) { return TRUE; } Modified: trunk/reactos/dll/win32/newdev/newdev.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/newdev.c?… ============================================================================== --- trunk/reactos/dll/win32/newdev/newdev.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/newdev/newdev.c [iso-8859-1] Mon Dec 22 19:23:25 2008 @@ -383,7 +383,7 @@ { LPCWSTR pszExtension = GetFileExt(FileName); - if ((wcsicmp(pszExtension, L".inf") == 0) && (wcscmp(LastDirPath, DirPath) != 0)) + if ((_wcsicmp(pszExtension, L".inf") == 0) && (wcscmp(LastDirPath, DirPath) != 0)) { wcscpy(LastDirPath, DirPath); Modified: trunk/reactos/dll/win32/newdev/wizard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/wizard.c?… ============================================================================== --- trunk/reactos/dll/win32/newdev/wizard.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/newdev/wizard.c [iso-8859-1] Mon Dec 22 19:23:25 2008 @@ -365,7 +365,7 @@ TRACE("ComboBox_GetLBText() failed\n"); goto cleanup; } - else if (UseCustomPath && wcsicmp(CustomPath, pBuffer) == 0) + else if (UseCustomPath && _wcsicmp(CustomPath, pBuffer) == 0) UseCustomPath = FALSE; pBuffer += 1 + Length; } Modified: trunk/reactos/dll/win32/ntmarta/ntmarta.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ntmarta/ntmarta.… ============================================================================== --- trunk/reactos/dll/win32/ntmarta/ntmarta.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ntmarta/ntmarta.rbuild [iso-8859-1] Mon Dec 22 19:23:25 2008 @@ -1,6 +1,7 @@ <module name="ntmarta" type="win32dll" baseaddress="${BASEADDRESS_NTMARTA}" installbase="system32" installname="ntmarta.dll" unicode="yes"> <importlibrary definition="ntmarta.spec" /> <include base="ntmarta">.</include> + <define name="__WINESRC__" /> <define name="_WIN32_WINNT">0x600</define> <library>ntdll</library> <library>kernel32</library> Modified: trunk/reactos/dll/win32/shell32/pidl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/pidl.c?r… ============================================================================== --- trunk/reactos/dll/win32/shell32/pidl.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/pidl.c [iso-8859-1] Mon Dec 22 19:23:25 2008 @@ -2261,7 +2261,7 @@ } /* display Ext-file as description */ strcpy(pOut, sType); - strupr(pOut); + _strupr(pOut); /* load localized file string */ sTemp[0] = '\0'; if(LoadStringA(shell32_hInstance, IDS_SHV_COLUMN1, sTemp, 64)) Modified: trunk/reactos/dll/win32/shell32/shelllink.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shelllin… ============================================================================== --- trunk/reactos/dll/win32/shell32/shelllink.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shelllink.c [iso-8859-1] Mon Dec 22 19:23:25 2008 @@ -2637,7 +2637,7 @@ return TRUE; } ptr = wcsrchr(szBuffer, L'.'); - if (ptr && !wcsnicmp(ptr, L".lnk", 4)) + if (ptr && !_wcsnicmp(ptr, L".lnk", 4)) { // FIXME load localized error msg MessageBoxW( hwndDlg, L"You cannot create a link to a shortcut", L"Error", MB_ICONERROR ); Modified: trunk/reactos/dll/win32/shell32/shlexec.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlexec.… ============================================================================== --- trunk/reactos/dll/win32/shell32/shlexec.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shlexec.c [iso-8859-1] Mon Dec 22 19:23:25 2008 @@ -360,7 +360,7 @@ while (*p) { int len = wcslen(p) + 1; - if (!wcsnicmp( p, wPath, 5 )) got_path = TRUE; + if (!_wcsnicmp( p, wPath, 5 )) got_path = TRUE; total += len; p += len; } @@ -378,7 +378,7 @@ { int len = wcslen(p) + 1; memcpy( p2, p, len * sizeof(WCHAR) ); - if (!wcsnicmp( p, wPath, 5 )) + if (!_wcsnicmp( p, wPath, 5 )) { p2[len - 1] = ';'; wcscpy( p2 + len, path ); @@ -1627,7 +1627,7 @@ /* Remove File Protocol from lpFile */ /* In the case file://path/file */ - if (!wcsnicmp(lpFile, wFile, iSize)) + if (!_wcsnicmp(lpFile, wFile, iSize)) { lpFile += iSize; while (*lpFile == ':') lpFile++; @@ -1635,7 +1635,7 @@ retval = execute_from_key(lpstrProtocol, lpFile, NULL, sei_tmp.lpParameters, wcmd, execfunc, &sei_tmp, sei); } /* Check if file specified is in the form www.??????.*** */ - else if (!wcsnicmp(lpFile, wWww, 3)) + else if (!_wcsnicmp(lpFile, wWww, 3)) { /* if so, append lpFile http:// and call ShellExecute */ WCHAR lpstrTmpFile[256]; Modified: trunk/reactos/dll/win32/shell32/shv_item_new.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shv_item… ============================================================================== --- trunk/reactos/dll/win32/shell32/shv_item_new.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shv_item_new.c [iso-8859-1] Mon Dec 22 19:23:25 2008 @@ -161,13 +161,13 @@ pNewItem = HeapAlloc(GetProcessHeap(), 0, sizeof(SHELLNEW_ITEM)); pNewItem->Type = type; if (szTarget) - pNewItem->szTarget = wcsdup(szTarget); + pNewItem->szTarget = _wcsdup(szTarget); else pNewItem->szTarget = NULL; - pNewItem->szDesc = wcsdup(szDesc); - pNewItem->szIcon = wcsdup(szIcon); - pNewItem->szExt = wcsdup(szKeyName); + pNewItem->szDesc = _wcsdup(szDesc); + pNewItem->szIcon = _wcsdup(szIcon); + pNewItem->szExt = _wcsdup(szKeyName); pNewItem->Next = NULL; break; } @@ -388,7 +388,7 @@ ZeroMemory(&sInfo, sizeof(sInfo)); sInfo.cb = sizeof(sizeof(sInfo)); - szCmd = wcsdup(ptr); + szCmd = _wcsdup(ptr); if (!szCmd) break; if (CreateProcessW(NULL, szCmd, NULL, NULL,FALSE,0,NULL,NULL,&sInfo, &pi))

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs