Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hyperion] 24486: How could so much be so wrong in so little code is something future generations will forever ponder in vain. Fixed constraints on inline asm outputs for compare-exchange intrinsics
by hyperion＠svn.reactos.org 11 Oct '06

11 Oct '06

Author: hyperion Date: Wed Oct 11 20:07:45 2006 New Revision: 24486 URL: http://svn.reactos.org/svn/reactos?rev=24486&view=rev Log: How could so much be so wrong in so little code is something future generations will forever ponder in vain. Fixed constraints on inline asm outputs for compare-exchange intrinsics Modified: trunk/reactos/include/psdk/intrin.h Modified: trunk/reactos/include/psdk/intrin.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/intrin.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/intrin.h (original) +++ trunk/reactos/include/psdk/intrin.h Wed Oct 11 20:07:45 2006 @@ -190,21 +190,21 @@ static __inline__ __attribute__((always_inline)) char _InterlockedCompareExchange8(volatile char * const Destination, const char Exchange, const char Comperand) { char retval = Comperand; - __asm__("lock; cmpxchgb %b[Exchange], %[Destination]" : "a" (retval) : [Destination] "rm" (Destination), [Exchange] "r" (Exchange) : "memory"); + __asm__("lock; cmpxchgb %b[Exchange], %[Destination]" : "=a" (retval) : [Destination] "rm" (Destination), [Exchange] "r" (Exchange) : "memory"); return retval; } static __inline__ __attribute__((always_inline)) short _InterlockedCompareExchange16(volatile short * const Destination, const short Exchange, const short Comperand) { short retval = Comperand; - __asm__("lock; cmpxchgw %w[Exchange], %[Destination]" : "a" (retval) : [Destination] "rm" (Destination), [Exchange] "r" (Exchange): "memory"); + __asm__("lock; cmpxchgw %w[Exchange], %[Destination]" : "=a" (retval) : [Destination] "rm" (Destination), [Exchange] "r" (Exchange): "memory"); return retval; } static __inline__ __attribute__((always_inline)) long _InterlockedCompareExchange(volatile long * const Destination, const long Exchange, const long Comperand) { long retval = Comperand; - __asm__("lock; cmpxchgl %k[Exchange], %[Destination]" : "a" (retval) : [Destination] "rm" (Destination), [Exchange] "r" (Exchange): "memory"); + __asm__("lock; cmpxchgl %k[Exchange], %[Destination]" : "=a" (retval) : [Destination] "rm" (Destination), [Exchange] "r" (Exchange): "memory"); return retval; } @@ -219,7 +219,7 @@ __asm__ ( "cmpxchg8b %[Destination]" : - "a" (lo32Retval), "d" (hi32Retval) : + "=a" (lo32Retval), "=d" (hi32Retval) : [Destination] "rm" (Destination), "b" (lo32Exchange), "c" (hi32Exchange) : "memory" ); @@ -244,28 +244,28 @@ static __inline__ __attribute__((always_inline)) void * _InterlockedCompareExchangePointer(void * volatile * const Destination, void * const Exchange, void * const Comperand) { void * retval; - __asm__("lock; cmpxchgl %k[Exchange], %[Destination]" : "a" (retval) : [Destination] "rm" (Destination), [Exchange] "r" (Exchange), "a" (Comperand) : "memory"); + __asm__("lock; cmpxchgl %k[Exchange], %[Destination]" : "=a" (retval) : [Destination] "rm" (Destination), [Exchange] "r" (Exchange), "a" (Comperand) : "memory"); return retval; } static __inline__ __attribute__((always_inline)) long _InterlockedExchange(volatile long * const Target, const long Value) { long retval = Value; - __asm__("lock; xchgl %[retval], %[Target]" : [retval] "r" (retval) : [Target] "rm" (Target) : "memory"); + __asm__("lock; xchgl %[retval], %[Target]" : [retval] "=r" (retval) : [Target] "rm" (Target) : "memory"); return retval; } static __inline__ __attribute__((always_inline)) void * _InterlockedExchangePointer(void * volatile * const Target, void * const Value) { void * retval = Value; - __asm__("lock; xchgl %[retval], %[Target]" : [retval] "r" (retval) : [Target] "rm" (Target) : "memory"); + __asm__("lock; xchgl %[retval], %[Target]" : [retval] "=r" (retval) : [Target] "rm" (Target) : "memory"); return retval; } static __inline__ __attribute__((always_inline)) long _InterlockedExchangeAdd(volatile long * const Addend, const long Value) { long retval = Value; - __asm__("lock; xaddl %[retval], %[Addend]" : "r" (retval) : "rm" (Addend)); + __asm__("lock; xaddl %[retval], %[Addend]" : "=r" (retval) : "rm" (Addend)); return retval; }

1 0

[weiden] 24485: Some header upgrades
by weiden＠svn.reactos.org 11 Oct '06

11 Oct '06

Author: weiden Date: Wed Oct 11 15:44:40 2006 New Revision: 24485 URL: http://svn.reactos.org/svn/reactos?rev=24485&view=rev Log: Some header upgrades Modified: trunk/reactos/include/psdk/ndrtypes.h trunk/reactos/include/psdk/ntsecapi.h trunk/reactos/include/psdk/rpcndr.h trunk/reactos/include/psdk/schannel.h trunk/reactos/include/psdk/security.h trunk/reactos/include/psdk/winbase.h trunk/reactos/include/psdk/winerror.h trunk/reactos/include/psdk/winsock2.h trunk/reactos/include/psdk/ws2tcpip.h trunk/reactos/include/reactos/wine/rpcfc.h Modified: trunk/reactos/include/psdk/ndrtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ndrtypes.h?re… ============================================================================== --- trunk/reactos/include/psdk/ndrtypes.h (original) +++ trunk/reactos/include/psdk/ndrtypes.h Wed Oct 11 15:44:40 2006 @@ -54,4 +54,129 @@ * call. */ } PARAM_ATTRIBUTES; +typedef struct +{ + unsigned char ServerMustSize : 1; /* 0x01 - the server must perform a + * sizing pass. */ + unsigned char ClientMustSize : 1; /* 0x02 - the client must perform a + * sizing pass. */ + unsigned char HasReturn : 1; /* 0x04 - procedure has a return value. */ + unsigned char HasPipes : 1; /* 0x08 - the pipe package should be used. */ + unsigned char Unused : 1; /* 0x10 - not used */ + unsigned char HasAsyncUuid : 1; /* 0x20 - indicates an asynchronous DCOM + * procedure. */ + unsigned char HasExtensions : 1; /* 0x40 - indicates that Win2000 + * extensions are in use. */ + unsigned char HasAsyncHandle : 1; /* 0x80 - indicates an asynchronous RPC + * procedure. */ +} INTERPRETER_OPT_FLAGS, *PINTERPRETER_OPT_FLAGS; + +typedef struct +{ + unsigned char HasNewCorrDesc : 1; /* 0x01 - indicates new correlation + * descriptors in use. */ + unsigned char ClientCorrCheck : 1; /* 0x02 - client needs correlation + * check. */ + unsigned char ServerCorrCheck : 1; /* 0x04 - server needs correlation + * check. */ + unsigned char HasNotify : 1; /* 0x08 - should call MIDL [notify] + * routine @ NotifyIndex. */ + unsigned char HasNotify2 : 1; /* 0x10 - should call MIDL [notify_flag] routine @ + * NotifyIndex. */ + unsigned char Unused : 3; +} INTERPRETER_OPT_FLAGS2, *PINTERPRETER_OPT_FLAGS2; + +/* Win2000 extensions */ +typedef struct +{ + /* size in bytes of all following extensions */ + unsigned char Size; + + INTERPRETER_OPT_FLAGS2 Flags2; + + /* client cache size hint */ + unsigned short ClientCorrHint; + + /* server cache size hint */ + unsigned short ServerCorrHint; + + /* index of routine in MIDL_STUB_DESC::NotifyRoutineTable to call if + * HasNotify or HasNotify2 flag set */ + unsigned short NotifyIndex; +} NDR_PROC_HEADER_EXTS; + +typedef struct +{ + /* size in bytes of all following extensions */ + unsigned char Size; + + INTERPRETER_OPT_FLAGS2 Flags2; + + /* client cache size hint */ + unsigned short ClientCorrHint; + + /* server cache size hint */ + unsigned short ServerCorrHint; + + /* index of routine in MIDL_STUB_DESC::NotifyRoutineTable to call if + * HasNotify or HasNotify2 flag set */ + unsigned short NotifyIndex; + + /* needed only on IA64 to cope with float/register loading */ + unsigned short FloatArgMask; +} NDR_PROC_HEADER_EXTS64; + +typedef enum +{ + FC_BYTE = 0x01, /* 0x01 */ + FC_CHAR, /* 0x02 */ + FC_SMALL, /* 0x03 */ + FC_USMALL, /* 0x04 */ + FC_WCHAR, /* 0x05 */ + FC_SHORT, /* 0x06 */ + FC_USHORT, /* 0x07 */ + FC_LONG, /* 0x08 */ + FC_ULONG, /* 0x09 */ + FC_FLOAT, /* 0x0a */ + FC_HYPER, /* 0x0b */ + FC_DOUBLE, /* 0x0c */ + FC_ENUM16, /* 0x0d */ + FC_ENUM32, /* 0x0e */ + FC_IGNORE, /* 0x0f */ + FC_ERROR_STATUS_T, /* 0x10 */ + + FC_RP, /* 0x11 */ /* reference pointer */ + FC_UP, /* 0x12 */ /* unique pointer */ + FC_OP, /* 0x13 */ /* object pointer */ + FC_FP, /* 0x14 */ /* full pointer */ + + FC_STRUCT, /* 0x15 */ /* simple structure */ + FC_PSTRUCT, /* 0x16 */ /* simple structure w/ pointers */ + FC_CSTRUCT, /* 0x17 */ /* conformant structure */ + FC_CPSTRUCT, /* 0x18 */ /* conformant structure w/ pointers */ + FC_CVSTRUCT, /* 0x19 */ /* conformant varying struct */ + FC_BOGUS_STRUCT, /* 0x1a */ /* complex structure */ + + FC_CARRAY, /* 0x1b */ /* conformant array */ + FC_CVARRAY, /* 0x1c */ /* conformant varying array */ + FC_SMFARRAY, /* 0x1d */ /* small (<64K) fixed array */ + FC_LGFARRAY, /* 0x1e */ /* large (>= 64k) fixed array */ + FC_SMVARRAY, /* 0x1f */ /* small (<64k) varying array */ + FC_LGVARRAY, /* 0x20 */ /* large (>= 64k) varying array */ + FC_BOGUS_ARRAY, /* 0x21 */ /* complex array */ +} FORMAT_CHARACTER; + +/* flags for all handle types */ +#define HANDLE_PARAM_IS_VIA_PTR 0x80 +#define HANDLE_PARAM_IS_IN 0x40 +#define HANDLE_PARAM_IS_OUT 0x20 +#define HANDLE_PARAM_IS_RETURN 0x10 + +/* flags for context handles */ +#define NDR_STRICT_CONTEXT_HANDLE 0x08 +#define NDR_CONTEXT_HANDLE_NOSERIALIZE 0x04 +#define NDR_CONTEXT_HANDLE_SERIALIZE 0x02 +#define NDR_CONTEXT_HANDLE_CANNOT_BE_NULL 0x01 + + #endif Modified: trunk/reactos/include/psdk/ntsecapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntsecapi.h?re… ============================================================================== --- trunk/reactos/include/psdk/ntsecapi.h (original) +++ trunk/reactos/include/psdk/ntsecapi.h Wed Oct 11 15:44:40 2006 @@ -123,11 +123,11 @@ #define TRUST_TYPE_MIT 3 #define TRUST_TYPE_DCE 4 -#if !defined(_NTDEF_H) && !defined(_SUBAUTH_H) +#if !defined(_NTDEF_) typedef LONG NTSTATUS, *PNTSTATUS; #endif -#if defined (_NTDEF_H) +#if defined (_NTDEF_) typedef UNICODE_STRING LSA_UNICODE_STRING, *PLSA_UNICODE_STRING; typedef STRING LSA_STRING, *PLSA_STRING; typedef OBJECT_ATTRIBUTES LSA_OBJECT_ATTRIBUTES, *PLSA_OBJECT_ATTRIBUTES; @@ -157,6 +157,9 @@ PVOID SecurityDescriptor; PVOID SecurityQualityOfService; } LSA_OBJECT_ATTRIBUTES, *PLSA_OBJECT_ATTRIBUTES; + +typedef LSA_UNICODE_STRING UNICODE_STRING, *PUNICODE_STRING; +typedef LSA_STRING STRING, *PSTRING ; #endif @@ -374,13 +377,6 @@ LONG DomainIndex; } LSA_TRANSLATED_NAME, *PLSA_TRANSLATED_NAME; -#if !defined(_NTDEF_) && !defined(UNICODE_STRING) -typedef LSA_UNICODE_STRING UNICODE_STRING, *PUNICODE_STRING; -#endif -#if !defined(_NTDEF_) && !defined(STRING) -typedef LSA_STRING STRING, *PSTRING ; -#endif - typedef struct _MSV1_0_INTERACTIVE_LOGON { MSV1_0_LOGON_SUBMIT_TYPE MessageType; UNICODE_STRING LogonDomainName; Modified: trunk/reactos/include/psdk/rpcndr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/rpcndr.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/rpcndr.h (original) +++ trunk/reactos/include/psdk/rpcndr.h Wed Oct 11 15:44:40 2006 @@ -12,6 +12,13 @@ extern "C" { #endif #include <objfwd.h> + +#ifdef CONST_VTABLE +#define CONST_VTBL const +#else +#define CONST_VTBL +#endif + #define TARGET_IS_NT50_OR_LATER 1 #define TARGET_IS_NT40_OR_LATER 1 #define TARGET_IS_NT351_OR_WIN95_OR_LATER 1 Modified: trunk/reactos/include/psdk/schannel.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/schannel.h?re… ============================================================================== --- trunk/reactos/include/psdk/schannel.h (original) +++ trunk/reactos/include/psdk/schannel.h Wed Oct 11 15:44:40 2006 @@ -10,11 +10,24 @@ extern "C" { #endif +#define SCHANNEL_NAME_A "Schannel" +#define SCHANNEL_NAME_W L"Schannel" +#ifdef UNICODE +#define SCHANNEL_NAME SCHANNEL_NAME_W +#else +#define SCHANNEL_NAME SCHANNEL_NAME_A +#endif + +#define SCH_CRED_V1 1 +#define SCH_CRED_V2 2 +#define SCH_CRED_VERSION 2 +#define SCH_CRED_V3 3 #define SCHANNEL_CRED_VERSION 4 -#define SCHANNEL_SHUTDOWN 1 -/* ? Do these belong here or in wincrypt.h */ -#define AUTHTYPE_CLIENT 1 -#define AUTHTYPE_SERVER 2 + +#define SCHANNEL_RENEGOTIATE 0 +#define SCHANNEL_SHUTDOWN 1 +#define SCHANNEL_ALERT 2 +#define SCHANNEL_SESSION 3 #define SP_PROT_TLS1_CLIENT 128 #define SP_PROT_TLS1_SERVER 64 @@ -22,65 +35,96 @@ #define SP_PROT_SSL3_SERVER 16 #define SP_PROT_SSL2_CLIENT 8 #define SP_PROT_SSL2_SERVER 4 +#define SP_PROT_PCT1_CLIENT 2 #define SP_PROT_PCT1_SERVER 1 -#define SP_PROT_PCT1_CLIENT 2 -#define SP_PROT_PCT1 (SP_PROT_PCT1_CLIENT|SP_PROT_PCT1_SERVER) -#define SP_PROT_TLS1 (SP_PROT_TLS1_CLIENT|SP_PROT_TLS1_SERVER) -#define SP_PROT_SSL2 (SP_PROT_SSL2_CLIENT|SP_PROT_SSL2_SERVER) -#define SP_PROT_SSL3 (SP_PROT_SSL3_CLIENT|SP_PROT_SSL3_SERVER) +#define SP_PROT_TLS1 (SP_PROT_TLS1_CLIENT | SP_PROT_TLS1_SERVER) +#define SP_PROT_SSL3 (SP_PROT_SSL3_CLIENT | SP_PROT_SSL3_SERVER) +#define SP_PROT_SSL2 (SP_PROT_SSL2_CLIENT | SP_PROT_SSL2_SERVER) +#define SP_PROT_PCT1 (SP_PROT_PCT1_CLIENT | SP_PROT_PCT1_SERVER) -#define SCH_CRED_NO_SYSTEM_MAPPER 2 -#define SCH_CRED_NO_SERVERNAME_CHECK 4 -#define SCH_CRED_MANUAL_CRED_VALIDATION 8 -#define SCH_CRED_NO_DEFAULT_CREDS 16 -#define SCH_CRED_AUTO_CRED_VALIDATION 32 -#define SCH_CRED_REVOCATION_CHECK_CHAIN 512 -#define SCH_CRED_REVOCATION_CHECK_END_CERT 256 +#define SCH_CRED_NO_SYSTEM_MAPPER 2 +#define SCH_CRED_NO_SERVERNAME_CHECK 4 +#define SCH_CRED_MANUAL_CRED_VALIDATION 8 +#define SCH_CRED_NO_DEFAULT_CREDS 16 +#define SCH_CRED_AUTO_CRED_VALIDATION 32 +#define SCH_CRED_USE_DEFAULT_CREDS 64 +#define SCH_CRED_REVOCATION_CHECK_CHAIN_END_CERT 256 +#define SCH_CRED_REVOCATION_CHECK_CHAIN 512 #define SCH_CRED_REVOCATION_CHECK_CHAIN_EXCLUDE_ROOT 1024 -#define SCH_CRED_IGNORE_NO_REVOCATION_CHECK 2048 -#define SCH_CRED_IGNORE_REVOCATION_OFFLINE 4096 -#define SCH_CRED_USE_DEFAULT_CREDS 64 +#define SCH_CRED_IGNORE_NO_REVOCATION_CHECK 2048 +#define SCH_CRED_IGNORE_REVOCATION_OFFLINE 4096 -typedef struct _SCHANNEL_CRED { - DWORD dwVersion; - DWORD cCreds; - PCCERT_CONTEXT* paCred; - HCERTSTORE hRootStore; - DWORD cMappers; - struct _HMAPPER** aphMappers; - DWORD cSupportedAlgs; - ALG_ID* palgSupportedAlgs; - DWORD grbitEnabledProtocols; - DWORD dwMinimumCypherStrength; - DWORD dwMaximumCypherStrength; - DWORD dwSessionLifespan; - DWORD dwFlags; - DWORD reserved; +#define SECPKG_ATTR_ISSUER_LIST 0x50 +#define SECPKG_ATTR_REMOTE_CRED 0x51 +#define SECPKG_ATTR_LOCAL_CRED 0x52 +#define SECPKG_ATTR_REMOTE_CERT_CONTEXT 0x53 +#define SECPKG_ATTR_LOCAL_CERT_CONTEXT 0x54 +#define SECPKG_ATTR_ROOT_STORE 0x55 +#define SECPKG_ATTR_SUPPORTED_ALGS 0x56 +#define SECPKG_ATTR_CIPHER_STRENGTHS 0x57 +#define SECPKG_ATTR_SUPPORTED_PROTOCOLS 0x58 +#define SECPKG_ATTR_ISSUER_LIST_EX 0x59 +#define SECPKG_ATTR_CONNECTION_INFO 0x5a +#define SECPKG_ATTR_EAP_KEY_BLOCK 0x5b +#define SECPKG_ATTR_MAPPED_CRED_ATTR 0x5c +#define SECPKG_ATTR_SESSION_INFO 0x5d +#define SECPKG_ATTR_APP_DATA 0x5e + +#define UNISP_RPC_ID 14 + +struct _HMAPPER; + +typedef struct _SCHANNEL_CRED +{ + DWORD dwVersion; + DWORD cCreds; + PCCERT_CONTEXT *paCred; + HCERTSTORE hRootStore; + DWORD cMappers; + struct _HMAPPER **aphMappers; + DWORD cSupportedAlgs; + ALG_ID *palgSupportedAlgs; + DWORD grbitEnabledProtocols; + DWORD dwMinimumCipherStrength; + DWORD dwMaximumCipherStrength; + DWORD dwSessionLength; + DWORD dwFlags; + DWORD reserved; } SCHANNEL_CRED, *PSCHANNEL_CRED; -typedef struct _SecPkgCred_SupportedAlgs { - DWORD cSupportedAlgs; - ALG_ID* palgSupportedAlgs; + +typedef struct _SecPkgCred_SupportedAlgs +{ + DWORD cSupportedAlgs; + ALG_ID *palgSupportedAlgs; } SecPkgCred_SupportedAlgs, *PSecPkgCred_SupportedAlgs; -typedef struct _SecPkgCred_CypherStrengths { - DWORD dwMinimumCypherStrength; - DWORD dwMaximumCypherStrength; -} SecPkgCred_CypherStrengths, *PSecPkgCred_CypherStrengths; -typedef struct _SecPkgCred_SupportedProtocols { - DWORD grbitProtocol; + +typedef struct _SecPkgCred_CipherStrengths +{ + DWORD dwMinimumCipherStrength; + DWORD dwMaximumCipherStrength; +} SecPkgCred_CipherStrengths, *PSecPkgCred_CipherStrengths; + +typedef struct _SecPkgCred_SupportedProtocols +{ + DWORD grbitProtocol; } SecPkgCred_SupportedProtocols, *PSecPkgCred_SupportedProtocols; -typedef struct _SecPkgContext_IssuerListInfoEx { - PCERT_NAME_BLOB aIssuers; - DWORD cIssuers; + +typedef struct _SecPkgContext_IssuerListInfoEx +{ + PCERT_NAME_BLOB aIssuers; + DWORD cIssuers; } SecPkgContext_IssuerListInfoEx, *PSecPkgContext_IssuerListInfoEx; -typedef struct _SecPkgContext_ConnectionInfo { - DWORD dwProtocol; - ALG_ID aiCipher; - DWORD dwCipherStrength; - ALG_ID aiHash; - DWORD dwHashStrength; - ALG_ID aiExch; - DWORD dwExchStrength; + +typedef struct _SecPkgContext_ConnectionInfo +{ + DWORD dwProtocol; + ALG_ID aiCipher; + DWORD dwCipherStrength; + ALG_ID aiHash; + DWORD dwHashStrength; + ALG_ID aiExch; + DWORD dwExchStrength; } SecPkgContext_ConnectionInfo, *PSecPkgContext_ConnectionInfo; #ifdef __cplusplus Modified: trunk/reactos/include/psdk/security.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/security.h?re… ============================================================================== --- trunk/reactos/include/psdk/security.h (original) +++ trunk/reactos/include/psdk/security.h Wed Oct 11 15:44:40 2006 @@ -4,37 +4,6 @@ #pragma GCC system_header #endif - -#define SEC_E_OK 0 -#define SEC_E_CERT_EXPIRED (-2146893016) -#define SEC_E_INCOMPLETE_MESSAGE (-2146893032) -#define SEC_E_INSUFFICIENT_MEMORY (-2146893056) -#define SEC_E_INTERNAL_ERROR (-2146893052) -#define SEC_E_INVALID_HANDLE (-2146893055) -#define SEC_E_INVALID_TOKEN (-2146893048) -#define SEC_E_LOGON_DENIED (-2146893044) -#define SEC_E_NO_AUTHENTICATING_AUTHORITY (-2146893039) -#define SEC_E_NO_CREDENTIALS (-2146893042) -#define SEC_E_TARGET_UNKNOWN (-2146893053) -#define SEC_E_UNSUPPORTED_FUNCTION (-2146893054) -#define SEC_E_UNTRUSTED_ROOT (-2146893019) -#define SEC_E_WRONG_PRINCIPAL (-2146893022) -#define SEC_E_SECPKG_NOT_FOUND (-2146893051) -#define SEC_E_QOP_NOT_SUPPORTED (-2146893046) -#define SEC_E_UNKNOWN_CREDENTIALS (-2146893043) -#define SEC_E_NOT_OWNER (-2146893050) -#define SEC_I_RENEGOTIATE 590625 -#define SEC_I_COMPLETE_AND_CONTINUE 590612 -#define SEC_I_COMPLETE_NEEDED 590611 -#define SEC_I_CONTINUE_NEEDED 590610 -#define SEC_I_INCOMPLETE_CREDENTIALS 590624 - -/* always a char */ -typedef char SEC_CHAR; -typedef wchar_t SEC_WCHAR; -typedef long SECURITY_STATUS; -#define SEC_FAR - #include <sspi.h> #include <ntsecpkg.h> #include <secext.h> Modified: trunk/reactos/include/psdk/winbase.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winbase.h?rev… ============================================================================== --- trunk/reactos/include/psdk/winbase.h (original) +++ trunk/reactos/include/psdk/winbase.h Wed Oct 11 15:44:40 2006 @@ -788,6 +788,9 @@ WORD wSecond; WORD wMilliseconds; } SYSTEMTIME,*LPSYSTEMTIME,*PSYSTEMTIME; +#if (_WIN32_WINNT >= 0x0500) +typedef WAITORTIMERCALLBACKFUNC WAITORTIMERCALLBACK ; +#endif typedef struct _WIN32_FILE_ATTRIBUTE_DATA { DWORD dwFileAttributes; FILETIME ftCreationTime; @@ -1144,6 +1147,9 @@ BOOL WINAPI Beep(DWORD,DWORD); HANDLE WINAPI BeginUpdateResourceA(LPCSTR,BOOL); HANDLE WINAPI BeginUpdateResourceW(LPCWSTR,BOOL); +#if (_WIN32_WINNT >= 0x0500) +BOOL WINAPI BindIoCompletionCallback(HANDLE,LPOVERLAPPED_COMPLETION_ROUTINE,ULONG); +#endif BOOL WINAPI BuildCommDCBA(LPCSTR,LPDCB); BOOL WINAPI BuildCommDCBW(LPCWSTR,LPDCB); BOOL WINAPI BuildCommDCBAndTimeoutsA(LPCSTR,LPDCB,LPCOMMTIMEOUTS); @@ -1837,6 +1843,9 @@ BOOL WINAPI QueryPerformanceCounter(PLARGE_INTEGER); BOOL WINAPI QueryPerformanceFrequency(PLARGE_INTEGER); DWORD WINAPI QueueUserAPC(PAPCFUNC,HANDLE,DWORD); +#if (_WIN32_WINNT >= 0x0500) +BOOL WINAPI QueueUserWorkItem(LPTHREAD_START_ROUTINE,PVOID,ULONG); +#endif void WINAPI RaiseException(DWORD,DWORD,DWORD,const ULONG_PTR*); BOOL WINAPI ReadDirectoryChangesW(HANDLE,PVOID,DWORD,BOOL,DWORD,PDWORD,LPOVERLAPPED,LPOVERLAPPED_COMPLETION_ROUTINE); BOOL WINAPI ReadEventLogA(HANDLE,DWORD,DWORD,PVOID,DWORD,DWORD *,DWORD *); @@ -1853,6 +1862,10 @@ #endif HANDLE WINAPI RegisterEventSourceA (LPCSTR,LPCSTR); HANDLE WINAPI RegisterEventSourceW(LPCWSTR,LPCWSTR); +#if (_WIN32_WINNT >= 0x0500) +BOOL WINAPI RegisterWaitForSingleObject(PHANDLE,HANDLE,WAITORTIMERCALLBACK,PVOID,ULONG,ULONG); +HANDLE WINAPI RegisterWaitForSingleObjectEx(HANDLE,WAITORTIMERCALLBACK,PVOID,ULONG,ULONG); +#endif #if (_WIN32_WINNT >= 0x0501) void WINAPI ReleaseActCtx(HANDLE); #endif @@ -2007,6 +2020,7 @@ #define UnlockSegment(w) GlobalUnfix((HANDLE)(w)) /* Obsolete: Has no effect. */ BOOL WINAPI UnmapViewOfFile(PVOID); #if (_WIN32_WINNT >= 0x0500) +BOOL WINAPI UnregisterWait(HANDLE); BOOL WINAPI UnregisterWaitEx(HANDLE,HANDLE); #endif BOOL WINAPI UpdateResourceA(HANDLE,LPCSTR,LPCSTR,WORD,PVOID,DWORD); Modified: trunk/reactos/include/psdk/winerror.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winerror.h?re… ============================================================================== --- trunk/reactos/include/psdk/winerror.h (original) +++ trunk/reactos/include/psdk/winerror.h Wed Oct 11 15:44:40 2006 @@ -416,14 +416,31 @@ #define ERROR_PKINIT_FAILURE 1263L #define ERROR_SMARTCARD_SUBSYSTEM_FAILURE 1264L #define ERROR_DOWNGRADE_DETECTED 1265L -/* wrong: */ -#if 0 -#define SEC_E_SMARTCARD_CERT_REVOKED 1266L -#define SEC_E_ISSUING_CA_UNTRUSTED 1267L -#define SEC_E_REVOCATION_OFFLINE_C 1268L -#define SEC_E_PKINIT_CLIENT_FAILUR 1269L -#define SEC_E_SMARTCARD_CERT_EXPIRED 1270L -#endif + +#define SEC_E_OK 0 +#define SEC_E_CERT_EXPIRED (-2146893016) +#define SEC_E_INCOMPLETE_MESSAGE (-2146893032) +#define SEC_E_INSUFFICIENT_MEMORY (-2146893056) +#define SEC_E_INTERNAL_ERROR (-2146893052) +#define SEC_E_INVALID_HANDLE (-2146893055) +#define SEC_E_INVALID_TOKEN (-2146893048) +#define SEC_E_LOGON_DENIED (-2146893044) +#define SEC_E_NO_AUTHENTICATING_AUTHORITY (-2146893039) +#define SEC_E_NO_CREDENTIALS (-2146893042) +#define SEC_E_TARGET_UNKNOWN (-2146893053) +#define SEC_E_UNSUPPORTED_FUNCTION (-2146893054) +#define SEC_E_UNTRUSTED_ROOT (-2146893019) +#define SEC_E_WRONG_PRINCIPAL (-2146893022) +#define SEC_E_SECPKG_NOT_FOUND (-2146893051) +#define SEC_E_QOP_NOT_SUPPORTED (-2146893046) +#define SEC_E_UNKNOWN_CREDENTIALS (-2146893043) +#define SEC_E_NOT_OWNER (-2146893050) +#define SEC_I_RENEGOTIATE 590625 +#define SEC_I_COMPLETE_AND_CONTINUE 590612 +#define SEC_I_COMPLETE_NEEDED 590611 +#define SEC_I_CONTINUE_NEEDED 590610 +#define SEC_I_INCOMPLETE_CREDENTIALS 590624 + #define ERROR_MACHINE_LOCKED 1271L #define ERROR_CALLBACK_SUPPLIED_INVALID_DATA 1273L #define ERROR_SYNC_FOREGROUND_REFRESH_REQUIRED 1274L @@ -1911,6 +1928,7 @@ #define CO_E_INIT_SCM_EXEC_FAILURE ((HRESULT)0x80004011L) #define CO_E_INIT_ONLY_SINGLE_THREADED ((HRESULT)0x80004012L) #define S_OK ((HRESULT)0x00000000L) +#define SEC_E_OK ((HRESULT)0x00000000L) #define S_FALSE ((HRESULT)0x00000001L) #define OLE_E_FIRST ((HRESULT)0x80040000L) #define OLE_E_LAST ((HRESULT)0x800400FFL) Modified: trunk/reactos/include/psdk/winsock2.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winsock2.h?re… ============================================================================== --- trunk/reactos/include/psdk/winsock2.h (original) +++ trunk/reactos/include/psdk/winsock2.h Wed Oct 11 15:44:40 2006 @@ -380,6 +380,7 @@ #define MSG_OOB 1 #define MSG_PEEK 2 #define MSG_DONTROUTE 4 +#define MSG_WAITALL 8 #endif /* ! (__INSIDE_CYGWIN__ || __INSIDE_MSYS__) */ #define MSG_MAXIOVLEN 16 #define MSG_PARTIAL 0x8000 Modified: trunk/reactos/include/psdk/ws2tcpip.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ws2tcpip.h?re… ============================================================================== --- trunk/reactos/include/psdk/ws2tcpip.h (original) +++ trunk/reactos/include/psdk/ws2tcpip.h Wed Oct 11 15:44:40 2006 @@ -292,8 +292,42 @@ int WSAAPI getaddrinfo (const char*,const char*,const struct addrinfo*, struct addrinfo**); -char* WSAAPI gai_strerrorA(int); -WCHAR* WSAAPI gai_strerrorW(int); +#define GAI_STRERROR_BUFFER_SIZE 1024 + +static __inline char* +gai_strerrorA(int ecode) +{ + static char buff[GAI_STRERROR_BUFFER_SIZE + 1]; + + FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS | FORMAT_MESSAGE_MAX_WIDTH_MASK, + NULL, + ecode, + MAKELANGID(LANG_NEUTRAL, + SUBLANG_DEFAULT), + (LPSTR)buff, + GAI_STRERROR_BUFFER_SIZE, + NULL); + + return buff; +} + +static __inline WCHAR* +gai_strerrorW(int ecode) +{ + static WCHAR buff[GAI_STRERROR_BUFFER_SIZE + 1]; + + FormatMessageW(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS | FORMAT_MESSAGE_MAX_WIDTH_MASK, + NULL, + ecode, + MAKELANGID(LANG_NEUTRAL, + SUBLANG_DEFAULT), + (LPWSTR)buff, + GAI_STRERROR_BUFFER_SIZE, + NULL); + + return buff; +} + #ifdef UNICODE #define gai_strerror gai_strerrorW #else Modified: trunk/reactos/include/reactos/wine/rpcfc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/rpcfc… ============================================================================== --- trunk/reactos/include/reactos/wine/rpcfc.h (original) +++ trunk/reactos/include/reactos/wine/rpcfc.h Wed Oct 11 15:44:40 2006 @@ -88,7 +88,13 @@ #define RPC_FC_ALIGNM4 0x38 #define RPC_FC_ALIGNM8 0x39 +#define RPC_FC_STRUCTPAD1 0x3d #define RPC_FC_STRUCTPAD2 0x3e +#define RPC_FC_STRUCTPAD3 0x3f +#define RPC_FC_STRUCTPAD4 0x40 +#define RPC_FC_STRUCTPAD5 0x41 +#define RPC_FC_STRUCTPAD6 0x42 +#define RPC_FC_STRUCTPAD7 0x43 #define RPC_FC_STRING_SIZED 0x44

