Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cwittich] 34896: use SHGetSpecialFolderPath instead of relying on envvars
by cwittich＠svn.reactos.org 28 Jul '08

28 Jul '08

Author: cwittich Date: Mon Jul 28 05:41:56 2008 New Revision: 34896 URL: http://svn.reactos.org/svn/reactos?rev=34896&view=rev Log: use SHGetSpecialFolderPath instead of relying on envvars Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/makefile trunk/tools/RosBE/RosBE-Windows/Tools/config/options.c Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/makefile URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/config/makefile [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/makefile [iso-8859-1] Mon Jul 28 05:41:56 2008 @@ -5,9 +5,9 @@ all: $(TARGET) CC=gcc -CFLAGS := -DWIN32 -DUNICODE -O2 -std=c99 +CFLAGS := -DWIN32 -DUNICODE -O2 -std=c99 -D_WIN32_IE=0x0400 -D_WIN32_WINNT=0x0500 LFLAGS := -mwindows -s -LIBS := +LIBS := -lshell32 SRCS := options.c RC := options.rc Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/options.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/config/options.c [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/options.c [iso-8859-1] Mon Jul 28 05:41:56 2008 @@ -37,12 +37,31 @@ return TRUE; } +static +const +WCHAR* +getConfigFile() +{ + static WCHAR filename[MAX_PATH]; + if (SHGetSpecialFolderPathW(NULL, filename, CSIDL_APPDATA, FALSE)) + { + if ((wcslen(filename) + wcslen(L"\\RosBE\\rosbe-options.cmd")) < MAX_PATH) + wcscat(filename, L"\\RosBE\\rosbe-options.cmd"); + } + else + { + wcscpy(filename, L"rosbe-options.cmd"); + } + return filename; +} + + INT WriteSettings(POPTIONS_DLG infoPtr) { INT foreground, background; BOOL showtime, writelog, useccache, strip, objstate, outstate; - WCHAR logdir[MAX_PATH], objdir[MAX_PATH], outdir[MAX_PATH], mingwpath[MAX_PATH], checkmgw[MAX_PATH], optionsfile[MAX_PATH]; + WCHAR logdir[MAX_PATH], objdir[MAX_PATH], outdir[MAX_PATH], mingwpath[MAX_PATH], checkmgw[MAX_PATH]; WCHAR msgerror[256]; HANDLE hFile; FILE *pFile; @@ -84,10 +103,7 @@ } CloseHandle(hFile); - wcscpy(optionsfile, _wgetenv(L"APPDATA")); - if ((wcslen(optionsfile) + wcslen(L"\\RosBE\\rosbe-options.cmd")) < MAX_PATH) - wcscat(optionsfile, L"\\RosBE\\rosbe-options.cmd"); - pFile = _wfopen(optionsfile, L"w"); + pFile = _wfopen(getConfigFile(), L"w"); if (pFile) { fwprintf(pFile, L"::\n"); @@ -114,16 +130,12 @@ VOID LoadSettings(POPTIONS_DLG infoPtr) { FILE *pFile; - WCHAR optionsfile[MAX_PATH]; WCHAR *ptr, *ptr2; WCHAR WTempLine[25+MAX_PATH]; WCHAR SBTitle[256]; PSETTINGS LoadedSettings = &infoPtr->Settings; - wcscpy(optionsfile, _wgetenv(L"APPDATA")); - if ((wcslen(optionsfile) + wcslen(L"\\RosBE\\rosbe-options.cmd")) < MAX_PATH) - wcscat(optionsfile, L"\\RosBE\\rosbe-options.cmd"); - pFile = _wfopen(optionsfile, L"r"); + pFile = _wfopen(getConfigFile(), L"r"); if (pFile) { while (fgetws(WTempLine, 24+MAX_PATH, pFile))

1 0

[pschweitzer] 34895: - Implemented FsRtlInitializeOplock - Implemented FsRtlNotifyUninitializeSync - Updated kernel exports
by pschweitzer＠svn.reactos.org 28 Jul '08

