Ros-diffs February 2007

ros-diffs@reactos.org

16 participants
265 discussions

[ion] 25892: - Load the driver image file with OBJ_KERNEL_HANDLE, and don't use FILE_SYNCHRONOUSIO_NONALERT, since we can use async access since the data is now being mapped instead of read.

by ion＠svn.reactos.org

Author: ion Date: Fri Feb 23 18:35:14 2007 New Revision: 25892 URL: http://svn.reactos.org/svn/reactos?rev=25892&view=rev Log: - Load the driver image file with OBJ_KERNEL_HANDLE, and don't use FILE_SYNCHRONOUSIO_NONALERT, since we can use async access since the data is now being mapped instead of read. Modified: trunk/reactos/ntoskrnl/mm/sysldr.c Modified: trunk/reactos/ntoskrnl/mm/sysldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/sysldr.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/mm/sysldr.c (original) +++ trunk/reactos/ntoskrnl/mm/sysldr.c Fri Feb 23 18:35:14 2007 @@ -1576,7 +1576,7 @@ /* Setup image attributes */ InitializeObjectAttributes(&ObjectAttributes, FileName, - OBJ_CASE_INSENSITIVE, + OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, NULL, NULL); @@ -1586,7 +1586,7 @@ &ObjectAttributes, &IoStatusBlock, FILE_SHARE_READ | FILE_SHARE_DELETE, - FILE_SYNCHRONOUS_IO_NONALERT); + 0); if (!NT_SUCCESS(Status)) goto Quickie; /* Validate it */

17 years, 6 months

[ion] 25891: - Add a new member to MM_IMAGE_SECTION_OBJECT to hold the size of the mapped image file. - Finally load driver images like human beings, as actual image section objects instead of random memory that we allocate and manually "load" using unsafe and crappy PE memory copies. We now use KJK's integer-safe and properly documented/implemented loader for image sections that is already used for processes and other user-mode images. - Implement MiLoadImageSection for the task above and remov

by ion＠svn.reactos.org

Author: ion Date: Fri Feb 23 18:31:45 2007 New Revision: 25891 URL: http://svn.reactos.org/svn/reactos?rev=25891&view=rev Log: - Add a new member to MM_IMAGE_SECTION_OBJECT to hold the size of the mapped image file. - Finally load driver images like human beings, as actual image section objects instead of random memory that we allocate and manually "load" using unsafe and crappy PE memory copies. We now use KJK's integer-safe and properly documented/implemented loader for image sections that is already used for processes and other user-mode images. - Implement MiLoadImageSection for the task above and remove all the deprecated code that did the previous hackloading. Modified: trunk/reactos/ntoskrnl/include/internal/mm.h trunk/reactos/ntoskrnl/mm/section.c trunk/reactos/ntoskrnl/mm/sysldr.c Modified: trunk/reactos/ntoskrnl/include/internal/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/mm.h (original) +++ trunk/reactos/ntoskrnl/include/internal/mm.h Fri Feb 23 18:31:45 2007 @@ -191,6 +191,7 @@ USHORT Machine; BOOLEAN Executable; ULONG NrSegments; + ULONG ImageSize; PMM_SECTION_SEGMENT Segments; } MM_IMAGE_SECTION_OBJECT, *PMM_IMAGE_SECTION_OBJECT; Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c (original) +++ trunk/reactos/ntoskrnl/mm/section.c Fri Feb 23 18:31:45 2007 @@ -4560,6 +4560,8 @@ } } + ImageSectionObject->ImageSize = ImageSize; + /* Check there is enough space to map the section at that point. */ if (MmLocateMemoryAreaByRegion(AddressSpace, (PVOID)ImageBase, PAGE_ROUND_UP(ImageSize)) != NULL) Modified: trunk/reactos/ntoskrnl/mm/sysldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/sysldr.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/mm/sysldr.c (original) +++ trunk/reactos/ntoskrnl/mm/sysldr.c Fri Feb 23 18:31:45 2007 @@ -18,8 +18,101 @@ KSPIN_LOCK PsLoadedModuleSpinLock; PVOID PsNtosImageBase; KMUTANT MmSystemLoadLock; +extern ULONG NtGlobalFlag; /* FUNCTIONS *****************************************************************/ + +NTSTATUS +NTAPI +MiLoadImageSection(IN OUT PVOID *SectionPtr, + OUT PVOID *ImageBase, + IN PUNICODE_STRING FileName, + IN BOOLEAN SessionLoad, + IN PLDR_DATA_TABLE_ENTRY LdrEntry) +{ + PROS_SECTION_OBJECT Section = *SectionPtr; + NTSTATUS Status; + PEPROCESS Process; + PVOID Base = NULL; + SIZE_T ViewSize = 0; + KAPC_STATE ApcState; + LARGE_INTEGER SectionOffset = {{0}}; + BOOLEAN LoadSymbols = FALSE; + ULONG DriverSize; + PVOID DriverBase; + PAGED_CODE(); + + /* Detect session load */ + if (SessionLoad) + { + /* Fail */ + DPRINT1("Session loading not yet supported!\n"); + while (TRUE); + } + + /* Not session load, shouldn't have an entry */ + ASSERT(LdrEntry == NULL); + + /* Attach to the system process */ + KeStackAttachProcess(&PsInitialSystemProcess->Pcb, &ApcState); + + /* Check if we need to load symbols */ + if (NtGlobalFlag & FLG_ENABLE_KDEBUG_SYMBOL_LOAD) + { + /* Yes we do */ + LoadSymbols = TRUE; + NtGlobalFlag &= ~FLG_ENABLE_KDEBUG_SYMBOL_LOAD; + } + + /* Map the driver */ + Process = PsGetCurrentProcess(); + Status = MmMapViewOfSection(Section, + Process, + &Base, + 0, + 0, + &SectionOffset, + &ViewSize, + ViewUnmap, + 0, + PAGE_EXECUTE); + + /* Re-enable the flag */ + if (LoadSymbols) NtGlobalFlag |= FLG_ENABLE_KDEBUG_SYMBOL_LOAD; + + /* Check if we failed with distinguished status code */ + if (Status == STATUS_IMAGE_MACHINE_TYPE_MISMATCH) + { + /* Change it to something more generic */ + Status = STATUS_INVALID_IMAGE_FORMAT; + } + + /* Now check if we failed */ + if (!NT_SUCCESS(Status)) + { + /* Detach and return */ + KeUnstackDetachProcess(&ApcState); + return Status; + } + + /* Get the driver size */ + DriverSize = Section->ImageSection->ImageSize; + + /* Allocate a virtual section for the module */ + DriverBase = MmAllocateSection(DriverSize, NULL); + *ImageBase = DriverBase; + + /* Copy the image */ + RtlCopyMemory(DriverBase, Base, DriverSize); + + /* Now unmap the view */ + Status = MmUnmapViewOfSection(Process, Base); + ASSERT(NT_SUCCESS(Status)); + + /* Detach and return status */ + KeUnstackDetachProcess(&ApcState); + return Status; +} NTSTATUS NTAPI @@ -1331,11 +1424,7 @@ NTSTATUS Status; HANDLE FileHandle = NULL; OBJECT_ATTRIBUTES ObjectAttributes; - FILE_STANDARD_INFORMATION FileStdInfo; IO_STATUS_BLOCK IoStatusBlock; - ULONG DriverSize = 0, Size, i; - PVOID DriverBase; - PIMAGE_SECTION_HEADER SectionHeaders; PIMAGE_NT_HEADERS NtHeader; UNICODE_STRING BaseName, BaseDirectory, PrefixName; PLDR_DATA_TABLE_ENTRY LdrEntry = NULL; @@ -1510,31 +1599,6 @@ goto Quickie; } - /* Get image size */ - Status = ZwQueryInformationFile(FileHandle, - &IoStatusBlock, - &FileStdInfo, - sizeof(FileStdInfo), - FileStandardInformation); - if (!NT_SUCCESS(Status)) goto Quickie; - - /* Allocate memory for image */ - ModuleLoadBase = ExAllocatePoolWithTag(NonPagedPool, - FileStdInfo.EndOfFile.u.LowPart, - TAG_DRIVER_MEM); - - /* Read the image */ - Status = ZwReadFile(FileHandle, - 0, - 0, - 0, - &IoStatusBlock, - ModuleLoadBase, - FileStdInfo.EndOfFile.u.LowPart, - 0, - 0); - if (!NT_SUCCESS(Status)) goto Quickie; - /* Check if this is a session-load */ if (Flags) { @@ -1591,61 +1655,19 @@ LdrEntry = NULL; } - /* We should have a valid module base */ - ASSERT(ModuleLoadBase != NULL); - - /* Get header pointers */ + /* Load the image */ + Status = MiLoadImageSection(&Section, + &ModuleLoadBase, + FileName, + FALSE, + NULL); + ASSERT(Status != STATUS_ALREADY_COMMITTED); + + /* Get the NT Header */ NtHeader = RtlImageNtHeader(ModuleLoadBase); - /* Get header pointers */ - SectionHeaders = IMAGE_FIRST_SECTION(NtHeader); - - /* Determine the size of the module */ - for (i = 0; i < NtHeader->FileHeader.NumberOfSections; i++) - { - /* Skip this section if we're not supposed to load it */ - if (!(SectionHeaders[i].Characteristics & IMAGE_SCN_TYPE_NOLOAD)) - { - /* Add the size of this section into the total size */ - Size = SectionHeaders[i].VirtualAddress + - SectionHeaders[i].Misc.VirtualSize; - DriverSize = max(DriverSize, Size); - } - } - - /* Round up the driver size to section alignment */ - DriverSize = ROUND_UP(DriverSize, NtHeader->OptionalHeader.SectionAlignment); - - /* Allocate a virtual section for the module */ - DriverBase = MmAllocateSection(DriverSize, NULL); - - /* Copy headers over */ - RtlCopyMemory(DriverBase, - ModuleLoadBase, - NtHeader->OptionalHeader.SizeOfHeaders); - - /* Copy image sections into virtual section */ - for (i = 0; i < NtHeader->FileHeader.NumberOfSections; i++) - { - /* Get the size of this section and check if it's valid and on-disk */ - Size = SectionHeaders[i].VirtualAddress + - SectionHeaders[i].Misc.VirtualSize; - if ((Size <= DriverSize) && (SectionHeaders[i].SizeOfRawData)) - { - /* Copy the data from the disk to the image */ - RtlCopyMemory((PVOID)((ULONG_PTR)DriverBase + - SectionHeaders[i].VirtualAddress), - (PVOID)((ULONG_PTR)ModuleLoadBase + - SectionHeaders[i].PointerToRawData), - SectionHeaders[i].Misc.VirtualSize > - SectionHeaders[i].SizeOfRawData ? - SectionHeaders[i].SizeOfRawData : - SectionHeaders[i].Misc.VirtualSize); - } - } - /* Relocate the driver */ - Status = LdrRelocateImageWithBias(DriverBase, + Status = LdrRelocateImageWithBias(ModuleLoadBase, 0, "SYSLDR", STATUS_SUCCESS, @@ -1682,10 +1704,10 @@ } /* Setup the rest of the entry */ - LdrEntry->DllBase = DriverBase; - LdrEntry->EntryPoint = (PVOID)((ULONG_PTR)DriverBase + + LdrEntry->DllBase = ModuleLoadBase; + LdrEntry->EntryPoint = (PVOID)((ULONG_PTR)ModuleLoadBase + NtHeader->OptionalHeader.AddressOfEntryPoint); - LdrEntry->SizeOfImage = DriverSize; + LdrEntry->SizeOfImage = ((PROS_SECTION_OBJECT)Section)->ImageSection->ImageSize; LdrEntry->CheckSum = NtHeader->OptionalHeader.CheckSum; LdrEntry->SectionPointer = LdrEntry; @@ -1729,7 +1751,7 @@ /* Resolve imports */ MissingApiName = Buffer; - Status = MiResolveImageReferences(DriverBase, + Status = MiResolveImageReferences(ModuleLoadBase, &BaseDirectory, NULL, &MissingApiName, @@ -1762,9 +1784,6 @@ Quickie: /* If we have a file handle, close it */ if (FileHandle) ZwClose(FileHandle); - - /* Cleanup */ - if (ModuleLoadBase) ExFreePool(ModuleLoadBase); /* Check if we have the lock acquired */ if (LockOwned)

17 years, 6 months

[tretiakov] 25890: Move primary language selection from Input Locale page to General page.

by tretiakov＠svn.reactos.org