1 0

[weiden] 24484: Fix polling of ShutdownNotify
by weiden＠svn.reactos.org 11 Oct '06

11 Oct '06

Author: weiden Date: Wed Oct 11 14:34:36 2006 New Revision: 24484 URL: http://svn.reactos.org/svn/reactos?rev=24484&view=rev Log: Fix polling of ShutdownNotify Modified: trunk/reactos/drivers/base/bootvid/bootvid.c Modified: trunk/reactos/drivers/base/bootvid/bootvid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/bootv… ============================================================================== --- trunk/reactos/drivers/base/bootvid/bootvid.c (original) +++ trunk/reactos/drivers/base/bootvid/bootvid.c Wed Oct 11 14:34:36 2006 @@ -33,7 +33,7 @@ /* GLOBALS *******************************************************************/ -static LONG ShutdownNotify; +static volatile LONG ShutdownNotify; static KEVENT ShutdownCompleteEvent; /* DATA **********************************************************************/

1 0

[fireball] 24483: - Add global var for keeping size of NLS data in pages - Restructure memory-map building loop to create special descriptor for NLS data - Fix a bug in memory-map building loop which lead to not covering last XXX pages of memory
by fireball＠svn.reactos.org 10 Oct '06

10 Oct '06

Author: fireball Date: Tue Oct 10 19:20:03 2006 New Revision: 24483 URL: http://svn.reactos.org/svn/reactos?rev=24483&view=rev Log: - Add global var for keeping size of NLS data in pages - Restructure memory-map building loop to create special descriptor for NLS data - Fix a bug in memory-map building loop which lead to not covering last XXX pages of memory Modified: trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c (contents, props changed) trunk/reactos/boot/freeldr/freeldr/windows/wlregistry.c 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 Tue Oct 10 19:20:03 2006 @@ -1,948 +1,991 @@ -/* - * PROJECT: EFI Windows Loader - * LICENSE: GPL - See COPYING in the top level directory - * FILE: freeldr/winldr/wlmemory.c - * PURPOSE: Memory related routines - * PROGRAMMERS: Aleksey Bragin (aleksey(a)reactos.org) - */ - -/* INCLUDES ***************************************************************/ - -#include <freeldr.h> - -#include <ndk/asm.h> - -#define NDEBUG -#include <debug.h> - -// This is needed because headers define wrong one for ReactOS -#undef KIP0PCRADDRESS -#define KIP0PCRADDRESS 0xffdff000 - -// -// This is the zone which is used by the OS loader -// -#define LOADER_HIGH_ZONE ((16*1024*1024) >> MM_PAGE_SHIFT) //16Mb page - -#define HYPER_SPACE_ENTRY 0x300 - -//TODO: Check if this is correct -PCHAR MemTypeDesc[] = { - "ExceptionBlock ", - "SystemBlock ", - "Free ", - "Bad ", - "LoadedProgram ", - "FirmwareTemporary ", - "FirmwarePermanent ", - "OsloaderHeap ", - "OsloaderStack ", - "SystemCode ", - "HalCode ", - "BootDriver ", - "ConsoleInDriver ", - "ConsoleOutDriver ", - "StartupDpcStack ", - "StartupKernelStack", - "StartupPanicStack ", - "StartupPcrPage ", - "StartupPdrPage ", - "RegistryData ", - "MemoryData ", - "NlsData ", - "SpecialMemory ", - "BBTMemory ", - "Maximum " - }; - -VOID -WinLdrpDumpMemoryDescriptors(PLOADER_PARAMETER_BLOCK LoaderBlock); - - -VOID -MempAddMemoryBlock(IN OUT PLOADER_PARAMETER_BLOCK LoaderBlock, - UINT64 BasePage, - UINT64 PageCount, - ULONG Type); -VOID -WinLdrInsertDescriptor(IN OUT PLOADER_PARAMETER_BLOCK LoaderBlock, - IN PMEMORY_ALLOCATION_DESCRIPTOR NewDescriptor); - -VOID -WinLdrRemoveDescriptor(IN PMEMORY_ALLOCATION_DESCRIPTOR Descriptor); - -VOID -WinLdrSetProcessorContext(PVOID GdtIdt, IN ULONG Pcr, IN ULONG Tss); - -// This is needed only for SetProcessorContext routine -#pragma pack(2) - typedef struct - { - USHORT Limit; - ULONG Base; - } GDTIDT; -#pragma pack(4) - -// this is needed for new IDT filling -#if 0 -extern ULONG_PTR i386DivideByZero; -extern ULONG_PTR i386DebugException; -extern ULONG_PTR i386NMIException; -extern ULONG_PTR i386Breakpoint; -extern ULONG_PTR i386Overflow; -extern ULONG_PTR i386BoundException; -extern ULONG_PTR i386InvalidOpcode; -extern ULONG_PTR i386FPUNotAvailable; -extern ULONG_PTR i386DoubleFault; -extern ULONG_PTR i386CoprocessorSegment; -extern ULONG_PTR i386InvalidTSS; -extern ULONG_PTR i386SegmentNotPresent; -extern ULONG_PTR i386StackException; -extern ULONG_PTR i386GeneralProtectionFault; -extern ULONG_PTR i386PageFault; // exc 14 -extern ULONG_PTR i386CoprocessorError; // exc 16 -extern ULONG_PTR i386AlignmentCheck; // exc 17 -#endif - -/* GLOBALS ***************************************************************/ - -PHARDWARE_PTE PDE; -PHARDWARE_PTE HalPT; - -PUCHAR PhysicalPageTablesBuffer; -PUCHAR KernelPageTablesBuffer; -ULONG PhysicalPageTables; -ULONG KernelPageTables; - -MEMORY_ALLOCATION_DESCRIPTOR Mad[1024]; -ULONG MadCount = 0; - - -/* FUNCTIONS **************************************************************/ - -BOOLEAN -MempAllocatePageTables() -{ - ULONG NumPageTables, TotalSize; - PUCHAR Buffer; - // It's better to allocate PDE + PTEs contigiuos - - // Max number of entries = MaxPageNum >> 10 - // FIXME: This is a number to describe ALL physical memory - // and windows doesn't expect ALL memory mapped... - NumPageTables = (GetSystemMemorySize() >> MM_PAGE_SHIFT) >> 10; - - DbgPrint((DPRINT_WINDOWS, "NumPageTables = %d\n", NumPageTables)); - - // Allocate memory block for all these things: - // PDE, HAL mapping page table, physical mapping, kernel mapping - TotalSize = (1+1+NumPageTables*2)*MM_PAGE_SIZE; - Buffer = MmAllocateMemory(TotalSize); - - if (Buffer == NULL) - { - UiMessageBox("Impossible to allocate memory block for page tables!"); - return FALSE; - } - - // Zero all this memory block - RtlZeroMemory(Buffer, TotalSize); - - // Set up pointers correctly now - PDE = (PHARDWARE_PTE)Buffer; - - // Map the page directory at 0xC0000000 (maps itself) - PDE[HYPER_SPACE_ENTRY].PageFrameNumber = (ULONG)PDE >> MM_PAGE_SHIFT; - PDE[HYPER_SPACE_ENTRY].Valid = 1; - PDE[HYPER_SPACE_ENTRY].Write = 1; - - // The last PDE slot is allocated for HAL's memory mapping (Virtual Addresses 0xFFC00000 - 0xFFFFFFFF) - HalPT = (PHARDWARE_PTE)&Buffer[MM_PAGE_SIZE*1]; - - // Map it - PDE[1023].PageFrameNumber = (ULONG)HalPT >> MM_PAGE_SHIFT; - PDE[1023].Valid = 1; - PDE[1023].Write = 1; - - // Store pointers to the tables for easier access - PhysicalPageTablesBuffer = &Buffer[MM_PAGE_SIZE*2]; - KernelPageTablesBuffer = PhysicalPageTablesBuffer + NumPageTables*MM_PAGE_SIZE; - - // Zero counters of page tables used - PhysicalPageTables = 0; - KernelPageTables = 0; - - return TRUE; -} - -VOID -MempAllocatePTE(ULONG Entry, PHARDWARE_PTE *PhysicalPT, PHARDWARE_PTE *KernelPT) -{ - //Print(L"Creating PDE Entry %X\n", Entry); - - // Identity mapping - *PhysicalPT = (PHARDWARE_PTE)&PhysicalPageTablesBuffer[PhysicalPageTables*MM_PAGE_SIZE]; - PhysicalPageTables++; - - PDE[Entry].PageFrameNumber = (ULONG)*PhysicalPT >> MM_PAGE_SHIFT; - PDE[Entry].Valid = 1; - PDE[Entry].Write = 1; - - if (Entry+(KSEG0_BASE >> 22) > 1023) - { - DbgPrint((DPRINT_WINDOWS, "WARNING! Entry: %X > 1023\n", Entry+(KSEG0_BASE >> 22))); - } - - // Kernel-mode mapping - *KernelPT = (PHARDWARE_PTE)&KernelPageTablesBuffer[KernelPageTables*MM_PAGE_SIZE]; - KernelPageTables++; - - PDE[Entry+(KSEG0_BASE >> 22)].PageFrameNumber = ((ULONG)*KernelPT >> MM_PAGE_SHIFT); - PDE[Entry+(KSEG0_BASE >> 22)].Valid = 1; - PDE[Entry+(KSEG0_BASE >> 22)].Write = 1; -} - -BOOLEAN -MempSetupPaging(IN ULONG StartPage, - IN ULONG NumberOfPages) -{ - PHARDWARE_PTE PhysicalPT; - PHARDWARE_PTE KernelPT; - ULONG Entry, Page; - - //Print(L"MempSetupPaging: SP 0x%X, Number: 0x%X\n", StartPage, NumberOfPages); - - // HACK - if (StartPage+NumberOfPages >= 0x80000) - { - // - // We can't map this as it requires more than 1 PDE - // and in fact it's not possible at all ;) - // - //Print(L"skipping...\n"); - return TRUE; - } - - // - // Now actually set up the page tables for identity mapping - // - for (Page=StartPage; Page < StartPage+NumberOfPages; Page++) - { - Entry = Page >> 10; - - if (((PULONG)PDE)[Entry] == 0) - { - MempAllocatePTE(Entry, &PhysicalPT, &KernelPT); - } - else - { - PhysicalPT = (PHARDWARE_PTE)(PDE[Entry].PageFrameNumber << MM_PAGE_SHIFT); - KernelPT = (PHARDWARE_PTE)(PDE[Entry+(KSEG0_BASE >> 22)].PageFrameNumber << MM_PAGE_SHIFT); - } - - if (Page == 0) - { - PhysicalPT[Page & 0x3ff].PageFrameNumber = Page; - PhysicalPT[Page & 0x3ff].Valid = 0; - PhysicalPT[Page & 0x3ff].Write = 0; - - KernelPT[Page & 0x3ff].PageFrameNumber = Page; - KernelPT[Page & 0x3ff].Valid = 0; - KernelPT[Page & 0x3ff].Write = 0; - } - else - { - PhysicalPT[Page & 0x3ff].PageFrameNumber = Page; - PhysicalPT[Page & 0x3ff].Valid = 1; - PhysicalPT[Page & 0x3ff].Write = 1; - - KernelPT[Page & 0x3ff].PageFrameNumber = Page; - KernelPT[Page & 0x3ff].Valid = 1; - KernelPT[Page & 0x3ff].Write = 1; - } - } - - return TRUE; -} - -VOID -MempAddMemoryBlock(IN OUT PLOADER_PARAMETER_BLOCK LoaderBlock, - UINT64 BasePage, - UINT64 PageCount, - ULONG Type) -{ - BOOLEAN Status; - - // - // Check for some weird stuff at the top - // - if (BasePage + PageCount > 0xF0000) - { - // - // Just skip this, without even adding to MAD list - // - return; - } - - // - // Base page and page count are always set - // - Mad[MadCount].BasePage = BasePage; - Mad[MadCount].PageCount = PageCount; - - // - // 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) - { - Mad[MadCount].MemoryType = LoaderFirmwareTemporary; - - WinLdrInsertDescriptor(LoaderBlock, &Mad[MadCount]); - MadCount++; - - Status = MempSetupPaging(BasePage, PageCount); - if (!Status) - { - DbgPrint((DPRINT_WINDOWS, "Error during WinLdrpSetupPaging\n")); - return; - } - return; - } - - if (BasePage == 0xFFF && PageCount == 1) - { - Mad[MadCount].MemoryType = LoaderSpecialMemory; - - WinLdrInsertDescriptor(LoaderBlock, &Mad[MadCount]); - MadCount++; - - // - // Map it - // - Status = MempSetupPaging(BasePage, PageCount); - if (!Status) - { - DbgPrint((DPRINT_WINDOWS, "Error during MempSetupPaging\n")); - return; - } - } - else if (BasePage == 0 && PageCount == 1) - { - Mad[MadCount].MemoryType = LoaderFirmwarePermanent; - - WinLdrInsertDescriptor(LoaderBlock, &Mad[MadCount]); - MadCount++; - - // - // Map it - // - Status = MempSetupPaging(BasePage, PageCount); - if (!Status) - { - DbgPrint((DPRINT_WINDOWS, "Error during MempSetupPaging\n")); - return; - } - } - else - { - // - // Now choose memory type as usual. FIXME!!! - // - if (Type == 0) - { - Mad[MadCount].MemoryType = LoaderFree; - } - else if (Type != 0 && Type != 1) - { - Mad[MadCount].MemoryType = LoaderFirmwarePermanent; - } - else if (Type == 1) - { - Mad[MadCount].MemoryType = LoaderSystemCode; - } - else - { - Mad[MadCount].MemoryType = LoaderFirmwarePermanent; - } - - // - // Add descriptor - // - WinLdrInsertDescriptor(LoaderBlock, &Mad[MadCount]); - MadCount++; - - // - // Map it - // - Status = MempSetupPaging(BasePage, PageCount); - if (!Status) - { - DbgPrint((DPRINT_WINDOWS, "Error during MempSetupPaging\n")); - return; - } - } -} - -BOOLEAN -WinLdrTurnOnPaging(IN OUT PLOADER_PARAMETER_BLOCK LoaderBlock, - ULONG PcrBasePage, - ULONG TssBasePage, - PVOID GdtIdt) -{ - ULONG i, PagesCount; - ULONG LastPageIndex, LastPageType; - PPAGE_LOOKUP_TABLE_ITEM MemoryMap; - ULONG NoEntries; - PKTSS Tss; - - // - // Creating a suitable memory map for the Windows can be tricky, so let's - // give a few advices: - // 1) One must not map the whole available memory pages to PDE! - // Map only what's needed - 16Mb, 24Mb, 32Mb max I think, - // thus occupying 4, 6 or 8 PDE entries for identical mapping, - // the same quantity for KSEG0_BASE mapping, one more entry for - // hyperspace and one more entry for HAL physical pages mapping. - // 2) Memory descriptors must map *the whole* physical memory - // showing any memory above 16/24/32 as FirmwareTemporary - // - // 3) Overall memory blocks count must not exceed 30 - // - - // - // During MmInitMachineDependent, the kernel zeroes PDE at the following address - // 0xC0300000 - 0xC03007FC - // - // Then it finds the best place for non-paged pool: - // StartPde C0300F70, EndPde C0300FF8, NumberOfPages C13, NextPhysPage 3AD - // - - // Before we start mapping pages, create a block of memory, which will contain - // PDE and PTEs - if (MempAllocatePageTables() == FALSE) - return FALSE; - - // Setup an entry for each descriptor - MemoryMap = MmGetMemoryMap(&NoEntries); - if (MemoryMap == NULL) - { - UiMessageBox("Can not retrieve the current memory map"); - return FALSE; - } - - DbgPrint((DPRINT_WINDOWS, "Got memory map with %d entries\n")); - - // Construct a good memory map from what we've got - PagesCount = 1; - LastPageIndex = 0; - LastPageType = MemoryMap[0].PageAllocated; - for(i=1;i<NoEntries;i++) - { - if (MemoryMap[i].PageAllocated == LastPageType) - { - PagesCount++; - } - else - { - // Add the region - MempAddMemoryBlock(LoaderBlock, LastPageIndex, PagesCount, LastPageType); - - // Reset our counter vars - LastPageIndex = i; - LastPageType = MemoryMap[i].PageAllocated; - PagesCount = 1; - } - } - - DbgPrint((DPRINT_WINDOWS, "MadCount: %d\n", MadCount)); - - WinLdrpDumpMemoryDescriptors(LoaderBlock); //FIXME: Delete! - - // Map our loader image, so we can continue running - /*Status = MempSetupPaging(OsLoaderBase >> MM_PAGE_SHIFT, OsLoaderSize >> MM_PAGE_SHIFT); - if (!Status) - { - UiMessageBox("Error during MempSetupPaging"); - return; - }*/ - - //VideoDisplayString(L"Hello from VGA, going into the kernel\n"); - DbgPrint((DPRINT_WINDOWS, "HalPT: 0x%X\n", HalPT)); - - // Page Tables have been setup, make special handling for PCR and TSS - // (which is done in BlSetupFotNt in usual ntldr) - HalPT[(KI_USER_SHARED_DATA - 0xFFC00000) >> MM_PAGE_SHIFT].PageFrameNumber = PcrBasePage+1; - HalPT[(KI_USER_SHARED_DATA - 0xFFC00000) >> MM_PAGE_SHIFT].Valid = 1; - HalPT[(KI_USER_SHARED_DATA - 0xFFC00000) >> MM_PAGE_SHIFT].Write = 1; - - HalPT[(KIP0PCRADDRESS - 0xFFC00000) >> MM_PAGE_SHIFT].PageFrameNumber = PcrBasePage; - HalPT[(KIP0PCRADDRESS - 0xFFC00000) >> MM_PAGE_SHIFT].Valid = 1; - HalPT[(KIP0PCRADDRESS - 0xFFC00000) >> MM_PAGE_SHIFT].Write = 1; - - // Map VGA memory - //VideoMemoryBase = MmMapIoSpace(0xb8000, 4000, MmNonCached); - //DbgPrint((DPRINT_WINDOWS, "VideoMemoryBase: 0x%X\n", VideoMemoryBase)); - - Tss = (PKTSS)(KSEG0_BASE | (TssBasePage << MM_PAGE_SHIFT)); - - // Fill the memory descriptor list and - //PrepareMemoryDescriptorList(); - DbgPrint((DPRINT_WINDOWS, "Memory Descriptor List prepared, printing PDE\n")); - List_PaToVa(&LoaderBlock->MemoryDescriptorListHead); - - #if DEBUG - { - ULONG *PDE_Addr=(ULONG *)PDE;//0xC0300000; - int j; - - DbgPrint((DPRINT_WINDOWS, "\nPDE\n")); - - for (i=0; i<128; i++) - { - DbgPrint((DPRINT_WINDOWS, "0x%04X | ", i*8)); - - for (j=0; j<8; j++) - { - DbgPrint((DPRINT_WINDOWS, "0x%08X ", PDE_Addr[i*8+j])); - } - - DbgPrint((DPRINT_WINDOWS, "\n")); - } - } - #endif - - - // Enable paging - //BS->ExitBootServices(ImageHandle,MapKey); - - // Disable Interrupts - Ke386DisableInterrupts(); - - // Re-initalize EFLAGS - Ke386EraseFlags(); - - // Set the PDBR - Ke386SetPageTableDirectory((ULONG_PTR)PDE); - - // Enable paging by modifying CR0 - Ke386SetCr0(Ke386GetCr0() | CR0_PG); - - // Set processor context - WinLdrSetProcessorContext(GdtIdt, KIP0PCRADDRESS, KSEG0_BASE | (TssBasePage << MM_PAGE_SHIFT)); - - // Zero KI_USER_SHARED_DATA page - memset((PVOID)KI_USER_SHARED_DATA, 0, MM_PAGE_SIZE); - - return TRUE; -} - -// Two special things this func does: it sorts descriptors, -// and it merges free ones -VOID -WinLdrInsertDescriptor(IN OUT PLOADER_PARAMETER_BLOCK LoaderBlock, - IN PMEMORY_ALLOCATION_DESCRIPTOR NewDescriptor) -{ - PLIST_ENTRY ListHead = &LoaderBlock->MemoryDescriptorListHead; - PLIST_ENTRY PreviousEntry, NextEntry; - PMEMORY_ALLOCATION_DESCRIPTOR PreviousDescriptor = NULL, NextDescriptor = NULL; - - DbgPrint((DPRINT_WINDOWS, "BP=0x%X PC=0x%X %s\n", NewDescriptor->BasePage, - NewDescriptor->PageCount, MemTypeDesc[NewDescriptor->MemoryType])); - - /* Find a place where to insert the new descriptor to */ - PreviousEntry = ListHead; - NextEntry = ListHead->Flink; - while (NextEntry != ListHead) - { - NextDescriptor = CONTAINING_RECORD(NextEntry, - MEMORY_ALLOCATION_DESCRIPTOR, - ListEntry); - if (NewDescriptor->BasePage < NextDescriptor->BasePage) - break; - - PreviousEntry = NextEntry; - PreviousDescriptor = NextDescriptor; - NextEntry = NextEntry->Flink; - } - - /* Don't forget about merging free areas */ - if (NewDescriptor->MemoryType != LoaderFree) - { - /* Just insert, nothing to merge */ - InsertHeadList(PreviousEntry, &NewDescriptor->ListEntry); - } - else - { - /* Previous block also free? */ - if ((PreviousEntry != ListHead) && (PreviousDescriptor->MemoryType == LoaderFree) && - ((PreviousDescriptor->BasePage + PreviousDescriptor->PageCount) == - NewDescriptor->BasePage)) - { - /* Just enlarge previous descriptor's PageCount */ - PreviousDescriptor->PageCount += NewDescriptor->PageCount; - NewDescriptor = PreviousDescriptor; - } - else - { - /* Nope, just insert */ - InsertHeadList(PreviousEntry, &NewDescriptor->ListEntry); - } - - /* Next block is free ?*/ - if ((NextEntry != ListHead) && - (NextDescriptor->MemoryType == LoaderFree) && - ((NewDescriptor->BasePage + NewDescriptor->PageCount) == NextDescriptor->BasePage)) - { - /* Enlarge next descriptor's PageCount */ - NewDescriptor->PageCount += NextDescriptor->PageCount; - RemoveEntryList(&NextDescriptor->ListEntry); - } - } - - return; -} - -VOID -WinLdrSetProcessorContext(PVOID GdtIdt, IN ULONG Pcr, IN ULONG Tss) -{ - GDTIDT GdtDesc, IdtDesc, OldIdt; - PKGDTENTRY pGdt; - PKIDTENTRY pIdt; - ULONG Ldt = 0; - //ULONG i; - - DbgPrint((DPRINT_WINDOWS, "GDtIdt %p, Pcr %p, Tss 0x%08X\n", - GdtIdt, Pcr, Tss)); - - // Kernel expects the PCR to be zero-filled on startup - // FIXME: Why zero it here when we can zero it right after allocation? - RtlZeroMemory((PVOID)Pcr, MM_PAGE_SIZE); //FIXME: Why zero only 1 page when we allocate 2? - - // Get old values of GDT and IDT - Ke386GetGlobalDescriptorTable(GdtDesc); - Ke386GetInterruptDescriptorTable(IdtDesc); - - // Save old IDT - OldIdt.Base = IdtDesc.Base; - OldIdt.Limit = IdtDesc.Limit; - - // Prepare new IDT+GDT - GdtDesc.Base = KSEG0_BASE | (ULONG_PTR)GdtIdt; - GdtDesc.Limit = NUM_GDT * sizeof(KGDTENTRY) - 1; - IdtDesc.Base = (ULONG)((PUCHAR)GdtDesc.Base + GdtDesc.Limit + 1); - IdtDesc.Limit = NUM_IDT * sizeof(KIDTENTRY) - 1; - - // ======================== - // Fill all descriptors now - // ======================== - - pGdt = (PKGDTENTRY)GdtDesc.Base; - pIdt = (PKIDTENTRY)IdtDesc.Base; - - // - // Code selector (0x8) - // Flat 4Gb - // - pGdt[1].LimitLow = 0xFFFF; - pGdt[1].BaseLow = 0; - pGdt[1].HighWord.Bytes.BaseMid = 0; - pGdt[1].HighWord.Bytes.Flags1 = 0x9A; - pGdt[1].HighWord.Bytes.Flags2 = 0xCF; - pGdt[1].HighWord.Bytes.BaseHi = 0; - - // - // Data selector (0x10) - // Flat 4Gb - // - pGdt[2].LimitLow = 0xFFFF; - pGdt[2].BaseLow = 0; - pGdt[2].HighWord.Bytes.BaseMid = 0; - pGdt[2].HighWord.Bytes.Flags1 = 0x92; - pGdt[2].HighWord.Bytes.Flags2 = 0xCF; - pGdt[2].HighWord.Bytes.BaseHi = 0; - - // - // Selector (0x18) - // Flat 2Gb - // - pGdt[3].LimitLow = 0xFFFF; - pGdt[3].BaseLow = 0; - pGdt[3].HighWord.Bytes.BaseMid = 0; - pGdt[3].HighWord.Bytes.Flags1 = 0xFA; - pGdt[3].HighWord.Bytes.Flags2 = 0xCF; - pGdt[3].HighWord.Bytes.BaseHi = 0; - - // - // Selector (0x20) - // Flat 2Gb - // - pGdt[4].LimitLow = 0xFFFF; - pGdt[4].BaseLow = 0; - pGdt[4].HighWord.Bytes.BaseMid = 0; - pGdt[4].HighWord.Bytes.Flags1 = 0xF2; - pGdt[4].HighWord.Bytes.Flags2 = 0xCF; - pGdt[4].HighWord.Bytes.BaseHi = 0; - - // - // TSS Selector (0x28) - // - pGdt[5].LimitLow = 0x78-1; // 60 dwords - pGdt[5].BaseLow = (USHORT)(Tss & 0xffff); - pGdt[5].HighWord.Bytes.BaseMid = (UCHAR)((Tss >> 16) & 0xff); - pGdt[5].HighWord.Bytes.Flags1 = 0x89; - pGdt[5].HighWord.Bytes.Flags2 = 0x00; - pGdt[5].HighWord.Bytes.BaseHi = (UCHAR)((Tss >> 24) & 0xff); - - // - // PCR Selector (0x30) - // - pGdt[6].LimitLow = 0x01; - pGdt[6].BaseLow = (USHORT)(Pcr & 0xffff); - pGdt[6].HighWord.Bytes.BaseMid = (UCHAR)((Pcr >> 16) & 0xff); - pGdt[6].HighWord.Bytes.Flags1 = 0x92; - pGdt[6].HighWord.Bytes.Flags2 = 0xC0; - pGdt[6].HighWord.Bytes.BaseHi = (UCHAR)((Pcr >> 24) & 0xff); - - // - // Selector (0x38) - // - pGdt[7].LimitLow = 0xFFFF; - pGdt[7].BaseLow = 0; - pGdt[7].HighWord.Bytes.BaseMid = 0; - pGdt[7].HighWord.Bytes.Flags1 = 0xF3; - pGdt[7].HighWord.Bytes.Flags2 = 0x40; - pGdt[7].HighWord.Bytes.BaseHi = 0; - - // - // Some BIOS fuck (0x40) - // - pGdt[8].LimitLow = 0xFFFF; - pGdt[8].BaseLow = 0x400; - pGdt[8].HighWord.Bytes.BaseMid = 0; - pGdt[8].HighWord.Bytes.Flags1 = 0xF2; - pGdt[8].HighWord.Bytes.Flags2 = 0x0; - pGdt[8].HighWord.Bytes.BaseHi = 0; - - // - // Selector (0x48) - // - pGdt[9].LimitLow = 0; - pGdt[9].BaseLow = 0; - pGdt[9].HighWord.Bytes.BaseMid = 0; - pGdt[9].HighWord.Bytes.Flags1 = 0; - pGdt[9].HighWord.Bytes.Flags2 = 0; - pGdt[9].HighWord.Bytes.BaseHi = 0; - - // - // Selector (0x50) - // - pGdt[10].LimitLow = 0xFFFF; //FIXME: Not correct! - pGdt[10].BaseLow = 0; - pGdt[10].HighWord.Bytes.BaseMid = 0x2; - pGdt[10].HighWord.Bytes.Flags1 = 0x89; - pGdt[10].HighWord.Bytes.Flags2 = 0; - pGdt[10].HighWord.Bytes.BaseHi = 0; - - // - // Selector (0x58) - // - pGdt[11].LimitLow = 0xFFFF; - pGdt[11].BaseLow = 0; - pGdt[11].HighWord.Bytes.BaseMid = 0x2; - pGdt[11].HighWord.Bytes.Flags1 = 0x9A; - pGdt[11].HighWord.Bytes.Flags2 = 0; - pGdt[11].HighWord.Bytes.BaseHi = 0; - - // - // Selector (0x60) - // - pGdt[12].LimitLow = 0xFFFF; - pGdt[12].BaseLow = 0; //FIXME: Maybe not correct, but noone cares - pGdt[12].HighWord.Bytes.BaseMid = 0x2; - pGdt[12].HighWord.Bytes.Flags1 = 0x92; - pGdt[12].HighWord.Bytes.Flags2 = 0; - pGdt[12].HighWord.Bytes.BaseHi = 0; - - // - // Video buffer Selector (0x68) - // - pGdt[13].LimitLow = 0x3FFF; - pGdt[13].BaseLow = 0x8000; //FIXME: I guess not correct for UGA - pGdt[13].HighWord.Bytes.BaseMid = 0x0B; - pGdt[13].HighWord.Bytes.Flags1 = 0x92; - pGdt[13].HighWord.Bytes.Flags2 = 0; - pGdt[13].HighWord.Bytes.BaseHi = 0; - - // - // Points to GDT (0x70) - // - pGdt[14].LimitLow = NUM_GDT*sizeof(KGDTENTRY) - 1; - pGdt[14].BaseLow = 0x7000; - pGdt[14].HighWord.Bytes.BaseMid = 0xFF; - pGdt[14].HighWord.Bytes.Flags1 = 0x92; - pGdt[14].HighWord.Bytes.Flags2 = 0; - pGdt[14].HighWord.Bytes.BaseHi = 0xFF; - - // - // Some unused descriptors should go here - // ... - - // - // Fill IDT with Traps - // -#if 0 - pIdt[0].Offset = (i386DivideByZero | KSEG0_BASE) & 0xFFFF; - pIdt[0].ExtendedOffset = 0x8; // Selector - pIdt[0].Access = 0x8F00; - pIdt[0].Selector = (i386DivideByZero | KSEG0_BASE) >> 16; // Extended Offset - - pIdt[1].Offset = (i386DebugException | KSEG0_BASE) & 0xFFFF; - pIdt[1].ExtendedOffset = 0x8; // Selector - pIdt[1].Access = 0x8F00; - pIdt[1].Selector = (i386DebugException | KSEG0_BASE) >> 16; // Extended Offset - - pIdt[2].Offset = (i386NMIException | KSEG0_BASE) & 0xFFFF; - pIdt[2].ExtendedOffset = 0x8; // Selector - pIdt[2].Access = 0x8F00; - pIdt[2].Selector = (i386NMIException | KSEG0_BASE) >> 16; // Extended Offset - - pIdt[3].Offset = (i386Breakpoint | KSEG0_BASE) & 0xFFFF; - pIdt[3].ExtendedOffset = 0x8; // Selector - pIdt[3].Access = 0x8F00; - pIdt[3].Selector = (i386Breakpoint | KSEG0_BASE) >> 16; // Extended Offset - - pIdt[4].Offset = (i386Overflow | KSEG0_BASE) & 0xFFFF; - pIdt[4].ExtendedOffset = 0x8; // Selector - pIdt[4].Access = 0x8F00; - pIdt[4].Selector = (i386Overflow | KSEG0_BASE) >> 16; // Extended Offset - - pIdt[5].Selector = (i386BoundException | KSEG0_BASE) >> 16; // Extended Offset - pIdt[5].Offset = (i386BoundException | KSEG0_BASE) & 0xFFFF; - pIdt[5].ExtendedOffset = 0x8; // Selector - pIdt[5].Access = 0x8F00; - - pIdt[6].Selector = (i386InvalidOpcode | KSEG0_BASE) >> 16; // Extended Offset - pIdt[6].Offset = (i386InvalidOpcode | KSEG0_BASE) & 0xFFFF; - pIdt[6].ExtendedOffset = 0x8; // Selector - pIdt[6].Access = 0x8F00; - - pIdt[7].Selector = (i386FPUNotAvailable | KSEG0_BASE) >> 16; // Extended Offset - pIdt[7].Offset = (i386FPUNotAvailable | KSEG0_BASE) & 0xFFFF; - pIdt[7].ExtendedOffset = 0x8; // Selector - pIdt[7].Access = 0x8F00; - - pIdt[8].Selector = (i386DoubleFault | KSEG0_BASE) >> 16; // Extended Offset - pIdt[8].Offset = (i386DoubleFault | KSEG0_BASE) & 0xFFFF; - pIdt[8].ExtendedOffset = 0x8; // Selector - pIdt[8].Access = 0x8F00; - - pIdt[9].Selector = (i386CoprocessorSegment | KSEG0_BASE) >> 16; // Extended Offset - pIdt[9].Offset = (i386CoprocessorSegment | KSEG0_BASE) & 0xFFFF; - pIdt[9].ExtendedOffset = 0x8; // Selector - pIdt[9].Access = 0x8F00; - - pIdt[10].Selector = (i386InvalidTSS | KSEG0_BASE) >> 16; // Extended Offset - pIdt[10].Offset = (i386InvalidTSS | KSEG0_BASE) & 0xFFFF; - pIdt[10].ExtendedOffset = 0x8; // Selector - pIdt[10].Access = 0x8F00; - - pIdt[11].Selector = (i386SegmentNotPresent | KSEG0_BASE) >> 16; // Extended Offset - pIdt[11].Offset = (i386SegmentNotPresent | KSEG0_BASE) & 0xFFFF; - pIdt[11].ExtendedOffset = 0x8; // Selector - pIdt[11].Access = 0x8F00; - - pIdt[12].Selector = (i386StackException | KSEG0_BASE) >> 16; // Extended Offset - pIdt[12].Offset = (i386StackException | KSEG0_BASE) & 0xFFFF; - pIdt[12].ExtendedOffset = 0x8; // Selector - pIdt[12].Access = 0x8F00; - - pIdt[13].Selector = (i386GeneralProtectionFault | KSEG0_BASE) >> 16; // Extended Offset - pIdt[13].Offset = (i386GeneralProtectionFault | KSEG0_BASE) & 0xFFFF; - pIdt[13].ExtendedOffset = 0x8; // Selector - pIdt[13].Access = 0x8F00; - - pIdt[14].Selector = (i386PageFault | KSEG0_BASE) >> 16; // Extended Offset - pIdt[14].Offset = (i386PageFault | KSEG0_BASE) & 0xFFFF; - pIdt[14].ExtendedOffset = 0x8; // Selector - pIdt[14].Access = 0x8F00; - - pIdt[15].Selector = 0; // Extended Offset - pIdt[15].Offset = 0; - pIdt[15].ExtendedOffset = 0; // Selector - pIdt[15].Access = 0; - - pIdt[16].Selector = (i386CoprocessorError | KSEG0_BASE) >> 16; // Extended Offset - pIdt[16].Offset = (i386CoprocessorError | KSEG0_BASE) & 0xFFFF; - pIdt[16].ExtendedOffset = 0x8; // Selector - pIdt[16].Access = 0x8F00; - - pIdt[17].Selector = (i386AlignmentCheck | KSEG0_BASE) >> 16; // Extended Offset - pIdt[17].Offset = (i386AlignmentCheck | KSEG0_BASE) & 0xFFFF; - pIdt[17].ExtendedOffset = 0x8; // Selector - pIdt[17].Access = 0x8F00; -#endif - - /*for (i=0; i<16; i++) - { - //pIdt[i].Offset = ((ULONG_PTR)i386GeneralProtectionFault | KSEG0_BASE) & 0xFFFF; - //pIdt[i].ExtendedOffset = 0x8; // Selector - //pIdt[i].Access = 0x8F00; - //pIdt[i].Selector = ((ULONG_PTR)i386GeneralProtectionFault | KSEG0_BASE) >> 16; // Extended Offset - - pIdt[i].Offset = ((ULONG_PTR)i386GeneralProtectionFault | KSEG0_BASE) & 0xFFFF; - pIdt[i].ExtendedOffset = ((ULONG_PTR)i386GeneralProtectionFault | KSEG0_BASE) >> 16; // Extended Offset - pIdt[i].Access = 0x8F00; - pIdt[i].Selector = 0x8; - }*/ - - // Copy the old IDT - RtlCopyMemory(pIdt, (PVOID)OldIdt.Base, OldIdt.Limit); - - - // Mask interrupts - //asm("cli\n"); // they are already masked before enabling paged mode - - // Load GDT+IDT - Ke386SetGlobalDescriptorTable(GdtDesc); - Ke386SetInterruptDescriptorTable(IdtDesc); - - // Jump to proper CS and clear prefetch queue - asm("ljmp $0x08, $mb1\n" - "mb1:\n"); - - // Set SS selector - asm(".intel_syntax noprefix\n"); - asm("mov ax, 0x10\n"); // DataSelector=0x10 - asm("mov ss, ax\n"); - asm(".att_syntax\n"); - - // Set DS and ES selectors - Ke386SetDs(0x10); - Ke386SetEs(0x10); // this is vital for rep stosd - - // LDT = not used ever, thus set to 0 - Ke386SetLocalDescriptorTable(Ldt); - - // Load TSR - Ke386SetTr(0x28); - - // Clear GS - asm(".intel_syntax noprefix\n"); - asm("push 0\n"); - asm("pop gs\n"); - asm(".att_syntax\n"); - - // Set FS to PCR - Ke386SetFs(0x30); - - // Real end of the function, just for information - /* do not uncomment! - pop edi; - pop esi; - pop ebx; - mov esp, ebp; - pop ebp; - ret - */ -} +/* + * PROJECT: EFI Windows Loader + * LICENSE: GPL - See COPYING in the top level directory + * FILE: freeldr/winldr/wlmemory.c + * PURPOSE: Memory related routines + * PROGRAMMERS: Aleksey Bragin (aleksey(a)reactos.org) + */ + +/* INCLUDES ***************************************************************/ + +#include <freeldr.h> + +#include <ndk/asm.h> + +#define NDEBUG +#include <debug.h> + +extern ULONG TotalNLSSize; + +// This is needed because headers define wrong one for ReactOS +#undef KIP0PCRADDRESS +#define KIP0PCRADDRESS 0xffdff000 + +// +// This is the zone which is used by the OS loader +// +#define LOADER_HIGH_ZONE ((16*1024*1024) >> MM_PAGE_SHIFT) //16Mb page + +#define HYPER_SPACE_ENTRY 0x300 + +//TODO: Check if this is correct +PCHAR MemTypeDesc[] = { + "ExceptionBlock ", + "SystemBlock ", + "Free ", + "Bad ", + "LoadedProgram ", + "FirmwareTemporary ", + "FirmwarePermanent ", + "OsloaderHeap ", + "OsloaderStack ", + "SystemCode ", + "HalCode ", + "BootDriver ", + "ConsoleInDriver ", + "ConsoleOutDriver ", + "StartupDpcStack ", + "StartupKernelStack", + "StartupPanicStack ", + "StartupPcrPage ", + "StartupPdrPage ", + "RegistryData ", + "MemoryData ", + "NlsData ", + "SpecialMemory ", + "BBTMemory ", + "Maximum " + }; + +VOID +WinLdrpDumpMemoryDescriptors(PLOADER_PARAMETER_BLOCK LoaderBlock); + + +VOID +MempAddMemoryBlock(IN OUT PLOADER_PARAMETER_BLOCK LoaderBlock, + UINT64 BasePage, + UINT64 PageCount, + ULONG Type); +VOID +WinLdrInsertDescriptor(IN OUT PLOADER_PARAMETER_BLOCK LoaderBlock, + IN PMEMORY_ALLOCATION_DESCRIPTOR NewDescriptor); + +VOID +WinLdrRemoveDescriptor(IN PMEMORY_ALLOCATION_DESCRIPTOR Descriptor); + +VOID +WinLdrSetProcessorContext(PVOID GdtIdt, IN ULONG Pcr, IN ULONG Tss); + +// This is needed only for SetProcessorContext routine +#pragma pack(2) + typedef struct + { + USHORT Limit; + ULONG Base; + } GDTIDT; +#pragma pack(4) + +// this is needed for new IDT filling +#if 0 +extern ULONG_PTR i386DivideByZero; +extern ULONG_PTR i386DebugException; +extern ULONG_PTR i386NMIException; +extern ULONG_PTR i386Breakpoint; +extern ULONG_PTR i386Overflow; +extern ULONG_PTR i386BoundException; +extern ULONG_PTR i386InvalidOpcode; +extern ULONG_PTR i386FPUNotAvailable; +extern ULONG_PTR i386DoubleFault; +extern ULONG_PTR i386CoprocessorSegment; +extern ULONG_PTR i386InvalidTSS; +extern ULONG_PTR i386SegmentNotPresent; +extern ULONG_PTR i386StackException; +extern ULONG_PTR i386GeneralProtectionFault; +extern ULONG_PTR i386PageFault; // exc 14 +extern ULONG_PTR i386CoprocessorError; // exc 16 +extern ULONG_PTR i386AlignmentCheck; // exc 17 +#endif + +/* GLOBALS ***************************************************************/ + +PHARDWARE_PTE PDE; +PHARDWARE_PTE HalPT; + +PUCHAR PhysicalPageTablesBuffer; +PUCHAR KernelPageTablesBuffer; +ULONG PhysicalPageTables; +ULONG KernelPageTables; + +MEMORY_ALLOCATION_DESCRIPTOR Mad[1024]; +ULONG MadCount = 0; + + +/* FUNCTIONS **************************************************************/ + +BOOLEAN +MempAllocatePageTables() +{ + ULONG NumPageTables, TotalSize; + PUCHAR Buffer; + // It's better to allocate PDE + PTEs contigiuos + + // Max number of entries = MaxPageNum >> 10 + // FIXME: This is a number to describe ALL physical memory + // and windows doesn't expect ALL memory mapped... + NumPageTables = (GetSystemMemorySize() >> MM_PAGE_SHIFT) >> 10; + + DbgPrint((DPRINT_WINDOWS, "NumPageTables = %d\n", NumPageTables)); + + // Allocate memory block for all these things: + // PDE, HAL mapping page table, physical mapping, kernel mapping + TotalSize = (1+1+NumPageTables*2)*MM_PAGE_SIZE; + Buffer = MmAllocateMemory(TotalSize); + + if (Buffer == NULL) + { + UiMessageBox("Impossible to allocate memory block for page tables!"); + return FALSE; + } + + // Zero all this memory block + RtlZeroMemory(Buffer, TotalSize); + + // Set up pointers correctly now + PDE = (PHARDWARE_PTE)Buffer; + + // Map the page directory at 0xC0000000 (maps itself) + PDE[HYPER_SPACE_ENTRY].PageFrameNumber = (ULONG)PDE >> MM_PAGE_SHIFT; + PDE[HYPER_SPACE_ENTRY].Valid = 1; + PDE[HYPER_SPACE_ENTRY].Write = 1; + + // The last PDE slot is allocated for HAL's memory mapping (Virtual Addresses 0xFFC00000 - 0xFFFFFFFF) + HalPT = (PHARDWARE_PTE)&Buffer[MM_PAGE_SIZE*1]; + + // Map it + PDE[1023].PageFrameNumber = (ULONG)HalPT >> MM_PAGE_SHIFT; + PDE[1023].Valid = 1; + PDE[1023].Write = 1; + + // Store pointers to the tables for easier access + PhysicalPageTablesBuffer = &Buffer[MM_PAGE_SIZE*2]; + KernelPageTablesBuffer = PhysicalPageTablesBuffer + NumPageTables*MM_PAGE_SIZE; + + // Zero counters of page tables used + PhysicalPageTables = 0; + KernelPageTables = 0; + + return TRUE; +} + +VOID +MempAllocatePTE(ULONG Entry, PHARDWARE_PTE *PhysicalPT, PHARDWARE_PTE *KernelPT) +{ + //Print(L"Creating PDE Entry %X\n", Entry); + + // Identity mapping + *PhysicalPT = (PHARDWARE_PTE)&PhysicalPageTablesBuffer[PhysicalPageTables*MM_PAGE_SIZE]; + PhysicalPageTables++; + + PDE[Entry].PageFrameNumber = (ULONG)*PhysicalPT >> MM_PAGE_SHIFT; + PDE[Entry].Valid = 1; + PDE[Entry].Write = 1; + + if (Entry+(KSEG0_BASE >> 22) > 1023) + { + DbgPrint((DPRINT_WINDOWS, "WARNING! Entry: %X > 1023\n", Entry+(KSEG0_BASE >> 22))); + } + + // Kernel-mode mapping + *KernelPT = (PHARDWARE_PTE)&KernelPageTablesBuffer[KernelPageTables*MM_PAGE_SIZE]; + KernelPageTables++; + + PDE[Entry+(KSEG0_BASE >> 22)].PageFrameNumber = ((ULONG)*KernelPT >> MM_PAGE_SHIFT); + PDE[Entry+(KSEG0_BASE >> 22)].Valid = 1; + PDE[Entry+(KSEG0_BASE >> 22)].Write = 1; +} + +BOOLEAN +MempSetupPaging(IN ULONG StartPage, + IN ULONG NumberOfPages) +{ + PHARDWARE_PTE PhysicalPT; + PHARDWARE_PTE KernelPT; + ULONG Entry, Page; + + //Print(L"MempSetupPaging: SP 0x%X, Number: 0x%X\n", StartPage, NumberOfPages); + + // HACK + if (StartPage+NumberOfPages >= 0x80000) + { + // + // We can't map this as it requires more than 1 PDE + // and in fact it's not possible at all ;) + // + //Print(L"skipping...\n"); + return TRUE; + } + + // + // Now actually set up the page tables for identity mapping + // + for (Page=StartPage; Page < StartPage+NumberOfPages; Page++) + { + Entry = Page >> 10; + + if (((PULONG)PDE)[Entry] == 0) + { + MempAllocatePTE(Entry, &PhysicalPT, &KernelPT); + } + else + { + PhysicalPT = (PHARDWARE_PTE)(PDE[Entry].PageFrameNumber << MM_PAGE_SHIFT); + KernelPT = (PHARDWARE_PTE)(PDE[Entry+(KSEG0_BASE >> 22)].PageFrameNumber << MM_PAGE_SHIFT); + } + + if (Page == 0) + { + PhysicalPT[Page & 0x3ff].PageFrameNumber = Page; + PhysicalPT[Page & 0x3ff].Valid = 0; + PhysicalPT[Page & 0x3ff].Write = 0; + + KernelPT[Page & 0x3ff].PageFrameNumber = Page; + KernelPT[Page & 0x3ff].Valid = 0; + KernelPT[Page & 0x3ff].Write = 0; + } + else + { + PhysicalPT[Page & 0x3ff].PageFrameNumber = Page; + PhysicalPT[Page & 0x3ff].Valid = 1; + PhysicalPT[Page & 0x3ff].Write = 1; + + KernelPT[Page & 0x3ff].PageFrameNumber = Page; + KernelPT[Page & 0x3ff].Valid = 1; + KernelPT[Page & 0x3ff].Write = 1; + } + } + + return TRUE; +} + +VOID +MempAddMemoryBlock(IN OUT PLOADER_PARAMETER_BLOCK LoaderBlock, + UINT64 BasePage, + UINT64 PageCount, + ULONG Type) +{ + BOOLEAN Status; + + // + // Check for some weird stuff at the top + // + if (BasePage + PageCount > 0xF0000) + { + // + // Just skip this, without even adding to MAD list + // + return; + } + + // + // Base page and page count are always set + // + Mad[MadCount].BasePage = BasePage; + Mad[MadCount].PageCount = PageCount; + + // + // 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 && (Type != LoaderNlsData)) + { + Mad[MadCount].MemoryType = LoaderFirmwareTemporary; + + WinLdrInsertDescriptor(LoaderBlock, &Mad[MadCount]); + MadCount++; + + Status = MempSetupPaging(BasePage, PageCount); + if (!Status) + { + DbgPrint((DPRINT_WINDOWS, "Error during WinLdrpSetupPaging\n")); + return; + } + return; + } + + if (BasePage == 0xFFF && PageCount == 1) + { + Mad[MadCount].MemoryType = LoaderSpecialMemory; + + WinLdrInsertDescriptor(LoaderBlock, &Mad[MadCount]); + MadCount++; + + // + // Map it + // + Status = MempSetupPaging(BasePage, PageCount); + if (!Status) + { + DbgPrint((DPRINT_WINDOWS, "Error during MempSetupPaging\n")); + return; + } + } + else if (BasePage == 0 && PageCount == 1) + { + Mad[MadCount].MemoryType = LoaderFirmwarePermanent; + + WinLdrInsertDescriptor(LoaderBlock, &Mad[MadCount]); + MadCount++; + + // + // Map it + // + Status = MempSetupPaging(BasePage, PageCount); + if (!Status) + { + DbgPrint((DPRINT_WINDOWS, "Error during MempSetupPaging\n")); + return; + } + } + else + { + // + // Set memory type + // + Mad[MadCount].MemoryType = Type; + + // + // Add descriptor + // + WinLdrInsertDescriptor(LoaderBlock, &Mad[MadCount]); + MadCount++; + + // + // Map it + // + Status = MempSetupPaging(BasePage, PageCount); + if (!Status) + { + DbgPrint((DPRINT_WINDOWS, "Error during MempSetupPaging\n")); + return; + } + } +} + +BOOLEAN +WinLdrTurnOnPaging(IN OUT PLOADER_PARAMETER_BLOCK LoaderBlock, + ULONG PcrBasePage, + ULONG TssBasePage, + PVOID GdtIdt) +{ + ULONG i, PagesCount; + ULONG LastPageIndex, LastPageType, NtType; + PPAGE_LOOKUP_TABLE_ITEM MemoryMap; + ULONG NoEntries; + PKTSS Tss; + PVOID NlsBase = VaToPa(((PNLS_DATA_BLOCK)VaToPa(LoaderBlock->NlsData))->AnsiCodePageData); + ULONG NlsBasePage = (ULONG_PTR)NlsBase >> PAGE_SHIFT; + + // + // Creating a suitable memory map for the Windows can be tricky, so let's + // give a few advices: + // 1) One must not map the whole available memory pages to PDE! + // Map only what's needed - 16Mb, 24Mb, 32Mb max I think, + // thus occupying 4, 6 or 8 PDE entries for identical mapping, + // the same quantity for KSEG0_BASE mapping, one more entry for + // hyperspace and one more entry for HAL physical pages mapping. + // 2) Memory descriptors must map *the whole* physical memory + // showing any memory above 16/24/32 as FirmwareTemporary + // + // 3) Overall memory blocks count must not exceed 30 + // + + // + // During MmInitMachineDependent, the kernel zeroes PDE at the following address + // 0xC0300000 - 0xC03007FC + // + // Then it finds the best place for non-paged pool: + // StartPde C0300F70, EndPde C0300FF8, NumberOfPages C13, NextPhysPage 3AD + // + + // Before we start mapping pages, create a block of memory, which will contain + // PDE and PTEs + if (MempAllocatePageTables() == FALSE) + return FALSE; + + // Setup an entry for each descriptor + MemoryMap = MmGetMemoryMap(&NoEntries); + if (MemoryMap == NULL) + { + UiMessageBox("Can not retrieve the current memory map"); + return FALSE; + } + + DbgPrint((DPRINT_WINDOWS, "Got memory map with %d entries, NlsBasePage 0x%X\n", + NoEntries, NlsBasePage)); + + // Construct a good memory map from what we've got + PagesCount = 1; + LastPageIndex = 0; + LastPageType = MemoryMap[0].PageAllocated; + for(i=1;i<NoEntries;i++) + { + if (MemoryMap[i].PageAllocated == LastPageType && + (i < NlsBasePage || i > NlsBasePage+TotalNLSSize) && (i != NoEntries-1) ) + { + PagesCount++; + } + else if (i == NlsBasePage) + { + // This is NLS data, map it accordingly + // It's VERY important for NT kernel - it calculates size of NLS + // tables based on NlsData memory type descriptors! + + // Firstly map what we already have (if we have any) + // Convert mem types + if (LastPageType == 0) + NtType = LoaderFree; + else if (LastPageType != 0 && LastPageType != 1) + NtType = LoaderFirmwarePermanent; + else if (LastPageType == 1) + NtType = LoaderSystemCode; + else + NtType = LoaderFirmwarePermanent; + + if (PagesCount > 0) + MempAddMemoryBlock(LoaderBlock, LastPageIndex, PagesCount, NtType); + + // Then map nls data + MempAddMemoryBlock(LoaderBlock, NlsBasePage, TotalNLSSize, LoaderNlsData); + + // skip them + i += TotalNLSSize; + + // Reset our counter vars + LastPageIndex = i; + LastPageType = MemoryMap[i].PageAllocated; + PagesCount = 1; + + continue; + } + else + { + // Add the resulting region + + // Convert mem types + if (LastPageType == 0) + { + NtType = LoaderFree; + } + else if (LastPageType != 0 && LastPageType != 1) + { + NtType = LoaderFirmwarePermanent; + } + else if (LastPageType == 1) + { + NtType = LoaderSystemCode; + } + else + { + NtType = LoaderFirmwarePermanent; + } + + MempAddMemoryBlock(LoaderBlock, LastPageIndex, PagesCount, NtType); + + // Reset our counter vars + LastPageIndex = i; + LastPageType = MemoryMap[i].PageAllocated; + PagesCount = 1; + } + } + + DbgPrint((DPRINT_WINDOWS, "MadCount: %d\n", MadCount)); + + WinLdrpDumpMemoryDescriptors(LoaderBlock); //FIXME: Delete! + + // Map our loader image, so we can continue running + /*Status = MempSetupPaging(OsLoaderBase >> MM_PAGE_SHIFT, OsLoaderSize >> MM_PAGE_SHIFT); + if (!Status) + { + UiMessageBox("Error during MempSetupPaging"); + return; + }*/ + + //VideoDisplayString(L"Hello from VGA, going into the kernel\n"); + DbgPrint((DPRINT_WINDOWS, "HalPT: 0x%X\n", HalPT)); + + // Page Tables have been setup, make special handling for PCR and TSS + // (which is done in BlSetupFotNt in usual ntldr) + HalPT[(KI_USER_SHARED_DATA - 0xFFC00000) >> MM_PAGE_SHIFT].PageFrameNumber = PcrBasePage+1; + HalPT[(KI_USER_SHARED_DATA - 0xFFC00000) >> MM_PAGE_SHIFT].Valid = 1; + HalPT[(KI_USER_SHARED_DATA - 0xFFC00000) >> MM_PAGE_SHIFT].Write = 1; + + HalPT[(KIP0PCRADDRESS - 0xFFC00000) >> MM_PAGE_SHIFT].PageFrameNumber = PcrBasePage; + HalPT[(KIP0PCRADDRESS - 0xFFC00000) >> MM_PAGE_SHIFT].Valid = 1; + HalPT[(KIP0PCRADDRESS - 0xFFC00000) >> MM_PAGE_SHIFT].Write = 1; + + // Map VGA memory + //VideoMemoryBase = MmMapIoSpace(0xb8000, 4000, MmNonCached); + //DbgPrint((DPRINT_WINDOWS, "VideoMemoryBase: 0x%X\n", VideoMemoryBase)); + + Tss = (PKTSS)(KSEG0_BASE | (TssBasePage << MM_PAGE_SHIFT)); + + // Fill the memory descriptor list and + //PrepareMemoryDescriptorList(); + DbgPrint((DPRINT_WINDOWS, "Memory Descriptor List prepared, printing PDE\n")); + List_PaToVa(&LoaderBlock->MemoryDescriptorListHead); + + #if DEBUG + { + ULONG *PDE_Addr=(ULONG *)PDE;//0xC0300000; + int j; + + DbgPrint((DPRINT_WINDOWS, "\nPDE\n")); + + for (i=0; i<128; i++) + { + DbgPrint((DPRINT_WINDOWS, "0x%04X | ", i*8)); + + for (j=0; j<8; j++) + { + DbgPrint((DPRINT_WINDOWS, "0x%08X ", PDE_Addr[i*8+j])); + } + + DbgPrint((DPRINT_WINDOWS, "\n")); + } + } + #endif + + + // Enable paging + //BS->ExitBootServices(ImageHandle,MapKey); + + // Disable Interrupts + Ke386DisableInterrupts(); + + // Re-initalize EFLAGS + Ke386EraseFlags(); + + // Set the PDBR + Ke386SetPageTableDirectory((ULONG_PTR)PDE); + + // Enable paging by modifying CR0 + Ke386SetCr0(Ke386GetCr0() | CR0_PG); + + // Set processor context + WinLdrSetProcessorContext(GdtIdt, KIP0PCRADDRESS, KSEG0_BASE | (TssBasePage << MM_PAGE_SHIFT)); + + // Zero KI_USER_SHARED_DATA page + memset((PVOID)KI_USER_SHARED_DATA, 0, MM_PAGE_SIZE); + + return TRUE; +} + +// Two special things this func does: it sorts descriptors, +// and it merges free ones +VOID +WinLdrInsertDescriptor(IN OUT PLOADER_PARAMETER_BLOCK LoaderBlock, + IN PMEMORY_ALLOCATION_DESCRIPTOR NewDescriptor) +{ + PLIST_ENTRY ListHead = &LoaderBlock->MemoryDescriptorListHead; + PLIST_ENTRY PreviousEntry, NextEntry; + PMEMORY_ALLOCATION_DESCRIPTOR PreviousDescriptor = NULL, NextDescriptor = NULL; + + DbgPrint((DPRINT_WINDOWS, "BP=0x%X PC=0x%X %s\n", NewDescriptor->BasePage, + NewDescriptor->PageCount, MemTypeDesc[NewDescriptor->MemoryType])); + + /* Find a place where to insert the new descriptor to */ + PreviousEntry = ListHead; + NextEntry = ListHead->Flink; + while (NextEntry != ListHead) + { + NextDescriptor = CONTAINING_RECORD(NextEntry, + MEMORY_ALLOCATION_DESCRIPTOR, + ListEntry); + if (NewDescriptor->BasePage < NextDescriptor->BasePage) + break; + + PreviousEntry = NextEntry; + PreviousDescriptor = NextDescriptor; + NextEntry = NextEntry->Flink; + } + + /* Don't forget about merging free areas */ + if (NewDescriptor->MemoryType != LoaderFree) + { + /* Just insert, nothing to merge */ + InsertHeadList(PreviousEntry, &NewDescriptor->ListEntry); + } + else + { + /* Previous block also free? */ + if ((PreviousEntry != ListHead) && (PreviousDescriptor->MemoryType == LoaderFree) && + ((PreviousDescriptor->BasePage + PreviousDescriptor->PageCount) == + NewDescriptor->BasePage)) + { + /* Just enlarge previous descriptor's PageCount */ + PreviousDescriptor->PageCount += NewDescriptor->PageCount; + NewDescriptor = PreviousDescriptor; + } + else + { + /* Nope, just insert */ + InsertHeadList(PreviousEntry, &NewDescriptor->ListEntry); + } + + /* Next block is free ?*/ + if ((NextEntry != ListHead) && + (NextDescriptor->MemoryType == LoaderFree) && + ((NewDescriptor->BasePage + NewDescriptor->PageCount) == NextDescriptor->BasePage)) + { + /* Enlarge next descriptor's PageCount */ + NewDescriptor->PageCount += NextDescriptor->PageCount; + RemoveEntryList(&NextDescriptor->ListEntry); + } + } + + return; +} + +VOID +WinLdrSetProcessorContext(PVOID GdtIdt, IN ULONG Pcr, IN ULONG Tss) +{ + GDTIDT GdtDesc, IdtDesc, OldIdt; + PKGDTENTRY pGdt; + PKIDTENTRY pIdt; + ULONG Ldt = 0; + //ULONG i; + + DbgPrint((DPRINT_WINDOWS, "GDtIdt %p, Pcr %p, Tss 0x%08X\n", + GdtIdt, Pcr, Tss)); + + // Kernel expects the PCR to be zero-filled on startup + // FIXME: Why zero it here when we can zero it right after allocation? + RtlZeroMemory((PVOID)Pcr, MM_PAGE_SIZE); //FIXME: Why zero only 1 page when we allocate 2? + + // Get old values of GDT and IDT + Ke386GetGlobalDescriptorTable(GdtDesc); + Ke386GetInterruptDescriptorTable(IdtDesc); + + // Save old IDT + OldIdt.Base = IdtDesc.Base; + OldIdt.Limit = IdtDesc.Limit; + + // Prepare new IDT+GDT + GdtDesc.Base = KSEG0_BASE | (ULONG_PTR)GdtIdt; + GdtDesc.Limit = NUM_GDT * sizeof(KGDTENTRY) - 1; + IdtDesc.Base = (ULONG)((PUCHAR)GdtDesc.Base + GdtDesc.Limit + 1); + IdtDesc.Limit = NUM_IDT * sizeof(KIDTENTRY) - 1; + + // ======================== + // Fill all descriptors now + // ======================== + + pGdt = (PKGDTENTRY)GdtDesc.Base; + pIdt = (PKIDTENTRY)IdtDesc.Base; + + // + // Code selector (0x8) + // Flat 4Gb + // + pGdt[1].LimitLow = 0xFFFF; + pGdt[1].BaseLow = 0; + pGdt[1].HighWord.Bytes.BaseMid = 0; + pGdt[1].HighWord.Bytes.Flags1 = 0x9A; + pGdt[1].HighWord.Bytes.Flags2 = 0xCF; + pGdt[1].HighWord.Bytes.BaseHi = 0; + + // + // Data selector (0x10) + // Flat 4Gb + // + pGdt[2].LimitLow = 0xFFFF; + pGdt[2].BaseLow = 0; + pGdt[2].HighWord.Bytes.BaseMid = 0; + pGdt[2].HighWord.Bytes.Flags1 = 0x92; + pGdt[2].HighWord.Bytes.Flags2 = 0xCF; + pGdt[2].HighWord.Bytes.BaseHi = 0; + + // + // Selector (0x18) + // Flat 2Gb + // + pGdt[3].LimitLow = 0xFFFF; + pGdt[3].BaseLow = 0; + pGdt[3].HighWord.Bytes.BaseMid = 0; + pGdt[3].HighWord.Bytes.Flags1 = 0xFA; + pGdt[3].HighWord.Bytes.Flags2 = 0xCF; + pGdt[3].HighWord.Bytes.BaseHi = 0; + + // + // Selector (0x20) + // Flat 2Gb + // + pGdt[4].LimitLow = 0xFFFF; + pGdt[4].BaseLow = 0; + pGdt[4].HighWord.Bytes.BaseMid = 0; + pGdt[4].HighWord.Bytes.Flags1 = 0xF2; + pGdt[4].HighWord.Bytes.Flags2 = 0xCF; + pGdt[4].HighWord.Bytes.BaseHi = 0; + + // + // TSS Selector (0x28) + // + pGdt[5].LimitLow = 0x78-1; // 60 dwords + pGdt[5].BaseLow = (USHORT)(Tss & 0xffff); + pGdt[5].HighWord.Bytes.BaseMid = (UCHAR)((Tss >> 16) & 0xff); + pGdt[5].HighWord.Bytes.Flags1 = 0x89; + pGdt[5].HighWord.Bytes.Flags2 = 0x00; + pGdt[5].HighWord.Bytes.BaseHi = (UCHAR)((Tss >> 24) & 0xff); + + // + // PCR Selector (0x30) + // + pGdt[6].LimitLow = 0x01; + pGdt[6].BaseLow = (USHORT)(Pcr & 0xffff); + pGdt[6].HighWord.Bytes.BaseMid = (UCHAR)((Pcr >> 16) & 0xff); + pGdt[6].HighWord.Bytes.Flags1 = 0x92; + pGdt[6].HighWord.Bytes.Flags2 = 0xC0; + pGdt[6].HighWord.Bytes.BaseHi = (UCHAR)((Pcr >> 24) & 0xff); + + // + // Selector (0x38) + // + pGdt[7].LimitLow = 0xFFFF; + pGdt[7].BaseLow = 0; + pGdt[7].HighWord.Bytes.BaseMid = 0; + pGdt[7].HighWord.Bytes.Flags1 = 0xF3; + pGdt[7].HighWord.Bytes.Flags2 = 0x40; + pGdt[7].HighWord.Bytes.BaseHi = 0; + + // + // Some BIOS fuck (0x40) + // + pGdt[8].LimitLow = 0xFFFF; + pGdt[8].BaseLow = 0x400; + pGdt[8].HighWord.Bytes.BaseMid = 0; + pGdt[8].HighWord.Bytes.Flags1 = 0xF2; + pGdt[8].HighWord.Bytes.Flags2 = 0x0; + pGdt[8].HighWord.Bytes.BaseHi = 0; + + // + // Selector (0x48) + // + pGdt[9].LimitLow = 0; + pGdt[9].BaseLow = 0; + pGdt[9].HighWord.Bytes.BaseMid = 0; + pGdt[9].HighWord.Bytes.Flags1 = 0; + pGdt[9].HighWord.Bytes.Flags2 = 0; + pGdt[9].HighWord.Bytes.BaseHi = 0; + + // + // Selector (0x50) + // + pGdt[10].LimitLow = 0xFFFF; //FIXME: Not correct! + pGdt[10].BaseLow = 0; + pGdt[10].HighWord.Bytes.BaseMid = 0x2; + pGdt[10].HighWord.Bytes.Flags1 = 0x89; + pGdt[10].HighWord.Bytes.Flags2 = 0; + pGdt[10].HighWord.Bytes.BaseHi = 0; + + // + // Selector (0x58) + // + pGdt[11].LimitLow = 0xFFFF; + pGdt[11].BaseLow = 0; + pGdt[11].HighWord.Bytes.BaseMid = 0x2; + pGdt[11].HighWord.Bytes.Flags1 = 0x9A; + pGdt[11].HighWord.Bytes.Flags2 = 0; + pGdt[11].HighWord.Bytes.BaseHi = 0; + + // + // Selector (0x60) + // + pGdt[12].LimitLow = 0xFFFF; + pGdt[12].BaseLow = 0; //FIXME: Maybe not correct, but noone cares + pGdt[12].HighWord.Bytes.BaseMid = 0x2; + pGdt[12].HighWord.Bytes.Flags1 = 0x92; + pGdt[12].HighWord.Bytes.Flags2 = 0; + pGdt[12].HighWord.Bytes.BaseHi = 0; + + // + // Video buffer Selector (0x68) + // + pGdt[13].LimitLow = 0x3FFF; + pGdt[13].BaseLow = 0x8000; //FIXME: I guess not correct for UGA + pGdt[13].HighWord.Bytes.BaseMid = 0x0B; + pGdt[13].HighWord.Bytes.Flags1 = 0x92; + pGdt[13].HighWord.Bytes.Flags2 = 0; + pGdt[13].HighWord.Bytes.BaseHi = 0; + + // + // Points to GDT (0x70) + // + pGdt[14].LimitLow = NUM_GDT*sizeof(KGDTENTRY) - 1; + pGdt[14].BaseLow = 0x7000; + pGdt[14].HighWord.Bytes.BaseMid = 0xFF; + pGdt[14].HighWord.Bytes.Flags1 = 0x92; + pGdt[14].HighWord.Bytes.Flags2 = 0; + pGdt[14].HighWord.Bytes.BaseHi = 0xFF; + + // + // Some unused descriptors should go here + // ... + + // + // Fill IDT with Traps + // +#if 0 + pIdt[0].Offset = (i386DivideByZero | KSEG0_BASE) & 0xFFFF; + pIdt[0].ExtendedOffset = 0x8; // Selector + pIdt[0].Access = 0x8F00; + pIdt[0].Selector = (i386DivideByZero | KSEG0_BASE) >> 16; // Extended Offset + + pIdt[1].Offset = (i386DebugException | KSEG0_BASE) & 0xFFFF; + pIdt[1].ExtendedOffset = 0x8; // Selector + pIdt[1].Access = 0x8F00; + pIdt[1].Selector = (i386DebugException | KSEG0_BASE) >> 16; // Extended Offset + + pIdt[2].Offset = (i386NMIException | KSEG0_BASE) & 0xFFFF; + pIdt[2].ExtendedOffset = 0x8; // Selector + pIdt[2].Access = 0x8F00; + pIdt[2].Selector = (i386NMIException | KSEG0_BASE) >> 16; // Extended Offset + + pIdt[3].Offset = (i386Breakpoint | KSEG0_BASE) & 0xFFFF; + pIdt[3].ExtendedOffset = 0x8; // Selector + pIdt[3].Access = 0x8F00; + pIdt[3].Selector = (i386Breakpoint | KSEG0_BASE) >> 16; // Extended Offset + + pIdt[4].Offset = (i386Overflow | KSEG0_BASE) & 0xFFFF; + pIdt[4].ExtendedOffset = 0x8; // Selector + pIdt[4].Access = 0x8F00; + pIdt[4].Selector = (i386Overflow | KSEG0_BASE) >> 16; // Extended Offset + + pIdt[5].Selector = (i386BoundException | KSEG0_BASE) >> 16; // Extended Offset + pIdt[5].Offset = (i386BoundException | KSEG0_BASE) & 0xFFFF; + pIdt[5].ExtendedOffset = 0x8; // Selector + pIdt[5].Access = 0x8F00; + + pIdt[6].Selector = (i386InvalidOpcode | KSEG0_BASE) >> 16; // Extended Offset + pIdt[6].Offset = (i386InvalidOpcode | KSEG0_BASE) & 0xFFFF; + pIdt[6].ExtendedOffset = 0x8; // Selector + pIdt[6].Access = 0x8F00; + + pIdt[7].Selector = (i386FPUNotAvailable | KSEG0_BASE) >> 16; // Extended Offset + pIdt[7].Offset = (i386FPUNotAvailable | KSEG0_BASE) & 0xFFFF; + pIdt[7].ExtendedOffset = 0x8; // Selector + pIdt[7].Access = 0x8F00; + + pIdt[8].Selector = (i386DoubleFault | KSEG0_BASE) >> 16; // Extended Offset + pIdt[8].Offset = (i386DoubleFault | KSEG0_BASE) & 0xFFFF; + pIdt[8].ExtendedOffset = 0x8; // Selector + pIdt[8].Access = 0x8F00; + + pIdt[9].Selector = (i386CoprocessorSegment | KSEG0_BASE) >> 16; // Extended Offset + pIdt[9].Offset = (i386CoprocessorSegment | KSEG0_BASE) & 0xFFFF; + pIdt[9].ExtendedOffset = 0x8; // Selector + pIdt[9].Access = 0x8F00; + + pIdt[10].Selector = (i386InvalidTSS | KSEG0_BASE) >> 16; // Extended Offset + pIdt[10].Offset = (i386InvalidTSS | KSEG0_BASE) & 0xFFFF; + pIdt[10].ExtendedOffset = 0x8; // Selector + pIdt[10].Access = 0x8F00; + + pIdt[11].Selector = (i386SegmentNotPresent | KSEG0_BASE) >> 16; // Extended Offset + pIdt[11].Offset = (i386SegmentNotPresent | KSEG0_BASE) & 0xFFFF; + pIdt[11].ExtendedOffset = 0x8; // Selector + pIdt[11].Access = 0x8F00; + + pIdt[12].Selector = (i386StackException | KSEG0_BASE) >> 16; // Extended Offset + pIdt[12].Offset = (i386StackException | KSEG0_BASE) & 0xFFFF; + pIdt[12].ExtendedOffset = 0x8; // Selector + pIdt[12].Access = 0x8F00; + + pIdt[13].Selector = (i386GeneralProtectionFault | KSEG0_BASE) >> 16; // Extended Offset + pIdt[13].Offset = (i386GeneralProtectionFault | KSEG0_BASE) & 0xFFFF; + pIdt[13].ExtendedOffset = 0x8; // Selector + pIdt[13].Access = 0x8F00; + + pIdt[14].Selector = (i386PageFault | KSEG0_BASE) >> 16; // Extended Offset + pIdt[14].Offset = (i386PageFault | KSEG0_BASE) & 0xFFFF; + pIdt[14].ExtendedOffset = 0x8; // Selector + pIdt[14].Access = 0x8F00; + + pIdt[15].Selector = 0; // Extended Offset + pIdt[15].Offset = 0; + pIdt[15].ExtendedOffset = 0; // Selector + pIdt[15].Access = 0; + + pIdt[16].Selector = (i386CoprocessorError | KSEG0_BASE) >> 16; // Extended Offset + pIdt[16].Offset = (i386CoprocessorError | KSEG0_BASE) & 0xFFFF; + pIdt[16].ExtendedOffset = 0x8; // Selector + pIdt[16].Access = 0x8F00; + + pIdt[17].Selector = (i386AlignmentCheck | KSEG0_BASE) >> 16; // Extended Offset + pIdt[17].Offset = (i386AlignmentCheck | KSEG0_BASE) & 0xFFFF; + pIdt[17].ExtendedOffset = 0x8; // Selector + pIdt[17].Access = 0x8F00; +#endif + + /*for (i=0; i<16; i++) + { + //pIdt[i].Offset = ((ULONG_PTR)i386GeneralProtectionFault | KSEG0_BASE) & 0xFFFF; + //pIdt[i].ExtendedOffset = 0x8; // Selector + //pIdt[i].Access = 0x8F00; + //pIdt[i].Selector = ((ULONG_PTR)i386GeneralProtectionFault | KSEG0_BASE) >> 16; // Extended Offset + + pIdt[i].Offset = ((ULONG_PTR)i386GeneralProtectionFault | KSEG0_BASE) & 0xFFFF; + pIdt[i].ExtendedOffset = ((ULONG_PTR)i386GeneralProtectionFault | KSEG0_BASE) >> 16; // Extended Offset + pIdt[i].Access = 0x8F00; + pIdt[i].Selector = 0x8; + }*/ + + // Copy the old IDT + RtlCopyMemory(pIdt, (PVOID)OldIdt.Base, OldIdt.Limit); + + + // Mask interrupts + //asm("cli\n"); // they are already masked before enabling paged mode + + // Load GDT+IDT + Ke386SetGlobalDescriptorTable(GdtDesc); + Ke386SetInterruptDescriptorTable(IdtDesc); + + // Jump to proper CS and clear prefetch queue + asm("ljmp $0x08, $mb1\n" + "mb1:\n"); + + // Set SS selector + asm(".intel_syntax noprefix\n"); + asm("mov ax, 0x10\n"); // DataSelector=0x10 + asm("mov ss, ax\n"); + asm(".att_syntax\n"); + + // Set DS and ES selectors + Ke386SetDs(0x10); + Ke386SetEs(0x10); // this is vital for rep stosd + + // LDT = not used ever, thus set to 0 + Ke386SetLocalDescriptorTable(Ldt); + + // Load TSR + Ke386SetTr(0x28); + + // Clear GS + asm(".intel_syntax noprefix\n"); + asm("push 0\n"); + asm("pop gs\n"); + asm(".att_syntax\n"); + + // Set FS to PCR + Ke386SetFs(0x30); + + // Real end of the function, just for information + /* do not uncomment! + pop edi; + pop esi; + pop ebx; + mov esp, ebp; + pop ebp; + ret + */ +} Propchange: trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/boot/freeldr/freeldr/windows/wlregistry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/wlregistry.c (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/wlregistry.c Tue Oct 10 19:20:03 2006 @@ -12,6 +12,9 @@ #define NDEBUG #include <debug.h> + +// The only global var here, used to mark mem pages as NLS in WinLdrTurnOnPaging() +ULONG TotalNLSSize = 0; BOOLEAN WinLdrGetNLSNames(LPSTR AnsiName, LPSTR OemName, @@ -327,6 +330,9 @@ MM_SIZE_TO_PAGES(OemFileSize) + MM_SIZE_TO_PAGES(LanguageFileSize); + /* Store it for later marking the pages as NlsData type */ + TotalNLSSize = TotalSize; + NlsDataBase = (ULONG_PTR)MmAllocateMemory(TotalSize*MM_PAGE_SIZE); if (NlsDataBase == 0)

