Ros-diffs

ros-diffs@reactos.org

81390 discussions

[gadamopoulos] 53890: fix some relocations
by gadamopoulos＠svn.reactos.org 29 Sep '11

29 Sep '11

Author: gadamopoulos Date: Thu Sep 29 12:04:13 2011 New Revision: 53890 URL: http://svn.reactos.org/svn/reactos?rev=53890&view=rev Log: fix some relocations Modified: trunk/reactos/baseaddress.rbuild trunk/reactos/cmake/baseaddress.cmake Modified: trunk/reactos/baseaddress.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/baseaddress.rbuild?rev=538… ============================================================================== --- trunk/reactos/baseaddress.rbuild [iso-8859-1] (original) +++ trunk/reactos/baseaddress.rbuild [iso-8859-1] Thu Sep 29 12:04:13 2011 @@ -83,6 +83,7 @@ <property name="BASEADDRESS_CRYPT32" value="0x67ab0000" /> <property name="BASEADDRESS_HTTPAPI" value="0x67ae0000" /> <property name="BASEADDRESS_HID" value="0x688f0000" /> + <property name="BASEADDRESS_GDI32" value="0x68a00000" /> <property name="BASEADDRESS_PSXDLL" value="0x68eb0000" /> <property name="BASEADDRESS_PSAPI" value="0x68f70000" /> <property name="BASEADDRESS_KSPROXY" value="0x68f90000" /> @@ -182,6 +183,7 @@ <property name="BASEADDRESS_RESUTILS" value="0x75070000" /> <property name="BASEADDRESS_SAMLIB" value="0x750c0000" /> <property name="BASEADDRESS_CABINET" value="0x75120000" /> + <property name="BASEADDRESS_RICHED20" value="0x75260000" /> <property name="BASEADDRESS_NETCFGX" value="0x755f0000" /> <property name="BASEADDRESS_IPHLPAPI" value="0x75700000" /> <property name="BASEADDRESS_NDDEAPI" value="0x75940000" /> @@ -195,7 +197,6 @@ <property name="BASEADDRESS_WINSTA" value="0x762f0000" /> <property name="BASEADDRESS_D3D8THK" value="0x76340000" /> <property name="BASEADDRESS_RICHED32" value="0x76340000" /> - <property name="BASEADDRESS_RICHED20" value="0x76360000" /> <property name="BASEADDRESS_ODBCCP32" value="0x76380000" /> <property name="BASEADDRESS_TWAIN_32" value="0x76380000" /> <property name="BASEADDRESS_NETSHELL" value="0x76390000" /> @@ -249,7 +250,6 @@ <property name="BASEADDRESS_ACTIVEDS" value="0x77cb0000" /> <property name="BASEADDRESS_ADVAPI32" value="0x77db0000" /> <property name="BASEADDRESS_USER32" value="0x77e70000" /> - <property name="BASEADDRESS_GDI32" value="0x77ff0000" /> <property name="BASEADDRESS_DNSAPI" value="0x78020000" /> <property name="BASEADDRESS_MSVCRT" value="0x78050000" /> <property name="BASEADDRESS_MSVCRT20" value="0x781E0000" /> Modified: trunk/reactos/cmake/baseaddress.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/baseaddress.cmake?re… ============================================================================== --- trunk/reactos/cmake/baseaddress.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/baseaddress.cmake [iso-8859-1] Thu Sep 29 12:04:13 2011 @@ -228,7 +228,6 @@ set(baseaddress_iprtprio 0x777c0000) set(baseaddress_ws2help 0x777e0000) set(baseaddress_wshirda 0x777f0000) -set(baseaddress_version 0x77a40000) set(baseaddress_ole32 0x77a50000) set(baseaddress_olepro32 0x77b20000) set(baseaddress_activeds 0x77cb0000) @@ -239,6 +238,7 @@ set(baseaddress_msvcrt40 0x78700000) set(baseaddress_mscoree 0x79000000) set(baseaddress_fusion 0x79040000) +set(baseaddress_version 0x79a40000) set(baseaddress_ntdll 0x7c900000) set(baseaddress_kernel32 0x7cb10000) set(baseaddress_user32 0x7ccf0000)

1 0

[gadamopoulos] 53889: [kernel32] - Do not force the hard error dialog to appear. As a result, calling SetErrorMode now really prevents the hard error dialog from appearing.
by gadamopoulos＠svn.reactos.org 29 Sep '11

29 Sep '11

Author: gadamopoulos Date: Thu Sep 29 10:07:15 2011 New Revision: 53889 URL: http://svn.reactos.org/svn/reactos?rev=53889&view=rev Log: [kernel32] - Do not force the hard error dialog to appear. As a result, calling SetErrorMode now really prevents the hard error dialog from appearing. Modified: trunk/reactos/dll/win32/kernel32/client/except.c Modified: trunk/reactos/dll/win32/kernel32/client/except.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/except.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/except.c [iso-8859-1] Thu Sep 29 10:07:15 2011 @@ -300,7 +300,7 @@ ErrorParameters[3] = ExceptionRecord->ExceptionInformation[1]; /* Raise the harderror */ - ErrCode = NtRaiseHardError(STATUS_UNHANDLED_EXCEPTION | 0x10000000, + ErrCode = NtRaiseHardError(STATUS_UNHANDLED_EXCEPTION, 4, 0, ErrorParameters, OptionOkCancel, &ErrorResponse); if (NT_SUCCESS(ErrCode) && (ErrorResponse == ResponseCancel))

1 0

[tfaber] 53888: [NTOSKRNL] - Fix handling of hard error string parameters from kernel mode - Some simplification
by tfaber＠svn.reactos.org 29 Sep '11

29 Sep '11

