Ros-diffs July 2008

ros-diffs@reactos.org

25 participants
761 discussions

[hpoussin] 34848: Define __LINUX__ for build tools if host is Linux
by hpoussin＠svn.reactos.org 27 Jul '08

27 Jul '08

Author: hpoussin Date: Sun Jul 27 10:32:40 2008 New Revision: 34848 URL: http://svn.reactos.org/svn/reactos?rev=34848&view=rev Log: Define __LINUX__ for build tools if host is Linux Modified: trunk/reactos/Makefile trunk/reactos/tools/sysreg/sysreg.rbuild Modified: trunk/reactos/Makefile URL: http://svn.reactos.org/svn/reactos/trunk/reactos/Makefile?rev=34848&r1=3484… ============================================================================== --- trunk/reactos/Makefile [iso-8859-1] (original) +++ trunk/reactos/Makefile [iso-8859-1] Sun Jul 27 10:32:40 2008 @@ -182,7 +182,7 @@ endif else HOST=mingw32-linux -HOST_CFLAGS+=-fshort-wchar +HOST_CFLAGS+=-fshort-wchar -D__LINUX__ HOST_CPPFLAGS+=-fshort-wchar endif endif Modified: trunk/reactos/tools/sysreg/sysreg.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/sysreg.rbuild… ============================================================================== --- trunk/reactos/tools/sysreg/sysreg.rbuild [iso-8859-1] (original) +++ trunk/reactos/tools/sysreg/sysreg.rbuild [iso-8859-1] Sun Jul 27 10:32:40 2008 @@ -2,17 +2,6 @@ <!DOCTYPE module SYSTEM "../../tools/rbuild/project.dtd"> <module name="sysreg" type="buildtool"> - <if property="HOST" value="mingw32-linux"> - <define name="__LINUX__" /> - </if> -  <file>conf_parser.cpp</file> <file>env_var.cpp</file> <file>rosboot_test.cpp</file>

1 0

[jmorlan] 34847: Improvements to cmd ConPrintfPaging: - Even if there is a console, don't do paging when output is redirected to a file; it would just confuse users with prompts they can't see. - Instead of WriteFile, use WriteConsole (which has a convenient Unicode version). - Rework the paging algorithm: don't treat end of string the same way as end-of-line (was causing nul bytes to be output after strings that didn't end with \n), and output multiple lines at once when possible. - Use the scr
by jmorlan＠svn.reactos.org 27 Jul '08

27 Jul '08

Author: jmorlan Date: Sun Jul 27 09:03:44 2008 New Revision: 34847 URL: http://svn.reactos.org/svn/reactos?rev=34847&view=rev Log: Improvements to cmd ConPrintfPaging: - Even if there is a console, don't do paging when output is redirected to a file; it would just confuse users with prompts they can't see. - Instead of WriteFile, use WriteConsole (which has a convenient Unicode version). - Rework the paging algorithm: don't treat end of string the same way as end-of-line (was causing nul bytes to be output after strings that didn't end with \n), and output multiple lines at once when possible. - Use the screen buffer width, not the window width, to determine when wrapping will happen. - Take the initial cursor position into account. Modified: trunk/reactos/base/shell/cmd/console.c Modified: trunk/reactos/base/shell/cmd/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/console.c?r… ============================================================================== --- trunk/reactos/base/shell/cmd/console.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/console.c [iso-8859-1] Sun Jul 27 09:03:44 2008 @@ -236,10 +236,10 @@ INT ConPrintfPaging(BOOL NewPage, LPTSTR szFormat, va_list arg_ptr, DWORD nStdHandle) { INT len; - PCHAR pBuf; CONSOLE_SCREEN_BUFFER_INFO csbi; TCHAR szOut[OUTPUT_BUFFER_SIZE]; DWORD dwWritten; + HANDLE hOutput = GetStdHandle(nStdHandle); /* used to count number of lines since last pause */ static int LineCount = 0; @@ -247,13 +247,10 @@ /* used to see how big the screen is */ int ScreenLines = 0; - /* the number of chars in a roow */ - int ScreenCol = 0; - /* chars since start of line */ - int CharSL = 0; - - int i = 0; + int CharSL; + + int from = 0, i = 0; if(NewPage == TRUE) LineCount = 0; @@ -264,7 +261,7 @@ //get the size of the visual screen that can be printed too - if (!GetConsoleScreenBufferInfo(hConsole, &csbi)) + if (!GetConsoleScreenBufferInfo(hOutput, &csbi)) { // we assuming its a file handle ConPrintf(szFormat, arg_ptr, nStdHandle); @@ -272,7 +269,7 @@ } //subtract 2 to account for "press any key..." and for the blank line at the end of PagePrompt() ScreenLines = (csbi.srWindow.Bottom - csbi.srWindow.Top) - 4; - ScreenCol = (csbi.srWindow.Right - csbi.srWindow.Left) + 1; + CharSL = csbi.dwCursorPosition.X; //make sure they didnt make the screen to small if(ScreenLines<4) @@ -282,45 +279,32 @@ } len = _vstprintf (szOut, szFormat, arg_ptr); -#ifdef _UNICODE - pBuf = cmd_alloc(len + 1); - len = WideCharToMultiByte( OutputCodePage, 0, szOut, len + 1, pBuf, len + 1, NULL, NULL) - 1; -#else - pBuf = szOut; -#endif - - for(i = 0; i < len; i++) - { - // search 'end of string' '\n' or 'end of screen line' - for(; (i < len) && (pBuf[i] != _T('\n') && (CharSL<ScreenCol)) ; i++) - CharSL++; - - WriteFile (GetStdHandle (nStdHandle),&pBuf[i-CharSL],sizeof(CHAR)*(CharSL+1),&dwWritten,NULL); + + while (i < len) + { + // Search until the end of a line is reached + if (szOut[i++] != _T('\n') && ++CharSL < csbi.dwSize.X) + continue; + LineCount++; CharSL=0; if(LineCount >= ScreenLines) { - if(_strnicmp(&pBuf[i], "\n", 2)!=0) - WriteFile (GetStdHandle (nStdHandle),_T("\n"),sizeof(CHAR),&dwWritten,NULL); + WriteConsole(hOutput, &szOut[from], i-from, &dwWritten, NULL); + from = i; if(PagePrompt() != PROMPT_YES) { -#ifdef _UNICODE - cmd_free(pBuf); -#endif return 1; } //reset the number of lines being printed LineCount = 0; - CharSL=0; } - - } - -#ifdef _UNICODE - cmd_free(pBuf); -#endif + } + + WriteConsole(hOutput, &szOut[from], i-from, &dwWritten, NULL); + return 0; }

1 0

[hpoussin] 34846: Factorize code for simple module types
by hpoussin＠svn.reactos.org 27 Jul '08

27 Jul '08