Author: tretiakov Date: Fri Feb 23 12:35:32 2007 New Revision: 25890 URL: http://svn.reactos.org/svn/reactos?rev=25890&view=rev Log: Move primary language selection from Input Locale page to General page. Added: trunk/reactos/dll/cpl/intl/generalp.c - copied, changed from r25798, trunk/reactos/dll/cpl/intl/locale.c trunk/reactos/dll/cpl/intl/inplocale.c - copied, changed from r25798, trunk/reactos/dll/cpl/intl/general.c Removed: trunk/reactos/dll/cpl/intl/general.c trunk/reactos/dll/cpl/intl/locale.c Modified: trunk/reactos/dll/cpl/intl/Fr.rc trunk/reactos/dll/cpl/intl/Ja.rc trunk/reactos/dll/cpl/intl/cz.rc trunk/reactos/dll/cpl/intl/de.rc trunk/reactos/dll/cpl/intl/en.rc trunk/reactos/dll/cpl/intl/es.rc trunk/reactos/dll/cpl/intl/hu.rc trunk/reactos/dll/cpl/intl/intl.c trunk/reactos/dll/cpl/intl/intl.h trunk/reactos/dll/cpl/intl/intl.rbuild trunk/reactos/dll/cpl/intl/it.rc trunk/reactos/dll/cpl/intl/nl.rc trunk/reactos/dll/cpl/intl/ru.rc trunk/reactos/dll/cpl/intl/sv.rc trunk/reactos/dll/cpl/intl/uk.rc Modified: trunk/reactos/dll/cpl/intl/Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/Fr.rc?rev=258… ============================================================================== --- trunk/reactos/dll/cpl/intl/Fr.rc (original) +++ trunk/reactos/dll/cpl/intl/Fr.rc Fri Feb 23 12:35:32 2007 @@ -7,7 +7,10 @@ CAPTION "Général" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Page de propriétés 1",-1,73,74,90,8 + GROUPBOX "Langue principale", -1, 8, 11, 228, 74 + ICON IDC_FLAGS, IDC_ICON1, 12, 26, 21, 20, SS_ICON + LTEXT "Sélectionnez la langue principale que vous voulez utiliser:", -1, 38, 25, 193, 22 + COMBOBOX IDC_LANGUAGELIST, 39, 49, 191, 83, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL END @@ -86,10 +89,7 @@ CAPTION "Langues" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Langue principale", -1, 8, 11, 228, 74 - ICON IDC_FLAGS, IDC_ICON1, 12, 26, 21, 20, SS_ICON - LTEXT "Sélectionnez la langue principale que vous voulez utiliser:", -1, 38, 25, 193, 22 - COMBOBOX IDC_LANGUAGELIST, 39, 49, 191, 83, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + END Modified: trunk/reactos/dll/cpl/intl/Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/Ja.rc?rev=258… ============================================================================== --- trunk/reactos/dll/cpl/intl/Ja.rc (original) +++ trunk/reactos/dll/cpl/intl/Ja.rc Fri Feb 23 12:35:32 2007 @@ -5,7 +5,10 @@ CAPTION "SÊ" FONT 9, "MS UI Gothic" BEGIN - LTEXT "Property Page 1",-1,73,74,90,8 + GROUPBOX "gp¾ê", -1, 8, 11, 228, 74 + ICON IDC_FLAGS, IDC_ICON1, 12, 26, 21, 20, SS_ICON + LTEXT "gpµ½¢¾êÆnæÝèðIðµÄ¾³¢:", -1, 38, 25, 193, 22 + COMBOBOX IDC_LANGUAGELIST, 39, 49, 191, 83, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL END @@ -83,10 +86,7 @@ CAPTION "üÍ¾ê" FONT 9, "MS UI Gothic" BEGIN - GROUPBOX "gp¾ê", -1, 8, 11, 228, 74 - ICON IDC_FLAGS, IDC_ICON1, 12, 26, 21, 20, SS_ICON - LTEXT "gpµ½¢¾êÆnæÝèðIðµÄ¾³¢:", -1, 38, 25, 193, 22 - COMBOBOX IDC_LANGUAGELIST, 39, 49, 191, 83, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + END Modified: trunk/reactos/dll/cpl/intl/cz.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/cz.rc?rev=258… ============================================================================== --- trunk/reactos/dll/cpl/intl/cz.rc (original) +++ trunk/reactos/dll/cpl/intl/cz.rc Fri Feb 23 12:35:32 2007 @@ -7,7 +7,10 @@ CAPTION "Obecné nastavení" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Property Page 1",-1,73,74,90,8 + GROUPBOX "Výchozí jazyk", -1, 8, 11, 228, 74 + ICON IDC_FLAGS, IDC_ICON1, 12, 26, 21, 20, SS_ICON + LTEXT "Vyberte jazyk, ve kterém bude systém zobrazovat dialogy a hláení:", -1, 38, 25, 193, 22 + COMBOBOX IDC_LANGUAGELIST, 39, 49, 191, 83, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL END @@ -85,10 +88,7 @@ CAPTION "Jazyky" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Výchozí jazyk", -1, 8, 11, 228, 74 - ICON IDC_FLAGS, IDC_ICON1, 12, 26, 21, 20, SS_ICON - LTEXT "Vyberte jazyk, ve kterém bude systém zobrazovat dialogy a hláení:", -1, 38, 25, 193, 22 - COMBOBOX IDC_LANGUAGELIST, 39, 49, 191, 83, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + END Modified: trunk/reactos/dll/cpl/intl/de.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/de.rc?rev=258… ============================================================================== --- trunk/reactos/dll/cpl/intl/de.rc (original) +++ trunk/reactos/dll/cpl/intl/de.rc Fri Feb 23 12:35:32 2007 @@ -7,7 +7,10 @@ CAPTION "Allgemein" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Property Page 1",-1,73,74,90,8 + GROUPBOX "Standardsprache", -1, 8, 11, 228, 74 + ICON IDC_FLAGS, IDC_ICON1, 12, 26, 21, 20, SS_ICON + LTEXT "Wählen Sie eine Sprache und Region aus welche Sie benutzen wollen:", -1, 38, 25, 193, 22 + COMBOBOX IDC_LANGUAGELIST, 39, 49, 191, 83, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL END @@ -85,10 +88,7 @@ CAPTION "Regionale Einstellungen" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Standardsprache", -1, 8, 11, 228, 74 - ICON IDC_FLAGS, IDC_ICON1, 12, 26, 21, 20, SS_ICON - LTEXT "Wählen Sie eine Sprache und Region aus welche Sie benutzen wollen:", -1, 38, 25, 193, 22 - COMBOBOX IDC_LANGUAGELIST, 39, 49, 191, 83, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + END Modified: trunk/reactos/dll/cpl/intl/en.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/en.rc?rev=258… ============================================================================== --- trunk/reactos/dll/cpl/intl/en.rc (original) +++ trunk/reactos/dll/cpl/intl/en.rc Fri Feb 23 12:35:32 2007 @@ -7,7 +7,10 @@ CAPTION "General" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Property Page 1",-1,73,74,90,8 + GROUPBOX "Primary language", -1, 8, 11, 228, 74 + ICON IDC_FLAGS, IDC_ICON1, 12, 26, 21, 20, SS_ICON + LTEXT "Select the primary language and region you want to use:", -1, 38, 25, 193, 22 + COMBOBOX IDC_LANGUAGELIST, 39, 49, 191, 83, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL END @@ -86,10 +89,7 @@ CAPTION "Input Locale" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Primary language", -1, 8, 11, 228, 74 - ICON IDC_FLAGS, IDC_ICON1, 12, 26, 21, 20, SS_ICON - LTEXT "Select the primary language and region you want to use:", -1, 38, 25, 193, 22 - COMBOBOX IDC_LANGUAGELIST, 39, 49, 191, 83, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "Input Locale Page",-1,73,74,90,8 END Modified: trunk/reactos/dll/cpl/intl/es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/es.rc?rev=258… ============================================================================== --- trunk/reactos/dll/cpl/intl/es.rc (original) +++ trunk/reactos/dll/cpl/intl/es.rc Fri Feb 23 12:35:32 2007 @@ -11,7 +11,10 @@ CAPTION "General" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Property Page 1",-1,73,74,90,8 + GROUPBOX "Lenguaje Primario", -1, 8, 11, 228, 74 + ICON IDC_FLAGS, IDC_ICON1, 12, 26, 21, 20, SS_ICON + LTEXT "Seleccione el lenguaje primario y la región que desea usar:", -1, 38, 25, 193, 22 + COMBOBOX IDC_LANGUAGELIST, 39, 49, 191, 83, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL END @@ -90,10 +93,7 @@ CAPTION "Localidad" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Lenguaje Primario", -1, 8, 11, 228, 74 - ICON IDC_FLAGS, IDC_ICON1, 12, 26, 21, 20, SS_ICON - LTEXT "Seleccione el lenguaje primario y la región que desea usar:", -1, 38, 25, 193, 22 - COMBOBOX IDC_LANGUAGELIST, 39, 49, 191, 83, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + END Removed: trunk/reactos/dll/cpl/intl/general.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/general.c?rev… ============================================================================== --- trunk/reactos/dll/cpl/intl/general.c (original) +++ trunk/reactos/dll/cpl/intl/general.c (removed) @@ -1,51 +1,0 @@ -/* - * ReactOS - * Copyright (C) 2004 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ -/* $Id$ - * - * PROJECT: ReactOS International Control Panel - * FILE: lib/cpl/intl/general.c - * PURPOSE: General property page - * PROGRAMMER: Eric Kohl - */ - -#include <windows.h> -#include <commctrl.h> -#include <prsht.h> -#include <cpl.h> - -#include "intl.h" -#include "resource.h" - - -/* Property page dialog callback */ -INT_PTR CALLBACK -GeneralPageProc(HWND hwndDlg, - UINT uMsg, - WPARAM wParam, - LPARAM lParam) -{ - switch(uMsg) - { - case WM_INITDIALOG: - break; - } - return FALSE; -} - -/* EOF */ Copied: trunk/reactos/dll/cpl/intl/generalp.c (from r25798, trunk/reactos/dll/cpl/intl/locale.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/generalp.c?p2… ============================================================================== --- trunk/reactos/dll/cpl/intl/locale.c (original) +++ trunk/reactos/dll/cpl/intl/generalp.c Fri Feb 23 12:35:32 2007 @@ -19,8 +19,8 @@ /* $Id$ * * PROJECT: ReactOS International Control Panel - * FILE: lib/cpl/intl/locale.c - * PURPOSE: Locale property page + * FILE: lib/cpl/intl/generalp.c + * PURPOSE: General property page * PROGRAMMER: Eric Kohl * Klemens Friedl * Aleksey Bragin @@ -176,7 +176,7 @@ /* Property page dialog callback */ INT_PTR CALLBACK -LocalePageProc(HWND hwndDlg, +GeneralPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) Modified: trunk/reactos/dll/cpl/intl/hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/hu.rc?rev=258… ============================================================================== --- trunk/reactos/dll/cpl/intl/hu.rc (original) +++ trunk/reactos/dll/cpl/intl/hu.rc Fri Feb 23 12:35:32 2007 @@ -6,7 +6,10 @@ CAPTION "Általános" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "1. tulajdonságlap",-1,73,74,90,8 + GROUPBOX "Elsõdleges nyelv", -1, 8, 11, 228, 74 + ICON IDC_FLAGS, IDC_ICON1, 12, 26, 21, 20, SS_ICON + LTEXT "Válassza ki azt a nyelvet és földrajzi helyet, amit használni akar:", -1, 38, 25, 193, 22 + COMBOBOX IDC_LANGUAGELIST, 39, 49, 191, 83, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL END @@ -85,10 +88,7 @@ CAPTION "Hely megadása" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Elsõdleges nyelv", -1, 8, 11, 228, 74 - ICON IDC_FLAGS, IDC_ICON1, 12, 26, 21, 20, SS_ICON - LTEXT "Válassza ki azt a nyelvet és földrajzi helyet, amit használni akar:", -1, 38, 25, 193, 22 - COMBOBOX IDC_LANGUAGELIST, 39, 49, 191, 83, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + END Copied: trunk/reactos/dll/cpl/intl/inplocale.c (from r25798, trunk/reactos/dll/cpl/intl/general.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/inplocale.c?p… ============================================================================== --- trunk/reactos/dll/cpl/intl/general.c (original) +++ trunk/reactos/dll/cpl/intl/inplocale.c Fri Feb 23 12:35:32 2007 @@ -19,8 +19,8 @@ /* $Id$ * * PROJECT: ReactOS International Control Panel - * FILE: lib/cpl/intl/general.c - * PURPOSE: General property page + * FILE: lib/cpl/intl/inplocale.c + * PURPOSE: Input Locale property page * PROGRAMMER: Eric Kohl */ @@ -35,7 +35,7 @@ /* Property page dialog callback */ INT_PTR CALLBACK -GeneralPageProc(HWND hwndDlg, +InpLocalePageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) Modified: trunk/reactos/dll/cpl/intl/intl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/intl.c?rev=25… ============================================================================== --- trunk/reactos/dll/cpl/intl/intl.c (original) +++ trunk/reactos/dll/cpl/intl/intl.c Fri Feb 23 12:35:32 2007 @@ -156,7 +156,7 @@ InitPropSheetPage(&psp[2], IDD_CURRENCYPAGE, CurrencyPageProc); InitPropSheetPage(&psp[3], IDD_TIMEPAGE, TimePageProc); InitPropSheetPage(&psp[4], IDD_DATEPAGE, DatePageProc); - InitPropSheetPage(&psp[5], IDD_LOCALEPAGE, LocalePageProc); + InitPropSheetPage(&psp[5], IDD_LOCALEPAGE, InpLocalePageProc); return (LONG)(PropertySheet(&psh) != -1); } Modified: trunk/reactos/dll/cpl/intl/intl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/intl.h?rev=25… ============================================================================== --- trunk/reactos/dll/cpl/intl/intl.h (original) +++ trunk/reactos/dll/cpl/intl/intl.h Fri Feb 23 12:35:32 2007 @@ -36,7 +36,7 @@ /* locale.c */ INT_PTR CALLBACK -LocalePageProc(HWND hwndDlg, +InpLocalePageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); Modified: trunk/reactos/dll/cpl/intl/intl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/intl.rbuild?r… ============================================================================== --- trunk/reactos/dll/cpl/intl/intl.rbuild (original) +++ trunk/reactos/dll/cpl/intl/intl.rbuild Fri Feb 23 12:35:32 2007 @@ -15,9 +15,9 @@ <library>msvcrt</library> <file>currency.c</file> <file>date.c</file> - <file>general.c</file> + <file>generalp.c</file> <file>intl.c</file> - <file>locale.c</file> + <file>inplocale.c</file> <file>numbers.c</file> <file>time.c</file> <file>intl.rc</file> Modified: trunk/reactos/dll/cpl/intl/it.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/it.rc?rev=258… ============================================================================== --- trunk/reactos/dll/cpl/intl/it.rc (original) +++ trunk/reactos/dll/cpl/intl/it.rc Fri Feb 23 12:35:32 2007 @@ -8,7 +8,10 @@ CAPTION "Generale" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Pagina delle proprietà 1",-1,73,74,90,8 + GROUPBOX "Lingua principale", -1, 8, 11, 228, 74 + ICON IDC_FLAGS, IDC_ICON1, 12, 26, 21, 20, SS_ICON + LTEXT "Scegli la lingua principale e le opzioni regionali che intendi usare:", -1, 38, 25, 193, 22 + COMBOBOX IDC_LANGUAGELIST, 39, 49, 191, 83, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL END @@ -87,10 +90,7 @@ CAPTION "Input Locale" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Lingua principale", -1, 8, 11, 228, 74 - ICON IDC_FLAGS, IDC_ICON1, 12, 26, 21, 20, SS_ICON - LTEXT "Scegli la lingua principale e le opzioni regionali che intendi usare:", -1, 38, 25, 193, 22 - COMBOBOX IDC_LANGUAGELIST, 39, 49, 191, 83, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + END Removed: trunk/reactos/dll/cpl/intl/locale.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/locale.c?rev=… ============================================================================== --- trunk/reactos/dll/cpl/intl/locale.c (original) +++ trunk/reactos/dll/cpl/intl/locale.c (removed) @@ -1,237 +1,0 @@ -/* - * ReactOS - * Copyright (C) 2004, 2005 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ -/* $Id$ - * - * PROJECT: ReactOS International Control Panel - * FILE: lib/cpl/intl/locale.c - * PURPOSE: Locale property page - * PROGRAMMER: Eric Kohl - * Klemens Friedl - * Aleksey Bragin - */ - -#define WINVER 0x0501 - -#include <windows.h> -#include <commctrl.h> -#include <cpl.h> - -#include <stdio.h> - -#include "intl.h" -#include "resource.h" - -HWND hList; - -BOOL CALLBACK LocalesEnumProc( - LPTSTR lpLocale // locale id -) -{ - LCID lcid; - TCHAR lang[255]; - int index; - - //swscanf(lpLocale, L"%lx", &lcid); // maybe use wcstoul? - lcid = wcstoul(lpLocale, NULL, 16); - - GetLocaleInfo(lcid, LOCALE_SLANGUAGE, lang, sizeof(lang)); - - index = SendMessageW(hList, - CB_ADDSTRING, - 0, - (LPARAM)lang); - - SendMessageW(hList, - CB_SETITEMDATA, - index, - (LPARAM)lcid); - - return TRUE; -} - - -static VOID -CreateLanguagesList(HWND hwnd) -{ - TCHAR langSel[255]; - - hList = hwnd; - EnumSystemLocalesW(LocalesEnumProc, LCID_SUPPORTED); - - // Select current locale - GetLocaleInfo(GetUserDefaultLCID(), LOCALE_SLANGUAGE, langSel, sizeof(langSel)); // or should it be System and not user? - - SendMessageW(hList, - CB_SELECTSTRING, - -1, - (LPARAM)langSel); -} - -// Sets new locale -void SetNewLocale(LCID lcid) -{ - // HKCU\\Control Panel\\International\\Locale = 0409 (type=0) - // HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","Default",0x00000000,"0409" (type=0) - // HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","InstallLanguage",0x00000000,"0409" (type=0) - - // Set locale - HKEY localeKey; - HKEY langKey; - DWORD ret; - TCHAR value[9]; - DWORD valuesize; - WCHAR ACPPage[9]; - WCHAR OEMPage[9]; - - ret = GetLocaleInfoW(MAKELCID(lcid, SORT_DEFAULT), LOCALE_IDEFAULTCODEPAGE, (WORD*)OEMPage, sizeof(OEMPage)); - if (ret == 0) - { - MessageBoxW(NULL, L"Problem reading OEM code page", L"Big Problem", MB_OK); - return; - } - - GetLocaleInfoW(MAKELCID(lcid, SORT_DEFAULT), LOCALE_IDEFAULTANSICODEPAGE, (WORD*)ACPPage, sizeof(ACPPage)); - if (ret == 0) - { - MessageBoxW(NULL, L"Problem reading ANSI code page", L"Big Problem", MB_OK); - return; - } - - ret = RegOpenKeyW(HKEY_CURRENT_USER, L"Control Panel\\International", &localeKey); - - if (ret != ERROR_SUCCESS) - { - // some serious error - MessageBoxW(NULL, L"Problem opening HKCU\\Control Panel\\International key", L"Big Problem", MB_OK); - return; - } - - wsprintf(value, L"%04X", (DWORD)lcid); - valuesize = (wcslen(value) + 1) * sizeof(WCHAR); - - RegSetValueExW(localeKey, L"Locale", 0, REG_SZ, (BYTE *)value, valuesize); - RegCloseKey(localeKey); - - ret = RegOpenKeyW(HKEY_USERS, L".DEFAULT\\Control Panel\\International", &localeKey); - - if (ret != ERROR_SUCCESS) - { - // some serious error - MessageBoxW(NULL, L"Problem opening HKU\\.DEFAULT\\Control Panel\\International key", L"Big Problem", MB_OK); - return; - } - - wsprintf(value, L"%04X", (DWORD)lcid); - valuesize = (wcslen(value) + 1) * sizeof(WCHAR); - - RegSetValueExW(localeKey, L"Locale", 0, REG_SZ, (BYTE *)value, valuesize); - RegCloseKey(localeKey); - - // Set language - ret = RegOpenKeyW(HKEY_LOCAL_MACHINE, L"SYSTEM\\CurrentControlSet\\Control\\NLS\\Language", &langKey); - - if (ret != ERROR_SUCCESS) - { - MessageBoxW(NULL, L"Problem opening HKLM\\SYSTEM\\CurrentControlSet\\Control\\NLS\\Language key", L"Big Problem", MB_OK); - return; - } - - RegSetValueExW(langKey, L"Default", 0, REG_SZ, (BYTE *)value, valuesize ); - RegSetValueExW(langKey, L"InstallLanguage", 0, REG_SZ, (BYTE *)value, valuesize ); - - RegCloseKey(langKey); - - - // Set language - ret = RegOpenKeyW(HKEY_LOCAL_MACHINE, L"SYSTEM\\CurrentControlSet\\Control\\NLS\\CodePage", &langKey); - - if (ret != ERROR_SUCCESS) - { - MessageBoxW(NULL, L"Problem opening HKLM\\SYSTEM\\CurrentControlSet\\Control\\NLS\\CodePage key", L"Big Problem", MB_OK); - return; - } - - RegSetValueExW(langKey, L"OEMCP", 0, REG_SZ, (BYTE *)OEMPage, (wcslen(OEMPage) +1 ) * sizeof(WCHAR) ); - RegSetValueExW(langKey, L"ACP", 0, REG_SZ, (BYTE *)ACPPage, (wcslen(ACPPage) +1 ) * sizeof(WCHAR) ); - - RegCloseKey(langKey); - -} - -/* Property page dialog callback */ -INT_PTR CALLBACK -LocalePageProc(HWND hwndDlg, - UINT uMsg, - WPARAM wParam, - LPARAM lParam) -{ - switch(uMsg) - { - case WM_INITDIALOG: - CreateLanguagesList(GetDlgItem(hwndDlg, IDC_LANGUAGELIST)); - break; - case WM_COMMAND: - switch (LOWORD(wParam)) - { - case IDC_LANGUAGELIST: - if (HIWORD(wParam) == CBN_SELCHANGE) - { - PropSheet_Changed(GetParent(hwndDlg), hwndDlg); - } - break; - } - break; - - case WM_NOTIFY: - { - LPNMHDR lpnm = (LPNMHDR)lParam; - if (lpnm->code == (UINT)PSN_APPLY) - { - // Apply changes - LCID NewLcid; - int iCurSel; - - // Acquire new value - iCurSel = SendMessageW(hList, - CB_GETCURSEL, - 0, - 0); - if (iCurSel == CB_ERR) - break; - - NewLcid = SendMessageW(hList, - CB_GETITEMDATA, - iCurSel, - 0); - - if (NewLcid == (LCID)CB_ERR) - break; - - - // Actually set new locale - SetNewLocale(NewLcid); - } - } - break; - } - return FALSE; -} - - -/* EOF */ Modified: trunk/reactos/dll/cpl/intl/nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/nl.rc?rev=258… ============================================================================== --- trunk/reactos/dll/cpl/intl/nl.rc (original) +++ trunk/reactos/dll/cpl/intl/nl.rc Fri Feb 23 12:35:32 2007 @@ -7,7 +7,10 @@ CAPTION "Algemeen" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Property Page 1",-1,73,74,90,8 + GROUPBOX "Eerste taal", -1, 8, 11, 228, 74 + ICON IDC_FLAGS, IDC_ICON1, 12, 26, 21, 20, SS_ICON + LTEXT "Selecteer uw eerste taal en regio die u wilt gebruiken:", -1, 38, 25, 193, 22 + COMBOBOX IDC_LANGUAGELIST, 39, 49, 191, 83, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL END @@ -86,10 +89,7 @@ CAPTION "Invoer" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Eerste taal", -1, 8, 11, 228, 74 - ICON IDC_FLAGS, IDC_ICON1, 12, 26, 21, 20, SS_ICON - LTEXT "Selecteer uw eerste taal en regio die u wilt gebruiken:", -1, 38, 25, 193, 22 - COMBOBOX IDC_LANGUAGELIST, 39, 49, 191, 83, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + END Modified: trunk/reactos/dll/cpl/intl/ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/ru.rc?rev=258… ============================================================================== --- trunk/reactos/dll/cpl/intl/ru.rc (original) +++ trunk/reactos/dll/cpl/intl/ru.rc Fri Feb 23 12:35:32 2007 @@ -7,7 +7,10 @@ CAPTION "Îáùèå" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Âêëàäêà 1",-1,73,74,90,8 + GROUPBOX "Îñíîâíîé ÿçûê", -1, 8, 11, 228, 74 + ICON IDC_FLAGS, IDC_ICON1, 12, 26, 21, 20, SS_ICON + LTEXT "Âûáåðèòå îñíîâíîé ÿçûê è ðåãèîí, êîòîðûé âû õîòèòå èñïîëüçîâàòü:", -1, 38, 25, 193, 22 + COMBOBOX IDC_LANGUAGELIST, 39, 49, 191, 83, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL END @@ -86,10 +89,7 @@ CAPTION "ßçûêè è ðàñêëàäêè" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Îñíîâíîé ÿçûê", -1, 8, 11, 228, 74 - ICON IDC_FLAGS, IDC_ICON1, 12, 26, 21, 20, SS_ICON - LTEXT "Âûáåðèòå îñíîâíîé ÿçûê è ðåãèîí, êîòîðûé âû õîòèòå èñïîëüçîâàòü:", -1, 38, 25, 193, 22 - COMBOBOX IDC_LANGUAGELIST, 39, 49, 191, 83, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + END Modified: trunk/reactos/dll/cpl/intl/sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/sv.rc?rev=258… ============================================================================== --- trunk/reactos/dll/cpl/intl/sv.rc (original) +++ trunk/reactos/dll/cpl/intl/sv.rc Fri Feb 23 12:35:32 2007 @@ -8,7 +8,10 @@ CAPTION "Generellt" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Property Page 1",-1,73,74,90,8 + GROUPBOX "Primärt språk", -1, 8, 11, 228, 74 + ICON IDC_FLAGS, IDC_ICON1, 12, 26, 21, 20, SS_ICON + LTEXT "Välj det språk och den region du vill använda:", -1, 38, 25, 193, 22 + COMBOBOX IDC_LANGUAGELIST, 39, 49, 191, 83, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL END @@ -87,10 +90,7 @@ CAPTION "Inmatningsspråk" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Primärt språk", -1, 8, 11, 228, 74 - ICON IDC_FLAGS, IDC_ICON1, 12, 26, 21, 20, SS_ICON - LTEXT "Välj det språk och den region du vill använda:", -1, 38, 25, 193, 22 - COMBOBOX IDC_LANGUAGELIST, 39, 49, 191, 83, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + END Modified: trunk/reactos/dll/cpl/intl/uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/uk.rc?rev=258… ============================================================================== --- trunk/reactos/dll/cpl/intl/uk.rc (original) +++ trunk/reactos/dll/cpl/intl/uk.rc Fri Feb 23 12:35:32 2007 @@ -14,7 +14,10 @@ FONT 8, "MS Shell Dlg" EXSTYLE DS_SHELLFONT BEGIN - LTEXT "Âêëàäêà âëàñòèâîñòåé 1",-1,73,74,90,8 + GROUPBOX "Îñíîâíà ìîâà", -1, 8, 11, 228, 74 + ICON IDC_FLAGS, IDC_ICON1, 12, 26, 21, 20, SS_ICON + LTEXT "Âèáåð³òü ïåðâèííó ìîâó ³ ðåã³îí, ÿêèé âè áàæàºòå âèêîðèñòîâóâàòè:", -1, 38, 25, 193, 22 + COMBOBOX IDC_LANGUAGELIST, 39, 49, 191, 83, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL END @@ -93,10 +96,7 @@ CAPTION "Ìîâè ³ ðîçêëàäêè" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Îñíîâíà ìîâà", -1, 8, 11, 228, 74 - ICON IDC_FLAGS, IDC_ICON1, 12, 26, 21, 20, SS_ICON - LTEXT "Âèáåð³òü ïåðâèííó ìîâó ³ ðåã³îí, ÿêèé âè áàæàºòå âèêîðèñòîâóâàòè:", -1, 38, 25, 193, 22 - COMBOBOX IDC_LANGUAGELIST, 39, 49, 191, 83, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + END