1 0

[arty] 24482: Added 'austin' AVL implementation and provide a binding for the AVL functions in generictable. Not tested, (but nothing relies on it yet). Austin is Copyright (C) 2000 Kaz Kylheku <kaz@ashi.footprints.net> Copyright (C) 2000 Carl van Tast <vanTast@netway.at> Copying, reuse and modification are permitted on liberal terms.
by arty＠svn.reactos.org 10 Oct '06

10 Oct '06

Author: arty Date: Tue Oct 10 16:31:16 2006 New Revision: 24482 URL: http://svn.reactos.org/svn/reactos?rev=24482&view=rev Log: Added 'austin' AVL implementation and provide a binding for the AVL functions in generictable. Not tested, (but nothing relies on it yet). Austin is Copyright (C) 2000 Kaz Kylheku <kaz(a)ashi.footprints.net> Copyright (C) 2000 Carl van Tast <vanTast(a)netway.at> Copying, reuse and modification are permitted on liberal terms. Added: trunk/reactos/lib/rtl/austin/ trunk/reactos/lib/rtl/austin/avl.c trunk/reactos/lib/rtl/austin/avl.h trunk/reactos/lib/rtl/austin/macros.h trunk/reactos/lib/rtl/austin/tree.c trunk/reactos/lib/rtl/austin/tree.h trunk/reactos/lib/rtl/austin/udict.h Modified: trunk/reactos/lib/rtl/generictable.c trunk/reactos/lib/rtl/rtl.rbuild Added: trunk/reactos/lib/rtl/austin/avl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/austin/avl.c?rev=2… ============================================================================== --- trunk/reactos/lib/rtl/austin/avl.c (added) +++ trunk/reactos/lib/rtl/austin/avl.c Tue Oct 10 16:31:16 2006 @@ -1,0 +1,345 @@ +/* + * Austin---Astonishing Universal Search Tree Interface Novelty + * Copyright (C) 2000 Kaz Kylheku <kaz(a)ashi.footprints.net> + * Copyright (C) 2000 Carl van Tast <vanTast(a)netway.at> + * + * Free Software License: + * + * All rights are reserved by the author, with the following exceptions: + * Permission is granted to freely reproduce and distribute this software, + * possibly in exchange for a fee, provided that this copyright notice appears + * intact. Permission is also granted to adapt this software to produce + * derivative works, as long as the modified versions carry this copyright + * notice and additional notices stating that the work has been modified. + * This source code may be translated into executable form and incorporated + * into proprietary software; there is no requirement for such software to + * contain a copyright notice related to this source. + * + * $Id: avl.c,v 1.3 2000/01/12 02:37:02 kaz Exp $ + * $Name: austin_0_2 $ + */ +/* + * Modified for use in ReactOS by arty + */ + +#include "udict.h" +#include "tree.h" +#include "macros.h" + +#define balance Balance +#define BALANCED udict_balanced +#define LEFTHEAVY udict_leftheavy +#define RIGHTHEAVY udict_rightheavy +#define EQUAL GenericEqual +#define LESS GenericLessThan +#define GREATER GenericGreaterThan + +void avl_init(udict_t *ud) +{ + ud->sentinel.left = ud->sentinel.right = ud->sentinel.parent = + &ud->sentinel; +} + +void RotateLeft(udict_node_t **top) +{ + udict_node_t *parent = *top; + udict_node_t *child = parent->right; + + child->parent = parent->parent; + parent->right = child->left; + parent->right->parent = parent; /* may change sentinel.parent */ + child->left = parent; + parent->parent = child; + *top = child; +}/*RotateLeft*/ + +void RotateRight(udict_node_t **top) +{ + udict_node_t *parent = *top; + udict_node_t *child = parent->left; + + child->parent = parent->parent; + parent->left = child->right; + parent->left->parent = parent; /* may change sentinel.parent */ + child->right = parent; + parent->parent = child; + *top = child; +}/*RotateRight*/ + +void FixBalance(udict_node_t **pnode, udict_avl_balance_t bal) +{ + udict_node_t *node = *pnode; + udict_node_t *child; + udict_node_t *grandchild; + + if (node->balance == BALANCED) { + node->balance = bal; + }/*if*/ + else if (node->balance != bal) { + node->balance = BALANCED; + }/*elsif*/ + else { + assert (node->balance == bal); + + if (bal == LEFTHEAVY) { + child = node->left; + if (child->balance == LEFTHEAVY) { + node->balance = BALANCED; + child->balance = BALANCED; + RotateRight(pnode); + }/*if*/ + else if (child->balance == BALANCED) { + /* only possible after delete */ + node->balance = LEFTHEAVY; + child->balance = RIGHTHEAVY; + RotateRight(pnode); + }/*elsif*/ + else { + assert (child->balance == RIGHTHEAVY); + + grandchild = child->right; + if (grandchild->balance == LEFTHEAVY) { + node->balance = RIGHTHEAVY; + child->balance = BALANCED; + }/*if*/ + else if (grandchild->balance == RIGHTHEAVY) { + node->balance = BALANCED; + child->balance = LEFTHEAVY; + }/*elsif*/ + else { + node->balance = BALANCED; + child->balance = BALANCED; + }/*else*/ + grandchild->balance = BALANCED; + RotateLeft(&node->left); + RotateRight(pnode); + }/*else*/ + }/*if*/ + else { + assert (bal == RIGHTHEAVY); + + child = node->right; + if (child->balance == RIGHTHEAVY) { + node->balance = BALANCED; + child->balance = BALANCED; + RotateLeft(pnode); + }/*if*/ + else if (child->balance == BALANCED) { + /* only possible after delete */ + node->balance = RIGHTHEAVY; + child->balance = LEFTHEAVY; + RotateLeft(pnode); + }/*elsif*/ + else { + assert (child->balance == LEFTHEAVY); + + grandchild = child->left; + if (grandchild->balance == RIGHTHEAVY) { + node->balance = LEFTHEAVY; + child->balance = BALANCED; + }/*if*/ + else if (grandchild->balance == LEFTHEAVY) { + node->balance = BALANCED; + child->balance = RIGHTHEAVY; + }/*elsif*/ + else { + node->balance = BALANCED; + child->balance = BALANCED; + }/*else*/ + grandchild->balance = BALANCED; + RotateRight(&node->right); + RotateLeft(pnode); + }/*else*/ + }/*else*/ + }/*else*/ +}/*FixBalance*/ + +int Insert(udict_t *ud, udict_node_t *what, udict_node_t **where, udict_node_t *parent) +{ + udict_node_t *here = *where; + int result; + + if (here == tree_null_priv(ud)) { + *where = what; + what->parent = parent; + return 1; /* higher than before */ + }/*if*/ + else { + result = ud->compare(ud, key(what), key(here)); + + if (result == LESS) { + if (Insert(ud, what, &here->left, here)) { + /* + ** now left side is higher than before + */ + FixBalance(where, LEFTHEAVY); + return ((*where)->balance != BALANCED); + }/*if*/ + }/*if*/ + else { + if (Insert(ud, what, &here->right, here)) { + /* + ** now right side is higher than before + */ + FixBalance(where, RIGHTHEAVY); + return ((*where)->balance != BALANCED); + }/*if*/ + }/*else*/ + }/*else*/ + return 0; /* height not changed */ +}/*Insert*/ + +void avl_insert_node(udict_t *ud, udict_node_t *node) +{ + udict_node_t *nil = tree_null_priv(ud); + + node->left = nil; + node->right = nil; + node->balance = BALANCED; + + if (Insert(ud, node, &nil->left, nil)) { + nil->balance = LEFTHEAVY; + }/*if*/ + + ud->nodecount++; +} + +void avl_delete_node(udict_t *ud, udict_node_t *node) +{ + udict_node_t *nil = tree_null_priv(ud); + udict_node_t *swap; + udict_node_t *child; + udict_node_t *parent; + + udict_tree_delete(ud, node, &swap, &child); + +#ifndef NDEBUG + if (swap == node) { + /* + ** node had 0 or 1 child, + ** child moved up to node's place + */ + if (child != nil) { + assert ((child->left == nil) && (child->right == nil)); + assert (child->balance == BALANCED); + }/*if*/ + }/*if*/ + else { + /* + ** node had 2 children, + ** swap was node's successor (in node's right subtree), + ** swap has been inserted in node's place, + ** child was swap->right, + ** child has been moved to swap's place + */ + if (child != nil) { + assert ((child->left == nil) && (child->right == nil)); + assert (child->balance == BALANCED); + }/*if*/ + }/*else*/ +#endif + swap->balance = node->balance; + + /* + ** In either case, child has been moved to the next higher level. + ** So the balance of its new parent has to be checked. + ** Note, that child->parent points to the node we are interested in, + ** even if child == nil. + */ + + parent = child->parent; + + if (parent == nil) { + /* root has been deleted */ + if (child == nil) { + parent->balance = BALANCED; + }/*if*/ + }/*if*/ + + while (parent != nil) { + if ((parent->left == nil) && (parent->right == nil)) { + assert (child == nil); + assert (parent->balance != BALANCED); + parent->balance = BALANCED; + /* propagate height reduction to upper level */ + }/*if*/ + else { + udict_node_t **pparent; + if (parent == parent->parent->left) + pparent = &parent->parent->left; + else + pparent = &parent->parent->right; + + if (child == parent->left) { + /* reduce parent's left height */ + FixBalance(pparent, RIGHTHEAVY); + }/*if*/ + else { + assert (child == parent->right); + /* reduce parent's right height */ + FixBalance(pparent, LEFTHEAVY); + }/*else*/ + + /* + ** parent and child are not valid now, + ** pparent may point to new root of subtree + */ + parent = *pparent; + }/*else*/ + + /* if subtree is balanced, then height is less than before */ + if (parent->balance == BALANCED) { + child = parent; + parent = child->parent; + }/*if*/ + else + break; + }/*while*/ +}/*avl_delete*/ + +int avl_search(udict_t *ud, void *_key, udict_node_t *here, udict_node_t **where) +{ + int result; + + result = ud->compare(ud, _key, key(here)); + + if (result == EQUAL) { + *where = here; + return TableFoundNode; + } + + if (result == LESS) { + if( here->left == &ud->sentinel ) { + *where = here; + return TableInsertAsLeft; + } + return avl_search(ud, _key, here->left, where); + }/*if*/ + else { + if( here->right == &ud->sentinel ) { + *where = here; + return TableInsertAsRight; + } + return avl_search(ud, _key, here->right, where); + }/*else*/ +} + +int avl_is_nil(udict_t *ud, udict_node_t *node) +{ + return &ud->sentinel == node; +} + +udict_node_t *avl_first(udict_t *ud) +{ + return udict_tree_first(ud); +} + +udict_node_t *avl_last(udict_t *ud) +{ + return udict_tree_last(ud); +} + +udict_node_t *avl_next(udict_t *ud, udict_node_t *prev) +{ + return udict_tree_next(ud, prev); +} Added: trunk/reactos/lib/rtl/austin/avl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/austin/avl.h?rev=2… ============================================================================== --- trunk/reactos/lib/rtl/austin/avl.h (added) +++ trunk/reactos/lib/rtl/austin/avl.h Tue Oct 10 16:31:16 2006 @@ -1,0 +1,29 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS System Libraries + * FILE: lib/rtl/austin/avl.h + * PURPOSE: Run-Time Libary Header (interface to austin AVL tree) + * PROGRAMMER: arty + */ + +#ifndef _REACTOS_RTL_LIB_AUSTIN_AVL_H +#define _REACTOS_RTL_LIB_AUSTIN_AVL_H + +#define avl_data(x) ((void*)(&(x)[1])) + +void avl_init(PRTL_AVL_TABLE table); +void avl_insert_node(PRTL_AVL_TABLE table, PRTL_BALANCED_LINKS node); +void avl_delete_node(PRTL_AVL_TABLE table, PRTL_BALANCED_LINKS node); +int avl_is_nil(PRTL_AVL_TABLE table, PRTL_BALANCED_LINKS node); +PRTL_BALANCED_LINKS avl_first(PRTL_AVL_TABLE table); +PRTL_BALANCED_LINKS avl_last(PRTL_AVL_TABLE table); +PRTL_BALANCED_LINKS avl_next(PRTL_AVL_TABLE table, PRTL_BALANCED_LINKS node); + +int avl_search +(PRTL_AVL_TABLE table, + PVOID _key, + PRTL_BALANCED_LINKS node, + PRTL_BALANCED_LINKS *where); + + +#endif/*_REACTOS_RTL_LIB_AUSTIN_AVL_H*/ Added: trunk/reactos/lib/rtl/austin/macros.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/austin/macros.h?re… ============================================================================== --- trunk/reactos/lib/rtl/austin/macros.h (added) +++ trunk/reactos/lib/rtl/austin/macros.h Tue Oct 10 16:31:16 2006 @@ -1,0 +1,51 @@ +/* + * Austin---Astonishing Universal Search Tree Interface Novelty + * Copyright (C) 2000 Kaz Kylheku <kaz(a)ashi.footprints.net> + * + * Free Software License: + * + * All rights are reserved by the author, with the following exceptions: + * Permission is granted to freely reproduce and distribute this software, + * possibly in exchange for a fee, provided that this copyright notice appears + * intact. Permission is also granted to adapt this software to produce + * derivative works, as long as the modified versions carry this copyright + * notice and additional notices stating that the work has been modified. + * This source code may be translated into executable form and incorporated + * into proprietary software; there is no requirement for such software to + * contain a copyright notice related to this source. + * + * $Id: macros.h,v 1.1 1999/11/26 05:59:49 kaz Exp $ + * $Name: austin_0_2 $ + */ +/* + * Modified for use in ReactOS by arty + */ + +/* + * Macros which give short, convenient internal names to public structure + * members. These members have prefixed names to reduce the possiblity of + * clashes with foreign macros. + */ + +#define left LeftChild +#define right RightChild +#define parent Parent +#define next RightChild +#define prev LeftChild +#define data(x) ((void *)&((x)[1])) +#define key(x) ((void *)&((x)[1])) +#define rb_color udict_rb_color +#define algo_specific udict_algo_specific + +#define optable udict_optable +#define nodecount NumberGenericTableElements +#define maxcount udict_maxcount +#define dupes_allowed udict_dupes_allowed +#define sentinel BalancedRoot +#define compare CompareRoutine +#define nodealloc AllocateRoutine +#define nodefree FreeRoutine +#define context TableContext + +#define assert(x) { if(x) { RtlAssert(#x, __FILE__, __LINE__, NULL); } } + Added: trunk/reactos/lib/rtl/austin/tree.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/austin/tree.c?rev=… ============================================================================== --- trunk/reactos/lib/rtl/austin/tree.c (added) +++ trunk/reactos/lib/rtl/austin/tree.c Tue Oct 10 16:31:16 2006 @@ -1,0 +1,287 @@ +/* + * Austin---Astonishing Universal Search Tree Interface Novelty + * Copyright (C) 2000 Kaz Kylheku <kaz(a)ashi.footprints.net> + * + * Free Software License: + * + * All rights are reserved by the author, with the following exceptions: + * Permission is granted to freely reproduce and distribute this software, + * possibly in exchange for a fee, provided that this copyright notice appears + * intact. Permission is also granted to adapt this software to produce + * derivative works, as long as the modified versions carry this copyright + * notice and additional notices stating that the work has been modified. + * This source code may be translated into executable form and incorporated + * into proprietary software; there is no requirement for such software to + * contain a copyright notice related to this source. + * + * $Id: tree.c,v 1.8 1999/12/09 05:38:52 kaz Exp $ + * $Name: austin_0_2 $ + */ +/* + * Modified for use in ReactOS by arty + */ + +#include "udict.h" +#include "tree.h" +#include "macros.h" + +void udict_tree_delete(udict_t *ud, udict_node_t *node, udict_node_t **pswap, udict_node_t **pchild) +{ + udict_node_t *nil = tree_null_priv(ud), *child, *delparent = node->parent; + udict_node_t *next = node, *nextparent; + + if (node->left != nil && node->right != nil) { + next = udict_tree_next(ud, node); + nextparent = next->parent; + + assert (next != nil); + assert (next->parent != nil); + assert (next->left == nil); + + /* + * First, splice out the successor from the tree completely, by + * moving up its right child into its place. + */ + + child = next->right; + child->parent = nextparent; + + if (nextparent->left == next) { + nextparent->left = child; + } else { + assert (nextparent->right == next); + nextparent->right = child; + } + + /* + * Now that the successor has been extricated from the tree, install it + * in place of the node that we want deleted. + */ + + next->parent = delparent; + next->left = node->left; + next->right = node->right; + next->left->parent = next; + next->right->parent = next; + + if (delparent->left == node) { + delparent->left = next; + } else { + assert (delparent->right == node); + delparent->right = next; + } + + } else { + assert (node != nil); + assert (node->left == nil || node->right == nil); + + child = (node->left != nil) ? node->left : node->right; + + child->parent = delparent = node->parent; + + if (node == delparent->left) { + delparent->left = child; + } else { + assert (node == delparent->right); + delparent->right = child; + } + } + + node->parent = 0; + node->right = 0; + node->left = 0; + + ud->nodecount--; + + *pswap = next; + *pchild = child; +} + +udict_node_t *udict_tree_lookup(udict_t *ud, const void *_key) +{ + udict_node_t *root = tree_root_priv(ud); + udict_node_t *nil = tree_null_priv(ud); + int result; + + /* simple binary search adapted for trees that contain duplicate keys */ + + while (root != nil) { + result = ud->compare(ud, (void *)_key, key(root)); + if (result < 0) + root = root->left; + else if (result > 0) + root = root->right; + else { + return root; + } + } + + return 0; +} + +udict_node_t *udict_tree_lower_bound(udict_t *ud, const void *_key) +{ + udict_node_t *root = tree_root_priv(ud); + udict_node_t *nil = tree_null_priv(ud); + udict_node_t *tentative = 0; + + while (root != nil) { + int result = ud->compare(ud, (void *)_key, key(root)); + + if (result > 0) { + root = root->right; + } else if (result < 0) { + tentative = root; + root = root->left; + } else { + return root; + } + } + + return tentative; +} + +udict_node_t *udict_tree_upper_bound(udict_t *ud, const void *_key) +{ + udict_node_t *root = tree_root_priv(ud); + udict_node_t *nil = tree_null_priv(ud); + udict_node_t *tentative = 0; + + while (root != nil) { + int result = ud->compare(ud, (void *)_key, key(root)); + + if (result < 0) { + root = root->left; + } else if (result > 0) { + tentative = root; + root = root->right; + } else { + return root; + } + } + + return tentative; +} + +udict_node_t *udict_tree_first(udict_t *ud) +{ + udict_node_t *nil = tree_null_priv(ud), *root = tree_root_priv(ud), *left; + + if (root != nil) + while ((left = root->left) != nil) + root = left; + + return (root == nil) ? 0 : root; +} + +udict_node_t *udict_tree_last(udict_t *ud) +{ + udict_node_t *nil = tree_null_priv(ud), *root = tree_root_priv(ud), *right; + + if (root != nil) + while ((right = root->right) != nil) + root = right; + + return (root == nil) ? 0 : root; +} + +udict_node_t *udict_tree_next(udict_t *ud, udict_node_t *curr) +{ + udict_node_t *nil = tree_null_priv(ud), *parent, *left; + + if (curr->right != nil) { + curr = curr->right; + while ((left = curr->left) != nil) + curr = left; + return curr; + } + + parent = curr->parent; + + while (parent != nil && curr == parent->right) { + curr = parent; + parent = curr->parent; + } + + return (parent == nil) ? 0 : parent; +} + +udict_node_t *udict_tree_prev(udict_t *ud, udict_node_t *curr) +{ + udict_node_t *nil = tree_null_priv(ud), *parent, *right; + + if (curr->left != nil) { + curr = curr->left; + while ((right = curr->right) != nil) + curr = right; + return curr; + } + + parent = curr->parent; + + while (parent != nil && curr == parent->left) { + curr = parent; + parent = curr->parent; + } + + return (parent == nil) ? 0 : parent; +} + +/* + * Perform a ``left rotation'' adjustment on the tree. The given parent node P + * and its right child C are rearranged so that the P instead becomes the left + * child of C. The left subtree of C is inherited as the new right subtree + * for P. The ordering of the keys within the tree is thus preserved. + */ + +void udict_tree_rotate_left(udict_node_t *child, udict_node_t *parent) +{ + udict_node_t *leftgrandchild, *grandpa; + + assert (parent->right == child); + + child = parent->right; + parent->right = leftgrandchild = child->left; + leftgrandchild->parent = parent; + + child->parent = grandpa = parent->parent; + + if (parent == grandpa->left) { + grandpa->left = child; + } else { + assert (parent == grandpa->right); + grandpa->right = child; + } + + child->left = parent; + parent->parent = child; +} + + +/* + * This operation is the ``mirror'' image of rotate_left. It is + * the same procedure, but with left and right interchanged. + */ + +void udict_tree_rotate_right(udict_node_t *child, udict_node_t *parent) +{ + udict_node_t *rightgrandchild, *grandpa; + + assert (parent->left == child); + + parent->left = rightgrandchild = child->right; + rightgrandchild->parent = parent; + + child->parent = grandpa = parent->parent; + + if (parent == grandpa->right) { + grandpa->right = child; + } else { + assert (parent == grandpa->left); + grandpa->left = child; + } + + child->right = parent; + parent->parent = child; +} + Added: trunk/reactos/lib/rtl/austin/tree.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/austin/tree.h?rev=… ============================================================================== --- trunk/reactos/lib/rtl/austin/tree.h (added) +++ trunk/reactos/lib/rtl/austin/tree.h Tue Oct 10 16:31:16 2006 @@ -1,0 +1,41 @@ +/* + * Austin---Astonishing Universal Search Tree Interface Novelty + * Copyright (C) 2000 Kaz Kylheku <kaz(a)ashi.footprints.net> + * + * Free Software License: + * + * All rights are reserved by the author, with the following exceptions: + * Permission is granted to freely reproduce and distribute this software, + * possibly in exchange for a fee, provided that this copyright notice appears + * intact. Permission is also granted to adapt this software to produce + * derivative works, as long as the modified versions carry this copyright + * notice and additional notices stating that the work has been modified. + * This source code may be translated into executable form and incorporated + * into proprietary software; there is no requirement for such software to + * contain a copyright notice related to this source. + * + * $Id: tree.h,v 1.5 1999/12/09 05:38:52 kaz Exp $ + * $Name: austin_0_2 $ + */ +/* + * Modified for use in ReactOS by arty + */ + +void udict_tree_init(udict_t *ud); +void udict_tree_insert(udict_t *ud, udict_node_t *node, const void *key); +void udict_tree_delete(udict_t *, udict_node_t *, udict_node_t **, udict_node_t **); +udict_node_t *udict_tree_lookup(udict_t *, const void *); +udict_node_t *udict_tree_lower_bound(udict_t *, const void *); +udict_node_t *udict_tree_upper_bound(udict_t *, const void *); +udict_node_t *udict_tree_first(udict_t *); +udict_node_t *udict_tree_last(udict_t *); +udict_node_t *udict_tree_next(udict_t *, udict_node_t *); +udict_node_t *udict_tree_prev(udict_t *, udict_node_t *); +void udict_tree_convert_to_list(udict_t *); +void udict_tree_convert_from_list(udict_t *); +void udict_tree_rotate_left(udict_node_t *, udict_node_t *); +void udict_tree_rotate_right(udict_node_t *, udict_node_t *); + +#define tree_root_priv(T) ((T)->sentinel.left) +#define tree_null_priv(L) (&(L)->sentinel) +#define TREE_DEPTH_MAX 64 Added: trunk/reactos/lib/rtl/austin/udict.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/austin/udict.h?rev… ============================================================================== --- trunk/reactos/lib/rtl/austin/udict.h (added) +++ trunk/reactos/lib/rtl/austin/udict.h Tue Oct 10 16:31:16 2006 @@ -1,0 +1,126 @@ +/* + * Austin---Astonishing Universal Search Tree Interface Novelty + * Copyright (C) 2000 Kaz Kylheku <kaz(a)ashi.footprints.net> + * + * Free Software License: + * + * All rights are reserved by the author, with the following exceptions: + * Permission is granted to freely reproduce and distribute this software, + * possibly in exchange for a fee, provided that this copyright notice appears + * intact. Permission is also granted to adapt this software to produce + * derivative works, as long as the modified versions carry this copyright + * notice and additional notices stating that the work has been modified. + * This source code may be translated into executable form and incorporated + * into proprietary software; there is no requirement for such software to + * contain a copyright notice related to this source. + * + * $Id: udict.h,v 1.6 1999/12/09 07:32:48 kaz Exp $ + * $Name: austin_0_2 $ + */ +/* + * Modified for use in ReactOS by arty + */ + +#ifndef UDICT_H +#define UDICT_H + +#include <limits.h> + +#define WIN32_NO_STATUS +#define _INC_SWPRINTF_INL_ + +#include <windows.h> +#include <ndk/ntndk.h> +#include "avl.h" + +#define UDICT_COUNT_T_MAX ULONG_MAX +typedef unsigned long udict_count_t; + +typedef unsigned int udict_alg_id_t; + +#define UDICT_LIST 0 +#define UDICT_BST 1 +#define UDICT_REDBLACK 2 +#define UDICT_SPLAY 3 +#define UDICT_AVL 4 + +typedef enum { + udict_bst, + udict_list, + udict_other +} udict_algkind_t; + +typedef enum { + udict_red, + udict_black +} udict_rb_color_t; + +typedef enum { + udict_balanced, + udict_leftheavy, + udict_rightheavy +} udict_avl_balance_t; + +typedef union { + int udict_dummy; + udict_rb_color_t udict_rb_color; + udict_avl_balance_t udict_avl_balance; +} udict_algdata_t; + +typedef struct _RTL_BALANCED_LINKS udict_node_t; + +typedef int (*udict_compare_t)(const void *, const void *); +typedef udict_node_t *(*udict_nodealloc_t)(void *); +typedef void (*udict_nodefree_t)(void *, udict_node_t *); + +typedef struct _RTL_AVL_TABLE udict_t; + +typedef struct udict_operations { + void (*udict_init)(udict_t *); + void (*udict_insert)(udict_t *, udict_node_t *, const void *); + void (*udict_delete)(udict_t *, udict_node_t *); + udict_node_t *(*udict_lookup)(udict_t *, const void *); + udict_node_t *(*udict_lower_bound)(udict_t *, const void *); + udict_node_t *(*udict_upper_bound)(udict_t *, const void *); + udict_node_t *(*udict_first)(udict_t *); + udict_node_t *(*udict_last)(udict_t *); + udict_node_t *(*udict_next)(udict_t *, udict_node_t *); + udict_node_t *(*udict_prev)(udict_t *, udict_node_t *); + void (*udict_convert_to_list)(udict_t *); + void (*udict_convert_from_list)(udict_t *); + udict_algkind_t udict_kind; +} udict_operations_t; + +/* non-virtual dict methods */ +void udict_init(udict_t *, int, udict_count_t, udict_compare_t); +udict_t *udict_create(int, udict_count_t, udict_compare_t); +void udict_destroy(udict_t *); +void udict_convert_to(udict_t *, int); +udict_count_t udict_count(udict_t *); +int udict_isempty(udict_t *); +int udict_isfull(udict_t *); +int udict_alloc_insert(udict_t *, const void *, void *); +void udict_delete_free(udict_t *, udict_node_t *); +void udict_set_allocator(udict_t *, udict_nodealloc_t, udict_nodefree_t, void *); +void udict_allow_dupes(udict_t *); + +/* non-virtual node methods */ +void udict_node_init(udict_node_t *, void *); +udict_node_t *udict_node_create(void *); +void udict_node_destroy(udict_node_t *); +void *udict_node_getdata(udict_node_t *); +void udict_node_setdata(udict_node_t *, void *); +const void *udict_node_getkey(udict_node_t *); + +/* virtual dict method wrappers */ +void udict_insert(udict_t *, udict_node_t *, const void *); +void udict_delete(udict_t *, udict_node_t *); +udict_node_t *udict_lookup(udict_t *, const void *); +udict_node_t *udict_lower_bound(udict_t *, const void *); +udict_node_t *udict_upper_bound(udict_t *, const void *); +udict_node_t *udict_first(udict_t *); +udict_node_t *udict_last(udict_t *); +udict_node_t *udict_next(udict_t *, udict_node_t *); +udict_node_t *udict_prev(udict_t *, udict_node_t *); + +#endif Modified: trunk/reactos/lib/rtl/generictable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/generictable.c?rev… ============================================================================== --- trunk/reactos/lib/rtl/generictable.c (original) +++ trunk/reactos/lib/rtl/generictable.c Tue Oct 10 16:31:16 2006 @@ -2,12 +2,13 @@ * PROJECT: ReactOS system libraries * PURPOSE: Generic Table Implementation * FILE: lib/rtl/genertictbl.c - * PROGRAMMERS: + * PROGRAMMERS: arty */ /* INCLUDES *****************************************************************/ #include <rtl.h> +#include "austin/avl.h" #define NDEBUG #include <debug.h> @@ -17,6 +18,88 @@ /* * @unimplemented */ +PVOID +NTAPI +RtlLookupElementGenericTable ( + PRTL_GENERIC_TABLE Table, + PVOID Buffer + ) +{ + UNIMPLEMENTED; + return 0; +} + +/* +* @unimplemented +*/ +PVOID +NTAPI +RtlLookupElementGenericTableFull ( + PRTL_GENERIC_TABLE Table, + PVOID Buffer, + OUT PVOID *NodeOrParent, + OUT TABLE_SEARCH_RESULT *SearchResult + ) +{ + UNIMPLEMENTED; + return 0; +} + +/* +* @implemented +*/ +PVOID +NTAPI +RtlLookupElementGenericTableFullAvl ( + PRTL_AVL_TABLE Table, + PVOID Buffer, + OUT PVOID *NodeOrParent, + OUT TABLE_SEARCH_RESULT *SearchResult + ) +{ + PRTL_BALANCED_LINKS OurNodeOrParent; + TABLE_SEARCH_RESULT OurSearchResult; + + if( Table->NumberGenericTableElements ) + { + *SearchResult = TableEmptyTree; + *NodeOrParent = NULL; + return NULL; + } + + OurSearchResult = avl_search + (Table, Buffer, &Table->BalancedRoot, &OurNodeOrParent); + + if(SearchResult) *SearchResult = OurSearchResult; + if(NodeOrParent) *NodeOrParent = OurNodeOrParent; + + if(OurSearchResult == TableFoundNode) + return avl_data(OurNodeOrParent); + else + return NULL; +} + + +/* +* @implemented +*/ +PVOID +NTAPI +RtlLookupElementGenericTableAvl ( + PRTL_AVL_TABLE Table, + PVOID Buffer + ) +{ + PRTL_BALANCED_LINKS OurNodeOrParent; + TABLE_SEARCH_RESULT OurSearchResult; + return RtlLookupElementGenericTableFullAvl + (Table, Buffer, (PVOID *)&OurNodeOrParent, &OurSearchResult); +} + + +/* +* @unimplemented +*/ BOOLEAN NTAPI RtlDeleteElementGenericTable ( @@ -29,7 +112,7 @@ } /* -* @unimplemented +* @implemented */ BOOLEAN NTAPI @@ -38,8 +121,22 @@ PVOID Buffer ) { - UNIMPLEMENTED; - return FALSE; + TABLE_SEARCH_RESULT Result; + PRTL_BALANCED_LINKS Node; + + RtlLookupElementGenericTableFullAvl + ( Table, Buffer, (PVOID *)&Node, &Result ); + + if( Result == TableFoundNode ) + { + avl_delete_node(Table, Buffer); + Table->FreeRoutine(Table, Node); + return TRUE; + } + else + { + return FALSE; + } } /* @@ -57,7 +154,7 @@ } /* -* @unimplemented +* @implemented */ PVOID NTAPI @@ -66,7 +163,23 @@ BOOLEAN Restart ) { - UNIMPLEMENTED; + if( Table->NumberGenericTableElements == 0 ) + return NULL; + + if( Restart ) + { + Table->RestartKey = avl_first(Table); + return avl_data(Table->RestartKey); + } + else + { + Table->RestartKey = avl_next(Table, Table->RestartKey); + if( avl_is_nil(Table, Table->RestartKey) ) + return NULL; + else + return avl_data(Table->RestartKey); + } + return 0; } @@ -104,7 +217,7 @@ } /* -* @unimplemented +* @implemented */ PVOID NTAPI @@ -113,8 +226,7 @@ PVOID *RestartKey ) { - UNIMPLEMENTED; - return 0; + return RtlEnumerateGenericTableWithoutSplayingAvl(Table, RestartKey); } /* @@ -132,7 +244,7 @@ } /* -* @unimplemented +* @implemented */ PVOID NTAPI @@ -141,8 +253,15 @@ ULONG I ) { - UNIMPLEMENTED; - return 0; + PRTL_BALANCED_LINKS Node; + + if( I >= Table->NumberGenericTableElements ) return NULL; + else + { + Node = avl_first(Table); + while(I--) Node = avl_next(Table, Node); + return avl_data(Node); + } } /* @@ -182,11 +301,11 @@ RtlZeroMemory(Table, sizeof(RTL_AVL_TABLE)); Table->BalancedRoot.Parent = &Table->BalancedRoot; - Table->CompareRoutine = CompareRoutine; Table->AllocateRoutine = AllocateRoutine; Table->FreeRoutine = FreeRoutine; Table->TableContext = TableContext; + avl_init(Table); } @@ -202,24 +321,8 @@ PBOOLEAN NewElement OPTIONAL ) { - UNIMPLEMENTED; - return 0; -} - -/* -* @unimplemented -*/ -PVOID -NTAPI -RtlInsertElementGenericTableAvl ( - PRTL_AVL_TABLE Table, - PVOID Buffer, - ULONG BufferSize, - PBOOLEAN NewElement OPTIONAL - ) -{ - UNIMPLEMENTED; - return 0; + UNIMPLEMENTED; + return 0; } /* @@ -241,7 +344,7 @@ } /* -* @unimplemented +* @implemented */ PVOID NTAPI @@ -250,12 +353,71 @@ PVOID Buffer, ULONG BufferSize, PBOOLEAN NewElement OPTIONAL, - PVOID NodeOrParent, - TABLE_SEARCH_RESULT SearchResult - ) -{ - UNIMPLEMENTED; - return 0; + PVOID *NodeOrParent, + TABLE_SEARCH_RESULT *SearchResult + ) +{ + PRTL_BALANCED_LINKS OurNodeOrParent; + TABLE_SEARCH_RESULT OurSearchResult; + + if(NewElement) + *NewElement = FALSE; + + if( Table->NumberGenericTableElements ) + { + OurSearchResult = TableEmptyTree; + OurNodeOrParent = NULL; + return NULL; + } + + OurSearchResult = avl_search + (Table, Buffer, &Table->BalancedRoot, &OurNodeOrParent); + + if(NodeOrParent) *NodeOrParent = OurNodeOrParent; + if(SearchResult) *SearchResult = OurSearchResult; + + if(OurSearchResult == TableFoundNode) + { + if(NewElement) + *NewElement = TRUE; + RtlCopyMemory(avl_data(OurNodeOrParent), Buffer, BufferSize); + return avl_data(OurNodeOrParent); + } + else + { + PRTL_BALANCED_LINKS NewNode = + Table->AllocateRoutine + (Table, + BufferSize + sizeof(RTL_BALANCED_LINKS) + BufferSize); + + if( !NewNode ) return NULL; + + RtlCopyMemory(avl_data(NewNode), Buffer, BufferSize); + + OurNodeOrParent = NewNode; + + avl_insert_node(Table, NewNode); + return avl_data(NewNode); + } +} + +/* +* @implemented +*/ +PVOID +NTAPI +RtlInsertElementGenericTableAvl ( + PRTL_AVL_TABLE Table, + PVOID Buffer, + ULONG BufferSize, + PBOOLEAN NewElement OPTIONAL + ) +{ + PVOID NodeOrParent; + TABLE_SEARCH_RESULT SearchResult; + + return RtlInsertElementGenericTableFullAvl + (Table, Buffer, BufferSize, NewElement, &NodeOrParent, &SearchResult); } @@ -281,69 +443,7 @@ PRTL_AVL_TABLE Table ) { - UNIMPLEMENTED; - return FALSE; -} - - -/* -* @unimplemented -*/ -PVOID -NTAPI -RtlLookupElementGenericTable ( - PRTL_GENERIC_TABLE Table, - PVOID Buffer - ) -{ - UNIMPLEMENTED; - return 0; -} - -/* -* @unimplemented -*/ -PVOID -NTAPI -RtlLookupElementGenericTableAvl ( - PRTL_AVL_TABLE Table, - PVOID Buffer - ) -{ - UNIMPLEMENTED; - return 0; -} - -/* -* @unimplemented -*/ -PVOID -NTAPI -RtlLookupElementGenericTableFull ( - PRTL_GENERIC_TABLE Table, - PVOID Buffer, - OUT PVOID *NodeOrParent, - OUT TABLE_SEARCH_RESULT *SearchResult - ) -{ - UNIMPLEMENTED; - return 0; -} - -/* -* @unimplemented -*/ -PVOID -NTAPI -RtlLookupElementGenericTableFullAvl ( - PRTL_AVL_TABLE Table, - PVOID Buffer, - OUT PVOID *NodeOrParent, - OUT TABLE_SEARCH_RESULT *SearchResult - ) -{ - UNIMPLEMENTED; - return 0; + return Table->NumberGenericTableElements == 0; } Modified: trunk/reactos/lib/rtl/rtl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/rtl.rbuild?rev=244… ============================================================================== --- trunk/reactos/lib/rtl/rtl.rbuild (original) +++ trunk/reactos/lib/rtl/rtl.rbuild Tue Oct 10 16:31:16 2006 @@ -40,6 +40,10 @@ <file>tan_asm.s</file> </directory> </if> + <directory name="austin"> + <file>avl.c</file> + <file>tree.c</file> + </directory> <ifnot property="ARCH" value="i386"> <file>memgen.c</file>

