Ros-diffs February 2017

ros-diffs@reactos.org

13 participants
353 discussions

[ion] 73716: [BOOTMGR]: Fix bug in test. [BOOTLIB]: Fix bug in MmMdFindDescriptorFromMdl. [BOOTLIB]: Implement MmFwFreePages. [BOOTLIB]: Implement most of MmPapFreePhysicalPages. The rest is coming...

by ion＠svn.reactos.org

Author: ion Date: Sun Feb 5 21:50:14 2017 New Revision: 73716 URL: http://svn.reactos.org/svn/reactos?rev=73716&view=rev Log: [BOOTMGR]: Fix bug in test. [BOOTLIB]: Fix bug in MmMdFindDescriptorFromMdl. [BOOTLIB]: Implement MmFwFreePages. [BOOTLIB]: Implement most of MmPapFreePhysicalPages. The rest is coming next. [BOOTMGR]: Add test for alloc/free. Modified: trunk/reactos/boot/environ/app/bootmgr/bootmgr.c trunk/reactos/boot/environ/include/bl.h trunk/reactos/boot/environ/lib/firmware/fwutil.c trunk/reactos/boot/environ/lib/mm/descriptor.c trunk/reactos/boot/environ/lib/mm/pagealloc.c Modified: trunk/reactos/boot/environ/app/bootmgr/bootmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/app/bootmgr/b… ============================================================================== --- trunk/reactos/boot/environ/app/bootmgr/bootmgr.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/app/bootmgr/bootmgr.c [iso-8859-1] Sun Feb 5 21:50:14 2017 @@ -2902,12 +2902,6 @@ NTSTATUS Status; PHYSICAL_ADDRESS PhysicalAddress; PBL_MEMORY_DESCRIPTOR Found; - PBL_MEMORY_DESCRIPTOR - MmMdFindDescriptor ( - _In_ ULONG WhichList, - _In_ ULONG Flags, - _In_ ULONGLONG Page - ); /* Allocate 1 physical page */ PhysicalAddress.QuadPart = 0; @@ -2915,8 +2909,11 @@ EfiPrintf(L"Allocation status: %lx at address: %llx\r\n", Status, PhysicalAddress.QuadPart); EfiStall(10000); - Found = MmMdFindDescriptor(BL_MM_INCLUDE_UNMAPPED_ALLOCATED, 0, PhysicalAddress.QuadPart); + Found = MmMdFindDescriptor(BL_MM_INCLUDE_UNMAPPED_ALLOCATED, 0, PhysicalAddress.QuadPart >> PAGE_SHIFT); EfiPrintf(L"Found descriptor: %p %llx\r\n", Found, Found->BasePage); + + Status = BlMmFreePhysicalPages(PhysicalAddress); + EfiPrintf(L"Memory free status: %lx\r\n", Status); } Modified: trunk/reactos/boot/environ/include/bl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/include/bl.h?… ============================================================================== --- trunk/reactos/boot/environ/include/bl.h [iso-8859-1] (original) +++ trunk/reactos/boot/environ/include/bl.h [iso-8859-1] Sun Feb 5 21:50:14 2017 @@ -122,6 +122,7 @@ #define BL_MM_REQUEST_DEFAULT_TYPE 1 #define BL_MM_REQUEST_TOP_DOWN_TYPE 2 +#define BL_MM_REMOVE_PHYSICAL_REGION_FLAG 0x40000000 #define BL_MM_REMOVE_VIRTUAL_REGION_FLAG 0x80000000 #define BL_LIBRARY_FLAG_NO_DISPLAY 0x01 @@ -374,9 +375,10 @@ BlMemoryCoalesced = 0x02000000, BlMemoryUpdate = 0x04000000, BlMemoryNonFirmware = 0x08000000, + BlMemoryPersistent = 0x10000000, BlMemorySpecial = 0x20000000, BlMemoryFirmware = 0x80000000, - BlMemoryValidTypeAttributes = BlMemoryRuntime | BlMemoryCoalesced | BlMemoryUpdate | BlMemoryNonFirmware | BlMemorySpecial | BlMemoryFirmware, + BlMemoryValidTypeAttributes = BlMemoryRuntime | BlMemoryCoalesced | BlMemoryUpdate | BlMemoryNonFirmware | BlMemoryPersistent | BlMemorySpecial | BlMemoryFirmware, BlMemoryValidTypeAttributeMask = 0xFF000000, } BL_MEMORY_ATTR; @@ -1541,6 +1543,12 @@ _Out_ PPHYSICAL_ADDRESS FoundRsdt ); +NTSTATUS +EfiFreePages ( + _In_ ULONG Pages, + _In_ EFI_PHYSICAL_ADDRESS PhysicalAddress + ); + /* PLATFORM TIMER ROUTINES ***************************************************/ NTSTATUS @@ -1709,6 +1717,12 @@ VOID BlFwReboot ( VOID + ); + +NTSTATUS +MmFwFreePages ( + _In_ ULONG BasePage, + _In_ ULONG PageCount ); PGUID @@ -1987,6 +2001,13 @@ _In_ PBL_MEMORY_DESCRIPTOR_LIST DescriptorList, _In_ ULONG Type, _In_ PLIST_ENTRY ListHead + ); + +PBL_MEMORY_DESCRIPTOR +MmMdFindDescriptor ( + _In_ ULONG WhichList, + _In_ ULONG Flags, + _In_ ULONGLONG Page ); NTSTATUS Modified: trunk/reactos/boot/environ/lib/firmware/fwutil.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/firmware/… ============================================================================== --- trunk/reactos/boot/environ/lib/firmware/fwutil.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/firmware/fwutil.c [iso-8859-1] Sun Feb 5 21:50:14 2017 @@ -24,3 +24,12 @@ EfiResetSystem(EfiResetCold); } +NTSTATUS +MmFwFreePages ( + _In_ ULONG BasePage, + _In_ ULONG PageCount + ) +{ + /* Free the pages */ + return EfiFreePages(PageCount, BasePage << PAGE_SHIFT); +} Modified: trunk/reactos/boot/environ/lib/mm/descriptor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/mm/descri… ============================================================================== --- trunk/reactos/boot/environ/lib/mm/descriptor.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/mm/descriptor.c [iso-8859-1] Sun Feb 5 21:50:14 2017 @@ -857,7 +857,7 @@ (Page < (BasePage + Current->PageCount))) { /* The descriptor fits the page being requested */ - break; + return Current; } /* Try the next one */ Modified: trunk/reactos/boot/environ/lib/mm/pagealloc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/mm/pageal… ============================================================================== --- trunk/reactos/boot/environ/lib/mm/pagealloc.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/mm/pagealloc.c [iso-8859-1] Sun Feb 5 21:50:14 2017 @@ -616,6 +616,130 @@ _In_ PHYSICAL_ADDRESS Address ) { + PBL_MEMORY_DESCRIPTOR Descriptor; + ULONGLONG Page; + ULONG DescriptorFlags, Flags; + BOOLEAN DontFree, HasPageData; + BL_LIBRARY_PARAMETERS LibraryParameters; + NTSTATUS Status; + + /* Set some defaults */ + Flags = BL_MM_ADD_DESCRIPTOR_COALESCE_FLAG; + DontFree = FALSE; + HasPageData = FALSE; + + /* Only page-aligned addresses a re accepted */ + if (Address.QuadPart & (PAGE_SIZE - 1)) + { + EfiPrintf(L"free mem fail 1\r\n"); + return STATUS_INVALID_PARAMETER; + } + + /* Try to find the descriptor containing this address */ + Page = Address.QuadPart >> PAGE_SHIFT; + Descriptor = MmMdFindDescriptor(WhichList, + BL_MM_REMOVE_PHYSICAL_REGION_FLAG, + Page); + if (!Descriptor) + { + EfiPrintf(L"free mem fail 2\r\n"); + return STATUS_INVALID_PARAMETER; + } + + /* If a page count was given, it must match, unless it's coalesced */ + DescriptorFlags = Descriptor->Flags; + if (!(DescriptorFlags & BlMemoryCoalesced) && + (PageCount) && (PageCount != Descriptor->PageCount)) + { + EfiPrintf(L"free mem fail 3\r\n"); + return STATUS_INVALID_PARAMETER; + } + + /* Check if this is persistent memory in teardown status */ + if ((PapInitializationStatus == 2) && + (DescriptorFlags & BlMemoryPersistent)) + { + /* Then we should keep it */ + DontFree = TRUE; + } + else + { + /* Mark it as non-persistent, since we're freeing it */ + Descriptor->Flags &= ~BlMemoryPersistent; + } + + /* Check if this memory contains paging data */ + if ((Descriptor->Type == BlLoaderPageDirectory) || + (Descriptor->Type == BlLoaderReferencePage)) + { + HasPageData = TRUE; + } + + /* Check if a page count was given */ + if (PageCount) + { + /* The pages must fit within the descriptor */ + if ((PageCount + Page - Descriptor->BasePage) > Descriptor->PageCount) + { + EfiPrintf(L"free mem fail 4\r\n"); + return STATUS_INVALID_PARAMETER; + } + } + else + { + /* No page count given, so the address must be at the beginning then */ + if (Descriptor->BasePage != Page) + { + EfiPrintf(L"free mem fail 5\r\n"); + return STATUS_INVALID_PARAMETER; + } + + /* And we'll use the page count in the descriptor */ + PageCount = Descriptor->PageCount; + } + + /* Copy library parameters since we will read them */ + RtlCopyMemory(&LibraryParameters, + &BlpLibraryParameters, + sizeof(LibraryParameters)); + + /* Check if this is teardown */ + if (PapInitializationStatus == 2) + { + EfiPrintf(L"Case 2 not yet handled!\r\n"); + return STATUS_NOT_SUPPORTED; + } + else if (!DontFree) + { + /* Caller wants memory to be freed -- should we zero it? */ + if (!(HasPageData) & + (LibraryParameters.LibraryFlags & + BL_LIBRARY_FLAG_ZERO_HEAP_ALLOCATIONS_ON_FREE)) + { + EfiPrintf(L"Freeing zero data not yet handled!\r\n"); + return STATUS_NOT_SUPPORTED; + } + } + + /* Now call into firmware to actually free the physical pages */ + Status = MmFwFreePages(Page, PageCount); + if (!NT_SUCCESS(Status)) + { + EfiPrintf(L"free mem fail 6\r\n"); + return Status; + } + + /* Remove the firmware flags */ + Descriptor->Flags &= ~(BlMemoryNonFirmware | + BlMemoryFirmware | + BlMemoryPersistent); + + /* If we're not actually freeing, don't coalesce with anyone nearby */ + if (DontFree) + { + Flags |= BL_MM_ADD_DESCRIPTOR_NEVER_COALESCE_FLAG; + } + /* TBD */ EfiPrintf(L"Leaking memory: %p!\r\n", Address.QuadPart); return STATUS_SUCCESS;