17 years, 6 months

[tretiakov] 25889: Update testapp

by tretiakov＠svn.reactos.org

Author: tretiakov Date: Fri Feb 23 11:56:32 2007 New Revision: 25889 URL: http://svn.reactos.org/svn/reactos?rev=25889&view=rev Log: Update testapp Modified: trunk/reactos/base/applications/testsets/user32/kbdlayout/ (props changed) trunk/reactos/base/applications/testsets/user32/kbdlayout/kbdlayout.c trunk/reactos/base/applications/testsets/user32/kbdlayout/kbdlayout.rc trunk/reactos/base/applications/testsets/user32/kbdlayout/resource.h Propchange: trunk/reactos/base/applications/testsets/user32/kbdlayout/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Fri Feb 23 11:56:32 2007 @@ -3,3 +3,5 @@ *.plg *.opt *.ncb +*.aps + Modified: trunk/reactos/base/applications/testsets/user32/kbdlayout/kbdlayout.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/testsets… ============================================================================== --- trunk/reactos/base/applications/testsets/user32/kbdlayout/kbdlayout.c (original) +++ trunk/reactos/base/applications/testsets/user32/kbdlayout/kbdlayout.c Fri Feb 23 11:56:32 2007 @@ -25,20 +25,28 @@ WCHAR WndName[25]; } WND_DATA; -INT WINAPI WinMain(HINSTANCE hInstance, - HINSTANCE hPrevInstance, - LPSTR lpCmdLine, - int nCmdShow) -{ - - - hInst = hInstance; +DWORD WINAPI ThreadProc(LPVOID lpParam) +{ DialogBoxParam(hInst, MAKEINTRESOURCE(IDD_MAINDIALOG), NULL, (DLGPROC)MainDialogProc, (LPARAM)NULL); + + return 0; +} + +INT WINAPI WinMain(HINSTANCE hInstance, + HINSTANCE hPrevInstance, + LPSTR lpCmdLine, + int nCmdShow) +{ + + + hInst = hInstance; + + ThreadProc(0); return 0; } @@ -148,11 +156,11 @@ if(IsDlgButtonChecked(hDlg, IDC_KLF_REORDER)) ret |= KLF_REORDER; -/* if(IsDlgButtonChecked(hDlg, IDC_KLF_RESET)) + if(IsDlgButtonChecked(hDlg, IDC_KLF_RESET)) ret |= KLF_RESET; if(IsDlgButtonChecked(hDlg, IDC_KLF_SHIFTLOCK)) - ret |= KLF_SHIFTLOCK;*/ + ret |= KLF_SHIFTLOCK; if(IsDlgButtonChecked(hDlg, IDC_KLF_SETFORPROCESS)) ret |= KLF_SETFORPROCESS; @@ -201,14 +209,6 @@ if(IsDlgButtonChecked(hDlg, IDC_FROMLIST)) return GetSelectedLayout(hDlg); - else if(IsDlgButtonChecked(hDlg, IDC_FROMEDIT)) - { - WCHAR buf[25]; - ULONG kl; - GetWindowText(GetDlgItem(hDlg, IDC_HANDLE), buf, 25); - swscanf(buf, L"%x", &kl); - return (HKL) kl; - } else if(IsDlgButtonChecked(hDlg, IDC_HKL_NEXT)) return (HKL)HKL_NEXT; @@ -232,21 +232,24 @@ { case WM_INITDIALOG: { + WCHAR Buf[255]; UpdateData(hDlg); hMainDlg = hDlg; SubclassWnd(GetDlgItem(hDlg, IDC_LIST), L"List"); SubclassWnd(GetDlgItem(hDlg, IDC_EDIT1), L"Edit1"); - SubclassWnd(GetDlgItem(hDlg, IDC_EDIT2), L"Edit2"); SubclassWnd(GetDlgItem(hDlg, IDC_KLID), L"Klid"); - SubclassWnd(GetDlgItem(hDlg, IDC_HANDLE), L"Handle"); SubclassWnd(GetDlgItem(hDlg, ID_CANCEL), L"CancelB"); SubclassWnd(GetDlgItem(hDlg, IDC_ACTIVATE), L"ActivateB"); SubclassWnd(GetDlgItem(hDlg, IDC_REFRESH), L"RefreshB"); SubclassWnd(GetDlgItem(hDlg, IDC_UNLOAD), L"UnloadB"); + SubclassWnd(GetDlgItem(hDlg, IDC_LOAD), L"LoadB"); CheckRadioButton(hDlg, IDC_FROMLIST, IDC_FROMEDIT, IDC_FROMLIST); SetWindowText(GetDlgItem(hDlg, IDC_KLID), L"00000419"); + + swprintf(Buf, L"Current thread id: %d", GetCurrentThreadId()); + SetWindowText(GetDlgItem(hDlg, IDC_CURTHREAD), Buf); return 0; } /* WM_INITDIALOG */ @@ -308,6 +311,15 @@ break; } + case IDC_NEWTHREAD: + { + if(!CreateThread(NULL, 0, ThreadProc, NULL, 0, NULL)) + { + FormatBox(hDlg, MB_ICONERROR, L"Error!", + L"Can not create thread (%d).", GetLastError()); + } + } + case IDC_LIST: { if(HIWORD(wParam) == LBN_SELCHANGE) Modified: trunk/reactos/base/applications/testsets/user32/kbdlayout/kbdlayout.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/testsets… ============================================================================== --- trunk/reactos/base/applications/testsets/user32/kbdlayout/kbdlayout.rc (original) +++ trunk/reactos/base/applications/testsets/user32/kbdlayout/kbdlayout.rc Fri Feb 23 11:56:32 2007 @@ -26,56 +26,55 @@ // Dialog // -IDD_MAINDIALOG DIALOG DISCARDABLE 0, 0, 403, 223 -STYLE DS_CENTER | WS_MINIMIZEBOX | WS_CAPTION | WS_SYSMENU +IDD_MAINDIALOG DIALOG DISCARDABLE 0, 0, 327, 194 +STYLE DS_MODALFRAME | DS_CENTER | WS_CAPTION | WS_SYSMENU CAPTION "Keyboard layout test" FONT 8, "MS Sans Serif" BEGIN - PUSHBUTTON "Exit",ID_CANCEL,138,202,121,14 - EDITTEXT IDC_EDIT1,7,140,195,58,ES_MULTILINE | ES_AUTOHSCROLL - LISTBOX IDC_LIST,185,17,101,87,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | + PUSHBUTTON "Close",ID_CANCEL,215,172,105,14 + EDITTEXT IDC_EDIT1,7,140,199,47,ES_MULTILINE | ES_AUTOHSCROLL + LISTBOX IDC_LIST,124,17,84,89,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP - LTEXT "Loaded layouts",IDC_STATIC,190,7,49,8 - LTEXT "Active layout:",IDC_ACTIVE,7,127,173,10,SS_SUNKEN - EDITTEXT IDC_EDIT2,206,140,190,58,ES_MULTILINE | ES_AUTOHSCROLL - PUSHBUTTON "Unload",IDC_UNLOAD,186,105,48,14 - PUSHBUTTON "Activate",IDC_ACTIVATE,237,121,47,14 - GROUPBOX "Activate Flags",IDC_STATIC,293,7,103,67 + LTEXT "Loaded layouts",IDC_STATIC,128,7,49,8 + LTEXT "Active layout:",IDC_ACTIVE,7,127,114,10,SS_SUNKEN + PUSHBUTTON "Unload",IDC_UNLOAD,124,109,41,14 + PUSHBUTTON "Activate",IDC_ACTIVATE,166,109,41,14 + GROUPBOX "Activate Flags",IDC_STATIC,215,7,103,67 CONTROL "KLF_REORDER",IDC_KLF_REORDER,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,299,22,69,10 + WS_TABSTOP,221,22,69,10 CONTROL "KLF_RESET",IDC_KLF_RESET,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,299,34,66,12 + WS_TABSTOP,221,34,66,12 CONTROL "KLF_SETFORPROCESS",IDC_KLF_SETFORPROCESS,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,299,48,95,10 + BS_AUTOCHECKBOX | WS_TABSTOP,221,48,95,10 CONTROL "KLF_SHIFTLOCK",IDC_KLF_SHIFTLOCK,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,299,60,72,10 - GROUPBOX "Activate layout",IDC_STATIC,294,77,101,60 + BS_AUTOCHECKBOX | WS_TABSTOP,221,60,72,10 + GROUPBOX "Activate layout",IDC_STATIC,216,77,103,50 CONTROL "From list",IDC_FROMLIST,"Button",BS_AUTORADIOBUTTON | - WS_GROUP,298,90,41,10 - CONTROL "HKL_NEXT",IDC_HKL_NEXT,"Button",BS_AUTORADIOBUTTON,298, + WS_GROUP,220,90,41,10 + CONTROL "HKL_NEXT",IDC_HKL_NEXT,"Button",BS_AUTORADIOBUTTON,220, 101,53,10 - CONTROL "HKL_PREV",IDC_HKL_PREV,"Button",BS_AUTORADIOBUTTON,298, + CONTROL "HKL_PREV",IDC_HKL_PREV,"Button",BS_AUTORADIOBUTTON,220, 112,53,10 - CONTROL "From edit",IDC_FROMEDIT,"Button",BS_AUTORADIOBUTTON,298, - 124,45,10 - GROUPBOX "Load layout",IDC_STATIC,7,7,173,118 + GROUPBOX "Load layout",IDC_STATIC,7,7,113,118 CONTROL "KLF_ACTIVATE",IDL_KLF_ACTIVATE,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,15,42,67,10 + WS_TABSTOP,14,44,67,10 CONTROL "KLF_NOTELLSHELL",IDL_KLF_NOTELLSHELL,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,15,55,83,10 - LTEXT "pwszKLID:",IDC_STATIC,15,22,35,8 - EDITTEXT IDC_KLID,53,21,64,14,ES_AUTOHSCROLL | ES_NUMBER + BS_AUTOCHECKBOX | WS_TABSTOP,14,57,83,10 + LTEXT "pwszKLID:",IDC_STATIC,14,17,35,8 + EDITTEXT IDC_KLID,14,27,54,14,ES_AUTOHSCROLL CONTROL "KLF_REORDER",IDL_KLF_REORDER,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,15,68,69,10 + WS_TABSTOP,14,71,69,10 CONTROL "KLF_REPLACELANG",IDL_KLF_REPLACELANG,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,15,81,85,10 + BS_AUTOCHECKBOX | WS_TABSTOP,14,84,85,10 CONTROL "KLF_SUBSTITUTE_OK",IDL_KLF_SUBSTITUTE_OK,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,15,94,92,10 + BS_AUTOCHECKBOX | WS_TABSTOP,14,97,92,10 CONTROL "KLF_SETFORPROCESS",IDL_KLF_SETFORPROCESS,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,15,107,95,10 - PUSHBUTTON "Load",IDC_LOAD,125,21,50,14 - PUSHBUTTON "Refresh",IDC_REFRESH,237,106,48,14 - EDITTEXT IDC_HANDLE,185,122,49,14,ES_AUTOHSCROLL + BS_AUTOCHECKBOX | WS_TABSTOP,14,110,95,10 + PUSHBUTTON "Load",IDC_LOAD,71,27,46,14 + PUSHBUTTON "Refresh",IDC_REFRESH,124,124,83,12 + GROUPBOX "Multithreading",IDC_STATIC,216,130,104,39 + LTEXT "Current thread ID:",IDC_CURTHREAD,219,141,93,8 + PUSHBUTTON "Create new thread",IDC_NEWTHREAD,234,152,71,12 END @@ -90,9 +89,9 @@ IDD_MAINDIALOG, DIALOG BEGIN LEFTMARGIN, 7 - RIGHTMARGIN, 396 + RIGHTMARGIN, 320 TOPMARGIN, 7 - BOTTOMMARGIN, 216 + BOTTOMMARGIN, 187 END END #endif // APSTUDIO_INVOKED @@ -123,7 +122,6 @@ #endif // APSTUDIO_INVOKED - #endif // Russian resources ///////////////////////////////////////////////////////////////////////////// Modified: trunk/reactos/base/applications/testsets/user32/kbdlayout/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/testsets… ============================================================================== --- trunk/reactos/base/applications/testsets/user32/kbdlayout/resource.h (original) +++ trunk/reactos/base/applications/testsets/user32/kbdlayout/resource.h Fri Feb 23 11:56:32 2007 @@ -1,6 +1,6 @@ //{{NO_DEPENDENCIES}} // Microsoft Developer Studio generated include file. -// Used by lab17.rc +// Used by kbdlayout.rc // #define IDD_MAINDIALOG 101 #define ID_CANCEL 1000 @@ -29,6 +29,8 @@ #define IDC_LOAD 1043 #define IDC_REFRESH 1044 #define IDC_HANDLE 1046 +#define IDC_CURTHREAD 1049 +#define IDC_NEWTHREAD 1050 // Next default values for new objects // @@ -37,7 +39,7 @@ #define _APS_NO_MFC 1 #define _APS_NEXT_RESOURCE_VALUE 105 #define _APS_NEXT_COMMAND_VALUE 40001 -#define _APS_NEXT_CONTROL_VALUE 1049 +#define _APS_NEXT_CONTROL_VALUE 1051 #define _APS_NEXT_SYMED_VALUE 101 #endif #endif