Author: hpoussin Date: Sun Jul 27 09:01:24 2008 New Revision: 34846 URL: http://svn.reactos.org/svn/reactos?rev=34846&view=rev Log: Factorize code for simple module types Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h trunk/reactos/tools/rbuild/rbuild.h 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] Sun Jul 27 09:01:24 2008 @@ -33,6 +33,44 @@ using std::map; typedef set<string> set_string; + +static const struct +{ + HostType DefaultHost; +} ModuleHandlerInformations[] = { + { HostTrue }, // BuildTool + { HostFalse }, // StaticLibrary + { HostFalse }, // ObjectLibrary + { HostFalse }, // Kernel + { HostFalse }, // KernelModeDLL + { HostFalse }, // KernelModeDriver + { HostFalse }, // NativeDLL + { HostFalse }, // NativeCUI + { HostFalse }, // Win32DLL + { HostFalse }, // Win32OCX + { HostFalse }, // Win32CUI + { HostFalse }, // Win32GUI + { HostFalse }, // BootLoader + { HostFalse }, // BootSector + { HostFalse }, // Iso + { HostFalse }, // LiveIso + { HostFalse }, // Test + { HostFalse }, // RpcServer + { HostFalse }, // RpcClient + { HostFalse }, // Alias + { HostFalse }, // BootProgram + { HostFalse }, // Win32SCR + { HostFalse }, // IdlHeader + { HostFalse }, // IsoRegTest + { HostFalse }, // LiveIsoRegTest + { HostFalse }, // EmbeddedTypeLib + { HostFalse }, // ElfExecutable + { HostFalse }, // RpcProxy + { HostTrue }, // HostStaticLibrary + { HostFalse }, // Cabinet + { HostFalse }, // KeyboardLayout + { HostFalse }, // MessageHeader +}; string MingwBackend::GetFullPath ( const FileLocation& file ) const @@ -252,7 +290,7 @@ h->EnablePreCompiledHeaderSupport (); if ( module.host == HostDefault ) { - module.host = h->DefaultHost(); + module.host = ModuleHandlerInformations[h->module.type].DefaultHost; assert ( module.host != HostDefault ); } v.push_back ( h ); @@ -324,6 +362,8 @@ void MingwBackend::ProcessNormal () { + assert(sizeof(ModuleHandlerInformations)/sizeof(ModuleHandlerInformations[0]) == TypeDontCare); + DetectCompiler (); DetectBinutils (); DetectNetwideAssembler (); 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] Sun Jul 27 09:01:24 2008 @@ -165,17 +165,19 @@ MingwModuleHandler* handler; switch ( module.type ) { + case StaticLibrary: + case HostStaticLibrary: + case ObjectLibrary: + case RpcServer: + case RpcClient: + case RpcProxy: + case MessageHeader: + case IdlHeader: + case EmbeddedTypeLib: + handler = new MingwModuleHandler( module ); + break; case BuildTool: handler = new MingwBuildToolModuleHandler ( module ); - break; - case StaticLibrary: - handler = new MingwStaticLibraryModuleHandler ( module ); - break; - case HostStaticLibrary: - handler = new MingwHostStaticLibraryModuleHandler ( module ); - break; - case ObjectLibrary: - handler = new MingwObjectLibraryModuleHandler ( module ); break; case Kernel: handler = new MingwKernelModuleHandler ( module ); @@ -230,29 +232,11 @@ case Test: handler = new MingwTestModuleHandler ( module ); break; - case RpcServer: - handler = new MingwRpcServerModuleHandler ( module ); - break; - case RpcClient: - handler = new MingwRpcClientModuleHandler ( module ); - break; - case RpcProxy: - handler = new MingwRpcProxyModuleHandler ( module ); - break; case Alias: handler = new MingwAliasModuleHandler ( module ); break; - case MessageHeader: - handler = new MingwMessageHeaderModuleHandler (module); - break; - case IdlHeader: - handler = new MingwIdlHeaderModuleHandler ( module ); - break; case Cabinet: handler = new MingwCabinetModuleHandler ( module ); - break; - case EmbeddedTypeLib: - handler = new MingwEmbeddedTypeLibModuleHandler ( module ); break; case ElfExecutable: handler = new MingwElfExecutableModuleHandler ( module ); @@ -2541,84 +2525,11 @@ } -MingwStaticLibraryModuleHandler::MingwStaticLibraryModuleHandler ( - const Module& module_ ) - - : MingwModuleHandler ( module_ ) -{ -} - -void -MingwStaticLibraryModuleHandler::Process () -{ - GenerateStaticLibraryModuleTarget (); -} - -void -MingwStaticLibraryModuleHandler::GenerateStaticLibraryModuleTarget () -{ - GenerateRules (); -} - - -MingwHostStaticLibraryModuleHandler::MingwHostStaticLibraryModuleHandler ( - const Module& module_ ) - - : MingwModuleHandler ( module_ ) -{ -} - -void -MingwHostStaticLibraryModuleHandler::Process () -{ - GenerateHostStaticLibraryModuleTarget (); -} - -void -MingwHostStaticLibraryModuleHandler::GenerateHostStaticLibraryModuleTarget () -{ - GenerateRules (); -} - - -MingwObjectLibraryModuleHandler::MingwObjectLibraryModuleHandler ( - const Module& module_ ) - - : MingwModuleHandler ( module_ ) -{ -} - -void -MingwObjectLibraryModuleHandler::Process () -{ - GenerateObjectLibraryModuleTarget (); -} - -void -MingwObjectLibraryModuleHandler::GenerateObjectLibraryModuleTarget () -{ - GenerateRules (); -} - - MingwKernelModeDLLModuleHandler::MingwKernelModeDLLModuleHandler ( const Module& module_ ) : MingwModuleHandler ( module_ ) { -} - -MingwEmbeddedTypeLibModuleHandler::MingwEmbeddedTypeLibModuleHandler ( - const Module& module_ ) - - : MingwModuleHandler ( module_ ) -{ -} - -void -MingwEmbeddedTypeLibModuleHandler::Process () -{ - GenerateRules (); } @@ -3695,48 +3606,6 @@ } -MingwRpcServerModuleHandler::MingwRpcServerModuleHandler ( - const Module& module_ ) - - : MingwModuleHandler ( module_ ) -{ -} - -void -MingwRpcServerModuleHandler::Process () -{ - GenerateRules (); -} - - -MingwRpcClientModuleHandler::MingwRpcClientModuleHandler ( - const Module& module_ ) - - : MingwModuleHandler ( module_ ) -{ -} - -void -MingwRpcClientModuleHandler::Process () -{ - GenerateRules (); -} - - -MingwRpcProxyModuleHandler::MingwRpcProxyModuleHandler ( - const Module& module_ ) - - : MingwModuleHandler ( module_ ) -{ -} - -void -MingwRpcProxyModuleHandler::Process () -{ - GenerateRules (); -} - - MingwAliasModuleHandler::MingwAliasModuleHandler ( const Module& module_ ) @@ -3749,31 +3618,6 @@ { } -MingwMessageHeaderModuleHandler::MingwMessageHeaderModuleHandler ( - const Module& module_ ) - - : MingwModuleHandler ( module_ ) -{ -} - -void -MingwMessageHeaderModuleHandler::Process () -{ - GenerateRules (); -} - -MingwIdlHeaderModuleHandler::MingwIdlHeaderModuleHandler ( - const Module& module_ ) - - : MingwModuleHandler ( module_ ) -{ -} - -void -MingwIdlHeaderModuleHandler::Process () -{ - GenerateRules (); -} MingwCabinetModuleHandler::MingwCabinetModuleHandler ( const Module& module_ ) Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h [iso-8859-1] Sun Jul 27 09:01:24 2008 @@ -65,9 +65,8 @@ static MingwModuleHandler* InstanciateHandler ( const Module& module_, MingwBackend* backend_ ); - virtual HostType DefaultHost() = 0; void GeneratePreconditionDependencies (); - virtual void Process () = 0; + virtual void Process () { GenerateRules (); } virtual std::string TypeSpecificCFlags() { return ""; } virtual std::string TypeSpecificNasmFlags() { return ""; } virtual std::string TypeSpecificLinkerFlags() { return ""; } @@ -192,7 +191,6 @@ { public: MingwBuildToolModuleHandler ( const Module& module ); - virtual HostType DefaultHost() { return HostTrue; } virtual void Process (); private: void GenerateBuildToolModuleTarget (); @@ -203,51 +201,16 @@ { public: MingwKernelModuleHandler ( const Module& module ); - virtual HostType DefaultHost() { return HostFalse; } virtual void Process (); private: void GenerateKernelModuleTarget (); }; -class MingwStaticLibraryModuleHandler : public MingwModuleHandler -{ -public: - MingwStaticLibraryModuleHandler ( const Module& module ); - virtual HostType DefaultHost() { return HostFalse; } - virtual void Process (); -private: - void GenerateStaticLibraryModuleTarget (); -}; - - -class MingwHostStaticLibraryModuleHandler : public MingwModuleHandler -{ -public: - MingwHostStaticLibraryModuleHandler ( const Module& module ); - virtual HostType DefaultHost() { return HostTrue; } - virtual void Process (); -private: - void GenerateHostStaticLibraryModuleTarget (); -}; - - -class MingwObjectLibraryModuleHandler : public MingwModuleHandler -{ -public: - MingwObjectLibraryModuleHandler ( const Module& module ); - virtual HostType DefaultHost() { return HostFalse; } - virtual void Process (); -private: - void GenerateObjectLibraryModuleTarget (); -}; - - class MingwKernelModeDLLModuleHandler : public MingwModuleHandler { public: MingwKernelModeDLLModuleHandler ( const Module& module ); - virtual HostType DefaultHost() { return HostFalse; } virtual void Process (); void AddImplicitLibraries ( Module& module ); private: @@ -259,7 +222,6 @@ { public: MingwKernelModeDriverModuleHandler ( const Module& module ); - virtual HostType DefaultHost() { return HostFalse; } virtual void Process (); std::string TypeSpecificCFlags() { return "-D__NTDRIVER__"; } void AddImplicitLibraries ( Module& module ); @@ -272,7 +234,6 @@ { public: MingwNativeDLLModuleHandler ( const Module& module ); - virtual HostType DefaultHost() { return HostFalse; } virtual void Process (); void AddImplicitLibraries ( Module& module ); private: @@ -284,7 +245,6 @@ { public: MingwNativeCUIModuleHandler ( const Module& module ); - virtual HostType DefaultHost() { return HostFalse; } virtual void Process (); std::string TypeSpecificCFlags() { return "-D__NTAPP__"; } void AddImplicitLibraries ( Module& module ); @@ -297,7 +257,6 @@ { public: MingwWin32DLLModuleHandler ( const Module& module ); - virtual HostType DefaultHost() { return HostFalse; } virtual void Process (); void AddImplicitLibraries ( Module& module ); private: @@ -309,7 +268,6 @@ { public: MingwWin32OCXModuleHandler ( const Module& module ); - virtual HostType DefaultHost() { return HostFalse; } virtual void Process (); void AddImplicitLibraries ( Module& module ); private: @@ -321,7 +279,6 @@ { public: MingwWin32CUIModuleHandler ( const Module& module ); - virtual HostType DefaultHost() { return HostFalse; } virtual void Process (); void AddImplicitLibraries ( Module& module ); private: @@ -333,7 +290,6 @@ { public: MingwWin32GUIModuleHandler ( const Module& module ); - virtual HostType DefaultHost() { return HostFalse; } virtual void Process (); void AddImplicitLibraries ( Module& module ); private: @@ -345,7 +301,6 @@ { public: MingwBootLoaderModuleHandler ( const Module& module ); - virtual HostType DefaultHost() { return HostFalse; } virtual void Process (); std::string TypeSpecificLinkerFlags() { return "-nostartfiles -nostdlib"; } private: @@ -357,7 +312,6 @@ { public: MingwBootSectorModuleHandler ( const Module& module ); - virtual HostType DefaultHost() { return HostFalse; } virtual void Process (); std::string TypeSpecificNasmFlags() { return "-f bin"; } private: @@ -369,7 +323,6 @@ { public: MingwBootProgramModuleHandler ( const Module& module ); - virtual HostType DefaultHost() { return HostFalse; } virtual void Process (); std::string GetProgTextAddrMacro (); std::string TypeSpecificLinkerFlags() { return "-nostartfiles -nostdlib"; } @@ -382,7 +335,6 @@ { public: MingwIsoModuleHandler ( const Module& module ); - virtual HostType DefaultHost() { return HostFalse; } virtual void Process (); private: void GenerateIsoModuleTarget (); @@ -401,7 +353,6 @@ { public: MingwLiveIsoModuleHandler ( const Module& module ); - virtual HostType DefaultHost() { return HostFalse; } virtual void Process (); private: void GenerateLiveIsoModuleTarget (); @@ -420,7 +371,6 @@ { public: MingwTestModuleHandler ( const Module& module ); - virtual HostType DefaultHost() { return HostFalse; } virtual void Process (); protected: virtual void GetModuleSpecificCompilationUnits ( std::vector<CompilationUnit*>& compilationUnits ); @@ -428,54 +378,10 @@ void GenerateTestModuleTarget (); }; - -class MingwRpcServerModuleHandler : public MingwModuleHandler -{ -public: - MingwRpcServerModuleHandler ( const Module& module ); - virtual HostType DefaultHost() { return HostFalse; } - virtual void Process (); -}; - - -class MingwRpcClientModuleHandler : public MingwModuleHandler -{ -public: - MingwRpcClientModuleHandler ( const Module& module ); - virtual HostType DefaultHost() { return HostFalse; } - virtual void Process (); -}; - - -class MingwRpcProxyModuleHandler : public MingwModuleHandler -{ -public: - MingwRpcProxyModuleHandler ( const Module& module ); - virtual HostType DefaultHost() { return HostFalse; } - virtual void Process (); -}; - -class MingwMessageHeaderModuleHandler : public MingwModuleHandler -{ -public: - MingwMessageHeaderModuleHandler ( const Module& module ); - virtual HostType DefaultHost() { return HostFalse; } - virtual void Process (); -}; - class MingwAliasModuleHandler : public MingwModuleHandler { public: MingwAliasModuleHandler ( const Module& module ); - virtual HostType DefaultHost() { return HostFalse; } - virtual void Process (); -}; - -class MingwIdlHeaderModuleHandler : public MingwModuleHandler -{ -public: - MingwIdlHeaderModuleHandler ( const Module& module ); - virtual HostType DefaultHost() { return HostFalse; } virtual void Process (); }; @@ -483,15 +389,6 @@ { public: MingwCabinetModuleHandler ( const Module& module ); - virtual HostType DefaultHost() { return HostFalse; } - virtual void Process (); -}; - -class MingwEmbeddedTypeLibModuleHandler : public MingwModuleHandler -{ -public: - MingwEmbeddedTypeLibModuleHandler ( const Module& module ); - virtual HostType DefaultHost() { return HostFalse; } virtual void Process (); }; @@ -499,7 +396,6 @@ { public: MingwElfExecutableModuleHandler ( const Module& module ); - virtual HostType DefaultHost() { return HostFalse; } virtual void Process (); }; Modified: trunk/reactos/tools/rbuild/rbuild.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/rbuild.h?rev=… ============================================================================== --- trunk/reactos/tools/rbuild/rbuild.h [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/rbuild.h [iso-8859-1] Sun Jul 27 09:01:24 2008 @@ -275,39 +275,39 @@ enum ModuleType { - BuildTool = 0, - StaticLibrary = 1, - ObjectLibrary = 2, - Kernel = 3, - KernelModeDLL = 4, - KernelModeDriver = 5, - NativeDLL = 6, - NativeCUI = 7, - Win32DLL = 8, - Win32OCX = 9, - Win32CUI = 10, - Win32GUI = 11, - BootLoader = 12, - BootSector = 13, - Iso = 14, - LiveIso = 15, - Test = 16, - RpcServer = 17, - RpcClient = 18, - Alias = 19, - BootProgram = 20, - Win32SCR = 21, - IdlHeader = 23, - IsoRegTest = 24, - LiveIsoRegTest = 25, - EmbeddedTypeLib = 26, - ElfExecutable = 27, + BuildTool, + StaticLibrary, + ObjectLibrary, + Kernel, + KernelModeDLL, + KernelModeDriver, + NativeDLL, + NativeCUI, + Win32DLL, + Win32OCX, + Win32CUI, + Win32GUI, + BootLoader, + BootSector, + Iso, + LiveIso, + Test, + RpcServer, + RpcClient, + Alias, + BootProgram, + Win32SCR, + IdlHeader, + IsoRegTest, + LiveIsoRegTest, + EmbeddedTypeLib, + ElfExecutable, RpcProxy, HostStaticLibrary, - TypeDontCare, Cabinet, KeyboardLayout, - MessageHeader + MessageHeader, + TypeDontCare, // always at the end }; enum HostType

