Ros-diffs

ros-diffs@reactos.org

81390 discussions

[janderwald] 27645: - make sysreg compilable under linux
by janderwald＠svn.reactos.org 14 Jul '07

14 Jul '07

Author: janderwald Date: Sat Jul 14 14:01:09 2007 New Revision: 27645 URL: http://svn.reactos.org/svn/reactos?rev=27645&view=rev Log: - make sysreg compilable under linux Modified: trunk/reactos/tools/sysreg/conf_parser.cpp trunk/reactos/tools/sysreg/data_source.h trunk/reactos/tools/sysreg/file_reader.cpp trunk/reactos/tools/sysreg/file_reader.h trunk/reactos/tools/sysreg/namedpipe_reader.cpp trunk/reactos/tools/sysreg/namedpipe_reader.h trunk/reactos/tools/sysreg/os_support.cpp trunk/reactos/tools/sysreg/pipe_reader.cpp trunk/reactos/tools/sysreg/pipe_reader.h trunk/reactos/tools/sysreg/rosboot_test.cpp trunk/reactos/tools/sysreg/rosboot_test.h trunk/reactos/tools/sysreg/sysreg.cpp trunk/reactos/tools/sysreg/sysreg.h trunk/reactos/tools/sysreg/user_types.h Modified: trunk/reactos/tools/sysreg/conf_parser.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/conf_parser.c… ============================================================================== --- trunk/reactos/tools/sysreg/conf_parser.cpp (original) +++ trunk/reactos/tools/sysreg/conf_parser.cpp Sat Jul 14 14:01:09 2007 @@ -11,10 +11,12 @@ #include <iostream> #include <sstream> #include <fstream> +#include <cstdio> namespace Sysreg_ { using std::ifstream; + extern "C" FILE * open(char * filename, char* filemode); //--------------------------------------------------------------------------------------- ConfigParser::ConfigParser() { @@ -34,7 +36,7 @@ #ifdef UNICODE file = _tfopen(FileName, _T("rt,ccs=UNICODE")); #else - file = _tfopen(FileName, _T("rt")); + file = open(FileName, "rt"); #endif if (!file) { Modified: trunk/reactos/tools/sysreg/data_source.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/data_source.h… ============================================================================== --- trunk/reactos/tools/sysreg/data_source.h (original) +++ trunk/reactos/tools/sysreg/data_source.h Sat Jul 14 14:01:09 2007 @@ -28,11 +28,11 @@ virtual ~DataSource() {} - virtual bool open(const string & opencmd) = 0; + virtual bool openSource(const string & opencmd) = 0; - virtual bool close() = 0; + virtual bool closeSource() = 0; - virtual bool read(std::vector<string> & vect) = 0; + virtual bool readSource(std::vector<string> & vect) = 0; }; // end of class DataSource Modified: trunk/reactos/tools/sysreg/file_reader.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/file_reader.c… ============================================================================== --- trunk/reactos/tools/sysreg/file_reader.cpp (original) +++ trunk/reactos/tools/sysreg/file_reader.cpp Sat Jul 14 14:01:09 2007 @@ -9,9 +9,10 @@ #include "file_reader.h" #include <assert.h> - +#include <cstdio> namespace System_ { + extern "C" FILE * open(char * filename, char* filemode); //--------------------------------------------------------------------------------------- FileReader::FileReader() : DataSource(), m_File(NULL) { @@ -21,12 +22,12 @@ { } //--------------------------------------------------------------------------------------- - bool FileReader::open(const string & filename) + bool FileReader::openSource(const string & filename) { #ifdef UNICODE - m_File = _tfopen(filename.c_str(), _T("rb,ccs=UNICODE")); + m_File = (FILE*)_tfopen(filename.c_str(), _T("rb,ccs=UNICODE")); #else - m_File = _tfopen(filename.c_str(), _T("rb")); + m_File = open((char*)filename.c_str(), (char*)"rb"); #endif if (m_File) @@ -39,7 +40,7 @@ } } //--------------------------------------------------------------------------------------- - bool FileReader::close() + bool FileReader::closeSource() { if (!m_File) { @@ -55,7 +56,7 @@ return false; } //--------------------------------------------------------------------------------------- - bool FileReader::read(vector<string> & lines) + bool FileReader::readSource(vector<string> & lines) { if (!m_File) { @@ -135,7 +136,7 @@ total_length = 0; while((ptr = _tcsstr(offset, _T("\x0D\x0A"))) != NULL) { - long long length = ((long long)ptr - (long long)offset); + long length = ((long )ptr - (long)offset); length /= sizeof(TCHAR); offset[length] = _T('\0'); Modified: trunk/reactos/tools/sysreg/file_reader.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/file_reader.h… ============================================================================== --- trunk/reactos/tools/sysreg/file_reader.h (original) +++ trunk/reactos/tools/sysreg/file_reader.h Sat Jul 14 14:01:09 2007 @@ -14,7 +14,6 @@ #include "user_types.h" #include "data_source.h" #include <vector> - namespace System_ { using std::vector; @@ -52,8 +51,7 @@ /// @param filename name of the file to open /// @return bool - virtual bool open(const string & filename); - + virtual bool openSource(const string & filename); //--------------------------------------------------------------------------------------- /// /// closeFile @@ -62,7 +60,7 @@ /// /// @return bool - virtual bool close(); + virtual bool closeSource(); //--------------------------------------------------------------------------------------- /// @@ -73,7 +71,7 @@ /// Note: returns true on success /// - virtual bool read(vector<string> & lines); + virtual bool readSource(vector<string> & lines); Modified: trunk/reactos/tools/sysreg/namedpipe_reader.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/namedpipe_rea… ============================================================================== --- trunk/reactos/tools/sysreg/namedpipe_reader.cpp (original) +++ trunk/reactos/tools/sysreg/namedpipe_reader.cpp Sat Jul 14 14:01:09 2007 @@ -33,7 +33,7 @@ //--------------------------------------------------------------------------------------- - bool NamedPipeReader::open(const string & PipeCmd) + bool NamedPipeReader::openSource(const string & PipeCmd) { if (h_Pipe != NULLVAL) { @@ -68,7 +68,7 @@ //--------------------------------------------------------------------------------------- - bool NamedPipeReader::close() + bool NamedPipeReader::closeSource() { if (!h_Pipe) { @@ -171,7 +171,7 @@ //--------------------------------------------------------------------------------------- - bool NamedPipeReader::read(vector<string> & vect) + bool NamedPipeReader::readSource(vector<string> & vect) { char * localbuf; DWORD localsize = 100; Modified: trunk/reactos/tools/sysreg/namedpipe_reader.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/namedpipe_rea… ============================================================================== --- trunk/reactos/tools/sysreg/namedpipe_reader.h (original) +++ trunk/reactos/tools/sysreg/namedpipe_reader.h Sat Jul 14 14:01:09 2007 @@ -74,7 +74,7 @@ /// /// @return bool - virtual bool open(const string & PipeCmd); + virtual bool openSource(const string & PipeCmd); //--------------------------------------------------------------------------------------- /// @@ -84,7 +84,7 @@ /// /// @return bool - virtual bool close(); + virtual bool closeSource(); //--------------------------------------------------------------------------------------- /// @@ -96,7 +96,7 @@ /// @param Buffer to be written to /// @return size_t - virtual bool read(std::vector<string> & vect); + virtual bool readSource(std::vector<string> & vect); //--------------------------------------------------------------------------------------- /// Modified: trunk/reactos/tools/sysreg/os_support.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/os_support.cp… ============================================================================== --- trunk/reactos/tools/sysreg/os_support.cpp (original) +++ trunk/reactos/tools/sysreg/os_support.cpp Sat Jul 14 14:01:09 2007 @@ -11,7 +11,7 @@ namespace System_ { -#ifdef WIN32 +#ifndef __LINUX__ bool OsSupport::terminateProcess(OsSupport::ProcessID pid) { HANDLE hProcess = OpenProcess(PROCESS_TERMINATE, FALSE, pid); @@ -57,10 +57,10 @@ free(command); return pid; } - void OsSupport::sleep(long value) - { - _sleep(value); - } + void OsSupport::sleep(long value) + { + _sleep(value); + } #else /********************************************************************************************************************/ OsSupport::ProcessID OsSupport::createProcess(TCHAR *procname, int procargsnum, TCHAR **procargs) @@ -87,10 +87,10 @@ return true; } - void OsSupport::sleep(long value) - { - sleep(value); - } + void OsSupport::sleep(long value) + { + sleep(value); + } #endif Modified: trunk/reactos/tools/sysreg/pipe_reader.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/pipe_reader.c… ============================================================================== --- trunk/reactos/tools/sysreg/pipe_reader.cpp (original) +++ trunk/reactos/tools/sysreg/pipe_reader.cpp Sat Jul 14 14:01:09 2007 @@ -14,6 +14,7 @@ namespace System_ { + using std::vector; //--------------------------------------------------------------------------------------- PipeReader::PipeReader() : m_File(NULL) { @@ -28,7 +29,7 @@ //--------------------------------------------------------------------------------------- - bool PipeReader::openPipe(string const & PipeCmd, string AccessMode) + bool PipeReader::openSource(string const & PipeCmd) { if (m_File != NULL) { @@ -49,7 +50,7 @@ //--------------------------------------------------------------------------------------- - bool PipeReader::closePipe() + bool PipeReader::closeSource() { if (!m_File) { @@ -78,34 +79,23 @@ //--------------------------------------------------------------------------------------- - string::size_type PipeReader::readPipe(string &Buffer) + bool PipeReader::readSource(vector<string> & lines) { - - TCHAR * buf = (TCHAR *)Buffer.c_str(); - string::size_type size = Buffer.capacity(); - + TCHAR * buf = (TCHAR*)malloc(100 * sizeof(TCHAR)); //#ifdef NDEBUG - memset(buf, 0x0, sizeof(TCHAR) * size); + memset(buf, 0x0, sizeof(TCHAR) * 100); //#endif - TCHAR * res = _fgetts(buf, size, m_File); + TCHAR * res = _fgetts(buf, 100, m_File); if (!res) { cerr << "Error: PipeReader::readPipe failed" << endl; - return 0; + free(buf); + return false; } - return _tcslen(buf); - } - -//--------------------------------------------------------------------------------------- - - bool PipeReader::writePipe(const string & Buffer) - { - //TODO - // implement me - cerr << "PipeReader::writePipe is not yet implemented" << endl; - - return false; + string line(buf); + lines.push_back(line); + return true; } } // end of namespace System_ Modified: trunk/reactos/tools/sysreg/pipe_reader.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/pipe_reader.h… ============================================================================== --- trunk/reactos/tools/sysreg/pipe_reader.h (original) +++ trunk/reactos/tools/sysreg/pipe_reader.h Sat Jul 14 14:01:09 2007 @@ -14,8 +14,8 @@ #include "user_types.h" #include "data_source.h" -#include <stdio.h> -#include <stdlib.h> +#include <cstdio> +//#include <stdlib.h> namespace System_ { @@ -61,7 +61,7 @@ /// w ... allows writing to the pipe /// @return bool - bool openPipe(const string & PipeCmd, string AccessMode = _T("rt")); + bool openSource(const string & PipeCmd); //--------------------------------------------------------------------------------------- /// @@ -71,7 +71,7 @@ /// /// @return bool - bool closePipe(); + bool closeSource(); //--------------------------------------------------------------------------------------- /// @@ -83,17 +83,7 @@ /// @param Buffer to be written to /// @return string::size_type - string::size_type readPipe(string & Buffer); - -//--------------------------------------------------------------------------------------- -/// -/// writePipe -/// -/// Description: attempts to write to the pipe. Returns true on success. -/// -/// @param Buffer containing information which is written to the pipe - - bool writePipe(const string & Buffer); + bool readSource(std::vector<string> & lines); //--------------------------------------------------------------------------------------- /// Modified: trunk/reactos/tools/sysreg/rosboot_test.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/rosboot_test.… ============================================================================== --- trunk/reactos/tools/sysreg/rosboot_test.cpp (original) +++ trunk/reactos/tools/sysreg/rosboot_test.cpp Sat Jul 14 14:01:09 2007 @@ -55,7 +55,7 @@ string RosBootTest::CRITICAL_APP = _T("ROSBOOT_CRITICAL_APP"); //--------------------------------------------------------------------------------------- - RosBootTest::RosBootTest() : RegressionTest(RosBootTest::CLASS_NAME), m_Timeout(60.0), m_Delayread(0) + RosBootTest::RosBootTest() : m_Timeout(60.0), m_Delayread(0) { } @@ -69,16 +69,16 @@ void RosBootTest::getPidFromFile() { FileReader file; - if (file.open(m_PidFile.c_str ())) + if (file.openSource(m_PidFile.c_str ())) { vector<string> lines; - file.read(lines); + file.readSource(lines); if (lines.size() == 1) { string line = lines[0]; m_Pid = _ttoi(line.c_str ()); } - file.close(); + file.closeSource(); } } //--------------------------------------------------------------------------------------- @@ -292,7 +292,7 @@ src = m_File; } - if (!m_DataSource->open(src)) + if (!m_DataSource->openSource(src)) { cerr << "Error: failed to open data source with " << src << endl; return false; @@ -300,7 +300,7 @@ bool ret = analyzeDebugData(); - m_DataSource->close(); + m_DataSource->closeSource(); OsSupport::sleep(3 * CLOCKS_PER_SEC); if (m_Pid) { @@ -522,7 +522,7 @@ } size_t prev_count = vect.size (); - if (!m_DataSource->read (vect)) + if (!m_DataSource->readSource (vect)) { cerr << "No data read" << endl; continue; @@ -548,7 +548,7 @@ } lines += (vect.size() -prev_count); //WTF? } - m_DataSource->close(); + m_DataSource->closeSource(); if (write_log) { file.close(); Modified: trunk/reactos/tools/sysreg/rosboot_test.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/rosboot_test.… ============================================================================== --- trunk/reactos/tools/sysreg/rosboot_test.h (original) +++ trunk/reactos/tools/sysreg/rosboot_test.h Sat Jul 14 14:01:09 2007 @@ -9,19 +9,17 @@ * PURPOSE: ReactOS boot test * PROGRAMMERS: Johannes Anderwald (johannes.anderwald at sbox tugraz at) */ +#include "data_source.h" +#include "conf_parser.h" +#include <vector> +#include <unistd.h> - -#include "reg_test.h" -#include "data_source.h" -#include <vector> -#ifndef WIN32 -#include <unistd.h> -#endif namespace Sysreg_ { using std::vector; using System_::DataSource; + //--------------------------------------------------------------------------------------- /// /// class RosBootTest @@ -29,7 +27,7 @@ /// Description: this class attempts to boot ReactOS in an emulator with console logging enabled. /// It - class RosBootTest : public RegressionTest + class RosBootTest { public: static string VARIABLE_NAME; Modified: trunk/reactos/tools/sysreg/sysreg.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/sysreg.cpp?re… ============================================================================== --- trunk/reactos/tools/sysreg/sysreg.cpp (original) +++ trunk/reactos/tools/sysreg/sysreg.cpp Sat Jul 14 14:01:09 2007 @@ -12,19 +12,15 @@ #include "sysreg.h" using System_::EnvironmentVariable; -using System_::ComponentFactoryTemplate; using Sysreg_::ConfigParser; //regression test classes -using Sysreg_::RegressionTest; using Sysreg_::RosBootTest; #if 0 using System_::SymbolFile; #endif - -typedef ComponentFactoryTemplate<RegressionTest, string> ComponentFactory; static const TCHAR USAGE[] = _T("sysreg.exe -l | [conf_file] <testname>\n\n-l - list available tests\nconf_file - (optional) path to a configuration file (default: sysreg.cfg)\ntest_name - name of test to execute\n"); @@ -35,7 +31,6 @@ int _tmain(int argc, TCHAR * argv[]) { ConfigParser config; - ComponentFactory comp_factory; TCHAR DefaultConfig[] = _T("sysreg.cfg"); TCHAR *ConfigFile; TCHAR * TestName; @@ -47,19 +42,6 @@ } //--------------------------------------------------------------------------------------- - /// regression tests should be registered here - comp_factory.registerComponent<RosBootTest>(RosBootTest::CLASS_NAME); - -//--------------------------------------------------------------------------------------- - - if (argc == 2) - { - if (_tcscmp(argv[1], _T("-l")) == 0) - { - comp_factory.listComponentIds(); - return -1; - } - } if (argc == 2) { @@ -79,7 +61,7 @@ return -1; } - RegressionTest * regtest = comp_factory.createComponent (TestName); + RosBootTest * regtest = new RosBootTest(); if (!regtest) { cerr << "Error: the requested regression test does not exist" << endl; @@ -94,11 +76,11 @@ #endif if (regtest->execute (config)) { - cout << "The regression test " << regtest->getName () << " completed successfully" << endl; + cout << "The regression test completed successfully" << endl; } else { - cout << "The regression test " << regtest->getName () << " failed" << endl; + cout << "The regression test failed" << endl; return -2; } Modified: trunk/reactos/tools/sysreg/sysreg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/sysreg.h?rev=… ============================================================================== --- trunk/reactos/tools/sysreg/sysreg.h (original) +++ trunk/reactos/tools/sysreg/sysreg.h Sat Jul 14 14:01:09 2007 @@ -13,7 +13,6 @@ #include "user_types.h" #include "env_var.h" #include "sym_file.h" -#include "comp_factory.h" #include "conf_parser.h" // regression test classes Modified: trunk/reactos/tools/sysreg/user_types.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/user_types.h?… ============================================================================== --- trunk/reactos/tools/sysreg/user_types.h (original) +++ trunk/reactos/tools/sysreg/user_types.h Sat Jul 14 14:01:09 2007 @@ -28,10 +28,16 @@ #define _tremove remove #define _ttoi atoi #define _T(x) x + #define _tfopen _open + #define _tcsstr strstr + #define _fgetts fgets + #define _tgetenv getenv + #define _tmain main #endif typedef std::basic_string<TCHAR> string; typedef std::basic_istringstream<TCHAR> istringstream; + #ifdef UNICODE