1 0

[fireball] 24481: Add a stub to peloader.c
by fireball＠svn.reactos.org 10 Oct '06

10 Oct '06

Author: fireball Date: Tue Oct 10 14:42:07 2006 New Revision: 24481 URL: http://svn.reactos.org/svn/reactos?rev=24481&view=rev Log: Add a stub to peloader.c Modified: trunk/reactos/boot/freeldr/freeldr/windows/peloader.c 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 Tue Oct 10 14:42:07 2006 @@ -20,6 +20,15 @@ #include <debug.h> /* FUNCTIONS **************************************************************/ + +BOOLEAN +WinLdrCheckForLoadedDll(IN OUT PLOADER_PARAMETER_BLOCK WinLdrBlock, + IN PCH DllName, + OUT PLDR_DATA_TABLE_ENTRY *LoadedEntry) +{ + return FALSE; +} + BOOLEAN WinLdrScanImportDescriptorTable(IN OUT PLOADER_PARAMETER_BLOCK WinLdrBlock,

1 0

[fireball] 24480: - Implement WinLdrLoadBootDrivers() / WinLdrLoadDeviceDriver() - to be able to load boot-time drivers - Perform hardware detection in the beginning (I had to insert RegInitializeRegistry() hack because MachHwDetect initializes certain stuff in registry) - Convert info from hwdetect to suitable form in LPB (code by Alex Ionescu, just moved/adapted). Debug routine added to output its contents. - Move allocation memory for NlsData into "phase 0" (AllocateAndInitLPB) - Fixed System
by fireball＠svn.reactos.org 10 Oct '06

