Ros-diffs

ros-diffs@reactos.org

81390 discussions

[fireball] 32116: - Add missing registry values.
by fireball＠svn.reactos.org 04 Feb '08

04 Feb '08

Author: fireball Date: Mon Feb 4 20:10:01 2008 New Revision: 32116 URL: http://svn.reactos.org/svn/reactos?rev=32116&view=rev Log: - Add missing registry values. Modified: trunk/reactos/include/psdk/regstr.h Modified: trunk/reactos/include/psdk/regstr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/regstr.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/regstr.h (original) +++ trunk/reactos/include/psdk/regstr.h Mon Feb 4 20:10:01 2008 @@ -752,6 +752,42 @@ #define REGSTR_VAL_JOYOEMCAL10 TEXT("OEMCal10") #define REGSTR_VAL_JOYOEMCAL11 TEXT("OEMCal11") #define REGSTR_VAL_JOYOEMCAL12 TEXT("OEMCal12") +#define REGSTR_KEY_DEVICE_PROPERTIES TEXT("Properties") +#define REGSTR_VAL_SLOTNUMBER TEXT("SlotNumber") +#define REGSTR_VAL_ATTACHEDCOMPONENTS TEXT("AttachedComponents") +#define REGSTR_VAL_BASEDEVICEPATH TEXT("BaseDevicePath") +#define REGSTR_VAL_SYSTEMBUSNUMBER TEXT("SystemBusNumber") +#define REGSTR_VAL_BUSDATATYPE TEXT("BusDataType") +#define REGSTR_VAL_INTERFACETYPE TEXT("InterfaceType") +#define REGSTR_VAL_SERVICE TEXT("Service") +#define REGSTR_VAL_DETECTSIGNATURE TEXT("DetectSignature") +#define REGSTR_VAL_CLASSGUID TEXT("ClassGUID") +#define REGSTR_VAL_INSTANCEIDENTIFIER TEXT("InstanceIdentifier") +#define REGSTR_VAL_DUPLICATEOF TEXT("DuplicateOf") +#define REGSTR_VAL_STATUSFLAGS TEXT("StatusFlags") +#define REGSTR_VAL_DISABLECOUNT TEXT("DisableCount") +#define REGSTR_VAL_UNKNOWNPROBLEMS TEXT("UnknownProblem") +#define REGSTR_VAL_DOCKSTATE TEXT("DockState") +#define REGSTR_VAL_PREFERENCEORDER TEXT("PreferenceOrder") +#define REGSTR_VAL_USERWAITINTERVAL TEXT("UserWaitInterval") +#define REGSTR_VAL_DEVICE_INSTANCE TEXT("DeviceInstance") +#define REGSTR_VAL_SYMBOLIC_LINK TEXT("SymbolicLink") +#define REGSTR_VAL_DEFAULT TEXT("Default") +#define REGSTR_VAL_LOWERFILTERS TEXT("LowerFilters") +#define REGSTR_VAL_UPPERFILTERS TEXT("UpperFilters") +#define REGSTR_VAL_LOCATION_INFORMATION TEXT("LocationInformation") +#define REGSTR_VAL_UI_NUMBER TEXT("UINumber") +#define REGSTR_VAL_UI_NUMBER_DESC_FORMAT TEXT("UINumberDescFormat") +#define REGSTR_VAL_CAPABILITIES TEXT("Capabilities") +#define REGSTR_VAL_DEVICE_TYPE TEXT("DeviceType") +#define REGSTR_VAL_DEVICE_CHARACTERISTICS TEXT("DeviceCharacteristics") +#define REGSTR_VAL_DEVICE_SECURITY_DESCRIPTOR TEXT("Security") +#define REGSTR_VAL_DEVICE_EXCLUSIVE TEXT("Exclusive") +#define REGSTR_VAL_RESOURCE_PICKER_TAGS TEXT("ResourcePickerTags") +#define REGSTR_VAL_RESOURCE_PICKER_EXCEPTIONS TEXT("ResourcePickerExceptions") +#define REGSTR_VAL_CUSTOM_PROPERTY_CACHE_DATE TEXT("CustomPropertyCacheDate") +#define REGSTR_VAL_CUSTOM_PROPERTY_HW_ID_KEY TEXT("CustomPropertyHwIdKey") +#define REGSTR_VAL_LAST_UPDATE_TIME TEXT("LastUpdateTime") #ifndef NEC_98 #define REGSTR_KEY_ISAENUM TEXT("ISAPnP") #define REGSTR_KEY_EISAENUM TEXT("EISA")

1 0

[janderwald] 32115: - add api message structs / constants for doskey
by janderwald＠svn.reactos.org 04 Feb '08

04 Feb '08

Author: janderwald Date: Mon Feb 4 18:06:09 2008 New Revision: 32115 URL: http://svn.reactos.org/svn/reactos?rev=32115&view=rev Log: - add api message structs / constants for doskey Modified: trunk/reactos/include/reactos/subsys/csrss/csrss.h Modified: trunk/reactos/include/reactos/subsys/csrss/csrss.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/subsys/csr… ============================================================================== --- trunk/reactos/include/reactos/subsys/csrss/csrss.h (original) +++ trunk/reactos/include/reactos/subsys/csrss/csrss.h Mon Feb 4 18:06:09 2008 @@ -411,6 +411,53 @@ { HANDLE InputWaitHandle; } CSRSS_GET_INPUT_WAIT_HANDLE, *PCSRSS_GET_INPUT_WAIT_HANDLE; + +typedef struct +{ + LPCWSTR lpSource; + LPCWSTR lpTarget; + LPCWSTR lpExeName; +} CSRSS_ADD_CONSOLE_ALIAS, *PCSRSS_ADD_CONSOLE_ALIAS; + +typedef struct +{ + LPWSTR lpSource; + LPWSTR lpExeName; + DWORD BytesWritten; + DWORD TargetBufferLength; + LPWSTR TargetBuffer; + +} CSRSS_GET_CONSOLE_ALIAS, *PCSRSS_GET_CONSOLE_ALIAS; + +typedef struct +{ + LPWSTR lpExeName; + DWORD BytesWritten; + DWORD AliasBufferLength; + LPWSTR AliasBuffer; +} CSRSS_GET_ALL_CONSOLE_ALIAS, *PCSRSS_GET_ALL_CONSOLE_ALIAS; + +typedef struct +{ + LPWSTR lpExeName; + DWORD Length; +} CSRSS_GET_ALL_CONSOLE_ALIASES_LENGTH, *PCSRSS_GET_ALL_CONSOLE_ALIASES_LENGTH; + +typedef struct +{ + BOOL Unicode; + DWORD BytesWritten; + DWORD Length; + LPWSTR ExeNames; +} CSRSS_GET_CONSOLE_ALIASES_EXES, *PCSRSS_GET_CONSOLE_ALIASES_EXES; + +typedef struct +{ + BOOL Unicode; + DWORD Length; +} CSRSS_GET_CONSOLE_ALIASES_EXES_LENGTH, *PCSRSS_GET_CONSOLE_ALIASES_EXES_LENGTH; + + #define CSR_API_MESSAGE_HEADER_SIZE(Type) (FIELD_OFFSET(CSR_API_MESSAGE, Data) + sizeof(Type)) #define CSRSS_MAX_WRITE_CONSOLE (LPC_MAX_DATA_LENGTH - CSR_API_MESSAGE_HEADER_SIZE(CSRSS_WRITE_CONSOLE)) @@ -480,6 +527,12 @@ #define GET_INPUT_WAIT_HANDLE (0x35) #define GET_PROCESS_LIST (0x36) #define START_SCREEN_SAVER (0x37) +#define ADD_CONSOLE_ALIAS (0x38) +#define GET_CONSOLE_ALIAS (0x39) +#define GET_ALL_CONSOLE_ALIAS (0x3A) +#define GET_ALL_CONSOLE_ALIASES_LENGTH (0x3B) +#define GET_CONSOLE_ALIASES_EXES (0x3C) +#define GET_CONSOLE_ALIASES_EXES_LENGTH (0x3D) /* Keep in sync with definition below. */ #define CSRSS_HEADER_SIZE (sizeof(PORT_MESSAGE) + sizeof(ULONG) + sizeof(NTSTATUS)) @@ -545,6 +598,12 @@ CSRSS_SET_CONSOLE_OUTPUT_CP SetConsoleOutputCodePage; CSRSS_GET_INPUT_WAIT_HANDLE GetConsoleInputWaitHandle; CSRSS_GET_PROCESS_LIST GetProcessListRequest; + CSRSS_ADD_CONSOLE_ALIAS AddConsoleAlias; + CSRSS_GET_CONSOLE_ALIAS GetConsoleAlias; + CSRSS_GET_ALL_CONSOLE_ALIAS GetAllConsoleAlias; + CSRSS_GET_ALL_CONSOLE_ALIASES_LENGTH GetAllConsoleAliasesLength; + CSRSS_GET_CONSOLE_ALIASES_EXES GetConsoleAliasesExes; + CSRSS_GET_CONSOLE_ALIASES_EXES_LENGTH GetConsoleAliasesExesLength; } Data; } CSR_API_MESSAGE, *PCSR_API_MESSAGE;

1 0

[fireball] 32114: - Sync RPC headers with Wine.
by fireball＠svn.reactos.org 04 Feb '08

04 Feb '08

Author: fireball Date: Mon Feb 4 16:15:01 2008 New Revision: 32114 URL: http://svn.reactos.org/svn/reactos?rev=32114&view=rev Log: - Sync RPC headers with Wine. Modified: trunk/reactos/include/psdk/rpc.h trunk/reactos/include/psdk/rpcasync.h trunk/reactos/include/psdk/rpcdce.h trunk/reactos/include/psdk/rpcdcep.h trunk/reactos/include/psdk/rpcproxy.h Modified: trunk/reactos/include/psdk/rpc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/rpc.h?rev=321… ============================================================================== --- trunk/reactos/include/psdk/rpc.h (original) +++ trunk/reactos/include/psdk/rpc.h Mon Feb 4 16:15:01 2008 @@ -91,10 +91,6 @@ #define RPCNSAPI #endif -#ifndef RPC_NO_WINDOWS_H -#include <rpcasync.h> -#endif - #ifdef __RPC_MAC__ #include <setjmp.h> #define RPCXCWORD (sizeof(jmp_buf)/sizeof(int)) @@ -167,6 +163,10 @@ #include <poppack.h> #endif +#ifndef RPC_NO_WINDOWS_H +#include <rpcasync.h> +#endif + #ifdef __cplusplus } #endif Modified: trunk/reactos/include/psdk/rpcasync.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/rpcasync.h?re… ============================================================================== --- trunk/reactos/include/psdk/rpcasync.h (original) +++ trunk/reactos/include/psdk/rpcasync.h Mon Feb 4 16:15:01 2008 @@ -17,6 +17,7 @@ */ #ifndef __WINE_RPCASYNC_H #define __WINE_RPCASYNC_H + typedef struct tagRPC_ERROR_ENUM_HANDLE { @@ -173,12 +174,12 @@ RPCRTAPI RPC_STATUS RPC_ENTRY RpcErrorLoadErrorInfo(PVOID,SIZE_T,RPC_ERROR_ENUM_HANDLE*); RPCRTAPI RPC_STATUS RPC_ENTRY RpcErrorAddRecord(RPC_EXTENDED_ERROR_INFO*); RPCRTAPI RPC_STATUS RPC_ENTRY RpcErrorClearInformation(void); -//RPCRTAPI RPC_STATUS RPC_ENTRY RpcGetAuthorizationContextForClient(RPC_BINDING_HANDLE,BOOL,LPVOID,PLARGE_INTEGER,LUID,DWORD,PVOID,PVOID*); +RPCRTAPI RPC_STATUS RPC_ENTRY RpcGetAuthorizationContextForClient(RPC_BINDING_HANDLE,BOOL,LPVOID,PLARGE_INTEGER,LUID,DWORD,PVOID,PVOID*); RPCRTAPI RPC_STATUS RPC_ENTRY RpcFreeAuthorizationContext(PVOID*); -//RPCRTAPI RPC_STATUS RPC_ENTRY RpcSsContextLockExclusive(RPC_BINDING_HANDLE,PVOID); -//RPCRTAPI RPC_STATUS RPC_ENTRY RpcSsContextLockShared(RPC_BINDING_HANDLE,PVOID); +RPCRTAPI RPC_STATUS RPC_ENTRY RpcSsContextLockExclusive(RPC_BINDING_HANDLE,PVOID); +RPCRTAPI RPC_STATUS RPC_ENTRY RpcSsContextLockShared(RPC_BINDING_HANDLE,PVOID); -//RPCRTAPI RPC_STATUS RPC_ENTRY I_RpcAsyncSetHandle(PRPC_MESSAGE,PRPC_ASYNC_STATE); +RPCRTAPI RPC_STATUS RPC_ENTRY I_RpcAsyncSetHandle(PRPC_MESSAGE,PRPC_ASYNC_STATE); RPCRTAPI RPC_STATUS RPC_ENTRY I_RpcAsyncAbortCall(PRPC_ASYNC_STATE,ULONG); RPCRTAPI int RPC_ENTRY I_RpcExceptionFilter(ULONG); Modified: trunk/reactos/include/psdk/rpcdce.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/rpcdce.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/rpcdce.h (original) +++ trunk/reactos/include/psdk/rpcdce.h Mon Feb 4 16:15:01 2008 @@ -32,6 +32,7 @@ #ifndef OPTIONAL #define OPTIONAL #endif + #ifndef GUID_DEFINED #include <guiddef.h> #endif @@ -288,7 +289,7 @@ RPC_STATUS RPC_ENTRY DceErrorInqTextW(RPC_STATUS e, RPC_WSTR buffer); #define DceErrorInqText WINELIB_NAME_AW(DceErrorInqText) -RPCRTAPI void RPC_ENTRY +RPCRTAPI DECLSPEC_NORETURN void RPC_ENTRY RpcRaiseException( RPC_STATUS exception ); RPCRTAPI RPC_STATUS RPC_ENTRY @@ -365,6 +366,8 @@ RPCRTAPI RPC_STATUS RPC_ENTRY RpcServerListen( unsigned int MinimumCallThreads, unsigned int MaxCalls, unsigned int DontWait ); + +RPCRTAPI RPC_STATUS RPC_ENTRY RpcMgmtSetCancelTimeout(LONG); RPCRTAPI RPC_STATUS RPC_ENTRY RpcMgmtWaitServerListen( void ); @@ -464,6 +467,8 @@ RpcBindingInqAuthInfoW( RPC_BINDING_HANDLE Binding, RPC_WSTR *ServerPrincName, ULONG *AuthnLevel, ULONG *AuthnSvc, RPC_AUTH_IDENTITY_HANDLE *AuthIdentity, ULONG *AuthzSvc ); #define RpcBindingInqAuthInfo WINELIB_NAME_AW(RpcBindingInqAuthInfo) + +RPCRTAPI RPC_STATUS RPC_ENTRY RpcCancelThread(void*); RPCRTAPI RPC_STATUS RPC_ENTRY RpcNetworkIsProtseqValidA( RPC_CSTR protseq ); Modified: trunk/reactos/include/psdk/rpcdcep.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/rpcdcep.h?rev… ============================================================================== --- trunk/reactos/include/psdk/rpcdcep.h (original) +++ trunk/reactos/include/psdk/rpcdcep.h Mon Feb 4 16:15:01 2008 @@ -18,6 +18,10 @@ #ifndef __WINE_RPCDCEP_H #define __WINE_RPCDCEP_H + +#ifdef __cplusplus +extern "C" { +#endif typedef struct _RPC_VERSION { unsigned short MajorVersion; @@ -44,6 +48,9 @@ unsigned long RpcFlags; } RPC_MESSAGE, *PRPC_MESSAGE; +/* or'd with ProcNum */ +#define RPC_FLAGS_VALID_BIT 0x00008000 + #define RPC_CONTEXT_HANDLE_DEFAULT_GUARD ((void *)0xfffff00d) #define RPC_CONTEXT_HANDLE_DEFAULT_FLAGS 0x00000000 @@ -72,9 +79,8 @@ #define RPCFLG_ASYNCHRONOUS 0x40000000 #define RPCFLG_NON_NDR 0x80000000 -#define RPC_FLAGS_VALID_BIT 0x00008000 - typedef void (__RPC_STUB *RPC_DISPATCH_FUNCTION)(PRPC_MESSAGE Message); +typedef RPC_STATUS (RPC_ENTRY *RPC_FORWARD_FUNCTION)(UUID *InterfaceId, RPC_VERSION *InterfaceVersion, UUID *ObjectId, unsigned char *Rpcpro, void **ppDestEndpoint); typedef struct { @@ -124,6 +130,8 @@ #define TRANSPORT_TYPE_WMSG 0x08 RPCRTAPI RPC_STATUS RPC_ENTRY + I_RpcNegotiateTransferSyntax( RPC_MESSAGE* Message ); +RPCRTAPI RPC_STATUS RPC_ENTRY I_RpcGetBuffer( RPC_MESSAGE* Message ); RPCRTAPI RPC_STATUS RPC_ENTRY I_RpcGetBufferWithObject( RPC_MESSAGE* Message, UUID* ObjectUuid ); @@ -152,7 +160,7 @@ * Note that the prototypes for I_RpcBindingSetAsync are different for each case. * * Wine defaults to the WinNT case and only defines these function is MSWMSG is - * defined. Defining the NT functions by default causes MIDL generated proxys + * defined. Defining the NT functions by default causes MIDL generated proxies * to not compile. */ @@ -180,9 +188,6 @@ RPCRTAPI RPC_STATUS RPC_ENTRY I_RpcSetWMsgEndpoint( WCHAR* Endpoint ); -RPCRTAPI RPC_STATUS RPC_ENTRY - I_RpcBindingInqTransportType( RPC_BINDING_HANDLE Binding, unsigned int* Type ); - #endif #else @@ -207,4 +212,13 @@ #endif +RPCRTAPI RPC_STATUS RPC_ENTRY + I_RpcBindingInqTransportType( RPC_BINDING_HANDLE Binding, unsigned int* Type ); + +RPCRTAPI LONG RPC_ENTRY I_RpcMapWin32Status(RPC_STATUS); + +#ifdef __cplusplus +} +#endif + #endif /*__WINE_RPCDCEP_H */ Modified: trunk/reactos/include/psdk/rpcproxy.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/rpcproxy.h?re… ============================================================================== --- trunk/reactos/include/psdk/rpcproxy.h (original) +++ trunk/reactos/include/psdk/rpcproxy.h Mon Feb 4 16:15:01 2008 @@ -32,6 +32,10 @@ #endif #include <rpc.h> #include <rpcndr.h> + +#ifdef __cplusplus +extern "C" { +#endif typedef struct tagCInterfaceStubVtbl *PCInterfaceStubVtblList; typedef struct tagCInterfaceProxyVtbl *PCInterfaceProxyVtblList; @@ -357,4 +361,8 @@ #endif +#ifdef __cplusplus +} +#endif + #endif /*__WINE_RPCDCE_H */