1 0

[weiden] 27644: Don't strip the trailing backslash if the path is only a drive
by weiden＠svn.reactos.org 14 Jul '07

14 Jul '07

Author: weiden Date: Sat Jul 14 12:01:01 2007 New Revision: 27644 URL: http://svn.reactos.org/svn/reactos?rev=27644&view=rev Log: Don't strip the trailing backslash if the path is only a drive Modified: trunk/reactos/base/shell/cmd/dir.c Modified: trunk/reactos/base/shell/cmd/dir.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/dir.c?rev=2… ============================================================================== --- trunk/reactos/base/shell/cmd/dir.c (original) +++ trunk/reactos/base/shell/cmd/dir.c Sat Jul 14 12:01:01 2007 @@ -1523,12 +1523,15 @@ { TCHAR szMsg[RC_STRING_MAX_SIZE]; TCHAR szTemp[MAX_PATH]; /* A buffer to format the directory header */ + SIZE_T len; /* Print directory header */ _tcscpy(szTemp, szCurPath); - /* We cut the trailing \ of the full path */ - szTemp[_tcslen(szTemp)-1] = _T('\0'); + /* We cut the trailing \ of the full path, unless the path is a drive */ + len = _tcslen(szTemp); + if ((len != 3 || szTemp[len - 2] != _T(':')) && szTemp[len - 1] == _T('\\')) + szTemp[len-1] = _T('\0'); /* Condition to print header: We are not printing in bare format