10 Oct '06

Author: fireball Date: Tue Oct 10 14:38:45 2006 New Revision: 24480 URL: http://svn.reactos.org/svn/reactos?rev=24480&view=rev Log: - Implement WinLdrLoadBootDrivers() / WinLdrLoadDeviceDriver() - to be able to load boot-time drivers - Perform hardware detection in the beginning (I had to insert RegInitializeRegistry() hack because MachHwDetect initializes certain stuff in registry) - Convert info from hwdetect to suitable form in LPB (code by Alex Ionescu, just moved/adapted). Debug routine added to output its contents. - Move allocation memory for NlsData into "phase 0" (AllocateAndInitLPB) - Fixed SystemRoot to be of a correct form (later will be autogenerated of course, now just for reference) Modified: trunk/reactos/boot/freeldr/freeldr/windows/winldr.c 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 Tue Oct 10 14:38:45 2006 @@ -26,10 +26,25 @@ //#define NDEBUG #include <debug.h> +//FIXME: Do a better way to retrieve Arc disk information +extern ULONG reactos_disk_count; +extern ARC_DISK_SIGNATURE reactos_arc_disk_info[]; +extern char reactos_arc_strings[32][256]; + +ARC_DISK_SIGNATURE BldrDiskInfo[32]; +CHAR BldrArcNames[32][256]; + +BOOLEAN +WinLdrCheckForLoadedDll(IN OUT PLOADER_PARAMETER_BLOCK WinLdrBlock, + IN PCH DllName, + OUT PLDR_DATA_TABLE_ENTRY *LoadedEntry); + // debug stuff VOID DumpMemoryAllocMap(VOID); VOID WinLdrpDumpMemoryDescriptors(PLOADER_PARAMETER_BLOCK LoaderBlock); VOID WinLdrpDumpBootDriver(PLOADER_PARAMETER_BLOCK LoaderBlock); +VOID WinLdrpDumpArcDisks(PLOADER_PARAMETER_BLOCK LoaderBlock); + void InitializeHWConfig(IN OUT PLOADER_PARAMETER_BLOCK LoaderBlock) { @@ -87,6 +102,14 @@ InitializeListHead(&LoaderBlock->MemoryDescriptorListHead); InitializeListHead(&LoaderBlock->BootDriverListHead); + /* Alloc space for NLS (it will be converted to VA in WinLdrLoadNLS) */ + LoaderBlock->NlsData = MmAllocateMemory(sizeof(NLS_DATA_BLOCK)); + if (LoaderBlock->NlsData == NULL) + { + UiMessageBox("Failed to allocate memory for NLS table data!"); + return; + } + RtlZeroMemory(LoaderBlock->NlsData, sizeof(NLS_DATA_BLOCK)); *OutLoaderBlock = LoaderBlock; } @@ -97,11 +120,12 @@ { //CHAR Options[] = "/CRASHDEBUG /DEBUGPORT=COM1 /BAUDRATE=115200"; CHAR Options[] = "/NODEBUG"; - CHAR SystemRoot[] = "\\WINNT"; + CHAR SystemRoot[] = "\\WINNT\\"; CHAR HalPath[] = "\\"; CHAR ArcBoot[] = "multi(0)disk(0)rdisk(1)partition(1)"; CHAR ArcHal[] = "multi(0)disk(0)rdisk(1)partition(1)"; + ULONG i; PLOADER_PARAMETER_EXTENSION Extension; LoaderBlock->u.I386.CommonDataArea = NULL; // Force No ABIOS support @@ -134,17 +158,31 @@ /* Arc devices */ LoaderBlock->ArcDiskInformation = (PARC_DISK_INFORMATION)MmAllocateMemory(sizeof(ARC_DISK_INFORMATION)); InitializeListHead(&LoaderBlock->ArcDiskInformation->DiskSignatureListHead); + + /* Convert ARC disk information from freeldr to a correct format */ + for (i = 0; i < reactos_disk_count; i++) + { + PARC_DISK_SIGNATURE ArcDiskInfo; + + /* Get the ARC structure */ + ArcDiskInfo = &BldrDiskInfo[i]; + + /* Copy the data over */ + ArcDiskInfo->Signature = reactos_arc_disk_info[i].Signature; + ArcDiskInfo->CheckSum = reactos_arc_disk_info[i].CheckSum; + + /* Copy the ARC Name */ + strcpy(BldrArcNames[i], reactos_arc_disk_info[i].ArcName); + ArcDiskInfo->ArcName = BldrArcNames[i]; + + /* Insert into the list */ + InsertTailList(&LoaderBlock->ArcDiskInformation->DiskSignatureListHead, + &ArcDiskInfo->ListEntry); + } + + /* Convert the list to virtual address */ List_PaToVa(&LoaderBlock->ArcDiskInformation->DiskSignatureListHead); LoaderBlock->ArcDiskInformation = PaToVa(LoaderBlock->ArcDiskInformation); - - /* Alloc space for NLS (it will be converted to VA in WinLdrLoadNLS) */ - LoaderBlock->NlsData = MmAllocateMemory(sizeof(NLS_DATA_BLOCK)); - if (LoaderBlock->NlsData == NULL) - { - UiMessageBox("Failed to allocate memory for NLS table data!"); - return; - } - RtlZeroMemory(LoaderBlock->NlsData, sizeof(NLS_DATA_BLOCK)); /* Create configuration entries */ InitializeHWConfig(LoaderBlock); @@ -224,6 +262,111 @@ /* Zero newly prepared GDT+IDT */ RtlZeroMemory(*GdtIdt, NumPages << MM_PAGE_SHIFT); +} + +BOOLEAN +WinLdrLoadDeviceDriver(PLOADER_PARAMETER_BLOCK LoaderBlock, + LPSTR BootPath, + PUNICODE_STRING FilePath, + ULONG Flags, + PLDR_DATA_TABLE_ENTRY *DriverDTE) +{ + CHAR FullPath[1024]; + CHAR DriverPath[1024]; + CHAR DllName[1024]; + PCHAR DriverNamePos; + BOOLEAN Status; + PVOID DriverBase; + + // Separate the path to file name and directory path + sprintf(DriverPath, "%wZ", FilePath); + DriverNamePos = strrchr(DriverPath, '\\'); + if (DriverNamePos != NULL) + { + // Copy the name + strcpy(DllName, DriverNamePos+1); + + // Cut out the name from the path + *(DriverNamePos+1) = 0; + } + + DbgPrint((DPRINT_WINDOWS, "DriverPath: %s, DllName: %s, LPB %p\n", DriverPath, DllName, LoaderBlock)); + + + // Check if driver is already loaded + Status = WinLdrCheckForLoadedDll(LoaderBlock, DllName, DriverDTE); + if (Status) + { + // We've got the pointer to its DTE, just return success + return TRUE; + } + + // It's not loaded, we have to load it + sprintf(FullPath,"%s%wZ", BootPath, FilePath); + Status = WinLdrLoadImage(FullPath, &DriverBase); + if (!Status) + return FALSE; + + // Allocate a DTE for it + Status = WinLdrAllocateDataTableEntry(LoaderBlock, DllName, DllName, DriverBase, DriverDTE); + if (!Status) + { + DbgPrint((DPRINT_WINDOWS, "WinLdrAllocateDataTableEntry() failed\n")); + return FALSE; + } + + // Modify any flags, if needed + (*DriverDTE)->Flags |= Flags; + + // Look for any dependencies it may have, and load them too + sprintf(FullPath,"%s%s", BootPath, DriverPath); + Status = WinLdrScanImportDescriptorTable(LoaderBlock, FullPath, *DriverDTE); + if (!Status) + { + DbgPrint((DPRINT_WINDOWS, "WinLdrScanImportDescriptorTable() failed for %s\n", + FullPath)); + return FALSE; + } + + return TRUE; +} + +BOOLEAN +WinLdrLoadBootDrivers(PLOADER_PARAMETER_BLOCK LoaderBlock, + LPSTR BootPath) +{ + PLIST_ENTRY NextBd; + PBOOT_DRIVER_LIST_ENTRY BootDriver; + BOOLEAN Status; + + // Walk through the boot drivers list + NextBd = LoaderBlock->BootDriverListHead.Flink; + + while (NextBd != &LoaderBlock->BootDriverListHead) + { + BootDriver = CONTAINING_RECORD(NextBd, BOOT_DRIVER_LIST_ENTRY, ListEntry); + + //DbgPrint((DPRINT_WINDOWS, "BootDriver %wZ DTE %08X RegPath: %wZ\n", &BootDriver->FilePath, + // BootDriver->DataTableEntry, &BootDriver->RegistryPath)); + + // Paths are relative (FIXME: Are they always relative?) + + // Load it + Status = WinLdrLoadDeviceDriver(LoaderBlock, BootPath, &BootDriver->FilePath, + 0, &BootDriver->DataTableEntry); + + // If loading failed - cry loudly + //FIXME: Maybe remove it from the list and try to continue? + if (!Status) + { + UiMessageBox("Can't load boot driver!"); + return FALSE; + } + + NextBd = BootDriver->ListEntry.Flink; + } + + return TRUE; } VOID @@ -245,8 +388,6 @@ ULONG PcrBasePage=0; ULONG TssBasePage=0; - - //sprintf(MsgBuffer,"Booting Microsoft(R) Windows(R) OS version '%04x' is not implemented yet", OperatingSystemVersion); //UiMessageBox(MsgBuffer); @@ -259,6 +400,13 @@ return; } + UiDrawBackdrop(); + UiDrawStatusText("Detecting Hardware..."); + UiDrawProgressBarCenter(1, 100, "Loading Windows..."); + + //FIXME: This is needed only for MachHwDetect() which performs registry operations! + RegInitializeRegistry(); + /* Make sure the system path is set in the .ini file */ if (!IniReadSettingByName(SectionId, "SystemPath", SystemPath, sizeof(SystemPath))) { @@ -272,6 +420,9 @@ UiMessageBox("Invalid system path"); return; } + + /* Detect hardware */ + MachHwDetect(); UiDrawStatusText("Loading..."); @@ -333,15 +484,16 @@ if (KdComDTE) WinLdrScanImportDescriptorTable(LoaderBlock, SearchPath, KdComDTE); - /* Initialize Phase 1 - before NLS */ - WinLdrInitializePhase1(LoaderBlock); - /* Load Hive, and then NLS data, OEM font, and prepare boot drivers list */ Status = WinLdrLoadAndScanSystemHive(LoaderBlock, BootPath); DbgPrint((DPRINT_WINDOWS, "SYSTEM hive loaded and scanned with status %d\n", Status)); /* Load boot drivers */ - //WinLdrLoadBootDrivers(); + Status = WinLdrLoadBootDrivers(LoaderBlock, BootPath); + DbgPrint((DPRINT_WINDOWS, "Boot drivers loaded with status %d\n", Status)); + + /* Initialize Phase 1 - no drivers loading anymore */ + WinLdrInitializePhase1(LoaderBlock); /* Alloc PCR, TSS, do magic things with the GDT/IDT */ WinLdrSetupForNt(LoaderBlock, &GdtIdt, &PcrBasePage, &TssBasePage); @@ -362,6 +514,7 @@ WinLdrpDumpMemoryDescriptors(LoaderBlockVA); WinLdrpDumpBootDriver(LoaderBlockVA); + WinLdrpDumpArcDisks(LoaderBlockVA); //FIXME: If I substitute this debugging checkpoint, GCC will "optimize away" the code below //while (1) {}; @@ -414,3 +567,23 @@ NextBd = BootDriver->ListEntry.Flink; } } + +VOID +WinLdrpDumpArcDisks(PLOADER_PARAMETER_BLOCK LoaderBlock) +{ + PLIST_ENTRY NextBd; + PARC_DISK_SIGNATURE ArcDisk; + + NextBd = LoaderBlock->ArcDiskInformation->DiskSignatureListHead.Flink; + + while (NextBd != &LoaderBlock->ArcDiskInformation->DiskSignatureListHead) + { + ArcDisk = CONTAINING_RECORD(NextBd, ARC_DISK_SIGNATURE, ListEntry); + + DbgPrint((DPRINT_WINDOWS, "ArcDisk %s checksum: 0x%X, signature: 0x%X\n", + ArcDisk->ArcName, ArcDisk->CheckSum, ArcDisk->Signature)); + + NextBd = ArcDisk->ListEntry.Flink; + } +} +