1 0

[sserapion] 34845: Fix Build.
by sserapion＠svn.reactos.org 27 Jul '08

27 Jul '08

Author: sserapion Date: Sun Jul 27 08:42:46 2008 New Revision: 34845 URL: http://svn.reactos.org/svn/reactos?rev=34845&view=rev Log: Fix Build. Modified: branches/ros-amd64-bringup/reactos/include/psdk/winnt.h Modified: branches/ros-amd64-bringup/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/psdk/winnt.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/psdk/winnt.h [iso-8859-1] Sun Jul 27 08:42:46 2008 @@ -2251,13 +2251,6 @@ }; } KNONVOLATILE_CONTEXT_POINTERS, *PKNONVOLATILE_CONTEXT_POINTERS; -typedef EXCEPTION_DISPOSITION (*PEXCEPTION_ROUTINE) ( - IN struct _EXCEPTION_RECORD *ExceptionRecord, - IN PVOID EstablisherFrame, - IN OUT struct _CONTEXT *ContextRecord, - IN OUT PVOID DispatcherContext - ); - #define UNW_FLAG_NHANDLER 0x0 /* No handler. */ #define UNW_FLAG_EHANDLER 0x1 /* Exception handler should be called */ #define UNW_FLAG_UHANDLER 0x2 /* Termination handler that should be called when unwinding an exception */ @@ -2303,17 +2296,6 @@ BOOLEAN __cdecl RtlDeleteFunctionTable(PRUNTIME_FUNCTION FunctionTable); - -PEXCEPTION_ROUTINE -WINAPI -RtlVirtualUnwind (IN ULONG HandlerType, - IN ULONG64 ImageBase, - IN ULONG64 ControlPc, - IN PRUNTIME_FUNCTION FunctionEntry, - IN OUT PCONTEXT ContextRecord, - OUT PVOID *HandlerData, - OUT PULONG64 EstablisherFrame, - IN OUT PKNONVOLATILE_CONTEXT_POINTERS ContextPointers OPTIONAL); #elif defined(_PPC_) #define CONTEXT_CONTROL 1L