1 0

[weiden] 27643: Display junction points
by weiden＠svn.reactos.org 14 Jul '07

14 Jul '07

Author: weiden Date: Sat Jul 14 11:16:05 2007 New Revision: 27643 URL: http://svn.reactos.org/svn/reactos?rev=27643&view=rev Log: Display junction points Modified: trunk/reactos/base/shell/cmd/dir.c Modified: trunk/reactos/base/shell/cmd/dir.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/dir.c?rev=2… ============================================================================== --- trunk/reactos/base/shell/cmd/dir.c (original) +++ trunk/reactos/base/shell/cmd/dir.c Sat Jul 14 11:16:05 2007 @@ -1206,7 +1206,13 @@ for (i = 0;i < dwCount;i++) { /* Calculate size */ - if (ptrFiles[i]->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) + if (ptrFiles[i]->dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT) + { + /* Junction */ + iSizeFormat = -14; + _tcscpy(szSize, _T("<JUNCTION>")); + } + else if (ptrFiles[i]->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) { /* Directory */ iSizeFormat = -14;

1 0

[jimtabor] 27642: Fix build.
by jimtabor＠svn.reactos.org 13 Jul '07

13 Jul '07

Author: jimtabor Date: Sat Jul 14 03:20:36 2007 New Revision: 27642 URL: http://svn.reactos.org/svn/reactos?rev=27642&view=rev Log: Fix build. Modified: trunk/reactos/base/applications/games/solitaire/lang/sk-SK.rc Modified: trunk/reactos/base/applications/games/solitaire/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/sk-SK.rc (original) +++ trunk/reactos/base/applications/games/solitaire/lang/sk-SK.rc Sat Jul 14 03:20:36 2007 @@ -9,7 +9,7 @@ */ #include "resource.h" -LANGUAGE LANG_Slovak, SUBLANG_DEFAULT +LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT /* Dialogs */ @@ -71,4 +71,4 @@ BEGIN VK_F1, IDM_HELP_CONTENTS, VIRTKEY, NOINVERT VK_F2, IDM_GAME_NEW, VIRTKEY, NOINVERT -END +END

