Ros-diffs September 2011

ros-diffs@reactos.org

20 participants
399 discussions

[tfaber] 53810: [KMTESTS/MM] - Extend MmSection test to include passing different files and mapping a view

by tfaber＠svn.reactos.org

Author: tfaber Date: Fri Sep 23 11:43:02 2011 New Revision: 53810 URL: http://svn.reactos.org/svn/reactos?rev=53810&view=rev Log: [KMTESTS/MM] - Extend MmSection test to include passing different files and mapping a view Modified: trunk/rostests/kmtests/ntos_mm/MmSection.c Modified: trunk/rostests/kmtests/ntos_mm/MmSection.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_mm/MmSection… ============================================================================== --- trunk/rostests/kmtests/ntos_mm/MmSection.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/ntos_mm/MmSection.c [iso-8859-1] Fri Sep 23 11:43:02 2011 @@ -18,6 +18,57 @@ ok_eq_hex(Status, STATUS_SUCCESS); \ ok_eq_ulong(ObjectInfo.PointerCount, Pointers); \ ok_eq_ulong(ObjectInfo.HandleCount, Handles); \ +} while (0) + +#define CheckSection(SectionObject, SectionFlag) do \ +{ \ + SECTION_BASIC_INFORMATION Sbi; \ + HANDLE SectionHandle = NULL; \ + NTSTATUS Status; \ + if (skip(SectionObject != NULL && \ + SectionObject != (PVOID)0x5555555555555555ULL, \ + "blah\n")) \ + break; \ + Status = ObOpenObjectByPointer(SectionObject, OBJ_KERNEL_HANDLE, \ + NULL, 0, MmSectionObjectType, \ + KernelMode, &SectionHandle); \ + ok_eq_hex(Status, STATUS_SUCCESS); \ + ok(SectionHandle != NULL, "Section handle null\n"); \ + if (!skip(NT_SUCCESS(Status) && SectionHandle, \ + "No section handle\n")) \ + { \ + Status = ZwQuerySection(SectionHandle, SectionBasicInformation, \ + &Sbi, sizeof Sbi, NULL); \ + ok_eq_hex(Status, STATUS_SUCCESS); \ + ok_eq_pointer(Sbi.BaseAddress, NULL); \ + ok_eq_longlong(Sbi.Size.QuadPart, 1LL); \ + ok_eq_hex(Sbi.Attributes, SectionFlag | SEC_FILE); \ + ZwClose(SectionHandle); \ + } \ +} while (0) + +#define TestMapView(SectionObject, ExpectAtBase, ExpectM) do \ +{ \ + NTSTATUS Status; \ + PVOID BaseAddress = NULL; \ + SIZE_T ViewSize = 0; \ + LARGE_INTEGER SectionOffset; \ + if (skip(SectionObject != NULL && \ + SectionObject != (PVOID)0x5555555555555555ULL, \ + "No section object\n")) \ + break; \ + \ + SectionOffset.QuadPart = 0; \ + Status = MmMapViewOfSection(SectionObject, PsGetCurrentProcess(), \ + &BaseAddress, 0, 1, &SectionOffset, \ + &ViewSize, ViewUnmap, 0, PAGE_READONLY); \ + ok_eq_hex(Status, ExpectAtBase ? STATUS_SUCCESS : STATUS_IMAGE_NOT_AT_BASE);\ + if (!skip(NT_SUCCESS(Status), "Section not mapped\n")) \ + { \ + ok_eq_uint(*(PUCHAR)BaseAddress, ExpectM ? 'M' : 0); \ + Status = MmUnmapViewOfSection(PsGetCurrentProcess(), BaseAddress); \ + ok_eq_hex(Status, STATUS_SUCCESS); \ + } \ } while (0) static @@ -149,6 +200,8 @@ ok(SectionObject != InvalidPointer, "Section object pointer untouched\n"); ok(SectionObject != NULL, "Section object pointer NULL\n"); CheckObject(FileHandle2, PointerCount2, 1L); + CheckSection(SectionObject, SEC_IMAGE); + TestMapView(SectionObject, FALSE, TRUE); if (SectionObject && SectionObject != InvalidPointer) ObDereferenceObject(SectionObject); @@ -165,6 +218,8 @@ ok(SectionObject != NULL, "Section object pointer NULL\n"); ++PointerCount2; CheckObject(FileHandle2, PointerCount2, 1L); + CheckSection(SectionObject, 0); + TestMapView(SectionObject, TRUE, TRUE); if (SectionObject && SectionObject != InvalidPointer) ObDereferenceObject(SectionObject); @@ -181,6 +236,8 @@ ok(SectionObject != InvalidPointer, "Section object pointer untouched\n"); ok(SectionObject != NULL, "Section object pointer NULL\n"); CheckObject(FileHandle2, PointerCount2, 1L); + CheckSection(SectionObject, 0); + TestMapView(SectionObject, TRUE, TRUE); if (SectionObject && SectionObject != InvalidPointer) ObDereferenceObject(SectionObject); @@ -212,6 +269,8 @@ ok(SectionObject != NULL, "Section object pointer NULL\n"); ++PointerCount1; CheckObject(FileHandle1, PointerCount1, 1L); + CheckSection(SectionObject, 0); + TestMapView(SectionObject, TRUE, FALSE); if (SectionObject && SectionObject != InvalidPointer) ObDereferenceObject(SectionObject); @@ -228,6 +287,45 @@ ok(SectionObject != InvalidPointer, "Section object pointer untouched\n"); ok(SectionObject != NULL, "Section object pointer NULL\n"); CheckObject(FileHandle1, PointerCount1, 1L); + CheckSection(SectionObject, 0); + TestMapView(SectionObject, TRUE, FALSE); + + if (SectionObject && SectionObject != InvalidPointer) + ObDereferenceObject(SectionObject); + + /* image section with two different files */ + CheckObject(FileHandle1, PointerCount1, 1L); + SectionObject = InvalidPointer; + MaximumSize.QuadPart = 1; + StartSeh() + Status = MmCreateSection(&SectionObject, 0, NULL, &MaximumSize, PAGE_READONLY, SEC_IMAGE, FileHandle1, FileObject2); + EndSeh(STATUS_SUCCESS); + ok_eq_hex(Status, STATUS_SUCCESS); + ok_eq_longlong(MaximumSize.QuadPart, 1LL); + ok(SectionObject != InvalidPointer, "Section object pointer untouched\n"); + ok(SectionObject != NULL, "Section object pointer NULL\n"); + CheckObject(FileHandle1, PointerCount1, 1L); + CheckObject(FileHandle2, PointerCount2, 1L); + CheckSection(SectionObject, 0); + TestMapView(SectionObject, TRUE, TRUE); + + if (SectionObject && SectionObject != InvalidPointer) + ObDereferenceObject(SectionObject); + + CheckObject(FileHandle1, PointerCount1, 1L); + SectionObject = InvalidPointer; + MaximumSize.QuadPart = 1; + StartSeh() + Status = MmCreateSection(&SectionObject, 0, NULL, &MaximumSize, PAGE_READONLY, SEC_IMAGE, FileHandle2, FileObject1); + EndSeh(STATUS_SUCCESS); + ok_eq_hex(Status, STATUS_SUCCESS); + ok_eq_longlong(MaximumSize.QuadPart, 1LL); + ok(SectionObject != InvalidPointer, "Section object pointer untouched\n"); + ok(SectionObject != NULL, "Section object pointer NULL\n"); + CheckObject(FileHandle1, PointerCount1, 1L); + CheckObject(FileHandle2, PointerCount2, 1L); + CheckSection(SectionObject, 0); + TestMapView(SectionObject, TRUE, FALSE); if (SectionObject && SectionObject != InvalidPointer) ObDereferenceObject(SectionObject); @@ -244,6 +342,8 @@ ok(SectionObject != InvalidPointer, "Section object pointer untouched\n"); ok(SectionObject != NULL, "Section object pointer NULL\n"); CheckObject(FileHandle1, PointerCount1, 1L); + CheckSection(SectionObject, 0); + TestMapView(SectionObject, TRUE, FALSE); if (SectionObject && SectionObject != InvalidPointer) ObDereferenceObject(SectionObject); @@ -259,6 +359,8 @@ ok(SectionObject != InvalidPointer, "Section object pointer untouched\n"); ok(SectionObject != NULL, "Section object pointer NULL\n"); CheckObject(FileHandle1, PointerCount1, 1L); + CheckSection(SectionObject, 0); + TestMapView(SectionObject, TRUE, FALSE); if (SectionObject && SectionObject != InvalidPointer) ObDereferenceObject(SectionObject); @@ -274,6 +376,8 @@ ok(SectionObject != InvalidPointer, "Section object pointer untouched\n"); ok(SectionObject != NULL, "Section object pointer NULL\n"); CheckObject(FileHandle1, PointerCount1, 1L); + CheckSection(SectionObject, 0); + TestMapView(SectionObject, TRUE, FALSE); if (SectionObject && SectionObject != InvalidPointer) ObDereferenceObject(SectionObject); @@ -294,6 +398,7 @@ LARGE_INTEGER FileOffset; UCHAR FileData = 0; + ok(ExGetPreviousMode() == UserMode, "Previous mode is kernel mode\n"); /* create a one-byte file that we can use */ InitializeObjectAttributes(&ObjectAttributes, &FileName1, OBJ_CASE_INSENSITIVE, NULL, NULL); Status = ZwCreateFile(&FileHandle1, GENERIC_ALL, &ObjectAttributes, &IoStatusBlock, NULL, FILE_ATTRIBUTE_NORMAL, FILE_SHARE_READ, FILE_SUPERSEDE, FILE_NON_DIRECTORY_FILE, NULL, 0);

12 years, 12 months

[tfaber] 53809: [DDK/PSDK] - Fix several typos. Patch by Elton Chung (elton328 at gmail dot com). Slight compatibility fix by me - Add missing NTSYSAPI to some externs - remove Se*DefaultDacl exter...

by tfaber＠svn.reactos.org