1 0

[cfinck] 34844: Daniel Verkamp (daniel.verkamp@gmail.com): - Fix buildno warnings when compiled with GCC 4.2.x or later See issue #3578 for more details.
by cfinck＠svn.reactos.org 27 Jul '08

27 Jul '08

Author: cfinck Date: Sun Jul 27 08:34:53 2008 New Revision: 34844 URL: http://svn.reactos.org/svn/reactos?rev=34844&view=rev Log: Daniel Verkamp (daniel.verkamp(a)gmail.com): - Fix buildno warnings when compiled with GCC 4.2.x or later See issue #3578 for more details. Modified: trunk/reactos/tools/buildno/buildno.cpp Modified: trunk/reactos/tools/buildno/buildno.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/buildno/buildno.cpp?… ============================================================================== --- trunk/reactos/tools/buildno/buildno.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/buildno/buildno.cpp [iso-8859-1] Sun Jul 27 08:34:53 2008 @@ -33,11 +33,11 @@ #define FALSE 0 #define TRUE 1 -static char * argv0 = ""; +static const char * argv0 = ""; static char * filename = NULL; static char * build_tag = NULL; -int count_wide_string( wchar_t *str ) +int count_wide_string( const wchar_t *str ) { int i; for( i = 0; str[i]; i++ )

1 0

[tkreuzer] 34843: LdrPEGetExportByName: The function and name table in the PE consists of RVA's that are stored in ULONGs. Change pointers accordingly PULONG* -> ULONG*
by tkreuzer＠svn.reactos.org 27 Jul '08

27 Jul '08

Author: tkreuzer Date: Sun Jul 27 06:41:11 2008 New Revision: 34843 URL: http://svn.reactos.org/svn/reactos?rev=34843&view=rev Log: LdrPEGetExportByName: The function and name table in the PE consists of RVA's that are stored in ULONGs. Change pointers accordingly PULONG* -> ULONG* Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/reactos/imageldr.c Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/reactos/imageldr.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… ============================================================================== --- branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/reactos/imageldr.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/reactos/imageldr.c [iso-8859-1] Sun Jul 27 06:41:11 2008 @@ -231,8 +231,8 @@ USHORT Hint) { PIMAGE_EXPORT_DIRECTORY ExportDir; - PULONG * ExFunctions; - PULONG * ExNames; + ULONG * ExFunctions; + ULONG * ExNames; USHORT * ExOrdinals; PVOID ExName; ULONG Ordinal; @@ -267,10 +267,10 @@ /* * Get header pointers */ - ExNames = (PULONG *)RVA(BaseAddress, ExportDir->AddressOfNames); + ExNames = (ULONG *)RVA(BaseAddress, ExportDir->AddressOfNames); ExOrdinals = (USHORT *)RVA(BaseAddress, ExportDir->AddressOfNameOrdinals); - ExFunctions = (PULONG *)RVA(BaseAddress, ExportDir->AddressOfFunctions); - + ExFunctions = (ULONG *)RVA(BaseAddress, ExportDir->AddressOfFunctions); + /* * Check the hint first */

1 0

[tkreuzer] 34842: - fix KESEG0_BASE
by tkreuzer＠svn.reactos.org 27 Jul '08

27 Jul '08

Author: tkreuzer Date: Sun Jul 27 06:11:02 2008 New Revision: 34842 URL: http://svn.reactos.org/svn/reactos?rev=34842&view=rev Log: - fix KESEG0_BASE Modified: branches/ros-amd64-bringup/reactos/include/ndk/amd64/ketypes.h Modified: branches/ros-amd64-bringup/reactos/include/ndk/amd64/ketypes.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/ndk/amd64/ketypes.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/ndk/amd64/ketypes.h [iso-8859-1] Sun Jul 27 06:11:02 2008 @@ -131,7 +131,7 @@ // // Static Kernel-Mode Address start (use MM_KSEG0_BASE for actual) // -#define KSEG0_BASE 0x80000000 +#define KSEG0_BASE 0xffff080000000000ULL // // Synchronization-level IRQL

1 0

[hpoussin] 34841: Use hal.spec file for i386 build
by hpoussin＠svn.reactos.org 27 Jul '08

27 Jul '08