1 0

[cwittich] 27641: -fix some linux build issues
by cwittich＠svn.reactos.org 13 Jul '07

13 Jul '07

Author: cwittich Date: Sat Jul 14 03:19:04 2007 New Revision: 27641 URL: http://svn.reactos.org/svn/reactos?rev=27641&view=rev Log: -fix some linux build issues Modified: trunk/reactos/tools/sysreg/os_support.h trunk/reactos/tools/sysreg/sysreg.mak trunk/reactos/tools/sysreg/user_types.h Modified: trunk/reactos/tools/sysreg/os_support.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/os_support.h?… ============================================================================== --- trunk/reactos/tools/sysreg/os_support.h (original) +++ trunk/reactos/tools/sysreg/os_support.h Sat Jul 14 03:19:04 2007 @@ -10,7 +10,7 @@ * PROGRAMMERS: Johannes Anderwald (johannes.anderwald at sbox tugraz at) */ -#if 1 +#ifndef __LINUX__ #include <windows.h> #else #include <unistd.h> Modified: trunk/reactos/tools/sysreg/sysreg.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/sysreg.mak?re… ============================================================================== --- trunk/reactos/tools/sysreg/sysreg.mak (original) +++ trunk/reactos/tools/sysreg/sysreg.mak Sat Jul 14 03:19:04 2007 @@ -48,9 +48,9 @@ ifeq ($(HOST),mingw32-linux) -SYSREGBUILD_HOST_CFLAGS = $(TOOLS_CPPFLAGS) -D__USE_W32API -D__LINUX__ -Iinclude -Iinclude/reactos -Iinclude/psdk -Iinclude/reactos/libs +SYSREGBUILD_HOST_CFLAGS = $(TOOLS_CPPFLAGS) -D__LINUX__ else -SYSREGBUILD_HOST_CFLAGS = $(TOOLS_CPPFLAGS) -D__USE_W32API -Iinclude -Iinclude/reactos -Iinclude/psdk -Iinclude/reactos/libs +SYSREGBUILD_HOST_CFLAGS = $(TOOLS_CPPFLAGS) -D__USE_W32API -Iinclude -Iinclude/reactos -Iinclude/psdk -Iinclude$(SEP)crt -Iinclude/reactos/libs -I$(INTERMEDIATE_)$(SEP)include$(SEP)psdk endif SYSREGBUILD_HOST_LFLAGS = $(TOOLS_LFLAGS) Modified: trunk/reactos/tools/sysreg/user_types.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/user_types.h?… ============================================================================== --- trunk/reactos/tools/sysreg/user_types.h (original) +++ trunk/reactos/tools/sysreg/user_types.h Sat Jul 14 03:19:04 2007 @@ -11,8 +11,24 @@ */ #include <string> -#include <tchar.h> #include <iostream> + +#ifndef __LINUX__ + #include <tchar.h> +#else + #define TCHAR char + #define tstrcpy strcpy + #define _tcscat strcat + #define _tcscpy(str1, str2) strcpy(str1, str2) + #define _tcslen(str1) strlen(str1) + #define _tcstod strtod + #define _tcscmp strcmp + #define _tcstoul strtoul + #define _tcsncmp strncmp + #define _tremove remove + #define _ttoi atoi + #define _T(x) x +#endif typedef std::basic_string<TCHAR> string; typedef std::basic_istringstream<TCHAR> istringstream;