Author: tfaber Date: Fri Sep 23 11:24:15 2011 New Revision: 53809 URL: http://svn.reactos.org/svn/reactos?rev=53809&view=rev Log: [DDK/PSDK] - Fix several typos. Patch by Elton Chung (elton328 at gmail dot com). Slight compatibility fix by me - Add missing NTSYSAPI to some externs - remove Se*DefaultDacl externs from ntifs, as they don't belong there, and are already correctly found in ndk/setypes.h Modified: trunk/reactos/include/ddk/classpnp.h trunk/reactos/include/ddk/ntifs.h trunk/reactos/include/ndk/extypes.h trunk/reactos/include/ndk/mmtypes.h trunk/reactos/include/ndk/setypes.h trunk/reactos/include/psdk/mimeole.idl trunk/reactos/include/psdk/ras.h trunk/reactos/include/psdk/usb.h Modified: trunk/reactos/include/ddk/classpnp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/classpnp.h?rev… ============================================================================== --- trunk/reactos/include/ddk/classpnp.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/classpnp.h [iso-8859-1] Fri Sep 23 11:24:15 2011 @@ -369,7 +369,7 @@ PDEVICE_OBJECT DeviceObject, ULONG *RegFlags, PUNICODE_STRING Name, - PUNICODE_STRING MofResouceName); + PUNICODE_STRING MofResourceName); typedef NTSTATUS (NTAPI *PCLASS_QUERY_WMI_REGINFO)( Modified: trunk/reactos/include/ddk/ntifs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntifs.h?rev=53… ============================================================================== --- trunk/reactos/include/ddk/ntifs.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntifs.h [iso-8859-1] Fri Sep 23 11:24:15 2011 @@ -1651,7 +1651,7 @@ if ((Length -= 1) == 0) { return; } - Address += 1; + Address += 1; } __stosq((PULONG64)(Address), Pattern | ((ULONG64)Pattern << 32), Length / 2); if ((Length & 1) != 0) Address[Length - 1] = Pattern; @@ -8978,9 +8978,6 @@ #include "csq.h" -extern PACL SePublicDefaultDacl; -extern PACL SeSystemDefaultDacl; - #define FS_LFN_APIS 0x00004000 #define FILE_STORAGE_TYPE_SPECIFIED 0x00000041 /* FILE_DIRECTORY_FILE | FILE_NON_DIRECTORY_FILE */ Modified: trunk/reactos/include/ndk/extypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/extypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/extypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/extypes.h [iso-8859-1] Fri Sep 23 11:24:15 2011 @@ -65,7 +65,7 @@ // // Exported NT Build Number // -extern ULONG NtBuildNumber; +extern ULONG NTSYSAPI NtBuildNumber; // // Invalid Handle Value Constant Modified: trunk/reactos/include/ndk/mmtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/mmtypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/mmtypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/mmtypes.h [iso-8859-1] Fri Sep 23 11:24:15 2011 @@ -980,7 +980,7 @@ // // Section Object Type // -extern POBJECT_TYPE MmSectionObjectType; +extern POBJECT_TYPE NTSYSAPI MmSectionObjectType; #endif // !NTOS_MODE_USER Modified: trunk/reactos/include/ndk/setypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/setypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/setypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/setypes.h [iso-8859-1] Fri Sep 23 11:24:15 2011 @@ -176,8 +176,8 @@ // // External SRM Data // -extern PACL SePublicDefaultDacl; -extern PACL SeSystemDefaultDacl; +extern PACL NTSYSAPI SePublicDefaultDacl; +extern PACL NTSYSAPI SeSystemDefaultDacl; #endif #endif Modified: trunk/reactos/include/psdk/mimeole.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/mimeole.idl?r… ============================================================================== --- trunk/reactos/include/psdk/mimeole.idl [iso-8859-1] (original) +++ trunk/reactos/include/psdk/mimeole.idl [iso-8859-1] Fri Sep 23 11:24:15 2011 @@ -611,7 +611,7 @@ DWORD dwCookie; DWORD dwReserved1; DWORD dwReserved2; - } ADRESSPROPS, *LPADDRESSPROPS; + } ADDRESSPROPS, *LPADDRESSPROPS; typedef struct tagADDRESSLIST { Modified: trunk/reactos/include/psdk/ras.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ras.h?rev=538… ============================================================================== --- trunk/reactos/include/psdk/ras.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ras.h [iso-8859-1] Fri Sep 23 11:24:15 2011 @@ -768,7 +768,7 @@ #if (WINVER >= 0x500) typedef RASEAPUSERIDENTITYW RASEAPUSERIDENTITY, *LPRASEAPUSERIDENTITY; typedef DWORD (WINAPI *PFNRASGETBUFFER) (PBYTE *ppBuffer, PDWORD pdwSize); -typedef DWORD (WINAPI *PFNRASFREEBUFFER) (PBYTE pBufer); +typedef DWORD (WINAPI *PFNRASFREEBUFFER) (PBYTE pBuffer); typedef DWORD (WINAPI *PFNRASSENDBUFFER) (HANDLE hPort, PBYTE pBuffer, DWORD dwSize); typedef DWORD (WINAPI *PFNRASRECEIVEBUFFER) (HANDLE hPort, PBYTE pBuffer, PDWORD pdwSize, DWORD dwTimeOut, HANDLE hEvent); typedef DWORD (WINAPI *PFNRASRETRIEVEBUFFER) (HANDLE hPort, PBYTE pBuffer, PDWORD pdwSize); Modified: trunk/reactos/include/psdk/usb.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/usb.h?rev=538… ============================================================================== --- trunk/reactos/include/psdk/usb.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/usb.h [iso-8859-1] Fri Sep 23 11:24:15 2011 @@ -201,11 +201,13 @@ #define USBD_STATUS_FRAME_CONTROL_NOT_OWNED ((USBD_STATUS)0xC0000D00L) #define USBD_STATUS_NOT_SUPPORTED ((USBD_STATUS)0xC0000E00L) #define USBD_STATUS_INAVLID_CONFIGURATION_DESCRIPTOR ((USBD_STATUS)0xC0000F00L) +#define USBD_STATUS_INVALID_CONFIGURATION_DESCRIPTOR ((USBD_STATUS)0xC0000F00L) #define USBD_STATUS_INSUFFICIENT_RESOURCES ((USBD_STATUS)0xC0001000L) #define USBD_STATUS_SET_CONFIG_FAILED ((USBD_STATUS)0xC0002000L) #define USBD_STATUS_BUFFER_TOO_SMALL ((USBD_STATUS)0xC0003000L) #define USBD_STATUS_INTERFACE_NOT_FOUND ((USBD_STATUS)0xC0004000L) #define USBD_STATUS_INAVLID_PIPE_FLAGS ((USBD_STATUS)0xC0005000L) +#define USBD_STATUS_INVALID_PIPE_FLAGS ((USBD_STATUS)0xC0005000L) #define USBD_STATUS_TIMEOUT ((USBD_STATUS)0xC0006000L) #define USBD_STATUS_DEVICE_GONE ((USBD_STATUS)0xC0007000L) #define USBD_STATUS_STATUS_NOT_MAPPED ((USBD_STATUS)0xC0008000L)

12 years, 12 months

[ekohl] 53808: [LSASRV] Implement the PolicyPrimaryDomainInformation and PolicyAccountDomainInformation cases of LsarQueryInformationPolicy.

by ekohl＠svn.reactos.org