28 Jul '08

Author: pschweitzer Date: Mon Jul 28 04:23:56 2008 New Revision: 34895 URL: http://svn.reactos.org/svn/reactos?rev=34895&view=rev Log: - Implemented FsRtlInitializeOplock - Implemented FsRtlNotifyUninitializeSync - Updated kernel exports Modified: branches/pierre-fsd/ntoskrnl/fsrtl/notify.c branches/pierre-fsd/ntoskrnl/fsrtl/oplock.c branches/pierre-fsd/ntoskrnl/ntoskrnl_i386.def Modified: branches/pierre-fsd/ntoskrnl/fsrtl/notify.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/ntoskrnl/fsrtl/notif… ============================================================================== --- branches/pierre-fsd/ntoskrnl/fsrtl/notify.c [iso-8859-1] (original) +++ branches/pierre-fsd/ntoskrnl/fsrtl/notify.c [iso-8859-1] Mon Jul 28 04:23:56 2008 @@ -404,6 +404,10 @@ NTAPI FsRtlNotifyUninitializeSync(IN PNOTIFY_SYNC *NotifySync) { - KEBUGCHECK(0); -} - + if (*NotifySync) + { + ExFreePoolWithTag(*NotifySync, TAG('F', 'S', 'N', 'S')); + *NotifySync = NULL; + } +} + Modified: branches/pierre-fsd/ntoskrnl/fsrtl/oplock.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/ntoskrnl/fsrtl/oploc… ============================================================================== --- branches/pierre-fsd/ntoskrnl/fsrtl/oplock.c [iso-8859-1] (original) +++ branches/pierre-fsd/ntoskrnl/fsrtl/oplock.c [iso-8859-1] Mon Jul 28 04:23:56 2008 @@ -78,24 +78,23 @@ /*++ * @name FsRtlInitializeOplock - * @unimplemented + * @implemented * - * FILLME + * This function initializes the given opportunistic lock pointer * * @param Oplock - * FILLME + * The opportunistic lock to initialize * * @return None * - * @remarks None + * @remarks Truth is this function does nothing! * *--*/ VOID NTAPI FsRtlInitializeOplock(IN OUT POPLOCK Oplock) { - /* Unimplemented */ - KEBUGCHECK(0); + UNREFERENCED_PARAMETER(Oplock); } /*++ Modified: branches/pierre-fsd/ntoskrnl/ntoskrnl_i386.def URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/ntoskrnl/ntoskrnl_i3… ============================================================================== --- branches/pierre-fsd/ntoskrnl/ntoskrnl_i386.def [iso-8859-1] (original) +++ branches/pierre-fsd/ntoskrnl/ntoskrnl_i386.def [iso-8859-1] Mon Jul 28 04:23:56 2008 @@ -228,7 +228,7 @@ FsRtlInitializeFileLock@12 FsRtlInitializeLargeMcb FsRtlInitializeMcb -FsRtlInitializeOplock +FsRtlInitializeOplock@4 FsRtlInitializeTunnelCache FsRtlInsertPerFileObjectContext FsRtlInsertPerStreamContext @@ -265,7 +265,7 @@ FsRtlNotifyFullReportChange FsRtlNotifyInitializeSync FsRtlNotifyReportChange -FsRtlNotifyUninitializeSync +FsRtlNotifyUninitializeSync@4 FsRtlNotifyVolumeEvent FsRtlNumberOfRunsInBaseMcb FsRtlNumberOfRunsInLargeMcb

1 0

[pschweitzer] 34894: Fixed a typo
by pschweitzer＠svn.reactos.org 28 Jul '08

28 Jul '08

