boot\bootdata\bootcdregtest\regtest.cmd 7 optional
; Subsystems
-subsystems\win32\csrss\csrss.exe 1
-subsystems\win32\csrss\win32csr\win32csr.dll 1
-subsystems\ntvdm\ntvdm.exe 1
-subsystems\win32\win32k\win32k.sys 1
+;subsystems\win32\csrss\csrss.exe 1
+;subsystems\win32\csrss\win32csr\win32csr.dll 1
+;subsystems\ntvdm\ntvdm.exe 1
+;subsystems\win32\win32k\win32k.sys 1
; Optional/proprietary files
-modules\optional\netkvm2k.inf 6 optional
-modules\optional\netkvm2k.cat 6 optional
-modules\optional\netkvm.sys 2 optional
+modules\optional\kvmnet.inf 6 optional
+modules\optional\kvmnet.sys 2 optional
+ modules\optional\alcxwdm.inf 6 optional
+ modules\optional\alcxwdm.sys 2 optional
modules\optional\mfc42.dll 1 optional
modules\optional\mfc42u.dll 1 optional
modules\optional\mfc71.dll 1 optional
// to have different install methods, etc.
LoadReactOSSetup();
}
-#ifdef __i386__
+#if defined(__i386__) || defined(__x86_64__)
- else if (_stricmp(SettingValue, "ReactOSSetup2") == 0)
+ else if (_stricmp(BootType, "ReactOSSetup2") == 0)
{
// WinLdr-style boot
LoadReactOSSetup2();
case REBOOT:
OptionMenuReboot();
break;
- }
+ #endif
+ }
}
- VOID OptionMenuReboot(VOID)
- {
- UiMessageBox("The system will now reboot.");
-
- #ifdef __i386__
- DiskStopFloppyMotor();
- SoftReboot();
- #else
- #endif
- }
+
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-/* $Id: acledit.c 35011 2008-08-01 16:29:40Z sginsberg $
+/* $Id$
*
* PROJECT: ReactOS Access Control List Editor
* FILE: lib/acledit/acledit.c
/*
* @implemented
*/
- BOOL WINAPI
+ BOOL
+ WINAPI
GetThreadSelectorEntry(IN HANDLE hThread,
- IN DWORD dwSelector,
- OUT LPLDT_ENTRY lpSelectorEntry)
+ IN DWORD dwSelector,
+ OUT LPLDT_ENTRY lpSelectorEntry)
{
- DESCRIPTOR_TABLE_ENTRY DescriptionTableEntry;
- NTSTATUS Status;
-
- DescriptionTableEntry.Selector = dwSelector;
- Status = NtQueryInformationThread(hThread,
- ThreadDescriptorTableEntry,
- &DescriptionTableEntry,
- sizeof(DESCRIPTOR_TABLE_ENTRY),
- NULL);
- if(!NT_SUCCESS(Status))
- {
- SetLastErrorByStatus(Status);
- return FALSE;
- }
+#ifdef _M_IX86
+ DESCRIPTOR_TABLE_ENTRY DescriptionTableEntry;
+ NTSTATUS Status;
- *lpSelectorEntry = DescriptionTableEntry.Descriptor;
- return TRUE;
+ /* Set the selector and do the query */
+ DescriptionTableEntry.Selector = dwSelector;
+ Status = NtQueryInformationThread(hThread,
+ ThreadDescriptorTableEntry,
+ &DescriptionTableEntry,
+ sizeof(DESCRIPTOR_TABLE_ENTRY),
+ NULL);
+ if (!NT_SUCCESS(Status))
+ {
+ /* Fail */
+ SetLastErrorByStatus(Status);
+ return FALSE;
+ }
+
+ /* Success, return the selector */
+ *lpSelectorEntry = DescriptionTableEntry.Descriptor;
+ return TRUE;
+#else
+ DPRINT1("Calling GetThreadSelectorEntry!\n");
+ return FALSE;
+#endif
}
/*
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
* NOTES:
- * Proxy ODBC driver manager. This manager delegates all ODBC
- * calls to a real ODBC driver manager named by the environment
+ * Proxy ODBC driver manager. This manager delegates all ODBC
+ * calls to a real ODBC driver manager named by the environment
* variable LIB_ODBC_DRIVER_MANAGER, or to libodbc.so if the
* variable is not set.
*
}
/* insert the entry */
- result = (*AddMRUStringW)((HANDLE)hList, szAppName);
+ result = (*AddMRUStringW)(hList, szAppName);
/* close mru list */
- (*FreeMRUList)(hList);
+ (*FreeMRUListProc)((HANDLE)hList);
/* create mru list key */
RegCloseKey(hKey);
}
<file>misc.c</file>
<file>mps.S</file>
<file>systimer.S</file>
++ <file>usage.c</file>
<pch>../include/hal.h</pch>
</module>
</group>
}
else if (BootPhase == 1)
{
-- /* Initialize the default HAL stubs for bus handling functions */
-- HalpInitNonBusHandler();
++ /* Initialize bus handlers */
++ //HalpInitBusHandler();
/* Enable the clock interrupt */
PKIDTENTRY64 IdtEntry = &((PKIPCR)KeGetPcr())->IdtBase[0x30];
_HalpLastPerfCounterHigh: .long 0
_HalpPerfCounterLow: .long 0
_HalpPerfCounterHigh: .long 0
++_HalpSystemHardwareFlags: .long 0
_UnhandledMsg:
.asciz "\n\x7\x7!!! Unhandled or Unexpected Code at line: %lx!!!\n"
/* FUNCTIONS *****************************************************************/
++.global _HalpReleaseCmosSpinLock
++.func HalpReleaseCmosSpinLock
++_HalpReleaseCmosSpinLock:
++
++.endfunc
++
++.global _HalpAcquireSystemHardwareSpinLock
++.func HalpAcquireSystemHardwareSpinLock
++_HalpAcquireSystemHardwareSpinLock:
++
++.endfunc
++
++.global _HalpCalibrateStallExecution@0
++.func HalpCalibrateStallExecution@0
++_HalpCalibrateStallExecution@0:
++
++.endfunc
++
++.globl _HalpProfileInterrupt
++.func HalpProfileInterrupt
++_HalpProfileInterrupt:
++
++.endfunc
++
++
.globl _KeStallExecutionProcessor
.func KeStallExecutionProcessor
_KeStallExecutionProcessor:
<module name="hal_generic_amd64" type="objectlibrary">
<include>include</include>
<include base="ntoskrnl">include</include>
+ <define name="_DISABLE_TIDENTS" />
<define name="_NTHAL_" />
<directory name="generic">
+ <directory name="bus">
+ <file>bushndlr.c</file>
+ <file>isabus.c</file>
+ <file>halbus.c</file>
++ <file>pcibus.c</file>
+ <file>pcidata.c</file>
+ <file>sysbus.c</file>
+ </directory>
<file>beep.c</file>
- <file>bus.c</file>
<file>cmos.c</file>
<file>dma.c</file>
<file>drive.c</file>
<file>display.c</file>
-- <file>pci.c</file>
<file>profil.c</file>
<file>reboot.c</file>
<file>sysinfo.c</file>
/* INCLUDES *****************************************************************/
#include <ntoskrnl.h>
- //#define NDEBUG
+ #define NDEBUG
#include <debug.h>
- #ifdef _M_PPC
+ #if defined(_PPC_)
#include <ppcmmu/mmu.h>
#define KERNEL_RVA(x) RVA(x,0x80800000)
-#define KERNEL_DESCRIPTOR_PAGE(x) (((ULONG_PTR)x + KernelBase) >> PAGE_SHIFT)
+#define KERNEL_DESCRIPTOR_PAGE(x) (((ULONG_PTR)(x) + KernelBase) >> PAGE_SHIFT)
#else
#define KERNEL_RVA(x) RVA(x,KSEG0_BASE)
-#define KERNEL_DESCRIPTOR_PAGE(x) (((ULONG_PTR)x &~ KSEG0_BASE) >> PAGE_SHIFT)
+#define KERNEL_DESCRIPTOR_PAGE(x) (((ULONG_PTR)(x) & ~KSEG0_BASE) >> PAGE_SHIFT)
#endif
typedef struct _BIOS_MEMORY_DESCRIPTOR
/* GLOBALS *******************************************************************/
+/* Function pointer for early debug prints */
+ULONG (*FrLdrDbgPrint)(const char *Format, ...);
+
/* FreeLDR Loader Data */
PROS_LOADER_PARAMETER_BLOCK KeRosLoaderBlock;
- BOOLEAN AcpiTableDetected = FALSE;
ADDRESS_RANGE KeMemoryMap[64];
ULONG KeMemoryMapRangeCount;
/* Build entries for ReactOS memory ranges, which uses ARC Descriptors */
KiRosBuildOsMemoryMap();
- #if defined(_M_IX86) || defined(_M_AMD64)
-#if defined(_X86_)
++#if defined(_X86_) || defined(_M_AMD64)
/* Build entries for the reserved map, which uses ARC Descriptors */
KiRosBuildReservedMemoryMap();
#endif
// Everything depends on this
//
C_ASSERT(sizeof(POOL_HEADER) == 8);
-C_ASSERT(sizeof(POOL_HEADER) == sizeof(LIST_ENTRY));
+//C_ASSERT(sizeof(POOL_HEADER) == sizeof(LIST_ENTRY));
+ extern ULONG ExpNumberOfPagedPools;
extern POOL_DESCRIPTOR NonPagedPoolDescriptor;
+ extern PPOOL_DESCRIPTOR ExpPagedPoolDescriptor[16 + 1];
+ extern PVOID PoolTrackTable;
//
// END FIXFIX
extern PVOID MmPagedPoolEnd;
extern PVOID MmNonPagedSystemStart;
extern PVOID MiSystemViewStart;
-extern ULONG MmSystemViewSize;
+extern ULONG_PTR MmSystemViewSize;
extern PVOID MmSessionBase;
extern PVOID MiSessionSpaceEnd;
-extern ULONG MmSizeOfPagedPoolInBytes;
+extern ULONG_PTR MmSizeOfPagedPoolInBytes;
extern PMMPTE MmSystemPagePtes;
+ extern PVOID MmSystemCacheStart;
+ extern PVOID MmSystemCacheEnd;
+ extern MMSUPPORT MmSystemCacheWs;
+ extern SIZE_T MmAllocatedNonPagedPool;
+ extern ULONG_PTR MmSubsectionBase;
+ extern ULONG MmSpecialPoolTag;
NTSTATUS
NTAPI