Author: ekohl Date: Fri Sep 23 10:01:22 2011 New Revision: 53808 URL: http://svn.reactos.org/svn/reactos?rev=53808&view=rev Log: [LSASRV] Implement the PolicyPrimaryDomainInformation and PolicyAccountDomainInformation cases of LsarQueryInformationPolicy. Modified: trunk/reactos/dll/win32/lsasrv/lsarpc.c trunk/reactos/dll/win32/lsasrv/lsasrv.h trunk/reactos/dll/win32/lsasrv/policy.c Modified: trunk/reactos/dll/win32/lsasrv/lsarpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsarpc.c?… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsarpc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsarpc.c [iso-8859-1] Fri Sep 23 10:01:22 2011 @@ -200,113 +200,25 @@ switch (InformationClass) { - case PolicyAuditEventsInformation: /* 2 */ - { - PLSAPR_POLICY_AUDIT_EVENTS_INFO p = MIDL_user_allocate(sizeof(LSAPR_POLICY_AUDIT_EVENTS_INFO)); - if (p == NULL) - return STATUS_INSUFFICIENT_RESOURCES; - - p->AuditingMode = FALSE; /* no auditing */ - p->EventAuditingOptions = NULL; - p->MaximumAuditEventCount = 0; - - *PolicyInformation = (PLSAPR_POLICY_INFORMATION)p; - } - break; + case PolicyAuditEventsInformation: /* 2 */ + Status = LsarQueryAuditEvents(PolicyHandle, + PolicyInformation); + break; case PolicyPrimaryDomainInformation: /* 3 */ - { - PLSAPR_POLICY_PRIMARY_DOM_INFO p = MIDL_user_allocate(sizeof(LSAPR_POLICY_PRIMARY_DOM_INFO)); - if (p == NULL) - return STATUS_INSUFFICIENT_RESOURCES; - - p->Name.Length = 0; - p->Name.MaximumLength = 0; - p->Name.Buffer = NULL; -#if 0 - p->Name.Length = wcslen(L"COMPUTERNAME"); - p->Name.MaximumLength = p->Name.Length + sizeof(WCHAR); - p->Name.Buffer = MIDL_user_allocate(p->Name.MaximumLength); - if (p->Name.Buffer == NULL) - { - MIDL_user_free(p); - return STATUS_INSUFFICIENT_RESOURCES; - } - - wcscpy(p->Name.Buffer, L"COMPUTERNAME"); -#endif - - p->Sid = NULL; /* no domain, no workgroup */ - - *PolicyInformation = (PLSAPR_POLICY_INFORMATION)p; - } - break; + Status = LsarQueryPrimaryDomain(PolicyHandle, + PolicyInformation); + break; case PolicyAccountDomainInformation: /* 5 */ - { - PLSAPR_POLICY_ACCOUNT_DOM_INFO p = MIDL_user_allocate(sizeof(LSAPR_POLICY_ACCOUNT_DOM_INFO)); - if (p == NULL) - return STATUS_INSUFFICIENT_RESOURCES; - - p->DomainName.Length = 0; - p->DomainName.MaximumLength = 0; - p->DomainName.Buffer = NULL; -#if 0 - p->DomainName.Length = wcslen(L"COMPUTERNAME"); - p->DomainName.MaximumLength = p->DomainName.Length + sizeof(WCHAR); - p->DomainName.Buffer = MIDL_user_allocate(p->DomainName.MaximumLength); - if (p->DomainName.Buffer == NULL) - { - MIDL_user_free(p); - return STATUS_INSUFFICIENT_RESOURCES; - } - - wcscpy(p->DomainName.Buffer, L"COMPUTERNAME"); -#endif - - p->Sid = NULL; /* no domain, no workgroup */ - - *PolicyInformation = (PLSAPR_POLICY_INFORMATION)p; - } - break; - - case PolicyDnsDomainInformation: /* 12 (0xc) */ - { - PLSAPR_POLICY_DNS_DOMAIN_INFO p = MIDL_user_allocate(sizeof(LSAPR_POLICY_DNS_DOMAIN_INFO)); - if (p == NULL) - return STATUS_INSUFFICIENT_RESOURCES; - - p->Name.Length = 0; - p->Name.MaximumLength = 0; - p->Name.Buffer = NULL; -#if 0 - p->Name.Length = wcslen(L"COMPUTERNAME"); - p->Name.MaximumLength = p->Name.Length + sizeof(WCHAR); - p->Name.Buffer = MIDL_user_allocate(p->Name.MaximumLength); - if (p->Name.Buffer == NULL) - { - MIDL_user_free(p); - return STATUS_INSUFFICIENT_RESOURCES; - } - - wcscpy(p->Name.Buffer, L"COMPUTERNAME"); -#endif - - p->DnsDomainName.Length = 0; - p->DnsDomainName.MaximumLength = 0; - p->DnsDomainName.Buffer = NULL; - - p->DnsForestName.Length = 0; - p->DnsForestName.MaximumLength = 0; - p->DnsForestName.Buffer = 0; - - memset(&p->DomainGuid, 0, sizeof(GUID)); - - p->Sid = NULL; /* no domain, no workgroup */ - - *PolicyInformation = (PLSAPR_POLICY_INFORMATION)p; - } - break; + Status = LsarQueryAccountDomain(PolicyHandle, + PolicyInformation); + break; + + case PolicyDnsDomainInformation: /* 12 (0xc) */ + Status = LsarQueryDnsDomain(PolicyHandle, + PolicyInformation); + break; case PolicyAuditLogInformation: case PolicyPdAccountInformation: @@ -317,13 +229,12 @@ case PolicyAuditFullSetInformation: case PolicyAuditFullQueryInformation: case PolicyEfsInformation: - { FIXME("category not implemented\n"); - return STATUS_UNSUCCESSFUL; - } - } - - return STATUS_SUCCESS; + Status = STATUS_UNSUCCESSFUL; + break; + } + + return Status; } Modified: trunk/reactos/dll/win32/lsasrv/lsasrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsasrv.h?… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsasrv.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsasrv.h [iso-8859-1] Fri Sep 23 10:01:22 2011 @@ -92,6 +92,22 @@ /* policy.c */ NTSTATUS +LsarQueryAuditEvents(LSAPR_HANDLE PolicyHandle, + PLSAPR_POLICY_INFORMATION *PolicyInformation); + +NTSTATUS +LsarQueryPrimaryDomain(LSAPR_HANDLE PolicyHandle, + PLSAPR_POLICY_INFORMATION *PolicyInformation); + +NTSTATUS +LsarQueryAccountDomain(LSAPR_HANDLE PolicyHandle, + PLSAPR_POLICY_INFORMATION *PolicyInformation); + +NTSTATUS +LsarQueryDnsDomain(LSAPR_HANDLE PolicyHandle, + PLSAPR_POLICY_INFORMATION *PolicyInformation); + +NTSTATUS LsarSetPrimaryDomain(LSAPR_HANDLE PolicyObject, PLSAPR_POLICY_PRIMARY_DOM_INFO Info); Modified: trunk/reactos/dll/win32/lsasrv/policy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/policy.c?… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/policy.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/policy.c [iso-8859-1] Fri Sep 23 10:01:22 2011 @@ -115,4 +115,286 @@ return STATUS_NOT_IMPLEMENTED; } + +NTSTATUS +LsarQueryAuditEvents(LSAPR_HANDLE PolicyHandle, + PLSAPR_POLICY_INFORMATION *PolicyInformation) +{ + PLSAPR_POLICY_AUDIT_EVENTS_INFO p = NULL; + + p = MIDL_user_allocate(sizeof(LSAPR_POLICY_AUDIT_EVENTS_INFO)); + if (p == NULL) + return STATUS_INSUFFICIENT_RESOURCES; + + p->AuditingMode = FALSE; /* no auditing */ + p->EventAuditingOptions = NULL; + p->MaximumAuditEventCount = 0; + + *PolicyInformation = (PLSAPR_POLICY_INFORMATION)p; + + return STATUS_SUCCESS; +} + + +NTSTATUS +LsarQueryPrimaryDomain(LSAPR_HANDLE PolicyHandle, + PLSAPR_POLICY_INFORMATION *PolicyInformation) +{ + PLSAPR_POLICY_PRIMARY_DOM_INFO p = NULL; + PUNICODE_STRING DomainName; + ULONG AttributeSize; + NTSTATUS Status; + + *PolicyInformation = NULL; + + p = MIDL_user_allocate(sizeof(LSAPR_POLICY_PRIMARY_DOM_INFO)); + if (p == NULL) + return STATUS_INSUFFICIENT_RESOURCES; + + /* Domain Name */ + Status = LsapGetObjectAttribute((PLSA_DB_OBJECT)PolicyHandle, + L"PolPrDmN", + NULL, + &AttributeSize); + if (!NT_SUCCESS(Status)) + { + goto Done; + } + + if (AttributeSize > 0) + { + DomainName = MIDL_user_allocate(AttributeSize); + if (DomainName == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto Done; + } + + Status = LsapGetObjectAttribute((PLSA_DB_OBJECT)PolicyHandle, + L"PolPrDmN", + DomainName, + &AttributeSize); + if (Status == STATUS_SUCCESS) + { + DomainName->Buffer = (LPWSTR)((ULONG_PTR)DomainName + (ULONG_PTR)DomainName->Buffer); + + TRACE("PrimaryDomainName: %wZ\n", DomainName); + + p->Name.Buffer = MIDL_user_allocate(DomainName->MaximumLength); + if (p->Name.Buffer == NULL) + { + MIDL_user_free(DomainName); + Status = STATUS_INSUFFICIENT_RESOURCES; + goto Done; + } + + p->Name.Length = DomainName->Length; + p->Name.MaximumLength = DomainName->MaximumLength; + memcpy(p->Name.Buffer, + DomainName->Buffer, + DomainName->MaximumLength); + } + + MIDL_user_free(DomainName); + } + + /* Domain SID */ + AttributeSize = 0; + Status = LsapGetObjectAttribute((PLSA_DB_OBJECT)PolicyHandle, + L"PolPrDmS", + NULL, + &AttributeSize); + if (!NT_SUCCESS(Status)) + { + goto Done; + } + + if (AttributeSize > 0) + { + p->Sid = MIDL_user_allocate(AttributeSize); + if (p->Sid == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto Done; + } + + Status = LsapGetObjectAttribute((PLSA_DB_OBJECT)PolicyHandle, + L"PolPrDmS", + p->Sid, + &AttributeSize); + } + + *PolicyInformation = (PLSAPR_POLICY_INFORMATION)p; + +Done: + if (!NT_SUCCESS(Status)) + { + if (p) + { + if (p->Name.Buffer) + MIDL_user_free(p->Name.Buffer); + + if (p->Sid) + MIDL_user_free(p->Sid); + + MIDL_user_free(p); + } + } + + return STATUS_SUCCESS; +} + + +NTSTATUS +LsarQueryAccountDomain(LSAPR_HANDLE PolicyHandle, + PLSAPR_POLICY_INFORMATION *PolicyInformation) +{ + PLSAPR_POLICY_ACCOUNT_DOM_INFO p = NULL; + PUNICODE_STRING DomainName; + ULONG AttributeSize; + NTSTATUS Status; + + *PolicyInformation = NULL; + + p = MIDL_user_allocate(sizeof(LSAPR_POLICY_ACCOUNT_DOM_INFO)); + if (p == NULL) + return STATUS_INSUFFICIENT_RESOURCES; + + /* Domain Name */ + Status = LsapGetObjectAttribute((PLSA_DB_OBJECT)PolicyHandle, + L"PolAcDmN", + NULL, + &AttributeSize); + if (!NT_SUCCESS(Status)) + { + goto Done; + } + + if (AttributeSize > 0) + { + DomainName = MIDL_user_allocate(AttributeSize); + if (DomainName == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto Done; + } + + Status = LsapGetObjectAttribute((PLSA_DB_OBJECT)PolicyHandle, + L"PolAcDmN", + DomainName, + &AttributeSize); + if (Status == STATUS_SUCCESS) + { + DomainName->Buffer = (LPWSTR)((ULONG_PTR)DomainName + (ULONG_PTR)DomainName->Buffer); + + TRACE("AccountDomainName: %wZ\n", DomainName); + + p->DomainName.Buffer = MIDL_user_allocate(DomainName->MaximumLength); + if (p->DomainName.Buffer == NULL) + { + MIDL_user_free(DomainName); + Status = STATUS_INSUFFICIENT_RESOURCES; + goto Done; + } + + p->DomainName.Length = DomainName->Length; + p->DomainName.MaximumLength = DomainName->MaximumLength; + memcpy(p->DomainName.Buffer, + DomainName->Buffer, + DomainName->MaximumLength); + } + + MIDL_user_free(DomainName); + } + + /* Domain SID */ + AttributeSize = 0; + Status = LsapGetObjectAttribute((PLSA_DB_OBJECT)PolicyHandle, + L"PolAcDmS", + NULL, + &AttributeSize); + if (!NT_SUCCESS(Status)) + { + goto Done; + } + + if (AttributeSize > 0) + { + p->Sid = MIDL_user_allocate(AttributeSize); + if (p->Sid == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto Done; + } + + Status = LsapGetObjectAttribute((PLSA_DB_OBJECT)PolicyHandle, + L"PolAcDmS", + p->Sid, + &AttributeSize); + } + + *PolicyInformation = (PLSAPR_POLICY_INFORMATION)p; + +Done: + if (!NT_SUCCESS(Status)) + { + if (p) + { + if (p->DomainName.Buffer) + MIDL_user_free(p->DomainName.Buffer); + + if (p->Sid) + MIDL_user_free(p->Sid); + + MIDL_user_free(p); + } + } + + return STATUS_SUCCESS; +} + + +NTSTATUS +LsarQueryDnsDomain(LSAPR_HANDLE PolicyHandle, + PLSAPR_POLICY_INFORMATION *PolicyInformation) +{ + PLSAPR_POLICY_DNS_DOMAIN_INFO p = NULL; + + p = MIDL_user_allocate(sizeof(LSAPR_POLICY_DNS_DOMAIN_INFO)); + if (p == NULL) + return STATUS_INSUFFICIENT_RESOURCES; + + p->Name.Length = 0; + p->Name.MaximumLength = 0; + p->Name.Buffer = NULL; +#if 0 + p->Name.Length = wcslen(L"COMPUTERNAME"); + p->Name.MaximumLength = p->Name.Length + sizeof(WCHAR); + p->Name.Buffer = MIDL_user_allocate(p->Name.MaximumLength); + if (p->Name.Buffer == NULL) + { + MIDL_user_free(p); + return STATUS_INSUFFICIENT_RESOURCES; + } + + wcscpy(p->Name.Buffer, L"COMPUTERNAME"); +#endif + + p->DnsDomainName.Length = 0; + p->DnsDomainName.MaximumLength = 0; + p->DnsDomainName.Buffer = NULL; + + p->DnsForestName.Length = 0; + p->DnsForestName.MaximumLength = 0; + p->DnsForestName.Buffer = 0; + + memset(&p->DomainGuid, 0, sizeof(GUID)); + + p->Sid = NULL; /* no domain, no workgroup */ + + *PolicyInformation = (PLSAPR_POLICY_INFORMATION)p; + + return STATUS_SUCCESS; +} + /* EOF */

12 years, 12 months

[tkreuzer] 53807: [LSASRV] Change some stubs to real exports in the spec file, since the functions exist. Fixes MSVC build

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Fri Sep 23 09:44:25 2011 New Revision: 53807 URL: http://svn.reactos.org/svn/reactos?rev=53807&view=rev Log: [LSASRV] Change some stubs to real exports in the spec file, since the functions exist. Fixes MSVC build Modified: trunk/reactos/dll/win32/lsasrv/lsasrv.spec Modified: trunk/reactos/dll/win32/lsasrv/lsasrv.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsasrv.sp… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsasrv.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsasrv.spec [iso-8859-1] Fri Sep 23 09:44:25 2011 @@ -35,13 +35,13 @@ @ stdcall LsarCreateAccount(ptr ptr long ptr) @ stdcall LsarCreateSecret(ptr ptr long ptr) @ stdcall LsarCreateTrustedDomain(ptr ptr long ptr) - @ stub LsarCreateTrustedDomainEx + @ stdcall LsarCreateTrustedDomainEx(ptr ptr ptr long ptr) @ stdcall LsarDelete(ptr) @ stdcall LsarEnumerateAccounts(ptr ptr ptr long) @ stdcall LsarEnumeratePrivileges(ptr ptr ptr long) @ stdcall LsarEnumeratePrivilegesAccount(ptr ptr) @ stdcall LsarEnumerateTrustedDomains(ptr ptr ptr long) - @ stub LsarEnumerateTrustedDomainsEx + @ stdcall LsarEnumerateTrustedDomainsEx(ptr long ptr long) @ stdcall LsarGetQuotasForAccount(ptr ptr) @ stdcall LsarGetSystemAccessAccount(ptr ptr) @ stdcall LsarLookupNames(ptr long ptr ptr ptr long ptr) @@ -49,29 +49,29 @@ @ stdcall LsarLookupPrivilegeName(ptr ptr ptr) @ stdcall LsarLookupPrivilegeValue(ptr ptr ptr) @ stdcall LsarLookupSids(ptr ptr ptr ptr long ptr) - @ stub LsarLookupSids2 + @ stdcall LsarLookupSids2(ptr ptr ptr ptr long long long long) @ stdcall LsarOpenAccount(ptr ptr long ptr) @ stdcall LsarOpenPolicy(ptr ptr long ptr) - @ stub LsarOpenPolicySce + @ stdcall LsarOpenPolicySce(ptr) @ stdcall LsarOpenSecret(ptr ptr long ptr) @ stdcall LsarOpenTrustedDomain(ptr ptr long ptr) - @ stub LsarOpenTrustedDomainByName - @ stub LsarQueryDomainInformationPolicy - @ stub LsarQueryForestTrustInformation + @ stdcall LsarOpenTrustedDomainByName(ptr ptr long ptr) + @ stdcall LsarQueryDomainInformationPolicy(ptr long ptr) + @ stdcall LsarQueryForestTrustInformation(ptr ptr long ptr) @ stdcall LsarQueryInfoTrustedDomain(ptr long ptr) @ stdcall LsarQueryInformationPolicy(ptr long ptr) @ stdcall LsarQuerySecret(ptr ptr ptr ptr ptr) @ stdcall LsarQuerySecurityObject(ptr long ptr) - @ stub LsarQueryTrustedDomainInfo - @ stub LsarQueryTrustedDomainInfoByName + @ stdcall LsarQueryTrustedDomainInfo(ptr ptr long ptr) + @ stdcall LsarQueryTrustedDomainInfoByName(ptr ptr long ptr) @ stdcall LsarRemovePrivilegesFromAccount(ptr long ptr) - @ stub LsarSetDomainInformationPolicy - @ stub LsarSetForestTrustInformation + @ stdcall LsarSetDomainInformationPolicy(ptr long long) + @ stdcall LsarSetForestTrustInformation(ptr ptr long ptr long ptr) @ stdcall LsarSetInformationPolicy(ptr long ptr) @ stdcall LsarSetInformationTrustedDomain(ptr long ptr) @ stdcall LsarSetQuotasForAccount(ptr ptr) @ stdcall LsarSetSecret(ptr ptr ptr) @ stdcall LsarSetSecurityObject(ptr long ptr) @ stdcall LsarSetSystemAccessAccount(ptr long) - @ stub LsarSetTrustedDomainInfoByName + @ stdcall LsarSetTrustedDomainInfoByName(ptr ptr long long) @ stdcall ServiceInit()

