Author: dgorbachev Date: Sun Feb 26 19:04:00 2012 New Revision: 55878
URL: http://svn.reactos.org/svn/reactos?rev=55878&view=rev Log: [NDK] - Fix declaration of HalPrivateDispatchTable for FreeLDR.
[FREELDR] - Rename BiosMemoryMap to XboxMemoryMap. Another BiosMemoryMap is in meminit.c
[NTOSKRNL][WIN32K][FTP] - Fix some variables.
Modified: trunk/reactos/base/applications/network/ftp/cmds.c trunk/reactos/base/applications/network/ftp/main.c trunk/reactos/boot/freeldr/freeldr/arch/i386/halstub.c trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxmem.c trunk/reactos/include/ndk/haltypes.h trunk/reactos/ntoskrnl/mm/section.c trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c
Modified: trunk/reactos/base/applications/network/ftp/cmds.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/f... ============================================================================== --- trunk/reactos/base/applications/network/ftp/cmds.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/ftp/cmds.c [iso-8859-1] Sun Feb 26 19:04:00 2012 @@ -1627,7 +1627,7 @@ */ void disconnect(int argc, const char *argv[]) { - extern int cout; + extern SOCKET cout; extern int data;
if (!connected)
Modified: trunk/reactos/base/applications/network/ftp/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/f... ============================================================================== --- trunk/reactos/base/applications/network/ftp/main.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/ftp/main.c [iso-8859-1] Sun Feb 26 19:04:00 2012 @@ -250,7 +250,7 @@
void lostpeer(void) { - extern int cout; + extern SOCKET cout; extern int data;
if (connected) {
Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/halstub.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/i... ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/halstub.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/halstub.c [iso-8859-1] Sun Feb 26 19:04:00 2012 @@ -69,7 +69,9 @@ (pHalEndMirroring)NULL, (pHalMirrorPhysicalMemory)NULL, (pHalEndOfBoot)NULL, - (pHalMirrorVerify)NULL + (pHalMirrorVerify)NULL, + (pHalGetAcpiTable)NULL, + (pHalSetPciErrorHandlerCallback)NULL };
HAL_PRIVATE_DISPATCH HalPrivateDispatchTable =
Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxmem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/i... ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxmem.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxmem.c [iso-8859-1] Sun Feb 26 19:04:00 2012 @@ -75,24 +75,24 @@ AvailableMemoryMb = InstalledMemoryMb; }
-FREELDR_MEMORY_DESCRIPTOR BiosMemoryMap[2]; +FREELDR_MEMORY_DESCRIPTOR XboxMemoryMap[2];
PFREELDR_MEMORY_DESCRIPTOR XboxMemGetMemoryMap(ULONG *MemoryMapSize) { /* Synthesize memory map */ /* Available RAM block */ - BiosMemoryMap[0].BasePage = 0; - BiosMemoryMap[0].PageCount = AvailableMemoryMb * 1024 * 1024 / MM_PAGE_SIZE; - BiosMemoryMap[0].MemoryType = LoaderFree; + XboxMemoryMap[0].BasePage = 0; + XboxMemoryMap[0].PageCount = AvailableMemoryMb * 1024 * 1024 / MM_PAGE_SIZE; + XboxMemoryMap[0].MemoryType = LoaderFree;
/* Video memory */ - BiosMemoryMap[1].BasePage = AvailableMemoryMb * 1024 * 1024 / MM_PAGE_SIZE; - BiosMemoryMap[1].PageCount = (InstalledMemoryMb - AvailableMemoryMb) * 1024 * 1024 / MM_PAGE_SIZE; - BiosMemoryMap[1].MemoryType = LoaderFirmwarePermanent; + XboxMemoryMap[1].BasePage = AvailableMemoryMb * 1024 * 1024 / MM_PAGE_SIZE; + XboxMemoryMap[1].PageCount = (InstalledMemoryMb - AvailableMemoryMb) * 1024 * 1024 / MM_PAGE_SIZE; + XboxMemoryMap[1].MemoryType = LoaderFirmwarePermanent;
*MemoryMapSize = 2; - return BiosMemoryMap; + return XboxMemoryMap; }
PVOID
Modified: trunk/reactos/include/ndk/haltypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/haltypes.h?rev=... ============================================================================== --- trunk/reactos/include/ndk/haltypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/haltypes.h [iso-8859-1] Sun Feb 26 19:04:00 2012 @@ -257,7 +257,7 @@ // // Kernel Exports // -#if defined(_NTDRIVER_) || defined(_NTHAL_) +#if (defined(_NTDRIVER_) || defined(_NTHAL_)) && !defined(_BLDR_) extern NTSYSAPI PHAL_PRIVATE_DISPATCH HalPrivateDispatchTable; #define HALPRIVATEDISPATCH ((PHAL_PRIVATE_DISPATCH)&HalPrivateDispatchTable) #else
Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=5... ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] Sun Feb 26 19:04:00 2012 @@ -63,6 +63,8 @@ DPRINT("SetPageEntrySectionSegment(old,%x,%x,%x)\n", S,(O)->LowPart,E); \ _MmSetPageEntrySectionSegment(S,O,E,__FILE__,__LINE__); \ } while (0) + +extern MMSESSION MmSession;
NTSTATUS NTAPI @@ -4939,7 +4941,6 @@
if ((ULONG_PTR)SectionObject & 1) { - extern PVOID MmSession; return MiMapViewInSystemSpace((PVOID)((ULONG_PTR)SectionObject & ~1), &MmSession, MappedBase,
Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ntd... ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c [iso-8859-1] Sun Feb 26 19:04:00 2012 @@ -15,7 +15,7 @@ PGD_DXDDCLEANUPDXGRAPHICS gpfnCleanupDxGraphics = NULL;
/* export from dxeng.c */ -extern DRVFN gaEngFuncs; +extern DRVFN gaEngFuncs[]; extern ULONG gcEngFuncs; extern EDD_DIRECTDRAW_GLOBAL edd_DdirectDraw_Global;
@@ -157,7 +157,7 @@ { /* Setup driver data for activate the dx interface */ DxEngDrv.iDriverVersion = DDI_DRIVER_VERSION_NT5_01; - DxEngDrv.pdrvfn = &gaEngFuncs; + DxEngDrv.pdrvfn = gaEngFuncs; DxEngDrv.c = gcEngFuncs;
Status = gpfnStartupDxGraphics ( sizeof(DRVENABLEDATA),