1 0

[fireball] 32113: - Make Mm allocation strategy low->high by default. - Clean up Mm APIs which are not needed anymore. - Get rid of the LOADER_HIGH_ZONE definition, now the real LoaderPagesSpanned value is calculated and used. As a result, minimum memory requirement (which was >= LOADER_HIGH_ZONE) is gone, and a maximum amount of memory which could be allocated is also gone (previously, not more that the LOADER_HIGH_ZONE). - IMPORTANT: The FAT filesystem caching is disabled by default now due st
by fireball＠svn.reactos.org 04 Feb '08

04 Feb '08

Author: fireball Date: Mon Feb 4 13:45:55 2008 New Revision: 32113 URL: http://svn.reactos.org/svn/reactos?rev=32113&view=rev Log: - Make Mm allocation strategy low->high by default. - Clean up Mm APIs which are not needed anymore. - Get rid of the LOADER_HIGH_ZONE definition, now the real LoaderPagesSpanned value is calculated and used. As a result, minimum memory requirement (which was >= LOADER_HIGH_ZONE) is gone, and a maximum amount of memory which could be allocated is also gone (previously, not more that the LOADER_HIGH_ZONE). - IMPORTANT: The FAT filesystem caching is disabled by default now due strange problems in 3rd boot stage, after switching the cache to use heap routines. Cache can't use non-heap routines anymore, since the memory will overlap the contigious modules memory space which ReactOS needs. - More cleanup and more usage of the heap routines for temporary buffers. - Fix a bug in MmAllocateMemoryWithType, where result of MmFindAvailablePages was checked against -1 in error case, when in reality it's 0 (spotted by Alex). NB: 0 page is marked as a reserved in x86 arch, so it's never going to be returned as an available. Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/loader.c trunk/reactos/boot/freeldr/freeldr/cache/blocklist.c trunk/reactos/boot/freeldr/freeldr/cache/cache.c trunk/reactos/boot/freeldr/freeldr/fs/fat.c trunk/reactos/boot/freeldr/freeldr/include/mm.h trunk/reactos/boot/freeldr/freeldr/mm/meminit.c trunk/reactos/boot/freeldr/freeldr/mm/mm.c trunk/reactos/boot/freeldr/freeldr/windows/peloader.c trunk/reactos/boot/freeldr/freeldr/windows/winldr.c trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/loader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/loader.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/loader.c Mon Feb 4 13:45:55 2008 @@ -582,7 +582,7 @@ FsSetFilePointer(Image, 0); /* Allocate a temporary buffer for the read */ - ReadBuffer = MmAllocateMemory(ImageSize); + ReadBuffer = MmHeapAlloc(ImageSize); /* Load the file image */ FsReadFile(Image, ImageSize, NULL, ReadBuffer); @@ -591,7 +591,7 @@ ImageSize = FrLdrReMapImage(ReadBuffer, LoadBase); /* Free the temporary buffer */ - MmFreeMemory(ReadBuffer); + MmHeapFree(ReadBuffer); /* Calculate Difference between Real Base and Compiled Base*/ Status = LdrRelocateImageWithBias(LoadBase, Modified: trunk/reactos/boot/freeldr/freeldr/cache/blocklist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/cache… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/cache/blocklist.c (original) +++ trunk/reactos/boot/freeldr/freeldr/cache/blocklist.c Mon Feb 4 13:45:55 2008 @@ -108,7 +108,7 @@ // allocate room for the block data RtlZeroMemory(CacheBlock, sizeof(CACHE_BLOCK)); CacheBlock->BlockNumber = BlockNumber; - CacheBlock->BlockData = MmAllocateMemory(CacheDrive->BlockSize * CacheDrive->BytesPerSector); + CacheBlock->BlockData = MmHeapAlloc(CacheDrive->BlockSize * CacheDrive->BytesPerSector); if (CacheBlock->BlockData ==NULL) { MmHeapFree(CacheBlock); @@ -118,7 +118,7 @@ // Now try to read in the block if (!MachDiskReadLogicalSectors(CacheDrive->DriveNumber, (BlockNumber * CacheDrive->BlockSize), CacheDrive->BlockSize, (PVOID)DISKREADBUFFER)) { - MmFreeMemory(CacheBlock->BlockData); + MmHeapFree(CacheBlock->BlockData); MmHeapFree(CacheBlock); return NULL; } @@ -161,7 +161,7 @@ RemoveEntryList(&CacheBlockToFree->ListEntry); // Free the block memory and the block structure - MmFreeMemory(CacheBlockToFree->BlockData); + MmHeapFree(CacheBlockToFree->BlockData); MmHeapFree(CacheBlockToFree); // Update the cache data Modified: trunk/reactos/boot/freeldr/freeldr/cache/cache.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/cache… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/cache/cache.c (original) +++ trunk/reactos/boot/freeldr/freeldr/cache/cache.c Mon Feb 4 13:45:55 2008 @@ -70,7 +70,7 @@ CACHE_BLOCK, ListEntry); - MmFreeMemory(NextCacheBlock->BlockData); + MmHeapFree(NextCacheBlock->BlockData); MmHeapFree(NextCacheBlock); } } Modified: trunk/reactos/boot/freeldr/freeldr/fs/fat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/fs/fa… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/fs/fat.c (original) +++ trunk/reactos/boot/freeldr/freeldr/fs/fat.c Mon Feb 4 13:45:55 2008 @@ -22,7 +22,7 @@ #define NDEBUG #include <debug.h> -BOOLEAN gCacheEnabled = TRUE; +BOOLEAN gCacheEnabled = FALSE; ULONG BytesPerSector; /* Number of bytes per sector */ ULONG SectorsPerCluster; /* Number of sectors per cluster */ Modified: trunk/reactos/boot/freeldr/freeldr/include/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/mm.h (original) +++ trunk/reactos/boot/freeldr/freeldr/include/mm.h Mon Feb 4 13:45:55 2008 @@ -47,10 +47,6 @@ ( ((a) >> MM_PAGE_SHIFT) + ((a) & MM_PAGE_MASK ? 1 : 0) ) #endif // defined __i386__ or _PPC_ or _MIPS_ -// -// This is the zone which is used by the OS loader -// -#define LOADER_HIGH_ZONE ((24*1024*1024) >> MM_PAGE_SHIFT) // 24Mb // HEAP and STACK size #define HEAP_PAGES 0x400 @@ -105,9 +101,6 @@ PVOID MmAllocateMemory(ULONG MemorySize); PVOID MmAllocateMemoryWithType(ULONG MemorySize, TYPE_OF_MEMORY MemoryType); VOID MmFreeMemory(PVOID MemoryPointer); -VOID MmChangeAllocationPolicy(BOOLEAN PolicyAllocatePagesFromEnd); -//PVOID MmAllocateLowMemory(ULONG MemorySize); -//VOID MmFreeLowMemory(PVOID MemoryPointer); PVOID MmAllocateMemoryAtAddress(ULONG MemorySize, PVOID DesiredAddress, TYPE_OF_MEMORY MemoryType); PVOID MmAllocateHighestMemoryBelowAddress(ULONG MemorySize, PVOID DesiredAddress, TYPE_OF_MEMORY MemoryType); Modified: trunk/reactos/boot/freeldr/freeldr/mm/meminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/mm/me… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/mm/meminit.c (original) +++ trunk/reactos/boot/freeldr/freeldr/mm/meminit.c Mon Feb 4 13:45:55 2008 @@ -393,8 +393,7 @@ if (FromEnd) { /* Allocate "high" (from end) pages */ - for (Index=/*LastFreePageHint-1*/LOADER_HIGH_ZONE-1; Index>0; Index--) - //for (Index=LastFreePageHint-1; Index>0; Index--) + for (Index=LastFreePageHint-1; Index>0; Index--) { if (RealPageLookupTable[Index].PageAllocated != LoaderFree) { Modified: trunk/reactos/boot/freeldr/freeldr/mm/mm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/mm/mm… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/mm/mm.c (original) +++ trunk/reactos/boot/freeldr/freeldr/mm/mm.c Mon Feb 4 13:45:55 2008 @@ -25,12 +25,7 @@ VOID MemAllocTest(VOID); #endif // DBG -BOOLEAN AllocateFromEnd = TRUE; - -VOID MmChangeAllocationPolicy(BOOLEAN PolicyAllocatePagesFromEnd) -{ - AllocateFromEnd = PolicyAllocatePagesFromEnd; -} +ULONG LoaderPagesSpanned = 0; PVOID MmAllocateMemoryWithType(ULONG MemorySize, TYPE_OF_MEMORY MemoryType) { @@ -60,9 +55,9 @@ return NULL; } - FirstFreePageFromEnd = MmFindAvailablePages(PageLookupTableAddress, TotalPagesInLookupTable, PagesNeeded, AllocateFromEnd); - - if (FirstFreePageFromEnd == (ULONG)-1) + FirstFreePageFromEnd = MmFindAvailablePages(PageLookupTableAddress, TotalPagesInLookupTable, PagesNeeded, FALSE); + + if (FirstFreePageFromEnd == 0) { DbgPrint((DPRINT_MEMORY, "Memory allocation failed in MmAllocateMemory(). Not enough free memory to allocate %d bytes.\n", MemorySize)); UiMessageBoxCritical("Memory allocation failed: out of memory."); @@ -78,6 +73,10 @@ DbgPrint((DPRINT_MEMORY, "Allocated %d bytes (%d pages) of memory starting at page %d.\n", MemorySize, PagesNeeded, FirstFreePageFromEnd)); DbgPrint((DPRINT_MEMORY, "Memory allocation pointer: 0x%x\n", MemPointer)); #endif // DBG + + // Update LoaderPagesSpanned count + if ((((ULONG_PTR)MemPointer + MemorySize) >> PAGE_SHIFT) > LoaderPagesSpanned) + LoaderPagesSpanned = (((ULONG_PTR)MemPointer + MemorySize) >> PAGE_SHIFT); // Now return the pointer return MemPointer; @@ -174,6 +173,10 @@ DbgPrint((DPRINT_MEMORY, "Allocated %d bytes (%d pages) of memory starting at page %d.\n", MemorySize, PagesNeeded, StartPageNumber)); DbgPrint((DPRINT_MEMORY, "Memory allocation pointer: 0x%x\n", MemPointer)); #endif // DBG + + // Update LoaderPagesSpanned count + if ((((ULONG_PTR)MemPointer + MemorySize) >> PAGE_SHIFT) > LoaderPagesSpanned) + LoaderPagesSpanned = (((ULONG_PTR)MemPointer + MemorySize) >> PAGE_SHIFT); // Now return the pointer return MemPointer; @@ -227,6 +230,10 @@ DbgPrint((DPRINT_MEMORY, "Allocated %d bytes (%d pages) of memory starting at page %d.\n", MemorySize, PagesNeeded, FirstFreePageFromEnd)); DbgPrint((DPRINT_MEMORY, "Memory allocation pointer: 0x%x\n", MemPointer)); #endif // DBG + + // Update LoaderPagesSpanned count + if ((((ULONG_PTR)MemPointer + MemorySize) >> PAGE_SHIFT) > LoaderPagesSpanned) + LoaderPagesSpanned = (((ULONG_PTR)MemPointer + MemorySize) >> PAGE_SHIFT); // Now return the pointer return MemPointer; Modified: trunk/reactos/boot/freeldr/freeldr/windows/peloader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/peloader.c (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/peloader.c Mon Feb 4 13:45:55 2008 @@ -1,832 +1,830 @@ -/* - * PROJECT: FreeLoader - * LICENSE: GPL - See COPYING in the top level directory - * FILE: freeldr/winldr/peloader.c - * PURPOSE: Provides routines for loading PE files. To be merged with - * arch/i386/loader.c in future - * This article was very handy during development: - * http://msdn.microsoft.com/msdnmag/issues/02/03/PE2/ - * PROGRAMMERS: Aleksey Bragin (aleksey(a)reactos.org) - * The source code in this file is based on the work of respective - * authors of PE loading code in ReactOS and Brian Palmer and - * Alex Ionescu's arch/i386/loader.c, and my research project - * (creating a native EFI loader for Windows) - */ - -/* INCLUDES ***************************************************************/ -#include <freeldr.h> -#include <debug.h> - - -BOOLEAN -WinLdrpCompareDllName(IN PCH DllName, - IN PUNICODE_STRING UnicodeName); - -BOOLEAN -WinLdrpBindImportName(IN OUT PLOADER_PARAMETER_BLOCK WinLdrBlock, - IN PVOID DllBase, - IN PVOID ImageBase, - IN PIMAGE_THUNK_DATA ThunkData, - IN PIMAGE_EXPORT_DIRECTORY ExportDirectory, - IN ULONG ExportSize, - IN BOOLEAN ProcessForwards); - -BOOLEAN -WinLdrpLoadAndScanReferencedDll(PLOADER_PARAMETER_BLOCK WinLdrBlock, - PCCH DirectoryPath, - PCH ImportName, - PLDR_DATA_TABLE_ENTRY *DataTableEntry); - -BOOLEAN -WinLdrpScanImportAddressTable(IN OUT PLOADER_PARAMETER_BLOCK WinLdrBlock, - IN PVOID DllBase, - IN PVOID ImageBase, - IN PIMAGE_THUNK_DATA ThunkData); - - - -/* FUNCTIONS **************************************************************/ - -/* Returns TRUE if DLL has already been loaded - looks in LoadOrderList in LPB */ -BOOLEAN -WinLdrCheckForLoadedDll(IN OUT PLOADER_PARAMETER_BLOCK WinLdrBlock, - IN PCH DllName, - OUT PLDR_DATA_TABLE_ENTRY *LoadedEntry) -{ - PLDR_DATA_TABLE_ENTRY DataTableEntry; - LIST_ENTRY *ModuleEntry; - - DbgPrint((DPRINT_WINDOWS, "WinLdrCheckForLoadedDll: DllName %X, LoadedEntry: %X\n", - DllName, LoadedEntry)); - - /* Just go through each entry in the LoadOrderList and compare loaded module's - name with a given name */ - ModuleEntry = WinLdrBlock->LoadOrderListHead.Flink; - while (ModuleEntry != &WinLdrBlock->LoadOrderListHead) - { - /* Get pointer to the current DTE */ - DataTableEntry = CONTAINING_RECORD(ModuleEntry, - LDR_DATA_TABLE_ENTRY, - InLoadOrderLinks); - - DbgPrint((DPRINT_WINDOWS, "WinLdrCheckForLoadedDll: DTE %p, EP %p\n", - DataTableEntry, DataTableEntry->EntryPoint)); - - /* Compare names */ - if (WinLdrpCompareDllName(DllName, &DataTableEntry->BaseDllName)) - { - /* Yes, found it, report pointer to the loaded module's DTE - to the caller and increase load count for it */ - *LoadedEntry = DataTableEntry; - DataTableEntry->LoadCount++; - DbgPrint((DPRINT_WINDOWS, "WinLdrCheckForLoadedDll: LoadedEntry %X\n", DataTableEntry)); - return TRUE; - } - - /* Go to the next entry */ - ModuleEntry = ModuleEntry->Flink; - } - - /* Nothing found */ - return FALSE; -} - -BOOLEAN -WinLdrScanImportDescriptorTable(IN OUT PLOADER_PARAMETER_BLOCK WinLdrBlock, - IN PCCH DirectoryPath, - IN PLDR_DATA_TABLE_ENTRY ScanDTE) -{ - PLDR_DATA_TABLE_ENTRY DataTableEntry; - PIMAGE_IMPORT_DESCRIPTOR ImportTable; - ULONG ImportTableSize; - PCH ImportName; - BOOLEAN Status; - - /* Get a pointer to the import table of this image */ - ImportTable = (PIMAGE_IMPORT_DESCRIPTOR)RtlImageDirectoryEntryToData(VaToPa(ScanDTE->DllBase), - TRUE, IMAGE_DIRECTORY_ENTRY_IMPORT, &ImportTableSize); - - { - UNICODE_STRING BaseName; - BaseName.Buffer = VaToPa(ScanDTE->BaseDllName.Buffer); - BaseName.MaximumLength = ScanDTE->BaseDllName.MaximumLength; - BaseName.Length = ScanDTE->BaseDllName.Length; - DbgPrint((DPRINT_WINDOWS, "WinLdrScanImportDescriptorTable(): %wZ ImportTable = 0x%X\n", - &BaseName, ImportTable)); - } - - /* If image doesn't have any import directory - just return success */ - if (ImportTable == NULL) - return TRUE; - - /* Loop through all entries */ - for (;(ImportTable->Name != 0) && (ImportTable->FirstThunk != 0);ImportTable++) - { - /* Get pointer to the name */ - ImportName = (PCH)VaToPa(RVA(ScanDTE->DllBase, ImportTable->Name)); - DbgPrint((DPRINT_WINDOWS, "WinLdrScanImportDescriptorTable(): Looking at %s\n", ImportName)); - - /* In case we get a reference to ourselves - just skip it */ - if (WinLdrpCompareDllName(ImportName, &ScanDTE->BaseDllName)) - continue; - - /* Load the DLL if it is not already loaded */ - if (!WinLdrCheckForLoadedDll(WinLdrBlock, ImportName, &DataTableEntry)) - { - Status = WinLdrpLoadAndScanReferencedDll(WinLdrBlock, - DirectoryPath, - ImportName, - &DataTableEntry); - - if (!Status) - { - DbgPrint((DPRINT_WINDOWS, "WinLdrpLoadAndScanReferencedDll() failed\n")); - return Status; - } - } - - /* Scan its import address table */ - Status = WinLdrpScanImportAddressTable( - WinLdrBlock, - DataTableEntry->DllBase, - ScanDTE->DllBase, - (PIMAGE_THUNK_DATA)RVA(ScanDTE->DllBase, ImportTable->FirstThunk)); - - if (!Status) - { - DbgPrint((DPRINT_WINDOWS, "WinLdrpScanImportAddressTable() failed\n")); - return Status; - } - } - - return TRUE; -} - -BOOLEAN -WinLdrAllocateDataTableEntry(IN OUT PLOADER_PARAMETER_BLOCK WinLdrBlock, - IN PCCH BaseDllName, - IN PCCH FullDllName, - IN PVOID BasePA, - OUT PLDR_DATA_TABLE_ENTRY *NewEntry) -{ - PVOID BaseVA = PaToVa(BasePA); - PWSTR Buffer; - PLDR_DATA_TABLE_ENTRY DataTableEntry; - PIMAGE_NT_HEADERS NtHeaders; - USHORT Length; - - /* Allocate memory for a data table entry, zero-initialize it */ - DataTableEntry = (PLDR_DATA_TABLE_ENTRY)MmHeapAlloc(sizeof(LDR_DATA_TABLE_ENTRY)); - if (DataTableEntry == NULL) - return FALSE; - RtlZeroMemory(DataTableEntry, sizeof(LDR_DATA_TABLE_ENTRY)); - - /* Get NT headers from the image */ - NtHeaders = RtlImageNtHeader(BasePA); - - /* Initialize corresponding fields of DTE based on NT headers value */ - DataTableEntry->DllBase = BaseVA; - DataTableEntry->SizeOfImage = NtHeaders->OptionalHeader.SizeOfImage; - DataTableEntry->EntryPoint = RVA(BaseVA, NtHeaders->OptionalHeader.AddressOfEntryPoint); - DataTableEntry->SectionPointer = 0; - DataTableEntry->CheckSum = NtHeaders->OptionalHeader.CheckSum; - - /* Initialize BaseDllName field (UNICODE_STRING) from the Ansi BaseDllName - by simple conversion - copying each character */ - Length = (USHORT)(strlen(BaseDllName) * sizeof(WCHAR)); - Buffer = (PWSTR)MmHeapAlloc(Length); - if (Buffer == NULL) - { - MmHeapFree(DataTableEntry); - return FALSE; - } - RtlZeroMemory(Buffer, Length); - - DataTableEntry->BaseDllName.Length = Length; - DataTableEntry->BaseDllName.MaximumLength = Length; - DataTableEntry->BaseDllName.Buffer = PaToVa(Buffer); - while (*BaseDllName != 0) - { - *Buffer++ = *BaseDllName++; - } - - /* Initialize FullDllName field (UNICODE_STRING) from the Ansi FullDllName - using the same method */ - Length = (USHORT)(strlen(FullDllName) * sizeof(WCHAR)); - Buffer = (PWSTR)MmHeapAlloc(Length); - if (Buffer == NULL) - { - MmHeapFree(DataTableEntry); - return FALSE; - } - RtlZeroMemory(Buffer, Length); - - DataTableEntry->FullDllName.Length = Length; - DataTableEntry->FullDllName.MaximumLength = Length; - DataTableEntry->FullDllName.Buffer = PaToVa(Buffer); - while (*FullDllName != 0) - { - *Buffer++ = *FullDllName++; - } - - /* Initialize what's left - LoadCount which is 1, and set Flags so that - we know this entry is processed */ - DataTableEntry->Flags = LDRP_ENTRY_PROCESSED; - DataTableEntry->LoadCount = 1; - - /* Insert this DTE to a list in the LPB */ - InsertTailList(&WinLdrBlock->LoadOrderListHead, &DataTableEntry->InLoadOrderLinks); - - /* Save pointer to a newly allocated and initialized entry */ - *NewEntry = DataTableEntry; - - /* Return success */ - return TRUE; -} - -/* WinLdrLoadImage loads the specified image from the file (it doesn't - perform any additional operations on the filename, just directly - calls the file I/O routines), and relocates it so that it's ready - to be used when paging is enabled. - Addressing mode: physical - */ -BOOLEAN -WinLdrLoadImage(IN PCHAR FileName, - TYPE_OF_MEMORY MemoryType, - OUT PVOID *ImageBasePA) -{ - PFILE FileHandle; - PVOID PhysicalBase; - PVOID VirtualBase = NULL; - UCHAR HeadersBuffer[SECTOR_SIZE * 2]; - PIMAGE_NT_HEADERS NtHeaders; - PIMAGE_SECTION_HEADER SectionHeader; - ULONG VirtualSize, SizeOfRawData, NumberOfSections; - BOOLEAN Status; - ULONG i, BytesRead; - - CHAR ProgressString[256]; - - /* Inform user we are loading files */ - sprintf(ProgressString, "Loading %s...", FileName); - UiDrawProgressBarCenter(1, 100, ProgressString); - - /* Open the image file */ - FileHandle = FsOpenFile(FileName); - - if (FileHandle == NULL) - { - //Print(L"Can not open the file %s\n",FileName); - UiMessageBox("Can not open the file"); - return FALSE; - } - - /* Load the first 2 sectors of the image so we can read the PE header */ - Status = FsReadFile(FileHandle, SECTOR_SIZE * 2, NULL, HeadersBuffer); - if (!Status) - { - //Print(L"Error reading from file %s\n", FileName); - UiMessageBox("Error reading from file"); - FsCloseFile(FileHandle); - return FALSE; - } - - /* Now read the MZ header to get the offset to the PE Header */ - NtHeaders = RtlImageNtHeader(HeadersBuffer); - - if (!NtHeaders) - { - //Print(L"Error - no NT header found in %s\n", FileName); - UiMessageBox("Error - no NT header found"); - FsCloseFile(FileHandle); - return FALSE; - } - - /* Ensure this is executable image */ - if (((NtHeaders->FileHeader.Characteristics & IMAGE_FILE_EXECUTABLE_IMAGE) == 0)) - { - //Print(L"Not an executable image %s\n", FileName); - UiMessageBox("Not an executable image"); - FsCloseFile(FileHandle); - return FALSE; - } - - /* Store number of sections to read and a pointer to the first section */ - NumberOfSections = NtHeaders->FileHeader.NumberOfSections; - SectionHeader = IMAGE_FIRST_SECTION(NtHeaders); - - /* Try to allocate this memory, if fails - allocate somewhere else */ - PhysicalBase = MmAllocateMemoryAtAddress(NtHeaders->OptionalHeader.SizeOfImage, - (PVOID)((ULONG)NtHeaders->OptionalHeader.ImageBase & (KSEG0_BASE - 1)), - MemoryType); - - if (PhysicalBase == NULL) - { - /* It's ok, we don't panic - let's allocate again at any other "low" place */ - //MmChangeAllocationPolicy(FALSE); - PhysicalBase = MmAllocateMemoryWithType(NtHeaders->OptionalHeader.SizeOfImage, MemoryType); - //MmChangeAllocationPolicy(TRUE); - - if (PhysicalBase == NULL) - { - //Print(L"Failed to alloc pages for image %s\n", FileName); - UiMessageBox("Failed to alloc pages for image"); - FsCloseFile(FileHandle); - return FALSE; - } - } - - /* This is the real image base - in form of a virtual address */ - VirtualBase = PaToVa(PhysicalBase); - - DbgPrint((DPRINT_WINDOWS, "Base PA: 0x%X, VA: 0x%X\n", PhysicalBase, VirtualBase)); - - /* Set to 0 position and fully load the file image */ - FsSetFilePointer(FileHandle, 0); - - Status = FsReadFile(FileHandle, NtHeaders->OptionalHeader.SizeOfHeaders, NULL, PhysicalBase); - - if (!Status) - { - //Print(L"Error reading headers %s\n", FileName); - UiMessageBox("Error reading headers"); - FsCloseFile(FileHandle); - return FALSE; - } - - /* Reload the NT Header */ - NtHeaders = RtlImageNtHeader(PhysicalBase); - - /* Load the first section */ - SectionHeader = IMAGE_FIRST_SECTION(NtHeaders); - - /* Fill output parameters */ - *ImageBasePA = PhysicalBase; - - /* Walk through each section and read it (check/fix any possible - bad situations, if they arise) */ - for (i = 0; i < NumberOfSections; i++) - { - VirtualSize = SectionHeader->Misc.VirtualSize; - SizeOfRawData = SectionHeader->SizeOfRawData; - - /* Handle a case when VirtualSize equals 0 */ - if (VirtualSize == 0) - VirtualSize = SizeOfRawData; - - /* If PointerToRawData is 0, then force its size to be also 0 */ - if (SectionHeader->PointerToRawData == 0) - { - SizeOfRawData = 0; - } - else - { - /* Cut the loaded size to the VirtualSize extents */ - if (SizeOfRawData > VirtualSize) - SizeOfRawData = VirtualSize; - } - - /* Actually read the section (if its size is not 0) */ - if (SizeOfRawData != 0) - { - /* Seek to the correct position */ - FsSetFilePointer(FileHandle, SectionHeader->PointerToRawData); - - DbgPrint((DPRINT_WINDOWS, "SH->VA: 0x%X\n", SectionHeader->VirtualAddress)); - - /* Read this section from the file, size = SizeOfRawData */ - Status = FsReadFile(FileHandle, SizeOfRawData, &BytesRead, (PUCHAR)PhysicalBase + SectionHeader->VirtualAddress); - - if (!Status && (BytesRead == 0)) - { - DbgPrint((DPRINT_WINDOWS, "WinLdrLoadImage(): Error reading section from file!\n")); - break; - } - } - - /* Size of data is less than the virtual size - fill up the remainder with zeroes */ - if (SizeOfRawData < VirtualSize) - { - DbgPrint((DPRINT_WINDOWS, "WinLdrLoadImage(): SORD %d < VS %d", SizeOfRawData, VirtualSize)); - RtlZeroMemory((PVOID)(SectionHeader->VirtualAddress + (ULONG)PhysicalBase + SizeOfRawData), VirtualSize - SizeOfRawData); - } - - SectionHeader++; - } - - /* We are done with the file - close it */ - FsCloseFile(FileHandle); - - /* If loading failed - return right now */ - if (!Status) - return FALSE; - - - /* Relocate the image, if it needs it */ - if (NtHeaders->OptionalHeader.ImageBase != (ULONG)VirtualBase) - { - DbgPrint((DPRINT_WINDOWS, "Relocating %p -> %p\n", - NtHeaders->OptionalHeader.ImageBase, VirtualBase)); - Status = (BOOLEAN)LdrRelocateImageWithBias(PhysicalBase, - (ULONG_PTR)VirtualBase - (ULONG_PTR)PhysicalBase, - "FreeLdr", - TRUE, - TRUE, /* in case of conflict still return success */ - FALSE); - } - - return Status; -} - -/* PRIVATE FUNCTIONS *******************************************************/ - -/* DllName - physical, UnicodeString->Buffer - virtual */ -BOOLEAN -WinLdrpCompareDllName(IN PCH DllName, - IN PUNICODE_STRING UnicodeName) -{ - PWSTR Buffer; - UNICODE_STRING UnicodeNamePA; - ULONG i, Length; - - /* First obvious check: for length of two names */ - Length = strlen(DllName); - - UnicodeNamePA.Length = UnicodeName->Length; - UnicodeNamePA.MaximumLength = UnicodeName->MaximumLength; - UnicodeNamePA.Buffer = VaToPa(UnicodeName->Buffer); - DbgPrint((DPRINT_WINDOWS, "WinLdrpCompareDllName: %s and %wZ, Length = %d " - "UN->Length %d\n", DllName, &UnicodeNamePA, Length, UnicodeName->Length)); - - if ((Length * sizeof(WCHAR)) > UnicodeName->Length) - return FALSE; - - /* Store pointer to unicode string's buffer */ - Buffer = VaToPa(UnicodeName->Buffer); - - /* Loop character by character */ - for (i = 0; i < Length; i++) - { - /* Compare two characters, uppercasing them */ - if (toupper(*DllName) != toupper((CHAR)*Buffer)) - return FALSE; - - /* Move to the next character */ - DllName++; - Buffer++; - } - - /* Check, if strings either fully match, or match till the "." (w/o extension) */ - if ((UnicodeName->Length == Length * sizeof(WCHAR)) || (*Buffer == L'.')) - { - /* Yes they do */ - return TRUE; - } - - /* Strings don't match, return FALSE */ - return FALSE; -} - -BOOLEAN -WinLdrpBindImportName(IN OUT PLOADER_PARAMETER_BLOCK WinLdrBlock, - IN PVOID DllBase, - IN PVOID ImageBase, - IN PIMAGE_THUNK_DATA ThunkData, - IN PIMAGE_EXPORT_DIRECTORY ExportDirectory, - IN ULONG ExportSize, - IN BOOLEAN ProcessForwards) -{ - ULONG Ordinal; - PULONG NameTable, FunctionTable; - PUSHORT OrdinalTable; - LONG High, Low, Middle, Result; - ULONG Hint; - - //DbgPrint((DPRINT_WINDOWS, "WinLdrpBindImportName(): DllBase 0x%X, ImageBase 0x%X, ThunkData 0x%X, ExportDirectory 0x%X, ExportSize %d, ProcessForwards 0x%X\n", - // DllBase, ImageBase, ThunkData, ExportDirectory, ExportSize, ProcessForwards)); - - /* Check passed DllBase param */ - if(DllBase == NULL) - { - DbgPrint((DPRINT_WINDOWS, "WARNING: DllBase == NULL!\n")); - return FALSE; - } - - /* Convert all non-critical pointers to PA from VA */ - ThunkData = VaToPa(ThunkData); - - /* Is the reference by ordinal? */ - if (IMAGE_SNAP_BY_ORDINAL(ThunkData->u1.Ordinal) && !ProcessForwards) - { - /* Yes, calculate the ordinal */ - Ordinal = (ULONG)(IMAGE_ORDINAL(ThunkData->u1.Ordinal) - (UINT32)ExportDirectory->Base); - //DbgPrint((DPRINT_WINDOWS, "WinLdrpBindImportName(): Ordinal %d\n", Ordinal)); - } - else - { - /* It's reference by name, we have to look it up in the export directory */ - if (!ProcessForwards) - { - /* AddressOfData in thunk entry will become a virtual address (from relative) */ - //DbgPrint((DPRINT_WINDOWS, "WinLdrpBindImportName(): ThunkData->u1.AOD was %p\n", ThunkData->u1.AddressOfData)); - ThunkData->u1.AddressOfData = - (ULONG)RVA(ImageBase, ThunkData->u1.AddressOfData); - //DbgPrint((DPRINT_WINDOWS, "WinLdrpBindImportName(): ThunkData->u1.AOD became %p\n", ThunkData->u1.AddressOfData)); - } - - /* Get pointers to Name and Ordinal tables (RVA -> VA) */ - NameTable = (PULONG)VaToPa(RVA(DllBase, ExportDirectory->AddressOfNames)); - OrdinalTable = (PUSHORT)VaToPa(RVA(DllBase, ExportDirectory->AddressOfNameOrdinals)); - - //DbgPrint((DPRINT_WINDOWS, "NameTable 0x%X, OrdinalTable 0x%X, ED->AddressOfNames 0x%X, ED->AOFO 0x%X\n", - // NameTable, OrdinalTable, ExportDirectory->AddressOfNames, ExportDirectory->AddressOfNameOrdinals)); - - /* Get the hint, convert it to a physical pointer */ - Hint = ((PIMAGE_IMPORT_BY_NAME)VaToPa((PVOID)ThunkData->u1.AddressOfData))->Hint; - //DbgPrint((DPRINT_WINDOWS, "HintIndex %d\n", Hint)); - - /* If Hint is less than total number of entries in the export directory, - and import name == export name, then we can just get it from the OrdinalTable */ - if ( - (Hint < ExportDirectory->NumberOfNames) && - ( - strcmp(VaToPa(&((PIMAGE_IMPORT_BY_NAME)VaToPa((PVOID)ThunkData->u1.AddressOfData))->Name[0]), - (PCHAR)VaToPa( RVA(DllBase, NameTable[Hint])) ) == 0 - ) - ) - { - Ordinal = OrdinalTable[Hint]; - //DbgPrint((DPRINT_WINDOWS, "WinLdrpBindImportName(): Ordinal %d\n", Ordinal)); - } - else - { - /* It's not the easy way, we have to lookup import name in the name table. - Let's use a binary search for this task. */ - - //DbgPrint((DPRINT_WINDOWS, "WinLdrpBindImportName() looking up the import name using binary search...\n")); - - /* Low boundary is set to 0, and high boundary to the maximum index */ - Low = 0; - High = ExportDirectory->NumberOfNames - 1; - - /* Perform a binary-search loop */ - while (High >= Low) - { - /* Divide by 2 by shifting to the right once */ - Middle = (Low + High) >> 1; - - /* Compare the names */ - Result = strcmp(VaToPa(&((PIMAGE_IMPORT_BY_NAME)VaToPa((PVOID)ThunkData->u1.AddressOfData))->Name[0]), - (PCHAR)VaToPa(RVA(DllBase, NameTable[Middle]))); - - /*DbgPrint((DPRINT_WINDOWS, "Binary search: comparing Import '__', Export '%s'\n",*/ - /*VaToPa(&((PIMAGE_IMPORT_BY_NAME)VaToPa(ThunkData->u1.AddressOfData))->Name[0]),*/ - /*(PCHAR)VaToPa(RVA(DllBase, NameTable[Middle]))));*/ - - /*DbgPrint((DPRINT_WINDOWS, "TE->u1.AOD %p, fulladdr %p\n", - ThunkData->u1.AddressOfData, - ((PIMAGE_IMPORT_BY_NAME)VaToPa(ThunkData->u1.AddressOfData))->Name ));*/ - - - /* Depending on result of strcmp, perform different actions */ - if (Result < 0) - { - /* Adjust top boundary */ - High = Middle - 1; - } - else if (Result > 0) - { - /* Adjust bottom boundary */ - Low = Middle + 1; - } - else - { - /* Yay, found it! */ - break; - } - } - - /* If high boundary is less than low boundary, then no result found */ - if (High < Low) - { - //Print(L"Error in binary search\n"); - DbgPrint((DPRINT_WINDOWS, "Error in binary search!\n")); - return FALSE; - } - - /* Everything allright, get the ordinal */ - Ordinal = OrdinalTable[Middle]; - - //DbgPrint((DPRINT_WINDOWS, "WinLdrpBindImportName() found Ordinal %d\n", Ordinal)); - } - } - - /* Check ordinal number for validity! */ - if (Ordinal >= ExportDirectory->NumberOfFunctions) - { - DbgPrint((DPRINT_WINDOWS, "Ordinal number is invalid!\n")); - return FALSE; - } - - /* Get a pointer to the function table */ - FunctionTable = (PULONG)VaToPa(RVA(DllBase, ExportDirectory->AddressOfFunctions)); - - /* Save a pointer to the function */ - ThunkData->u1.Function = (ULONG)RVA(DllBase, FunctionTable[Ordinal]); - - /* Is it a forwarder? (function pointer isn't within the export directory) */ - if (((ULONG)VaToPa((PVOID)ThunkData->u1.Function) > (ULONG)ExportDirectory) && - ((ULONG)VaToPa((PVOID)ThunkData->u1.Function) < ((ULONG)ExportDirectory + ExportSize))) - { - PLDR_DATA_TABLE_ENTRY DataTableEntry; - CHAR ForwardDllName[255]; - PIMAGE_EXPORT_DIRECTORY RefExportDirectory; - ULONG RefExportSize; - - /* Save the name of the forward dll */ - RtlCopyMemory(ForwardDllName, (PCHAR)VaToPa((PVOID)ThunkData->u1.Function), sizeof(ForwardDllName)); - - /* Strip out its extension */ - *strchr(ForwardDllName,'.') = '\0'; - - DbgPrint((DPRINT_WINDOWS, "WinLdrpBindImportName(): ForwardDllName %s\n", ForwardDllName)); - if (!WinLdrCheckForLoadedDll(WinLdrBlock, ForwardDllName, &DataTableEntry)) - { - /* We can't continue if DLL couldn't be loaded, so bomb out with an error */ - //Print(L"Error loading DLL!\n"); - DbgPrint((DPRINT_WINDOWS, "Error loading DLL!\n")); - return FALSE; - } - - /* Get pointer to the export directory of loaded DLL */ - RefExportDirectory = (PIMAGE_EXPORT_DIRECTORY) - RtlImageDirectoryEntryToData(VaToPa(DataTableEntry->DllBase), - TRUE, - IMAGE_DIRECTORY_ENTRY_EXPORT, - &RefExportSize); - - /* Fail if it's NULL */ - if (RefExportDirectory) - { - UCHAR Buffer[128]; - IMAGE_THUNK_DATA RefThunkData; - PIMAGE_IMPORT_BY_NAME ImportByName; - PCHAR ImportName; - BOOLEAN Status; - - /* Get pointer to the import name */ - ImportName = strchr((PCHAR)VaToPa((PVOID)ThunkData->u1.Function), '.') + 1; - - /* Create a IMAGE_IMPORT_BY_NAME structure, pointing to the local Buffer */ - ImportByName = (PIMAGE_IMPORT_BY_NAME)Buffer; - - /* Fill the name with the import name */ - RtlCopyMemory(ImportByName->Name, ImportName, strlen(ImportName)+1); - - /* Set Hint to 0 */ - ImportByName->Hint = 0; - - /* And finally point ThunkData's AddressOfData to that structure */ - RefThunkData.u1.AddressOfData = (ULONG)ImportByName; - - /* And recursively call ourselves */ - Status = WinLdrpBindImportName( - WinLdrBlock, - DataTableEntry->DllBase, - ImageBase, - &RefThunkData, - RefExportDirectory, - RefExportSize, - TRUE); - - /* Fill out the ThunkData with data from RefThunkData */ - ThunkData->u1 = RefThunkData.u1; - - /* Return what we got from the recursive call */ - return Status; - } - else - { - /* Fail if ExportDirectory is NULL */ - return FALSE; - } - } - - /* Success! */ - return TRUE; -} - -BOOLEAN -WinLdrpLoadAndScanReferencedDll(PLOADER_PARAMETER_BLOCK WinLdrBlock, - PCCH DirectoryPath, - PCH ImportName, - PLDR_DATA_TABLE_ENTRY *DataTableEntry) -{ - CHAR FullDllName[256]; - BOOLEAN Status; - PVOID BasePA; - - /* Prepare the full path to the file to be loaded */ - strcpy(FullDllName, DirectoryPath); - strcat(FullDllName, ImportName); - - DbgPrint((DPRINT_WINDOWS, "Loading referenced DLL: %s\n", FullDllName)); - //Print(L"Loading referenced DLL: %s\n", FullDllName); - - /* Load the image */ - Status = WinLdrLoadImage(FullDllName, LoaderHalCode, &BasePA); - - if (!Status) - { - DbgPrint((DPRINT_WINDOWS, "WinLdrLoadImage() failed\n")); - return Status; - } - - /* Allocate DTE for newly loaded DLL */ - Status = WinLdrAllocateDataTableEntry(WinLdrBlock, - ImportName, - FullDllName, - BasePA, - DataTableEntry); - - if (!Status) - { - DbgPrint((DPRINT_WINDOWS, - "WinLdrAllocateDataTableEntry() failed with Status=0x%X\n", Status)); - return Status; - } - - /* Scan its dependencies too */ - DbgPrint((DPRINT_WINDOWS, - "WinLdrScanImportDescriptorTable() calling ourselves for %S\n", - VaToPa((*DataTableEntry)->BaseDllName.Buffer))); - Status = WinLdrScanImportDescriptorTable(WinLdrBlock, DirectoryPath, *DataTableEntry); - - if (!Status) - { - DbgPrint((DPRINT_WINDOWS, - "WinLdrScanImportDescriptorTable() failed with Status=0x%X\n", Status)); - return Status; - } - - return TRUE; -} - -BOOLEAN -WinLdrpScanImportAddressTable(IN OUT PLOADER_PARAMETER_BLOCK WinLdrBlock, - IN PVOID DllBase, - IN PVOID ImageBase, - IN PIMAGE_THUNK_DATA ThunkData) -{ - PIMAGE_EXPORT_DIRECTORY ExportDirectory = NULL; - BOOLEAN Status; - ULONG ExportSize; - - DbgPrint((DPRINT_WINDOWS, "WinLdrpScanImportAddressTable(): DllBase 0x%X, " - "ImageBase 0x%X, ThunkData 0x%X\n", DllBase, ImageBase, ThunkData)); - - /* Obtain the export table from the DLL's base */ - if (DllBase == NULL) - { - //Print(L"Error, DllBase == NULL!\n"); - return FALSE; - } - else - { - ExportDirectory = - (PIMAGE_EXPORT_DIRECTORY)RtlImageDirectoryEntryToData(VaToPa(DllBase), - TRUE, - IMAGE_DIRECTORY_ENTRY_EXPORT, - &ExportSize); - } - - DbgPrint((DPRINT_WINDOWS, "WinLdrpScanImportAddressTable(): ExportDirectory 0x%X\n", ExportDirectory)); - - /* If pointer to Export Directory is */ - if (ExportDirectory == NULL) - return FALSE; - - /* Go through each entry in the thunk table and bind it */ - while (((PIMAGE_THUNK_DATA)VaToPa(ThunkData))->u1.AddressOfData != 0) - { - /* Bind it */ - Status = WinLdrpBindImportName( - WinLdrBlock, - DllBase, - ImageBase, - ThunkData, - ExportDirectory, - ExportSize, - FALSE); - - /* Move to the next entry */ - ThunkData++; - - /* Return error if binding was unsuccessful */ - if (!Status) - return Status; - } - - /* Return success */ - return TRUE; -} +/* + * PROJECT: FreeLoader + * LICENSE: GPL - See COPYING in the top level directory + * FILE: freeldr/winldr/peloader.c + * PURPOSE: Provides routines for loading PE files. To be merged with + * arch/i386/loader.c in future + * This article was very handy during development: + * http://msdn.microsoft.com/msdnmag/issues/02/03/PE2/ + * PROGRAMMERS: Aleksey Bragin (aleksey(a)reactos.org) + * The source code in this file is based on the work of respective + * authors of PE loading code in ReactOS and Brian Palmer and + * Alex Ionescu's arch/i386/loader.c, and my research project + * (creating a native EFI loader for Windows) + */ + +/* INCLUDES ***************************************************************/ +#include <freeldr.h> +#include <debug.h> + + +BOOLEAN +WinLdrpCompareDllName(IN PCH DllName, + IN PUNICODE_STRING UnicodeName); + +BOOLEAN +WinLdrpBindImportName(IN OUT PLOADER_PARAMETER_BLOCK WinLdrBlock, + IN PVOID DllBase, + IN PVOID ImageBase, + IN PIMAGE_THUNK_DATA ThunkData, + IN PIMAGE_EXPORT_DIRECTORY ExportDirectory, + IN ULONG ExportSize, + IN BOOLEAN ProcessForwards); + +BOOLEAN +WinLdrpLoadAndScanReferencedDll(PLOADER_PARAMETER_BLOCK WinLdrBlock, + PCCH DirectoryPath, + PCH ImportName, + PLDR_DATA_TABLE_ENTRY *DataTableEntry); + +BOOLEAN +WinLdrpScanImportAddressTable(IN OUT PLOADER_PARAMETER_BLOCK WinLdrBlock, + IN PVOID DllBase, + IN PVOID ImageBase, + IN PIMAGE_THUNK_DATA ThunkData); + + + +/* FUNCTIONS **************************************************************/ + +/* Returns TRUE if DLL has already been loaded - looks in LoadOrderList in LPB */ +BOOLEAN +WinLdrCheckForLoadedDll(IN OUT PLOADER_PARAMETER_BLOCK WinLdrBlock, + IN PCH DllName, + OUT PLDR_DATA_TABLE_ENTRY *LoadedEntry) +{ + PLDR_DATA_TABLE_ENTRY DataTableEntry; + LIST_ENTRY *ModuleEntry; + + DbgPrint((DPRINT_WINDOWS, "WinLdrCheckForLoadedDll: DllName %X, LoadedEntry: %X\n", + DllName, LoadedEntry)); + + /* Just go through each entry in the LoadOrderList and compare loaded module's + name with a given name */ + ModuleEntry = WinLdrBlock->LoadOrderListHead.Flink; + while (ModuleEntry != &WinLdrBlock->LoadOrderListHead) + { + /* Get pointer to the current DTE */ + DataTableEntry = CONTAINING_RECORD(ModuleEntry, + LDR_DATA_TABLE_ENTRY, + InLoadOrderLinks); + + DbgPrint((DPRINT_WINDOWS, "WinLdrCheckForLoadedDll: DTE %p, EP %p\n", + DataTableEntry, DataTableEntry->EntryPoint)); + + /* Compare names */ + if (WinLdrpCompareDllName(DllName, &DataTableEntry->BaseDllName)) + { + /* Yes, found it, report pointer to the loaded module's DTE + to the caller and increase load count for it */ + *LoadedEntry = DataTableEntry; + DataTableEntry->LoadCount++; + DbgPrint((DPRINT_WINDOWS, "WinLdrCheckForLoadedDll: LoadedEntry %X\n", DataTableEntry)); + return TRUE; + } + + /* Go to the next entry */ + ModuleEntry = ModuleEntry->Flink; + } + + /* Nothing found */ + return FALSE; +} + +BOOLEAN +WinLdrScanImportDescriptorTable(IN OUT PLOADER_PARAMETER_BLOCK WinLdrBlock, + IN PCCH DirectoryPath, + IN PLDR_DATA_TABLE_ENTRY ScanDTE) +{ + PLDR_DATA_TABLE_ENTRY DataTableEntry; + PIMAGE_IMPORT_DESCRIPTOR ImportTable; + ULONG ImportTableSize; + PCH ImportName; + BOOLEAN Status; + + /* Get a pointer to the import table of this image */ + ImportTable = (PIMAGE_IMPORT_DESCRIPTOR)RtlImageDirectoryEntryToData(VaToPa(ScanDTE->DllBase), + TRUE, IMAGE_DIRECTORY_ENTRY_IMPORT, &ImportTableSize); + + { + UNICODE_STRING BaseName; + BaseName.Buffer = VaToPa(ScanDTE->BaseDllName.Buffer); + BaseName.MaximumLength = ScanDTE->BaseDllName.MaximumLength; + BaseName.Length = ScanDTE->BaseDllName.Length; + DbgPrint((DPRINT_WINDOWS, "WinLdrScanImportDescriptorTable(): %wZ ImportTable = 0x%X\n", + &BaseName, ImportTable)); + } + + /* If image doesn't have any import directory - just return success */ + if (ImportTable == NULL) + return TRUE; + + /* Loop through all entries */ + for (;(ImportTable->Name != 0) && (ImportTable->FirstThunk != 0);ImportTable++) + { + /* Get pointer to the name */ + ImportName = (PCH)VaToPa(RVA(ScanDTE->DllBase, ImportTable->Name)); + DbgPrint((DPRINT_WINDOWS, "WinLdrScanImportDescriptorTable(): Looking at %s\n", ImportName)); + + /* In case we get a reference to ourselves - just skip it */ + if (WinLdrpCompareDllName(ImportName, &ScanDTE->BaseDllName)) + continue; + + /* Load the DLL if it is not already loaded */ + if (!WinLdrCheckForLoadedDll(WinLdrBlock, ImportName, &DataTableEntry)) + { + Status = WinLdrpLoadAndScanReferencedDll(WinLdrBlock, + DirectoryPath, + ImportName, + &DataTableEntry); + + if (!Status) + { + DbgPrint((DPRINT_WINDOWS, "WinLdrpLoadAndScanReferencedDll() failed\n")); + return Status; + } + } + + /* Scan its import address table */ + Status = WinLdrpScanImportAddressTable( + WinLdrBlock, + DataTableEntry->DllBase, + ScanDTE->DllBase, + (PIMAGE_THUNK_DATA)RVA(ScanDTE->DllBase, ImportTable->FirstThunk)); + + if (!Status) + { + DbgPrint((DPRINT_WINDOWS, "WinLdrpScanImportAddressTable() failed\n")); + return Status; + } + } + + return TRUE; +} + +BOOLEAN +WinLdrAllocateDataTableEntry(IN OUT PLOADER_PARAMETER_BLOCK WinLdrBlock, + IN PCCH BaseDllName, + IN PCCH FullDllName, + IN PVOID BasePA, + OUT PLDR_DATA_TABLE_ENTRY *NewEntry) +{ + PVOID BaseVA = PaToVa(BasePA); + PWSTR Buffer; + PLDR_DATA_TABLE_ENTRY DataTableEntry; + PIMAGE_NT_HEADERS NtHeaders; + USHORT Length; + + /* Allocate memory for a data table entry, zero-initialize it */ + DataTableEntry = (PLDR_DATA_TABLE_ENTRY)MmHeapAlloc(sizeof(LDR_DATA_TABLE_ENTRY)); + if (DataTableEntry == NULL) + return FALSE; + RtlZeroMemory(DataTableEntry, sizeof(LDR_DATA_TABLE_ENTRY)); + + /* Get NT headers from the image */ + NtHeaders = RtlImageNtHeader(BasePA); + + /* Initialize corresponding fields of DTE based on NT headers value */ + DataTableEntry->DllBase = BaseVA; + DataTableEntry->SizeOfImage = NtHeaders->OptionalHeader.SizeOfImage; + DataTableEntry->EntryPoint = RVA(BaseVA, NtHeaders->OptionalHeader.AddressOfEntryPoint); + DataTableEntry->SectionPointer = 0; + DataTableEntry->CheckSum = NtHeaders->OptionalHeader.CheckSum; + + /* Initialize BaseDllName field (UNICODE_STRING) from the Ansi BaseDllName + by simple conversion - copying each character */ + Length = (USHORT)(strlen(BaseDllName) * sizeof(WCHAR)); + Buffer = (PWSTR)MmHeapAlloc(Length); + if (Buffer == NULL) + { + MmHeapFree(DataTableEntry); + return FALSE; + } + RtlZeroMemory(Buffer, Length); + + DataTableEntry->BaseDllName.Length = Length; + DataTableEntry->BaseDllName.MaximumLength = Length; + DataTableEntry->BaseDllName.Buffer = PaToVa(Buffer); + while (*BaseDllName != 0) + { + *Buffer++ = *BaseDllName++; + } + + /* Initialize FullDllName field (UNICODE_STRING) from the Ansi FullDllName + using the same method */ + Length = (USHORT)(strlen(FullDllName) * sizeof(WCHAR)); + Buffer = (PWSTR)MmHeapAlloc(Length); + if (Buffer == NULL) + { + MmHeapFree(DataTableEntry); + return FALSE; + } + RtlZeroMemory(Buffer, Length); + + DataTableEntry->FullDllName.Length = Length; + DataTableEntry->FullDllName.MaximumLength = Length; + DataTableEntry->FullDllName.Buffer = PaToVa(Buffer); + while (*FullDllName != 0) + { + *Buffer++ = *FullDllName++; + } + + /* Initialize what's left - LoadCount which is 1, and set Flags so that + we know this entry is processed */ + DataTableEntry->Flags = LDRP_ENTRY_PROCESSED; + DataTableEntry->LoadCount = 1; + + /* Insert this DTE to a list in the LPB */ + InsertTailList(&WinLdrBlock->LoadOrderListHead, &DataTableEntry->InLoadOrderLinks); + + /* Save pointer to a newly allocated and initialized entry */ + *NewEntry = DataTableEntry; + + /* Return success */ + return TRUE; +} + +/* WinLdrLoadImage loads the specified image from the file (it doesn't + perform any additional operations on the filename, just directly + calls the file I/O routines), and relocates it so that it's ready + to be used when paging is enabled. + Addressing mode: physical + */ +BOOLEAN +WinLdrLoadImage(IN PCHAR FileName, + TYPE_OF_MEMORY MemoryType, + OUT PVOID *ImageBasePA) +{ + PFILE FileHandle; + PVOID PhysicalBase; + PVOID VirtualBase = NULL; + UCHAR HeadersBuffer[SECTOR_SIZE * 2]; + PIMAGE_NT_HEADERS NtHeaders; + PIMAGE_SECTION_HEADER SectionHeader; + ULONG VirtualSize, SizeOfRawData, NumberOfSections; + BOOLEAN Status; + ULONG i, BytesRead; + + CHAR ProgressString[256]; + + /* Inform user we are loading files */ + sprintf(ProgressString, "Loading %s...", FileName); + UiDrawProgressBarCenter(1, 100, ProgressString); + + /* Open the image file */ + FileHandle = FsOpenFile(FileName); + + if (FileHandle == NULL) + { + //Print(L"Can not open the file %s\n",FileName); + UiMessageBox("Can not open the file"); + return FALSE; + } + + /* Load the first 2 sectors of the image so we can read the PE header */ + Status = FsReadFile(FileHandle, SECTOR_SIZE * 2, NULL, HeadersBuffer); + if (!Status) + { + //Print(L"Error reading from file %s\n", FileName); + UiMessageBox("Error reading from file"); + FsCloseFile(FileHandle); + return FALSE; + } + + /* Now read the MZ header to get the offset to the PE Header */ + NtHeaders = RtlImageNtHeader(HeadersBuffer); + + if (!NtHeaders) + { + //Print(L"Error - no NT header found in %s\n", FileName); + UiMessageBox("Error - no NT header found"); + FsCloseFile(FileHandle); + return FALSE; + } + + /* Ensure this is executable image */ + if (((NtHeaders->FileHeader.Characteristics & IMAGE_FILE_EXECUTABLE_IMAGE) == 0)) + { + //Print(L"Not an executable image %s\n", FileName); + UiMessageBox("Not an executable image"); + FsCloseFile(FileHandle); + return FALSE; + } + + /* Store number of sections to read and a pointer to the first section */ + NumberOfSections = NtHeaders->FileHeader.NumberOfSections; + SectionHeader = IMAGE_FIRST_SECTION(NtHeaders); + + /* Try to allocate this memory, if fails - allocate somewhere else */ + PhysicalBase = MmAllocateMemoryAtAddress(NtHeaders->OptionalHeader.SizeOfImage, + (PVOID)((ULONG)NtHeaders->OptionalHeader.ImageBase & (KSEG0_BASE - 1)), + MemoryType); + + if (PhysicalBase == NULL) + { + /* It's ok, we don't panic - let's allocate again at any other "low" place */ + PhysicalBase = MmAllocateMemoryWithType(NtHeaders->OptionalHeader.SizeOfImage, MemoryType); + + if (PhysicalBase == NULL) + { + //Print(L"Failed to alloc pages for image %s\n", FileName); + UiMessageBox("Failed to alloc pages for image"); + FsCloseFile(FileHandle); + return FALSE; + } + } + + /* This is the real image base - in form of a virtual address */ + VirtualBase = PaToVa(PhysicalBase); + + DbgPrint((DPRINT_WINDOWS, "Base PA: 0x%X, VA: 0x%X\n", PhysicalBase, VirtualBase)); + + /* Set to 0 position and fully load the file image */ + FsSetFilePointer(FileHandle, 0); + + Status = FsReadFile(FileHandle, NtHeaders->OptionalHeader.SizeOfHeaders, NULL, PhysicalBase); + + if (!Status) + { + //Print(L"Error reading headers %s\n", FileName); + UiMessageBox("Error reading headers"); + FsCloseFile(FileHandle); + return FALSE; + } + + /* Reload the NT Header */ + NtHeaders = RtlImageNtHeader(PhysicalBase); + + /* Load the first section */ + SectionHeader = IMAGE_FIRST_SECTION(NtHeaders); + + /* Fill output parameters */ + *ImageBasePA = PhysicalBase; + + /* Walk through each section and read it (check/fix any possible + bad situations, if they arise) */ + for (i = 0; i < NumberOfSections; i++) + { + VirtualSize = SectionHeader->Misc.VirtualSize; + SizeOfRawData = SectionHeader->SizeOfRawData; + + /* Handle a case when VirtualSize equals 0 */ + if (VirtualSize == 0) + VirtualSize = SizeOfRawData; + + /* If PointerToRawData is 0, then force its size to be also 0 */ + if (SectionHeader->PointerToRawData == 0) + { + SizeOfRawData = 0; + } + else + { + /* Cut the loaded size to the VirtualSize extents */ + if (SizeOfRawData > VirtualSize) + SizeOfRawData = VirtualSize; + } + + /* Actually read the section (if its size is not 0) */ + if (SizeOfRawData != 0) + { + /* Seek to the correct position */ + FsSetFilePointer(FileHandle, SectionHeader->PointerToRawData); + + DbgPrint((DPRINT_WINDOWS, "SH->VA: 0x%X\n", SectionHeader->VirtualAddress)); + + /* Read this section from the file, size = SizeOfRawData */ + Status = FsReadFile(FileHandle, SizeOfRawData, &BytesRead, (PUCHAR)PhysicalBase + SectionHeader->VirtualAddress); + + if (!Status && (BytesRead == 0)) + { + DbgPrint((DPRINT_WINDOWS, "WinLdrLoadImage(): Error reading section from file!\n")); + break; + } + } + + /* Size of data is less than the virtual size - fill up the remainder with zeroes */ + if (SizeOfRawData < VirtualSize) + { + DbgPrint((DPRINT_WINDOWS, "WinLdrLoadImage(): SORD %d < VS %d", SizeOfRawData, VirtualSize)); + RtlZeroMemory((PVOID)(SectionHeader->VirtualAddress + (ULONG)PhysicalBase + SizeOfRawData), VirtualSize - SizeOfRawData); + } + + SectionHeader++; + } + + /* We are done with the file - close it */ + FsCloseFile(FileHandle); + + /* If loading failed - return right now */ + if (!Status) + return FALSE; + + + /* Relocate the image, if it needs it */ + if (NtHeaders->OptionalHeader.ImageBase != (ULONG)VirtualBase) + { + DbgPrint((DPRINT_WINDOWS, "Relocating %p -> %p\n", + NtHeaders->OptionalHeader.ImageBase, VirtualBase)); + Status = (BOOLEAN)LdrRelocateImageWithBias(PhysicalBase, + (ULONG_PTR)VirtualBase - (ULONG_PTR)PhysicalBase, + "FreeLdr", + TRUE, + TRUE, /* in case of conflict still return success */ + FALSE); + } + + return Status; +} + +/* PRIVATE FUNCTIONS *******************************************************/ + +/* DllName - physical, UnicodeString->Buffer - virtual */ +BOOLEAN +WinLdrpCompareDllName(IN PCH DllName, + IN PUNICODE_STRING UnicodeName) +{ + PWSTR Buffer; + UNICODE_STRING UnicodeNamePA; + ULONG i, Length; + + /* First obvious check: for length of two names */ + Length = strlen(DllName); + + UnicodeNamePA.Length = UnicodeName->Length; + UnicodeNamePA.MaximumLength = UnicodeName->MaximumLength; + UnicodeNamePA.Buffer = VaToPa(UnicodeName->Buffer); + DbgPrint((DPRINT_WINDOWS, "WinLdrpCompareDllName: %s and %wZ, Length = %d " + "UN->Length %d\n", DllName, &UnicodeNamePA, Length, UnicodeName->Length)); + + if ((Length * sizeof(WCHAR)) > UnicodeName->Length) + return FALSE; + + /* Store pointer to unicode string's buffer */ + Buffer = VaToPa(UnicodeName->Buffer); + + /* Loop character by character */ + for (i = 0; i < Length; i++) + { + /* Compare two characters, uppercasing them */ + if (toupper(*DllName) != toupper((CHAR)*Buffer)) + return FALSE; + + /* Move to the next character */ + DllName++; + Buffer++; + } + + /* Check, if strings either fully match, or match till the "." (w/o extension) */ + if ((UnicodeName->Length == Length * sizeof(WCHAR)) || (*Buffer == L'.')) + { + /* Yes they do */ + return TRUE; + } + + /* Strings don't match, return FALSE */ + return FALSE; +} + +BOOLEAN +WinLdrpBindImportName(IN OUT PLOADER_PARAMETER_BLOCK WinLdrBlock, + IN PVOID DllBase, + IN PVOID ImageBase, + IN PIMAGE_THUNK_DATA ThunkData, + IN PIMAGE_EXPORT_DIRECTORY ExportDirectory, + IN ULONG ExportSize, + IN BOOLEAN ProcessForwards) +{ + ULONG Ordinal; + PULONG NameTable, FunctionTable; + PUSHORT OrdinalTable; + LONG High, Low, Middle, Result; + ULONG Hint; + + //DbgPrint((DPRINT_WINDOWS, "WinLdrpBindImportName(): DllBase 0x%X, ImageBase 0x%X, ThunkData 0x%X, ExportDirectory 0x%X, ExportSize %d, ProcessForwards 0x%X\n", + // DllBase, ImageBase, ThunkData, ExportDirectory, ExportSize, ProcessForwards)); + + /* Check passed DllBase param */ + if(DllBase == NULL) + { + DbgPrint((DPRINT_WINDOWS, "WARNING: DllBase == NULL!\n")); + return FALSE; + } + + /* Convert all non-critical pointers to PA from VA */ + ThunkData = VaToPa(ThunkData); + + /* Is the reference by ordinal? */ + if (IMAGE_SNAP_BY_ORDINAL(ThunkData->u1.Ordinal) && !ProcessForwards) + { + /* Yes, calculate the ordinal */ + Ordinal = (ULONG)(IMAGE_ORDINAL(ThunkData->u1.Ordinal) - (UINT32)ExportDirectory->Base); + //DbgPrint((DPRINT_WINDOWS, "WinLdrpBindImportName(): Ordinal %d\n", Ordinal)); + } + else + { + /* It's reference by name, we have to look it up in the export directory */ + if (!ProcessForwards) + { + /* AddressOfData in thunk entry will become a virtual address (from relative) */ + //DbgPrint((DPRINT_WINDOWS, "WinLdrpBindImportName(): ThunkData->u1.AOD was %p\n", ThunkData->u1.AddressOfData)); + ThunkData->u1.AddressOfData = + (ULONG)RVA(ImageBase, ThunkData->u1.AddressOfData); + //DbgPrint((DPRINT_WINDOWS, "WinLdrpBindImportName(): ThunkData->u1.AOD became %p\n", ThunkData->u1.AddressOfData)); + } + + /* Get pointers to Name and Ordinal tables (RVA -> VA) */ + NameTable = (PULONG)VaToPa(RVA(DllBase, ExportDirectory->AddressOfNames)); + OrdinalTable = (PUSHORT)VaToPa(RVA(DllBase, ExportDirectory->AddressOfNameOrdinals)); + + //DbgPrint((DPRINT_WINDOWS, "NameTable 0x%X, OrdinalTable 0x%X, ED->AddressOfNames 0x%X, ED->AOFO 0x%X\n", + // NameTable, OrdinalTable, ExportDirectory->AddressOfNames, ExportDirectory->AddressOfNameOrdinals)); + + /* Get the hint, convert it to a physical pointer */ + Hint = ((PIMAGE_IMPORT_BY_NAME)VaToPa((PVOID)ThunkData->u1.AddressOfData))->Hint; + //DbgPrint((DPRINT_WINDOWS, "HintIndex %d\n", Hint)); + + /* If Hint is less than total number of entries in the export directory, + and import name == export name, then we can just get it from the OrdinalTable */ + if ( + (Hint < ExportDirectory->NumberOfNames) && + ( + strcmp(VaToPa(&((PIMAGE_IMPORT_BY_NAME)VaToPa((PVOID)ThunkData->u1.AddressOfData))->Name[0]), + (PCHAR)VaToPa( RVA(DllBase, NameTable[Hint])) ) == 0 + ) + ) + { + Ordinal = OrdinalTable[Hint]; + //DbgPrint((DPRINT_WINDOWS, "WinLdrpBindImportName(): Ordinal %d\n", Ordinal)); + } + else + { + /* It's not the easy way, we have to lookup import name in the name table. + Let's use a binary search for this task. */ + + //DbgPrint((DPRINT_WINDOWS, "WinLdrpBindImportName() looking up the import name using binary search...\n")); + + /* Low boundary is set to 0, and high boundary to the maximum index */ + Low = 0; + High = ExportDirectory->NumberOfNames - 1; + + /* Perform a binary-search loop */ + while (High >= Low) + { + /* Divide by 2 by shifting to the right once */ + Middle = (Low + High) >> 1; + + /* Compare the names */ + Result = strcmp(VaToPa(&((PIMAGE_IMPORT_BY_NAME)VaToPa((PVOID)ThunkData->u1.AddressOfData))->Name[0]), + (PCHAR)VaToPa(RVA(DllBase, NameTable[Middle]))); + + /*DbgPrint((DPRINT_WINDOWS, "Binary search: comparing Import '__', Export '%s'\n",*/ + /*VaToPa(&((PIMAGE_IMPORT_BY_NAME)VaToPa(ThunkData->u1.AddressOfData))->Name[0]),*/ + /*(PCHAR)VaToPa(RVA(DllBase, NameTable[Middle]))));*/ + + /*DbgPrint((DPRINT_WINDOWS, "TE->u1.AOD %p, fulladdr %p\n", + ThunkData->u1.AddressOfData, + ((PIMAGE_IMPORT_BY_NAME)VaToPa(ThunkData->u1.AddressOfData))->Name ));*/ + + + /* Depending on result of strcmp, perform different actions */ + if (Result < 0) + { + /* Adjust top boundary */ + High = Middle - 1; + } + else if (Result > 0) + { + /* Adjust bottom boundary */ + Low = Middle + 1; + } + else + { + /* Yay, found it! */ + break; + } + } + + /* If high boundary is less than low boundary, then no result found */ + if (High < Low) + { + //Print(L"Error in binary search\n"); + DbgPrint((DPRINT_WINDOWS, "Error in binary search!\n")); + return FALSE; + } + + /* Everything allright, get the ordinal */ + Ordinal = OrdinalTable[Middle]; + + //DbgPrint((DPRINT_WINDOWS, "WinLdrpBindImportName() found Ordinal %d\n", Ordinal)); + } + } + + /* Check ordinal number for validity! */ + if (Ordinal >= ExportDirectory->NumberOfFunctions) + { + DbgPrint((DPRINT_WINDOWS, "Ordinal number is invalid!\n")); + return FALSE; + } + + /* Get a pointer to the function table */ + FunctionTable = (PULONG)VaToPa(RVA(DllBase, ExportDirectory->AddressOfFunctions)); + + /* Save a pointer to the function */ + ThunkData->u1.Function = (ULONG)RVA(DllBase, FunctionTable[Ordinal]); + + /* Is it a forwarder? (function pointer isn't within the export directory) */ + if (((ULONG)VaToPa((PVOID)ThunkData->u1.Function) > (ULONG)ExportDirectory) && + ((ULONG)VaToPa((PVOID)ThunkData->u1.Function) < ((ULONG)ExportDirectory + ExportSize))) + { + PLDR_DATA_TABLE_ENTRY DataTableEntry; + CHAR ForwardDllName[255]; + PIMAGE_EXPORT_DIRECTORY RefExportDirectory; + ULONG RefExportSize; + + /* Save the name of the forward dll */ + RtlCopyMemory(ForwardDllName, (PCHAR)VaToPa((PVOID)ThunkData->u1.Function), sizeof(ForwardDllName)); + + /* Strip out its extension */ + *strchr(ForwardDllName,'.') = '\0'; + + DbgPrint((DPRINT_WINDOWS, "WinLdrpBindImportName(): ForwardDllName %s\n", ForwardDllName)); + if (!WinLdrCheckForLoadedDll(WinLdrBlock, ForwardDllName, &DataTableEntry)) + { + /* We can't continue if DLL couldn't be loaded, so bomb out with an error */ + //Print(L"Error loading DLL!\n"); + DbgPrint((DPRINT_WINDOWS, "Error loading DLL!\n")); + return FALSE; + } + + /* Get pointer to the export directory of loaded DLL */ + RefExportDirectory = (PIMAGE_EXPORT_DIRECTORY) + RtlImageDirectoryEntryToData(VaToPa(DataTableEntry->DllBase), + TRUE, + IMAGE_DIRECTORY_ENTRY_EXPORT, + &RefExportSize); + + /* Fail if it's NULL */ + if (RefExportDirectory) + { + UCHAR Buffer[128]; + IMAGE_THUNK_DATA RefThunkData; + PIMAGE_IMPORT_BY_NAME ImportByName; + PCHAR ImportName; + BOOLEAN Status; + + /* Get pointer to the import name */ + ImportName = strchr((PCHAR)VaToPa((PVOID)ThunkData->u1.Function), '.') + 1; + + /* Create a IMAGE_IMPORT_BY_NAME structure, pointing to the local Buffer */ + ImportByName = (PIMAGE_IMPORT_BY_NAME)Buffer; + + /* Fill the name with the import name */ + RtlCopyMemory(ImportByName->Name, ImportName, strlen(ImportName)+1); + + /* Set Hint to 0 */ + ImportByName->Hint = 0; + + /* And finally point ThunkData's AddressOfData to that structure */ + RefThunkData.u1.AddressOfData = (ULONG)ImportByName; + + /* And recursively call ourselves */ + Status = WinLdrpBindImportName( + WinLdrBlock, + DataTableEntry->DllBase, + ImageBase, + &RefThunkData, + RefExportDirectory, + RefExportSize, + TRUE); + + /* Fill out the ThunkData with data from RefThunkData */ + ThunkData->u1 = RefThunkData.u1; + + /* Return what we got from the recursive call */ + return Status; + } + else + { + /* Fail if ExportDirectory is NULL */ + return FALSE; + } + } + + /* Success! */ + return TRUE; +} + +BOOLEAN +WinLdrpLoadAndScanReferencedDll(PLOADER_PARAMETER_BLOCK WinLdrBlock, + PCCH DirectoryPath, + PCH ImportName, + PLDR_DATA_TABLE_ENTRY *DataTableEntry) +{ + CHAR FullDllName[256]; + BOOLEAN Status; + PVOID BasePA; + + /* Prepare the full path to the file to be loaded */ + strcpy(FullDllName, DirectoryPath); + strcat(FullDllName, ImportName); + + DbgPrint((DPRINT_WINDOWS, "Loading referenced DLL: %s\n", FullDllName)); + //Print(L"Loading referenced DLL: %s\n", FullDllName); + + /* Load the image */ + Status = WinLdrLoadImage(FullDllName, LoaderHalCode, &BasePA); + + if (!Status) + { + DbgPrint((DPRINT_WINDOWS, "WinLdrLoadImage() failed\n")); + return Status; + } + + /* Allocate DTE for newly loaded DLL */ + Status = WinLdrAllocateDataTableEntry(WinLdrBlock, + ImportName, + FullDllName, + BasePA, + DataTableEntry); + + if (!Status) + { + DbgPrint((DPRINT_WINDOWS, + "WinLdrAllocateDataTableEntry() failed with Status=0x%X\n", Status)); + return Status; + } + + /* Scan its dependencies too */ + DbgPrint((DPRINT_WINDOWS, + "WinLdrScanImportDescriptorTable() calling ourselves for %S\n", + VaToPa((*DataTableEntry)->BaseDllName.Buffer))); + Status = WinLdrScanImportDescriptorTable(WinLdrBlock, DirectoryPath, *DataTableEntry); + + if (!Status) + { + DbgPrint((DPRINT_WINDOWS, + "WinLdrScanImportDescriptorTable() failed with Status=0x%X\n", Status)); + return Status; + } + + return TRUE; +} + +BOOLEAN +WinLdrpScanImportAddressTable(IN OUT PLOADER_PARAMETER_BLOCK WinLdrBlock, + IN PVOID DllBase, + IN PVOID ImageBase, + IN PIMAGE_THUNK_DATA ThunkData) +{ + PIMAGE_EXPORT_DIRECTORY ExportDirectory = NULL; + BOOLEAN Status; + ULONG ExportSize; + + DbgPrint((DPRINT_WINDOWS, "WinLdrpScanImportAddressTable(): DllBase 0x%X, " + "ImageBase 0x%X, ThunkData 0x%X\n", DllBase, ImageBase, ThunkData)); + + /* Obtain the export table from the DLL's base */ + if (DllBase == NULL) + { + //Print(L"Error, DllBase == NULL!\n"); + return FALSE; + } + else + { + ExportDirectory = + (PIMAGE_EXPORT_DIRECTORY)RtlImageDirectoryEntryToData(VaToPa(DllBase), + TRUE, + IMAGE_DIRECTORY_ENTRY_EXPORT, + &ExportSize); + } + + DbgPrint((DPRINT_WINDOWS, "WinLdrpScanImportAddressTable(): ExportDirectory 0x%X\n", ExportDirectory)); + + /* If pointer to Export Directory is */ + if (ExportDirectory == NULL) + return FALSE; + + /* Go through each entry in the thunk table and bind it */ + while (((PIMAGE_THUNK_DATA)VaToPa(ThunkData))->u1.AddressOfData != 0) + { + /* Bind it */ + Status = WinLdrpBindImportName( + WinLdrBlock, + DllBase, + ImageBase, + ThunkData, + ExportDirectory, + ExportSize, + FALSE); + + /* Move to the next entry */ + ThunkData++; + + /* Return error if binding was unsuccessful */ + if (!Status) + return Status; + } + + /* Return success */ + return TRUE; +} Modified: trunk/reactos/boot/freeldr/freeldr/windows/winldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/winldr.c (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/winldr.c Mon Feb 4 13:45:55 2008 @@ -30,6 +30,7 @@ extern char reactos_arc_strings[32][256]; extern BOOLEAN UseRealHeap; +extern ULONG LoaderPagesSpanned; BOOLEAN WinLdrCheckForLoadedDll(IN OUT PLOADER_PARAMETER_BLOCK WinLdrBlock, @@ -186,12 +187,11 @@ } RtlZeroMemory(Extension, sizeof(LOADER_PARAMETER_EXTENSION)); - /* Save size and version information */ + /* Fill LPB extension */ Extension->Size = sizeof(LOADER_PARAMETER_EXTENSION); Extension->MajorVersion = (VersionToBoot & 0xFF00) >> 8; Extension->MinorVersion = VersionToBoot & 0xFF; - Extension->LoaderPagesSpanned = LOADER_HIGH_ZONE; - + Extension->Profile.Status = 2; LoaderBlock->Extension = PaToVa(Extension); } @@ -208,8 +208,8 @@ ULONG_PTR Tss = 0; ULONG BlockSize, NumPages; - LoaderBlock->u.I386.CommonDataArea = NULL;//CommonDataArea; - //LoaderBlock->u.I386.MachineType = MachineType; //FIXME: MachineType? + LoaderBlock->u.I386.CommonDataArea = NULL; //CommonDataArea; + LoaderBlock->u.I386.MachineType = 0; // ntldr sets this to 0 /* Allocate 2 pages for PCR */ Pcr = (ULONG_PTR)MmAllocateMemoryWithType(2 * MM_PAGE_SIZE, LoaderStartupPcrPage); @@ -483,11 +483,11 @@ Status = WinLdrLoadBootDrivers(LoaderBlock, BootPath); DbgPrint((DPRINT_WINDOWS, "Boot drivers loaded with status %d\n", Status)); + /* Alloc PCR, TSS, do magic things with the GDT/IDT */ + WinLdrSetupForNt(LoaderBlock, &GdtIdt, &PcrBasePage, &TssBasePage); + /* Initialize Phase 1 - no drivers loading anymore */ WinLdrInitializePhase1(LoaderBlock, BootOptions, SystemPath, OperatingSystemVersion); - - /* Alloc PCR, TSS, do magic things with the GDT/IDT */ - WinLdrSetupForNt(LoaderBlock, &GdtIdt, &PcrBasePage, &TssBasePage); /* Save entry-point pointer and Loader block VAs */ KiSystemStartup = (KERNEL_ENTRY_POINT)KernelDTE->EntryPoint; @@ -506,6 +506,9 @@ /* Turn on paging mode of CPU*/ WinLdrTurnOnPaging(LoaderBlock, PcrBasePage, TssBasePage, GdtIdt); + /* Save final value of LoaderPagesSpanned */ + LoaderBlock->Extension->LoaderPagesSpanned = LoaderPagesSpanned; + DbgPrint((DPRINT_WINDOWS, "Hello from paged mode, KiSystemStartup %p, LoaderBlockVA %p!\n", KiSystemStartup, LoaderBlockVA)); 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 (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c Mon Feb 4 13:45:55 2008 @@ -14,6 +14,7 @@ #include <debug.h> extern ULONG TotalNLSSize; +extern ULONG LoaderPagesSpanned; // This is needed because headers define wrong one for ReactOS #undef KIP0PCRADDRESS @@ -131,13 +132,13 @@ // PDE, HAL mapping page table, physical mapping, kernel mapping TotalSize = (1+1+NumPageTables*2)*MM_PAGE_SIZE; + // PDE+HAL+KernelPTEs == MemoryData + Buffer = MmAllocateMemoryWithType( + TotalSize - NumPageTables*MM_PAGE_SIZE, LoaderMemoryData); + // Physical PTEs = FirmwareTemporary PhysicalPageTablesBuffer = MmAllocateMemoryWithType( NumPageTables*MM_PAGE_SIZE, LoaderFirmwareTemporary); - - // PDE+HAL+KernelPTEs == MemoryData - Buffer = MmAllocateMemoryWithType( - TotalSize - NumPageTables*MM_PAGE_SIZE, LoaderMemoryData); if (Buffer + (TotalSize - NumPageTables*MM_PAGE_SIZE) != PhysicalPageTablesBuffer) @@ -290,23 +291,22 @@ if (Mad[i].MemoryType == LoaderFirmwarePermanent || Mad[i].MemoryType == LoaderSpecialMemory || Mad[i].MemoryType == LoaderFree || - (Mad[i].MemoryType == LoaderFirmwareTemporary && EndPage <= LOADER_HIGH_ZONE) || + (Mad[i].MemoryType == LoaderFirmwareTemporary && EndPage <= LoaderPagesSpanned) || Mad[i].MemoryType == LoaderOsloaderStack || Mad[i].MemoryType == LoaderLoadedProgram) { - // // But, the first megabyte of memory always stays! // And, to tell the truth, we don't care about what's higher - // than LOADER_HIGH_ZONE + // than LoaderPagesSpanned if (Mad[i].MemoryType == LoaderFirmwarePermanent || Mad[i].MemoryType == LoaderSpecialMemory) { if (StartPage < 0x100) StartPage = 0x100; - if (EndPage > LOADER_HIGH_ZONE) - EndPage = LOADER_HIGH_ZONE; + if (EndPage > LoaderPagesSpanned) + EndPage = LoaderPagesSpanned; } for (Page = StartPage; Page < EndPage; Page++) @@ -330,7 +330,6 @@ } } - VOID MempAddMemoryBlock(IN OUT PLOADER_PARAMETER_BLOCK LoaderBlock, ULONG BasePage, @@ -361,7 +360,7 @@ // Check if it's more than the allowed for OS loader // if yes - don't map the pages, just add as FirmwareTemporary // - if (BasePage + PageCount > LOADER_HIGH_ZONE) + if (BasePage + PageCount > LoaderPagesSpanned) { if (Mad[MadCount].MemoryType != LoaderSpecialMemory && Mad[MadCount].MemoryType != LoaderFirmwarePermanent &&