Author: tfaber Date: Thu Sep 29 06:48:19 2011 New Revision: 53888 URL: http://svn.reactos.org/svn/reactos?rev=53888&view=rev Log: [NTOSKRNL] - Fix handling of hard error string parameters from kernel mode - Some simplification Modified: trunk/reactos/ntoskrnl/ex/harderr.c trunk/reactos/ntoskrnl/include/internal/ex.h Modified: trunk/reactos/ntoskrnl/ex/harderr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/harderr.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ex/harderr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/harderr.c [iso-8859-1] Thu Sep 29 06:48:19 2011 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS Kernel * LICENSE: GPL - See COPYING in the top level directory - * FILE: ntoskrnl/ex/error.c + * FILE: ntoskrnl/ex/harderr.c * PURPOSE: Error Functions and Status/Exception Dispatching/Raising * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) */ @@ -158,52 +158,27 @@ } } - /* Check if we have an exception port */ - if (Process->ExceptionPort) - { - /* Check if hard errors should be processed */ - if (Process->DefaultHardErrorProcessing & 1) + /* Enable hard error processing if it is enabled for the process + * or if the exception status forces it */ + if ((Process->DefaultHardErrorProcessing & 1) || + (ErrorStatus & 0x10000000)) + { + /* Check if we have an exception port */ + if (Process->ExceptionPort) { /* Use the port */ PortHandle = Process->ExceptionPort; } else { - /* It's disabled, check if the error overrides it */ - if (ErrorStatus & 0x10000000) - { - /* Use the port anyway */ - PortHandle = Process->ExceptionPort; - } - else - { - /* No such luck */ - PortHandle = NULL; - } - } - } - else - { - /* Check if hard errors are enabled */ - if (Process->DefaultHardErrorProcessing & 1) - { /* Use our default system port */ PortHandle = ExpDefaultErrorPort; } - else - { - /* It's disabled, check if the error overrides it */ - if (ErrorStatus & 0x10000000) - { - /* Use the port anyway */ - PortHandle = ExpDefaultErrorPort; - } - else - { - /* No such luck */ - PortHandle = NULL; - } - } + } + else + { + /* Don't process the error */ + PortHandle = NULL; } /* If hard errors are disabled, do nothing */ @@ -390,8 +365,8 @@ SIZE_T Size; UNICODE_STRING CapturedParams[MAXIMUM_HARDERROR_PARAMETERS]; ULONG i; - PULONG_PTR UserData = NULL, ParameterBase; - PUNICODE_STRING StringBase; + PVOID UserData = NULL; + PHARDERROR_USER_PARAMETERS UserParams; PWSTR BufferBase; ULONG SafeResponse; NTSTATUS Status; @@ -403,9 +378,8 @@ /* Check if we have strings */ if (UnicodeStringParameterMask) { - /* Add the maximum possible size */ - Size = (sizeof(ULONG_PTR) + sizeof(UNICODE_STRING)) * - MAXIMUM_HARDERROR_PARAMETERS + sizeof(UNICODE_STRING); + /* Calculate the required size */ + Size = FIELD_OFFSET(HARDERROR_USER_PARAMETERS, Buffer[0]); /* Loop each parameter */ for (i = 0; i < NumberOfParameters; i++) @@ -415,7 +389,7 @@ { /* Copy it */ RtlMoveMemory(&CapturedParams[i], - &Parameters[i], + (PVOID)Parameters[i], sizeof(UNICODE_STRING)); /* Increase the size */ @@ -425,21 +399,16 @@ /* Allocate the user data region */ Status = ZwAllocateVirtualMemory(NtCurrentProcess(), - (PVOID*)&UserData, + &UserData, 0, &Size, MEM_COMMIT, PAGE_READWRITE); if (!NT_SUCCESS(Status)) return Status; - /* Set the pointers to our various data */ - ParameterBase = UserData; - StringBase = (PVOID)((ULONG_PTR)UserData + - sizeof(ULONG_PTR) * - MAXIMUM_HARDERROR_PARAMETERS); - BufferBase = (PVOID)((ULONG_PTR)StringBase + - sizeof(UNICODE_STRING) * - MAXIMUM_HARDERROR_PARAMETERS); + /* Set the pointers to our data */ + UserParams = UserData; + BufferBase = UserParams->Buffer; /* Loop parameters again */ for (i = 0; i < NumberOfParameters; i++) @@ -448,7 +417,7 @@ if (UnicodeStringParameterMask & (1 << i)) { /* Update the base */ - ParameterBase[i] = (ULONG_PTR)&StringBase[i]; + UserParams->Parameters[i] = (ULONG_PTR)&UserParams->Strings[i]; /* Copy the string buffer */ RtlMoveMemory(BufferBase, @@ -459,9 +428,7 @@ CapturedParams[i].Buffer = BufferBase; /* Copy the string structure */ - RtlMoveMemory(&StringBase[i], - &CapturedParams[i], - sizeof(UNICODE_STRING)); + UserParams->Strings[i] = CapturedParams[i]; /* Update the pointer */ BufferBase += CapturedParams[i].MaximumLength; @@ -469,7 +436,7 @@ else { /* No need to copy any strings */ - ParameterBase[i] = Parameters[i]; + UserParams->Parameters[i] = Parameters[i]; } } } @@ -494,7 +461,7 @@ /* We did! Delete it */ Size = 0; ZwFreeVirtualMemory(NtCurrentProcess(), - (PVOID*)&UserData, + &UserData, &Size, MEM_RELEASE); } @@ -609,7 +576,7 @@ /* Copy them */ RtlCopyMemory(SafeParams, Parameters, ParamSize); - /* Nowo check if there's strings in it */ + /* Now check if there's strings in it */ if (UnicodeStringParameterMask) { /* Loop every string */ Modified: trunk/reactos/ntoskrnl/include/internal/ex.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ex.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/ex.h [iso-8859-1] Thu Sep 29 06:48:19 2011 @@ -61,6 +61,13 @@ PWSTR Name; } SYSTEM_CALLBACKS; +typedef struct _HARDERROR_USER_PARAMETERS +{ + ULONG_PTR Parameters[MAXIMUM_HARDERROR_PARAMETERS]; + UNICODE_STRING Strings[MAXIMUM_HARDERROR_PARAMETERS]; + WCHAR Buffer[ANYSIZE_ARRAY]; +} HARDERROR_USER_PARAMETERS, *PHARDERROR_USER_PARAMETERS; + #define MAX_FAST_REFS 7 #define ExAcquireRundownProtection _ExAcquireRundownProtection

1 0