12 years, 12 months

[cgutman] 53806: [HAL] - Revert part of r53788 (MAXIMUM_IDTVECTOR is a valid vector number) - The buffer overrun in the IDT code was already fixed by r53420

by cgutman＠svn.reactos.org

Author: cgutman Date: Thu Sep 22 21:23:09 2011 New Revision: 53806 URL: http://svn.reactos.org/svn/reactos?rev=53806&view=rev Log: [HAL] - Revert part of r53788 (MAXIMUM_IDTVECTOR is a valid vector number) - The buffer overrun in the IDT code was already fixed by r53420 Modified: trunk/reactos/hal/halx86/generic/usage.c Modified: trunk/reactos/hal/halx86/generic/usage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/usage.c… ============================================================================== --- trunk/reactos/hal/halx86/generic/usage.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/usage.c [iso-8859-1] Thu Sep 22 21:23:09 2011 @@ -323,7 +323,7 @@ while (TRUE) { /* Check for valid vector number */ - if (i < MAXIMUM_IDTVECTOR) + if (i <= MAXIMUM_IDTVECTOR) { /* Check if this entry should be parsed */ if ((HalpIDTUsageFlags[i].Flags & FlagMatch))

12 years, 12 months

[osiejka] 53805: [TRANSLATION] - Multimodule translation and UTF-8 conversion to Portugese Brazilian. Patch by mkbu95. Minor fixes by me; See issue #6467 for more details.

by osiejka＠svn.reactos.org

Author: osiejka Date: Thu Sep 22 19:06:29 2011 New Revision: 53805 URL: http://svn.reactos.org/svn/reactos?rev=53805&view=rev Log: [TRANSLATION] - Multimodule translation and UTF-8 conversion to Portugese Brazilian. Patch by mkbu95. Minor fixes by me; See issue #6467 for more details. Added: trunk/reactos/base/applications/calc/lang/pt-BR.rc (with props) trunk/reactos/base/applications/dxdiag/lang/pt-BR.rc (with props) trunk/reactos/base/applications/fontview/lang/pt-BR.rc (with props) trunk/reactos/base/applications/games/spider/lang/pt-BR.rc (with props) trunk/reactos/base/applications/kbswitch/lang/pt-BR.rc (with props) trunk/reactos/base/applications/logoff/lang/pt-BR.rc (with props) trunk/reactos/base/applications/mplay32/lang/pt-BR.rc (with props) trunk/reactos/base/applications/rapps/lang/pt-BR.rc (with props) trunk/reactos/base/applications/shutdown/lang/pt-BR.rc (with props) trunk/reactos/base/shell/explorer-new/lang/pt-BR.rc (with props) trunk/reactos/base/system/runonce/lang/pt-BR.rc (with props) Modified: trunk/reactos/base/applications/calc/lang/en-US.rc trunk/reactos/base/applications/calc/resource.rc trunk/reactos/base/applications/charmap/lang/pt-BR.rc trunk/reactos/base/applications/dxdiag/rsrc.rc trunk/reactos/base/applications/fontview/fontview.rc trunk/reactos/base/applications/games/spider/rsrc.rc trunk/reactos/base/applications/kbswitch/rsrc.rc trunk/reactos/base/applications/logoff/rsrc.rc trunk/reactos/base/applications/mplay32/rsrc.rc trunk/reactos/base/applications/mspaint/lang/pt-BR.rc trunk/reactos/base/applications/rapps/rsrc.rc trunk/reactos/base/applications/shutdown/rsrc.rc trunk/reactos/base/setup/reactos/lang/pt-BR.rc trunk/reactos/base/shell/explorer-new/explorer.rc trunk/reactos/base/system/runonce/rsrc.rc [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/applications/calc/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… Added: trunk/reactos/base/applications/calc/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… Modified: trunk/reactos/base/applications/calc/resource.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/res… Modified: trunk/reactos/base/applications/charmap/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… Added: trunk/reactos/base/applications/dxdiag/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… Modified: trunk/reactos/base/applications/dxdiag/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/r… Modified: trunk/reactos/base/applications/fontview/fontview.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview… Added: trunk/reactos/base/applications/fontview/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview… Added: trunk/reactos/base/applications/games/spider/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/sp… Modified: trunk/reactos/base/applications/games/spider/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/sp… Added: trunk/reactos/base/applications/kbswitch/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/kbswitch… Modified: trunk/reactos/base/applications/kbswitch/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/kbswitch… Added: trunk/reactos/base/applications/logoff/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/logoff/l… Modified: trunk/reactos/base/applications/logoff/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/logoff/r… Added: trunk/reactos/base/applications/mplay32/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… Modified: trunk/reactos/base/applications/mplay32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… Modified: trunk/reactos/base/applications/mspaint/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… Added: trunk/reactos/base/applications/rapps/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… Modified: trunk/reactos/base/applications/rapps/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/rs… Added: trunk/reactos/base/applications/shutdown/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/shutdown… Modified: trunk/reactos/base/applications/shutdown/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/shutdown… Modified: trunk/reactos/base/setup/reactos/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/pt… Modified: trunk/reactos/base/shell/explorer-new/explorer.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/ex… Added: trunk/reactos/base/shell/explorer-new/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/la… Added: trunk/reactos/base/system/runonce/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/runonce/lang/p… Modified: trunk/reactos/base/system/runonce/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/runonce/rsrc.r…

12 years, 12 months

[khornicek] 53804: Czech localization (base/applications): UTF-8 conversion cleanup, fixed typos, translated some more English strings.

by khornicek＠svn.reactos.org

Author: khornicek Date: Thu Sep 22 17:18:26 2011 New Revision: 53804 URL: http://svn.reactos.org/svn/reactos?rev=53804&view=rev Log: Czech localization (base/applications): UTF-8 conversion cleanup, fixed typos, translated some more English strings. Modified: trunk/reactos/base/applications/cacls/lang/cs-CZ.rc trunk/reactos/base/applications/calc/lang/cs-CZ.rc trunk/reactos/base/applications/charmap/lang/cs-CZ.rc trunk/reactos/base/applications/cmdutils/find/lang/cs-CZ.rc trunk/reactos/base/applications/cmdutils/more/lang/cs-CZ.rc trunk/reactos/base/applications/dxdiag/lang/cs-CZ.rc trunk/reactos/base/applications/findstr/lang/cs-CZ.rc trunk/reactos/base/applications/games/solitaire/lang/cs-CZ.rc trunk/reactos/base/applications/games/winmine/lang/cs-CZ.rc trunk/reactos/base/applications/kbswitch/lang/cs-CZ.rc trunk/reactos/base/applications/logoff/lang/cs-CZ.rc trunk/reactos/base/applications/mmc/lang/cs-CZ.rc trunk/reactos/base/applications/mplay32/lang/cs-CZ.rc trunk/reactos/base/applications/msconfig/lang/cs-CZ.rc trunk/reactos/base/applications/mspaint/lang/cs-CZ.rc trunk/reactos/base/applications/network/ping/lang/cs-CZ.rc trunk/reactos/base/applications/notepad/lang/cs-CZ.rc trunk/reactos/base/applications/regedit/lang/cs-CZ.rc trunk/reactos/base/applications/sndrec32/lang/cs-CZ.rc trunk/reactos/base/applications/sndvol32/lang/cs-CZ.rc trunk/reactos/base/applications/taskmgr/lang/cs-CZ.rc trunk/reactos/dll/win32/user32/lang/cs-CZ.rc [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/applications/cacls/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cacls/la… Modified: trunk/reactos/base/applications/calc/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… Modified: trunk/reactos/base/applications/charmap/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… Modified: trunk/reactos/base/applications/cmdutils/find/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Modified: trunk/reactos/base/applications/cmdutils/more/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Modified: trunk/reactos/base/applications/dxdiag/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… Modified: trunk/reactos/base/applications/findstr/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/findstr/… Modified: trunk/reactos/base/applications/games/solitaire/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… Modified: trunk/reactos/base/applications/games/winmine/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/kbswitch/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/kbswitch… Modified: trunk/reactos/base/applications/logoff/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/logoff/l… Modified: trunk/reactos/base/applications/mmc/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/lang… Modified: trunk/reactos/base/applications/mplay32/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… Modified: trunk/reactos/base/applications/msconfig/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… Modified: trunk/reactos/base/applications/mspaint/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… Modified: trunk/reactos/base/applications/network/ping/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… Modified: trunk/reactos/base/applications/notepad/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/regedit/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/sndrec32/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… Modified: trunk/reactos/base/applications/sndvol32/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… Modified: trunk/reactos/base/applications/taskmgr/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/dll/win32/user32/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/lang/cs-C…

12 years, 12 months