7 years, 10 months

[ekohl] 73715: [APPWIZ] Replace resource metrics by fixed sizes.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Feb 5 21:46:51 2017 New Revision: 73715 URL: http://svn.reactos.org/svn/reactos?rev=73715&view=rev Log: [APPWIZ] Replace resource metrics by fixed sizes. Modified: trunk/reactos/dll/cpl/appwiz/lang/bg-BG.rc trunk/reactos/dll/cpl/appwiz/lang/cs-CZ.rc trunk/reactos/dll/cpl/appwiz/lang/de-DE.rc trunk/reactos/dll/cpl/appwiz/lang/el-GR.rc trunk/reactos/dll/cpl/appwiz/lang/en-US.rc trunk/reactos/dll/cpl/appwiz/lang/es-ES.rc trunk/reactos/dll/cpl/appwiz/lang/fr-FR.rc trunk/reactos/dll/cpl/appwiz/lang/he-IL.rc trunk/reactos/dll/cpl/appwiz/lang/it-IT.rc trunk/reactos/dll/cpl/appwiz/lang/ja-JP.rc trunk/reactos/dll/cpl/appwiz/lang/no-NO.rc trunk/reactos/dll/cpl/appwiz/lang/pl-PL.rc trunk/reactos/dll/cpl/appwiz/lang/pt-BR.rc trunk/reactos/dll/cpl/appwiz/lang/ro-RO.rc trunk/reactos/dll/cpl/appwiz/lang/ru-RU.rc trunk/reactos/dll/cpl/appwiz/lang/sk-SK.rc trunk/reactos/dll/cpl/appwiz/lang/sq-AL.rc trunk/reactos/dll/cpl/appwiz/lang/tr-TR.rc trunk/reactos/dll/cpl/appwiz/lang/uk-UA.rc trunk/reactos/dll/cpl/appwiz/lang/zh-CN.rc trunk/reactos/dll/cpl/appwiz/lang/zh-TW.rc trunk/reactos/dll/cpl/appwiz/resource.h Modified: trunk/reactos/dll/cpl/appwiz/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/bg-BG.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz/lang/bg-BG.rc [iso-8859-1] Sun Feb 5 21:46:51 2017 @@ -1,6 +1,6 @@ LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT -IDD_FIRSTPAGE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +IDD_FIRSTPAGE DIALOGEX 0, 0, 380, 228 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Ð¡ÑÐ·Ð´Ð°Ð²Ð°Ð½Ðµ Ð½Ð° Ð²ÑÑÐ·ÐºÐ°" FONT 8, "MS Shell Dlg", 0, 0, 0x0 @@ -9,7 +9,7 @@ LTEXT "Text2", -1, 115, 35, 160, 17 END -IDD_SUBMIT_REPORT DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +IDD_SUBMIT_REPORT DIALOGEX 0, 0, 380, 228 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Ð¡ÑÐ·Ð´Ð°Ð²Ð°Ð½Ðµ Ð½Ð° Ð²ÑÑÐ·ÐºÐ°" FONT 8, "MS Shell Dlg", 0, 0, 0x0 Modified: trunk/reactos/dll/cpl/appwiz/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/cs-CZ.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz/lang/cs-CZ.rc [iso-8859-1] Sun Feb 5 21:46:51 2017 @@ -5,7 +5,7 @@ LANGUAGE LANG_CZECH, SUBLANG_DEFAULT -IDD_FIRSTPAGE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +IDD_FIRSTPAGE DIALOGEX 0, 0, 380, 228 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Create link" FONT 8, "MS Shell Dlg", 0, 0, 0x0 @@ -14,7 +14,7 @@ LTEXT "Text2", -1, 115, 35, 160, 17 END -IDD_SUBMIT_REPORT DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +IDD_SUBMIT_REPORT DIALOGEX 0, 0, 380, 228 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Create link" FONT 8, "MS Shell Dlg", 0, 0, 0x0 Modified: trunk/reactos/dll/cpl/appwiz/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/de-DE.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz/lang/de-DE.rc [iso-8859-1] Sun Feb 5 21:46:51 2017 @@ -1,6 +1,6 @@ LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL -IDD_FIRSTPAGE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +IDD_FIRSTPAGE DIALOGEX 0, 0, 380, 228 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "VerknÃ¼pfung erstellen" FONT 8, "MS Shell Dlg", 0, 0, 0x0 @@ -9,7 +9,7 @@ LTEXT "Text2", -1, 115, 35, 160, 17 END -IDD_SUBMIT_REPORT DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +IDD_SUBMIT_REPORT DIALOGEX 0, 0, 380, 228 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "VerknÃ¼pfung erstellen" FONT 8, "MS Shell Dlg", 0, 0, 0x0 Modified: trunk/reactos/dll/cpl/appwiz/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/el-GR.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz/lang/el-GR.rc [iso-8859-1] Sun Feb 5 21:46:51 2017 @@ -1,6 +1,6 @@ LANGUAGE LANG_GREEK, SUBLANG_DEFAULT -IDD_FIRSTPAGE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +IDD_FIRSTPAGE DIALOGEX 0, 0, 380, 228 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "ÎÎ·Î¼Î¹Î¿ÏÏÎ³Î¯Î± ÏÏÎ½Î´ÎÏÎ¼Î¿Ï" FONT 8, "MS Shell Dlg", 0, 0, 0x0 @@ -9,7 +9,7 @@ LTEXT "Text2", -1, 115, 35, 160, 17 END -IDD_SUBMIT_REPORT DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +IDD_SUBMIT_REPORT DIALOGEX 0, 0, 380, 228 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "ÎÎ·Î¼Î¹Î¿ÏÏÎ³Î¯Î± ÏÏÎ½Î´ÎÏÎ¼Î¿Ï" FONT 8, "MS Shell Dlg", 0, 0, 0x0 Modified: trunk/reactos/dll/cpl/appwiz/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/en-US.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz/lang/en-US.rc [iso-8859-1] Sun Feb 5 21:46:51 2017 @@ -1,6 +1,6 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -IDD_FIRSTPAGE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +IDD_FIRSTPAGE DIALOGEX 0, 0, 380, 228 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Create link" FONT 8, "MS Shell Dlg", 0, 0, 0x0 @@ -9,7 +9,7 @@ LTEXT "Text2", -1, 115, 35, 160, 17 END -IDD_SUBMIT_REPORT DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +IDD_SUBMIT_REPORT DIALOGEX 0, 0, 380, 228 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Create link" FONT 8, "MS Shell Dlg", 0, 0, 0x0 Modified: trunk/reactos/dll/cpl/appwiz/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/es-ES.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz/lang/es-ES.rc [iso-8859-1] Sun Feb 5 21:46:51 2017 @@ -6,7 +6,7 @@ LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL -IDD_FIRSTPAGE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +IDD_FIRSTPAGE DIALOGEX 0, 0, 380, 228 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Crear acceso directo" FONT 8, "MS Shell Dlg", 0, 0, 0x0 @@ -15,7 +15,7 @@ LTEXT "Text2", -1, 115, 35, 160, 17 END -IDD_SUBMIT_REPORT DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +IDD_SUBMIT_REPORT DIALOGEX 0, 0, 380, 228 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Crear acceso directo" FONT 8, "MS Shell Dlg", 0, 0, 0x0 Modified: trunk/reactos/dll/cpl/appwiz/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/fr-FR.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz/lang/fr-FR.rc [iso-8859-1] Sun Feb 5 21:46:51 2017 @@ -1,6 +1,6 @@ LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL -IDD_FIRSTPAGE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +IDD_FIRSTPAGE DIALOGEX 0, 0, 380, 228 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "CrÃ©er un lien" FONT 8, "MS Shell Dlg", 0, 0, 0x0 @@ -9,7 +9,7 @@ LTEXT "Texte2", -1, 115, 35, 160, 17 END -IDD_SUBMIT_REPORT DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +IDD_SUBMIT_REPORT DIALOGEX 0, 0, 380, 228 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "CrÃ©er un lien" FONT 8, "MS Shell Dlg", 0, 0, 0x0 Modified: trunk/reactos/dll/cpl/appwiz/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/he-IL.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz/lang/he-IL.rc [iso-8859-1] Sun Feb 5 21:46:51 2017 @@ -1,7 +1,7 @@ // Traslated by Baruch Rutman LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT -IDD_FIRSTPAGE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +IDD_FIRSTPAGE DIALOGEX 0, 0, 380, 228 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "×¦××¨ ×§××©××¨" FONT 8, "MS Shell Dlg", 0, 0, 0x0 @@ -10,7 +10,7 @@ LTEXT "Text2", -1, 115, 35, 160, 17 END -IDD_SUBMIT_REPORT DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +IDD_SUBMIT_REPORT DIALOGEX 0, 0, 380, 228 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "×¦××¨ ×§××©××¨" FONT 8, "MS Shell Dlg", 0, 0, 0x0 Modified: trunk/reactos/dll/cpl/appwiz/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/it-IT.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz/lang/it-IT.rc [iso-8859-1] Sun Feb 5 21:46:51 2017 @@ -1,6 +1,6 @@ LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL -IDD_FIRSTPAGE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +IDD_FIRSTPAGE DIALOGEX 0, 0, 380, 228 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Crea collegamento" FONT 8, "MS Shell Dlg", 0, 0, 0x0 @@ -9,7 +9,7 @@ LTEXT "Text2", -1, 115, 35, 160, 17 END -IDD_SUBMIT_REPORT DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +IDD_SUBMIT_REPORT DIALOGEX 0, 0, 380, 228 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Crea collegamento" FONT 8, "MS Shell Dlg", 0, 0, 0x0 Modified: trunk/reactos/dll/cpl/appwiz/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/ja-JP.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz/lang/ja-JP.rc [iso-8859-1] Sun Feb 5 21:46:51 2017 @@ -1,6 +1,6 @@ LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT -IDD_FIRSTPAGE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +IDD_FIRSTPAGE DIALOGEX 0, 0, 380, 228 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "ãªã³ã¯ã®ä½æ" FONT 9, "MS UI Gothic", 0, 0, 0x0 @@ -9,7 +9,7 @@ LTEXT "ããã¹ã2", -1, 115, 35, 160, 17 END -IDD_SUBMIT_REPORT DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +IDD_SUBMIT_REPORT DIALOGEX 0, 0, 380, 228 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "ãªã³ã¯ã®ä½æ" FONT 9, "MS UI Gothic", 0, 0, 0x0 Modified: trunk/reactos/dll/cpl/appwiz/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/no-NO.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz/lang/no-NO.rc [iso-8859-1] Sun Feb 5 21:46:51 2017 @@ -1,6 +1,6 @@ LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL -IDD_FIRSTPAGE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +IDD_FIRSTPAGE DIALOGEX 0, 0, 380, 228 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Opprett lenke" FONT 8, "MS Shell Dlg", 0, 0, 0x0 @@ -9,7 +9,7 @@ LTEXT "Text2", -1, 115, 35, 160, 17 END -IDD_SUBMIT_REPORT DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +IDD_SUBMIT_REPORT DIALOGEX 0, 0, 380, 228 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Opprett lenke" FONT 8, "MS Shell Dlg", 0, 0, 0x0 Modified: trunk/reactos/dll/cpl/appwiz/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/pl-PL.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz/lang/pl-PL.rc [iso-8859-1] Sun Feb 5 21:46:51 2017 @@ -9,7 +9,7 @@ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT -IDD_FIRSTPAGE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +IDD_FIRSTPAGE DIALOGEX 0, 0, 380, 228 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "UtwÃ³rz ÅÄcze" FONT 8, "MS Shell Dlg", 0, 0, 0x0 @@ -18,7 +18,7 @@ LTEXT "Text2", -1, 115, 35, 160, 17 END -IDD_SUBMIT_REPORT DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +IDD_SUBMIT_REPORT DIALOGEX 0, 0, 380, 228 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "UtwÃ³rz ÅÄcze" FONT 8, "MS Shell Dlg", 0, 0, 0x0 Modified: trunk/reactos/dll/cpl/appwiz/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/pt-BR.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz/lang/pt-BR.rc [iso-8859-1] Sun Feb 5 21:46:51 2017 @@ -2,7 +2,7 @@ LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL -IDD_FIRSTPAGE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +IDD_FIRSTPAGE DIALOGEX 0, 0, 380, 228 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Criar link" FONT 8, "MS Shell Dlg", 0, 0, 0x0 @@ -11,7 +11,7 @@ LTEXT "Text2", -1, 115, 35, 160, 17 END -IDD_SUBMIT_REPORT DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +IDD_SUBMIT_REPORT DIALOGEX 0, 0, 380, 228 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Criar link" FONT 8, "MS Shell Dlg", 0, 0, 0x0 Modified: trunk/reactos/dll/cpl/appwiz/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/ro-RO.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz/lang/ro-RO.rc [iso-8859-1] Sun Feb 5 21:46:51 2017 @@ -6,7 +6,7 @@ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL -IDD_FIRSTPAGE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +IDD_FIRSTPAGE DIALOGEX 0, 0, 380, 228 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Asistent pentru creare de legÄturÄ" FONT 8, "MS Shell Dlg", 0, 0, 0x0 @@ -15,7 +15,7 @@ LTEXT "Text2", -1, 115, 35, 160, 17 END -IDD_SUBMIT_REPORT DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +IDD_SUBMIT_REPORT DIALOGEX 0, 0, 380, 228 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Asistent pentru creare de legÄturÄ" FONT 8, "MS Shell Dlg", 0, 0, 0x0 Modified: trunk/reactos/dll/cpl/appwiz/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/ru-RU.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz/lang/ru-RU.rc [iso-8859-1] Sun Feb 5 21:46:51 2017 @@ -1,6 +1,6 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT -IDD_FIRSTPAGE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +IDD_FIRSTPAGE DIALOGEX 0, 0, 380, 228 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Ð¡Ð¾Ð·Ð´Ð°Ð½Ð¸Ñ ÑÑÐ»ÑÐºÐ°" FONT 8, "MS Shell Dlg", 0, 0, 0x0 @@ -9,7 +9,7 @@ LTEXT "Text2", -1, 115, 35, 160, 17 END -IDD_SUBMIT_REPORT DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +IDD_SUBMIT_REPORT DIALOGEX 0, 0, 380, 228 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Ð¡Ð¾Ð·Ð´Ð°Ð½Ð¸Ðµ ÑÑÐ»ÑÐºÐ°" FONT 8, "MS Shell Dlg", 0, 0, 0x0 Modified: trunk/reactos/dll/cpl/appwiz/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/sk-SK.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz/lang/sk-SK.rc [iso-8859-1] Sun Feb 5 21:46:51 2017 @@ -4,7 +4,7 @@ LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT -IDD_FIRSTPAGE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +IDD_FIRSTPAGE DIALOGEX 0, 0, 380, 228 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "VytvoriÅ¥ linku" FONT 8, "MS Shell Dlg", 0, 0, 0x0 @@ -13,7 +13,7 @@ LTEXT "Text2", -1, 115, 35, 160, 17 END -IDD_SUBMIT_REPORT DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +IDD_SUBMIT_REPORT DIALOGEX 0, 0, 380, 228 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "VytvoriÅ¥ linku" FONT 8, "MS Shell Dlg", 0, 0, 0x0 Modified: trunk/reactos/dll/cpl/appwiz/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/sq-AL.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz/lang/sq-AL.rc [iso-8859-1] Sun Feb 5 21:46:51 2017 @@ -4,7 +4,7 @@ LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL -IDD_FIRSTPAGE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +IDD_FIRSTPAGE DIALOGEX 0, 0, 380, 228 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Krijo link" FONT 8, "MS Shell Dlg", 0, 0, 0x0 @@ -13,7 +13,7 @@ LTEXT "Text2", -1, 115, 35, 160, 17 END -IDD_SUBMIT_REPORT DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +IDD_SUBMIT_REPORT DIALOGEX 0, 0, 380, 228 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Krijo link" FONT 8, "MS Shell Dlg", 0, 0, 0x0 Modified: trunk/reactos/dll/cpl/appwiz/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/tr-TR.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz/lang/tr-TR.rc [iso-8859-1] Sun Feb 5 21:46:51 2017 @@ -2,7 +2,7 @@ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT -IDD_FIRSTPAGE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +IDD_FIRSTPAGE DIALOGEX 0, 0, 380, 228 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "BaÄlantÄ± OluÅtur" FONT 8, "MS Shell Dlg", 0, 0, 0x0 @@ -11,7 +11,7 @@ LTEXT "Metin2", -1, 115, 35, 160, 17 END -IDD_SUBMIT_REPORT DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +IDD_SUBMIT_REPORT DIALOGEX 0, 0, 380, 228 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "BaÄlantÄ± OluÅtur" FONT 8, "MS Shell Dlg", 0, 0, 0x0 Modified: trunk/reactos/dll/cpl/appwiz/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/uk-UA.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz/lang/uk-UA.rc [iso-8859-1] Sun Feb 5 21:46:51 2017 @@ -8,7 +8,7 @@ LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT -IDD_FIRSTPAGE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +IDD_FIRSTPAGE DIALOGEX 0, 0, 380, 228 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Ð¡ÑÐ²Ð¾ÑÐµÐ½Ð½Ñ ÑÑÐ»Ð¸ÐºÐ°" FONT 8, "MS Shell Dlg", 0, 0, 0x0 @@ -17,7 +17,7 @@ LTEXT "Text2", -1, 115, 35, 160, 17 END -IDD_SUBMIT_REPORT DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +IDD_SUBMIT_REPORT DIALOGEX 0, 0, 380, 228 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Ð¡ÑÐ²Ð¾ÑÐµÐ½Ð½Ñ ÑÑÐ»Ð¸ÐºÐ°" FONT 8, "MS Shell Dlg", 0, 0, 0x0 Modified: trunk/reactos/dll/cpl/appwiz/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/zh-CN.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz/lang/zh-CN.rc [iso-8859-1] Sun Feb 5 21:46:51 2017 @@ -7,7 +7,7 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED -IDD_FIRSTPAGE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +IDD_FIRSTPAGE DIALOGEX 0, 0, 380, 228 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "æ°å»ºè¿æ¥" FONT 9, "MS Shell Dlg", 0, 0, 0x0 @@ -16,7 +16,7 @@ LTEXT "Text2", -1, 115, 35, 160, 17 END -IDD_SUBMIT_REPORT DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +IDD_SUBMIT_REPORT DIALOGEX 0, 0, 380, 228 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "æ°å»ºè¿æ¥" FONT 9, "MS Shell Dlg", 0, 0, 0x0 Modified: trunk/reactos/dll/cpl/appwiz/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/zh-TW.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz/lang/zh-TW.rc [iso-8859-1] Sun Feb 5 21:46:51 2017 @@ -7,7 +7,7 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL -IDD_FIRSTPAGE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +IDD_FIRSTPAGE DIALOGEX 0, 0, 380, 228 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "æ°å»ºé£ç·" FONT 9, "MS Shell Dlg", 0, 0, 0x0 @@ -16,7 +16,7 @@ LTEXT "Text2", -1, 115, 35, 160, 17 END -IDD_SUBMIT_REPORT DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +IDD_SUBMIT_REPORT DIALOGEX 0, 0, 380, 228 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "æ°å»ºé£ç·" FONT 9, "MS Shell Dlg", 0, 0, 0x0 Modified: trunk/reactos/dll/cpl/appwiz/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/resource.h?… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/resource.h [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz/resource.h [iso-8859-1] Sun Feb 5 21:46:51 2017 @@ -1,9 +1,4 @@ #pragma once - -/* Metrics */ -#define PROPSHEETWIDTH 380 -#define PROPSHEETHEIGHT 228 -#define PROPSHEETPADDING 6 /* Icons */ #define IDI_CPLSYSTEM 1500