[tkreuzer] 53887: [CRT] implement floor and floorf for amd64 with sse2 instructions
by tkreuzer＠svn.reactos.org 28 Sep '11

28 Sep '11

Author: tkreuzer Date: Wed Sep 28 21:32:37 2011 New Revision: 53887 URL: http://svn.reactos.org/svn/reactos?rev=53887&view=rev Log: [CRT] implement floor and floorf for amd64 with sse2 instructions Modified: trunk/reactos/lib/sdk/crt/libcntpr.cmake trunk/reactos/lib/sdk/crt/math/amd64/floor.S trunk/reactos/lib/sdk/crt/math/amd64/floorf.S Modified: trunk/reactos/lib/sdk/crt/libcntpr.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/libcntpr.cmake… ============================================================================== --- trunk/reactos/lib/sdk/crt/libcntpr.cmake [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/libcntpr.cmake [iso-8859-1] Wed Sep 28 21:32:37 2011 @@ -111,6 +111,7 @@ math/amd64/exp.S math/amd64/fabs.S math/amd64/floor.S + math/amd64/floorf.S math/amd64/fmod.S math/amd64/ldexp.S math/amd64/log.S Modified: trunk/reactos/lib/sdk/crt/math/amd64/floor.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/amd64/flo… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/amd64/floor.S [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/amd64/floor.S [iso-8859-1] Wed Sep 28 21:32:37 2011 @@ -9,14 +9,33 @@ /* INCLUDES ******************************************************************/ #include <asm.inc> -#include <ksamd64.inc> /* CODE **********************************************************************/ .code64 PUBLIC floor -floor: - UNIMPLEMENTED floor +FUNC floor + sub rsp, 16 + .ENDPROLOG + + /* Truncate xmm0 to integer (double precision) */ + cvttsd2si rcx, xmm0 + + /* Duplicate the bits into rax */ + movd rax, xmm0 + + /* Shift all bits to the right, keeping the sign bit */ + shr rax, 63 + + /* Substract the sign bit from the truncated value, so that + we get the correct result for negative values. */ + sub rcx, rax + + /* Convert the result back to xmm0 (double precision) */ + cvtsi2sd xmm0, rcx + + add rsp, 16 ret +ENDFUNC floor END Modified: trunk/reactos/lib/sdk/crt/math/amd64/floorf.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/amd64/flo… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/amd64/floorf.S [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/amd64/floorf.S [iso-8859-1] Wed Sep 28 21:32:37 2011 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries - * PURPOSE: Implementation of tan + * PURPOSE: Implementation of floorf * FILE: lib/sdk/crt/math/amd64/floorf.S * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) */ @@ -9,7 +9,6 @@ /* INCLUDES ******************************************************************/ #include <asm.inc> -#include <ksamd64.inc> /* CODE **********************************************************************/ .code64 @@ -19,26 +18,22 @@ sub rsp, 16 .ENDPROLOG - /* Put parameter on the stack */ - movss dword ptr [rsp], xmm0 - fld dword ptr [rsp] + /* Truncate xmm0 to integer (single precision) */ + cvttss2si rcx, xmm0 - /* Change fpu control word to round down */ - fstcw [rsp] - mov eax, [rsp] - or eax, HEX(000400) - and eax, HEX(00f7ff) - mov [rsp + 8], eax - fldcw [rsp + 8] + /* Duplicate the bits into rax */ + movd eax, xmm0 - /* Round to integer */ - frndint + /* Shift all bits to the right, keeping the sign bit */ + shr rax, 31 - /* Restore fpu control word */ - fldcw [rsp] + /* Substract the sign bit from the truncated value, so that + we get the correct result for negative values. */ + sub rcx, rax - fstp dword ptr [rsp] - movss xmm0, dword ptr [rsp] + /* Convert the result back to xmm0 (single precision) */ + cvtsi2ss xmm0, rcx + add rsp, 16 ret ENDFUNC floorf

1 0

[tfaber] 53886: [SERVICES] - Minor fixes to ScmAssignNewTag - Correctly handle an invalid parameter case in RCreateServiceW. Fixes second stage boot under certain circumstances.
by tfaber＠svn.reactos.org 28 Sep '11

28 Sep '11

Author: tfaber Date: Wed Sep 28 18:43:35 2011 New Revision: 53886 URL: http://svn.reactos.org/svn/reactos?rev=53886&view=rev Log: [SERVICES] - Minor fixes to ScmAssignNewTag - Correctly handle an invalid parameter case in RCreateServiceW. Fixes second stage boot under certain circumstances. Modified: trunk/reactos/base/system/services/rpcserver.c Modified: trunk/reactos/base/system/services/rpcserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/rpcse… ============================================================================== --- trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] Wed Sep 28 18:43:35 2011 @@ -277,6 +277,9 @@ PLIST_ENTRY ServiceEntry; PSERVICE CurrentService; + ASSERT(lpService != NULL); + ASSERT(lpService->lpGroup != NULL); + dwError = RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"System\\CurrentControlSet\\Control\\GroupOrderList", 0, @@ -295,7 +298,7 @@ NULL, &cbDataSize); - if (dwError != ERROR_MORE_DATA) + if (dwError != ERROR_SUCCESS && dwError != ERROR_MORE_DATA) goto findFreeTag; pdwGroupTags = HeapAlloc(GetProcessHeap(), 0, cbDataSize); @@ -315,7 +318,10 @@ if (dwError != ERROR_SUCCESS) goto findFreeTag; - dwGroupTagCount = min(pdwGroupTags[0], cbDataSize / sizeof(pdwGroupTags[0])); + if (cbDataSize < sizeof(pdwGroupTags[0])) + goto findFreeTag; + + dwGroupTagCount = min(pdwGroupTags[0], cbDataSize / sizeof(pdwGroupTags[0]) - 1); findFreeTag: do @@ -336,6 +342,7 @@ ServiceEntry = lpService->ServiceListEntry.Flink; while (ServiceEntry != &lpService->ServiceListEntry) { + ASSERT(ServiceEntry != NULL); CurrentService = CONTAINING_RECORD(ServiceEntry, SERVICE, ServiceListEntry); if (CurrentService->lpGroup == lpService->lpGroup) { @@ -1961,6 +1968,7 @@ DPRINT("dwErrorControl = %lu\n", dwErrorControl); DPRINT("lpBinaryPathName = %S\n", lpBinaryPathName); DPRINT("lpLoadOrderGroup = %S\n", lpLoadOrderGroup); + DPRINT("lpdwTagId = %p\n", lpdwTagId); if (ScmShutdown) return ERROR_SHUTDOWN_IN_PROGRESS; @@ -2005,6 +2013,11 @@ } if (dwStartType > SERVICE_DISABLED) + { + return ERROR_INVALID_PARAMETER; + } + + if (lpdwTagId && (!lpLoadOrderGroup || !*lpLoadOrderGroup)) { return ERROR_INVALID_PARAMETER; }