1 0

[navaraf] 24479: Fix setting of SystemBootDevice and SystemStartOptions in registry. Fix detection of MiniNT systems.
by navaraf＠svn.reactos.org 10 Oct '06

10 Oct '06

Author: navaraf Date: Tue Oct 10 04:22:04 2006 New Revision: 24479 URL: http://svn.reactos.org/svn/reactos?rev=24479&view=rev Log: Fix setting of SystemBootDevice and SystemStartOptions in registry. Fix detection of MiniNT systems. Modified: trunk/reactos/ntoskrnl/cm/registry.c Modified: trunk/reactos/ntoskrnl/cm/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/registry.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/cm/registry.c (original) +++ trunk/reactos/ntoskrnl/cm/registry.c Tue Oct 10 04:22:04 2006 @@ -134,40 +134,25 @@ { ULONG PiceStart = 4; BOOLEAN MiniNT = FALSE; - PWCHAR SystemBootDevice; - PWCHAR SystemStartOptions; - ULONG Position; NTSTATUS Status; + UNICODE_STRING TempString; /* Create the 'CurrentControlSet' link. */ Status = CmiCreateCurrentControlSetLink(); if (!NT_SUCCESS(Status)) KEBUGCHECK(CONFIG_INITIALIZATION_FAILED); - - /* - * Parse the system boot device. - */ - Position = 0; - SystemBootDevice = ExAllocatePool(PagedPool, - (strlen(CommandLine) + 1) * sizeof(WCHAR)); - if (SystemBootDevice == NULL) - { - KEBUGCHECK(CONFIG_INITIALIZATION_FAILED); - } - - while (*CommandLine != 0 && *CommandLine != ' ') - SystemBootDevice[Position++] = *(CommandLine++); - SystemBootDevice[Position++] = 0; /* * Write the system boot device to registry. */ + RtlCreateUnicodeStringFromAsciiz(&TempString, KeLoaderBlock->ArcBootDeviceName); Status = RtlWriteRegistryValue(RTL_REGISTRY_ABSOLUTE, L"\\Registry\\Machine\\System\\CurrentControlSet\\Control", L"SystemBootDevice", REG_SZ, - SystemBootDevice, - Position * sizeof(WCHAR)); + TempString.Buffer, + TempString.MaximumLength); + RtlFreeUnicodeString(&TempString); if (!NT_SUCCESS(Status)) { KEBUGCHECK(CONFIG_INITIALIZATION_FAILED); @@ -176,38 +161,20 @@ /* * Parse the system start options. */ - Position = 0; - SystemStartOptions = SystemBootDevice; - while ((CommandLine = strchr(CommandLine, '/')) != NULL) - { - /* Skip over the slash */ - CommandLine++; - - /* Special options */ - if (!_strnicmp(CommandLine, "MININT", 6)) - MiniNT = TRUE; - else if (!_strnicmp(CommandLine, "DEBUGPORT=PICE", 14)) - PiceStart = 1; - - /* Add a space between the options */ - if (Position != 0) - SystemStartOptions[Position++] = L' '; - - /* Copy the command */ - while (*CommandLine != 0 && *CommandLine != ' ') - SystemStartOptions[Position++] = *(CommandLine++); - } - SystemStartOptions[Position++] = 0; + PiceStart = strstr(KeLoaderBlock->LoadOptions, "DEBUGPORT=PICE") != NULL; + MiniNT = strstr(KeLoaderBlock->LoadOptions, "MININT") != NULL; /* * Write the system start options to registry. */ + RtlCreateUnicodeStringFromAsciiz(&TempString, KeLoaderBlock->LoadOptions); Status = RtlWriteRegistryValue(RTL_REGISTRY_ABSOLUTE, L"\\Registry\\Machine\\System\\CurrentControlSet\\Control", L"SystemStartOptions", REG_SZ, - SystemStartOptions, - Position * sizeof(WCHAR)); + TempString.Buffer, + TempString.MaximumLength); + RtlFreeUnicodeString(&TempString); if (!NT_SUCCESS(Status)) { KEBUGCHECK(CONFIG_INITIALIZATION_FAILED); @@ -234,8 +201,6 @@ sizeof(ULONG)); if (!NT_SUCCESS(Status)) KEBUGCHECK(CONFIG_INITIALIZATION_FAILED); - - ExFreePool(SystemBootDevice); }