7 years, 10 months

[ekohl] 73714: [CPL] Remove unused resource metrics.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Feb 5 21:15:25 2017 New Revision: 73714 URL: http://svn.reactos.org/svn/reactos?rev=73714&view=rev Log: [CPL] Remove unused resource metrics. Modified: trunk/reactos/dll/cpl/desk/resource.h trunk/reactos/dll/cpl/input/resource.h trunk/reactos/dll/cpl/powercfg/resource.h trunk/reactos/dll/cpl/usrmgr/resource.h Modified: trunk/reactos/dll/cpl/desk/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/resource.h?re… ============================================================================== --- trunk/reactos/dll/cpl/desk/resource.h [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/resource.h [iso-8859-1] Sun Feb 5 21:15:25 2017 @@ -1,14 +1,4 @@ #pragma once - -/* Metrics */ -#define PROPSHEETWIDTH 246 -#define PROPSHEETHEIGHT 228 -#define PROPSHEETPADDING 6 - -#define SYSTEM_COLUMN (18 * PROPSHEETPADDING) -#define LABELLINE(x) (((PROPSHEETPADDING + 2) * x) + (x + 2)) - -#define ICONSIZE 16 /* ids */ #define IDC_DESK_ICON 40 Modified: trunk/reactos/dll/cpl/input/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/resource.h?r… ============================================================================== --- trunk/reactos/dll/cpl/input/resource.h [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/resource.h [iso-8859-1] Sun Feb 5 21:15:25 2017 @@ -1,11 +1,4 @@ #pragma once - -/* Metrics */ -#define PROPSHEETWIDTH 252 -#define PROPSHEETHEIGHT 228 -#define PROPSHEETPADDING 6 -#define SYSTEM_COLUMN (0 * PROPSHEETPADDING) -#define ICONSIZE 16 /* IDI */ #define IDI_KEYBOARD_ICO 202 Modified: trunk/reactos/dll/cpl/powercfg/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/resource.… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/resource.h [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/powercfg/resource.h [iso-8859-1] Sun Feb 5 21:15:25 2017 @@ -1,12 +1,4 @@ #pragma once - -/* Metrics */ -#define PROPSHEETWIDTH 246 -#define PROPSHEETHEIGHT 228 -#define PROPSHEETPADDING 6 -#define SYSTEM_COLUMN (18 * PROPSHEETPADDING) -#define LABELLINE(x) (((PROPSHEETPADDING + 2) * x) + (x + 2)) -#define ICONSIZE 16 /* IDs */ Modified: trunk/reactos/dll/cpl/usrmgr/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/resource.h?… ============================================================================== --- trunk/reactos/dll/cpl/usrmgr/resource.h [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/usrmgr/resource.h [iso-8859-1] Sun Feb 5 21:15:25 2017 @@ -1,14 +1,4 @@ #pragma once - -/* metrics */ -#define PROPSHEETWIDTH 246 -#define PROPSHEETHEIGHT 228 -#define PROPSHEETPADDING 6 - -#define SYSTEM_COLUMN (18 * PROPSHEETPADDING) -#define LABELLINE(x) (((PROPSHEETPADDING + 2) * x) + (x + 2)) - -#define ICONSIZE 16 /* Icons */ #define IDI_USRMGR_ICON 40