1 0

[fireball] 32112: - Make other filesystems use the new heap mm routines.
by fireball＠svn.reactos.org 04 Feb '08

04 Feb '08

Author: fireball Date: Mon Feb 4 12:37:59 2008 New Revision: 32112 URL: http://svn.reactos.org/svn/reactos?rev=32112&view=rev Log: - Make other filesystems use the new heap mm routines. Modified: trunk/reactos/boot/freeldr/freeldr/fs/ext2.c trunk/reactos/boot/freeldr/freeldr/fs/iso.c trunk/reactos/boot/freeldr/freeldr/fs/ntfs.c Modified: trunk/reactos/boot/freeldr/freeldr/fs/ext2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/fs/ex… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/fs/ext2.c (original) +++ trunk/reactos/boot/freeldr/freeldr/fs/ext2.c Mon Feb 4 12:37:59 2008 @@ -106,7 +106,7 @@ { if (TempExt2FileInfo.FileBlockList != NULL) { - MmFreeMemory(TempExt2FileInfo.FileBlockList); + MmHeapFree(TempExt2FileInfo.FileBlockList); } return NULL; @@ -148,20 +148,20 @@ if (TempExt2FileInfo.FileBlockList != NULL) { - MmFreeMemory(TempExt2FileInfo.FileBlockList); + MmHeapFree(TempExt2FileInfo.FileBlockList); } return Ext2OpenFile(FullPath); } else { - FileHandle = MmAllocateMemory(sizeof(EXT2_FILE_INFO)); + FileHandle = MmHeapAlloc(sizeof(EXT2_FILE_INFO)); if (FileHandle == NULL) { if (TempExt2FileInfo.FileBlockList != NULL) { - MmFreeMemory(TempExt2FileInfo.FileBlockList); + MmHeapFree(TempExt2FileInfo.FileBlockList); } return NULL; @@ -230,11 +230,11 @@ // if (!Ext2SearchDirectoryBufferForFile(DirectoryBuffer, (ULONG)Ext2GetInodeFileSize(&InodeData), PathPart, &DirectoryEntry)) { - MmFreeMemory(DirectoryBuffer); - return FALSE; - } - - MmFreeMemory(DirectoryBuffer); + MmHeapFree(DirectoryBuffer); + return FALSE; + } + + MmHeapFree(DirectoryBuffer); DirectoryInode = DirectoryEntry.inode; } @@ -581,7 +581,7 @@ // if (Ext2SuperBlock != NULL) { - MmFreeMemory(Ext2SuperBlock); + MmHeapFree(Ext2SuperBlock); Ext2SuperBlock = NULL; } @@ -589,7 +589,7 @@ // // Now allocate the memory to hold the super block // - Ext2SuperBlock = (PEXT2_SUPER_BLOCK)MmAllocateMemory(1024); + Ext2SuperBlock = (PEXT2_SUPER_BLOCK)MmHeapAlloc(1024); // // Make sure we got the memory @@ -744,7 +744,7 @@ // if (Ext2GroupDescriptors != NULL) { - MmFreeMemory(Ext2GroupDescriptors); + MmHeapFree(Ext2GroupDescriptors); Ext2GroupDescriptors = NULL; } @@ -753,7 +753,7 @@ // Now allocate the memory to hold the group descriptors // GroupDescBlockCount = ROUND_UP(Ext2GroupCount, Ext2GroupDescPerBlock) / Ext2GroupDescPerBlock; - Ext2GroupDescriptors = (PEXT2_GROUP_DESC)MmAllocateMemory(GroupDescBlockCount * Ext2BlockSizeInBytes); + Ext2GroupDescriptors = (PEXT2_GROUP_DESC)MmHeapAlloc(GroupDescBlockCount * Ext2BlockSizeInBytes); // // Make sure we got the memory @@ -812,14 +812,14 @@ // // Now allocate the memory to hold the group descriptors // - *DirectoryBuffer = (PEXT2_DIR_ENTRY)MmAllocateMemory(DirectoryFileInfo.FileSize); + *DirectoryBuffer = (PEXT2_DIR_ENTRY)MmHeapAlloc(DirectoryFileInfo.FileSize); // // Make sure we got the memory // if (*DirectoryBuffer == NULL) { - MmFreeMemory(DirectoryFileInfo.FileBlockList); + MmHeapFree(DirectoryFileInfo.FileBlockList); FileSystemError("Out of memory."); return FALSE; } @@ -827,13 +827,13 @@ // Now read the root directory data if (!Ext2ReadFileBig(&DirectoryFileInfo, DirectoryFileInfo.FileSize, NULL, *DirectoryBuffer)) { - MmFreeMemory(*DirectoryBuffer); + MmHeapFree(*DirectoryBuffer); *DirectoryBuffer = NULL; - MmFreeMemory(DirectoryFileInfo.FileBlockList); - return FALSE; - } - - MmFreeMemory(DirectoryFileInfo.FileBlockList); + MmHeapFree(DirectoryFileInfo.FileBlockList); + return FALSE; + } + + MmHeapFree(DirectoryFileInfo.FileBlockList); return TRUE; } @@ -1023,7 +1023,7 @@ BlockCount = (FileSize / Ext2BlockSizeInBytes); // Allocate the memory for the block list - BlockList = MmAllocateMemory(BlockCount * sizeof(ULONG)); + BlockList = MmHeapAlloc(BlockCount * sizeof(ULONG)); if (BlockList == NULL) { return NULL; @@ -1044,7 +1044,7 @@ { if (!Ext2CopyIndirectBlockPointers(BlockList, &CurrentBlockInList, BlockCount, Inode->i_block[EXT3_IND_BLOCK])) { - MmFreeMemory(BlockList); + MmHeapFree(BlockList); return FALSE; } } @@ -1054,7 +1054,7 @@ { if (!Ext2CopyDoubleIndirectBlockPointers(BlockList, &CurrentBlockInList, BlockCount, Inode->i_block[EXT3_DIND_BLOCK])) { - MmFreeMemory(BlockList); + MmHeapFree(BlockList); return FALSE; } } @@ -1064,7 +1064,7 @@ { if (!Ext2CopyTripleIndirectBlockPointers(BlockList, &CurrentBlockInList, BlockCount, Inode->i_block[EXT3_TIND_BLOCK])) { - MmFreeMemory(BlockList); + MmHeapFree(BlockList); return FALSE; } } @@ -1118,7 +1118,7 @@ BlockPointersPerBlock = Ext2BlockSizeInBytes / sizeof(ULONG); - BlockBuffer = (ULONG*)MmAllocateMemory(Ext2BlockSizeInBytes); + BlockBuffer = (ULONG*)MmHeapAlloc(Ext2BlockSizeInBytes); if (BlockBuffer == NULL) { return FALSE; @@ -1126,7 +1126,7 @@ if (!Ext2ReadBlock(DoubleIndirectBlock, BlockBuffer)) { - MmFreeMemory(BlockBuffer); + MmHeapFree(BlockBuffer); return FALSE; } @@ -1134,12 +1134,12 @@ { if (!Ext2CopyIndirectBlockPointers(BlockList, CurrentBlockInList, BlockCount, BlockBuffer[CurrentBlock])) { - MmFreeMemory(BlockBuffer); - return FALSE; - } - } - - MmFreeMemory(BlockBuffer); + MmHeapFree(BlockBuffer); + return FALSE; + } + } + + MmHeapFree(BlockBuffer); return TRUE; } @@ -1153,7 +1153,7 @@ BlockPointersPerBlock = Ext2BlockSizeInBytes / sizeof(ULONG); - BlockBuffer = (ULONG*)MmAllocateMemory(Ext2BlockSizeInBytes); + BlockBuffer = (ULONG*)MmHeapAlloc(Ext2BlockSizeInBytes); if (BlockBuffer == NULL) { return FALSE; @@ -1161,7 +1161,7 @@ if (!Ext2ReadBlock(TripleIndirectBlock, BlockBuffer)) { - MmFreeMemory(BlockBuffer); + MmHeapFree(BlockBuffer); return FALSE; } @@ -1169,12 +1169,12 @@ { if (!Ext2CopyDoubleIndirectBlockPointers(BlockList, CurrentBlockInList, BlockCount, BlockBuffer[CurrentBlock])) { - MmFreeMemory(BlockBuffer); - return FALSE; - } - } - - MmFreeMemory(BlockBuffer); + MmHeapFree(BlockBuffer); + return FALSE; + } + } + + MmHeapFree(BlockBuffer); return TRUE; } Modified: trunk/reactos/boot/freeldr/freeldr/fs/iso.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/fs/is… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/fs/iso.c (original) +++ trunk/reactos/boot/freeldr/freeldr/fs/iso.c Mon Feb 4 12:37:59 2008 @@ -265,7 +265,7 @@ return NULL; } - FileHandle = MmAllocateMemory(sizeof(ISO_FILE_INFO)); + FileHandle = MmHeapAlloc(sizeof(ISO_FILE_INFO)); if (FileHandle == NULL) { Modified: trunk/reactos/boot/freeldr/freeldr/fs/ntfs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/fs/nt… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/fs/ntfs.c (original) +++ trunk/reactos/boot/freeldr/freeldr/fs/ntfs.c Mon Feb 4 12:37:59 2008 @@ -89,7 +89,7 @@ { PNTFS_ATTR_CONTEXT Context; - Context = MmAllocateMemory(FIELD_OFFSET(NTFS_ATTR_CONTEXT, Record) + AttrRecord->Length); + Context = MmHeapAlloc(FIELD_OFFSET(NTFS_ATTR_CONTEXT, Record) + AttrRecord->Length); RtlCopyMemory(&Context->Record, AttrRecord, AttrRecord->Length); if (AttrRecord->IsNonResident) { @@ -120,7 +120,7 @@ static VOID NtfsReleaseAttributeContext(PNTFS_ATTR_CONTEXT Context) { - MmFreeMemory(Context); + MmHeapFree(Context); } /* FIXME: Optimize for multisector reads. */ @@ -338,7 +338,7 @@ ListContext = NtfsPrepareAttributeContext(AttrRecord); ListSize = NtfsGetAttributeSize(&ListContext->Record); - ListBuffer = MmAllocateMemory(ListSize); + ListBuffer = MmHeapAlloc(ListSize); ListAttrRecord = (PNTFS_ATTR_RECORD)ListBuffer; ListAttrRecordEnd = (PNTFS_ATTR_RECORD)((PCHAR)ListBuffer + ListSize); @@ -349,7 +349,7 @@ Type, Name, NameLength); NtfsReleaseAttributeContext(ListContext); - MmFreeMemory(ListBuffer); + MmHeapFree(ListBuffer); if (Context != NULL) return Context; @@ -495,7 +495,7 @@ ULONG RecordOffset; ULONG IndexBlockSize; - MftRecord = MmAllocateMemory(NtfsMftRecordSize); + MftRecord = MmHeapAlloc(NtfsMftRecordSize); if (MftRecord == NULL) { return FALSE; @@ -508,14 +508,14 @@ IndexRootCtx = NtfsFindAttribute(MftRecord, NTFS_ATTR_TYPE_INDEX_ROOT, L"$I30"); if (IndexRootCtx == NULL) { - MmFreeMemory(MftRecord); + MmHeapFree(MftRecord); return FALSE; } - IndexRecord = MmAllocateMemory(NtfsIndexRecordSize); + IndexRecord = MmHeapAlloc(NtfsIndexRecordSize); if (IndexRecord == NULL) { - MmFreeMemory(MftRecord); + MmHeapFree(MftRecord); return FALSE; } @@ -534,8 +534,8 @@ if (NtfsCompareFileName(FileName, IndexEntry)) { *OutMFTIndex = IndexEntry->Data.Directory.IndexedFile; - MmFreeMemory(IndexRecord); - MmFreeMemory(MftRecord); + MmHeapFree(IndexRecord); + MmHeapFree(MftRecord); return TRUE; } IndexEntry = (PNTFS_INDEX_ENTRY)((PCHAR)IndexEntry + IndexEntry->Length); @@ -551,16 +551,16 @@ if (IndexBitmapCtx == NULL) { DbgPrint((DPRINT_FILESYSTEM, "Corrupted filesystem!\n")); - MmFreeMemory(MftRecord); + MmHeapFree(MftRecord); return FALSE; } BitmapDataSize = NtfsGetAttributeSize(&IndexBitmapCtx->Record); DbgPrint((DPRINT_FILESYSTEM, "BitmapDataSize: %x\n", BitmapDataSize)); - BitmapData = MmAllocateMemory(BitmapDataSize); + BitmapData = MmHeapAlloc(BitmapDataSize); if (BitmapData == NULL) { - MmFreeMemory(IndexRecord); - MmFreeMemory(MftRecord); + MmHeapFree(IndexRecord); + MmHeapFree(MftRecord); return FALSE; } NtfsReadAttribute(IndexBitmapCtx, 0, BitmapData, BitmapDataSize); @@ -570,9 +570,9 @@ if (IndexAllocationCtx == NULL) { DbgPrint((DPRINT_FILESYSTEM, "Corrupted filesystem!\n")); - MmFreeMemory(BitmapData); - MmFreeMemory(IndexRecord); - MmFreeMemory(MftRecord); + MmHeapFree(BitmapData); + MmHeapFree(IndexRecord); + MmHeapFree(MftRecord); return FALSE; } IndexAllocationSize = NtfsGetAttributeSize(&IndexAllocationCtx->Record); @@ -614,9 +614,9 @@ { DbgPrint((DPRINT_FILESYSTEM, "File found\n")); *OutMFTIndex = IndexEntry->Data.Directory.IndexedFile; - MmFreeMemory(BitmapData); - MmFreeMemory(IndexRecord); - MmFreeMemory(MftRecord); + MmHeapFree(BitmapData); + MmHeapFree(IndexRecord); + MmHeapFree(MftRecord); NtfsReleaseAttributeContext(IndexAllocationCtx); return TRUE; } @@ -627,16 +627,16 @@ } NtfsReleaseAttributeContext(IndexAllocationCtx); - MmFreeMemory(BitmapData); - } - - MmFreeMemory(IndexRecord); + MmHeapFree(BitmapData); + } + + MmHeapFree(IndexRecord); } else { DbgPrint((DPRINT_FILESYSTEM, "Can't read MFT record\n")); } - MmFreeMemory(MftRecord); + MmHeapFree(MftRecord); return FALSE; } @@ -703,7 +703,7 @@ return FALSE; } - NtfsBootSector = MmAllocateMemory(NtfsBootSector->BytesPerSector); + NtfsBootSector = MmHeapAlloc(NtfsBootSector->BytesPerSector); if (NtfsBootSector == NULL) { return FALSE; @@ -740,10 +740,10 @@ return FALSE; } - NtfsMasterFileTable = MmAllocateMemory(NtfsMftRecordSize); + NtfsMasterFileTable = MmHeapAlloc(NtfsMftRecordSize); if (NtfsMasterFileTable == NULL) { - MmFreeMemory(NtfsBootSector); + MmHeapFree(NtfsBootSector); return FALSE; } @@ -765,7 +765,7 @@ PNTFS_FILE_HANDLE FileHandle; PNTFS_MFT_RECORD MftRecord; - FileHandle = MmAllocateMemory(sizeof(NTFS_FILE_HANDLE) + NtfsMftRecordSize); + FileHandle = MmHeapAlloc(sizeof(NTFS_FILE_HANDLE) + NtfsMftRecordSize); if (FileHandle == NULL) { return NULL; @@ -774,7 +774,7 @@ MftRecord = (PNTFS_MFT_RECORD)(FileHandle + 1); if (!NtfsLookupFile(FileName, MftRecord, &FileHandle->DataContext)) { - MmFreeMemory(FileHandle); + MmHeapFree(FileHandle); return NULL; } @@ -787,7 +787,7 @@ { PNTFS_FILE_HANDLE FileHandle = (PNTFS_FILE_HANDLE)File; NtfsReleaseAttributeContext(FileHandle->DataContext); - MmFreeMemory(FileHandle); + MmHeapFree(FileHandle); } BOOLEAN NtfsReadFile(FILE *File, ULONG BytesToRead, ULONG* BytesRead, PVOID Buffer)