17 years, 6 months

[tretiakov] 25888: Add KLF_SHIFTLOCK and KLF_RESET

by tretiakov＠svn.reactos.org

Author: tretiakov Date: Fri Feb 23 11:21:29 2007 New Revision: 25888 URL: http://svn.reactos.org/svn/reactos?rev=25888&view=rev Log: Add KLF_SHIFTLOCK and KLF_RESET Modified: trunk/reactos/include/psdk/winuser.h Modified: trunk/reactos/include/psdk/winuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winuser.h?rev… ============================================================================== --- trunk/reactos/include/psdk/winuser.h (original) +++ trunk/reactos/include/psdk/winuser.h Fri Feb 23 11:21:29 2007 @@ -89,10 +89,16 @@ #define KLF_REPLACELANG 16 #define KLF_NOTELLSHELL 128 #define KLF_SETFORPROCESS 256 +#if (_WIN32_WINNT >= 0x0500) +#define KLF_SHIFTLOCK 65535 +#define KLF_RESET 0x40000000 +#endif /*(_WIN32_WINNT >= 0x0500) */ #define KL_NAMELENGTH 9 +#if (WINVER >= 0x0500) #define INPUTLANGCHANGE_BACKWARD 4 #define INPUTLANGCHANGE_FORWARD 2 #define INPUTLANGCHANGE_SYSCHARSET 1 +#endif /* (WINVER >= 0x0500) */ #define MF_ENABLED 0 #define MF_GRAYED 1 #define MF_DISABLED 2

17 years, 6 months

[tretiakov] 25887: Fix warnings.

by tretiakov＠svn.reactos.org

Author: tretiakov Date: Fri Feb 23 11:20:33 2007 New Revision: 25887 URL: http://svn.reactos.org/svn/reactos?rev=25887&view=rev Log: Fix warnings. Modified: trunk/reactos/dll/win32/user32/windows/defwnd.c Modified: trunk/reactos/dll/win32/user32/windows/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/defwnd.c (original) +++ trunk/reactos/dll/win32/user32/windows/defwnd.c Fri Feb 23 11:20:33 2007 @@ -1537,9 +1537,9 @@ //FIXME: What to do with INPUTLANGCHANGE_SYSCHARSET ? - if(wParam & INPUTLANGCHANGE_BACKWARD) NewHkl = HKL_PREV; - else if(wParam & INPUTLANGCHANGE_FORWARD) NewHkl = HKL_NEXT; - else NewHkl = lParam; + if(wParam & INPUTLANGCHANGE_BACKWARD) NewHkl = (HKL) HKL_PREV; + else if(wParam & INPUTLANGCHANGE_FORWARD) NewHkl = (HKL) HKL_NEXT; + else NewHkl = (HKL) lParam; NtUserActivateKeyboardLayout(NewHkl, 0);

17 years, 6 months

[ion] 25886: - Get rid of LdrGetModuleObject, since MmLoadSystemImage will now return the existing module object in case it has already been loaded, get rid of LdrGetProcedureAddress, it doesn't belong in the kernel. Move MmGetSystemRoutineAddress from mm.c to sysldr.c and rewrite it to use MiFindExportedRoutineByName instead. - Remove /ldr ntoskrnl directory, since this module is finally gone. - Make PsInit code search for ntdll lookups using LookupEntryPoint internal function, instead of LdrGe

by ion＠svn.reactos.org

