diff --git a/reactos/tools/rgenstat/rgenstat.c b/reactos/tools/rgenstat/rgenstat.c index 157e1152b69..511669a501d 100755 --- a/reactos/tools/rgenstat/rgenstat.c +++ b/reactos/tools/rgenstat/rgenstat.c @@ -13,6 +13,9 @@ #ifdef WIN32 #include #include +#include +int __cdecl strcasecmp (const char * __sz1, const char * __sz2) + {return _stricmp (__sz1, __sz2);} #else #include #include diff --git a/reactos/tools/sysreg/conf_parser.cpp b/reactos/tools/sysreg/conf_parser.cpp index f1b9d153f9d..99bc1a4a8bd 100644 --- a/reactos/tools/sysreg/conf_parser.cpp +++ b/reactos/tools/sysreg/conf_parser.cpp @@ -69,8 +69,8 @@ namespace Sysreg_ } } } + fclose(file); return ret; - } //--------------------------------------------------------------------------------------- diff --git a/reactos/tools/sysreg/rosboot_test.cpp b/reactos/tools/sysreg/rosboot_test.cpp index 2e641fbc5d8..5d8d40a92c4 100644 --- a/reactos/tools/sysreg/rosboot_test.cpp +++ b/reactos/tools/sysreg/rosboot_test.cpp @@ -27,7 +27,7 @@ #include #include #include -//#include +#include namespace Sysreg_ { diff --git a/reactos/tools/sysreg/sysreg.cpp b/reactos/tools/sysreg/sysreg.cpp index 8d60b3c8be2..601d99d5fe0 100644 --- a/reactos/tools/sysreg/sysreg.cpp +++ b/reactos/tools/sysreg/sysreg.cpp @@ -77,9 +77,11 @@ int main(int argc, char * argv[]) if (!ret) { cout << "The regression test has failed at stage: " << i << endl; + delete regtest; return -2; } } cout << "The regression test completed successfully" << endl; + delete regtest; return 0; } diff --git a/reactos/tools/sysreg/user_types.h b/reactos/tools/sysreg/user_types.h index 36e7c013829..fbcad93d2db 100644 --- a/reactos/tools/sysreg/user_types.h +++ b/reactos/tools/sysreg/user_types.h @@ -18,26 +18,12 @@ #define pclose _pclose #endif - typedef std::basic_string string; - typedef std::basic_istringstream istringstream; +typedef std::basic_string string; +typedef std::basic_istringstream istringstream; - -#ifdef UNICODE - - using std::wcout; - using std::wcerr; - using std::endl; - -#define cout wcout -#define cerr wcerr - -#else - - using std::cout; - using std::cerr; - using std::endl; - -#endif +using std::cout; +using std::cerr; +using std::endl; #endif // end of USER_TYPES_H__