1 0

[tkreuzer] 32111: - recurse into IntGdiDeleteDC directly, instead of going back to NtGdiDeleteObjectApp and pass Force parameter on. - add a FIXME for dangerous code
by tkreuzer＠svn.reactos.org 04 Feb '08

04 Feb '08

Author: tkreuzer Date: Mon Feb 4 06:31:09 2008 New Revision: 32111 URL: http://svn.reactos.org/svn/reactos?rev=32111&view=rev Log: - recurse into IntGdiDeleteDC directly, instead of going back to NtGdiDeleteObjectApp and pass Force parameter on. - add a FIXME for dangerous code Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c Mon Feb 4 06:31:09 2008 @@ -961,7 +961,7 @@ DC_SetNextDC (DCToDelete, DC_GetNextDC (savedDC)); DCToDelete->saveLevel--; DC_UnlockDc( savedDC ); - NtGdiDeleteObjectApp (savedHDC); + IntGdiDeleteDC(savedHDC, Force); } /* Free GDI resources allocated to this DC */ @@ -2475,7 +2475,7 @@ { INT Index = GDI_HANDLE_GET_INDEX((HGDIOBJ)hDC); PGDI_TABLE_ENTRY Entry = &GdiHandleTable->Entries[Index]; - + // FIXME: dc could have been deleted!!! use GDIOBJ_InsertUserData if (NT_SUCCESS(Status)) { RtlZeroMemory(NewMem, MemSize);