Author: ion Date: Fri Feb 23 10:56:01 2007 New Revision: 25886 URL: http://svn.reactos.org/svn/reactos?rev=25886&view=rev Log: - Get rid of LdrGetModuleObject, since MmLoadSystemImage will now return the existing module object in case it has already been loaded, get rid of LdrGetProcedureAddress, it doesn't belong in the kernel. Move MmGetSystemRoutineAddress from mm.c to sysldr.c and rewrite it to use MiFindExportedRoutineByName instead. - Remove /ldr ntoskrnl directory, since this module is finally gone. - Make PsInit code search for ntdll lookups using LookupEntryPoint internal function, instead of LdrGetProcedureAddress. Same code but done with recursion instead, and internal to this module (remove ANSI_STRINGs since we don't need them anymore). Removed: trunk/reactos/ntoskrnl/ldr/ Modified: trunk/reactos/ntoskrnl/include/internal/ldr.h trunk/reactos/ntoskrnl/io/iomgr/driver.c trunk/reactos/ntoskrnl/kdbg/kdb_symbols.c trunk/reactos/ntoskrnl/mm/mm.c trunk/reactos/ntoskrnl/mm/pagefile.c trunk/reactos/ntoskrnl/mm/sysldr.c trunk/reactos/ntoskrnl/ntoskrnl.rbuild trunk/reactos/ntoskrnl/ps/psmgr.c Modified: trunk/reactos/ntoskrnl/include/internal/ldr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ldr.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ldr.h Fri Feb 23 10:56:01 2007 @@ -6,8 +6,4 @@ #define DRIVER_ROOT_NAME L"\\Driver\\" #define FILESYSTEM_ROOT_NAME L"\\FileSystem\\" -PLDR_DATA_TABLE_ENTRY -NTAPI -LdrGetModuleObject(PUNICODE_STRING ModuleName); - #endif /* __INCLUDE_INTERNAL_LDR_H */ Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/driver.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/driver.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/driver.c Fri Feb 23 10:56:01 2007 @@ -435,34 +435,20 @@ return Status; } - /* - * Load the module. - */ - - *ModuleObject = LdrGetModuleObject(&ServiceImagePath); - - if (*ModuleObject == NULL) - { /* * Case for disabled drivers */ - if (ServiceStart >= 4) - { - /* FIXME: Check if it is the right status code */ - Status = STATUS_PLUGPLAY_NO_DEVICE; - } - else - { - DPRINT("Loading module\n"); - Status = MmLoadSystemImage(&ServiceImagePath, NULL, NULL, 0, (PVOID)ModuleObject, NULL); - } - } - else - { - DPRINT("Module already loaded\n"); - Status = STATUS_IMAGE_ALREADY_LOADED; - } + if (ServiceStart >= 4) + { + /* FIXME: Check if it is the right status code */ + Status = STATUS_PLUGPLAY_NO_DEVICE; + } + else + { + DPRINT("Loading module\n"); + Status = MmLoadSystemImage(&ServiceImagePath, NULL, NULL, 0, (PVOID)ModuleObject, NULL); + } ExFreePool(ServiceImagePath.Buffer); @@ -1062,7 +1048,6 @@ UNICODE_STRING ServiceName; UNICODE_STRING ObjectName; PDRIVER_OBJECT DriverObject; - PLDR_DATA_TABLE_ENTRY ModuleObject; NTSTATUS Status; LPWSTR Start; @@ -1146,16 +1131,6 @@ } /* - * ... and check if it's loaded - */ - - ModuleObject = LdrGetModuleObject(&ImagePath); - if (ModuleObject == NULL) - { - return STATUS_UNSUCCESSFUL; - } - - /* * Free the service path */ @@ -1169,7 +1144,7 @@ (*DriverObject->DriverUnload)(DriverObject); ObDereferenceObject(DriverObject); ObDereferenceObject(DriverObject); - MmUnloadSystemImage(ModuleObject); + MmUnloadSystemImage(DriverObject->DriverSection); return STATUS_SUCCESS; } @@ -1693,18 +1668,6 @@ DPRINT("Type: %lx\n", Type); /* - * See, if the driver module isn't already loaded - */ - - ModuleObject = LdrGetModuleObject(&ImagePath); - if (ModuleObject != NULL) - { - DPRINT("Image already loaded\n"); - Status = STATUS_IMAGE_ALREADY_LOADED; - goto ReleaseCapturedString; - } - - /* * Create device node */ Modified: trunk/reactos/ntoskrnl/kdbg/kdb_symbols.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/kdb_symbols.… ============================================================================== --- trunk/reactos/ntoskrnl/kdbg/kdb_symbols.c (original) +++ trunk/reactos/ntoskrnl/kdbg/kdb_symbols.c Fri Feb 23 10:56:01 2007 @@ -608,7 +608,7 @@ IsRaw = FALSE; } - ModuleObject = LdrGetModuleObject(ModuleName); + ModuleObject = NULL; if (ModuleObject != NULL) { Modified: trunk/reactos/ntoskrnl/mm/mm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mm.c?rev=25886… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mm.c (original) +++ trunk/reactos/ntoskrnl/mm/mm.c Fri Feb 23 10:56:01 2007 @@ -398,70 +398,6 @@ return (FALSE); } -/* - * @implemented - */ -PVOID -NTAPI -MmGetSystemRoutineAddress(IN PUNICODE_STRING SystemRoutineName) -{ - PVOID ProcAddress; - ANSI_STRING AnsiRoutineName; - NTSTATUS Status; - PLIST_ENTRY NextEntry; - extern LIST_ENTRY PsLoadedModuleList; - PLDR_DATA_TABLE_ENTRY LdrEntry; - BOOLEAN Found = FALSE; - UNICODE_STRING KernelName = RTL_CONSTANT_STRING(L"ntoskrnl.exe"); - UNICODE_STRING HalName = RTL_CONSTANT_STRING(L"hal.dll"); - - /* Convert routine to ansi name */ - Status = RtlUnicodeStringToAnsiString(&AnsiRoutineName, - SystemRoutineName, - TRUE); - if (!NT_SUCCESS(Status)) return NULL; - - /* Loop the loaded module list */ - NextEntry = PsLoadedModuleList.Flink; - while (NextEntry != &PsLoadedModuleList) - { - /* Get the entry */ - LdrEntry = CONTAINING_RECORD(NextEntry, - LDR_DATA_TABLE_ENTRY, - InLoadOrderLinks); - - /* Check if it's the kernel or HAL */ - if (RtlEqualUnicodeString(&KernelName, &LdrEntry->BaseDllName, TRUE)) - { - /* Found it */ - Found = TRUE; - } - else if (RtlEqualUnicodeString(&HalName, &LdrEntry->BaseDllName, TRUE)) - { - /* Found it */ - Found = TRUE; - } - - /* Check if we found a valid binary */ - if (Found) - { - /* Find the procedure name */ - Status = LdrGetProcedureAddress(LdrEntry->DllBase, - &AnsiRoutineName, - 0, - &ProcAddress); - break; - } - - /* Keep looping */ - NextEntry = NextEntry->Flink; - } - - /* Free the string and return */ - RtlFreeAnsiString(&AnsiRoutineName); - return (NT_SUCCESS(Status) ? ProcAddress : NULL); -} - NTSTATUS NTAPI NtGetWriteWatch(IN HANDLE ProcessHandle, Modified: trunk/reactos/ntoskrnl/mm/pagefile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/pagefile.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/mm/pagefile.c (original) +++ trunk/reactos/ntoskrnl/mm/pagefile.c Fri Feb 23 10:56:01 2007 @@ -35,6 +35,10 @@ #pragma alloc_text(INIT, MmInitPagingFile) #endif +PVOID +NTAPI +MiFindExportedRoutineByName(IN PVOID DllBase, + IN PANSI_STRING ExportName); /* TYPES *********************************************************************/ @@ -694,7 +698,7 @@ UNICODE_STRING DiskDumpName = RTL_CONSTANT_STRING(L"DiskDump"); ANSI_STRING ProcName; PIO_STACK_LOCATION StackPtr; - PLDR_DATA_TABLE_ENTRY ModuleObject; + PLDR_DATA_TABLE_ENTRY ModuleObject = NULL; Status = ZwFsControlFile(PageFileHandle, 0, @@ -767,16 +771,14 @@ } /* Load the diskdump driver. */ - ModuleObject = LdrGetModuleObject(&DiskDumpName); + Status = MmLoadSystemImage(&DiskDumpName, NULL, NULL, 0, (PVOID)&ModuleObject, NULL); if (ModuleObject == NULL) { return(STATUS_OBJECT_NAME_NOT_FOUND); } RtlInitAnsiString(&ProcName, "DiskDumpFunctions"); - Status = LdrGetProcedureAddress(ModuleObject->DllBase, - &ProcName, - 0, - (PVOID*)&MmCoreDumpFunctions); + MmCoreDumpFunctions = MiFindExportedRoutineByName(ModuleObject->DllBase, + &ProcName); if (!NT_SUCCESS(Status)) { ObDereferenceObject(PageFile); Modified: trunk/reactos/ntoskrnl/mm/sysldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/sysldr.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/mm/sysldr.c (original) +++ trunk/reactos/ntoskrnl/mm/sysldr.c Fri Feb 23 10:56:01 2007 @@ -54,6 +54,77 @@ /* Otherwise, free the import list */ ExFreePool(LdrEntry->LoadedImports); +} + +PVOID +NTAPI +MiFindExportedRoutineByName(IN PVOID DllBase, + IN PANSI_STRING ExportName) +{ + PULONG NameTable; + PUSHORT OrdinalTable; + PIMAGE_EXPORT_DIRECTORY ExportDirectory; + LONG Low = 0, Mid = 0, High, Ret; + USHORT Ordinal; + PVOID Function; + ULONG ExportSize; + PULONG ExportTable; + PAGED_CODE(); + + /* Get the export directory */ + ExportDirectory = RtlImageDirectoryEntryToData(DllBase, + TRUE, + IMAGE_DIRECTORY_ENTRY_EXPORT, + &ExportSize); + if (!ExportDirectory) return NULL; + + /* Setup name tables */ + NameTable = (PULONG)((ULONG_PTR)DllBase + + ExportDirectory->AddressOfNames); + OrdinalTable = (PUSHORT)((ULONG_PTR)DllBase + + ExportDirectory->AddressOfNameOrdinals); + + /* Do a binary search */ + High = ExportDirectory->NumberOfNames - 1; + while (High >= Low) + { + /* Get new middle value */ + Mid = (Low + High) >> 1; + + /* Compare name */ + Ret = strcmp(ExportName->Buffer, (PCHAR)DllBase + NameTable[Mid]); + if (Ret < 0) + { + /* Update high */ + High = Mid - 1; + } + else if (Ret > 0) + { + /* Update low */ + Low = Mid + 1; + } + else + { + /* We got it */ + break; + } + } + + /* Check if we couldn't find it */ + if (High < Low) return NULL; + + /* Otherwise, this is the ordinal */ + Ordinal = OrdinalTable[Mid]; + + /* Resolve the address and write it */ + ExportTable = (PULONG)((ULONG_PTR)DllBase + + ExportDirectory->AddressOfFunctions); + Function = (PVOID)((ULONG_PTR)DllBase + ExportTable[Ordinal]); + + /* We found it! */ + ASSERT((Function > (PVOID)ExportDirectory) && + (Function < (PVOID)((ULONG_PTR)ExportDirectory + ExportSize))); + return Function; } PVOID @@ -1712,3 +1783,77 @@ return Status; } +/* + * @implemented + */ +PVOID +NTAPI +MmGetSystemRoutineAddress(IN PUNICODE_STRING SystemRoutineName) +{ + PVOID ProcAddress = NULL; + ANSI_STRING AnsiRoutineName; + NTSTATUS Status; + PLIST_ENTRY NextEntry; + extern LIST_ENTRY PsLoadedModuleList; + PLDR_DATA_TABLE_ENTRY LdrEntry; + BOOLEAN Found = FALSE; + UNICODE_STRING KernelName = RTL_CONSTANT_STRING(L"ntoskrnl.exe"); + UNICODE_STRING HalName = RTL_CONSTANT_STRING(L"hal.dll"); + ULONG Modules = 0; + + /* Convert routine to ansi name */ + Status = RtlUnicodeStringToAnsiString(&AnsiRoutineName, + SystemRoutineName, + TRUE); + if (!NT_SUCCESS(Status)) return NULL; + + /* Lock the list */ + KeEnterCriticalRegion(); + + /* Loop the loaded module list */ + NextEntry = PsLoadedModuleList.Flink; + while (NextEntry != &PsLoadedModuleList) + { + /* Get the entry */ + LdrEntry = CONTAINING_RECORD(NextEntry, + LDR_DATA_TABLE_ENTRY, + InLoadOrderLinks); + + /* Check if it's the kernel or HAL */ + if (RtlEqualUnicodeString(&KernelName, &LdrEntry->BaseDllName, TRUE)) + { + /* Found it */ + Found = TRUE; + Modules++; + } + else if (RtlEqualUnicodeString(&HalName, &LdrEntry->BaseDllName, TRUE)) + { + /* Found it */ + Found = TRUE; + Modules++; + } + + /* Check if we found a valid binary */ + if (Found) + { + /* Find the procedure name */ + ProcAddress = MiFindExportedRoutineByName(LdrEntry->DllBase, + &AnsiRoutineName); + + /* Break out if we found it or if we already tried both modules */ + if (ProcAddress) break; + if (Modules == 2) break; + } + + /* Keep looping */ + NextEntry = NextEntry->Flink; + } + + /* Release the lock */ + KeLeaveCriticalRegion(); + + /* Free the string and return */ + RtlFreeAnsiString(&AnsiRoutineName); + return ProcAddress; +} + Modified: trunk/reactos/ntoskrnl/ntoskrnl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.rbuild?r… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl.rbuild (original) +++ trunk/reactos/ntoskrnl/ntoskrnl.rbuild Fri Feb 23 10:56:01 2007 @@ -227,10 +227,6 @@ <file>kdio.c</file> <file>kdmain.c</file> </directory> - <directory name="ldr"> - <file>loader.c</file> - <file>rtl.c</file> - </directory> <directory name="lpc"> <file>close.c</file> <file>complete.c</file> Modified: trunk/reactos/ntoskrnl/ps/psmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/psmgr.c?rev=25… ============================================================================== --- trunk/reactos/ntoskrnl/ps/psmgr.c (original) +++ trunk/reactos/ntoskrnl/ps/psmgr.c Fri Feb 23 10:56:01 2007 @@ -38,15 +38,6 @@ PVOID PspSystemDllSection; PVOID PspSystemDllEntryPoint; -ANSI_STRING ThunkName = RTL_CONSTANT_STRING("LdrInitializeThunk"); -ANSI_STRING ApcName = RTL_CONSTANT_STRING("KiUserApcDispatcher"); -ANSI_STRING ExceptName = RTL_CONSTANT_STRING("KiUserExceptionDispatcher"); -ANSI_STRING CallbackName = RTL_CONSTANT_STRING("KiUserCallbackDispatcher"); -ANSI_STRING RaiseName = RTL_CONSTANT_STRING("KiRaiseUserExceptionDispatcher"); -ANSI_STRING FastName = RTL_CONSTANT_STRING("KiFastSystemCall"); -ANSI_STRING FastReturnName = RTL_CONSTANT_STRING("KiFastSystemCallRet"); -ANSI_STRING InterruptName = RTL_CONSTANT_STRING("KiIntSystemCall"); - UNICODE_STRING PsNtDllPathName = RTL_CONSTANT_STRING(L"\\SystemRoot\\system32\\ntdll.dll"); @@ -67,13 +58,106 @@ /* PRIVATE FUNCTIONS *********************************************************/ +ULONG +NTAPI +NameToOrdinal(IN PCHAR Name, + IN PVOID DllBase, + IN ULONG NumberOfNames, + IN PULONG NameTable, + IN PUSHORT OrdinalTable) +{ + ULONG Mid; + LONG Ret; + + /* Fail if no names */ + if (!NumberOfNames) return -1; + + /* Do binary search */ + Mid = NumberOfNames >> 1; + Ret = strcmp(Name, (PCHAR)((ULONG_PTR)DllBase + NameTable[Mid])); + + /* Check if we found it */ + if (!Ret) return OrdinalTable[Mid]; + + /* We didn't. Check if we only had one name to check */ + if (NumberOfNames == 1) return -1; + + /* Check if we should look up or down */ + if (Ret < 0) + { + /* Loop down */ + NumberOfNames = Mid; + } + else + { + /* Look up, update tables */ + NameTable = &NameTable[Mid + 1]; + OrdinalTable = &OrdinalTable[Mid + 1]; + NumberOfNames -= (Mid - 1); + } + + /* Call us recursively */ + return NameToOrdinal(Name, DllBase, NumberOfNames, NameTable, OrdinalTable); +} + NTSTATUS NTAPI -PspLookupSystemDllEntryPoint(IN PANSI_STRING Name, +LookupEntryPoint(IN PVOID DllBase, + IN PCHAR Name, + OUT PVOID *EntryPoint) +{ + PULONG NameTable; + PUSHORT OrdinalTable; + PIMAGE_EXPORT_DIRECTORY ExportDirectory; + ULONG ExportSize; + CHAR Buffer[64]; + USHORT Ordinal; + PULONG ExportTable; + + /* Get the export directory */ + ExportDirectory = RtlImageDirectoryEntryToData(DllBase, + TRUE, + IMAGE_DIRECTORY_ENTRY_EXPORT, + &ExportSize); + + /* Validate the name and copy it */ + if (strlen(Name) > sizeof(Buffer) - 2) return STATUS_INVALID_PARAMETER; + strcpy(Buffer, Name); + + /* Setup name tables */ + NameTable = (PULONG)((ULONG_PTR)DllBase + + ExportDirectory->AddressOfNames); + OrdinalTable = (PUSHORT)((ULONG_PTR)DllBase + + ExportDirectory->AddressOfNameOrdinals); + + /* Get the ordinal */ + Ordinal = NameToOrdinal(Buffer, + DllBase, + ExportDirectory->NumberOfNames, + NameTable, + OrdinalTable); + + /* Make sure the ordinal is valid */ + if (Ordinal >= ExportDirectory->NumberOfFunctions) + { + /* It's not, fail */ + return STATUS_PROCEDURE_NOT_FOUND; + } + + /* Resolve the address and write it */ + ExportTable = (PULONG)((ULONG_PTR)DllBase + + ExportDirectory->AddressOfFunctions); + *EntryPoint = (PVOID)((ULONG_PTR)DllBase + ExportTable[Ordinal]); + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +PspLookupSystemDllEntryPoint(IN PCHAR Name, IN PVOID *EntryPoint) { /* Call the LDR Routine */ - return LdrGetProcedureAddress(PspSystemDllBase, Name, 0, EntryPoint); + return LookupEntryPoint(PspSystemDllBase, Name, EntryPoint); } NTSTATUS @@ -83,22 +167,22 @@ NTSTATUS Status; /* Get user-mode APC trampoline */ - Status = PspLookupSystemDllEntryPoint(&ApcName, + Status = PspLookupSystemDllEntryPoint("KiUserApcDispatcher", &KeUserApcDispatcher); if (!NT_SUCCESS(Status)) return Status; /* Get user-mode exception dispatcher */ - Status = PspLookupSystemDllEntryPoint(&ExceptName, + Status = PspLookupSystemDllEntryPoint("KiUserExceptionDispatcher", &KeUserExceptionDispatcher); if (!NT_SUCCESS(Status)) return Status; /* Get user-mode callback dispatcher */ - Status = PspLookupSystemDllEntryPoint(&CallbackName, + Status = PspLookupSystemDllEntryPoint("KiUserCallbackDispatcher", &KeUserCallbackDispatcher); if (!NT_SUCCESS(Status)) return Status; /* Get user-mode exception raise trampoline */ - Status = PspLookupSystemDllEntryPoint(&RaiseName, + Status = PspLookupSystemDllEntryPoint("KiRaiseUserExceptionDispatcher", &KeRaiseUserExceptionDispatcher); if (!NT_SUCCESS(Status)) return Status; @@ -106,20 +190,20 @@ if (KeFeatureBits & KF_FAST_SYSCALL) { /* Get user-mode sysenter stub */ - Status = PspLookupSystemDllEntryPoint(&FastName, + Status = PspLookupSystemDllEntryPoint("KiFastSystemCall", (PVOID)&SharedUserData-> SystemCall); if (!NT_SUCCESS(Status)) return Status; /* Get user-mode sysenter return stub */ - Status = PspLookupSystemDllEntryPoint(&FastReturnName, + Status = PspLookupSystemDllEntryPoint("KiFastSystemCallRet", (PVOID)&SharedUserData-> SystemCallReturn); } else { /* Get the user-mode interrupt stub */ - Status = PspLookupSystemDllEntryPoint(&InterruptName, + Status = PspLookupSystemDllEntryPoint("KiIntSystemCall", (PVOID)&SharedUserData-> SystemCall); } @@ -250,7 +334,8 @@ NTSTATUS Status; /* Get user-mode startup thunk */ - Status = PspLookupSystemDllEntryPoint(&ThunkName, &PspSystemDllEntryPoint); + Status = PspLookupSystemDllEntryPoint("LdrInitializeThunk", + &PspSystemDllEntryPoint); if (!NT_SUCCESS(Status)) { /* Failed, bugcheck */

17 years, 6 months

[ion] 25885: - Merge DbgUnLoadImageSymbols from KD branch. - Rename LdrUnloadModule to MmUnloadSystemImage and: - Use MmSystemLoadLock. - Take into consideration the import list. - Honour load count. - Unload symbols if really unloading the image. - Dereference and clear imports. - Do proper LdrEntry cleanup. - Stub MiDereferenceImports and MmCallDllInitialize. - Implement MiLocateExportName and MiClearImports. - We don't yet fully support reference counting imports...this is still TBD.

by ion＠svn.reactos.org