7 years, 10 months

[ion] 73713: [BOOTLIB]: Fix GCC build. Maybe I should stop using MSVC.

by ion＠svn.reactos.org

Author: ion Date: Sun Feb 5 20:52:00 2017 New Revision: 73713 URL: http://svn.reactos.org/svn/reactos?rev=73713&view=rev Log: [BOOTLIB]: Fix GCC build. Maybe I should stop using MSVC. Modified: trunk/reactos/boot/environ/lib/mm/pagealloc.c Modified: trunk/reactos/boot/environ/lib/mm/pagealloc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/mm/pageal… ============================================================================== --- trunk/reactos/boot/environ/lib/mm/pagealloc.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/mm/pagealloc.c [iso-8859-1] Sun Feb 5 20:52:00 2017 @@ -652,7 +652,7 @@ } /* Free it from there */ - PhysicalAddress.QuadPart = (ULONGLONG)Address; + PhysicalAddress.QuadPart = (ULONG_PTR)Address; return MmPapFreePhysicalPages(WhichList, 0, PhysicalAddress); }

7 years, 10 months

[ion] 73712: [BOOTMGR]: Add the basics of some memory allocator/descriptor tests. [BOOTLIB]: Implement MmMdFindDescriptorFromMdl (broken?) [BOOTLIB]: Implement MmMdFindDescriptor. [BOOTLIB]: Implem...