1 0

[tkreuzer] 32110: - simplify a check - fix a check - fix a region leak - don't abuse GDIOBJ_LockObj to validate a handle, use GDIOBJ_ValidateHandle instead - add some additional debug output
by tkreuzer＠svn.reactos.org 04 Feb '08

04 Feb '08

Author: tkreuzer Date: Mon Feb 4 06:22:27 2008 New Revision: 32110 URL: http://svn.reactos.org/svn/reactos?rev=32110&view=rev Log: - simplify a check - fix a check - fix a region leak - don't abuse GDIOBJ_LockObj to validate a handle, use GDIOBJ_ValidateHandle instead - add some additional debug output Modified: trunk/reactos/subsystems/win32/win32k/ntuser/windc.c trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/windc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/windc.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/windc.c Mon Feb 4 06:22:27 2008 @@ -485,7 +485,7 @@ else { Dce = Window->Dce; - if (NULL != Dce && Dce->hwndCurrent == (Window ? Window->hSelf : NULL)) + if (Dce->hwndCurrent == Window->hSelf) { UpdateVisRgn = FALSE; /* updated automatically, via DCHook() */ } @@ -511,7 +511,7 @@ if (0 == (Flags & (DCX_EXCLUDERGN | DCX_INTERSECTRGN)) && NULL != ClipRegion) { - if (Flags & DCX_KEEPCLIPRGN) + if (!(Flags & DCX_KEEPCLIPRGN)) NtGdiDeleteObject(ClipRegion); ClipRegion = NULL; } @@ -520,7 +520,6 @@ if (NULL != Dce->hClipRgn) { DceDeleteClipRgn(Dce); - Dce->hClipRgn = NULL; } #endif @@ -541,6 +540,7 @@ { Dce->hClipRgn = UnsafeIntCreateRectRgnIndirect(&Window->Wnd->WindowRect); } + Dce->DCXFlags &= ~DCX_KEEPCLIPRGN; } else if (ClipRegion != NULL) { @@ -715,8 +715,8 @@ } } - dc = DC_LockDc(pDCE->hDC); - if (dc == NULL) + if (!GDIOBJ_ValidateHandle(pDCE->hDC, GDI_OBJECT_TYPE_DC) || + (dc = DC_LockDc(pDCE->hDC)) == NULL) { pDCE = (PDCE) pDCE->List.Flink; continue; Modified: trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c Mon Feb 4 06:22:27 2008 @@ -857,6 +857,12 @@ /* Check for invalid owner. */ if (ProcessId != HandleProcessId && HandleProcessId != NULL) { + DPRINT1("Tried to lock object (0x%p) of wrong owner! ProcessId = %p, HandleProcessId = %p\n", hObj, ProcessId, HandleProcessId); +#ifdef GDI_DEBUG + KeRosDumpStackFrames(NULL, 20); +// DPRINT1("Handle allocator:\n"); +// KeRosDumpStackFrames(GDIHandleAllocator[GDI_HANDLE_GET_INDEX(hObj)], GDI_STACK_LEVELS); +#endif return NULL; }