Author: ion Date: Fri Feb 23 10:13:19 2007 New Revision: 25885 URL: http://svn.reactos.org/svn/reactos?rev=25885&view=rev Log: - Merge DbgUnLoadImageSymbols from KD branch. - Rename LdrUnloadModule to MmUnloadSystemImage and: - Use MmSystemLoadLock. - Take into consideration the import list. - Honour load count. - Unload symbols if really unloading the image. - Dereference and clear imports. - Do proper LdrEntry cleanup. - Stub MiDereferenceImports and MmCallDllInitialize. - Implement MiLocateExportName and MiClearImports. - We don't yet fully support reference counting imports...this is still TBD. Modified: trunk/reactos/include/ndk/rtlfuncs.h trunk/reactos/lib/rtl/debug.c trunk/reactos/ntoskrnl/ex/sysinfo.c trunk/reactos/ntoskrnl/include/internal/ldr.h trunk/reactos/ntoskrnl/include/internal/mm.h trunk/reactos/ntoskrnl/io/iomgr/driver.c trunk/reactos/ntoskrnl/ldr/loader.c trunk/reactos/ntoskrnl/mm/sysldr.c Modified: trunk/reactos/include/ndk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtlfuncs.h?rev… ============================================================================== --- trunk/reactos/include/ndk/rtlfuncs.h (original) +++ trunk/reactos/include/ndk/rtlfuncs.h Fri Feb 23 10:13:19 2007 @@ -2514,6 +2514,14 @@ IN ULONG ProcessId ); +VOID +NTAPI +DbgUnLoadImageSymbols( + IN PANSI_STRING Name, + IN PVOID Base, + IN ULONG_PTR ProcessId +); + // // Generic Table Functions // Modified: trunk/reactos/lib/rtl/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/debug.c?rev=25885&… ============================================================================== --- trunk/reactos/lib/rtl/debug.c (original) +++ trunk/reactos/lib/rtl/debug.c Fri Feb 23 10:13:19 2007 @@ -348,4 +348,25 @@ DebugService2(Name, &SymbolInfo, BREAKPOINT_LOAD_SYMBOLS); return STATUS_SUCCESS; } + +/* + * @implemented + */ +VOID +NTAPI +DbgUnLoadImageSymbols(IN PANSI_STRING Name, + IN PVOID Base, + IN ULONG_PTR ProcessId) +{ + KD_SYMBOLS_INFO SymbolInfo; + + /* Setup the symbol data */ + SymbolInfo.BaseOfDll = Base; + SymbolInfo.ProcessId = (PVOID)ProcessId; + SymbolInfo.CheckSum = SymbolInfo.SizeOfImage = 0; + + /* Load the symbols */ + DebugService2(Name, &SymbolInfo, BREAKPOINT_UNLOAD_SYMBOLS); +} + /* EOF */ Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/sysinfo.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ex/sysinfo.c (original) +++ trunk/reactos/ntoskrnl/ex/sysinfo.c Fri Feb 23 10:13:19 2007 @@ -1495,7 +1495,7 @@ if (!NtHeader) { /* Fail */ - LdrUnloadModule(ModuleObject); + MmUnloadSystemImage(ModuleObject); return STATUS_INVALID_IMAGE_FORMAT; } @@ -1514,7 +1514,7 @@ ASSERT(KeGetCurrentIrql() == PASSIVE_LEVEL); /* Unload if we failed */ - if (!NT_SUCCESS(Status)) LdrUnloadModule(ModuleObject); + if (!NT_SUCCESS(Status)) MmUnloadSystemImage(ModuleObject); return Status; } Modified: trunk/reactos/ntoskrnl/include/internal/ldr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ldr.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ldr.h Fri Feb 23 10:13:19 2007 @@ -6,77 +6,6 @@ #define DRIVER_ROOT_NAME L"\\Driver\\" #define FILESYSTEM_ROOT_NAME L"\\FileSystem\\" -extern ULONG_PTR LdrHalBase; - -NTSTATUS -NTAPI -LdrLoadInitialProcess( - PHANDLE ProcessHandle, - PHANDLE ThreadHandle -); - -VOID -NTAPI -LdrLoadAutoConfigDrivers(VOID); - -NTSTATUS -NTAPI -LdrpMapImage( - HANDLE ProcessHandle, - HANDLE SectionHandle, - PVOID *ImageBase -); - -NTSTATUS -NTAPI -LdrpLoadImage( - PUNICODE_STRING DriverName, - PVOID *ModuleBase, - PVOID *SectionPointer, - PVOID *EntryPoint, - PVOID *ExportDirectory -); - -NTSTATUS -NTAPI -LdrpUnloadImage(PVOID ModuleBase); - -NTSTATUS -NTAPI -LdrpLoadAndCallImage(PUNICODE_STRING DriverName); - -NTSTATUS -NTAPI -LdrpQueryModuleInformation( - PVOID Buffer, - ULONG Size, - PULONG ReqSize -); - -VOID -NTAPI -LdrInit1(VOID); - -VOID -NTAPI -LdrInitDebug( - PLOADER_MODULE Module, - PWCH Name -); - -NTSTATUS -NTAPI -MmLoadSystemImage(IN PUNICODE_STRING FileName, - IN PUNICODE_STRING NamePrefix OPTIONAL, - IN PUNICODE_STRING LoadedName OPTIONAL, - IN ULONG Flags, - OUT PVOID *ModuleObject, - OUT PVOID *ImageBaseAddress); - -NTSTATUS -NTAPI -LdrUnloadModule(PLDR_DATA_TABLE_ENTRY ModuleObject); - PLDR_DATA_TABLE_ENTRY NTAPI LdrGetModuleObject(PUNICODE_STRING ModuleName); Modified: trunk/reactos/ntoskrnl/include/internal/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/mm.h (original) +++ trunk/reactos/ntoskrnl/include/internal/mm.h Fri Feb 23 10:13:19 2007 @@ -332,16 +332,6 @@ BOOLEAN Dirty ); - -/* FUNCTIONS */ - -NTSTATUS -NTAPI -MmCheckSystemImage( - IN HANDLE ImageHandle, - IN BOOLEAN PurgeSection -); - /* aspace.c ******************************************************************/ VOID @@ -1429,6 +1419,8 @@ OUT PULONG ResultLength ); +/* sysldr.c ******************************************************************/ + VOID NTAPI MiReloadBootLoadedDrivers( @@ -1441,5 +1433,28 @@ IN PLOADER_PARAMETER_BLOCK LoaderBlock ); +NTSTATUS +NTAPI +MmLoadSystemImage( + IN PUNICODE_STRING FileName, + IN PUNICODE_STRING NamePrefix OPTIONAL, + IN PUNICODE_STRING LoadedName OPTIONAL, + IN ULONG Flags, + OUT PVOID *ModuleObject, + OUT PVOID *ImageBaseAddress +); + +NTSTATUS +NTAPI +MmUnloadSystemImage( + IN PVOID ImageHandle +); + +NTSTATUS +NTAPI +MmCheckSystemImage( + IN HANDLE ImageHandle, + IN BOOLEAN PurgeSection +); #endif Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/driver.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/driver.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/driver.c Fri Feb 23 10:13:19 2007 @@ -1169,7 +1169,7 @@ (*DriverObject->DriverUnload)(DriverObject); ObDereferenceObject(DriverObject); ObDereferenceObject(DriverObject); - LdrUnloadModule(ModuleObject); + MmUnloadSystemImage(ModuleObject); return STATUS_SUCCESS; } @@ -1750,7 +1750,7 @@ if (!NT_SUCCESS(Status)) { DPRINT("IopInitializeDriver() failed (Status %lx)\n", Status); - LdrUnloadModule(ModuleObject); + MmUnloadSystemImage(ModuleObject); IopFreeDeviceNode(DeviceNode); goto ReleaseCapturedString; } Modified: trunk/reactos/ntoskrnl/ldr/loader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ldr/loader.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ldr/loader.c (original) +++ trunk/reactos/ntoskrnl/ldr/loader.c Fri Feb 23 10:13:19 2007 @@ -133,30 +133,4 @@ return(NULL); } -// -// Used when unloading drivers -// -NTSTATUS -NTAPI -LdrUnloadModule ( PLDR_DATA_TABLE_ENTRY ModuleObject ) -{ - KIRQL Irql; - - /* Remove the module from the module list */ - KeAcquireSpinLock(&PsLoadedModuleSpinLock,&Irql); - RemoveEntryList(&ModuleObject->InLoadOrderLinks); - KeReleaseSpinLock(&PsLoadedModuleSpinLock, Irql); - - /* Hook for KDB on unloading a driver. */ - KDB_UNLOADDRIVER_HOOK(ModuleObject); - - /* Free module section */ - // MmFreeSection(ModuleObject->DllBase); - - ExFreePool(ModuleObject->FullDllName.Buffer); - ExFreePool(ModuleObject); - - return(STATUS_SUCCESS); -} - /* EOF */ Modified: trunk/reactos/ntoskrnl/mm/sysldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/sysldr.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/mm/sysldr.c (original) +++ trunk/reactos/ntoskrnl/mm/sysldr.c Fri Feb 23 10:13:19 2007 @@ -20,6 +20,135 @@ KMUTANT MmSystemLoadLock; /* FUNCTIONS *****************************************************************/ + +NTSTATUS +NTAPI +MiDereferenceImports(IN PLOAD_IMPORTS ImportList) +{ + /* Check if there's no imports or if we're a boot driver */ + if ((ImportList == (PVOID)-1) || (ImportList == (PVOID)-2)) + { + /* Then there's nothing to do */ + return STATUS_SUCCESS; + } + + /* Otherwise, FIXME */ + DPRINT1("Imports not dereferenced!\n"); + return STATUS_UNSUCCESSFUL; +} + +VOID +NTAPI +MiClearImports(IN PLDR_DATA_TABLE_ENTRY LdrEntry) +{ + PAGED_CODE(); + + /* Check if there's no imports or we're a boot driver or only one entry */ + if ((LdrEntry->LoadedImports == (PVOID)-1) || + (LdrEntry->LoadedImports == (PVOID)-2) || + ((ULONG_PTR)LdrEntry->LoadedImports & 1)) + { + /* Nothing to do */ + return; + } + + /* Otherwise, free the import list */ + ExFreePool(LdrEntry->LoadedImports); +} + +PVOID +NTAPI +MiLocateExportName(IN PVOID DllBase, + IN PCHAR ExportName) +{ + PULONG NameTable; + PUSHORT OrdinalTable; + PIMAGE_EXPORT_DIRECTORY ExportDirectory; + LONG Low = 0, Mid = 0, High, Ret; + USHORT Ordinal; + PVOID Function; + ULONG ExportSize; + PULONG ExportTable; + PAGED_CODE(); + + /* Get the export directory */ + ExportDirectory = RtlImageDirectoryEntryToData(DllBase, + TRUE, + IMAGE_DIRECTORY_ENTRY_EXPORT, + &ExportSize); + if (!ExportDirectory) return NULL; + + /* Setup name tables */ + NameTable = (PULONG)((ULONG_PTR)DllBase + + ExportDirectory->AddressOfNames); + OrdinalTable = (PUSHORT)((ULONG_PTR)DllBase + + ExportDirectory->AddressOfNameOrdinals); + + /* Do a binary search */ + High = ExportDirectory->NumberOfNames - 1; + while (High >= Low) + { + /* Get new middle value */ + Mid = (Low + High) >> 1; + + /* Compare name */ + Ret = strcmp(ExportName, (PCHAR)DllBase + NameTable[Mid]); + if (Ret < 0) + { + /* Update high */ + High = Mid - 1; + } + else if (Ret > 0) + { + /* Update low */ + Low = Mid + 1; + } + else + { + /* We got it */ + break; + } + } + + /* Check if we couldn't find it */ + if (High < Low) return NULL; + + /* Otherwise, this is the ordinal */ + Ordinal = OrdinalTable[Mid]; + + /* Resolve the address and write it */ + ExportTable = (PULONG)((ULONG_PTR)DllBase + + ExportDirectory->AddressOfFunctions); + Function = (PVOID)((ULONG_PTR)DllBase + ExportTable[Ordinal]); + + /* Check if the function is actually a forwarder */ + if (((ULONG_PTR)Function > (ULONG_PTR)ExportDirectory) && + ((ULONG_PTR)Function < ((ULONG_PTR)ExportDirectory + ExportSize))) + { + /* It is, fail */ + return NULL; + } + + /* We found it */ + return Function; +} + +NTSTATUS +NTAPI +MmCallDllInitialize(IN PLDR_DATA_TABLE_ENTRY LdrEntry, + IN PLIST_ENTRY ListHead) +{ + PMM_DLL_INITIALIZE DllInit; + + /* Try to see if the image exports a DllInitialize routine */ + DllInit = (PMM_DLL_INITIALIZE)MiLocateExportName(LdrEntry->DllBase, + "DllInitialize"); + if (!DllInit) return STATUS_SUCCESS; + + /* FIXME: TODO */ + DPRINT1("DllInitialize not called!\n"); + return STATUS_UNSUCCESSFUL; +} VOID NTAPI @@ -321,6 +450,92 @@ NTSTATUS NTAPI +MmUnloadSystemImage(IN PVOID ImageHandle) +{ + PLDR_DATA_TABLE_ENTRY LdrEntry = ImageHandle; + PVOID BaseAddress = LdrEntry->DllBase; + NTSTATUS Status; + ANSI_STRING TempName; + BOOLEAN HadEntry = FALSE; + + /* Acquire the loader lock */ + KeEnterCriticalRegion(); + KeWaitForSingleObject(&MmSystemLoadLock, + WrVirtualMemory, + KernelMode, + FALSE, + NULL); + + /* Check if this driver was loaded at boot and didn't get imports parsed */ + if (LdrEntry->LoadedImports == (PVOID)-1) goto Done; + + /* We should still be alive */ + ASSERT(LdrEntry->LoadCount != 0); + LdrEntry->LoadCount--; + + /* Check if we're still loaded */ + if (LdrEntry->LoadCount) goto Done; + + /* We should cleanup... are symbols loaded */ + if (LdrEntry->Flags & LDRP_DEBUG_SYMBOLS_LOADED) + { + /* Create the ANSI name */ + Status = RtlUnicodeStringToAnsiString(&TempName, + &LdrEntry->BaseDllName, + TRUE); + if (NT_SUCCESS(Status)) + { + /* Unload the symbols */ + DbgUnLoadImageSymbols(&TempName, BaseAddress, -1); + RtlFreeAnsiString(&TempName); + } + } + + /* FIXME: Free the driver */ + //MmFreeSection(LdrEntry->DllBase); + + /* Check if we're linked in */ + if (LdrEntry->InLoadOrderLinks.Flink) + { + /* Remove us */ + MiProcessLoaderEntry(LdrEntry, FALSE); + HadEntry = TRUE; + } + + /* Dereference and clear the imports */ + MiDereferenceImports(LdrEntry->LoadedImports); + MiClearImports(LdrEntry); + + /* Check if the entry needs to go away */ + if (HadEntry) + { + /* Check if it had a name */ + if (LdrEntry->FullDllName.Buffer) + { + /* Free it */ + ExFreePool(LdrEntry->FullDllName.Buffer); + } + + /* Check if we had a section */ + if (LdrEntry->SectionPointer) + { + /* Dereference it */ + ObDereferenceObject(LdrEntry->SectionPointer); + } + + /* Free the entry */ + ExFreePool(LdrEntry); + } + + /* Release the system lock and return */ +Done: + KeReleaseMutant(&MmSystemLoadLock, 1, FALSE, FALSE); + KeLeaveCriticalRegion(); + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI MiResolveImageReferences(IN PVOID ImageBase, IN PUNICODE_STRING ImageFileDirectory, IN PUNICODE_STRING NamePrefix OPTIONAL, @@ -406,8 +621,7 @@ if ((GdiLink) && (NormalLink)) { /* It's not, it's importing stuff it shouldn't be! */ - DPRINT1("Invalid driver!\n"); - //MiDereferenceImports(LoadedImports); + MiDereferenceImports(LoadedImports); if (LoadedImports) ExFreePool(LoadedImports); return STATUS_PROCEDURE_NOT_FOUND; } @@ -432,7 +646,7 @@ if (!NT_SUCCESS(Status)) { /* Failed */ - //MiDereferenceImports(LoadedImports); + MiDereferenceImports(LoadedImports); if (LoadedImports) ExFreePool(LoadedImports); return Status; } @@ -517,7 +731,6 @@ else { /* Fill out the information for the error */ - DPRINT1("Failed to import: %S\n", DllName.Buffer); *MissingDriver = DllName.Buffer; *(PULONG)MissingDriver |= 1; *MissingApi = NULL; @@ -539,7 +752,6 @@ ASSERT(DllBase = DllEntry->DllBase); /* Call the initialization routines */ -#if 0 Status = MmCallDllInitialize(DllEntry, &PsLoadedModuleList); if (!NT_SUCCESS(Status)) { @@ -548,16 +760,14 @@ while (TRUE); Loaded = FALSE; } -#endif } /* Check if we failed by here */ if (!NT_SUCCESS(Status)) { /* Cleanup and return */ - DPRINT1("Failed loading import\n"); RtlFreeUnicodeString(&NameString); - //MiDereferenceImports(LoadedImports); + MiDereferenceImports(LoadedImports); if (LoadedImports) ExFreePool(LoadedImports); return Status; } @@ -590,8 +800,7 @@ if (!ExportDirectory) { /* Cleanup and return */ - DPRINT1("Invalid driver: %wZ\n", &LdrEntry->BaseDllName); - //MiDereferenceImports(LoadedImports); + MiDereferenceImports(LoadedImports); if (LoadedImports) ExFreePool(LoadedImports); return STATUS_DRIVER_ENTRYPOINT_NOT_FOUND; } @@ -620,7 +829,7 @@ if (!NT_SUCCESS(Status)) { /* Cleanup and return */ - //MiDereferenceImports(LoadedImports); + MiDereferenceImports(LoadedImports); if (LoadedImports) ExFreePool(LoadedImports); return Status; }

17 years, 6 months

[ion] 25884: - Fix build.

by ion＠svn.reactos.org

Author: ion Date: Fri Feb 23 09:59:10 2007 New Revision: 25884 URL: http://svn.reactos.org/svn/reactos?rev=25884&view=rev Log: - Fix build. Modified: trunk/reactos/ntoskrnl/mm/verifier.c Modified: trunk/reactos/ntoskrnl/mm/verifier.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/verifier.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/mm/verifier.c (original) +++ trunk/reactos/ntoskrnl/mm/verifier.c Fri Feb 23 09:59:10 2007 @@ -164,7 +164,7 @@ if (!LdrEntry) return FALSE; /* Check if we're verifying or not */ - return (LdrEntry->Flags & LDRP_DRIVER_VERIFYING) ? TRUE: FALSE; + return (LdrEntry->Flags & LDRP_IMAGE_VERIFYING) ? TRUE: FALSE; } /*

17 years, 6 months