1 0

[weiden] 27640: Adjust the owner edit field on page resizes
by weiden＠svn.reactos.org 13 Jul '07

13 Jul '07

Author: weiden Date: Sat Jul 14 02:56:32 2007 New Revision: 27640 URL: http://svn.reactos.org/svn/reactos?rev=27640&view=rev Log: Adjust the owner edit field on page resizes Modified: trunk/reactos/dll/win32/aclui/aclui.c Modified: trunk/reactos/dll/win32/aclui/aclui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/aclui/aclui.c?re… ============================================================================== --- trunk/reactos/dll/win32/aclui/aclui.c (original) +++ trunk/reactos/dll/win32/aclui/aclui.c Sat Jul 14 02:56:32 2007 @@ -896,12 +896,12 @@ IN INT Width, IN INT Height) { - HWND hWndAllow, hWndDeny; + HWND hWndAllow, hWndDeny, hWndOwnerEdit; RECT rcControl, rcControl2, rcControl3, rcWnd; INT cxWidth, cxEdge, btnSpacing; POINT pt, pt2; HDWP dwp; - INT nControls = 7; + INT nControls = 8; LVCOLUMN lvc; hWndAllow = GetDlgItem(sp->hWnd, @@ -931,6 +931,29 @@ if ((dwp = BeginDeferWindowPos(nControls))) { + /* resize the owner edit field */ + hWndOwnerEdit = GetDlgItem(sp->hWnd, + IDC_OWNER); + GetWindowRect(hWndOwnerEdit, + &rcControl); + pt2.x = 0; + pt2.y = 0; + MapWindowPoints(hWndOwnerEdit, + sp->hWnd, + &pt2, + 1); + if (!(dwp = DeferWindowPos(dwp, + hWndOwnerEdit, + NULL, + 0, + 0, + Width - pt.x - pt2.x, + rcControl.bottom - rcControl.top, + SWP_NOMOVE | SWP_NOZORDER))) + { + goto EndDeferWnds; + } + /* resize the Principal list view */ GetWindowRect(sp->hWndPrincipalsList, &rcControl);