Author: pschweitzer Date: Mon Jul 28 04:06:12 2008 New Revision: 34894 URL: http://svn.reactos.org/svn/reactos?rev=34894&view=rev Log: Fixed a typo Modified: branches/pierre-fsd/include/ddk/ntifs.h Modified: branches/pierre-fsd/include/ddk/ntifs.h URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/include/ddk/ntifs.h?… ============================================================================== --- branches/pierre-fsd/include/ddk/ntifs.h [iso-8859-1] (original) +++ branches/pierre-fsd/include/ddk/ntifs.h [iso-8859-1] Mon Jul 28 04:06:12 2008 @@ -2970,7 +2970,7 @@ IN ANSI_STRING DbcsName, IN BOOLEAN WildCardsPermissible, IN BOOLEAN PathNamePermissible, - IN BOOLEAN LeadingBackslashPermissible) + IN BOOLEAN LeadingBackslashPermissible ); NTKERNELAPI

1 0

[pschweitzer] 34893: Initialize notify stuff when creating a VCB. It's commented out because of lacks in ReactOS which lead to bugcheck
by pschweitzer＠svn.reactos.org 28 Jul '08

28 Jul '08

Author: pschweitzer Date: Mon Jul 28 03:55:20 2008 New Revision: 34893 URL: http://svn.reactos.org/svn/reactos?rev=34893&view=rev Log: Initialize notify stuff when creating a VCB. It's commented out because of lacks in ReactOS which lead to bugcheck Modified: branches/pierre-fsd/drivers/filesystems/fastfat/fsctl.c Modified: branches/pierre-fsd/drivers/filesystems/fastfat/fsctl.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… ============================================================================== --- branches/pierre-fsd/drivers/filesystems/fastfat/fsctl.c [iso-8859-1] (original) +++ branches/pierre-fsd/drivers/filesystems/fastfat/fsctl.c [iso-8859-1] Mon Jul 28 03:55:20 2008 @@ -584,6 +584,12 @@ } VolumeFcb->Flags |= VCB_IS_DIRTY; + /* Initialize notify sync */ +#if 0 + InitializeListHead(&(DeviceExt->NotifyList)); + FsRtlNotifyInitializeSync(&(DeviceExt->NotifySync)); +#endif + Status = STATUS_SUCCESS; ByeBye:

1 0

[gedmurphy] 34892: - Don't check outside of the array bounds - Spotted by Marcelo Slomp <mslomp at linuxmail dot org> See issue #3593 for more details.
by gedmurphy＠svn.reactos.org 28 Jul '08

28 Jul '08

Author: gedmurphy Date: Mon Jul 28 03:45:38 2008 New Revision: 34892 URL: http://svn.reactos.org/svn/reactos?rev=34892&view=rev Log: - Don't check outside of the array bounds - Spotted by Marcelo Slomp <mslomp at linuxmail dot org> See issue #3593 for more details. Modified: trunk/reactos/base/services/tcpsvcs/chargen.c Modified: trunk/reactos/base/services/tcpsvcs/chargen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/tcpsvcs/char… ============================================================================== --- trunk/reactos/base/services/tcpsvcs/chargen.c [iso-8859-1] (original) +++ trunk/reactos/base/services/tcpsvcs/chargen.c [iso-8859-1] Mon Jul 28 03:45:38 2008 @@ -74,7 +74,7 @@ line[i] = chars[charIndex]; /* if we hit the end char, reset it */ - if (chars[charIndex] == chars[NUM_CHARS]) + if (chars[charIndex] == chars[NUM_CHARS - 1]) charIndex = 0; else charIndex++;

1 0

[cfinck] 34891: Replace '#ifdef __linux__' by '#ifndef WIN32', etc. to fix compilation on Mac OS X (hint by Alex on ros-dev)
by cfinck＠svn.reactos.org 28 Jul '08

28 Jul '08