1 0

[navaraf] 24478: Sort the key indexes in CM.
by navaraf＠svn.reactos.org 09 Oct '06

09 Oct '06

Author: navaraf Date: Tue Oct 10 03:43:06 2006 New Revision: 24478 URL: http://svn.reactos.org/svn/reactos?rev=24478&view=rev Log: Sort the key indexes in CM. Modified: trunk/reactos/boot/freeldr/freeldr/reactos/registry.c trunk/reactos/tools/mkhive/cmi.c Modified: trunk/reactos/boot/freeldr/freeldr/reactos/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/reactos/registry.c (original) +++ trunk/reactos/boot/freeldr/freeldr/reactos/registry.c Tue Oct 10 03:43:06 2006 @@ -216,6 +216,7 @@ int subkeyLength; int stringLength; ULONG NameSize; + int CmpResult; DbgPrint((DPRINT_REGISTRY, "KeyName '%S'\n", KeyName)); @@ -261,6 +262,7 @@ NameSize = (subkeyLength + 1) * sizeof(WCHAR); Ptr = CurrentKey->SubKeyList.Flink; + CmpResult = 1; while (Ptr != &CurrentKey->SubKeyList) { DbgPrint((DPRINT_REGISTRY, "Ptr 0x%x\n", Ptr)); @@ -270,14 +272,16 @@ KeyList); DbgPrint((DPRINT_REGISTRY, "SearchKey 0x%x\n", SearchKey)); DbgPrint((DPRINT_REGISTRY, "Searching '%S'\n", SearchKey->Name)); - if (SearchKey->NameSize == NameSize && - _wcsnicmp(SearchKey->Name, name, subkeyLength) == 0) + CmpResult = _wcsnicmp(SearchKey->Name, name, subkeyLength); + if (CmpResult == 0 && SearchKey->NameSize == NameSize) break; + else if (CmpResult == 1) + break; Ptr = Ptr->Flink; } - if (Ptr == &CurrentKey->SubKeyList) + if (CmpResult != 0) { /* no key found -> create new subkey */ NewKey = (FRLDRHKEY)MmAllocateMemory(sizeof(KEY)); @@ -294,7 +298,7 @@ NewKey->DataSize = 0; NewKey->Data = NULL; - InsertTailList(&CurrentKey->SubKeyList, &NewKey->KeyList); + InsertTailList(Ptr, &NewKey->KeyList); CurrentKey->SubKeyCount++; NewKey->NameSize = NameSize; Modified: trunk/reactos/tools/mkhive/cmi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/cmi.c?rev=244… ============================================================================== --- trunk/reactos/tools/mkhive/cmi.c (original) +++ trunk/reactos/tools/mkhive/cmi.c Tue Oct 10 03:43:06 2006 @@ -145,16 +145,32 @@ IN HCELL_INDEX NKBOffset) { ULONG i = KeyCell->SubKeyCounts[StorageType]; - - HashCell->Table[i].KeyOffset = NKBOffset; - HashCell->Table[i].HashValue = 0; + ULONG HashValue; + if (NewKeyCell->Flags & REG_KEY_NAME_PACKED) { RtlCopyMemory( - &HashCell->Table[i].HashValue, + &HashValue, NewKeyCell->Name, min(NewKeyCell->NameSize, sizeof(ULONG))); } + + for (i = 0; i < KeyCell->SubKeyCounts[StorageType]; i++) + { + if (HashCell->Table[i].HashValue > HashValue) + break; + } + + if (i < KeyCell->SubKeyCounts[StorageType]) + { + RtlMoveMemory(HashCell->Table + i + 1, + HashCell->Table + i, + (HashCell->HashTableSize - 1 - i) * + sizeof(HashCell->Table[0])); + } + + HashCell->Table[i].KeyOffset = NKBOffset; + HashCell->Table[i].HashValue = HashValue; HvMarkCellDirty(&RegistryHive->Hive, KeyCell->SubKeyLists[StorageType]); return STATUS_SUCCESS; } @@ -604,7 +620,7 @@ if (*VBOffset == HCELL_NULL) { Status = STATUS_INSUFFICIENT_RESOURCES; - } + } else { ASSERT(NameSize <= USHORT_MAX); @@ -645,7 +661,7 @@ OUT PCM_KEY_VALUE *pValueCell, OUT HCELL_INDEX *pValueCellOffset) { - PVALUE_LIST_CELL ValueListCell; + PVALUE_LIST_CELL ValueListCell; PCM_KEY_VALUE NewValueCell; HCELL_INDEX ValueListCellOffset; HCELL_INDEX NewValueCellOffset;