[tkreuzer] 53803: [FREELDR] - Fix a bug, where the bios memory map could have a bogus entry: according to R.B.'s Interrupt list, in some bioses the function for enumerating the memory can return eb...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Sep 22 16:38:54 2011 New Revision: 53803 URL: http://svn.reactos.org/svn/reactos?rev=53803&view=rev Log: [FREELDR] - Fix a bug, where the bios memory map could have a bogus entry: according to R.B.'s Interrupt list, in some bioses the function for enumerating the memory can return ebx != 0 for the last descriptor, and fail in the following call returning CF = 1. In that case we were previously counting that last descriptor as well, but its content wouldn't describe a valid memory region. - Use a static buffer for the bios memory map, stored in the achitecture specific file and return a pointer to that variable from PcMemGetMemoryMap. Reuse the static map from DetectAcpiBios instead of enumerating again. On arm, we don't even need a buffer, we return the pointer from the arm block. Modified: trunk/reactos/boot/freeldr/freeldr/arch/arm/macharm.c trunk/reactos/boot/freeldr/freeldr/arch/i386/hwacpi.c trunk/reactos/boot/freeldr/freeldr/arch/i386/pcmem.c trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxmem.c trunk/reactos/boot/freeldr/freeldr/include/arch/i386/machxbox.h trunk/reactos/boot/freeldr/freeldr/include/arch/pc/machpc.h trunk/reactos/boot/freeldr/freeldr/include/machine.h trunk/reactos/boot/freeldr/freeldr/mm/meminit.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/arm/macharm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/arm/macharm.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/arm/macharm.c [iso-8859-1] Thu Sep 22 16:38:54 2011 @@ -143,15 +143,12 @@ return RootNode; } -ULONG -ArmMemGetMemoryMap(OUT PBIOS_MEMORY_MAP BiosMemoryMap, - IN ULONG MaxMemoryMapSize) +PBIOS_MEMORY_MAP +ArmMemGetMemoryMap(OUT PULONG MaxMemoryMapSize) { /* Return whatever the board returned to us (CS0 Base + Size and FLASH0) */ - memcpy(BiosMemoryMap, - ArmBoardBlock->MemoryMap, - ArmBoardBlock->MemoryMapEntryCount * sizeof(BIOS_MEMORY_MAP)); - return ArmBoardBlock->MemoryMapEntryCount; + *MaxMemoryMapSize = ArmBoardBlock->MemoryMapEntryCount; + return ArmBoardBlock->MemoryMap; } VOID Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwacpi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/hwacpi.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hwacpi.c [iso-8859-1] Thu Sep 22 16:38:54 2011 @@ -58,8 +58,7 @@ PCM_PARTIAL_RESOURCE_DESCRIPTOR PartialDescriptor; PRSDP_DESCRIPTOR Rsdp; PACPI_BIOS_DATA AcpiBiosData; - BIOS_MEMORY_MAP BiosMemoryMap[32]; - ULONG BiosMemoryMapEntryCount, TableSize; + ULONG TableSize; Rsdp = FindAcpiBios(); @@ -68,13 +67,8 @@ /* Set up the flag in the loader block */ AcpiPresent = TRUE; - /* Get BIOS memory map */ - RtlZeroMemory(BiosMemoryMap, sizeof(BiosMemoryMap)); - BiosMemoryMapEntryCount = PcMemGetMemoryMap(BiosMemoryMap, - sizeof(BiosMemoryMap) / sizeof(BIOS_MEMORY_MAP)); - /* Calculate the table size */ - TableSize = BiosMemoryMapEntryCount * sizeof(BIOS_MEMORY_MAP) + + TableSize = PcBiosMapCount * sizeof(BIOS_MEMORY_MAP) + sizeof(ACPI_BIOS_DATA) - sizeof(BIOS_MEMORY_MAP); /* Set 'Configuration Data' value */ @@ -100,9 +94,9 @@ /* Fill the table */ AcpiBiosData = (PACPI_BIOS_DATA)&PartialResourceList->PartialDescriptors[1]; AcpiBiosData->RSDTAddress.LowPart = Rsdp->rsdt_physical_address; - AcpiBiosData->Count = BiosMemoryMapEntryCount; - memcpy(AcpiBiosData->MemoryMap, BiosMemoryMap, - BiosMemoryMapEntryCount * sizeof(BIOS_MEMORY_MAP)); + AcpiBiosData->Count = PcBiosMapCount; + memcpy(AcpiBiosData->MemoryMap, PcBiosMemoryMap, + PcBiosMapCount * sizeof(BIOS_MEMORY_MAP)); TRACE("RSDT %p, data size %x\n", Rsdp->rsdt_physical_address, TableSize); Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/pcmem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/pcmem.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/pcmem.c [iso-8859-1] Thu Sep 22 16:38:54 2011 @@ -26,6 +26,11 @@ #include <debug.h> DBG_DEFAULT_CHANNEL(MEMORY); + +#define MAX_BIOS_DESCRIPTORS 32 + +BIOS_MEMORY_MAP PcBiosMemoryMap[MAX_BIOS_DESCRIPTORS]; +ULONG PcBiosMapCount; static BOOLEAN @@ -174,14 +179,17 @@ * CF set on error * AH = error code (86h) */ - Regs.x.eax = 0x0000E820; - Regs.x.edx = 0x534D4150; /* ('SMAP') */ Regs.x.ebx = 0x00000000; - Regs.x.ecx = sizeof(BIOS_MEMORY_MAP); - Regs.w.es = BIOSCALLBUFSEGMENT; - Regs.w.di = BIOSCALLBUFOFFSET; + for (MapCount = 0; MapCount < MaxMemoryMapSize; MapCount++) { + /* Setup the registers for the BIOS call */ + Regs.x.eax = 0x0000E820; + Regs.x.edx = 0x534D4150; /* ('SMAP') */ + /* Regs.x.ebx = 0x00000001; Continuation value already set */ + Regs.x.ecx = sizeof(BIOS_MEMORY_MAP); + Regs.w.es = BIOSCALLBUFSEGMENT; + Regs.w.di = BIOSCALLBUFOFFSET; Int386(0x15, &Regs, &Regs); TRACE("Memory Map Entry %d\n", MapCount); @@ -192,8 +200,8 @@ TRACE("CF set = %s\n", (Regs.x.eflags & EFLAGS_CF) ? "TRUE" : "FALSE"); /* If the BIOS didn't return 'SMAP' in EAX then - * it doesn't support this call */ - if (Regs.x.eax != 0x534D4150) + * it doesn't support this call. If CF is set, we're done */ + if (Regs.x.eax != 0x534D4150 || !INT386_SUCCESS(Regs)) { break; } @@ -210,62 +218,57 @@ /* If the continuation value is zero or the * carry flag is set then this was * the last entry so we're done */ - if (Regs.x.ebx == 0x00000000 || !INT386_SUCCESS(Regs)) - { - MapCount++; + if (Regs.x.ebx == 0x00000000) + { TRACE("End Of System Memory Map!\n\n"); break; } - /* Setup the registers for the next call */ - Regs.x.eax = 0x0000E820; - Regs.x.edx = 0x534D4150; /* ('SMAP') */ - /* Regs.x.ebx = 0x00000001; Continuation value already set by the BIOS */ - Regs.x.ecx = sizeof(BIOS_MEMORY_MAP); - Regs.w.es = BIOSCALLBUFSEGMENT; - Regs.w.di = BIOSCALLBUFOFFSET; } return MapCount; } -ULONG -PcMemGetMemoryMap(PBIOS_MEMORY_MAP BiosMemoryMap, ULONG MaxMemoryMapSize) +PBIOS_MEMORY_MAP +PcMemGetMemoryMap(ULONG *MemoryMapSize) { ULONG EntryCount; ULONG ExtendedMemorySizeAtOneMB; ULONG ExtendedMemorySizeAtSixteenMB; - EntryCount = PcMemGetBiosMemoryMap(BiosMemoryMap, MaxMemoryMapSize); + EntryCount = PcMemGetBiosMemoryMap(PcBiosMemoryMap, MAX_BIOS_DESCRIPTORS); + PcBiosMapCount = EntryCount; /* If the BIOS didn't provide a memory map, synthesize one */ - if (0 == EntryCount && 3 <= MaxMemoryMapSize) + if (0 == EntryCount) { GetExtendedMemoryConfiguration(&ExtendedMemorySizeAtOneMB, &ExtendedMemorySizeAtSixteenMB); /* Conventional memory */ - BiosMemoryMap[EntryCount].BaseAddress = 0; - BiosMemoryMap[EntryCount].Length = PcMemGetConventionalMemorySize() * 1024; - BiosMemoryMap[EntryCount].Type = BiosMemoryUsable; + PcBiosMemoryMap[EntryCount].BaseAddress = 0; + PcBiosMemoryMap[EntryCount].Length = PcMemGetConventionalMemorySize() * 1024; + PcBiosMemoryMap[EntryCount].Type = BiosMemoryUsable; EntryCount++; /* Extended memory at 1MB */ - BiosMemoryMap[EntryCount].BaseAddress = 1024 * 1024; - BiosMemoryMap[EntryCount].Length = ExtendedMemorySizeAtOneMB * 1024; - BiosMemoryMap[EntryCount].Type = BiosMemoryUsable; + PcBiosMemoryMap[EntryCount].BaseAddress = 1024 * 1024; + PcBiosMemoryMap[EntryCount].Length = ExtendedMemorySizeAtOneMB * 1024; + PcBiosMemoryMap[EntryCount].Type = BiosMemoryUsable; EntryCount++; if (ExtendedMemorySizeAtSixteenMB != 0) { /* Extended memory at 16MB */ - BiosMemoryMap[EntryCount].BaseAddress = 0x1000000; - BiosMemoryMap[EntryCount].Length = ExtendedMemorySizeAtSixteenMB * 64 * 1024; - BiosMemoryMap[EntryCount].Type = BiosMemoryUsable; + PcBiosMemoryMap[EntryCount].BaseAddress = 0x1000000; + PcBiosMemoryMap[EntryCount].Length = ExtendedMemorySizeAtSixteenMB * 64 * 1024; + PcBiosMemoryMap[EntryCount].Type = BiosMemoryUsable; EntryCount++; } } - return EntryCount; + *MemoryMapSize = EntryCount; + + return PcBiosMemoryMap; } /* EOF */ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxmem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxmem.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxmem.c [iso-8859-1] Thu Sep 22 16:38:54 2011 @@ -75,31 +75,24 @@ AvailableMemoryMb = InstalledMemoryMb; } -ULONG -XboxMemGetMemoryMap(PBIOS_MEMORY_MAP BiosMemoryMap, ULONG MaxMemoryMapSize) +BIOS_MEMORY_MAP BiosMemoryMap[2]; + +PBIOS_MEMORY_MAP +XboxMemGetMemoryMap(ULONG *MemoryMapSize) { - ULONG EntryCount = 0; - /* Synthesize memory map */ - if (1 <= MaxMemoryMapSize) - { /* Available RAM block */ BiosMemoryMap[0].BaseAddress = 0; BiosMemoryMap[0].Length = AvailableMemoryMb * 1024 * 1024; BiosMemoryMap[0].Type = BiosMemoryUsable; - EntryCount = 1; - } - if (2 <= MaxMemoryMapSize) - { /* Video memory */ BiosMemoryMap[1].BaseAddress = AvailableMemoryMb * 1024 * 1024; BiosMemoryMap[1].Length = (InstalledMemoryMb - AvailableMemoryMb) * 1024 * 1024; BiosMemoryMap[1].Type = BiosMemoryReserved; - EntryCount = 2; - } - return EntryCount; + *MemoryMapSize = 2; + return BiosMemoryMap; } PVOID Modified: trunk/reactos/boot/freeldr/freeldr/include/arch/i386/machxbox.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/arch/i386/machxbox.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/arch/i386/machxbox.h [iso-8859-1] Thu Sep 22 16:38:54 2011 @@ -49,7 +49,7 @@ VOID XboxMemInit(VOID); PVOID XboxMemReserveMemory(ULONG MbToReserve); -ULONG XboxMemGetMemoryMap(PBIOS_MEMORY_MAP BiosMemoryMap, ULONG MaxMemoryMapSize); +PBIOS_MEMORY_MAP XboxMemGetMemoryMap(ULONG *MemoryMapSize); BOOLEAN XboxDiskReadLogicalSectors(UCHAR DriveNumber, ULONGLONG SectorNumber, ULONG SectorCount, PVOID Buffer); BOOLEAN XboxDiskGetPartitionEntry(UCHAR DriveNumber, ULONG PartitionNumber, PPARTITION_TABLE_ENTRY PartitionTableEntry); Modified: trunk/reactos/boot/freeldr/freeldr/include/arch/pc/machpc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/arch/pc/machpc.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/arch/pc/machpc.h [iso-8859-1] Thu Sep 22 16:38:54 2011 @@ -46,7 +46,7 @@ VOID PcVideoPrepareForReactOS(IN BOOLEAN Setup); VOID PcPrepareForReactOS(IN BOOLEAN Setup); -ULONG PcMemGetMemoryMap(PBIOS_MEMORY_MAP BiosMemoryMap, ULONG MaxMemoryMapSize); +PBIOS_MEMORY_MAP PcMemGetMemoryMap(ULONG *MemoryMapSize); BOOLEAN PcDiskGetBootPath(char *BootPath, unsigned Size); BOOLEAN PcDiskReadLogicalSectors(UCHAR DriveNumber, ULONGLONG SectorNumber, ULONG SectorCount, PVOID Buffer); @@ -58,4 +58,7 @@ PCONFIGURATION_COMPONENT_DATA PcHwDetect(VOID); +extern BIOS_MEMORY_MAP PcBiosMemoryMap[]; +extern ULONG PcBiosMapCount; + /* EOF */ Modified: trunk/reactos/boot/freeldr/freeldr/include/machine.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/machine.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/machine.h [iso-8859-1] Thu Sep 22 16:38:54 2011 @@ -59,7 +59,7 @@ VOID (*PrepareForReactOS)(IN BOOLEAN Setup); MEMORY_DESCRIPTOR* (*GetMemoryDescriptor)(MEMORY_DESCRIPTOR* Current); - ULONG (*GetMemoryMap)(PBIOS_MEMORY_MAP BiosMemoryMap, ULONG MaxMemoryMapSize); + PBIOS_MEMORY_MAP (*GetMemoryMap)(PULONG MemoryMapSize); BOOLEAN (*DiskGetBootPath)(char *BootPath, unsigned Size); BOOLEAN (*DiskReadLogicalSectors)(UCHAR DriveNumber, ULONGLONG SectorNumber, ULONG SectorCount, PVOID Buffer); Modified: trunk/reactos/boot/freeldr/freeldr/mm/meminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/mm/me… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/mm/meminit.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/mm/meminit.c [iso-8859-1] Thu Sep 22 16:38:54 2011 @@ -124,7 +124,7 @@ ArcGetMemoryDescriptor(const MEMORY_DESCRIPTOR* Current) { MEMORY_DESCRIPTOR_INT* CurrentDescriptor; - BIOS_MEMORY_MAP BiosMemoryMap[32]; + PBIOS_MEMORY_MAP BiosMemoryMap; static ULONG BiosMemoryMapEntryCount; static MEMORY_DESCRIPTOR_INT BiosMemoryDescriptors[32]; static BOOLEAN MemoryMapInitialized = FALSE; @@ -138,10 +138,7 @@ // // Get the machine generated memory map // - RtlZeroMemory(BiosMemoryMap, sizeof(BIOS_MEMORY_MAP) * 32); - BiosMemoryMapEntryCount = MachVtbl.GetMemoryMap(BiosMemoryMap, - sizeof(BiosMemoryMap) / - sizeof(BIOS_MEMORY_MAP)); + BiosMemoryMap = MachVtbl.GetMemoryMap(&BiosMemoryMapEntryCount); // // Fix entries that are not page aligned @@ -545,6 +542,7 @@ { PPAGE_LOOKUP_TABLE_ITEM RealPageLookupTable = (PPAGE_LOOKUP_TABLE_ITEM)PageLookupTable; ULONG Index; + TRACE("MmMarkPagesInLookupTable()\n"); StartPage -= MmLowestPhysicalPage; for (Index=StartPage; Index<(StartPage+PageCount); Index++)