1 0

[tkreuzer] 53885: [FREELDR] - Remove pointless NTKRNLAPI - remove unneeded include - delete deprecated file amd64/loader.c - add an #ifef __REACTOS__ around public header includes to make it possib...
by tkreuzer＠svn.reactos.org 28 Sep '11

28 Sep '11

Author: tkreuzer Date: Wed Sep 28 18:33:25 2011 New Revision: 53885 URL: http://svn.reactos.org/svn/reactos?rev=53885&view=rev Log: [FREELDR] - Remove pointless NTKRNLAPI - remove unneeded include - delete deprecated file amd64/loader.c - add an #ifef __REACTOS__ around public header includes to make it possible to use an alternative header set from ntsup.h Removed: trunk/reactos/boot/freeldr/freeldr/arch/amd64/loader.c Modified: trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt trunk/reactos/boot/freeldr/freeldr/disk/partition.c trunk/reactos/boot/freeldr/freeldr/include/freeldr.h trunk/reactos/boot/freeldr/freeldr/mm/heap.c trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c Modified: trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/CMake… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] Wed Sep 28 18:33:25 2011 @@ -121,7 +121,6 @@ list(APPEND FREELDR_COMMON_SOURCE arch/amd64/entry.S arch/amd64/int386.S - arch/amd64/loader.c arch/amd64/pnpbios.S arch/i386/hardware.c arch/i386/hwacpi.c Removed: trunk/reactos/boot/freeldr/freeldr/arch/amd64/loader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/amd64/loader.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/amd64/loader.c (removed) @@ -1,63 +1,0 @@ -/* - * FreeLoader - * Copyright (C) 2008 - 2009 Timo Kreuzer (timo.kreuzer(a)reactor.org) - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ -#include <freeldr.h> - -#define NDEBUG -#include <debug.h> - -/* Page Directory and Tables for non-PAE Systems */ -extern ULONG_PTR NextModuleBase; -extern ULONG_PTR KernelBase; -ULONG_PTR GdtBase, IdtBase, TssBase; -extern ROS_KERNEL_ENTRY_POINT KernelEntryPoint; - -PVOID pIdt, pGdt; - -/* FUNCTIONS *****************************************************************/ - -void -EnableA20() -{ - /* Already done */ -} - -/*++ - * FrLdrStartup - * INTERNAL - * - * Prepares the system for loading the Kernel. - * - * Params: - * Magic - Multiboot Magic - * - * Returns: - * None. - * - * Remarks: - * None. - * - *--*/ -VOID -NTAPI -FrLdrStartup(ULONG Magic) -{ - DbgPrint("ReactOS loader is unsupported! Halting.\n", KernelEntryPoint); - for(;;); -} - Modified: trunk/reactos/boot/freeldr/freeldr/disk/partition.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/disk/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/disk/partition.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/disk/partition.c [iso-8859-1] Wed Sep 28 18:33:25 2011 @@ -289,7 +289,6 @@ return TRUE; } -NTKERNELAPI NTSTATUS FASTCALL IoReadPartitionTable( Modified: trunk/reactos/boot/freeldr/freeldr/include/freeldr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/freeldr.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/freeldr.h [iso-8859-1] Wed Sep 28 18:33:25 2011 @@ -30,6 +30,7 @@ ROUND_DOWN(((ULONG)n) + (align) - 1, (align)) /* public headers */ +#ifdef __REACTOS__ #define NTOSAPI #define printf TuiPrintf #include <ntddk.h> @@ -48,8 +49,10 @@ #include <ntdddisk.h> #include <internal/hal.h> #include <drivers/pci/pci.h> - #include <winerror.h> +#else +#include <ntsup.h> +#endif /* internal headers */ #include <arcemul.h> Modified: trunk/reactos/boot/freeldr/freeldr/mm/heap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/mm/he… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/mm/heap.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/mm/heap.c [iso-8859-1] Wed Sep 28 18:33:25 2011 @@ -90,7 +90,6 @@ #undef ExAllocatePoolWithTag -NTKERNELAPI PVOID NTAPI ExAllocatePoolWithTag( @@ -102,7 +101,6 @@ } #undef ExFreePool -NTKERNELAPI VOID NTAPI ExFreePool( @@ -112,7 +110,6 @@ } #undef ExFreePoolWithTag -NTKERNELAPI VOID NTAPI ExFreePoolWithTag( Modified: trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c [iso-8859-1] Wed Sep 28 18:33:25 2011 @@ -10,7 +10,6 @@ #include <freeldr.h> -#include <ndk/asm.h> #include <debug.h> DBG_DEFAULT_CHANNEL(WINDOWS);

1 0

[cgutman] 53884: [ACPI] - Check for PCI device presence before doing the actual HAL operation - Attempt #1 at fixing ACPI on VMware
by cgutman＠svn.reactos.org 28 Sep '11

28 Sep '11