by ion＠svn.reactos.org

Author: ion Date: Sun Feb 5 19:55:49 2017 New Revision: 73712 URL: http://svn.reactos.org/svn/reactos?rev=73712&view=rev Log: [BOOTMGR]: Add the basics of some memory allocator/descriptor tests. [BOOTLIB]: Implement MmMdFindDescriptorFromMdl (broken?) [BOOTLIB]: Implement MmMdFindDescriptor. [BOOTLIB]: Implement BlMmFreePhysicalPages. [BOOTLIB]: Implement MmPapFreePages for physical memory translation scenario only. Modified: trunk/reactos/boot/environ/app/bootmgr/bootmgr.c trunk/reactos/boot/environ/include/bl.h trunk/reactos/boot/environ/lib/mm/descriptor.c trunk/reactos/boot/environ/lib/mm/pagealloc.c Modified: trunk/reactos/boot/environ/app/bootmgr/bootmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/app/bootmgr/b… ============================================================================== --- trunk/reactos/boot/environ/app/bootmgr/bootmgr.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/app/bootmgr/bootmgr.c [iso-8859-1] Sun Feb 5 19:55:49 2017 @@ -2895,6 +2895,31 @@ } } + + /* TEST MODE */ + EfiPrintf(L"Performing memory allocator tests...\r\n"); + { + NTSTATUS Status; + PHYSICAL_ADDRESS PhysicalAddress; + PBL_MEMORY_DESCRIPTOR Found; + PBL_MEMORY_DESCRIPTOR + MmMdFindDescriptor ( + _In_ ULONG WhichList, + _In_ ULONG Flags, + _In_ ULONGLONG Page + ); + + /* Allocate 1 physical page */ + PhysicalAddress.QuadPart = 0; + Status = BlMmAllocatePhysicalPages(&PhysicalAddress, BlLoaderData, 1, 0, 1); + EfiPrintf(L"Allocation status: %lx at address: %llx\r\n", Status, PhysicalAddress.QuadPart); + EfiStall(10000); + + Found = MmMdFindDescriptor(BL_MM_INCLUDE_UNMAPPED_ALLOCATED, 0, PhysicalAddress.QuadPart); + EfiPrintf(L"Found descriptor: %p %llx\r\n", Found, Found->BasePage); + } + + /* Write out the first XML tag */ BlXmiWrite(L"<bootmgr/>"); Modified: trunk/reactos/boot/environ/include/bl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/include/bl.h?… ============================================================================== --- trunk/reactos/boot/environ/include/bl.h [iso-8859-1] (original) +++ trunk/reactos/boot/environ/include/bl.h [iso-8859-1] Sun Feb 5 19:55:49 2017 @@ -669,7 +669,6 @@ (*PBL_DEVICE_CREATE) ( VOID ); - /* DATA STRUCTURES ***********************************************************/ Modified: trunk/reactos/boot/environ/lib/mm/descriptor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/mm/descri… ============================================================================== --- trunk/reactos/boot/environ/lib/mm/descriptor.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/mm/descriptor.c [iso-8859-1] Sun Feb 5 19:55:49 2017 @@ -779,6 +779,204 @@ return Status; } +PBL_MEMORY_DESCRIPTOR +MmMdFindDescriptorFromMdl ( + _In_ PBL_MEMORY_DESCRIPTOR_LIST MdList, + _In_ ULONG Flags, + _In_ ULONGLONG Page + ) +{ + BOOLEAN IsVirtual; + PLIST_ENTRY NextEntry, ListHead; + PBL_MEMORY_DESCRIPTOR Current; + ULONGLONG BasePage; + + /* Assume physical */ + IsVirtual = FALSE; + + /* Check if the caller wants physical memory */ + if (!(Flags & BL_MM_REMOVE_VIRTUAL_REGION_FLAG)) + { + /* Check if this is a virtual memory list */ + if (MdList->Type == BlMdVirtual) + { + /* We won't find anything */ + return NULL; + } + } + else if (MdList->Type == BlMdPhysical) + { + /* Otherwise, caller wants virtual, but this is a physical list */ + IsVirtual = TRUE; + NextEntry = MdList->First->Flink; + } + + /* Check if this is a physical search */ + if (!IsVirtual) + { + /* Check if we can use the current pointer */ + NextEntry = MdList->This; + if (!NextEntry) + { + /* We can't -- start at the beginning */ + NextEntry = MdList->First->Flink; + } + else + { + /* If the page is below the current pointer, restart */ + Current = CONTAINING_RECORD(NextEntry, BL_MEMORY_DESCRIPTOR, ListEntry); + if (Page < Current->BasePage) + { + NextEntry = MdList->First->Flink; + } + } + } + + /* Loop the list of descriptors */ + ListHead = MdList->First; + while (NextEntry != ListHead) + { + /* Get the current one */ + Current = CONTAINING_RECORD(NextEntry, BL_MEMORY_DESCRIPTOR, ListEntry); + + /* Check if we are looking for virtual memory */ + if (IsVirtual) + { + /* Use the base address */ + BasePage = Current->VirtualPage; + } + else + { + /* Use the page */ + BasePage = Current->BasePage; + } + + /* If this is a virtual descriptor, make sure it has a base address */ + if ((!(IsVirtual) || (BasePage)) && + (BasePage <= Page) && + (Page < (BasePage + Current->PageCount))) + { + /* The descriptor fits the page being requested */ + break; + } + + /* Try the next one */ + NextEntry = NextEntry->Flink; + } + + /* Nothing found if we're here */ + return NULL; +} + +PBL_MEMORY_DESCRIPTOR +MmMdFindDescriptor ( + _In_ ULONG WhichList, + _In_ ULONG Flags, + _In_ ULONGLONG Page + ) +{ + PBL_MEMORY_DESCRIPTOR FoundDescriptor; + + /* Check if the caller is looking for mapped, allocated memory */ + if (WhichList & BL_MM_INCLUDE_MAPPED_ALLOCATED) + { + /* Find a descriptor in that list */ + FoundDescriptor = MmMdFindDescriptorFromMdl(&MmMdlMappedAllocated, Flags, Page); + if (FoundDescriptor) + { + /* Got it */ + return FoundDescriptor; + } + } + + /* Check if the caller is looking for mapped, unallocated memory */ + if (WhichList & BL_MM_INCLUDE_MAPPED_UNALLOCATED) + { + /* Find a descriptor in that list */ + FoundDescriptor = MmMdFindDescriptorFromMdl(&MmMdlMappedUnallocated, Flags, Page); + if (FoundDescriptor) + { + /* Got it */ + return FoundDescriptor; + } + } + + /* Check if the caller is looking for unmapped, allocated memory */ + if (WhichList & BL_MM_INCLUDE_UNMAPPED_ALLOCATED) + { + /* Find a descriptor in that list */ + FoundDescriptor = MmMdFindDescriptorFromMdl(&MmMdlUnmappedAllocated, Flags, Page); + if (FoundDescriptor) + { + /* Got it */ + return FoundDescriptor; + } + } + + /* Check if the caller is looking for unmapped, unallocated memory */ + if (WhichList & BL_MM_INCLUDE_UNMAPPED_UNALLOCATED) + { + /* Find a descriptor in that list */ + FoundDescriptor = MmMdFindDescriptorFromMdl(&MmMdlUnmappedUnallocated, Flags, Page); + if (FoundDescriptor) + { + /* Got it */ + return FoundDescriptor; + } + } + + /* Check if the caller is looking for reserved, allocated memory */ + if (WhichList & BL_MM_INCLUDE_RESERVED_ALLOCATED) + { + /* Find a descriptor in that list */ + FoundDescriptor = MmMdFindDescriptorFromMdl(&MmMdlReservedAllocated, Flags, Page); + if (FoundDescriptor) + { + /* Got it */ + return FoundDescriptor; + } + } + + /* Check if the caller is looking for bad memory */ + if (WhichList & BL_MM_INCLUDE_BAD_MEMORY) + { + /* Find a descriptor in that list */ + FoundDescriptor = MmMdFindDescriptorFromMdl(&MmMdlBadMemory, Flags, Page); + if (FoundDescriptor) + { + /* Got it */ + return FoundDescriptor; + } + } + + /* Check if the caller is looking for truncated memory */ + if (WhichList & BL_MM_INCLUDE_TRUNCATED_MEMORY) + { + /* Find a descriptor in that list */ + FoundDescriptor = MmMdFindDescriptorFromMdl(&MmMdlTruncatedMemory, Flags, Page); + if (FoundDescriptor) + { + /* Got it */ + return FoundDescriptor; + } + } + + /* Check if the caller is looking for persistent memory */ + if (WhichList & BL_MM_INCLUDE_PERSISTENT_MEMORY) + { + /* Find a descriptor in that list */ + FoundDescriptor = MmMdFindDescriptorFromMdl(&MmMdlPersistentMemory, Flags, Page); + if (FoundDescriptor) + { + /* Got it */ + return FoundDescriptor; + } + } + + /* Nothing if we got here */ + return NULL; +} + BOOLEAN MmMdFindSatisfyingRegion ( _In_ PBL_MEMORY_DESCRIPTOR Descriptor, Modified: trunk/reactos/boot/environ/lib/mm/pagealloc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/mm/pageal… ============================================================================== --- trunk/reactos/boot/environ/lib/mm/pagealloc.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/mm/pagealloc.c [iso-8859-1] Sun Feb 5 19:55:49 2017 @@ -610,14 +610,24 @@ } NTSTATUS +MmPapFreePhysicalPages ( + _In_ ULONG WhichList, + _In_ ULONGLONG PageCount, + _In_ PHYSICAL_ADDRESS Address + ) +{ + /* TBD */ + EfiPrintf(L"Leaking memory: %p!\r\n", Address.QuadPart); + return STATUS_SUCCESS; +} + +NTSTATUS BlMmFreePhysicalPages ( _In_ PHYSICAL_ADDRESS Address ) { /* Call the physical allocator */ - EfiPrintf(L"Leaking memory: %p!\r\n", Address.QuadPart); - return STATUS_SUCCESS; - //return MmPapFreePhysicalPages(4, 0, Address); + return MmPapFreePhysicalPages(BL_MM_INCLUDE_UNMAPPED_ALLOCATED, 0, Address); } NTSTATUS @@ -626,8 +636,24 @@ _In_ ULONG WhichList ) { - EfiPrintf(L"Leaking memory: %p!\r\n", Address); - return STATUS_SUCCESS; + PHYSICAL_ADDRESS PhysicalAddress; + + /* Handle virtual memory scenario */ + if (MmTranslationType != BlNone) + { + EfiPrintf(L"Unimplemented virtual path\r\n"); + return STATUS_SUCCESS; + } + + /* Physical memory should be in the unmapped allocated list */ + if (WhichList != BL_MM_INCLUDE_PERSISTENT_MEMORY) + { + WhichList = BL_MM_INCLUDE_UNMAPPED_ALLOCATED; + } + + /* Free it from there */ + PhysicalAddress.QuadPart = (ULONGLONG)Address; + return MmPapFreePhysicalPages(WhichList, 0, PhysicalAddress); } NTSTATUS