12 years, 12 months

[fireball] 53802: [NTDLL] - Remove useless code. Spotted by Pierre.

by fireball＠svn.reactos.org

Author: fireball Date: Thu Sep 22 08:45:05 2011 New Revision: 53802 URL: http://svn.reactos.org/svn/reactos?rev=53802&view=rev Log: [NTDLL] - Remove useless code. Spotted by Pierre. Modified: trunk/reactos/dll/ntdll/ldr/ldrapi.c Modified: trunk/reactos/dll/ntdll/ldr/ldrapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/ldrapi.c?rev… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/ldrapi.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/ldrapi.c [iso-8859-1] Thu Sep 22 08:45:05 2011 @@ -1374,18 +1374,6 @@ NextEntry = LdrpUnloadHead.Flink; while (NextEntry != &LdrpUnloadHead) { - /* If we have an active entry */ - if (CurrentEntry) - { - /* Remove it */ - RemoveEntryList(&CurrentEntry->InLoadOrderLinks); - CurrentEntry = NULL; - - /* Reset list pointers */ - NextEntry = LdrpUnloadHead.Flink; - if (NextEntry == &LdrpUnloadHead) break; - } - /* Get the current entry */ LdrEntry = CONTAINING_RECORD(NextEntry, LDR_DATA_TABLE_ENTRY, HashLinks);

12 years, 12 months