1 0

[hpoussin] 24477: - Start NetLogon service (lsass.exe) - Fix lots of problems in error handling - Some general cleanup
by hpoussin＠svn.reactos.org 09 Oct '06

09 Oct '06

Author: hpoussin Date: Mon Oct 9 23:19:28 2006 New Revision: 24477 URL: http://svn.reactos.org/svn/reactos?rev=24477&view=rev Log: - Start NetLogon service (lsass.exe) - Fix lots of problems in error handling - Some general cleanup Modified: trunk/reactos/base/system/winlogon/sas.c trunk/reactos/base/system/winlogon/screensaver.c trunk/reactos/base/system/winlogon/setup.c trunk/reactos/base/system/winlogon/setup.h trunk/reactos/base/system/winlogon/winlogon.c trunk/reactos/base/system/winlogon/winlogon.h trunk/reactos/base/system/winlogon/wlx.c Modified: trunk/reactos/base/system/winlogon/sas.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/sas.c… ============================================================================== --- trunk/reactos/base/system/winlogon/sas.c (original) +++ trunk/reactos/base/system/winlogon/sas.c Mon Oct 9 23:19:28 2006 @@ -28,16 +28,29 @@ StartTaskManager( IN OUT PWLSESSION Session) { + LPVOID lpEnvironment; + + if (!Session->Gina.Functions.WlxStartApplication) + return FALSE; + + if (!CreateEnvironmentBlock( + &lpEnvironment, + Session->UserToken, + TRUE)) + { + return FALSE; + } + return Session->Gina.Functions.WlxStartApplication( Session->Gina.Context, L"Default", - NULL, + lpEnvironment, L"taskmgr.exe"); } BOOL SetDefaultLanguage( - IN BOOLEAN UserProfile) + IN BOOL UserProfile) { HKEY BaseKey; LPCWSTR SubKey; @@ -146,11 +159,11 @@ HandleLogon( IN OUT PWLSESSION Session) { - PROFILEINFOW ProfileInfo = { 0 }; + PROFILEINFOW ProfileInfo = { 0, }; LPVOID lpEnvironment = NULL; BOOLEAN Old; - if (!(Session->Options & WLX_LOGON_OPT_NO_PROFILE)) + if (0 == (Session->Options & WLX_LOGON_OPT_NO_PROFILE)) { /* Load the user profile */ ProfileInfo.dwSize = sizeof(PROFILEINFOW); @@ -165,7 +178,6 @@ if (!LoadUserProfileW(Session->UserToken, &ProfileInfo)) { ERR("WL: LoadUserProfileW() failed\n"); - CloseHandle(Session->UserToken); return FALSE; } } @@ -177,9 +189,12 @@ TRUE)) { ERR("WL: CreateEnvironmentBlock() failed\n"); - if (!(Session->Options & WLX_LOGON_OPT_NO_PROFILE)) + if (0 == (Session->Options & WLX_LOGON_OPT_NO_PROFILE)) + { UnloadUserProfile(WLSession->UserToken, ProfileInfo.hProfile); - CloseHandle(Session->UserToken); + CloseHandle(Session->UserToken); + Session->UserToken = NULL; + } return FALSE; } /* FIXME: use Session->Profile.pszEnvironment */ @@ -195,7 +210,15 @@ /* Set default language */ if (!SetDefaultLanguage(TRUE)) + { + if (0 == (Session->Options & WLX_LOGON_OPT_NO_PROFILE)) + { + UnloadUserProfile(WLSession->UserToken, ProfileInfo.hProfile); + CloseHandle(Session->UserToken); + Session->UserToken = NULL; + } return FALSE; + } if (!Session->Gina.Functions.WlxActivateUserShell( Session->Gina.Context, @@ -203,6 +226,12 @@ NULL, /* FIXME */ lpEnvironment)) { + if (0 == (Session->Options & WLX_LOGON_OPT_NO_PROFILE)) + { + UnloadUserProfile(WLSession->UserToken, ProfileInfo.hProfile); + CloseHandle(Session->UserToken); + Session->UserToken = NULL; + } return FALSE; } /*if(!GinaInst->Functions->WlxActivateUserShell(GinaInst->Context, @@ -222,7 +251,7 @@ */ if (!InitializeScreenSaver(Session)) - ERR("WL: Failed to initialize screen saver\n"); + WARN("WL: Failed to initialize screen saver\n"); return TRUE; } @@ -241,7 +270,7 @@ { PLOGOFF_SHUTDOWN_DATA LSData = (PLOGOFF_SHUTDOWN_DATA)Parameter; - if (LSData->Session->UserToken && !ImpersonateLoggedOnUser(LSData->Session->UserToken)) + if (LSData->Session->UserToken != NULL && !ImpersonateLoggedOnUser(LSData->Session->UserToken)) { ERR("ImpersonateLoggedOnUser() failed with error %lu\n", GetLastError()); return 0; @@ -363,7 +392,7 @@ UnregisterClassW(WINLOGON_SAS_CLASS, hAppInstance); } -BOOL +NTSTATUS HandleShutdown( IN OUT PWLSESSION Session, IN DWORD wlxAction) @@ -423,11 +452,11 @@ if (FALSE) { /* FIXME - only show this dialog if it's a shutdown and the computer doesn't support APM */ - DialogBox(hAppInstance, MAKEINTRESOURCE(IDD_SHUTDOWNCOMPUTER), 0, ShutdownComputerWindowProc); + DialogBox(hAppInstance, MAKEINTRESOURCE(IDD_SHUTDOWNCOMPUTER), GetDesktopWindow(), ShutdownComputerWindowProc); } NtShutdownSystem(ShutdownNoReboot); } - return TRUE; + return STATUS_SUCCESS; } static VOID @@ -508,9 +537,9 @@ DWORD wlxAction = WLX_SAS_ACTION_NONE; if (Session->LogonStatus == WKSTA_IS_LOGGED_ON) - wlxAction = Session->Gina.Functions.WlxLoggedOnSAS(Session->Gina.Context, dwSasType, NULL); + wlxAction = (DWORD)Session->Gina.Functions.WlxLoggedOnSAS(Session->Gina.Context, dwSasType, NULL); else if (Session->LogonStatus == WKSTA_IS_LOCKED) - wlxAction = Session->Gina.Functions.WlxWkstaLockedSAS(Session->Gina.Context, dwSasType); + wlxAction = (DWORD)Session->Gina.Functions.WlxWkstaLockedSAS(Session->Gina.Context, dwSasType); else { /* Display a new dialog (if necessary) */ @@ -528,7 +557,7 @@ ZeroMemory(&Session->Profile, sizeof(Session->Profile)); Session->Options = 0; - wlxAction = Session->Gina.Functions.WlxLoggedOutSAS( + wlxAction = (DWORD)Session->Gina.Functions.WlxLoggedOutSAS( Session->Gina.Context, Session->SASAction, &Session->LogonId, Modified: trunk/reactos/base/system/winlogon/screensaver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/scree… ============================================================================== --- trunk/reactos/base/system/winlogon/screensaver.c (original) +++ trunk/reactos/base/system/winlogon/screensaver.c Mon Oct 9 23:19:28 2006 @@ -244,7 +244,7 @@ PROCESS_INFORMATION ProcessInformation; HANDLE HandleArray[2]; LONG rc; - NTSTATUS Status; + DWORD Status; BOOL ret = FALSE; if (!ImpersonateLoggedOnUser(Session->UserToken)) Modified: trunk/reactos/base/system/winlogon/setup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/setup… ============================================================================== --- trunk/reactos/base/system/winlogon/setup.c (original) +++ trunk/reactos/base/system/winlogon/setup.c Mon Oct 9 23:19:28 2006 @@ -70,7 +70,7 @@ } -BOOL +static BOOL SetSetupType (DWORD dwSetupType) { DWORD dwError; Modified: trunk/reactos/base/system/winlogon/setup.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/setup… ============================================================================== --- trunk/reactos/base/system/winlogon/setup.h (original) +++ trunk/reactos/base/system/winlogon/setup.h Mon Oct 9 23:19:28 2006 @@ -28,7 +28,6 @@ #define __SETUP_H__ DWORD GetSetupType (VOID); -BOOL SetSetupType (DWORD dwSetupType); BOOL RunSetup (VOID); #endif /* __SETUP_H__ */ Modified: trunk/reactos/base/system/winlogon/winlogon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/winlo… ============================================================================== --- trunk/reactos/base/system/winlogon/winlogon.c (original) +++ trunk/reactos/base/system/winlogon/winlogon.c Mon Oct 9 23:19:28 2006 @@ -102,10 +102,8 @@ hService = OpenServiceW(hSCManager, ServiceName, SERVICE_START); if (!hService) goto cleanup; -#if 0 if (!StartServiceW(hService, 0, NULL)) goto cleanup; -#endif ret = TRUE; @@ -140,9 +138,7 @@ return FALSE; } -#if 0 WaitForSingleObject(LsassInitEvent, INFINITE); -#endif CloseHandle(LsassInitEvent); return TRUE; @@ -360,6 +356,7 @@ ULONG AuthenticationPackage; NTSTATUS Status; #endif + ULONG HardErrorResponse; MSG Msg; UNREFERENCED_PARAMETER(hPrevInstance); @@ -377,27 +374,27 @@ } WLSession = (PWLSESSION)HeapAlloc(GetProcessHeap(), 0, sizeof(WLSESSION)); + if (!WLSession) + { + ERR("WL: Could not allocate memory for winlogon instance\n"); + NtRaiseHardError(STATUS_SYSTEM_PROCESS_TERMINATED, 0, 0, NULL, OptionOk, &HardErrorResponse); + ExitProcess(1); + } ZeroMemory(WLSession, sizeof(WLSESSION)); - if (!WLSession) - { - ERR("WL: Could not allocate memory for winlogon instance\n"); - NtRaiseHardError(STATUS_SYSTEM_PROCESS_TERMINATED, 0, 0, 0, 0, 0); + WLSession->DialogTimeout = 120; /* 2 minutes */ + + if (!CreateWindowStationAndDesktops(WLSession)) + { + ERR("WL: Could not create window station and desktops\n"); + NtRaiseHardError(STATUS_SYSTEM_PROCESS_TERMINATED, 0, 0, NULL, OptionOk, &HardErrorResponse); ExitProcess(1); } - WLSession->DialogTimeout = 120; /* 2 minutes */ - - if (!CreateWindowStationAndDesktops(WLSession)) - { - ERR("WL: Could not create window station and desktops\n"); - NtRaiseHardError(STATUS_SYSTEM_PROCESS_TERMINATED, 0, 0, 0, 0, 0); - ExitProcess(1); - } LockWorkstation(WLSession); if (!StartServicesManager()) { ERR("WL: Could not start services.exe\n"); - NtRaiseHardError(STATUS_SYSTEM_PROCESS_TERMINATED, 0, 0, 0, 0, 0); + NtRaiseHardError(STATUS_SYSTEM_PROCESS_TERMINATED, 0, 0, NULL, OptionOk, &HardErrorResponse); ExitProcess(1); } @@ -420,7 +417,7 @@ if (!StartLsass()) { DPRINT1("WL: Failed to start lsass.exe service (error %lu)\n", GetLastError()); - NtRaiseHardError(STATUS_SYSTEM_PROCESS_TERMINATED, 0, 0, 0, 0, 0); + NtRaiseHardError(STATUS_SYSTEM_PROCESS_TERMINATED, 0, 0, 0, OptionOk, &HardErrorResponse); ExitProcess(1); } @@ -428,7 +425,7 @@ if (!GinaInit(WLSession)) { ERR("WL: Failed to initialize Gina\n"); - DialogBoxParam(hAppInstance, MAKEINTRESOURCE(IDD_GINALOADFAILED), 0, GinaLoadFailedWindowProc, (LPARAM)L""); + DialogBoxParam(hAppInstance, MAKEINTRESOURCE(IDD_GINALOADFAILED), GetDesktopWindow(), GinaLoadFailedWindowProc, (LPARAM)L""); HandleShutdown(WLSession, WLX_SAS_ACTION_SHUTDOWN_REBOOT); ExitProcess(1); } Modified: trunk/reactos/base/system/winlogon/winlogon.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/winlo… ============================================================================== --- trunk/reactos/base/system/winlogon/winlogon.h (original) +++ trunk/reactos/base/system/winlogon/winlogon.h Mon Oct 9 23:19:28 2006 @@ -89,7 +89,7 @@ /* Functions available if WlxVersion >= WLX_VERSION_1_1 (MS Windows 3.5.1) */ PFWLXSCREENSAVERNOTIFY WlxScreenSaverNotify; /* optional */ - PFWLXSTARTAPPLICATION WlxStartApplication; /* optional, not called ATM */ + PFWLXSTARTAPPLICATION WlxStartApplication; /* optional */ /* Functions available if WlxVersion >= WLX_VERSION_1_2 (MS Windows NT 4.0) */ @@ -179,7 +179,7 @@ /* sas.c */ BOOL SetDefaultLanguage( - IN BOOLEAN UserProfile); + IN BOOL UserProfile); BOOL InitializeSAS( @@ -213,7 +213,7 @@ CreateWindowStationAndDesktops( IN OUT PWLSESSION Session); -BOOL +NTSTATUS HandleShutdown( IN OUT PWLSESSION Session, IN DWORD wlxAction); Modified: trunk/reactos/base/system/winlogon/wlx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/wlx.c… ============================================================================== --- trunk/reactos/base/system/winlogon/wlx.c (original) +++ trunk/reactos/base/system/winlogon/wlx.c Mon Oct 9 23:19:28 2006 @@ -896,7 +896,10 @@ } /* FIXME: big HACK */ - Session->WinlogonDesktop = Session->ApplicationDesktop; + CloseDesktop(Session->WinlogonDesktop); + CloseDesktop(Session->ScreenSaverDesktop); + Session->WinlogonDesktop = OpenDesktopW(L"Default", 0, FALSE, GENERIC_ALL); + Session->ScreenSaverDesktop = OpenDesktopW(L"Default", 0, FALSE, GENERIC_ALL); /* * Switch to winlogon desktop @@ -914,13 +917,25 @@ if (!ret) { if (Session->ApplicationDesktop) + { CloseDesktop(Session->ApplicationDesktop); + Session->ApplicationDesktop = NULL; + } if (Session->WinlogonDesktop) + { CloseDesktop(Session->WinlogonDesktop); + Session->WinlogonDesktop = NULL; + } if (Session->ScreenSaverDesktop) + { CloseDesktop(Session->ScreenSaverDesktop); + Session->ScreenSaverDesktop = NULL; + } if (Session->InteractiveWindowStation) + { CloseWindowStation(Session->InteractiveWindowStation); + Session->InteractiveWindowStation = NULL; + } } HeapFree(GetProcessHeap(), 0, pDefaultAcl); HeapFree(GetProcessHeap(), 0, pUserDesktopAcl);

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