1 0

[tkreuzer] 32109: - remove GDIOB_XxxDbg functions - enhance backtracing and debug output for GDI_DEBUG - implement GDIOBJ_ValidateHandle() Stack record dumping is commented out atm due to missing support from ntoskrnl
by tkreuzer＠svn.reactos.org 04 Feb '08

04 Feb '08

Author: tkreuzer Date: Mon Feb 4 06:17:37 2008 New Revision: 32109 URL: http://svn.reactos.org/svn/reactos?rev=32109&view=rev Log: - remove GDIOB_XxxDbg functions - enhance backtracing and debug output for GDI_DEBUG - implement GDIOBJ_ValidateHandle() Stack record dumping is commented out atm due to missing support from ntoskrnl Modified: trunk/reactos/subsystems/win32/win32k/include/gdiobj.h trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c Modified: trunk/reactos/subsystems/win32/win32k/include/gdiobj.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/gdiobj.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/gdiobj.h Mon Feb 4 06:17:37 2008 @@ -72,27 +72,11 @@ #define GDIOBJ_GetObjectType(Handle) \ GDI_HANDLE_GET_TYPE(Handle) -#ifdef GDI_DEBUG - -/* a couple macros for debugging GDIOBJ locking */ -#define GDIOBJ_AllocObj(ht,ty) GDIOBJ_AllocObjDbg(ht,__FILE__,__LINE__,ty) -#define GDIOBJ_FreeObj(ht,obj,ty) GDIOBJ_FreeObjDbg(ht,__FILE__,__LINE__,obj,ty) -#define GDIOBJ_LockObj(ht,obj,ty) GDIOBJ_LockObjDbg(ht,__FILE__,__LINE__,obj,ty) -#define GDIOBJ_ShareLockObj(ht,obj,ty) GDIOBJ_ShareLockObjDbg(ht,__FILE__,__LINE__,obj,ty) - -HGDIOBJ INTERNAL_CALL GDIOBJ_AllocObjDbg(PGDI_HANDLE_TABLE HandleTable, const char* file, int line, ULONG ObjectType); -BOOL INTERNAL_CALL GDIOBJ_FreeObjDbg (PGDI_HANDLE_TABLE HandleTable, const char* file, int line, HGDIOBJ hObj, DWORD ObjectType); -PGDIOBJ INTERNAL_CALL GDIOBJ_LockObjDbg (PGDI_HANDLE_TABLE HandleTable, const char* file, int line, HGDIOBJ hObj, DWORD ObjectType); -PGDIOBJ INTERNAL_CALL GDIOBJ_ShareLockObjDbg (PGDI_HANDLE_TABLE HandleTable, const char* file, int line, HGDIOBJ hObj, DWORD ObjectType); - -#else /* !GDI_DEBUG */ - +BOOL INTERNAL_CALL GDIOBJ_ValidateHandle(HGDIOBJ hObj, ULONG ObjectType); HGDIOBJ INTERNAL_CALL GDIOBJ_AllocObj(PGDI_HANDLE_TABLE HandleTable, ULONG ObjectType); BOOL INTERNAL_CALL GDIOBJ_FreeObj (PGDI_HANDLE_TABLE HandleTable, HGDIOBJ hObj, DWORD ObjectType); PGDIOBJ INTERNAL_CALL GDIOBJ_LockObj (PGDI_HANDLE_TABLE HandleTable, HGDIOBJ hObj, DWORD ObjectType); PGDIOBJ INTERNAL_CALL GDIOBJ_ShareLockObj (PGDI_HANDLE_TABLE HandleTable, HGDIOBJ hObj, DWORD ObjectType); - -#endif /* GDI_DEBUG */ PVOID INTERNAL_CALL GDI_MapHandleTable(PSECTION_OBJECT SectionObject, PEPROCESS Process); Modified: trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c Mon Feb 4 06:17:37 2008 @@ -28,12 +28,11 @@ #include <debug.h> /* FIXME include right header for KeRosDumpStackFrames */ -VOID -NTAPI -KeRosDumpStackFrames( - PULONG Frame, - ULONG FrameCount -); +VOID NTAPI KeRosDumpStackFrames(PULONG, ULONG); + +#ifdef GDI_DEBUG +BOOLEAN STDCALL KiRosPrintAddress(PVOID Address); +#endif #define GDI_ENTRY_TO_INDEX(ht, e) \ (((ULONG_PTR)(e) - (ULONG_PTR)&((ht)->Entries[0])) / sizeof(GDI_TABLE_ENTRY)) @@ -109,11 +108,6 @@ DPRINT("%s:%i: Delay\n", __FILE__, __LINE__); \ KeDelayExecutionThread(KernelMode, FALSE, &ShortDelay) -#ifdef GDI_DEBUG -BOOLEAN STDCALL KiRosPrintAddress(PVOID Address); -VOID STDCALL KeRosDumpStackFrames(PULONG Frame, ULONG FrameCount); -#endif - /*! * Allocate GDI object table. * \param Size - number of entries in the object table. @@ -207,6 +201,7 @@ static int leak_reported = 0; #define GDI_STACK_LEVELS 12 static ULONG GDIHandleAllocator[GDI_HANDLE_COUNT][GDI_STACK_LEVELS]; +static ULONG GDIHandleLocker[GDI_HANDLE_COUNT][GDI_STACK_LEVELS]; struct DbgOpenGDIHandle { ULONG idx; @@ -383,6 +378,23 @@ } +BOOL +INTERNAL_CALL +GDIOBJ_ValidateHandle(HGDIOBJ hObj, ULONG ObjectType) +{ + PGDI_TABLE_ENTRY Entry = GDI_HANDLE_GET_ENTRY(GdiHandleTable, hObj); + if((((ULONG_PTR)hObj & GDI_HANDLE_TYPE_MASK) == ObjectType) && + (Entry->Type << GDI_ENTRY_UPPER_SHIFT) == GDI_HANDLE_GET_UPPER(hObj)) + { + HANDLE pid = (HANDLE)((ULONG_PTR)Entry->ProcessId & ~0x1); + if(pid == NULL || pid == PsGetCurrentProcessId()) + { + return TRUE; + } + } + return FALSE; +} + /*! * Allocate memory for GDI object and return handle to it. * @@ -394,11 +406,7 @@ * \todo return the object pointer and lock it by default. */ HGDIOBJ INTERNAL_CALL -#ifdef GDI_DEBUG -GDIOBJ_AllocObjDbg(PGDI_HANDLE_TABLE HandleTable, const char* file, int line, ULONG ObjectType) -#else /* !GDI_DEBUG */ GDIOBJ_AllocObj(PGDI_HANDLE_TABLE HandleTable, ULONG ObjectType) -#endif /* GDI_DEBUG */ { PW32PROCESS W32Process; PGDIOBJHDR newObject = NULL; @@ -445,13 +453,6 @@ newObject->LockingThread = NULL; newObject->Locks = 0; -#ifdef GDI_DEBUG - newObject->createdfile = file; - newObject->createdline = line; - newObject->lockfile = NULL; - newObject->lockline = 0; -#endif - ObjectBody = GDIHdrToBdy(newObject); RtlZeroMemory(ObjectBody, GetObjectSize(TypeIndex)); @@ -487,8 +488,8 @@ (void)InterlockedExchangePointer(&Entry->ProcessId, CurrentProcessId); #ifdef GDI_DEBUG - memset ( GDIHandleAllocator[Index], 0xcd, GDI_STACK_LEVELS * sizeof(ULONG) ); - RtlCaptureStackBackTrace(2, GDI_STACK_LEVELS, (PVOID*)GDIHandleAllocator[Index], NULL); + memset ( GDIHandleAllocator[Index], 0x00, GDI_STACK_LEVELS * sizeof(ULONG) ); + RtlCaptureStackBackTrace(1, GDI_STACK_LEVELS, (PVOID*)GDIHandleAllocator[Index], NULL); #endif /* GDI_DEBUG */ if(W32Process != NULL) @@ -548,11 +549,7 @@ * to the calling process. */ BOOL INTERNAL_CALL -#ifdef GDI_DEBUG -GDIOBJ_FreeObjDbg(PGDI_HANDLE_TABLE HandleTable, const char* file, int line, HGDIOBJ hObj, DWORD ExpectedType) -#else /* !GDI_DEBUG */ GDIOBJ_FreeObj(PGDI_HANDLE_TABLE HandleTable, HGDIOBJ hObj, DWORD ExpectedType) -#endif /* GDI_DEBUG */ { PGDI_TABLE_ENTRY Entry; PPAGED_LOOKASIDE_LIST LookasideList; @@ -569,7 +566,8 @@ { DPRINT1("GDIOBJ_FreeObj() failed, can't delete stock object handle: 0x%x !!!\n", hObj); #ifdef GDI_DEBUG - DPRINT1("-> called from %s:%i\n", file, line); + DPRINT1("-> called from:\n"); + KeRosDumpStackFrames(NULL, 20); #endif return FALSE; } @@ -655,7 +653,8 @@ */ DPRINT1("GdiHdr->Locks: %d\n", GdiHdr->Locks); #ifdef GDI_DEBUG - DPRINT1("Locked from: %s:%d\n", GdiHdr->lockfile, GdiHdr->lockline); +// DPRINT1("Locked from:\n"); +// KeRosDumpStackFrames(GDIHandleLocker[GDI_HANDLE_GET_INDEX(hObj)], GDI_STACK_LEVELS); #endif ASSERT(FALSE); } @@ -688,15 +687,16 @@ { DPRINT1("Attempted to free global gdi handle 0x%x, caller needs to get ownership first!!!\n", hObj); DPRINT1("Type = 0x%lx, KernelData = 0x%p, ProcessId = 0x%p\n", Entry->Type, Entry->KernelData, Entry->ProcessId); - KeRosDumpStackFrames(NULL, 20); } else { DPRINT1("Attempted to free foreign handle: 0x%x Owner: 0x%x from Caller: 0x%x\n", hObj, (ULONG_PTR)PrevProcId & ~0x1, (ULONG_PTR)ProcessId & ~0x1); + } +#ifdef GDI_DEBUG + DPRINT1("-> called from:\n"); KeRosDumpStackFrames(NULL, 20); - } -#ifdef GDI_DEBUG - DPRINT1("-> called from %s:%i\n", file, line); +// DPRINT1("Allocated from:\n"); +// KeRosDumpStackFrames(GDIHandleAllocator[GDI_HANDLE_GET_INDEX(hObj)], GDI_STACK_LEVELS); #endif } } @@ -818,11 +818,7 @@ * \todo Get rid of the ExpectedType parameter! */ PGDIOBJ INTERNAL_CALL -#ifdef GDI_DEBUG -GDIOBJ_LockObjDbg (PGDI_HANDLE_TABLE HandleTable, const char* file, int line, HGDIOBJ hObj, DWORD ExpectedType) -#else /* !GDI_DEBUG */ GDIOBJ_LockObj (PGDI_HANDLE_TABLE HandleTable, HGDIOBJ hObj, DWORD ExpectedType) -#endif /* GDI_DEBUG */ { ULONG HandleIndex; PGDI_TABLE_ENTRY Entry; @@ -847,6 +843,11 @@ { DPRINT1("Attempted to lock object 0x%x of wrong type (Handle: 0x%x, requested: 0x%x)\n", hObj, HandleType, ExpectedType); +#ifdef GDI_DEBUG + KeRosDumpStackFrames(NULL, 20); +// DPRINT1("Allocated from:\n"); +// KeRosDumpStackFrames(GDIHandleAllocator[GDI_HANDLE_GET_INDEX(hObj)], GDI_STACK_LEVELS); +#endif return NULL; } @@ -898,8 +899,8 @@ GdiHdr->LockingThread = Thread; GdiHdr->Locks = 1; #ifdef GDI_DEBUG - GdiHdr->lockfile = file; - GdiHdr->lockline = line; + memset(GDIHandleLocker[GDI_HANDLE_GET_INDEX(hObj)], 0x00, GDI_STACK_LEVELS * sizeof(ULONG)); + RtlCaptureStackBackTrace(1, GDI_STACK_LEVELS, (PVOID*)GDIHandleLocker[GDI_HANDLE_GET_INDEX(hObj)], NULL); #endif Object = Entry->KernelData; } @@ -928,7 +929,8 @@ LockErrorDebugOutput(hObj, Entry, "GDIOBJ_LockObj"); #ifdef GDI_DEBUG - DPRINT1("-> called from %s:%i\n", file, line); + DPRINT1("-> called from:\n"); + KeRosDumpStackFrames(NULL, 20); #endif } @@ -966,11 +968,7 @@ * \todo Get rid of the ExpectedType parameter! */ PGDIOBJ INTERNAL_CALL -#ifdef GDI_DEBUG -GDIOBJ_ShareLockObjDbg (PGDI_HANDLE_TABLE HandleTable, const char* file, int line, HGDIOBJ hObj, DWORD ExpectedType) -#else /* !GDI_DEBUG */ GDIOBJ_ShareLockObj (PGDI_HANDLE_TABLE HandleTable, HGDIOBJ hObj, DWORD ExpectedType) -#endif /* GDI_DEBUG */ { ULONG HandleIndex; PGDI_TABLE_ENTRY Entry; @@ -1043,8 +1041,8 @@ #ifdef GDI_DEBUG if (InterlockedIncrement((PLONG)&GdiHdr->Locks) == 1) { - GdiHdr->lockfile = file; - GdiHdr->lockline = line; + memset(GDIHandleLocker[HandleIndex], 0x00, GDI_STACK_LEVELS * sizeof(ULONG)); + RtlCaptureStackBackTrace(1, GDI_STACK_LEVELS, (PVOID*)GDIHandleLocker[HandleIndex], NULL); } #else InterlockedIncrement((PLONG)&GdiHdr->Locks); @@ -1060,7 +1058,8 @@ LockErrorDebugOutput(hObj, Entry, "GDIOBJ_ShareLockObj"); #ifdef GDI_DEBUG - DPRINT1("-> called from %s:%i\n", file, line); + DPRINT1("-> called from:\n"); + KeRosDumpStackFrames(NULL, 20); #endif } @@ -1099,8 +1098,8 @@ #ifdef GDI_DEBUG if (InterlockedDecrement((PLONG)&GdiHdr->Locks) == 0) { - GdiHdr->lockfile = NULL; - GdiHdr->lockline = 0; + memset(GDIHandleLocker[GDI_HANDLE_GET_INDEX(Object)], 0x00, GDI_STACK_LEVELS * sizeof(ULONG)); + RtlCaptureStackBackTrace(1, GDI_STACK_LEVELS, (PVOID*)GDIHandleLocker[GDI_HANDLE_GET_INDEX(Object)], NULL); } #else if (InterlockedDecrement((PLONG)&GdiHdr->Locks) < 0) @@ -1234,7 +1233,7 @@ { if(GdiHdr->lockfile != NULL) { - DPRINT1("[%d]Locked %s:%i by 0x%x (we're 0x%x)\n", Attempts, GdiHdr->lockfile, GdiHdr->lockline, PrevThread, Thread); + DPRINT1("[%d]Locked by 0x%x (we're 0x%x)\n", Attempts, PrevThread, Thread); } } #endif @@ -1356,10 +1355,7 @@ #ifdef GDI_DEBUG if(++Attempts > 20) { - if(GdiHdr->lockfile != NULL) - { - DPRINT1("[%d]Locked from %s:%i by 0x%x (we're 0x%x)\n", Attempts, GdiHdr->lockfile, GdiHdr->lockline, PrevThread, Thread); - } + DPRINT1("[%d]Locked by 0x%x (we're 0x%x)\n", Attempts, PrevThread, Thread); } #endif /* WTF?! The object is already locked by a different thread! @@ -1475,10 +1471,7 @@ #ifdef GDI_DEBUG if(++Attempts > 20) { - if(GdiHdr->lockfile != NULL) - { - DPRINT1("[%d]Locked from %s:%i by 0x%x (we're 0x%x)\n", Attempts, GdiHdr->lockfile, GdiHdr->lockline, PrevThread, Thread); - } + DPRINT1("[%d]Locked by 0x%x (we're 0x%x)\n", Attempts, PrevThread, Thread); } #endif /* WTF?! The object is already locked by a different thread!