1 0

[janderwald] 27639: - blame svn
by janderwald＠svn.reactos.org 13 Jul '07

13 Jul '07

Author: janderwald Date: Sat Jul 14 02:16:15 2007 New Revision: 27639 URL: http://svn.reactos.org/svn/reactos?rev=27639&view=rev Log: - blame svn Modified: trunk/reactos/base/applications/games/solitaire/lang/sk-SK.rc Modified: trunk/reactos/base/applications/games/solitaire/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/sk-SK.rc (original) +++ trunk/reactos/base/applications/games/solitaire/lang/sk-SK.rc Sat Jul 14 02:16:15 2007 @@ -39,6 +39,7 @@ IDS_SOL_NAME "Solitaire" IDS_SOL_ABOUT "Solitaire od J Brown\n\nCardLib verzia 1.0.\n\nPreklad: Kario" IDS_SOL_QUIT "Naozaj chcete skonèi aktuálnu hru?" + IDS_SOL_WIN "Congratulations, you win!!" END

1 0

[janderwald] 27638: - update slovak translation by Kario <kario@szm.sk> See issue #2353 for more details.
by janderwald＠svn.reactos.org 13 Jul '07

13 Jul '07

Author: janderwald Date: Sat Jul 14 02:13:52 2007 New Revision: 27638 URL: http://svn.reactos.org/svn/reactos?rev=27638&view=rev Log: - update slovak translation by Kario <kario(a)szm.sk> See issue #2353 for more details. Modified: trunk/reactos/base/applications/games/solitaire/lang/sk-SK.rc Modified: trunk/reactos/base/applications/games/solitaire/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/sk-SK.rc (original) +++ trunk/reactos/base/applications/games/solitaire/lang/sk-SK.rc Sat Jul 14 02:13:52 2007 @@ -1,78 +1,73 @@ -// Slovak translation by Kario 2007 <kario(a)szm.sk> +/* + * PROJECT: Solitaire + * LICENSE: Freeware, permission to use under Public Domain + * FILE: base/applications/games/solitaire/lang/sk-SK.rc + * PURPOSE: Slovak Language File for Solitaire + * TRANSLATOR: Kario <kario(a)szm.sk> + * DATE OF TR.: 13-07-2007 + * PROGRAMMERS: Daniel "EmuandCo" Reimer (reimer.daniel(a)freenet.de) + */ #include "resource.h" -LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT +LANGUAGE LANG_Slovak, SUBLANG_DEFAULT -///////////////////////////////////////////////////////////////////////////// -// -// Dialog -// +/* Dialogs */ IDD_OPTIONS DIALOGEX DISCARDABLE 0, 0, 186, 118 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Options" +CAPTION "Monosti" FONT 8, "MS Shell Dlg" EXSTYLE DS_SHELLFONT BEGIN - GROUPBOX "Cards", -1, 7, 7, 65, 40 - AUTORADIOBUTTON "Draw &One", IDC_OPT_DRAWONE, 14, 19, 52, 10, WS_GROUP | WS_TABSTOP - AUTORADIOBUTTON "Draw &Three", IDC_OPT_DRAWTHREE, 14, 32, 52, 10 + GROUPBOX "Karty", -1, 7, 7, 65, 40 + AUTORADIOBUTTON "aha &jednu", IDC_OPT_DRAWONE, 14, 19, 52, 10, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "aha &tri", IDC_OPT_DRAWTHREE, 14, 32, 52, 10 - AUTOCHECKBOX "&Show Time", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP - AUTOCHECKBOX "S&tatus bar", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP + AUTOCHECKBOX "Èa&sový limit", IDC_OPT_SHOWTIME, 7 ,51 ,64 ,10, WS_TABSTOP + AUTOCHECKBOX "Stavový riad&ok", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 35, 97, 50, 14 - PUSHBUTTON "Zrui»", IDCANCEL, 101, 97, 50, 14 + PUSHBUTTON "Zrui", IDCANCEL, 101, 97, 50, 14 END -///////////////////////////////////////////////////////////////////////////// -// -// Strings -// +/* Strings */ STRINGTABLE BEGIN IDS_SOL_NAME "Solitaire" - IDS_SOL_ABOUT "Solitaire by J Brown\n\nCardLib version 1.0." - IDS_SOL_QUIT "Quit the current game?" - IDS_SOL_WIN "Congratulations, you win!!" + IDS_SOL_ABOUT "Solitaire od J Brown\n\nCardLib verzia 1.0.\n\nPreklad: Kario" + IDS_SOL_QUIT "Naozaj chcete skonèi aktuálnu hru?" END -///////////////////////////////////////////////////////////////////////////// -// -// Menu -// +/* Menus */ IDR_MENU1 MENU DISCARDABLE BEGIN POPUP "&Hra" BEGIN - MENUITEM "&Rozda\tF2", IDM_GAME_NEW + MENUITEM "&Rozda\tF2", IDM_GAME_NEW MENUITEM SEPARATOR - MENUITEM "&Balíèek...", IDM_GAME_DECK + MENUITEM "&Balíèek...", IDM_GAME_DECK MENUITEM "&Monosti...", IDM_GAME_OPTIONS MENUITEM SEPARATOR - MENUITEM "Sk&onèi", IDM_GAME_EXIT + MENUITEM "Sk&onèi", IDM_GAME_EXIT END POPUP "&Pomocník" BEGIN - MENUITEM "&Obsah\tF1", IDM_HELP_CONTENTS - MENUITEM "&Èo je Solitaire", IDM_HELP_ABOUT + MENUITEM "&Obsah\tF1", IDM_HELP_CONTENTS + MENUITEM "&Èo je Solitaire", IDM_HELP_ABOUT END END -///////////////////////////////////////////////////////////////////////////// -// -// Accelerator -// -IDR_ACCELERATOR1 ACCELERATORS DISCARDABLE +/* Accelerator */ + +IDR_ACCELERATOR1 ACCELERATORS DISCARDABLE BEGIN VK_F1, IDM_HELP_CONTENTS, VIRTKEY, NOINVERT VK_F2, IDM_GAME_NEW, VIRTKEY, NOINVERT -END - +END