Author: cfinck Date: Mon Jul 28 03:32:04 2008 New Revision: 34891 URL: http://svn.reactos.org/svn/reactos?rev=34891&view=rev Log: Replace '#ifdef __linux__' by '#ifndef WIN32', etc. to fix compilation on Mac OS X (hint by Alex on ros-dev) Modified: trunk/reactos/tools/sysreg/namedpipe_reader.cpp trunk/reactos/tools/sysreg/os_support.cpp trunk/reactos/tools/sysreg/os_support.h trunk/reactos/tools/sysreg/rosboot_test.cpp trunk/reactos/tools/sysreg/rosboot_test.h trunk/reactos/tools/sysreg/user_types.h 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 [iso-8859-1] (original) +++ trunk/reactos/tools/sysreg/namedpipe_reader.cpp [iso-8859-1] Mon Jul 28 03:32:04 2008 @@ -14,7 +14,7 @@ { #define MIN(a, b) (((a) < (b)) ? (a) : (b)) -#ifdef __linux__ +#ifndef WIN32 const char * NamedPipeReader::s_LineBreak = "\x0A\0"; #else const char * NamedPipeReader::s_LineBreak = "\x0D\x0A\0"; @@ -46,7 +46,7 @@ cerr << "NamedPipeReader::openPipe> pipe already open" << endl; return false; } -#ifndef __linux__ +#ifdef WIN32 h_Pipe = CreateFile(PipeCmd.c_str(), GENERIC_WRITE | GENERIC_READ, 0, @@ -105,7 +105,7 @@ cerr << "NamedPipeReader::closePipe> pipe is not open" << endl; return false; } -#ifdef __linux__ +#ifndef WIN32 close(h_Pipe); #else DisconnectNamedPipe(h_Pipe); @@ -274,7 +274,7 @@ bool NamedPipeReader::readPipe(char * buffer, int bufferlength, long & bytesread) { -#ifdef __linux__ +#ifndef WIN32 long cbRead = read(h_Pipe, buffer, (bufferlength-1) * sizeof(char)); 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 [iso-8859-1] (original) +++ trunk/reactos/tools/sysreg/os_support.cpp [iso-8859-1] Mon Jul 28 03:32:04 2008 @@ -38,7 +38,7 @@ } } -#ifdef __linux__ +#ifndef WIN32 if (s_Entries.size()) { long secs = s_Entries[i]->tm.tv_sec - tm.tv_sec; @@ -54,7 +54,7 @@ void OsSupport::cancelAlarms() { -#ifndef __linux__ +#ifdef WIN32 if (s_hThread) { TerminateThread(s_hThread, 0); @@ -73,7 +73,7 @@ } -#ifndef __linux__ +#ifdef WIN32 HANDLE OsSupport::s_hThread = 0; static HANDLE hTimer; 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 [iso-8859-1] (original) +++ trunk/reactos/tools/sysreg/os_support.h [iso-8859-1] Mon Jul 28 03:32:04 2008 @@ -10,7 +10,7 @@ * PROGRAMMERS: Johannes Anderwald (johannes.anderwald at sbox tugraz at) */ -#ifndef __linux__ +#ifdef WIN32 #include <windows.h> #else #include <unistd.h> @@ -140,7 +140,7 @@ OsSupport() {} -#ifdef __linux__ +#ifndef WIN32 static struct sigaction s_sact; #else static HANDLE s_hThread; 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 [iso-8859-1] (original) +++ trunk/reactos/tools/sysreg/rosboot_test.cpp [iso-8859-1] Mon Jul 28 03:32:04 2008 @@ -46,7 +46,7 @@ string RosBootTest::XEN_CONFIG_FILE = "XEN_CONFIG_FILE"; string RosBootTest::XEN_CONFIG_NAME = "XEN_CONFIG_NAME"; -#ifdef __linux__ +#ifndef WIN32 string RosBootTest::ROS_EMU_PATH = "ROS_EMU_PATH_LIN"; #else string RosBootTest::ROS_EMU_PATH = "ROS_EMU_PATH_WIN"; @@ -117,7 +117,7 @@ img = "output-i386"; EnvironmentVariable::getValue("ROS_OUTPUT", img); -#ifdef __linux__ +#ifndef WIN32 img += "/ros.hd"; #else img += "\\ros.hd"; @@ -159,7 +159,7 @@ } -#ifdef __linux__ +#ifndef WIN32 qemuimgdir += "/qemu-img"; #else @@ -176,7 +176,7 @@ const char * options[] = {NULL, "create", "-f", -#ifdef __linux__ +#ifndef WIN32 "raw", #else "vmdk", @@ -241,7 +241,7 @@ { string::size_type pos; -#ifdef __linux__ +#ifndef WIN32 pos = m_EmuPath.find_last_of("/"); #else pos = m_EmuPath.find_last_of("\\"); @@ -266,7 +266,7 @@ m_MaxMem = "64"; } -#ifdef __linux__ +#ifndef WIN32 if (mktemp(pipename)) { @@ -332,7 +332,7 @@ return false; } -#ifdef __linux__ +#ifndef WIN32 /* on linux we need get pid in order to be able * to terminate the emulator in case of errors * on windows we can get pid as return of CreateProcess @@ -369,7 +369,7 @@ { pipe = pipe.substr(0, pos); } -#ifdef __linux__ +#ifndef WIN32 m_Src = pipe; #else m_Src = "\\\\.\\pipe\\" + pipe.substr(0, pos); @@ -577,7 +577,7 @@ return false; } } -#ifdef __linux__ +#ifndef WIN32 if (mkfifo(m_Src.c_str(), 400)) { /* @@ -802,7 +802,7 @@ cleanup(conf_parser); return false; } -#ifdef __linux__ +#ifndef WIN32 /* * For linux systems we can only * check if the emulator runs by @@ -832,7 +832,7 @@ } #endif OsSupport::cancelAlarms(); -#ifdef __linux__ +#ifndef WIN32 // OsSupport::setAlarm (m_MaxTime, m_Pid); // OsSupport::setAlarm(m_MaxTime, getpid()); #else 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 [iso-8859-1] (original) +++ trunk/reactos/tools/sysreg/rosboot_test.h [iso-8859-1] Mon Jul 28 03:32:04 2008 @@ -30,12 +30,12 @@ #include <cstdlib> #include <cstring> #include <ctime> -#ifndef __linux__ +#ifdef WIN32 #include <io.h> #include <errno.h> #endif -#ifdef __linux__ +#ifndef WIN32 #include <unistd.h> #include <sys/types.h> #if defined(__FreeBSD__) || defined(__APPLE__) 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 [iso-8859-1] (original) +++ trunk/reactos/tools/sysreg/user_types.h [iso-8859-1] Mon Jul 28 03:32:04 2008 @@ -13,7 +13,7 @@ #include <string> #include <iostream> -#ifndef __linux__ +#ifdef WIN32 #define popen _popen #define pclose _pclose #endif