1 0

[fireball] 32108: - Revert 32105 to make trunk bootable, as agreed with Colin.
by fireball＠svn.reactos.org 03 Feb '08

03 Feb '08

Author: fireball Date: Mon Feb 4 00:47:35 2008 New Revision: 32108 URL: http://svn.reactos.org/svn/reactos?rev=32108&view=rev Log: - Revert 32105 to make trunk bootable, as agreed with Colin. Modified: trunk/reactos/tools/rsym.c trunk/reactos/tools/rsym.h trunk/reactos/tools/rsym.mak Modified: trunk/reactos/tools/rsym.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rsym.c?rev=32108&r1=… ============================================================================== --- trunk/reactos/tools/rsym.c (original) +++ trunk/reactos/tools/rsym.c Mon Feb 4 00:47:35 2008 @@ -490,7 +490,7 @@ *ProcessedRelocs = malloc(RelocSectionHeader->SizeOfRawData); if (NULL == *ProcessedRelocs) { - fprintf(stderr, "Failed to allocate %u bytes for relocations\n", (UINT)RelocSectionHeader->SizeOfRawData); + fprintf(stderr, "Failed to allocate %lu bytes for relocations\n", RelocSectionHeader->SizeOfRawData); return 1; } *ProcessedRelocsLength = 0; @@ -566,7 +566,7 @@ OutHeader = malloc(StartOfRawData); if (NULL == OutHeader) { - fprintf(stderr, "Failed to allocate %u bytes for output file header\n", (UINT)StartOfRawData); + fprintf(stderr, "Failed to allocate %lu bytes for output file header\n", StartOfRawData); return 1; } memset(OutHeader, '\0', StartOfRawData); @@ -679,7 +679,7 @@ PaddedRosSym = malloc(RosSymFileLength); if (NULL == PaddedRosSym) { - fprintf(stderr, "Failed to allocate %u bytes for padded .rossym\n", (UINT)RosSymFileLength); + fprintf(stderr, "Failed to allocate %lu bytes for padded .rossym\n", RosSymFileLength); return 1; } memcpy(PaddedRosSym, RosSymSection, RosSymLength); Modified: trunk/reactos/tools/rsym.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rsym.h?rev=32108&r1=… ============================================================================== --- trunk/reactos/tools/rsym.h (original) +++ trunk/reactos/tools/rsym.h Mon Feb 4 00:47:35 2008 @@ -10,7 +10,28 @@ #define IMAGE_NUMBEROF_DIRECTORY_ENTRIES 16 -#include <host/typedefs.h> +typedef unsigned char BYTE; +typedef unsigned char UCHAR; +typedef unsigned short WORD; +typedef unsigned short USHORT; +#if defined(__x86_64__) && defined(unix) +typedef signed int LONG; +typedef unsigned int ULONG; +typedef unsigned int DWORD; +#else +typedef signed long LONG; +typedef unsigned long ULONG; +typedef unsigned long DWORD; +#endif +#if defined(_WIN64) +typedef unsigned __int64 ULONG_PTR; +#else +#if defined(__x86_64__) && defined(unix) +typedef unsigned int ULONG_PTR; +#else +typedef unsigned long ULONG_PTR; +#endif +#endif #pragma pack(2) typedef struct _IMAGE_DOS_HEADER { Modified: trunk/reactos/tools/rsym.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rsym.mak?rev=32108&r… ============================================================================== --- trunk/reactos/tools/rsym.mak (original) +++ trunk/reactos/tools/rsym.mak Mon Feb 4 00:47:35 2008 @@ -16,7 +16,7 @@ RSYM_OBJECTS = \ $(addprefix $(INTERMEDIATE_), $(RSYM_SOURCES:.c=.o)) -RSYM_HOST_CFLAGS = $(TOOLS_CFLAGS) -Iinclude +RSYM_HOST_CFLAGS = $(TOOLS_CFLAGS) RSYM_HOST_LFLAGS = $(TOOLS_LFLAGS)