1 0

[janderwald] 27637: - update french translation by Pierre Schweitzer See issue #2399 for more details.
by janderwald＠svn.reactos.org 13 Jul '07

13 Jul '07

Author: janderwald Date: Sat Jul 14 01:51:13 2007 New Revision: 27637 URL: http://svn.reactos.org/svn/reactos?rev=27637&view=rev Log: - update french translation by Pierre Schweitzer See issue #2399 for more details. Modified: trunk/reactos/base/applications/msconfig/lang/fr-FR.rc Modified: trunk/reactos/base/applications/msconfig/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/lang/fr-FR.rc (original) +++ trunk/reactos/base/applications/msconfig/lang/fr-FR.rc Sat Jul 14 01:51:13 2007 @@ -28,18 +28,18 @@ FONT 8, "MS Shell Dlg" BEGIN CONTROL "", 237, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_EDITLABELS | TVS_SHOWSELALWAYS | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP, 2, 1, 280, 148 - PUSHBUTTON "Move &Up", IDC_BTN_SYSTEM_UP, 290, 5, 66, 14 - PUSHBUTTON "Move &Down", IDC_BTN_SYSTEM_DOWN, 290, 25, 66, 14 + PUSHBUTTON "Monter", IDC_BTN_SYSTEM_UP, 290, 5, 66, 14 + PUSHBUTTON "&Descendre", IDC_BTN_SYSTEM_DOWN, 290, 25, 66, 14 - PUSHBUTTON "&Enable", IDC_BTN_SYSTEM_ENABLE, 290, 50, 66, 14 - PUSHBUTTON "D&isable", IDC_BTN_SYSTEM_DISABLE, 290, 70, 66, 14 + PUSHBUTTON "Activ&er", IDC_BTN_SYSTEM_ENABLE, 290, 50, 66, 14 + PUSHBUTTON "Désact&iver", IDC_BTN_SYSTEM_DISABLE, 290, 70, 66, 14 - PUSHBUTTON "&Find", IDC_BTN_SYSTEM_FIND, 290, 95, 66, 14 - PUSHBUTTON "&New", IDC_BTN_SYSTEM_NEW, 290, 115, 66, 14 - PUSHBUTTON "Edi&t", IDC_BTN_SYSTEM_EDIT, 290, 135, 66, 14 + PUSHBUTTON "Rechercher", IDC_BTN_SYSTEM_FIND, 290, 95, 66, 14 + PUSHBUTTON "&Nouveau", IDC_BTN_SYSTEM_NEW, 290, 115, 66, 14 + PUSHBUTTON "Édi&ter", IDC_BTN_SYSTEM_EDIT, 290, 135, 66, 14 - PUSHBUTTON "Ena&ble All", IDC_BTN_SYSTEM_ACTIVATE, 123, 155, 66, 14 - PUSHBUTTON "Disable A&ll",IDC_BTN_SYSTEM_DEACTIVATE, 195, 155, 66, 14 + PUSHBUTTON "Activer tout", IDC_BTN_SYSTEM_ACTIVATE, 123, 155, 66, 14 + PUSHBUTTON "Désactiver tout",IDC_BTN_SYSTEM_DEACTIVATE, 195, 155, 66, 14 END IDD_TOOLS_PAGE DIALOG DISCARDABLE 0, 0, 362, 175

1 0

[weiden] 27636: Add support for user quotas in GetDiskFreeSpaceExW
by weiden＠svn.reactos.org 13 Jul '07

13 Jul '07