1 0

[hpoussin] 34856: Revert r34848 and r34850, and replace them by a real fix (hinted by Colin Finck)
by hpoussin＠svn.reactos.org 28 Jul '08

28 Jul '08

Author: hpoussin Date: Sun Jul 27 14:39:05 2008 New Revision: 34856 URL: http://svn.reactos.org/svn/reactos?rev=34856&view=rev Log: Revert r34848 and r34850, and replace them by a real fix (hinted by Colin Finck) Modified: trunk/reactos/Makefile trunk/reactos/tools/sysreg/namedpipe_reader.cpp trunk/reactos/tools/sysreg/os_support.cpp trunk/reactos/tools/sysreg/os_support.h trunk/reactos/tools/sysreg/rosboot_test.cpp trunk/reactos/tools/sysreg/rosboot_test.h trunk/reactos/tools/sysreg/user_types.h Modified: trunk/reactos/Makefile URL: http://svn.reactos.org/svn/reactos/trunk/reactos/Makefile?rev=34856&r1=3485… ============================================================================== --- trunk/reactos/Makefile [iso-8859-1] (original) +++ trunk/reactos/Makefile [iso-8859-1] Sun Jul 27 14:39:05 2008 @@ -182,8 +182,8 @@ endif else HOST=mingw32-linux -HOST_CFLAGS+=-fshort-wchar -D__LINUX__ -HOST_CPPFLAGS+=-fshort-wchar -D__LINUX__ +HOST_CFLAGS+=-fshort-wchar +HOST_CPPFLAGS+=-fshort-wchar endif endif 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 [iso-8859-1] (original) +++ trunk/reactos/tools/sysreg/namedpipe_reader.cpp [iso-8859-1] Sun Jul 27 14:39:05 2008 @@ -14,7 +14,7 @@ { #define MIN(a, b) (((a) < (b)) ? (a) : (b)) -#ifdef __LINUX__ +#ifdef __linux__ const char * NamedPipeReader::s_LineBreak = "\x0A\0"; #else const char * NamedPipeReader::s_LineBreak = "\x0D\x0A\0"; @@ -46,7 +46,7 @@ cerr << "NamedPipeReader::openPipe> pipe already open" << endl; return false; } -#ifndef __LINUX__ +#ifndef __linux__ h_Pipe = CreateFile(PipeCmd.c_str(), GENERIC_WRITE | GENERIC_READ, 0, @@ -105,7 +105,7 @@ cerr << "NamedPipeReader::closePipe> pipe is not open" << endl; return false; } -#ifdef __LINUX__ +#ifdef __linux__ close(h_Pipe); #else DisconnectNamedPipe(h_Pipe); @@ -274,7 +274,7 @@ bool NamedPipeReader::readPipe(char * buffer, int bufferlength, long & bytesread) { -#ifdef __LINUX__ +#ifdef __linux__ long cbRead = read(h_Pipe, buffer, (bufferlength-1) * sizeof(char)); 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 [iso-8859-1] (original) +++ trunk/reactos/tools/sysreg/os_support.cpp [iso-8859-1] Sun Jul 27 14:39:05 2008 @@ -38,7 +38,7 @@ } } -#ifdef __LINUX__ +#ifdef __linux__ if (s_Entries.size()) { long secs = s_Entries[i]->tm.tv_sec - tm.tv_sec; @@ -54,7 +54,7 @@ void OsSupport::cancelAlarms() { -#ifndef __LINUX__ +#ifndef __linux__ if (s_hThread) { TerminateThread(s_hThread, 0); @@ -73,7 +73,7 @@ } -#ifndef __LINUX__ +#ifndef __linux__ HANDLE OsSupport::s_hThread = 0; static HANDLE hTimer; 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 [iso-8859-1] (original) +++ trunk/reactos/tools/sysreg/os_support.h [iso-8859-1] Sun Jul 27 14:39:05 2008 @@ -10,7 +10,7 @@ * PROGRAMMERS: Johannes Anderwald (johannes.anderwald at sbox tugraz at) */ -#ifndef __LINUX__ +#ifndef __linux__ #include <windows.h> #else #include <unistd.h> @@ -140,7 +140,7 @@ OsSupport() {} -#ifdef __LINUX__ +#ifdef __linux__ static struct sigaction s_sact; #else static HANDLE s_hThread; 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 [iso-8859-1] (original) +++ trunk/reactos/tools/sysreg/rosboot_test.cpp [iso-8859-1] Sun Jul 27 14:39:05 2008 @@ -46,7 +46,7 @@ string RosBootTest::XEN_CONFIG_FILE = "XEN_CONFIG_FILE"; string RosBootTest::XEN_CONFIG_NAME = "XEN_CONFIG_NAME"; -#ifdef __LINUX__ +#ifdef __linux__ string RosBootTest::ROS_EMU_PATH = "ROS_EMU_PATH_LIN"; #else string RosBootTest::ROS_EMU_PATH = "ROS_EMU_PATH_WIN"; @@ -117,7 +117,7 @@ img = "output-i386"; EnvironmentVariable::getValue("ROS_OUTPUT", img); -#ifdef __LINUX__ +#ifdef __linux__ img += "/ros.hd"; #else img += "\\ros.hd"; @@ -159,7 +159,7 @@ } -#ifdef __LINUX__ +#ifdef __linux__ qemuimgdir += "/qemu-img"; #else @@ -176,7 +176,7 @@ const char * options[] = {NULL, "create", "-f", -#ifdef __LINUX__ +#ifdef __linux__ "raw", #else "vmdk", @@ -241,7 +241,7 @@ { string::size_type pos; -#ifdef __LINUX__ +#ifdef __linux__ pos = m_EmuPath.find_last_of("/"); #else pos = m_EmuPath.find_last_of("\\"); @@ -266,7 +266,7 @@ m_MaxMem = "64"; } -#ifdef __LINUX__ +#ifdef __linux__ if (mktemp(pipename)) { @@ -332,7 +332,7 @@ return false; } -#ifdef __LINUX__ +#ifdef __linux__ /* on linux we need get pid in order to be able * to terminate the emulator in case of errors * on windows we can get pid as return of CreateProcess @@ -369,7 +369,7 @@ { pipe = pipe.substr(0, pos); } -#ifdef __LINUX__ +#ifdef __linux__ m_Src = pipe; #else m_Src = "\\\\.\\pipe\\" + pipe.substr(0, pos); @@ -577,7 +577,7 @@ return false; } } -#ifdef __LINUX__ +#ifdef __linux__ if (mkfifo(m_Src.c_str(), 400)) { /* @@ -802,7 +802,7 @@ cleanup(conf_parser); return false; } -#ifdef __LINUX__ +#ifdef __linux__ /* * For linux systems we can only * check if the emulator runs by @@ -832,7 +832,7 @@ } #endif OsSupport::cancelAlarms(); -#ifdef __LINUX__ +#ifdef __linux__ // OsSupport::setAlarm (m_MaxTime, m_Pid); // OsSupport::setAlarm(m_MaxTime, getpid()); #else 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 [iso-8859-1] (original) +++ trunk/reactos/tools/sysreg/rosboot_test.h [iso-8859-1] Sun Jul 27 14:39:05 2008 @@ -30,12 +30,12 @@ #include <cstdlib> #include <cstring> #include <ctime> -#ifndef __LINUX__ +#ifndef __linux__ #include <io.h> #include <errno.h> #endif -#ifdef __LINUX__ +#ifdef __linux__ #include <unistd.h> #include <sys/types.h> #if defined(__FreeBSD__) || defined(__APPLE__) 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 [iso-8859-1] (original) +++ trunk/reactos/tools/sysreg/user_types.h [iso-8859-1] Sun Jul 27 14:39:05 2008 @@ -13,7 +13,7 @@ #include <string> #include <iostream> -#ifndef __LINUX__ +#ifndef __linux__ #define popen _popen #define pclose _pclose #endif