[tkreuzer] 53801: [FREELDR] - Move heap code out of mm.c into a seperate file mm/heap.c - Move code from arcemul/mm.c into mm/mminit.c

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Sep 22 07:52:51 2011 New Revision: 53801 URL: http://svn.reactos.org/svn/reactos?rev=53801&view=rev Log: [FREELDR] - Move heap code out of mm.c into a seperate file mm/heap.c - Move code from arcemul/mm.c into mm/mminit.c Added: trunk/reactos/boot/freeldr/freeldr/mm/heap.c - copied, changed from r53800, trunk/reactos/boot/freeldr/freeldr/mm/mm.c Removed: trunk/reactos/boot/freeldr/freeldr/arcemul/mm.c Modified: trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt trunk/reactos/boot/freeldr/freeldr/freeldr_base.rbuild trunk/reactos/boot/freeldr/freeldr/mm/meminit.c trunk/reactos/boot/freeldr/freeldr/mm/mm.c Modified: trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/CMake… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] Thu Sep 22 07:52:51 2011 @@ -33,7 +33,6 @@ options.c oslist.c version.c - arcemul/mm.c arcemul/time.c cache/blocklist.c cache/cache.c @@ -53,6 +52,7 @@ inifile/parse.c mm/meminit.c mm/mm.c + mm/heap.c reactos/registry.c reactos/arcname.c reactos/archwsup.c Removed: trunk/reactos/boot/freeldr/freeldr/arcemul/mm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arcem… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arcemul/mm.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arcemul/mm.c (removed) @@ -1,223 +1,0 @@ -/* - * PROJECT: ReactOS Boot Loader (FreeLDR) - * LICENSE: GPL - See COPYING in the top level directory - * FILE: boot/freeldr/freeldr/arcemul/mm.c - * PURPOSE: Routines for ARC Memory Management - * PROGRAMMERS: Hervé Poussineau <hpoussin(a)reactos.org> - */ - -/* INCLUDES *******************************************************************/ - -#include <freeldr.h> -#define NDEBUG -#include <debug.h> - -/* FUNCTIONS ******************************************************************/ - -typedef struct -{ - MEMORY_DESCRIPTOR m; - ULONG Index; - BOOLEAN GeneratedDescriptor; -} MEMORY_DESCRIPTOR_INT; -static const MEMORY_DESCRIPTOR_INT MemoryDescriptors[] = -{ -#if defined (__i386__) || defined (_M_AMD64) - { { MemoryFirmwarePermanent, 0x00, 1 }, 0, }, // realmode int vectors - { { MemoryFirmwareTemporary, 0x01, 7 }, 1, }, // freeldr stack + cmdline - { { MemoryLoadedProgram, 0x08, 0x70 }, 2, }, // freeldr image (roughly max. 0x64 pages) - { { MemorySpecialMemory, 0x78, 8 }, 3, }, // prot mode stack. BIOSCALLBUFFER - { { MemoryFirmwareTemporary, 0x80, 0x10 }, 4, }, // File system read buffer. FILESYSBUFFER - { { MemoryFirmwareTemporary, 0x90, 0x10 }, 5, }, // Disk read buffer for int 13h. DISKREADBUFFER - { { MemoryFirmwarePermanent, 0xA0, 0x60 }, 6, }, // ROM / Video - { { MemorySpecialMemory, 0xFFF, 1 }, 7, }, // unusable memory -#elif __arm__ // This needs to be done per-platform specific way - -#endif -}; - -static -VOID MmFixupSystemMemoryMap(PBIOS_MEMORY_MAP BiosMemoryMap, ULONG* MapCount) -{ - int Index; - int Index2; - ULONGLONG BaseAddressOffset; - - // Loop through each entry in the array - for (Index=0; Index<*MapCount; Index++) - { - // Correct all the addresses to be aligned on page boundaries - BaseAddressOffset = ROUND_UP(BiosMemoryMap[Index].BaseAddress, MM_PAGE_SIZE) - BiosMemoryMap[Index].BaseAddress; - BiosMemoryMap[Index].BaseAddress += BaseAddressOffset; - if (BiosMemoryMap[Index].Length < BaseAddressOffset) - { - BiosMemoryMap[Index].Length = 0; - } - else - { - BiosMemoryMap[Index].Length -= BaseAddressOffset; - } - BiosMemoryMap[Index].Length = ROUND_DOWN(BiosMemoryMap[Index].Length, MM_PAGE_SIZE); - - // If the entry type isn't usable then remove - // it from the memory map (this will help reduce - // the size of our lookup table) - // If the length is less than a full page then - // get rid of it also. - if (BiosMemoryMap[Index].Type != BiosMemoryUsable || - BiosMemoryMap[Index].Length < MM_PAGE_SIZE) - { - // Slide every entry after this down one - for (Index2=Index; Index2<(*MapCount - 1); Index2++) - { - BiosMemoryMap[Index2] = BiosMemoryMap[Index2 + 1]; - } - (*MapCount)--; - Index--; - } - } -} - -const MEMORY_DESCRIPTOR* -ArcGetMemoryDescriptor(const MEMORY_DESCRIPTOR* Current) -{ - MEMORY_DESCRIPTOR_INT* CurrentDescriptor; - BIOS_MEMORY_MAP BiosMemoryMap[32]; - static ULONG BiosMemoryMapEntryCount; - static MEMORY_DESCRIPTOR_INT BiosMemoryDescriptors[32]; - static BOOLEAN MemoryMapInitialized = FALSE; - ULONG i, j; - - // - // Check if it is the first time we're called - // - if (!MemoryMapInitialized) - { - // - // Get the machine generated memory map - // - RtlZeroMemory(BiosMemoryMap, sizeof(BIOS_MEMORY_MAP) * 32); - BiosMemoryMapEntryCount = MachVtbl.GetMemoryMap(BiosMemoryMap, - sizeof(BiosMemoryMap) / - sizeof(BIOS_MEMORY_MAP)); - - // - // Fix entries that are not page aligned - // - MmFixupSystemMemoryMap(BiosMemoryMap, &BiosMemoryMapEntryCount); - - // - // Copy the entries to our structure - // - for (i = 0, j = 0; i < BiosMemoryMapEntryCount; i++) - { - // - // Is it suitable memory? - // - if (BiosMemoryMap[i].Type != BiosMemoryUsable) - { - // - // No. Process next descriptor - // - continue; - } - - // - // Copy this memory descriptor - // - BiosMemoryDescriptors[j].m.MemoryType = MemoryFree; - BiosMemoryDescriptors[j].m.BasePage = (ULONG)(BiosMemoryMap[i].BaseAddress / MM_PAGE_SIZE); - BiosMemoryDescriptors[j].m.PageCount = (ULONG)(BiosMemoryMap[i].Length / MM_PAGE_SIZE); - BiosMemoryDescriptors[j].Index = j; - BiosMemoryDescriptors[j].GeneratedDescriptor = TRUE; - j++; - } - - // - // Remember how much descriptors we found - // - BiosMemoryMapEntryCount = j; - - // - // Mark memory map as already retrieved and initialized - // - MemoryMapInitialized = TRUE; - } - - CurrentDescriptor = CONTAINING_RECORD(Current, MEMORY_DESCRIPTOR_INT, m); - - if (Current == NULL) - { - // - // First descriptor requested - // - if (BiosMemoryMapEntryCount > 0) - { - // - // Return first generated memory descriptor - // - return &BiosMemoryDescriptors[0].m; - } - else if (sizeof(MemoryDescriptors) > 0) - { - // - // Return first fixed memory descriptor - // - return &MemoryDescriptors[0].m; - } - else - { - // - // Strange case, we have no memory descriptor - // - return NULL; - } - } - else if (CurrentDescriptor->GeneratedDescriptor) - { - // - // Current entry is a generated descriptor - // - if (CurrentDescriptor->Index + 1 < BiosMemoryMapEntryCount) - { - // - // Return next generated descriptor - // - return &BiosMemoryDescriptors[CurrentDescriptor->Index + 1].m; - } - else if (sizeof(MemoryDescriptors) > 0) - { - // - // Return first fixed memory descriptor - // - return &MemoryDescriptors[0].m; - } - else - { - // - // No fixed memory descriptor; end of memory map - // - return NULL; - } - } - else - { - // - // Current entry is a fixed descriptor - // - if (CurrentDescriptor->Index + 1 < sizeof(MemoryDescriptors) / sizeof(MemoryDescriptors[0])) - { - // - // Return next fixed descriptor - // - return &MemoryDescriptors[CurrentDescriptor->Index + 1].m; - } - else - { - // - // No more fixed memory descriptor; end of memory map - // - return NULL; - } - } -} Modified: trunk/reactos/boot/freeldr/freeldr/freeldr_base.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/freeldr_base.rbuild [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/freeldr_base.rbuild [iso-8859-1] Thu Sep 22 07:52:51 2011 @@ -9,7 +9,6 @@ <define name="_NTHAL_" /> <define name="_NTSYSTEM_" /> <directory name="arcemul"> - <file>mm.c</file> <file>time.c</file> </directory> <directory name="cache"> @@ -41,6 +40,7 @@ <file>parse.c</file> </directory> <directory name="mm"> + <file>heap.c</file> <file>meminit.c</file> <file>mm.c</file> </directory> Copied: trunk/reactos/boot/freeldr/freeldr/mm/heap.c (from r53800, trunk/reactos/boot/freeldr/freeldr/mm/mm.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/mm/he… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/mm/mm.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/mm/heap.c [iso-8859-1] Thu Sep 22 07:52:51 2011 @@ -20,66 +20,30 @@ #include <freeldr.h> #include <debug.h> -#if DBG -VOID DumpMemoryAllocMap(VOID); -VOID MemAllocTest(VOID); -#endif // DBG - DBG_DEFAULT_CHANNEL(MEMORY); -ULONG LoaderPagesSpanned = 0; +VOID MmInitializeHeap(PVOID PageLookupTable) +{ + ULONG PagesNeeded = 0; + ULONG HeapStart = 0; -PVOID MmAllocateMemoryWithType(ULONG MemorySize, TYPE_OF_MEMORY MemoryType) -{ - ULONG PagesNeeded; - ULONG FirstFreePageFromEnd; - PVOID MemPointer; + // Find contigious memory block for HEAP:STACK + PagesNeeded = HEAP_PAGES + STACK_PAGES; + HeapStart = MmFindAvailablePages(PageLookupTable, TotalPagesInLookupTable, PagesNeeded, FALSE); - if (MemorySize == 0) + if (HeapStart == 0) { - WARN("MmAllocateMemory() called for 0 bytes. Returning NULL.\n"); - UiMessageBoxCritical("Memory allocation failed: MmAllocateMemory() called for 0 bytes."); - return NULL; + UiMessageBox("Critical error: Can't allocate heap!"); + return; } - MemorySize = ROUND_UP(MemorySize, 4); + // Initialize BGET + bpool(HeapStart << MM_PAGE_SHIFT, PagesNeeded << MM_PAGE_SHIFT); - // Find out how many blocks it will take to - // satisfy this allocation - PagesNeeded = ROUND_UP(MemorySize, MM_PAGE_SIZE) / MM_PAGE_SIZE; + // Mark those pages as used + MmMarkPagesInLookupTable(PageLookupTableAddress, HeapStart, PagesNeeded, LoaderOsloaderHeap); - // If we don't have enough available mem - // then return NULL - if (FreePagesInLookupTable < PagesNeeded) - { - ERR("Memory allocation failed in MmAllocateMemory(). Not enough free memory to allocate %d bytes.\n", MemorySize); - UiMessageBoxCritical("Memory allocation failed: out of memory."); - return NULL; - } - - FirstFreePageFromEnd = MmFindAvailablePages(PageLookupTableAddress, TotalPagesInLookupTable, PagesNeeded, FALSE); - - if (FirstFreePageFromEnd == 0) - { - ERR("Memory allocation failed in MmAllocateMemory(). Not enough free memory to allocate %d bytes.\n", MemorySize); - UiMessageBoxCritical("Memory allocation failed: out of memory."); - return NULL; - } - - MmAllocatePagesInLookupTable(PageLookupTableAddress, FirstFreePageFromEnd, PagesNeeded, MemoryType); - - FreePagesInLookupTable -= PagesNeeded; - MemPointer = (PVOID)((ULONG_PTR)FirstFreePageFromEnd * MM_PAGE_SIZE); - - TRACE("Allocated %d bytes (%d pages) of memory starting at page %d.\n", MemorySize, PagesNeeded, FirstFreePageFromEnd); - TRACE("Memory allocation pointer: 0x%x\n", MemPointer); - - // Update LoaderPagesSpanned count - if ((((ULONG_PTR)MemPointer + MemorySize + PAGE_SIZE - 1) >> PAGE_SHIFT) > LoaderPagesSpanned) - LoaderPagesSpanned = (((ULONG_PTR)MemPointer + MemorySize + PAGE_SIZE - 1) >> PAGE_SHIFT); - - // Now return the pointer - return MemPointer; + TRACE("Heap initialized, base 0x%08x, pages %d\n", (HeapStart << MM_PAGE_SHIFT), PagesNeeded); } PVOID MmHeapAlloc(ULONG MemorySize) @@ -118,232 +82,7 @@ brel(MemoryPointer); } -PVOID MmAllocateMemory(ULONG MemorySize) -{ - // Temporary forwarder... - return MmAllocateMemoryWithType(MemorySize, LoaderOsloaderHeap); -} -PVOID MmAllocateMemoryAtAddress(ULONG MemorySize, PVOID DesiredAddress, TYPE_OF_MEMORY MemoryType) -{ - ULONG PagesNeeded; - ULONG StartPageNumber; - PVOID MemPointer; - - if (MemorySize == 0) - { - WARN("MmAllocateMemoryAtAddress() called for 0 bytes. Returning NULL.\n"); - UiMessageBoxCritical("Memory allocation failed: MmAllocateMemoryAtAddress() called for 0 bytes."); - return NULL; - } - - // Find out how many blocks it will take to - // satisfy this allocation - PagesNeeded = ROUND_UP(MemorySize, MM_PAGE_SIZE) / MM_PAGE_SIZE; - - // Get the starting page number - StartPageNumber = MmGetPageNumberFromAddress(DesiredAddress); - - // If we don't have enough available mem - // then return NULL - if (FreePagesInLookupTable < PagesNeeded) - { - ERR("Memory allocation failed in MmAllocateMemoryAtAddress(). " - "Not enough free memory to allocate %d bytes (requesting %d pages but have only %d). " - "\n", MemorySize, PagesNeeded, FreePagesInLookupTable); - UiMessageBoxCritical("Memory allocation failed: out of memory."); - return NULL; - } - - if (MmAreMemoryPagesAvailable(PageLookupTableAddress, TotalPagesInLookupTable, DesiredAddress, PagesNeeded) == FALSE) - { - WARN("Memory allocation failed in MmAllocateMemoryAtAddress(). " - "Not enough free memory to allocate %d bytes at address %p.\n", - MemorySize, DesiredAddress); - - // Don't tell this to user since caller should try to alloc this memory - // at a different address - //UiMessageBoxCritical("Memory allocation failed: out of memory."); - return NULL; - } - - MmAllocatePagesInLookupTable(PageLookupTableAddress, StartPageNumber, PagesNeeded, MemoryType); - - FreePagesInLookupTable -= PagesNeeded; - MemPointer = (PVOID)((ULONG_PTR)StartPageNumber * MM_PAGE_SIZE); - - TRACE("Allocated %d bytes (%d pages) of memory starting at page %d.\n", MemorySize, PagesNeeded, StartPageNumber); - TRACE("Memory allocation pointer: 0x%x\n", MemPointer); - - // Update LoaderPagesSpanned count - if ((((ULONG_PTR)MemPointer + MemorySize + PAGE_SIZE - 1) >> PAGE_SHIFT) > LoaderPagesSpanned) - LoaderPagesSpanned = (((ULONG_PTR)MemPointer + MemorySize + PAGE_SIZE - 1) >> PAGE_SHIFT); - - // Now return the pointer - return MemPointer; -} - -VOID MmSetMemoryType(PVOID MemoryAddress, ULONG MemorySize, TYPE_OF_MEMORY NewType) -{ - ULONG PagesNeeded; - ULONG StartPageNumber; - - // Find out how many blocks it will take to - // satisfy this allocation - PagesNeeded = ROUND_UP(MemorySize, MM_PAGE_SIZE) / MM_PAGE_SIZE; - - // Get the starting page number - StartPageNumber = MmGetPageNumberFromAddress(MemoryAddress); - - // Set new type for these pages - MmAllocatePagesInLookupTable(PageLookupTableAddress, StartPageNumber, PagesNeeded, NewType); -} - -PVOID MmAllocateHighestMemoryBelowAddress(ULONG MemorySize, PVOID DesiredAddress, TYPE_OF_MEMORY MemoryType) -{ - ULONG PagesNeeded; - ULONG FirstFreePageFromEnd; - ULONG DesiredAddressPageNumber; - PVOID MemPointer; - - if (MemorySize == 0) - { - WARN("MmAllocateHighestMemoryBelowAddress() called for 0 bytes. Returning NULL.\n"); - UiMessageBoxCritical("Memory allocation failed: MmAllocateHighestMemoryBelowAddress() called for 0 bytes."); - return NULL; - } - - // Find out how many blocks it will take to - // satisfy this allocation - PagesNeeded = ROUND_UP(MemorySize, MM_PAGE_SIZE) / MM_PAGE_SIZE; - - // Get the page number for their desired address - DesiredAddressPageNumber = (ULONG_PTR)DesiredAddress / MM_PAGE_SIZE; - - // If we don't have enough available mem - // then return NULL - if (FreePagesInLookupTable < PagesNeeded) - { - ERR("Memory allocation failed in MmAllocateHighestMemoryBelowAddress(). Not enough free memory to allocate %d bytes.\n", MemorySize); - UiMessageBoxCritical("Memory allocation failed: out of memory."); - return NULL; - } - - FirstFreePageFromEnd = MmFindAvailablePagesBeforePage(PageLookupTableAddress, TotalPagesInLookupTable, PagesNeeded, DesiredAddressPageNumber); - - if (FirstFreePageFromEnd == 0) - { - ERR("Memory allocation failed in MmAllocateHighestMemoryBelowAddress(). Not enough free memory to allocate %d bytes.\n", MemorySize); - UiMessageBoxCritical("Memory allocation failed: out of memory."); - return NULL; - } - - MmAllocatePagesInLookupTable(PageLookupTableAddress, FirstFreePageFromEnd, PagesNeeded, MemoryType); - - FreePagesInLookupTable -= PagesNeeded; - MemPointer = (PVOID)((ULONG_PTR)FirstFreePageFromEnd * MM_PAGE_SIZE); - - TRACE("Allocated %d bytes (%d pages) of memory starting at page %d.\n", MemorySize, PagesNeeded, FirstFreePageFromEnd); - TRACE("Memory allocation pointer: 0x%x\n", MemPointer); - - // Update LoaderPagesSpanned count - if ((((ULONG_PTR)MemPointer + MemorySize) >> PAGE_SHIFT) > LoaderPagesSpanned) - LoaderPagesSpanned = (((ULONG_PTR)MemPointer + MemorySize) >> PAGE_SHIFT); - - // Now return the pointer - return MemPointer; -} - -VOID MmFreeMemory(PVOID MemoryPointer) -{ -} - -#if DBG - -VOID DumpMemoryAllocMap(VOID) -{ - ULONG Idx; - PPAGE_LOOKUP_TABLE_ITEM RealPageLookupTable = (PPAGE_LOOKUP_TABLE_ITEM)PageLookupTableAddress; - - DbgPrint("----------- Memory Allocation Bitmap -----------\n"); - - for (Idx=0; Idx<TotalPagesInLookupTable; Idx++) - { - if ((Idx % 32) == 0) - { - DbgPrint("\n"); - DbgPrint("%08x:\t", (Idx * MM_PAGE_SIZE)); - } - else if ((Idx % 4) == 0) - { - DbgPrint(" "); - } - - switch (RealPageLookupTable[Idx].PageAllocated) - { - case LoaderFree: - DbgPrint("*"); - break; - case LoaderBad: - DbgPrint( "-"); - break; - case LoaderLoadedProgram: - DbgPrint("O"); - break; - case LoaderFirmwareTemporary: - DbgPrint("T"); - break; - case LoaderFirmwarePermanent: - DbgPrint( "P"); - break; - case LoaderOsloaderHeap: - DbgPrint("H"); - break; - case LoaderOsloaderStack: - DbgPrint("S"); - break; - case LoaderSystemCode: - DbgPrint("K"); - break; - case LoaderHalCode: - DbgPrint("L"); - break; - case LoaderBootDriver: - DbgPrint("B"); - break; - case LoaderStartupPcrPage: - DbgPrint("G"); - break; - case LoaderRegistryData: - DbgPrint("R"); - break; - case LoaderMemoryData: - DbgPrint("M"); - break; - case LoaderNlsData: - DbgPrint("N"); - break; - case LoaderSpecialMemory: - DbgPrint("C"); - break; - default: - DbgPrint("?"); - break; - } - } - - DbgPrint("\n"); -} -#endif // DBG - -PPAGE_LOOKUP_TABLE_ITEM MmGetMemoryMap(ULONG *NoEntries) -{ - PPAGE_LOOKUP_TABLE_ITEM RealPageLookupTable = (PPAGE_LOOKUP_TABLE_ITEM)PageLookupTableAddress; - - *NoEntries = TotalPagesInLookupTable; - - return RealPageLookupTable; -} #undef ExAllocatePoolWithTag NTKERNELAPI Modified: trunk/reactos/boot/freeldr/freeldr/mm/meminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/mm/me… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/mm/meminit.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/mm/meminit.c [iso-8859-1] Thu Sep 22 07:52:51 2011 @@ -56,6 +56,215 @@ extern ULONG_PTR MmHeapPointer; extern ULONG_PTR MmHeapStart; +typedef struct +{ + MEMORY_DESCRIPTOR m; + ULONG Index; + BOOLEAN GeneratedDescriptor; +} MEMORY_DESCRIPTOR_INT; +static const MEMORY_DESCRIPTOR_INT MemoryDescriptors[] = +{ +#if defined (__i386__) || defined (_M_AMD64) + { { MemoryFirmwarePermanent, 0x00, 1 }, 0, }, // realmode int vectors + { { MemoryFirmwareTemporary, 0x01, 7 }, 1, }, // freeldr stack + cmdline + { { MemoryLoadedProgram, 0x08, 0x70 }, 2, }, // freeldr image (roughly max. 0x64 pages) + { { MemorySpecialMemory, 0x78, 8 }, 3, }, // prot mode stack. BIOSCALLBUFFER + { { MemoryFirmwareTemporary, 0x80, 0x10 }, 4, }, // File system read buffer. FILESYSBUFFER + { { MemoryFirmwareTemporary, 0x90, 0x10 }, 5, }, // Disk read buffer for int 13h. DISKREADBUFFER + { { MemoryFirmwarePermanent, 0xA0, 0x60 }, 6, }, // ROM / Video + { { MemorySpecialMemory, 0xFFF, 1 }, 7, }, // unusable memory +#elif __arm__ // This needs to be done per-platform specific way + +#endif +}; + +static +VOID MmFixupSystemMemoryMap(PBIOS_MEMORY_MAP BiosMemoryMap, ULONG* MapCount) +{ + int Index; + int Index2; + ULONGLONG BaseAddressOffset; + + // Loop through each entry in the array + for (Index=0; Index<*MapCount; Index++) + { + // Correct all the addresses to be aligned on page boundaries + BaseAddressOffset = ROUND_UP(BiosMemoryMap[Index].BaseAddress, MM_PAGE_SIZE) - BiosMemoryMap[Index].BaseAddress; + BiosMemoryMap[Index].BaseAddress += BaseAddressOffset; + if (BiosMemoryMap[Index].Length < BaseAddressOffset) + { + BiosMemoryMap[Index].Length = 0; + } + else + { + BiosMemoryMap[Index].Length -= BaseAddressOffset; + } + BiosMemoryMap[Index].Length = ROUND_DOWN(BiosMemoryMap[Index].Length, MM_PAGE_SIZE); + + // If the entry type isn't usable then remove + // it from the memory map (this will help reduce + // the size of our lookup table) + // If the length is less than a full page then + // get rid of it also. + if (BiosMemoryMap[Index].Type != BiosMemoryUsable || + BiosMemoryMap[Index].Length < MM_PAGE_SIZE) + { + // Slide every entry after this down one + for (Index2=Index; Index2<(*MapCount - 1); Index2++) + { + BiosMemoryMap[Index2] = BiosMemoryMap[Index2 + 1]; + } + (*MapCount)--; + Index--; + } + } +} + +const MEMORY_DESCRIPTOR* +ArcGetMemoryDescriptor(const MEMORY_DESCRIPTOR* Current) +{ + MEMORY_DESCRIPTOR_INT* CurrentDescriptor; + BIOS_MEMORY_MAP BiosMemoryMap[32]; + static ULONG BiosMemoryMapEntryCount; + static MEMORY_DESCRIPTOR_INT BiosMemoryDescriptors[32]; + static BOOLEAN MemoryMapInitialized = FALSE; + ULONG i, j; + + // + // Check if it is the first time we're called + // + if (!MemoryMapInitialized) + { + // + // Get the machine generated memory map + // + RtlZeroMemory(BiosMemoryMap, sizeof(BIOS_MEMORY_MAP) * 32); + BiosMemoryMapEntryCount = MachVtbl.GetMemoryMap(BiosMemoryMap, + sizeof(BiosMemoryMap) / + sizeof(BIOS_MEMORY_MAP)); + + // + // Fix entries that are not page aligned + // + MmFixupSystemMemoryMap(BiosMemoryMap, &BiosMemoryMapEntryCount); + + // + // Copy the entries to our structure + // + for (i = 0, j = 0; i < BiosMemoryMapEntryCount; i++) + { + // + // Is it suitable memory? + // + if (BiosMemoryMap[i].Type != BiosMemoryUsable) + { + // + // No. Process next descriptor + // + continue; + } + + // + // Copy this memory descriptor + // + BiosMemoryDescriptors[j].m.MemoryType = MemoryFree; + BiosMemoryDescriptors[j].m.BasePage = (ULONG)(BiosMemoryMap[i].BaseAddress / MM_PAGE_SIZE); + BiosMemoryDescriptors[j].m.PageCount = (ULONG)(BiosMemoryMap[i].Length / MM_PAGE_SIZE); + BiosMemoryDescriptors[j].Index = j; + BiosMemoryDescriptors[j].GeneratedDescriptor = TRUE; + j++; + } + + // + // Remember how much descriptors we found + // + BiosMemoryMapEntryCount = j; + + // + // Mark memory map as already retrieved and initialized + // + MemoryMapInitialized = TRUE; + } + + CurrentDescriptor = CONTAINING_RECORD(Current, MEMORY_DESCRIPTOR_INT, m); + + if (Current == NULL) + { + // + // First descriptor requested + // + if (BiosMemoryMapEntryCount > 0) + { + // + // Return first generated memory descriptor + // + return &BiosMemoryDescriptors[0].m; + } + else if (sizeof(MemoryDescriptors) > 0) + { + // + // Return first fixed memory descriptor + // + return &MemoryDescriptors[0].m; + } + else + { + // + // Strange case, we have no memory descriptor + // + return NULL; + } + } + else if (CurrentDescriptor->GeneratedDescriptor) + { + // + // Current entry is a generated descriptor + // + if (CurrentDescriptor->Index + 1 < BiosMemoryMapEntryCount) + { + // + // Return next generated descriptor + // + return &BiosMemoryDescriptors[CurrentDescriptor->Index + 1].m; + } + else if (sizeof(MemoryDescriptors) > 0) + { + // + // Return first fixed memory descriptor + // + return &MemoryDescriptors[0].m; + } + else + { + // + // No fixed memory descriptor; end of memory map + // + return NULL; + } + } + else + { + // + // Current entry is a fixed descriptor + // + if (CurrentDescriptor->Index + 1 < sizeof(MemoryDescriptors) / sizeof(MemoryDescriptors[0])) + { + // + // Return next fixed descriptor + // + return &MemoryDescriptors[CurrentDescriptor->Index + 1].m; + } + else + { + // + // No more fixed memory descriptor; end of memory map + // + return NULL; + } + } +} + + BOOLEAN MmInitializeMemoryManager(VOID) { #if DBG @@ -102,40 +311,6 @@ return TRUE; } -VOID MmInitializeHeap(PVOID PageLookupTable) -{ - ULONG PagesNeeded; - ULONG HeapStart; -#ifndef _M_ARM - MEMORY_TYPE Type; - PPAGE_LOOKUP_TABLE_ITEM RealPageLookupTable = (PPAGE_LOOKUP_TABLE_ITEM)PageLookupTable; - - // HACK: Make it so it doesn't overlap kernel space - Type = RealPageLookupTable[0x100].PageAllocated; - MmMarkPagesInLookupTable(PageLookupTableAddress, 0x100, 0xFF, LoaderSystemCode); -#endif - // Find contigious memory block for HEAP:STACK - PagesNeeded = HEAP_PAGES + STACK_PAGES; - HeapStart = MmFindAvailablePages(PageLookupTable, TotalPagesInLookupTable, PagesNeeded, FALSE); -#ifndef _M_ARM - // Unapply the hack - MmMarkPagesInLookupTable(PageLookupTableAddress, 0x100, 0xFF, Type); -#endif - if (HeapStart == 0) - { - UiMessageBox("Critical error: Can't allocate heap!"); - return; - } - - // Initialize BGET - bpool(HeapStart << MM_PAGE_SHIFT, PagesNeeded << MM_PAGE_SHIFT); - - // Mark those pages as used - MmMarkPagesInLookupTable(PageLookupTableAddress, HeapStart, PagesNeeded, LoaderOsloaderHeap); - - TRACE("Heap initialized, base 0x%08x, pages %d\n", (HeapStart << MM_PAGE_SHIFT), PagesNeeded); -} - #if DBG PCSTR MmGetSystemMemoryMapTypeString(MEMORY_TYPE Type) { @@ -178,7 +353,7 @@ // if (MemoryDescriptor->MemoryType == MemoryFree) MmHighestPhysicalPage = MemoryDescriptor->BasePage + MemoryDescriptor->PageCount; } - + // // Check if we got a higher (usable) start page address // @@ -190,7 +365,7 @@ if (MemoryDescriptor->MemoryType == MemoryFree) MmLowestPhysicalPage = MemoryDescriptor->BasePage; } } - + TRACE("lo/hi %lx %lxn", MmLowestPhysicalPage, MmHighestPhysicalPage); PageCount = MmHighestPhysicalPage - MmLowestPhysicalPage; TRACE("MmGetAddressablePageCountIncludingHoles() returning 0x%x\n", PageCount); Modified: trunk/reactos/boot/freeldr/freeldr/mm/mm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/mm/mm… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/mm/mm.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/mm/mm.c [iso-8859-1] Thu Sep 22 07:52:51 2011 @@ -82,42 +82,6 @@ return MemPointer; } -PVOID MmHeapAlloc(ULONG MemorySize) -{ - PVOID Result; - - if (MemorySize > MM_PAGE_SIZE) - { - WARN("Consider using other functions to allocate %d bytes of memory!\n", MemorySize); - } - - // Get the buffer from BGET pool - Result = bget(MemorySize); - - if (Result == NULL) - { - ERR("Heap allocation for %d bytes failed\n", MemorySize); - } -#if MM_DBG - { - LONG CurAlloc, TotalFree, MaxFree, NumberOfGets, NumberOfRels; - - // Gather some stats - bstats(&CurAlloc, &TotalFree, &MaxFree, &NumberOfGets, &NumberOfRels); - - TRACE("Current alloced %d bytes, free %d bytes, allocs %d, frees %d\n", - CurAlloc, TotalFree, NumberOfGets, NumberOfRels); - } -#endif - return Result; -} - -VOID MmHeapFree(PVOID MemoryPointer) -{ - // Release the buffer to the pool - brel(MemoryPointer); -} - PVOID MmAllocateMemory(ULONG MemorySize) { // Temporary forwarder... @@ -345,64 +309,3 @@ return RealPageLookupTable; } -#undef ExAllocatePoolWithTag -NTKERNELAPI -PVOID -NTAPI -ExAllocatePoolWithTag( - IN POOL_TYPE PoolType, - IN SIZE_T NumberOfBytes, - IN ULONG Tag) -{ - return MmHeapAlloc(NumberOfBytes); -} - -#undef ExFreePool -NTKERNELAPI -VOID -NTAPI -ExFreePool( - IN PVOID P) -{ - MmHeapFree(P); -} - -#undef ExFreePoolWithTag -NTKERNELAPI -VOID -NTAPI -ExFreePoolWithTag( - IN PVOID P, - IN ULONG Tag) -{ - ExFreePool(P); -} - -PVOID -NTAPI -RtlAllocateHeap( - IN PVOID HeapHandle, - IN ULONG Flags, - IN SIZE_T Size) -{ - PVOID ptr; - - ptr = MmHeapAlloc(Size); - if (ptr && (Flags & HEAP_ZERO_MEMORY)) - { - RtlZeroMemory(ptr, Size); - } - - return ptr; -} - -BOOLEAN -NTAPI -RtlFreeHeap( - IN PVOID HeapHandle, - IN ULONG Flags, - IN PVOID HeapBase) -{ - MmHeapFree(HeapBase); - return TRUE; -}

12 years, 12 months

← Newer
1
...
8
9
10
11
12
13
14
...
40
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2011