[ion] 25883: - Fix MmCreateImageSection to use previous mode instead of hardcoding UserMode. - Implement MiProcessLoaderEntry for adding/removing entries on the PsLoadedModuleList. - Move MmLoadSystemImage from loader.c to sysldr.c - Update MmLoadSystemImage: - Use MmSystemLoadLock. - Support returning the entry for an already-loaded image, instead of loading it twice. - Use Section APIs to map the image... we're still doing a dirty ZwReadFile hack, but at least now we can depend on the PE code

by ion＠svn.reactos.org

Author: ion Date: Fri Feb 23 08:39:42 2007 New Revision: 25883 URL: http://svn.reactos.org/svn/reactos?rev=25883&view=rev Log: - Fix MmCreateImageSection to use previous mode instead of hardcoding UserMode. - Implement MiProcessLoaderEntry for adding/removing entries on the PsLoadedModuleList. - Move MmLoadSystemImage from loader.c to sysldr.c - Update MmLoadSystemImage: - Use MmSystemLoadLock. - Support returning the entry for an already-loaded image, instead of loading it twice. - Use Section APIs to map the image... we're still doing a dirty ZwReadFile hack, but at least now we can depend on the PE code to validate the image (so removed the hardcoded validation). - Add more generic cleanup got so we can just jump to it. - Add more stub code and detection code for upcoming features. Modified: trunk/reactos/ntoskrnl/ldr/loader.c trunk/reactos/ntoskrnl/mm/section.c trunk/reactos/ntoskrnl/mm/sysldr.c Modified: trunk/reactos/ntoskrnl/ldr/loader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ldr/loader.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ldr/loader.c (original) +++ trunk/reactos/ntoskrnl/ldr/loader.c Fri Feb 23 08:39:42 2007 @@ -19,15 +19,6 @@ #include <debug.h> /* FUNCTIONS *****************************************************************/ - -NTSTATUS -NTAPI -MiResolveImageReferences(IN PVOID ImageBase, - IN PUNICODE_STRING ImageFileDirectory, - IN PUNICODE_STRING NamePrefix OPTIONAL, - OUT PCHAR *MissingApi, - OUT PWCHAR *MissingDriver, - OUT PLOAD_IMPORTS *LoadImports); static LONG LdrpCompareModuleNames ( @@ -168,372 +159,4 @@ return(STATUS_SUCCESS); } -// -// Used by NtLoadDriver/IoMgr -// -NTSTATUS -NTAPI -MmLoadSystemImage(IN PUNICODE_STRING FileName, - IN PUNICODE_STRING NamePrefix OPTIONAL, - IN PUNICODE_STRING LoadedName OPTIONAL, - IN ULONG Flags, - OUT PVOID *ModuleObject, - OUT PVOID *ImageBaseAddress) -{ - PVOID ModuleLoadBase; - NTSTATUS Status; - HANDLE FileHandle; - OBJECT_ATTRIBUTES ObjectAttributes; - PLDR_DATA_TABLE_ENTRY Module; - FILE_STANDARD_INFORMATION FileStdInfo; - IO_STATUS_BLOCK IoStatusBlock; - unsigned int DriverSize, Idx; - ULONG CurrentSize; - PVOID DriverBase; - PIMAGE_DOS_HEADER PEDosHeader; - PIMAGE_NT_HEADERS PENtHeaders; - PIMAGE_SECTION_HEADER PESectionHeaders; - KIRQL Irql; - PIMAGE_NT_HEADERS NtHeader; - UNICODE_STRING BaseName, BaseDirectory, PrefixName; - PLDR_DATA_TABLE_ENTRY LdrEntry; - ULONG EntrySize; - PLOAD_IMPORTS LoadedImports = (PVOID)-2; - PCHAR MissingApiName, Buffer; - PWCHAR MissingDriverName; - PAGED_CODE(); - - /* Detect session-load */ - if (Flags) - { - /* Sanity checks */ - ASSERT(NamePrefix == NULL); - ASSERT(LoadedName == NULL); - - /* Make sure the process is in session too */ - if (!PsGetCurrentProcess()->ProcessInSession) return STATUS_NO_MEMORY; - } - - if (ModuleObject) *ModuleObject = NULL; - if (ImageBaseAddress) *ImageBaseAddress = NULL; - - /* Allocate a buffer we'll use for names */ - Buffer = ExAllocatePoolWithTag(NonPagedPool, MAX_PATH, TAG_LDR_WSTR); - if (!Buffer) - { - /* Fail */ - return STATUS_INSUFFICIENT_RESOURCES; - } - - /* Check for a separator */ - if (FileName->Buffer[0] == OBJ_NAME_PATH_SEPARATOR) - { - PWCHAR p; - ULONG BaseLength; - - /* Loop the path until we get to the base name */ - p = &FileName->Buffer[FileName->Length / sizeof(WCHAR)]; - while (*(p - 1) != OBJ_NAME_PATH_SEPARATOR) p--; - - /* Get the length */ - BaseLength = (ULONG)(&FileName->Buffer[FileName->Length / sizeof(WCHAR)] - p); - BaseLength *= sizeof(WCHAR); - - /* Setup the string */ - BaseName.Length = (USHORT)BaseLength; - BaseName.Buffer = p; - } - else - { - /* Otherwise, we already have a base name */ - BaseName.Length = FileName->Length; - BaseName.Buffer = FileName->Buffer; - } - - /* Setup the maximum length */ - BaseName.MaximumLength = BaseName.Length; - - /* Now compute the base directory */ - BaseDirectory = *FileName; - BaseDirectory.Length -= BaseName.Length; - BaseDirectory.MaximumLength = BaseDirectory.Length; - - /* And the prefix, which for now is just the name itself */ - PrefixName = *FileName; - - /* Check if we have a prefix */ - if (NamePrefix) DPRINT1("Prefixed images are not yet supported!\n"); - - /* Check if we already have a name, use it instead */ - if (LoadedName) BaseName = *LoadedName; - - /* Open the Module */ - InitializeObjectAttributes(&ObjectAttributes, - FileName, - OBJ_CASE_INSENSITIVE, - NULL, - NULL); - - Status = ZwOpenFile(&FileHandle, - GENERIC_READ, - &ObjectAttributes, - &IoStatusBlock, - FILE_SHARE_READ, - FILE_SYNCHRONOUS_IO_NONALERT); - - if (!NT_SUCCESS(Status)) - { - DPRINT("Could not open module file: %wZ (Status 0x%08lx)\n", FileName, Status); - return(Status); - } - - - /* Get the size of the file */ - Status = ZwQueryInformationFile(FileHandle, - &IoStatusBlock, - &FileStdInfo, - sizeof(FileStdInfo), - FileStandardInformation); - if (!NT_SUCCESS(Status)) - { - DPRINT("Could not get file size\n"); - NtClose(FileHandle); - return(Status); - } - - - /* Allocate nonpageable memory for driver */ - ModuleLoadBase = ExAllocatePoolWithTag(NonPagedPool, - FileStdInfo.EndOfFile.u.LowPart, - TAG_DRIVER_MEM); - if (ModuleLoadBase == NULL) - { - DPRINT("Could not allocate memory for module"); - NtClose(FileHandle); - return(STATUS_INSUFFICIENT_RESOURCES); - } - - - /* Load driver into memory chunk */ - Status = ZwReadFile(FileHandle, - 0, 0, 0, - &IoStatusBlock, - ModuleLoadBase, - FileStdInfo.EndOfFile.u.LowPart, - 0, 0); - if (!NT_SUCCESS(Status)) - { - DPRINT("Could not read module file into memory"); - ExFreePool(ModuleLoadBase); - NtClose(FileHandle); - return(Status); - } - - - ZwClose(FileHandle); - - DPRINT("Processing PE Module at module base:%08lx\n", ModuleLoadBase); - - /* Get header pointers */ - PEDosHeader = (PIMAGE_DOS_HEADER) ModuleLoadBase; - PENtHeaders = RtlImageNtHeader(ModuleLoadBase); - NtHeader = PENtHeaders; - PESectionHeaders = IMAGE_FIRST_SECTION(PENtHeaders); - - - /* Check file magic numbers */ - if (PEDosHeader->e_magic != IMAGE_DOS_SIGNATURE) - { - DPRINT("Incorrect MZ magic: %04x\n", PEDosHeader->e_magic); - return STATUS_UNSUCCESSFUL; - } - if (PEDosHeader->e_lfanew == 0) - { - DPRINT("Invalid lfanew offset: %08x\n", PEDosHeader->e_lfanew); - return STATUS_UNSUCCESSFUL; - } - if (PENtHeaders->Signature != IMAGE_NT_SIGNATURE) - { - DPRINT("Incorrect PE magic: %08x\n", PENtHeaders->Signature); - return STATUS_UNSUCCESSFUL; - } - if (PENtHeaders->FileHeader.Machine != IMAGE_FILE_MACHINE_I386) - { - DPRINT("Incorrect Architechture: %04x\n", PENtHeaders->FileHeader.Machine); - return STATUS_UNSUCCESSFUL; - } - - - /* FIXME: if image is fixed-address load, then fail */ - - /* FIXME: check/verify OS version number */ - - DPRINT("OptionalHdrMagic:%04x LinkVersion:%d.%d\n", - PENtHeaders->OptionalHeader.Magic, - PENtHeaders->OptionalHeader.MajorLinkerVersion, - PENtHeaders->OptionalHeader.MinorLinkerVersion); - DPRINT("Entry Point:%08lx\n", PENtHeaders->OptionalHeader.AddressOfEntryPoint); - - /* Determine the size of the module */ - DriverSize = 0; - for (Idx = 0; Idx < PENtHeaders->FileHeader.NumberOfSections; Idx++) - { - if (!(PESectionHeaders[Idx].Characteristics & IMAGE_SCN_TYPE_NOLOAD)) - { - CurrentSize = PESectionHeaders[Idx].VirtualAddress + PESectionHeaders[Idx].Misc.VirtualSize; - DriverSize = max(DriverSize, CurrentSize); - } - } - DriverSize = ROUND_UP(DriverSize, PENtHeaders->OptionalHeader.SectionAlignment); - DPRINT("DriverSize %x, SizeOfImage %x\n",DriverSize, PENtHeaders->OptionalHeader.SizeOfImage); - - /* Allocate a virtual section for the module */ - DriverBase = NULL; - DriverBase = MmAllocateSection(DriverSize, DriverBase); - if (DriverBase == 0) - { - DPRINT("Failed to allocate a virtual section for driver\n"); - return STATUS_UNSUCCESSFUL; - } - DPRINT("DriverBase for %wZ: %x\n", FileName, DriverBase); - - /* Copy headers over */ - memcpy(DriverBase, ModuleLoadBase, PENtHeaders->OptionalHeader.SizeOfHeaders); - - /* Copy image sections into virtual section */ - for (Idx = 0; Idx < PENtHeaders->FileHeader.NumberOfSections; Idx++) - { - CurrentSize = PESectionHeaders[Idx].VirtualAddress + PESectionHeaders[Idx].Misc.VirtualSize; - /* Copy current section into current offset of virtual section */ - if (CurrentSize <= DriverSize && - PESectionHeaders[Idx].SizeOfRawData) - { - DPRINT("PESectionHeaders[Idx].VirtualAddress + DriverBase %x\n", - PESectionHeaders[Idx].VirtualAddress + (ULONG_PTR)DriverBase); - memcpy((PVOID)((ULONG_PTR)DriverBase + PESectionHeaders[Idx].VirtualAddress), - (PVOID)((ULONG_PTR)ModuleLoadBase + PESectionHeaders[Idx].PointerToRawData), - PESectionHeaders[Idx].Misc.VirtualSize > PESectionHeaders[Idx].SizeOfRawData - ? PESectionHeaders[Idx].SizeOfRawData : PESectionHeaders[Idx].Misc.VirtualSize ); - } - } - - /* Relocate the driver */ - Status = LdrRelocateImageWithBias(DriverBase, - 0, - "SYSLDR", - STATUS_SUCCESS, - STATUS_CONFLICTING_ADDRESSES, - STATUS_INVALID_IMAGE_FORMAT); - if (!NT_SUCCESS(Status)) - { - /* Fail */ - return Status; - } - - /* Calculate the size we'll need for the entry and allocate it */ - EntrySize = sizeof(LDR_DATA_TABLE_ENTRY) + - BaseName.Length + - sizeof(UNICODE_NULL); - - /* Allocate the entry */ - LdrEntry = ExAllocatePoolWithTag(NonPagedPool, EntrySize, TAG_MODULE_OBJECT); - if (!LdrEntry) - { - /* Fail */ - return STATUS_INSUFFICIENT_RESOURCES; - } - - /* Setup the entry */ - LdrEntry->Flags = LDRP_LOAD_IN_PROGRESS; - LdrEntry->LoadCount = 1; - LdrEntry->LoadedImports = LoadedImports; - LdrEntry->PatchInformation = NULL; - - /* Check the version */ - if ((NtHeader->OptionalHeader.MajorOperatingSystemVersion >= 5) && - (NtHeader->OptionalHeader.MajorImageVersion >= 5)) - { - /* Mark this image as a native image */ - LdrEntry->Flags |= 0x80000000; - } - - /* Setup the rest of the entry */ - LdrEntry->DllBase = DriverBase; - LdrEntry->EntryPoint = (PVOID)((ULONG_PTR)DriverBase + - NtHeader->OptionalHeader.AddressOfEntryPoint); - LdrEntry->SizeOfImage = DriverSize; - LdrEntry->CheckSum = NtHeader->OptionalHeader.CheckSum; - LdrEntry->SectionPointer = LdrEntry; - - /* Now write the DLL name */ - LdrEntry->BaseDllName.Buffer = (PVOID)(LdrEntry + 1); - LdrEntry->BaseDllName.Length = BaseName.Length; - LdrEntry->BaseDllName.MaximumLength = BaseName.Length; - - /* Copy and null-terminate it */ - RtlCopyMemory(LdrEntry->BaseDllName.Buffer, - BaseName.Buffer, - BaseName.Length); - LdrEntry->BaseDllName.Buffer[BaseName.Length / 2] = UNICODE_NULL; - - /* Now allocate the full name */ - LdrEntry->FullDllName.Buffer = ExAllocatePoolWithTag(PagedPool, - PrefixName.Length + - sizeof(UNICODE_NULL), - TAG_LDR_WSTR); - if (!LdrEntry->FullDllName.Buffer) - { - /* Don't fail, just set it to zero */ - LdrEntry->FullDllName.Length = 0; - LdrEntry->FullDllName.MaximumLength = 0; - } - else - { - /* Set it up */ - LdrEntry->FullDllName.Length = PrefixName.Length; - LdrEntry->FullDllName.MaximumLength = PrefixName.Length; - - /* Copy and null-terminate */ - RtlCopyMemory(LdrEntry->FullDllName.Buffer, - PrefixName.Buffer, - PrefixName.Length); - LdrEntry->FullDllName.Buffer[PrefixName.Length / 2] = UNICODE_NULL; - } - - /* Insert the entry */ - KeAcquireSpinLock(&PsLoadedModuleSpinLock, &Irql); - InsertTailList(&PsLoadedModuleList, &LdrEntry->InLoadOrderLinks); - KeReleaseSpinLock(&PsLoadedModuleSpinLock, Irql); - - /* Resolve imports */ - MissingApiName = Buffer; - Status = MiResolveImageReferences(DriverBase, - &BaseDirectory, - NULL, - &MissingApiName, - &MissingDriverName, - &LoadedImports); - if (!NT_SUCCESS(Status)) - { - /* Fail */ - ExFreePool(LdrEntry->FullDllName.Buffer); - ExFreePool(LdrEntry); - return Status; - } - - /* Return */ - Module = LdrEntry; - - /* Cleanup */ - ExFreePool(ModuleLoadBase); - - if (ModuleObject) *ModuleObject = Module; - if (ImageBaseAddress) *ImageBaseAddress = Module->DllBase; - - /* Hook for KDB on loading a driver. */ - KDB_LOADDRIVER_HOOK(FileName, Module); - - return(STATUS_SUCCESS); -} - /* EOF */ Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c (original) +++ trunk/reactos/ntoskrnl/mm/section.c Fri Feb 23 08:39:42 2007 @@ -3292,7 +3292,7 @@ Status = ObReferenceObjectByHandle(FileHandle, FileAccess, IoFileObjectType, - UserMode, + ExGetPreviousMode(), (PVOID*)(PVOID)&FileObject, NULL); Modified: trunk/reactos/ntoskrnl/mm/sysldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/sysldr.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/mm/sysldr.c (original) +++ trunk/reactos/ntoskrnl/mm/sysldr.c Fri Feb 23 08:39:42 2007 @@ -20,6 +20,24 @@ KMUTANT MmSystemLoadLock; /* FUNCTIONS *****************************************************************/ + +VOID +NTAPI +MiProcessLoaderEntry(IN PLDR_DATA_TABLE_ENTRY LdrEntry, + IN BOOLEAN Insert) +{ + KIRQL OldIrql; + + /* Acquire the lock */ + KeAcquireSpinLock(&PsLoadedModuleSpinLock, &OldIrql); + + /* Insert or remove from the list */ + Insert ? InsertTailList(&PsLoadedModuleList, &LdrEntry->InLoadOrderLinks) : + RemoveEntryList(&LdrEntry->InLoadOrderLinks); + + /* Release the lock */ + KeReleaseSpinLock(&PsLoadedModuleSpinLock, OldIrql); +} VOID NTAPI @@ -1019,3 +1037,469 @@ ZwClose(SectionHandle); return Status; } + +NTSTATUS +NTAPI +MmLoadSystemImage(IN PUNICODE_STRING FileName, + IN PUNICODE_STRING NamePrefix OPTIONAL, + IN PUNICODE_STRING LoadedName OPTIONAL, + IN ULONG Flags, + OUT PVOID *ModuleObject, + OUT PVOID *ImageBaseAddress) +{ + PVOID ModuleLoadBase = NULL; + NTSTATUS Status; + HANDLE FileHandle = NULL; + OBJECT_ATTRIBUTES ObjectAttributes; + FILE_STANDARD_INFORMATION FileStdInfo; + IO_STATUS_BLOCK IoStatusBlock; + ULONG DriverSize = 0, Size, i; + PVOID DriverBase; + PIMAGE_SECTION_HEADER SectionHeaders; + PIMAGE_NT_HEADERS NtHeader; + UNICODE_STRING BaseName, BaseDirectory, PrefixName; + PLDR_DATA_TABLE_ENTRY LdrEntry = NULL; + ULONG EntrySize; + PLOAD_IMPORTS LoadedImports = (PVOID)-2; + PCHAR MissingApiName, Buffer; + PWCHAR MissingDriverName; + HANDLE SectionHandle; + ACCESS_MASK DesiredAccess; + PVOID Section = NULL; + BOOLEAN LockOwned = FALSE; + PLIST_ENTRY NextEntry; + PAGED_CODE(); + + /* Detect session-load */ + if (Flags) + { + /* Sanity checks */ + ASSERT(NamePrefix == NULL); + ASSERT(LoadedName == NULL); + + /* Make sure the process is in session too */ + if (!PsGetCurrentProcess()->ProcessInSession) return STATUS_NO_MEMORY; + } + + if (ModuleObject) *ModuleObject = NULL; + if (ImageBaseAddress) *ImageBaseAddress = NULL; + + /* Allocate a buffer we'll use for names */ + Buffer = ExAllocatePoolWithTag(NonPagedPool, MAX_PATH, TAG_LDR_WSTR); + if (!Buffer) return STATUS_INSUFFICIENT_RESOURCES; + + /* Check for a separator */ + if (FileName->Buffer[0] == OBJ_NAME_PATH_SEPARATOR) + { + PWCHAR p; + ULONG BaseLength; + + /* Loop the path until we get to the base name */ + p = &FileName->Buffer[FileName->Length / sizeof(WCHAR)]; + while (*(p - 1) != OBJ_NAME_PATH_SEPARATOR) p--; + + /* Get the length */ + BaseLength = (ULONG)(&FileName->Buffer[FileName->Length / sizeof(WCHAR)] - p); + BaseLength *= sizeof(WCHAR); + + /* Setup the string */ + BaseName.Length = (USHORT)BaseLength; + BaseName.Buffer = p; + } + else + { + /* Otherwise, we already have a base name */ + BaseName.Length = FileName->Length; + BaseName.Buffer = FileName->Buffer; + } + + /* Setup the maximum length */ + BaseName.MaximumLength = BaseName.Length; + + /* Now compute the base directory */ + BaseDirectory = *FileName; + BaseDirectory.Length -= BaseName.Length; + BaseDirectory.MaximumLength = BaseDirectory.Length; + + /* And the prefix, which for now is just the name itself */ + PrefixName = *FileName; + + /* Check if we have a prefix */ + if (NamePrefix) DPRINT1("Prefixed images are not yet supported!\n"); + + /* Check if we already have a name, use it instead */ + if (LoadedName) BaseName = *LoadedName; + + /* Acquire the load lock */ +LoaderScan: + ASSERT(LockOwned == FALSE); + LockOwned = TRUE; + KeEnterCriticalRegion(); + KeWaitForSingleObject(&MmSystemLoadLock, + WrVirtualMemory, + KernelMode, + FALSE, + NULL); + + /* Scan the module list */ + NextEntry = PsLoadedModuleList.Flink; + while (NextEntry != &PsLoadedModuleList) + { + /* Get the entry and compare the names */ + LdrEntry = CONTAINING_RECORD(NextEntry, + LDR_DATA_TABLE_ENTRY, + InLoadOrderLinks); + if (RtlEqualUnicodeString(&PrefixName, &LdrEntry->FullDllName, TRUE)) + { + /* Found it, break out */ + break; + } + + /* Keep scanning */ + NextEntry = NextEntry->Flink; + } + + /* Check if we found the image */ + if (NextEntry != &PsLoadedModuleList) + { + /* Check if we had already mapped a section */ + if (Section) + { + /* Dereference and clear */ + ObDereferenceObject(Section); + Section = NULL; + } + + /* Check if this was supposed to be a session load */ + if (!Flags) + { + /* It wasn't, so just return the data */ + *ModuleObject = LdrEntry; + *ImageBaseAddress = LdrEntry->DllBase; + Status = STATUS_IMAGE_ALREADY_LOADED; + } + else + { + /* We don't support session loading yet */ + DPRINT1("Unsupported Session-Load!\n"); + while (TRUE); + } + + /* Do cleanup */ + goto Quickie; + } + else if (!Section) + { + /* It wasn't loaded, and we didn't have a previous attempt */ + KeReleaseMutant(&MmSystemLoadLock, 1, FALSE, FALSE); + KeLeaveCriticalRegion(); + LockOwned = FALSE; + + /* Check if KD is enabled */ + if ((KdDebuggerEnabled) && !(KdDebuggerNotPresent)) + { + /* FIXME: Attempt to get image from KD */ + } + + /* We don't have a valid entry */ + LdrEntry = NULL; + + /* Setup image attributes */ + InitializeObjectAttributes(&ObjectAttributes, + FileName, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + + /* Open the image */ + Status = ZwOpenFile(&FileHandle, + FILE_EXECUTE, + &ObjectAttributes, + &IoStatusBlock, + FILE_SHARE_READ | FILE_SHARE_DELETE, + FILE_SYNCHRONOUS_IO_NONALERT); + if (!NT_SUCCESS(Status)) goto Quickie; + + /* Validate it */ + Status = MmCheckSystemImage(FileHandle, FALSE); + if ((Status == STATUS_IMAGE_CHECKSUM_MISMATCH) || + (Status == STATUS_IMAGE_MP_UP_MISMATCH) || + (Status == STATUS_INVALID_IMAGE_FORMAT)) + { + /* Fail loading */ + goto Quickie; + } + + /* Get image size */ + Status = ZwQueryInformationFile(FileHandle, + &IoStatusBlock, + &FileStdInfo, + sizeof(FileStdInfo), + FileStandardInformation); + if (!NT_SUCCESS(Status)) goto Quickie; + + /* Allocate memory for image */ + ModuleLoadBase = ExAllocatePoolWithTag(NonPagedPool, + FileStdInfo.EndOfFile.u.LowPart, + TAG_DRIVER_MEM); + + /* Read the image */ + Status = ZwReadFile(FileHandle, + 0, + 0, + 0, + &IoStatusBlock, + ModuleLoadBase, + FileStdInfo.EndOfFile.u.LowPart, + 0, + 0); + if (!NT_SUCCESS(Status)) goto Quickie; + + /* Check if this is a session-load */ + if (Flags) + { + /* Then we only need read and execute */ + DesiredAccess = SECTION_MAP_READ | SECTION_MAP_EXECUTE; + } + else + { + /* Otherwise, we can allow write access */ + DesiredAccess = SECTION_ALL_ACCESS; + } + + /* Initialize the attributes for the section */ + InitializeObjectAttributes(&ObjectAttributes, + NULL, + OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, + NULL, + NULL); + + /* Create the section */ + Status = ZwCreateSection(&SectionHandle, + DesiredAccess, + &ObjectAttributes, + NULL, + PAGE_EXECUTE, + SEC_IMAGE, + FileHandle); + if (!NT_SUCCESS(Status)) goto Quickie; + + /* Now get the section pointer */ + Status = ObReferenceObjectByHandle(SectionHandle, + SECTION_MAP_EXECUTE, + MmSectionObjectType, + KernelMode, + &Section, + NULL); + ZwClose(SectionHandle); + if (!NT_SUCCESS(Status)) goto Quickie; + + /* Check if this was supposed to be a session-load */ + if (Flags) + { + /* We don't support session loading yet */ + DPRINT1("Unsupported Session-Load!\n"); + while (TRUE); + } + + /* Check the loader list again, we should end up in the path below */ + goto LoaderScan; + } + else + { + /* We don't have a valid entry */ + LdrEntry = NULL; + } + + /* We should have a valid module base */ + ASSERT(ModuleLoadBase != NULL); + + /* Get header pointers */ + NtHeader = RtlImageNtHeader(ModuleLoadBase); + + /* Get header pointers */ + SectionHeaders = IMAGE_FIRST_SECTION(NtHeader); + + /* Determine the size of the module */ + for (i = 0; i < NtHeader->FileHeader.NumberOfSections; i++) + { + /* Skip this section if we're not supposed to load it */ + if (!(SectionHeaders[i].Characteristics & IMAGE_SCN_TYPE_NOLOAD)) + { + /* Add the size of this section into the total size */ + Size = SectionHeaders[i].VirtualAddress + + SectionHeaders[i].Misc.VirtualSize; + DriverSize = max(DriverSize, Size); + } + } + + /* Round up the driver size to section alignment */ + DriverSize = ROUND_UP(DriverSize, NtHeader->OptionalHeader.SectionAlignment); + + /* Allocate a virtual section for the module */ + DriverBase = MmAllocateSection(DriverSize, NULL); + + /* Copy headers over */ + RtlCopyMemory(DriverBase, + ModuleLoadBase, + NtHeader->OptionalHeader.SizeOfHeaders); + + /* Copy image sections into virtual section */ + for (i = 0; i < NtHeader->FileHeader.NumberOfSections; i++) + { + /* Get the size of this section and check if it's valid and on-disk */ + Size = SectionHeaders[i].VirtualAddress + + SectionHeaders[i].Misc.VirtualSize; + if ((Size <= DriverSize) && (SectionHeaders[i].SizeOfRawData)) + { + /* Copy the data from the disk to the image */ + RtlCopyMemory((PVOID)((ULONG_PTR)DriverBase + + SectionHeaders[i].VirtualAddress), + (PVOID)((ULONG_PTR)ModuleLoadBase + + SectionHeaders[i].PointerToRawData), + SectionHeaders[i].Misc.VirtualSize > + SectionHeaders[i].SizeOfRawData ? + SectionHeaders[i].SizeOfRawData : + SectionHeaders[i].Misc.VirtualSize); + } + } + + /* Relocate the driver */ + Status = LdrRelocateImageWithBias(DriverBase, + 0, + "SYSLDR", + STATUS_SUCCESS, + STATUS_CONFLICTING_ADDRESSES, + STATUS_INVALID_IMAGE_FORMAT); + if (!NT_SUCCESS(Status)) goto Quickie; + + /* Calculate the size we'll need for the entry and allocate it */ + EntrySize = sizeof(LDR_DATA_TABLE_ENTRY) + + BaseName.Length + + sizeof(UNICODE_NULL); + + /* Allocate the entry */ + LdrEntry = ExAllocatePoolWithTag(NonPagedPool, EntrySize, TAG_MODULE_OBJECT); + if (!LdrEntry) + { + /* Fail */ + Status = STATUS_INSUFFICIENT_RESOURCES; + goto Quickie; + } + + /* Setup the entry */ + LdrEntry->Flags = LDRP_LOAD_IN_PROGRESS; + LdrEntry->LoadCount = 1; + LdrEntry->LoadedImports = LoadedImports; + LdrEntry->PatchInformation = NULL; + + /* Check the version */ + if ((NtHeader->OptionalHeader.MajorOperatingSystemVersion >= 5) && + (NtHeader->OptionalHeader.MajorImageVersion >= 5)) + { + /* Mark this image as a native image */ + LdrEntry->Flags |= 0x80000000; + } + + /* Setup the rest of the entry */ + LdrEntry->DllBase = DriverBase; + LdrEntry->EntryPoint = (PVOID)((ULONG_PTR)DriverBase + + NtHeader->OptionalHeader.AddressOfEntryPoint); + LdrEntry->SizeOfImage = DriverSize; + LdrEntry->CheckSum = NtHeader->OptionalHeader.CheckSum; + LdrEntry->SectionPointer = LdrEntry; + + /* Now write the DLL name */ + LdrEntry->BaseDllName.Buffer = (PVOID)(LdrEntry + 1); + LdrEntry->BaseDllName.Length = BaseName.Length; + LdrEntry->BaseDllName.MaximumLength = BaseName.Length; + + /* Copy and null-terminate it */ + RtlCopyMemory(LdrEntry->BaseDllName.Buffer, + BaseName.Buffer, + BaseName.Length); + LdrEntry->BaseDllName.Buffer[BaseName.Length / 2] = UNICODE_NULL; + + /* Now allocate the full name */ + LdrEntry->FullDllName.Buffer = ExAllocatePoolWithTag(PagedPool, + PrefixName.Length + + sizeof(UNICODE_NULL), + TAG_LDR_WSTR); + if (!LdrEntry->FullDllName.Buffer) + { + /* Don't fail, just set it to zero */ + LdrEntry->FullDllName.Length = 0; + LdrEntry->FullDllName.MaximumLength = 0; + } + else + { + /* Set it up */ + LdrEntry->FullDllName.Length = PrefixName.Length; + LdrEntry->FullDllName.MaximumLength = PrefixName.Length; + + /* Copy and null-terminate */ + RtlCopyMemory(LdrEntry->FullDllName.Buffer, + PrefixName.Buffer, + PrefixName.Length); + LdrEntry->FullDllName.Buffer[PrefixName.Length / 2] = UNICODE_NULL; + } + + /* Add the entry */ + MiProcessLoaderEntry(LdrEntry, TRUE); + + /* Resolve imports */ + MissingApiName = Buffer; + Status = MiResolveImageReferences(DriverBase, + &BaseDirectory, + NULL, + &MissingApiName, + &MissingDriverName, + &LoadedImports); + if (!NT_SUCCESS(Status)) + { + /* Fail */ + MiProcessLoaderEntry(LdrEntry, FALSE); + + /* Check if we need to free the name */ + if (LdrEntry->FullDllName.Buffer) + { + /* Free it */ + ExFreePool(LdrEntry->FullDllName.Buffer); + } + + /* Free the entry itself */ + ExFreePool(LdrEntry); + LdrEntry = NULL; + goto Quickie; + } + + if (ModuleObject) *ModuleObject = LdrEntry; + if (ImageBaseAddress) *ImageBaseAddress = LdrEntry->DllBase; + + /* Hook for KDB on loading a driver. */ + KDB_LOADDRIVER_HOOK(FileName, LdrEntry); + +Quickie: + /* If we have a file handle, close it */ + if (FileHandle) ZwClose(FileHandle); + + /* Cleanup */ + if (ModuleLoadBase) ExFreePool(ModuleLoadBase); + + /* Check if we have the lock acquired */ + if (LockOwned) + { + /* Release the lock */ + KeReleaseMutant(&MmSystemLoadLock, 1, FALSE, FALSE); + KeLeaveCriticalRegion(); + LockOwned = FALSE; + } + + /* Check if we had a prefix */ + if (NamePrefix) ExFreePool(PrefixName.Buffer); + + /* Free the name buffer and return status */ + ExFreePool(Buffer); + return Status; +} +

17 years, 6 months

← Newer
1
2
3
4
5
6
7
8
...
27
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 2007