1 0

[fireball] 32107: - Make caching enable/disable a runtime switch instead of a compile time one.
by fireball＠svn.reactos.org 03 Feb '08

03 Feb '08

Author: fireball Date: Sun Feb 3 21:51:48 2008 New Revision: 32107 URL: http://svn.reactos.org/svn/reactos?rev=32107&view=rev Log: - Make caching enable/disable a runtime switch instead of a compile time one. Modified: trunk/reactos/boot/freeldr/freeldr/fs/fat.c Modified: trunk/reactos/boot/freeldr/freeldr/fs/fat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/fs/fa… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/fs/fat.c (original) +++ trunk/reactos/boot/freeldr/freeldr/fs/fat.c Sun Feb 3 21:51:48 2008 @@ -22,7 +22,7 @@ #define NDEBUG #include <debug.h> -#define CACHE_ENABLED +BOOLEAN gCacheEnabled = TRUE; ULONG BytesPerSector; /* Number of bytes per sector */ ULONG SectorsPerCluster; /* Number of sectors per cluster */ @@ -336,28 +336,30 @@ } MmHeapFree(FatVolumeBootSector); -#ifdef CACHE_ENABLED - // - // Initialize the disk cache for this drive - // - if (!CacheInitializeDrive(DriveNumber)) - { - return FALSE; - } - - // - // Force the FAT sectors into the cache - // as long as it is FAT12 or FAT16. FAT32 can - // have a multi-megabyte FAT so we don't want that. - // - if (FatType != FAT32 && FatType != FATX32) - { - if (!CacheForceDiskSectorsIntoCache(DriveNumber, ActiveFatSectorStart, SectorsPerFat)) + if (gCacheEnabled) + { + // + // Initialize the disk cache for this drive + // + if (!CacheInitializeDrive(DriveNumber)) { return FALSE; } - } -#else + + // + // Force the FAT sectors into the cache + // as long as it is FAT12 or FAT16. FAT32 can + // have a multi-megabyte FAT so we don't want that. + // + if (FatType != FAT32 && FatType != FATX32) + { + if (!CacheForceDiskSectorsIntoCache(DriveNumber, ActiveFatSectorStart, SectorsPerFat)) + { + return FALSE; + } + } + } + else { GEOMETRY DriveGeometry; ULONG BlockSize; @@ -370,7 +372,6 @@ BlockSize = MachDiskGetCacheableBlockCount(DriveNumber); } -#endif return TRUE; } @@ -1422,21 +1423,24 @@ BOOLEAN FatReadVolumeSectors(ULONG DriveNumber, ULONG SectorNumber, ULONG SectorCount, PVOID Buffer) { -#ifdef CACHE_ENABLED - return CacheReadDiskSectors(DriveNumber, SectorNumber + FatVolumeStartSector, SectorCount, Buffer); -#else - // Now try to read in the block - if (!MachDiskReadLogicalSectors(DriveNumber, SectorNumber + FatVolumeStartSector, SectorCount, (PVOID)DISKREADBUFFER)) - { - return FALSE; - } - - // Copy data to the caller - RtlCopyMemory(Buffer, (PVOID)DISKREADBUFFER, SectorCount * BytesPerSector); - - // Return success - return TRUE; -#endif + if (gCacheEnabled) + { + return CacheReadDiskSectors(DriveNumber, SectorNumber + FatVolumeStartSector, SectorCount, Buffer); + } + else + { + // Now try to read in the block + if (!MachDiskReadLogicalSectors(DriveNumber, SectorNumber + FatVolumeStartSector, SectorCount, (PVOID)DISKREADBUFFER)) + { + return FALSE; + } + + // Copy data to the caller + RtlCopyMemory(Buffer, (PVOID)DISKREADBUFFER, SectorCount * BytesPerSector); + + // Return success + return TRUE; + } } const FS_VTBL FatVtbl = {

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