Author: cgutman Date: Wed Sep 28 14:16:07 2011 New Revision: 53884 URL: http://svn.reactos.org/svn/reactos?rev=53884&view=rev Log: [ACPI] - Check for PCI device presence before doing the actual HAL operation - Attempt #1 at fixing ACPI on VMware Modified: trunk/reactos/drivers/bus/acpi/osl.c Modified: trunk/reactos/drivers/bus/acpi/osl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/osl.c?rev… ============================================================================== --- trunk/reactos/drivers/bus/acpi/osl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/osl.c [iso-8859-1] Wed Sep 28 14:16:07 2011 @@ -446,6 +446,39 @@ return (AE_OK); } +BOOLEAN +OslIsPciDevicePresent(ULONG BusNumber, ULONG SlotNumber) +{ + UINT32 ReadLength; + PCI_COMMON_CONFIG PciConfig; + + /* Detect device presence by reading the PCI configuration space */ + + ReadLength = HalGetBusDataByOffset(PCIConfiguration, + BusNumber, + SlotNumber, + &PciConfig, + 0, + sizeof(PciConfig)); + if (ReadLength == 0) + { + DPRINT1("PCI device is not present\n"); + return FALSE; + } + + ASSERT(ReadLength >= 2); + + if (PciConfig.VendorID == PCI_INVALID_VENDORID) + { + DPRINT1("Invalid vendor ID in PCI configuration space\n"); + return FALSE; + } + + DPRINT("PCI device is present\n"); + + return TRUE; +} + ACPI_STATUS AcpiOsReadPciConfiguration ( ACPI_PCI_ID *PciId, @@ -453,7 +486,6 @@ void *Value, UINT32 Width) { - NTSTATUS Status; PCI_SLOT_NUMBER slot; slot.u.AsULONG = 0; @@ -462,22 +494,17 @@ DPRINT("AcpiOsReadPciConfiguration, slot=0x%X, func=0x%X\n", slot.u.AsULONG, Register); - Status = HalGetBusDataByOffset(PCIConfiguration, + if (!OslIsPciDevicePresent(PciId->Bus, slot.u.AsULONG)) + return AE_NOT_FOUND; + + HalGetBusDataByOffset(PCIConfiguration, PciId->Bus, slot.u.AsULONG, Value, Register, - (Width / 8)); - - if (Status == 0 || Status == 2) - { - DPRINT1("HalGetBusDataByOffset failed (Status = %d)\n", Status); - return AE_NOT_FOUND; - } - else - { - return AE_OK; - } + (Width >> 3)); + + return AE_OK; } ACPI_STATUS @@ -487,7 +514,6 @@ ACPI_INTEGER Value, UINT32 Width) { - NTSTATUS Status; ULONG buf = Value; PCI_SLOT_NUMBER slot; @@ -497,20 +523,17 @@ DPRINT("AcpiOsWritePciConfiguration, slot=0x%x\n", slot.u.AsULONG); - Status = HalSetBusDataByOffset(PCIConfiguration, + if (!OslIsPciDevicePresent(PciId->Bus, slot.u.AsULONG)) + return AE_NOT_FOUND; + + HalSetBusDataByOffset(PCIConfiguration, PciId->Bus, slot.u.AsULONG, &buf, Register, - (Width / 8)); - - if (Status == 0 || Status == 2) - { - DPRINT1("HalSetBusDataByOffset failed (Status = %d)\n", Status); - return AE_NOT_FOUND; - } - else - return AE_OK; + (Width >> 3)); + + return AE_OK; } ACPI_STATUS

1 0

[gadamopoulos] 53883: [user32] - Fix a couple of misleading tests
by gadamopoulos＠svn.reactos.org 28 Sep '11

28 Sep '11