Author: hpoussin Date: Sun Jul 27 04:56:21 2008 New Revision: 34841 URL: http://svn.reactos.org/svn/reactos?rev=34841&view=rev Log: Use hal.spec file for i386 build Removed: trunk/reactos/hal/hal/hal_i386.def Modified: trunk/reactos/hal/halx86/halmp.rbuild trunk/reactos/hal/halx86/halup.rbuild trunk/reactos/hal/halx86/halxbox.rbuild Removed: trunk/reactos/hal/hal/hal_i386.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/hal/hal_i386.def?rev=3… ============================================================================== --- trunk/reactos/hal/hal/hal_i386.def [iso-8859-1] (original) +++ trunk/reactos/hal/hal/hal_i386.def (removed) @@ -1,98 +1,0 @@ -; Hardware Abstraction Layer - ReactOS Operating System - -LIBRARY hal.dll - -EXPORTS -@ExAcquireFastMutex@4=@ExiAcquireFastMutex@4 -@ExReleaseFastMutex@4=@ExiReleaseFastMutex@4 -@ExTryToAcquireFastMutex@4=@ExiTryToAcquireFastMutex@4 -@HalClearSoftwareInterrupt@4 -@HalRequestSoftwareInterrupt@4 -@HalSystemVectorDispatchEntry@12 -@KeAcquireInStackQueuedSpinLock@8 -@KeAcquireInStackQueuedSpinLockRaiseToSynch@8 -@KeAcquireSpinLockRaiseToSynch@4 -@KeAcquireQueuedSpinLock@4 -@KeAcquireQueuedSpinLockRaiseToSynch@4 -@KeReleaseInStackQueuedSpinLock@4 -@KeReleaseQueuedSpinLock@8 -@KeTryToAcquireQueuedSpinLock@8 -@KeTryToAcquireQueuedSpinLockRaiseToSynch@8 -@KfAcquireSpinLock@4 -@KfLowerIrql@4 -@KfRaiseIrql@4 -@KfReleaseSpinLock@8 - -HalAcquireDisplayOwnership@4 -HalAdjustResourceList@4 -HalAllProcessorsStarted@0 -HalAllocateAdapterChannel@16 -HalAllocateCommonBuffer@16 -HalAllocateCrashDumpRegisters@8 -HalAssignSlotResources@32 -HalBeginSystemInterrupt@12 -HalCalibratePerformanceCounter@12 -HalDisableSystemInterrupt@8 -HalDisplayString@4 -HalEnableSystemInterrupt@12 -HalEndSystemInterrupt@8 -HalFlushCommonBuffer@20 -HalFreeCommonBuffer@24 -HalGetAdapter@8 -HalGetBusData@20 -HalGetBusDataByOffset@24 -HalGetEnvironmentVariable@12 -HalGetInterruptVector@24 -HalHandleNMI@4 -HalInitSystem@8 -HalInitializeProcessor@8 -HalMakeBeep@4 -HalProcessorIdle@0 -HalQueryDisplayParameters@16 -HalQueryRealTimeClock@4 -HalReadDmaCounter@4 -HalReportResourceUsage@0 -HalRequestIpi@4 -HalReturnToFirmware@4 -HalSetBusData@20 -HalSetBusDataByOffset@24 -HalSetDisplayParameters@8 -HalSetEnvironmentVariable@8 -HalSetProfileInterval@4 -HalSetRealTimeClock@4 -HalSetTimeIncrement@4 -HalStartNextProcessor@8 -HalStartProfileInterrupt@4 -HalStopProfileInterrupt@4 -HalTranslateBusAddress@24 -IoAssignDriveLetters@16=HalpAssignDriveLetters@16 -IoFlushAdapterBuffers@24 -IoFreeAdapterChannel@4 -IoFreeMapRegisters@12 -IoMapTransfer@24 -IoReadPartitionTable@16=HalpReadPartitionTable@16 -IoSetPartitionInformation@16=HalpSetPartitionInformation@16 -IoWritePartitionTable@20=HalpWritePartitionTable@20 -KeAcquireSpinLock@8 -KdComPortInUse=_KdComPortInUse DATA -KeFlushWriteBuffer@0 -KeGetCurrentIrql@0 -KeLowerIrql@4 -KeQueryPerformanceCounter@4 -KeRaiseIrql@8 -KeRaiseIrqlToDpcLevel@0 -KeRaiseIrqlToSynchLevel@0 -KeReleaseSpinLock@8 -KeStallExecutionProcessor@4 -READ_PORT_BUFFER_UCHAR@12 -READ_PORT_BUFFER_ULONG@12 -READ_PORT_BUFFER_USHORT@12 -READ_PORT_UCHAR@4 -READ_PORT_ULONG@4 -READ_PORT_USHORT@4 -WRITE_PORT_BUFFER_UCHAR@12 -WRITE_PORT_BUFFER_ULONG@12 -WRITE_PORT_BUFFER_USHORT@12 -WRITE_PORT_UCHAR@8 -WRITE_PORT_ULONG@8 -WRITE_PORT_USHORT@8 Modified: trunk/reactos/hal/halx86/halmp.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/halmp.rbuild?re… ============================================================================== --- trunk/reactos/hal/halx86/halmp.rbuild [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/halmp.rbuild [iso-8859-1] Sun Jul 27 04:56:21 2008 @@ -2,7 +2,7 @@ <!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd"> <group xmlns:xi="http://www.w3.org/2001/XInclude"> <module name="halmp" type="kernelmodedll" entrypoint="0"> - <importlibrary base="hal" definition="hal_i386.def" /> + <importlibrary base="hal" definition="hal.spec.def" /> <bootstrap installbase="$(CDOUTPUT)" /> <include>include</include> <include base="ntoskrnl">include</include> Modified: trunk/reactos/hal/halx86/halup.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/halup.rbuild?re… ============================================================================== --- trunk/reactos/hal/halx86/halup.rbuild [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/halup.rbuild [iso-8859-1] Sun Jul 27 04:56:21 2008 @@ -2,7 +2,7 @@ <!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd"> <group xmlns:xi="http://www.w3.org/2001/XInclude"> <module name="halup" type="kernelmodedll" entrypoint="0" installname="hal.dll"> - <importlibrary base="hal" definition="hal_i386.def" /> + <importlibrary base="hal" definition="hal.spec.def" /> <bootstrap installbase="$(CDOUTPUT)" /> <include>include</include> <include base="ntoskrnl">include</include> Modified: trunk/reactos/hal/halx86/halxbox.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/halxbox.rbuild?… ============================================================================== --- trunk/reactos/hal/halx86/halxbox.rbuild [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/halxbox.rbuild [iso-8859-1] Sun Jul 27 04:56:21 2008 @@ -2,7 +2,7 @@ <!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd"> <group xmlns:xi="http://www.w3.org/2001/XInclude"> <module name="halxbox" type="kernelmodedll" entrypoint="0" allowwarnings="true"> - <importlibrary base="hal" definition="hal_i386.def" /> + <importlibrary base="hal" definition="hal.spec.def" /> <include>include</include> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" />

1 0

[sserapion] 34840: revert r34835: "_WIN32 Defined for applications for Win32 and Win64. Always defined." http://msdn.microsoft.com/en-us/library/b0084kay.aspx winnt.h: Define KNONVOLATILE_CONTEXT_POINTERS, EXCEPTION_DISPOSITION, RtlVirtualUnwind
by sserapion＠svn.reactos.org 27 Jul '08

27 Jul '08