Author: weiden Date: Sat Jul 14 01:42:44 2007 New Revision: 27636 URL: http://svn.reactos.org/svn/reactos?rev=27636&view=rev Log: Add support for user quotas in GetDiskFreeSpaceExW Modified: trunk/reactos/dll/win32/kernel32/file/volume.c trunk/reactos/include/ndk/iotypes.h Modified: trunk/reactos/dll/win32/kernel32/file/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/vo… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/volume.c (original) +++ trunk/reactos/dll/win32/kernel32/file/volume.c Sat Jul 14 01:42:44 2007 @@ -307,61 +307,104 @@ PULARGE_INTEGER lpTotalNumberOfFreeBytes ) { - FILE_FS_SIZE_INFORMATION FileFsSize; + union + { + FILE_FS_SIZE_INFORMATION FsSize; + FILE_FS_FULL_SIZE_INFORMATION FsFullSize; + } FsInfo; IO_STATUS_BLOCK IoStatusBlock; ULARGE_INTEGER BytesPerCluster; - WCHAR RootPathName[MAX_PATH]; HANDLE hFile; - NTSTATUS errCode; - - /* - FIXME: this is obviously wrong for UNC paths, symbolic directories etc. - -Gunnar - */ - if (lpDirectoryName) - { - wcsncpy (RootPathName, lpDirectoryName, 3); - } - else - { - GetCurrentDirectoryW (MAX_PATH, RootPathName); - } - RootPathName[3] = 0; - - hFile = InternalOpenDirW(RootPathName, FALSE); + NTSTATUS Status; + + if (lpDirectoryName == NULL) + lpDirectoryName = L"\\"; + + hFile = InternalOpenDirW(lpDirectoryName, FALSE); if (INVALID_HANDLE_VALUE == hFile) { return FALSE; } - errCode = NtQueryVolumeInformationFile(hFile, - &IoStatusBlock, - &FileFsSize, - sizeof(FILE_FS_SIZE_INFORMATION), - FileFsSizeInformation); - if (!NT_SUCCESS(errCode)) - { - CloseHandle(hFile); - SetLastErrorByStatus (errCode); + if (lpFreeBytesAvailableToCaller != NULL || lpTotalNumberOfBytes != NULL) + { + /* To get the free space available to the user associated with the + current thread, try FileFsFullSizeInformation. If this is not + supported by the file system, fall back to FileFsSize */ + + Status = NtQueryVolumeInformationFile(hFile, + &IoStatusBlock, + &FsInfo.FsFullSize, + sizeof(FsInfo.FsFullSize), + FileFsFullSizeInformation); + + if (NT_SUCCESS(Status)) + { + /* Close the handle before returning data + to avoid a handle leak in case of a fault! */ + CloseHandle(hFile); + + BytesPerCluster.QuadPart = + FsInfo.FsFullSize.BytesPerSector * FsInfo.FsFullSize.SectorsPerAllocationUnit; + + if (lpFreeBytesAvailableToCaller != NULL) + { + lpFreeBytesAvailableToCaller->QuadPart = + BytesPerCluster.QuadPart * FsInfo.FsFullSize.CallerAvailableAllocationUnits.QuadPart; + } + + if (lpTotalNumberOfBytes != NULL) + { + lpTotalNumberOfBytes->QuadPart = + BytesPerCluster.QuadPart * FsInfo.FsFullSize.TotalAllocationUnits.QuadPart; + } + + if (lpTotalNumberOfFreeBytes != NULL) + { + lpTotalNumberOfFreeBytes->QuadPart = + BytesPerCluster.QuadPart * FsInfo.FsFullSize.ActualAvailableAllocationUnits.QuadPart; + } + + return TRUE; + } + } + + Status = NtQueryVolumeInformationFile(hFile, + &IoStatusBlock, + &FsInfo.FsSize, + sizeof(FsInfo.FsSize), + FileFsSizeInformation); + + /* Close the handle before returning data + to avoid a handle leak in case of a fault! */ + CloseHandle(hFile); + + if (!NT_SUCCESS(Status)) + { + SetLastErrorByStatus (Status); return FALSE; } BytesPerCluster.QuadPart = - FileFsSize.BytesPerSector * FileFsSize.SectorsPerAllocationUnit; - - // FIXME: Use quota information - if (lpFreeBytesAvailableToCaller) + FsInfo.FsSize.BytesPerSector * FsInfo.FsSize.SectorsPerAllocationUnit; + + if (lpFreeBytesAvailableToCaller) + { lpFreeBytesAvailableToCaller->QuadPart = - BytesPerCluster.QuadPart * FileFsSize.AvailableAllocationUnits.QuadPart; - - if (lpTotalNumberOfBytes) + BytesPerCluster.QuadPart * FsInfo.FsSize.AvailableAllocationUnits.QuadPart; + } + + if (lpTotalNumberOfBytes) + { lpTotalNumberOfBytes->QuadPart = - BytesPerCluster.QuadPart * FileFsSize.TotalAllocationUnits.QuadPart; - if (lpTotalNumberOfFreeBytes) + BytesPerCluster.QuadPart * FsInfo.FsSize.TotalAllocationUnits.QuadPart; + } + + if (lpTotalNumberOfFreeBytes) + { lpTotalNumberOfFreeBytes->QuadPart = - BytesPerCluster.QuadPart * FileFsSize.AvailableAllocationUnits.QuadPart; - - CloseHandle(hFile); + BytesPerCluster.QuadPart * FsInfo.FsSize.AvailableAllocationUnits.QuadPart; + } return TRUE; } Modified: trunk/reactos/include/ndk/iotypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/iotypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/iotypes.h (original) +++ trunk/reactos/include/ndk/iotypes.h Sat Jul 14 01:42:44 2007 @@ -584,6 +584,15 @@ ULONG SectorsPerAllocationUnit; ULONG BytesPerSector; } FILE_FS_SIZE_INFORMATION, *PFILE_FS_SIZE_INFORMATION; + +typedef struct _FILE_FS_FULL_SIZE_INFORMATION +{ + LARGE_INTEGER TotalAllocationUnits; + LARGE_INTEGER CallerAvailableAllocationUnits; + LARGE_INTEGER ActualAvailableAllocationUnits; + ULONG SectorsPerAllocationUnit; + ULONG BytesPerSector; +} FILE_FS_FULL_SIZE_INFORMATION, *PFILE_FS_FULL_SIZE_INFORMATION; typedef struct _FILE_FS_LABEL_INFORMATION {

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