Author: gadamopoulos Date: Wed Sep 28 12:40:43 2011 New Revision: 53883 URL: http://svn.reactos.org/svn/reactos?rev=53883&view=rev Log: [user32] - Fix a couple of misleading tests Modified: trunk/rostests/apitests/user32/TrackMouseEvent.c Modified: trunk/rostests/apitests/user32/TrackMouseEvent.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/TrackMous… ============================================================================== --- trunk/rostests/apitests/user32/TrackMouseEvent.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/TrackMouseEvent.c [iso-8859-1] Wed Sep 28 12:40:43 2011 @@ -214,6 +214,11 @@ {3, WM_MOUSEHOVER, POST}, {0,0}}; +/* the mouse hovers hwnd3 without moving */ +MSG_ENTRY mousehover3_nomove_chain[]={{3, WM_SYSTIMER, POST, ID_TME_TIMER}, + {3, WM_MOUSEHOVER, POST}, + {0,0}}; + /* the mouse hovers hwnd3 and the timer is not dispatched */ MSG_ENTRY mousehover3_droptimer_chain[]={{0, WH_MOUSE_LL, HOOK, WM_MOUSEMOVE}, {3, WM_NCHITTEST}, @@ -238,17 +243,25 @@ {3, WM_MOUSEHOVER, POST}, {0,0}}; -/* the mouse leaves hwnd2 and moves to hwnd3 and mouse message is dropped by WH_MOUSE */ +/* the mouse leaves hwnd3 and moves to hwnd2 and mouse message is dropped by WH_MOUSE */ MSG_ENTRY mouseleave3to2_dropmouse_chain[]={{0, WH_MOUSE_LL, HOOK, WM_MOUSEMOVE}, {2, WM_NCHITTEST}, {2, WH_MOUSE,HOOK, WM_MOUSEMOVE, HTCLIENT}, {0,0}}; +/* the mouse leaves hwnd3 and moves to hwnd2 and mouse message is dropped by WH_MOUSE_LL */ +MSG_ENTRY mouseleave3to2_dropmousell_chain[]={{0, WH_MOUSE_LL, HOOK, WM_MOUSEMOVE}, + {0,0}}; + +/* after WH_MOUSE drops WM_MOUSEMOVE, WM_MOUSELEAVE is still in the queue */ +MSG_ENTRY mouseleave3_remainging_chain[]={{3, WM_MOUSELEAVE, POST}, + {0,0}}; + void Test_TrackMouseEvent() { MOVE_CURSOR(0,0); create_test_windows(); - FlushMessages(0,0); + FlushMessages(); empty_message_cache(); /* the mouse moves over hwnd2 */ @@ -331,21 +344,27 @@ EXPECT_TME_FLAGS(hWnd3, TME_LEAVE); COMPARE_CACHE(mousehover3_chain); + FlushMessages(); + COMPARE_CACHE(empty_chain); + /* Begin tracking mouse events for hWnd3 */ TmeStartTracking(hWnd3, TME_HOVER ); FLUSH_MESSAGES(0, QS_TIMER|QS_MOUSEMOVE); COMPARE_CACHE(empty_chain); EXPECT_TME_FLAGS(hWnd3, TME_HOVER|TME_LEAVE); - /* make sure that the timer won't fire before the mouse moves */ - Sleep(100); - COMPARE_CACHE(empty_chain); - Sleep(100); - COMPARE_CACHE(empty_chain); - Sleep(100); + /* make sure that the timer will fire before the mouse moves */ + Sleep(100); + FlushMessages(); + COMPARE_CACHE(mousehover3_nomove_chain); + EXPECT_TME_FLAGS(hWnd3, TME_LEAVE); + + Sleep(100); + FlushMessages(); COMPARE_CACHE(empty_chain); /* the mouse hovers hwnd3 and the timer is not dispatched*/ + TmeStartTracking(hWnd3, TME_HOVER ); ignore_timer = TRUE; MOVE_CURSOR(400,400); Sleep(100); @@ -354,7 +373,7 @@ EXPECT_TME_FLAGS(hWnd3, TME_HOVER|TME_LEAVE); /* TME_HOVER is still active */ COMPARE_CACHE(mousehover3_droptimer_chain); /* we get no WM_MOUSEHOVER */ ignore_timer = FALSE; - + /* the mouse hovers hwnd3 and mouse message is dropped by WH_MOUSE_LL */ ignore_mousell = TRUE; MOVE_CURSOR(402,402); @@ -365,6 +384,9 @@ COMPARE_CACHE(mousehover3_dropmousell_chain); /* we get WM_MOUSEHOVER normaly */ ignore_mousell = FALSE; + FlushMessages(); + COMPARE_CACHE(empty_chain); + /* the mouse hovers hwnd3 and mouse message is dropped by WH_MOUSE */ ignore_mouse = TRUE; TmeStartTracking(hWnd3, TME_HOVER ); @@ -376,13 +398,35 @@ COMPARE_CACHE(mousehover3_dropmouse_chain); /* we get WM_MOUSEHOVER normaly */ ignore_mouse = FALSE; - /* the mouse leaves hwnd2 and moves to hwnd3 and mouse message is dropped by WH_MOUSE */ + FlushMessages(); + COMPARE_CACHE(empty_chain); + + /* the mouse leaves hwnd3 and moves to hwnd2 and mouse message is dropped by WH_MOUSE_LL */ + ignore_mousell = TRUE; + TmeStartTracking(hWnd3, TME_LEAVE ); + MOVE_CURSOR(220,220); + FLUSH_MESSAGES(0, QS_MOUSEMOVE|QS_TIMER); /* WH_MOUSE drops WM_MOUSEMOVE */ + EXPECT_TME_FLAGS(hWnd3, TME_LEAVE); /* all flags are removed */ + COMPARE_CACHE(mouseleave3to2_dropmousell_chain); /* we get no WM_MOUSELEAVE */ + ignore_mousell = FALSE; + + FlushMessages(); + COMPARE_CACHE(empty_chain); + + /* the mouse leaves hwnd3 and moves to hwnd2 and mouse message is dropped by WH_MOUSE */ ignore_mouse = TRUE; MOVE_CURSOR(220,220); FLUSH_MESSAGES(QS_MOUSEMOVE, QS_TIMER); /* WH_MOUSE drops WM_MOUSEMOVE */ EXPECT_TME_FLAGS(hWnd3, 0); /* all flags are removed */ COMPARE_CACHE(mouseleave3to2_dropmouse_chain); /* we get no WM_MOUSELEAVE */ ignore_mouse = FALSE; + + /* after WH_MOUSE drops WM_MOUSEMOVE, WM_MOUSELEAVE is still in the queue */ + FLUSH_MESSAGES(QS_POSTMESSAGE, QS_TIMER|QS_MOUSEMOVE); + COMPARE_CACHE(mouseleave3_remainging_chain); + + FlushMessages(); + COMPARE_CACHE(empty_chain); } START_TEST(TrackMouseEvent)

1 0

[akhaldi] 53882: [CMAKE] * Don't detect the ASM compiler ID, we set it instead.
by akhaldi＠svn.reactos.org 28 Sep '11

28 Sep '11

Author: akhaldi Date: Wed Sep 28 11:13:53 2011 New Revision: 53882 URL: http://svn.reactos.org/svn/reactos?rev=53882&view=rev Log: [CMAKE] * Don't detect the ASM compiler ID, we set it instead. Modified: trunk/reactos/toolchain-gcc.cmake trunk/reactos/toolchain-msvc.cmake Modified: trunk/reactos/toolchain-gcc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/toolchain-gcc.cmake?rev=53… ============================================================================== --- trunk/reactos/toolchain-gcc.cmake [iso-8859-1] (original) +++ trunk/reactos/toolchain-gcc.cmake [iso-8859-1] Wed Sep 28 11:13:53 2011 @@ -38,6 +38,7 @@ set(CMAKE_C_COMPILER ${MINGW_TOOLCHAIN_PREFIX}gcc${MINGW_TOOLCHAIN_SUFFIX}) set(CMAKE_CXX_COMPILER ${MINGW_TOOLCHAIN_PREFIX}g++${MINGW_TOOLCHAIN_SUFFIX}) set(CMAKE_ASM_COMPILER ${MINGW_TOOLCHAIN_PREFIX}gcc${MINGW_TOOLCHAIN_SUFFIX}) +set(CMAKE_ASM_COMPILER_ID "GNU") set(CMAKE_MC_COMPILER ${MINGW_TOOLCHAIN_PREFIX}windmc) set(CMAKE_RC_COMPILER ${MINGW_TOOLCHAIN_PREFIX}windres) set(CMAKE_DLLTOOL ${MINGW_TOOLCHAIN_PREFIX}dlltool) Modified: trunk/reactos/toolchain-msvc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/toolchain-msvc.cmake?rev=5… ============================================================================== --- trunk/reactos/toolchain-msvc.cmake [iso-8859-1] (original) +++ trunk/reactos/toolchain-msvc.cmake [iso-8859-1] Wed Sep 28 11:13:53 2011 @@ -12,6 +12,7 @@ else() set(CMAKE_ASM_COMPILER ml) endif() +set(CMAKE_ASM_COMPILER_ID "VISUAL") set(CMAKE_C_STANDARD_LIBRARIES "" CACHE INTERNAL "")