Author: sserapion Date: Sun Jul 27 04:45:59 2008 New Revision: 34840 URL: http://svn.reactos.org/svn/reactos?rev=34840&view=rev Log: revert r34835: "_WIN32 Defined for applications for Win32 and Win64. Always defined." http://msdn.microsoft.com/en-us/library/b0084kay.aspx winnt.h: Define KNONVOLATILE_CONTEXT_POINTERS, EXCEPTION_DISPOSITION, RtlVirtualUnwind Modified: branches/ros-amd64-bringup/reactos/include/psdk/windef.h branches/ros-amd64-bringup/reactos/include/psdk/winnt.h Modified: branches/ros-amd64-bringup/reactos/include/psdk/windef.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/psdk/windef.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/psdk/windef.h [iso-8859-1] Sun Jul 27 04:45:59 2008 @@ -25,23 +25,12 @@ * including windows.h or any other method of including the windef.h header. */ #endif - -#if !defined(WIN64) && !defined(_M_AMD64) && !defined(_M_IA64) #ifndef WIN32 #define WIN32 #endif #ifndef _WIN32 #define _WIN32 #endif -#else // WIN64 -#ifdef WIN32 -#undef WIN32 -#endif -#ifdef _WIN32 -#undef _WIN32 -#endif -#endif // WIN64 - #define FAR #define far #define NEAR Modified: branches/ros-amd64-bringup/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/psdk/winnt.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/psdk/winnt.h [iso-8859-1] Sun Jul 27 04:45:59 2008 @@ -2204,6 +2204,65 @@ DWORD64 LastExceptionFromRip; } CONTEXT, *PCONTEXT; + +typedef struct _KNONVOLATILE_CONTEXT_POINTERS { + union { + PM128A FloatingContext[16]; + struct { + PM128A Xmm0; + PM128A Xmm1; + PM128A Xmm2; + PM128A Xmm3; + PM128A Xmm4; + PM128A Xmm5; + PM128A Xmm6; + PM128A Xmm7; + PM128A Xmm8; + PM128A Xmm9; + PM128A Xmm10; + PM128A Xmm11; + PM128A Xmm12; + PM128A Xmm13; + PM128A Xmm14; + PM128A Xmm15; + }; + }; + + union { + PULONG64 IntegerContext[16]; + struct { + PULONG64 Rax; + PULONG64 Rcx; + PULONG64 Rdx; + PULONG64 Rbx; + PULONG64 Rsp; + PULONG64 Rbp; + PULONG64 Rsi; + PULONG64 Rdi; + PULONG64 R8; + PULONG64 R9; + PULONG64 R10; + PULONG64 R11; + PULONG64 R12; + PULONG64 R13; + PULONG64 R14; + PULONG64 R15; + }; + }; +} KNONVOLATILE_CONTEXT_POINTERS, *PKNONVOLATILE_CONTEXT_POINTERS; + +typedef EXCEPTION_DISPOSITION (*PEXCEPTION_ROUTINE) ( + IN struct _EXCEPTION_RECORD *ExceptionRecord, + IN PVOID EstablisherFrame, + IN OUT struct _CONTEXT *ContextRecord, + IN OUT PVOID DispatcherContext + ); + +#define UNW_FLAG_NHANDLER 0x0 /* No handler. */ +#define UNW_FLAG_EHANDLER 0x1 /* Exception handler should be called */ +#define UNW_FLAG_UHANDLER 0x2 /* Termination handler that should be called when unwinding an exception */ +#define UNW_FLAG_CHAININFO 0x4 /* FunctionEntry member is the contents of a previous function table entry */ + #define RUNTIME_FUNCTION_INDIRECT 0x1 typedef struct _RUNTIME_FUNCTION { @@ -2217,10 +2276,44 @@ #define OUT_OF_PROCESS_FUNCTION_TABLE_CALLBACK_EXPORT_NAME "OutOfProcessFunctionTableCallback" - NTSYSAPI VOID __cdecl RtlRestoreContext (PCONTEXT ContextRecord,struct _EXCEPTION_RECORD *ExceptionRecord); - NTSYSAPI BOOLEAN __cdecl RtlAddFunctionTable(PRUNTIME_FUNCTION FunctionTable,DWORD EntryCount,DWORD64 BaseAddress); - NTSYSAPI BOOLEAN __cdecl RtlInstallFunctionTableCallback(DWORD64 TableIdentifier,DWORD64 BaseAddress,DWORD Length,PGET_RUNTIME_FUNCTION_CALLBACK Callback,PVOID Context,PCWSTR OutOfProcessCallbackDll); - NTSYSAPI BOOLEAN __cdecl RtlDeleteFunctionTable(PRUNTIME_FUNCTION FunctionTable); +NTSYSAPI +VOID +__cdecl +RtlRestoreContext(PCONTEXT ContextRecord, + struct _EXCEPTION_RECORD *ExceptionRecord); + +NTSYSAPI +BOOLEAN +__cdecl +RtlAddFunctionTable(PRUNTIME_FUNCTION FunctionTable, + DWORD EntryCount, + DWORD64 BaseAddress); + +NTSYSAPI +BOOLEAN +__cdecl +RtlInstallFunctionTableCallback(DWORD64 TableIdentifier, + DWORD64 BaseAddress, + DWORD Length, + PGET_RUNTIME_FUNCTION_CALLBACK Callback, + PVOID Context, + PCWSTR OutOfProcessCallbackDll); + +NTSYSAPI +BOOLEAN +__cdecl +RtlDeleteFunctionTable(PRUNTIME_FUNCTION FunctionTable); + +PEXCEPTION_ROUTINE +WINAPI +RtlVirtualUnwind (IN ULONG HandlerType, + IN ULONG64 ImageBase, + IN ULONG64 ControlPc, + IN PRUNTIME_FUNCTION FunctionEntry, + IN OUT PCONTEXT ContextRecord, + OUT PVOID *HandlerData, + OUT PULONG64 EstablisherFrame, + IN OUT PKNONVOLATILE_CONTEXT_POINTERS ContextPointers OPTIONAL); #elif defined(_PPC_) #define CONTEXT_CONTROL 1L

1 0

[tkreuzer] 34839: stub out hal.c, make it compile again
by tkreuzer＠svn.reactos.org 27 Jul '08

27 Jul '08