7 years, 10 months

[khornicek] 73711: [SPIDER] - Add a null pointer check. CID 500248 - Check for a memory allocation failure. - Improve Czech resources.

by khornicek＠svn.reactos.org

Author: khornicek Date: Sun Feb 5 18:17:27 2017 New Revision: 73711 URL: http://svn.reactos.org/svn/reactos?rev=73711&view=rev Log: [SPIDER] - Add a null pointer check. CID 500248 - Check for a memory allocation failure. - Improve Czech resources. Modified: trunk/reactos/base/applications/games/spider/lang/cs-CZ.rc trunk/reactos/base/applications/games/spider/spider.cpp Modified: trunk/reactos/base/applications/games/spider/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/sp… ============================================================================== --- trunk/reactos/base/applications/games/spider/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/spider/lang/cs-CZ.rc [iso-8859-1] Sun Feb 5 18:17:27 2017 @@ -1,4 +1,4 @@ -LANGUAGE LANG_CZECH, SUBLANG_DEFAULT +ï»¿LANGUAGE LANG_CZECH, SUBLANG_DEFAULT /* Dialogs */ @@ -28,7 +28,7 @@ CAPTION "ObtÃÅ¾nost" FONT 8, "MS Shell Dlg" BEGIN - AUTORADIOBUTTON "JednoduchÃ¡: &Jedna barva", IDC_DIF_ONECOLOR, 8, 10, 80, 10, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "LehkÃ¡: &Jedna barva", IDC_DIF_ONECOLOR, 8, 10, 80, 10, WS_GROUP | WS_TABSTOP AUTORADIOBUTTON "StÅednÃ: &DvÄ barvy", IDC_DIF_TWOCOLORS, 8, 23, 80, 10 AUTORADIOBUTTON "TeÅ¾kÃ¡: Ä&tyÅi barvy", IDC_DIF_FOURCOLORS, 8, 36, 80, 10 DEFPUSHBUTTON "OK", IDOK, 8, 58, 40, 14 Modified: trunk/reactos/base/applications/games/spider/spider.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/sp… ============================================================================== --- trunk/reactos/base/applications/games/spider/spider.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/spider/spider.cpp [iso-8859-1] Sun Feb 5 18:17:27 2017 @@ -163,7 +163,10 @@ GWL_USERDATA); static WNDPROC hOldProc = NULL; - if (!hOldProc && pCardBack) + if(!pCardBack) + return FALSE; + + if (!hOldProc) hOldProc = pCardBack->hOldProc; switch (msg) @@ -246,9 +249,10 @@ INT i, c; SIZE_T size = sizeof(CARDBACK) * NUM_CARDBACKS; - pCardBacks = (PCARDBACK)HeapAlloc(GetProcessHeap(), - 0, - size); + pCardBacks = (PCARDBACK)HeapAlloc(GetProcessHeap(), 0, size); + + if(!pCardBacks) + return FALSE; for (i = 0, c = CARDBACK_START; c <= CARDBACK_END; i++, c++) {

7 years, 10 months

[pschweitzer] 73710: [FASTFAT] Addendum to r73709: - Also apply the override to FATX partitions CORE-9988

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sun Feb 5 17:14:42 2017 New Revision: 73710 URL: http://svn.reactos.org/svn/reactos?rev=73710&view=rev Log: [FASTFAT] Addendum to r73709: - Also apply the override to FATX partitions CORE-9988 Modified: trunk/reactos/drivers/filesystems/fastfat/fsctl.c Modified: trunk/reactos/drivers/filesystems/fastfat/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/fsctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/fsctl.c [iso-8859-1] Sun Feb 5 17:14:42 2017 @@ -264,7 +264,7 @@ Offset.QuadPart = 0; /* Try to recognize FATX16/FATX32 partitions (Xbox) */ - Status = VfatReadDisk(DeviceToMount, &Offset, sizeof(struct _BootSectorFatX), (PUCHAR) BootFatX, FALSE); + Status = VfatReadDisk(DeviceToMount, &Offset, sizeof(struct _BootSectorFatX), (PUCHAR) BootFatX, Override); if (NT_SUCCESS(Status)) { *RecognizedFS = TRUE;

7 years, 10 months