2 1

[ros-arm-bringup] 34890: - Don't use .spec file on ARM, it doesn't work. - For the first time, the entire ARM build of ReactOS builds (for the components we've defined)! - Now the user-mode fun begins.
by ros-arm-bringup＠svn.reactos.org 28 Jul '08

28 Jul '08

Author: ros-arm-bringup Date: Sun Jul 27 22:07:50 2008 New Revision: 34890 URL: http://svn.reactos.org/svn/reactos?rev=34890&view=rev Log: - Don't use .spec file on ARM, it doesn't work. - For the first time, the entire ARM build of ReactOS builds (for the components we've defined)! - Now the user-mode fun begins. Modified: trunk/reactos/hal/hal/hal.rbuild Modified: trunk/reactos/hal/hal/hal.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/hal/hal.rbuild?rev=348… ============================================================================== --- trunk/reactos/hal/hal/hal.rbuild [iso-8859-1] (original) +++ trunk/reactos/hal/hal/hal.rbuild [iso-8859-1] Sun Jul 27 22:07:50 2008 @@ -1,6 +1,18 @@ <?xml version="1.0"?> <!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd"> <group> + <if property="ARCH" value="arm"> + <module name="hal" type="kernelmodedll"> + <importlibrary definition="hal_arm.def" /> + <include base="ntoskrnl">include</include> + <library>ntoskrnl</library> + <define name="_NTHAL_" /> + <file>hal.c</file> + <file>hal.rc</file> + <file>hal.spec</file> + </module> + </if> + <if property="ARCH" value="i386"> <module name="hal" type="kernelmodedll"> <importlibrary definition="hal.spec.def" /> <include base="ntoskrnl">include</include> @@ -10,6 +22,7 @@ <file>hal.rc</file> <file>hal.spec</file> </module> + </if> <if property="ARCH" value="i386"> <module ifnot="false" name="halupalias" type="alias" installbase="system32" installname="hal.dll" aliasof="halup"> </module>

1 0

[ros-arm-bringup] 34889: - Fix build of NTOS and FreeLDR on ARM.
by ros-arm-bringup＠svn.reactos.org 28 Jul '08

28 Jul '08

Author: ros-arm-bringup Date: Sun Jul 27 22:07:03 2008 New Revision: 34889 URL: http://svn.reactos.org/svn/reactos?rev=34889&view=rev Log: - Fix build of NTOS and FreeLDR on ARM. Modified: trunk/reactos/ntoskrnl/include/internal/arm/mm.h trunk/reactos/ntoskrnl/mm/arm/stubs.c Modified: trunk/reactos/ntoskrnl/include/internal/arm/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/arm/mm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/arm/mm.h [iso-8859-1] Sun Jul 27 22:07:03 2008 @@ -164,6 +164,6 @@ #define PTE_BASE 0xC0000000 #define PDE_BASE 0xC1000000 -#define HYPER_SPACE ((PVOID)0xC1100000) +#define HYPER_SPACE 0xC1100000 #endif Modified: trunk/reactos/ntoskrnl/mm/arm/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/arm/stubs.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/mm/arm/stubs.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/arm/stubs.c [iso-8859-1] Sun Jul 27 22:07:03 2008 @@ -619,7 +619,7 @@ // // Loop hyperspace PTEs (1MB) // - FirstPte = PointerPte = MiGetPteAddress(HYPER_SPACE); + FirstPte = PointerPte = MiGetPteAddress((PVOID)HYPER_SPACE); LastPte = PointerPte + 256; while (PointerPte <= LastPte) { @@ -657,7 +657,7 @@ // // Return the address // - Address = HYPER_SPACE + ((PointerPte - FirstPte) * PAGE_SIZE); + Address = (PVOID)(HYPER_SPACE + ((PointerPte - FirstPte) * PAGE_SIZE)); KeArmInvalidateTlbEntry(Address); DPRINT("[HMAP]: %p %lx\n", Address, Page); return Address;

1 0

[tkreuzer] 34888: Now after loading all the drivers we come to where we setup the page directory. This is good, but I'm too tired to look into this now....
by tkreuzer＠svn.reactos.org 28 Jul '08

28 Jul '08

Author: tkreuzer Date: Sun Jul 27 21:18:46 2008 New Revision: 34888 URL: http://svn.reactos.org/svn/reactos?rev=34888&view=rev Log: Now after loading all the drivers we come to where we setup the page directory. This is good, but I'm too tired to look into this now.... Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/include/freeldr.h Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/include/freeldr.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… ============================================================================== --- branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/include/freeldr.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/include/freeldr.h [iso-8859-1] Sun Jul 27 21:18:46 2008 @@ -107,6 +107,10 @@ #define Ke386EraseFlags(x) __asm__ __volatile__("pushl $0 ; popfl\n") #endif +#ifdef _M_AMD64 +#define KeAmd64EraseFlags(x) __asm__ __volatile__("pushq $0 ; popfq\n") +#endif + VOID BootMain(LPSTR CmdLine); VOID RunLoader(VOID);

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