Author: tkreuzer Date: Sun Jul 27 04:16:49 2008 New Revision: 34839 URL: http://svn.reactos.org/svn/reactos?rev=34839&view=rev Log: stub out hal.c, make it compile again Modified: branches/ros-amd64-bringup/reactos/hal/halamd64/generic/hal.c branches/ros-amd64-bringup/reactos/hal/halamd64/include/halp.h Modified: branches/ros-amd64-bringup/reactos/hal/halamd64/generic/hal.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h… ============================================================================== --- branches/ros-amd64-bringup/reactos/hal/halamd64/generic/hal.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/hal/halamd64/generic/hal.c [iso-8859-1] Sun Jul 27 04:16:49 2008 @@ -47,22 +47,6 @@ 0xFFFF0019, // IRQL 13 0xFFFE0019, // IRQL 14 0xFFFC0019, // IRQL 15 - 0xFFF80019, // IRQL 16 - 0xFFF00019, // IRQL 17 - 0xFFE00019, // IRQL 18 - 0xFFC00019, // IRQL 19 - 0xFF800019, // IRQL 20 - 0xFF000019, // IRQL 21 - 0xFE000019, // IRQL 22 - 0xFC000019, // IRQL 23 - 0xF0000019, // IRQL 24 - 0x80000019, // IRQL 25 - 0x19, // IRQL 26 - 0x18, // IRQL 27 PROFILE_LEVEL - 0x10, // IRQL 28 CLOCK2_LEVEL - 0x00, // IRQL 29 IPI_LEVEL - 0x00, // IRQL 30 POWER_LEVEL - 0x00, // IRQL 31 HIGH_LEVEL }; UCHAR HalpMaskTable[HIGH_LEVEL + 1] = @@ -71,7 +55,7 @@ APC_LEVEL, // INT 1 SOFTWARE INTERRUPT DISPATCH_LEVEL,// INT 2 COMM RX IPI_LEVEL, // INT 3 COMM TX - CLOCK2_LEVEL, // INT 4 TIMER 0 + CLOCK_LEVEL, // INT 4 TIMER 0 3, 4, 5, @@ -82,22 +66,7 @@ 10, 11, 12, - 13, - 14, - 15, - 16, - 17, - 18, - 19, - 20, - 21, - 22, - 23, - 24, - 25, - 26, - 26, - 26 + 13 }; /* FUNCTIONS *****************************************************************/ @@ -145,34 +114,6 @@ KEBUGCHECK(0); return Interval; } - -VOID -FASTCALL -ExAcquireFastMutex( - PFAST_MUTEX FastMutex) -{ - UNIMPLEMENTED; -} - - -VOID -FASTCALL -ExReleaseFastMutex( - PFAST_MUTEX FastMutex) -{ - UNIMPLEMENTED; -} - - -BOOLEAN FASTCALL -ExTryToAcquireFastMutex( - PFAST_MUTEX FastMutex) -{ - UNIMPLEMENTED; - - return TRUE; -} - NTSTATUS NTAPI @@ -482,93 +423,29 @@ ULONG HalGetInterruptSource(VOID) { - ULONG InterruptStatus; - - // - // Get the interrupt status, and return the highest bit set - // - InterruptStatus = READ_REGISTER_ULONG(VIC_INT_STATUS); - return 31 - _clz(InterruptStatus); + KEBUGCHECK(0); + return 0; } VOID HalpClockInterrupt(VOID) { - // - // Clear the interrupt - // - ASSERT(KeGetCurrentIrql() == CLOCK2_LEVEL); - WRITE_REGISTER_ULONG(TIMER0_INT_CLEAR, 1); - - // - // FIXME: Update HAL Perf counters - // - - // - // FIXME: Check if someone changed the clockrate - // - - // - // Call the kernel - // - KeUpdateSystemTime(KeGetCurrentThread()->TrapFrame, - CLOCK2_LEVEL, - HalpCurrentTimeIncrement); - - // - // We're done - // + KEBUGCHECK(0); + return; } VOID HalpStallInterrupt(VOID) { - // - // Clear the interrupt - // - WRITE_REGISTER_ULONG(TIMER0_INT_CLEAR, 1); + KEBUGCHECK(0); + return; } VOID HalpInitializeInterrupts(VOID) { - PKPCR Pcr = (PKPCR)KeGetPcr(); - ULONG ClockInterval; - SP804_CONTROL_REGISTER ControlRegister; - - // - // Fill out the IRQL mappings - // - RtlCopyMemory(Pcr->IrqlTable, HalpIrqlTable, sizeof(Pcr->IrqlTable)); - RtlCopyMemory(Pcr->IrqlMask, HalpMaskTable, sizeof(Pcr->IrqlMask)); - - // - // Setup the clock and profile interrupt - // - Pcr->InterruptRoutine[CLOCK2_LEVEL] = HalpStallInterrupt; - - // - // Configure the interval to 10ms - // (INTERVAL (10ms) * TIMCLKfreq (1MHz)) - // --------------------------------------- == 10^4 - // (TIMCLKENXdiv (1) * PRESCALEdiv (1)) - // - ClockInterval = 0x2710; - - // - // Configure the timer - // - ControlRegister.AsUlong = 0; - ControlRegister.Wide = TRUE; - ControlRegister.Periodic = TRUE; - ControlRegister.Interrupt = TRUE; - ControlRegister.Enabled = TRUE; - - // - // Enable the timer - // - WRITE_REGISTER_ULONG(TIMER0_LOAD, ClockInterval); - WRITE_REGISTER_ULONG(TIMER0_CONTROL, ControlRegister.AsUlong); + KEBUGCHECK(0); + return; } /* @@ -579,91 +456,8 @@ HalInitSystem(IN ULONG BootPhase, IN PLOADER_PARAMETER_BLOCK LoaderBlock) { - PKPRCB Prcb = KeGetCurrentPrcb(); - - // - // Check the boot phase - // - if (!BootPhase) - { - // - // Get command-line parameters - // - HalpGetParameters(LoaderBlock); - -#if DBG - // - // Checked HAL requires checked kernel - // - if (!(Prcb->BuildType & PRCB_BUILD_DEBUG)) - { - // - // No match, bugcheck - // - KeBugCheckEx(MISMATCHED_HAL, 2, Prcb->BuildType, 1, 0); - } -#else - // - // Release build requires release HAL - // - if (Prcb->BuildType & PRCB_BUILD_DEBUG) - { - // - // No match, bugcheck - // - KeBugCheckEx(MISMATCHED_HAL, 2, Prcb->BuildType, 0, 0); - } -#endif - -#ifdef CONFIG_SMP - // - // SMP HAL requires SMP kernel - // - if (Prcb->BuildType & PRCB_BUILD_UNIPROCESSOR) - { - // - // No match, bugcheck - // - KeBugCheckEx(MISMATCHED_HAL, 2, Prcb->BuildType, 0, 0); - } -#endif - - // - // Validate the PRCB - // - if (Prcb->MajorVersion != PRCB_MAJOR_VERSION) - { - // - // Validation failed, bugcheck - // - KeBugCheckEx(MISMATCHED_HAL, 1, Prcb->MajorVersion, 1, 0); - } - - // - // Setup time increments to 10ms and 1ms - // - HalpCurrentTimeIncrement = 100000; - HalpNextTimeIncrement = 100000; - HalpNextIntervalCount = 0; - KeSetTimeIncrement(100000, 10000); - - // - // Initialize interrupts - // - HalpInitializeInterrupts(); - } - else if (BootPhase == 1) - { - // - // Switch to real clock interrupt - // - PCR->InterruptRoutine[CLOCK2_LEVEL] = HalpClockInterrupt; - } - - // - // All done, return - // - return TRUE; + KEBUGCHECK(0); + return; } @@ -704,23 +498,7 @@ NTAPI HalQueryRealTimeClock(IN PTIME_FIELDS Time) { - LARGE_INTEGER LargeTime; - ULONG Seconds; - - // - // Query the RTC value - // - Seconds = READ_REGISTER_ULONG(RTC_DATA); - - // - // Convert to time - // - RtlSecondsSince1970ToTime(Seconds, &LargeTime); - - // - // Convert to time-fields - // - RtlTimeToTimeFields(&LargeTime, Time); + KEBUGCHECK(0); return TRUE; } @@ -746,7 +524,7 @@ VOID NTAPI HalRequestIpi( - ULONG Unknown) + KAFFINITY TargetSet) { UNIMPLEMENTED; } @@ -756,20 +534,16 @@ FASTCALL HalRequestSoftwareInterrupt(IN KIRQL Request) { - // - // Force a software interrupt - // - WRITE_REGISTER_ULONG(VIC_SOFT_INT, 1 << Request); + KEBUGCHECK(0); + return; } VOID FASTCALL HalClearSoftwareInterrupt(IN KIRQL Request) { - // - // Clear a software interrupt - // - WRITE_REGISTER_ULONG(VIC_SOFT_INT_CLEAR, 1 << Request); + KEBUGCHECK(0); + return; } VOID @@ -1024,245 +798,27 @@ NTAPI KeStallExecutionProcessor(IN ULONG Microseconds) { - SP804_CONTROL_REGISTER ControlRegister; - - // - // Enable the timer - // - WRITE_REGISTER_ULONG(TIMER1_LOAD, Microseconds); - - // - // Configure the timer - // - ControlRegister.AsUlong = 0; - ControlRegister.OneShot = TRUE; - ControlRegister.Wide = TRUE; - ControlRegister.Periodic = TRUE; - ControlRegister.Enabled = TRUE; - WRITE_REGISTER_ULONG(TIMER1_CONTROL, ControlRegister.AsUlong); - - // - // Now we will loop until the timer reached 0 - // - while (READ_REGISTER_ULONG(TIMER1_VALUE)); + UNIMPLEMENTED; + return; } VOID FASTCALL KfLowerIrql(IN KIRQL NewIrql) { - ULONG InterruptMask; - ARM_STATUS_REGISTER Flags; - PKPCR Pcr = (PKPCR)KeGetPcr(); - - // - // Validate the new IRQL - // - Flags = KeArmStatusRegisterGet(); - _disable(); - ASSERT(NewIrql <= Pcr->CurrentIrql); - - // - // IRQLs are internally 8 bits - // - NewIrql &= 0xFF; - - // - // Setup the interrupt mask for this IRQL - // - InterruptMask = KeGetPcr()->IrqlTable[NewIrql]; -// DPRINT1("[LOWER] IRQL: %d InterruptMask: %lx\n", NewIrql, InterruptMask); - - // - // Clear interrupts associated to the old IRQL - // - WRITE_REGISTER_ULONG(VIC_INT_CLEAR, 0xFFFFFFFF); - - // - // Set the new interrupt mask - // PL190 VIC support only for now - // - WRITE_REGISTER_ULONG(VIC_INT_ENABLE, InterruptMask); - - // - // Save the new IRQL - // - Pcr->CurrentIrql = NewIrql; - if (!Flags.IrqDisable) _enable(); + UNIMPLEMENTED; + return; } KIRQL FASTCALL KfRaiseIrql(IN KIRQL NewIrql) { - KIRQL OldIrql; - ULONG InterruptMask; - ARM_STATUS_REGISTER Flags; - PKPCR Pcr = (PKPCR)KeGetPcr(); - - // - // Save the current IRQL - // - Flags = KeArmStatusRegisterGet(); - _disable(); - OldIrql = Pcr->CurrentIrql; - - // - // IRQLs are internally 8 bits - // - NewIrql &= 0xFF; - - // - // Setup the interrupt mask for this IRQL - // - InterruptMask = KeGetPcr()->IrqlTable[NewIrql]; - // DPRINT1("[RAISE] IRQL: %d InterruptMask: %lx\n", NewIrql, InterruptMask); - ASSERT(NewIrql >= OldIrql); - - // - // Clear interrupts associated to the old IRQL - // - WRITE_REGISTER_ULONG(VIC_INT_CLEAR, 0xFFFFFFFF); - - // - // Set the new interrupt mask - // PL190 VIC support only for now - // - WRITE_REGISTER_ULONG(VIC_INT_ENABLE, InterruptMask); - - // - // Save the new IRQL - // - Pcr->CurrentIrql = NewIrql; - if (!Flags.IrqDisable) _enable(); - return OldIrql; -} - -VOID -NTAPI -READ_PORT_BUFFER_UCHAR( - PUCHAR Port, - PUCHAR Buffer, - ULONG Count) -{ - UNIMPLEMENTED; -} - - -VOID -NTAPI -READ_PORT_BUFFER_ULONG( - PULONG Port, - PULONG Buffer, - ULONG Count) -{ - UNIMPLEMENTED; -} - - -VOID -NTAPI -READ_PORT_BUFFER_USHORT( - PUSHORT Port, - PUSHORT Buffer, - ULONG Count) -{ - UNIMPLEMENTED; -} - - -UCHAR -NTAPI -READ_PORT_UCHAR( - PUCHAR Port) -{ - UNIMPLEMENTED; - - return 0; -} - - -ULONG -NTAPI -READ_PORT_ULONG( - PULONG Port) -{ - UNIMPLEMENTED; - - return 0; -} - - -USHORT -NTAPI -READ_PORT_USHORT( - PUSHORT Port) -{ - UNIMPLEMENTED; - - return 0; -} - - -VOID -NTAPI -WRITE_PORT_BUFFER_UCHAR( - PUCHAR Port, - PUCHAR Buffer, - ULONG Count) -{ - UNIMPLEMENTED; -} - - -VOID -NTAPI -WRITE_PORT_BUFFER_USHORT( - PUSHORT Port, - PUSHORT Buffer, - ULONG Count) -{ - UNIMPLEMENTED; -} - - -VOID -NTAPI -WRITE_PORT_BUFFER_ULONG( - PULONG Port, - PULONG Buffer, - ULONG Count) -{ - UNIMPLEMENTED; -} - - -VOID -NTAPI -WRITE_PORT_UCHAR( - PUCHAR Port, - UCHAR Value) -{ - UNIMPLEMENTED; -} - -VOID -NTAPI -WRITE_PORT_ULONG( - PULONG Port, - ULONG Value) -{ - UNIMPLEMENTED; -} - -VOID -NTAPI -WRITE_PORT_USHORT( - PUSHORT Port, - USHORT Value) -{ - UNIMPLEMENTED; -} + UNIMPLEMENTED; + return; +} + + KIRQL KeRaiseIrqlToDpcLevel(VOID) @@ -1288,59 +844,22 @@ VOID HalpIdentifyProcessor(VOID) { - ARM_ID_CODE_REGISTER IdRegister; - - // - // Don't do it again - // - HalpProcessorIdentified = TRUE; - - // - // Read the ID Code - // - IdRegister = KeArmIdCodeRegisterGet(); - - // - // Architecture "6" CPUs support test-and-clean (926EJ-S and 1026EJ-S) - // - HalpTestCleanSupported = (IdRegister.Architecture == 6); + UNIMPLEMENTED; + return; } VOID HalSweepDcache(VOID) { - // - // We get called very early on, before HalInitSystem or any of the Hal* - // processor routines, so we need to figure out what CPU we're on. - // - if (!HalpProcessorIdentified) HalpIdentifyProcessor(); - - // - // Check if we can do it the ARMv5TE-J way - // - if (HalpTestCleanSupported) - { - // - // Test, clean, flush D-Cache - // - __asm__ __volatile__ ("1: mrc p15, 0, pc, c7, c14, 3; bne 1b"); - } - else - { - // - // We need to do it it by set/way - // - UNIMPLEMENTED; - } + UNIMPLEMENTED; + return; } VOID HalSweepIcache(VOID) { - // - // All ARM cores support the same Icache flush command, no need for HAL work - // - KeArmFlushIcache(); + UNIMPLEMENTED; + return; } /* @@ -1351,8 +870,8 @@ NTAPI KeGetCurrentIrql(VOID) { - /* Return IRQL */ - return PCR->CurrentIrql; + UNIMPLEMENTED; + return; } /* Modified: branches/ros-amd64-bringup/reactos/hal/halamd64/include/halp.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h… ============================================================================== --- branches/ros-amd64-bringup/reactos/hal/halamd64/include/halp.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/hal/halamd64/include/halp.h [iso-8859-1] Sun Jul 27 04:16:49 2008 @@ -2,17 +2,11 @@ #define __INTERNAL_HAL_HAL_H // -// ARM Headers +// amd64 Headers // -#include <internal/arm/ke.h> -#include <internal/arm/intrin_i.h> +#include <internal/amd64/ke.h> +#include <internal/amd64/intrin_i.h> -// -// Versatile Peripherals -// -#include <peripherals/pl011.h> -#include <peripherals/pl190.h> -#include <peripherals/sp804.h> // // WDK Hack

1 0

← Newer
1
...
12
13
14
15
16
17
18
...
77
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2008