[pschweitzer] 73709: [FASTFAT] - Modify the VfatHasFileSystem() so that it allows a DO_VERIFY_VOLUME override, when required - Fix the implementation of VfatVerify() so that it actually really does...

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sun Feb 5 17:07:31 2017 New Revision: 73709 URL: http://svn.reactos.org/svn/reactos?rev=73709&view=rev Log: [FASTFAT] - Modify the VfatHasFileSystem() so that it allows a DO_VERIFY_VOLUME override, when required - Fix the implementation of VfatVerify() so that it actually really does the job it's supposed to do: - it will now use the appropriate DO for verification (lower DO and not volume DO) - it will properly clear the DO_VERIFY_VOLUME flag - Introduce a hack in VfatVerify() so that in case of removal media, if FATInfo is the same, it forces a dismount Effects of this commit: - It properly fixes CORE-9988. That means if a FAT media changes, now FastFAT properly handles it, and does not go to a code path producing (expected!) BSODs - The hack introduces a hacky way to make ReactOS remount FAT floppies when changed In short, changing FAT floppy in ReactOS doesn't make it BSOD any longer. CORE-9988 Modified: trunk/reactos/drivers/filesystems/fastfat/fsctl.c Modified: trunk/reactos/drivers/filesystems/fastfat/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/fsctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/fsctl.c [iso-8859-1] Sun Feb 5 17:07:31 2017 @@ -40,7 +40,8 @@ VfatHasFileSystem( PDEVICE_OBJECT DeviceToMount, PBOOLEAN RecognizedFS, - PFATINFO pFatInfo) + PFATINFO pFatInfo, + BOOLEAN Override) { NTSTATUS Status; PARTITION_INFORMATION PartitionInfo; @@ -64,7 +65,7 @@ 0, &DiskGeometry, &Size, - FALSE); + Override); if (!NT_SUCCESS(Status)) { DPRINT("VfatBlockDeviceIoControl failed (%x)\n", Status); @@ -82,7 +83,7 @@ 0, &PartitionInfo, &Size, - FALSE); + Override); if (!NT_SUCCESS(Status)) { DPRINT("VfatBlockDeviceIoControl failed (%x)\n", Status); @@ -137,7 +138,7 @@ Offset.QuadPart = 0; /* Try to recognize FAT12/FAT16/FAT32 partitions */ - Status = VfatReadDisk(DeviceToMount, &Offset, DiskGeometry.BytesPerSector, (PUCHAR) Boot, FALSE); + Status = VfatReadDisk(DeviceToMount, &Offset, DiskGeometry.BytesPerSector, (PUCHAR) Boot, Override); if (NT_SUCCESS(Status)) { if (Boot->Signatur1 != 0xaa55) @@ -345,7 +346,7 @@ DPRINT("Mounting VFAT device...\n"); - Status = VfatHasFileSystem(DeviceToMount, &RecognizedFS, &DeviceExt->FatInfo); + Status = VfatHasFileSystem(DeviceToMount, &RecognizedFS, &DeviceExt->FatInfo, FALSE); if (!NT_SUCCESS(Status)) { return Status; @@ -392,7 +393,7 @@ DeviceToMount = IrpContext->Stack->Parameters.MountVolume.DeviceObject; Vpb = IrpContext->Stack->Parameters.MountVolume.Vpb; - Status = VfatHasFileSystem(DeviceToMount, &RecognizedFS, &FatInfo); + Status = VfatHasFileSystem(DeviceToMount, &RecognizedFS, &FatInfo, FALSE); if (!NT_SUCCESS(Status)) { goto ByeBye; @@ -645,19 +646,19 @@ NTSTATUS Status = STATUS_SUCCESS; FATINFO FatInfo; BOOLEAN RecognizedFS; - PDEVICE_EXTENSION DeviceExt = IrpContext->DeviceExt; + PDEVICE_EXTENSION DeviceExt; DPRINT("VfatVerify(IrpContext %p)\n", IrpContext); DeviceToVerify = IrpContext->Stack->Parameters.VerifyVolume.DeviceObject; - Status = VfatBlockDeviceIoControl(DeviceToVerify, + DeviceExt = DeviceToVerify->DeviceExtension; + Status = VfatBlockDeviceIoControl(DeviceExt->StorageDevice, IOCTL_DISK_CHECK_VERIFY, NULL, 0, NULL, 0, TRUE); - DeviceToVerify->Flags &= ~DO_VERIFY_VOLUME; if (!NT_SUCCESS(Status) && Status != STATUS_VERIFY_REQUIRED) { DPRINT("VfatBlockDeviceIoControl() failed (Status %lx)\n", Status); @@ -665,25 +666,33 @@ } else { - Status = VfatHasFileSystem(DeviceToVerify, &RecognizedFS, &FatInfo); + Status = VfatHasFileSystem(DeviceExt->StorageDevice, &RecognizedFS, &FatInfo, TRUE); if (!NT_SUCCESS(Status) || RecognizedFS == FALSE) { Status = STATUS_WRONG_VOLUME; } else if (sizeof(FATINFO) == RtlCompareMemory(&FatInfo, &DeviceExt->FatInfo, sizeof(FATINFO))) { + DPRINT1("Same volume\n"); /* * FIXME: * Preformatted floppy disks have very often a serial number of 0000:0000. * We should calculate a crc sum over the sectors from the root directory as secondary volume number. * Each write to the root directory must update this crc sum. */ + /* HACK */ + if (!FatInfo.FixedMedia) + { + Status = STATUS_WRONG_VOLUME; + } } else { Status = STATUS_WRONG_VOLUME; } } + + IrpContext->Stack->Parameters.VerifyVolume.Vpb->RealDevice->Flags &= ~DO_VERIFY_VOLUME; return Status; }

7 years, 10 months

[khornicek] 73708: [KBSWITCH] - Don't fall through to the default label. CID 515166 [NTUSER] - Fix a copypasta. [USER32] - Fix computing of HKL for layouts with Layout id. - Don't call NtUserLoadKe...

by khornicek＠svn.reactos.org

Author: khornicek Date: Sun Feb 5 15:42:23 2017 New Revision: 73708 URL: http://svn.reactos.org/svn/reactos?rev=73708&view=rev Log: [KBSWITCH] - Don't fall through to the default label. CID 515166 [NTUSER] - Fix a copypasta. [USER32] - Fix computing of HKL for layouts with Layout id. - Don't call NtUserLoadKeyboardLayoutEx with bogus keyboard layout id. - Ideally LoadKeyboardLayout should return the default system layout on failure - to be continued. Modified: trunk/reactos/base/applications/kbswitch/kbswitch.c trunk/reactos/win32ss/user/ntuser/kbdlayout.c trunk/reactos/win32ss/user/user32/windows/input.c Modified: trunk/reactos/base/applications/kbswitch/kbswitch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/kbswitch… ============================================================================== --- trunk/reactos/base/applications/kbswitch/kbswitch.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/kbswitch/kbswitch.c [iso-8859-1] Sun Feb 5 15:42:23 2017 @@ -492,6 +492,8 @@ if (!ShellExecuteEx(&shInputDll)) MessageBox(hwnd, _T("Can't start input.dll"), NULL, MB_OK | MB_ICONERROR); + + return 0; } default: Modified: trunk/reactos/win32ss/user/ntuser/kbdlayout.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/kbdlay… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/kbdlayout.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/kbdlayout.c [iso-8859-1] Sun Feb 5 15:42:23 2017 @@ -722,7 +722,7 @@ { /* Get previous keyboard layout starting with current */ if (pti->KeyboardLayout) - pKl = pti->KeyboardLayout->pklNext; + pKl = pti->KeyboardLayout->pklPrev; } else pKl = UserHklToKbl(hKl); Modified: trunk/reactos/win32ss/user/user32/windows/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/input.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/input.c [iso-8859-1] Sun Feb 5 15:42:23 2017 @@ -281,7 +281,7 @@ HKEY hKey; /* LOWORD of dwhkl is Locale Identifier */ - dwhkl = wcstol(pwszKLID, NULL, 16); + dwhkl = LOWORD(wcstoul(pwszKLID, NULL, 16)); if (Flags & KLF_SUBSTITUTE_OK) { @@ -305,7 +305,7 @@ StringCbCatW(wszRegKey, sizeof(wszRegKey), pwszKLID); /* Open layout registry key for read */ - if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, wszRegKey, 0, + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, wszRegKey, 0, KEY_READ, &hKey) == ERROR_SUCCESS) { dwSize = sizeof(wszLayoutId); @@ -324,10 +324,13 @@ RegCloseKey(hKey); } else - ERR("RegOpenKeyExW failed!\n"); + { + ERR("Could not find keyboard layout %S.\n", pwszKLID); + return NULL; + } /* If Layout Id is not given HIWORD == LOWORD (for dwhkl) */ - if (!HIWORD(dwhkl)) + if (!HIWORD(dwhkl)) dwhkl |= dwhkl << 16; ZeroMemory(&ustrKbdName, sizeof(ustrKbdName));

7 years, 10 months

[ion] 73707: [BOOTLIB]: Stub MmPapFreePages [BOOTLIB]: Implement BlImgUnallocateImageBuffer [BOOTLIB]: Stub BlMmTranslateVirtualAddress

by ion＠svn.reactos.org