1 0

[tkreuzer] 53881: [FREELDR] Cleanup headers
by tkreuzer＠svn.reactos.org 28 Sep '11

28 Sep '11

Author: tkreuzer Date: Wed Sep 28 09:54:05 2011 New Revision: 53881 URL: http://svn.reactos.org/svn/reactos?rev=53881&view=rev Log: [FREELDR] Cleanup headers Removed: trunk/reactos/boot/freeldr/freeldr/include/rtl.h Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/i386rtl.c trunk/reactos/boot/freeldr/freeldr/arch/i386/winldr.c trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mboot.c trunk/reactos/boot/freeldr/freeldr/include/arch/i386/i386.h trunk/reactos/boot/freeldr/freeldr/include/freeldr.h trunk/reactos/boot/freeldr/freeldr/include/reactos.h Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/i386rtl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/i386rtl.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/i386rtl.c [iso-8859-1] Wed Sep 28 09:54:05 2011 @@ -18,6 +18,9 @@ */ #include <freeldr.h> + +void sound(int freq); +void delay(unsigned msec); void PcBeep(void) { Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/winldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/winldr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/winldr.c [iso-8859-1] Wed Sep 28 09:54:05 2011 @@ -338,16 +338,14 @@ { *ExtendedBIOSDataArea = BiosRegs.w.es << 4; *ExtendedBIOSDataSize = 1024; - ERR(">> *ExtendedBIOSDataArea = 0x%lx\n", *ExtendedBIOSDataArea); + TRACE("*ExtendedBIOSDataArea = 0x%lx\n", *ExtendedBIOSDataArea); } else { - ERR("Couldn't get address of extended BIOS data area\n"); + WARN("Couldn't get address of extended BIOS data area\n"); *ExtendedBIOSDataArea = 0; *ExtendedBIOSDataSize = 0; } - - /* Store size of the extended bios data area in 0x740 */ } void WinLdrSetupMachineDependent(PLOADER_PARAMETER_BLOCK LoaderBlock) Modified: trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mboot.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mboot.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mboot.c [iso-8859-1] Wed Sep 28 09:54:05 2011 @@ -55,6 +55,8 @@ #define BAT_GRANULARITY (64 * 1024) #define KernelMemorySize (8 * 1024 * 1024) #define XROUNDUP(x,n) ((((ULONG)x) + ((n) - 1)) & (~((n) - 1))) + +char reactos_module_strings[64][256]; // Array to hold module names /* Load Address of Next Module */ ULONG_PTR NextModuleBase = 0; @@ -178,7 +180,7 @@ set->info = newinfo; set->mapsize *= 2; } - + set->info[set->usecount].flags = MMU_ALL_RW; set->info[set->usecount].proc = proc; set->info[set->usecount].addr = virt; @@ -208,7 +210,7 @@ while(OldModCount != LoaderBlock.ModsCount) { - printf("Added %d modules last pass\n", + printf("Added %d modules last pass\n", LoaderBlock.ModsCount - OldModCount); OldModCount = LoaderBlock.ModsCount; @@ -224,7 +226,7 @@ ((PVOID)reactos_modules[i].ModStart, (PCHAR)reactos_modules[i].String); } - } + } } printf("Starting mmu\n"); @@ -233,7 +235,7 @@ printf("Allocating vsid 0 (kernel)\n"); MmuAllocVsid(0, 0xff00); - + /* We'll use vsid 1 for freeldr (expendable) */ printf("Allocating vsid 1 (freeldr)\n"); MmuAllocVsid(1, 0xff); @@ -247,7 +249,7 @@ i += (1<<PFN_SHIFT) ) { FrLdrAddPageMapping(&memmap, 1, i, 0); } - + printf("KernelBase %x\n", KernelBase); /* Heap pages -- this gets the entire freeldr heap */ @@ -255,7 +257,7 @@ tmp = i<<PFN_SHIFT; if (FreeLdrMap[i].PageAllocated == LoaderSystemCode) { UsedEntries++; - if (tmp >= (ULONG)KernelMemory && + if (tmp >= (ULONG)KernelMemory && tmp < (ULONG)KernelMemory + KernelMemorySize) { FrLdrAddPageMapping(&memmap, 0, tmp, KernelBase + tmp - (ULONG)KernelMemory); } else { @@ -721,7 +723,7 @@ } while(TempName); NameBuffer = reactos_module_strings[LoaderBlock.ModsCount]; - + /* Get Module Size */ LocalModuleSize = FsGetFileSize(ModuleImage); @@ -773,7 +775,7 @@ PVOID ModuleBase = (PVOID)NextModuleBase; if(FrLdrMapModule(Image, ShortName, 0, 0)) - Result = ModuleBase; + Result = ModuleBase; } return Result; } Modified: trunk/reactos/boot/freeldr/freeldr/include/arch/i386/i386.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/arch/i386/i386.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/arch/i386/i386.h [iso-8859-1] Wed Sep 28 09:54:05 2011 @@ -24,6 +24,32 @@ #undef KIP0PCRADDRESS #define KIP0PCRADDRESS 0xffdff000 +/* Bits to shift to convert a Virtual Address into an Offset in the Page Table */ +#define PFN_SHIFT 12 + +/* Bits to shift to convert a Virtual Address into an Offset in the Page Directory */ +#define PDE_SHIFT 22 +#define PDE_SHIFT_PAE 18 + +/* Converts a Physical Address Pointer into a Page Frame Number */ +#define PaPtrToPfn(p) \ + (((ULONG_PTR)&p) >> PFN_SHIFT) + +/* Converts a Physical Address into a Page Frame Number */ +#define PaToPfn(p) \ + ((p) >> PFN_SHIFT) + +#define STARTUP_BASE 0xC0000000 + +#define LowMemPageTableIndex 0 +#define StartupPageTableIndex (STARTUP_BASE >> 22) +#define HalPageTableIndex (HAL_BASE >> 22) + +typedef struct _PAGE_DIRECTORY_X86 +{ + HARDWARE_PTE Pde[1024]; +} PAGE_DIRECTORY_X86, *PPAGE_DIRECTORY_X86; + void i386DivideByZero(void); void i386DebugException(void); void i386NMIException(void); Modified: trunk/reactos/boot/freeldr/freeldr/include/freeldr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/freeldr.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/freeldr.h [iso-8859-1] Wed Sep 28 09:54:05 2011 @@ -45,8 +45,6 @@ #include <stdlib.h> #include <stdio.h> #include <ctype.h> -#include <rosldr.h> -#include <rtl.h> #include <ntdddisk.h> #include <internal/hal.h> #include <drivers/pci/pci.h> @@ -55,8 +53,8 @@ /* internal headers */ #include <arcemul.h> +#include <bget.h> #include <bytesex.h> -#include <bget.h> #include <cache.h> #include <cmdline.h> #include <comm.h> Modified: trunk/reactos/boot/freeldr/freeldr/include/reactos.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/reactos.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/reactos.h [iso-8859-1] Wed Sep 28 09:54:05 2011 @@ -19,53 +19,6 @@ #pragma once -/* Base Addres of Kernel in Physical Memory */ -#define KERNEL_BASE_PHYS 0x800000 - -#if defined(_M_IX86) - -/* Bits to shift to convert a Virtual Address into an Offset in the Page Table */ -#define PFN_SHIFT 12 - -/* Bits to shift to convert a Virtual Address into an Offset in the Page Directory */ -#define PDE_SHIFT 22 -#define PDE_SHIFT_PAE 18 - -/* Converts a Physical Address Pointer into a Page Frame Number */ -#define PaPtrToPfn(p) \ - (((ULONG_PTR)&p) >> PFN_SHIFT) - -/* Converts a Physical Address into a Page Frame Number */ -#define PaToPfn(p) \ - ((p) >> PFN_SHIFT) - -#define STARTUP_BASE 0xC0000000 - -#define LowMemPageTableIndex 0 -#define StartupPageTableIndex (STARTUP_BASE >> 22) -#define HalPageTableIndex (HAL_BASE >> 22) - -typedef struct _PAGE_DIRECTORY_X86 -{ - HARDWARE_PTE Pde[1024]; -} PAGE_DIRECTORY_X86, *PPAGE_DIRECTORY_X86; - -#endif - -/////////////////////////////////////////////////////////////////////////////////////// -// -// ReactOS Loading Functions -// -/////////////////////////////////////////////////////////////////////////////////////// -VOID LoadAndBootReactOS(PCSTR OperatingSystemName); - -/////////////////////////////////////////////////////////////////////////////////////// -// -// ReactOS Setup Loader Functions -// -/////////////////////////////////////////////////////////////////////////////////////// -VOID ReactOSRunSetupLoader(VOID); - /////////////////////////////////////////////////////////////////////////////////////// // // ARC Path Functions @@ -83,53 +36,4 @@ VOID ConstructArcPath(PCHAR ArcPath, PCHAR SystemFolder, UCHAR Disk, ULONG Partition); UCHAR ConvertArcNameToBiosDriveNumber(PCHAR ArcPath); -/////////////////////////////////////////////////////////////////////////////////////// -// -// Loader Functions And Definitions -// -/////////////////////////////////////////////////////////////////////////////////////// -extern ROS_LOADER_PARAMETER_BLOCK LoaderBlock; /* Multiboot info structure passed to kernel */ -extern char reactos_kernel_cmdline[255]; // Command line passed to kernel -extern LOADER_MODULE reactos_modules[64]; // Array to hold boot module info loaded for the kernel -extern char reactos_module_strings[64][256]; // Array to hold module names -typedef struct _reactos_mem_data { - unsigned long memory_map_descriptor_size; - memory_map_t memory_map[32]; // Memory map -} reactos_mem_data_t; -extern reactos_mem_data_t reactos_mem_data; -#define reactos_memory_map_descriptor_size reactos_mem_data.memory_map_descriptor_size -#define reactos_memory_map reactos_mem_data.memory_map - -VOID FASTCALL FrLdrSetupPae(ULONG Magic); -VOID FASTCALL FrLdrSetupPageDirectory(VOID); -VOID FASTCALL FrLdrGetPaeMode(VOID); -BOOLEAN NTAPI FrLdrMapKernel(PFILE KernelImage); -ULONG_PTR NTAPI FrLdrCreateModule(LPCSTR ModuleName); -ULONG_PTR NTAPI FrLdrLoadModule(PFILE ModuleImage, LPCSTR ModuleName, PULONG ModuleSize); -BOOLEAN NTAPI FrLdrCloseModule(ULONG_PTR ModuleBase, ULONG dwModuleSize); -VOID NTAPI FrLdrStartup(ULONG Magic); -typedef VOID (NTAPI *ROS_KERNEL_ENTRY_POINT)(IN PROS_LOADER_PARAMETER_BLOCK LoaderBlock); - -PVOID -NTAPI -FrLdrMapImage( - IN PFILE Image, - IN PCHAR ShortName, - IN ULONG ImageType -); - -PVOID -NTAPI -FrLdrReadAndMapImage( - IN PFILE Image, - IN PCHAR ShortName, - IN ULONG ImageType -); - -PVOID -NTAPI -FrLdrLoadImage( - IN PCHAR szFileName, - IN INT nPos, - IN ULONG ImageType -); +void PcBeep(void); Removed: trunk/reactos/boot/freeldr/freeldr/include/rtl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/rtl.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/rtl.h (removed) @@ -1,29 +1,0 @@ -/* - * FreeLoader - * Copyright (C) 1998-2003 Brian Palmer <brianp(a)sginet.com> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#pragma once - -#include <freeldr.h> - -char * convert_to_ascii(char *buf, int c, int num); -char * convert_i64_to_ascii(char *buf, int c, unsigned long long num); - -void PcBeep(void); -void delay(unsigned msec); -void sound(int freq);

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