Author: ion Date: Sun Feb 5 15:14:44 2017 New Revision: 73707 URL: http://svn.reactos.org/svn/reactos?rev=73707&view=rev Log: [BOOTLIB]: Stub MmPapFreePages [BOOTLIB]: Implement BlImgUnallocateImageBuffer [BOOTLIB]: Stub BlMmTranslateVirtualAddress Modified: trunk/reactos/boot/environ/include/bl.h trunk/reactos/boot/environ/lib/io/device.c trunk/reactos/boot/environ/lib/misc/bootreg.c trunk/reactos/boot/environ/lib/misc/image.c trunk/reactos/boot/environ/lib/mm/mm.c trunk/reactos/boot/environ/lib/mm/pagealloc.c Modified: trunk/reactos/boot/environ/include/bl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/include/bl.h?… ============================================================================== --- trunk/reactos/boot/environ/include/bl.h [iso-8859-1] (original) +++ trunk/reactos/boot/environ/include/bl.h [iso-8859-1] Sun Feb 5 15:14:44 2017 @@ -2093,6 +2093,12 @@ ); NTSTATUS +MmPapFreePages ( + _In_ PVOID Address, + _In_ ULONG WhichList + ); + +NTSTATUS MmPapAllocatePagesInRange ( _Inout_ PVOID* PhysicalAddress, _In_ BL_MEMORY_TYPE MemoryType, @@ -2141,6 +2147,12 @@ BlMmUnmapVirtualAddressEx ( _In_ PVOID VirtualAddress, _In_ ULONGLONG Size + ); + +BOOLEAN +BlMmTranslateVirtualAddress ( + _In_ PVOID VirtualAddress, + _Out_ PPHYSICAL_ADDRESS PhysicalAddress ); /* BLOCK ALLOCATOR ROUTINES **************************************************/ Modified: trunk/reactos/boot/environ/lib/io/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/io/device… ============================================================================== --- trunk/reactos/boot/environ/lib/io/device.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/io/device.c [iso-8859-1] Sun Feb 5 15:14:44 2017 @@ -214,9 +214,7 @@ if (*BufferSize) { - EfiPrintf(L"Aligned free not yet implemented\r\n"); - Status = STATUS_NOT_IMPLEMENTED; - //Status = MmPapFreePages(*Buffer, 1); + Status = MmPapFreePages(*Buffer, BL_MM_INCLUDE_MAPPED_ALLOCATED); *Buffer = NULL; *BufferSize = 0; @@ -1881,8 +1879,7 @@ /* Free the prefetch buffer is one was allocated */ if (BlockIopPrefetchBuffer) { - EfiPrintf(L"Failure path not implemented %lx\r\n", Status); - //MmPapFreePages(BlockIopPrefetchBuffer, 1); + MmPapFreePages(BlockIopPrefetchBuffer, BL_MM_INCLUDE_MAPPED_ALLOCATED); } } Modified: trunk/reactos/boot/environ/lib/misc/bootreg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/misc/boot… ============================================================================== --- trunk/reactos/boot/environ/lib/misc/bootreg.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/misc/bootreg.c [iso-8859-1] Sun Feb 5 15:14:44 2017 @@ -163,8 +163,7 @@ } /* Unmap the hive */ - //MmPapFreePages(KeyHive->ImageBase, 1); - EfiPrintf(L"Leaking hive memory\r\n"); + MmPapFreePages(KeyHive->BaseBlock, BL_MM_INCLUDE_MAPPED_ALLOCATED); /* Free the hive and hive path */ BlMmFreeHeap(KeyHive->FilePath); @@ -516,8 +515,7 @@ RtlCopyMemory(NewBaseBlock, BaseBlock, HiveSize); /* Free the old data */ - EfiPrintf(L"Leaking old hive buffer\r\n"); - //MmPapFreePages(BaseBlock, 1); + MmPapFreePages(BaseBlock, BL_MM_INCLUDE_MAPPED_ALLOCATED); /* Update our pointers */ BaseBlock = NewBaseBlock; @@ -607,8 +605,7 @@ /* If we had logging data, free it */ if (LogData) { - EfiPrintf(L"Leaking log buffer\r\n"); - //MmPapFreePages(LogData, 1); + MmPapFreePages(LogData, BL_MM_INCLUDE_MAPPED_ALLOCATED); } /* Check if this is the failure path */ @@ -617,8 +614,7 @@ /* If we mapped the hive, free it */ if (BaseBlock) { - EfiPrintf(L"Leaking base block on failure\r\n"); - //MmPapFreePages(BaseBlock, 1u); + MmPapFreePages(BaseBlock, BL_MM_INCLUDE_MAPPED_ALLOCATED); } /* If we opened the device, close it */ Modified: trunk/reactos/boot/environ/lib/misc/image.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/misc/imag… ============================================================================== --- trunk/reactos/boot/environ/lib/misc/image.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/misc/image.c [iso-8859-1] Sun Feb 5 15:14:44 2017 @@ -194,8 +194,7 @@ if (File->Flags & BL_IMG_REMOTE_FILE) { /* Then only free the memory in that scenario */ - EfiPrintf(L"TODO\r\n"); - //return MmPapFreePages(File->BaseAddress, TRUE); + return MmPapFreePages(File->BaseAddress, BL_MM_INCLUDE_MAPPED_ALLOCATED); } } @@ -210,8 +209,37 @@ _In_ ULONG ImageFlags ) { - EfiPrintf(L"leaking the shit out of %p\r\n", ImageBase); - return STATUS_NOT_IMPLEMENTED; + PHYSICAL_ADDRESS PhysicalAddress; + NTSTATUS Status; + + /* Make sure required parameters are present */ + if (!(ImageBase) || !(ImageSize)) + { + return STATUS_INVALID_PARAMETER; + } + + /* Check if this was a physical allocation */ + if (!(ImageFlags & BL_LOAD_IMG_VIRTUAL_BUFFER)) + { + return MmPapFreePages(ImageBase, BL_MM_INCLUDE_MAPPED_ALLOCATED); + } + + /* It's virtual, so translate it first */ + if (!BlMmTranslateVirtualAddress(ImageBase, &PhysicalAddress)) + { + return STATUS_INVALID_PARAMETER; + } + + /* Unmap the virtual mapping */ + Status = BlMmUnmapVirtualAddressEx(ImageBase, ROUND_TO_PAGES(ImageSize)); + if (NT_SUCCESS(Status)) + { + /* Now free the physical pages */ + Status = BlMmFreePhysicalPages(PhysicalAddress); + } + + /* All done */ + return Status; } NTSTATUS @@ -562,8 +590,7 @@ else { /* Free the physical buffer */ - //MmPapFreePages(VirtualAddress, 1); - EfiPrintf(L"Leaking memory\r\n"); + MmPapFreePages(BaseAddress, BL_MM_INCLUDE_MAPPED_ALLOCATED); } } @@ -1192,8 +1219,7 @@ if (HashBuffer) { /* Free it */ - EfiPrintf(L"Leadking hash: %p\r\n", HashBuffer); - //MmPapFreePages(HashBuffer, TRUE); + MmPapFreePages(HashBuffer, BL_MM_INCLUDE_MAPPED_ALLOCATED); } /* Check if we have a certificate directory */ @@ -1234,8 +1260,7 @@ else { /* Into a physical buffer -- free it */ - EfiPrintf(L"Leaking physical pages\r\n"); - // MmPapFreePages(VirtualAddress, TRUE); + MmPapFreePages(VirtualAddress, BL_MM_INCLUDE_MAPPED_ALLOCATED); } } } @@ -1888,7 +1913,7 @@ if (BootData) { /* Free it */ - //MmPapFreePages(bootData, TRUE); + MmPapFreePages(BootData, BL_MM_INCLUDE_MAPPED_ALLOCATED); } /* All done */ Modified: trunk/reactos/boot/environ/lib/mm/mm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/mm/mm.c?r… ============================================================================== --- trunk/reactos/boot/environ/lib/mm/mm.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/mm/mm.c [iso-8859-1] Sun Feb 5 15:14:44 2017 @@ -284,6 +284,7 @@ if ((NT_SUCCESS(Status)) && (MmTranslationType != BlNone)) { /* TODO */ + EfiPrintf(L"unhandled virtual path\r\n"); Status = STATUS_NOT_IMPLEMENTED; } } @@ -297,6 +298,23 @@ MmMdFreeGlobalDescriptors(); --MmDescriptorCallTreeCount; return Status; +} + +BOOLEAN +BlMmTranslateVirtualAddress ( + _In_ PVOID VirtualAddress, + _Out_ PPHYSICAL_ADDRESS PhysicalAddress + ) +{ + /* Make sure arguments are present */ + if (!(VirtualAddress) || !(PhysicalAddress)) + { + return FALSE; + } + + EfiPrintf(L"Unhandled virtual path\r\n"); + return FALSE; + //return MmArchTranslateVirtualAddress(VirtualAddress, PhysicalAddress, NULL); } NTSTATUS Modified: trunk/reactos/boot/environ/lib/mm/pagealloc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/mm/pageal… ============================================================================== --- trunk/reactos/boot/environ/lib/mm/pagealloc.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/mm/pagealloc.c [iso-8859-1] Sun Feb 5 15:14:44 2017 @@ -195,7 +195,6 @@ /* Does the memory we received not exactly fall onto the beginning of its descriptor? */ if (LocalDescriptor.BasePage != FoundDescriptor->BasePage) { - EfiPrintf(L"Local Page: %08I64X Found Page: %08I64X\r\n", LocalDescriptor.BasePage, FoundDescriptor->BasePage); TempDescriptor = MmMdInitByteGranularDescriptor(FoundDescriptor->Flags, FoundDescriptor->Type, FoundDescriptor->BasePage, @@ -216,7 +215,6 @@ LocalDescriptor.VirtualPage + LocalDescriptor.PageCount : 0; if (LocalEndPage != FoundEndPage) { - EfiPrintf(L"Local Page: %08I64X Found Page: %08I64X\r\n", LocalEndPage, FoundEndPage); TempDescriptor = MmMdInitByteGranularDescriptor(FoundDescriptor->Flags, FoundDescriptor->Type, LocalEndPage, @@ -617,9 +615,19 @@ ) { /* Call the physical allocator */ - EfiPrintf(L"Leaking memory!\r\n"); + EfiPrintf(L"Leaking memory: %p!\r\n", Address.QuadPart); return STATUS_SUCCESS; //return MmPapFreePhysicalPages(4, 0, Address); +} + +NTSTATUS +MmPapFreePages ( + _In_ PVOID Address, + _In_ ULONG WhichList + ) +{ + EfiPrintf(L"Leaking memory: %p!\r\n", Address); + return STATUS_SUCCESS; } NTSTATUS

7 years, 10 months

← Newer
1
...
27
28
29
30
31
32
33
...
36
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 February 2017