Ros-diffs October 2010

ros-diffs@reactos.org

20 participants
435 discussions

[fireball] 49045: [NTDLL] - Load image execution options before creating process heap (so that GlobalFlag overrides can be taken into account). - Make LdrQueryImageFileExecutionOptions avoid heap u...
by fireball＠svn.reactos.org 07 Oct '10

07 Oct '10

Author: fireball Date: Thu Oct 7 21:12:10 2010 New Revision: 49045 URL: http://svn.reactos.org/svn/reactos?rev=49045&view=rev Log: [NTDLL] - Load image execution options before creating process heap (so that GlobalFlag overrides can be taken into account). - Make LdrQueryImageFileExecutionOptions avoid heap usage when possible (and when it's not possible, fail with out of memory status). - Fixes a dramatic count of ~100 failures in "kernel32_winetest heap". Modified: trunk/reactos/dll/ntdll/ldr/startup.c trunk/reactos/dll/ntdll/ldr/utils.c Modified: trunk/reactos/dll/ntdll/ldr/startup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/startup.c?re… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/startup.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/startup.c [iso-8859-1] Thu Oct 7 21:12:10 2010 @@ -383,6 +383,9 @@ /* Initialize Critical Section Data */ RtlpInitDeferedCriticalSection(); + /* Load execution options */ + LoadImageFileExecutionOptions(Peb); + /* create process heap */ RtlInitializeHeapManager(); Peb->ProcessHeap = RtlCreateHeap(HEAP_GROWABLE, @@ -447,9 +450,6 @@ /* Load compatibility settings */ LoadCompatibilitySettings(Peb); - /* Load execution options */ - LoadImageFileExecutionOptions(Peb); - /* build full ntdll path */ wcscpy(FullNtDllPath, SharedUserData->NtSystemRoot); wcscat(FullNtDllPath, L"\\system32\\ntdll.dll"); Modified: trunk/reactos/dll/ntdll/ldr/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/utils.c?rev=… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/utils.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/utils.c [iso-8859-1] Thu Oct 7 21:12:10 2010 @@ -3337,6 +3337,7 @@ OUT PULONG ReturnedLength OPTIONAL) { PKEY_VALUE_PARTIAL_INFORMATION KeyInfo; + CHAR KeyInfoBuffer[sizeof(KEY_VALUE_PARTIAL_INFORMATION) + 32]; OBJECT_ATTRIBUTES ObjectAttributes; UNICODE_STRING ValueNameString; UNICODE_STRING KeyName; @@ -3377,15 +3378,8 @@ return Status; } - KeyInfoSize = sizeof(KEY_VALUE_PARTIAL_INFORMATION) + 32; - KeyInfo = RtlAllocateHeap (RtlGetProcessHeap(), - HEAP_ZERO_MEMORY, - KeyInfoSize); - if (KeyInfo == NULL) - { - NtClose (KeyHandle); - return STATUS_INSUFFICIENT_RESOURCES; - } + KeyInfoSize = sizeof(KeyInfoBuffer); + KeyInfo = (PKEY_VALUE_PARTIAL_INFORMATION)KeyInfoBuffer; RtlInitUnicodeString (&ValueNameString, (PWSTR)ValueName); @@ -3397,10 +3391,13 @@ &ResultSize); if (Status == STATUS_BUFFER_OVERFLOW) { + /* We can allocate only if there is a process heap already */ + if (!RtlGetProcessHeap()) + { + NtClose (KeyHandle); + return STATUS_NO_MEMORY; + } KeyInfoSize = sizeof(KEY_VALUE_PARTIAL_INFORMATION) + KeyInfo->DataLength; - RtlFreeHeap (RtlGetProcessHeap(), - 0, - KeyInfo); KeyInfo = RtlAllocateHeap (RtlGetProcessHeap(), HEAP_ZERO_MEMORY, KeyInfoSize); @@ -3421,7 +3418,7 @@ if (!NT_SUCCESS(Status)) { - if (KeyInfo != NULL) + if ((PCHAR)KeyInfo != KeyInfoBuffer) { RtlFreeHeap (RtlGetProcessHeap(), 0, @@ -3432,9 +3429,12 @@ if (KeyInfo->Type != Type) { - RtlFreeHeap (RtlGetProcessHeap(), - 0, - KeyInfo); + if ((PCHAR)KeyInfo != KeyInfoBuffer) + { + RtlFreeHeap (RtlGetProcessHeap(), + 0, + KeyInfo); + } return STATUS_OBJECT_TYPE_MISMATCH; } @@ -3451,9 +3451,12 @@ &KeyInfo->Data, ResultSize); - RtlFreeHeap (RtlGetProcessHeap(), - 0, - KeyInfo); + if ((PCHAR)KeyInfo != KeyInfoBuffer) + { + RtlFreeHeap (RtlGetProcessHeap(), + 0, + KeyInfo); + } if (ReturnedLength != NULL) {

1 0

[pschweitzer] 49044: [NTOSKRNL] On boot, while loading drivers, make starting Loader Block available to the whole kernel to let drivers calling on-boot functions that may need it. One of them will ...
by pschweitzer＠svn.reactos.org 07 Oct '10

07 Oct '10

Author: pschweitzer Date: Thu Oct 7 20:20:10 2010 New Revision: 49044 URL: http://svn.reactos.org/svn/reactos?rev=49044&view=rev Log: [NTOSKRNL] On boot, while loading drivers, make starting Loader Block available to the whole kernel to let drivers calling on-boot functions that may need it. One of them will be implemented later. Modified: trunk/reactos/ntoskrnl/io/iomgr/iomgr.c Modified: trunk/reactos/ntoskrnl/io/iomgr/iomgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iomgr.c?… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/iomgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/iomgr.c [iso-8859-1] Thu Oct 7 20:20:10 2010 @@ -82,6 +82,8 @@ GENERAL_LOOKASIDE IopMdlLookasideList; extern GENERAL_LOOKASIDE IoCompletionPacketLookaside; +PLOADER_PARAMETER_BLOCK IopLoaderBlock; + #if defined (ALLOC_PRAGMA) #pragma alloc_text(INIT, IoInitSystem) #endif @@ -493,6 +495,9 @@ /* Initialize HAL Root Bus Driver */ HalInitPnpDriver(); + /* Make loader block available for the whole kernel */ + IopLoaderBlock = LoaderBlock; + /* Load boot start drivers */ IopInitializeBootDrivers(); @@ -506,6 +511,9 @@ IopStartRamdisk(LoaderBlock); } + /* No one should need loader block any longer */ + IopLoaderBlock = NULL; + /* Create ARC names for boot devices */ if (!NT_SUCCESS(IopCreateArcNames(LoaderBlock))) return FALSE;

1 0

[pschweitzer] 49043: [NTOSKRNL] Fixed a FIXME in ARC names by implementing IopStoreSystemPartitionInformation(). This make ReactOS writing boot paths to registry.
by pschweitzer＠svn.reactos.org 07 Oct '10

07 Oct '10

Author: pschweitzer Date: Thu Oct 7 20:08:24 2010 New Revision: 49043 URL: http://svn.reactos.org/svn/reactos?rev=49043&view=rev Log: [NTOSKRNL] Fixed a FIXME in ARC names by implementing IopStoreSystemPartitionInformation(). This make ReactOS writing boot paths to registry. Modified: trunk/reactos/ntoskrnl/include/internal/io.h trunk/reactos/ntoskrnl/io/iomgr/arcname.c trunk/reactos/ntoskrnl/io/iomgr/iorsrce.c Modified: trunk/reactos/ntoskrnl/include/internal/io.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/io.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/io.h [iso-8859-1] Thu Oct 7 20:08:24 2010 @@ -1165,6 +1165,14 @@ IN PLOADER_PARAMETER_BLOCK LoaderBlock ); +// Configuration Routines +// +VOID +NTAPI +IopStoreSystemPartitionInformation(IN PUNICODE_STRING NtSystemPartitionDeviceName, + IN PUNICODE_STRING OsLoaderPathName +); + // // Global I/O Data // Modified: trunk/reactos/ntoskrnl/io/iomgr/arcname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/arcname.… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/arcname.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/arcname.c [iso-8859-1] Thu Oct 7 20:08:24 2010 @@ -578,7 +578,8 @@ TRUE); if (NT_SUCCESS(Status)) { - /* FIXME: Save in registry */ + /* Save in registry */ + IopStoreSystemPartitionInformation(&DeviceName, &BootPath); /* Free the string now */ RtlFreeUnicodeString(&BootPath); Modified: trunk/reactos/ntoskrnl/io/iomgr/iorsrce.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iorsrce.… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/iorsrce.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/iorsrce.c [iso-8859-1] Thu Oct 7 20:08:24 2010 @@ -1,11 +1,12 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel - * FILE: ntoskrnl/io/resource.c + * FILE: ntoskrnl/io/iorsrce.c * PURPOSE: Hardware resource managment * * PROGRAMMERS: David Welch (welch(a)mcmail.com) * Alex Ionescu (alex(a)relsoft.net) + * Pierre Schweitzer (pierre.schweitzer(a)reactos.org) */ /* INCLUDES *****************************************************************/ @@ -650,6 +651,143 @@ return Status; } +VOID +NTAPI +IopStoreSystemPartitionInformation(IN PUNICODE_STRING NtSystemPartitionDeviceName, + IN PUNICODE_STRING OsLoaderPathName) +{ + NTSTATUS Status; + UNICODE_STRING LinkTarget, KeyName; + OBJECT_ATTRIBUTES ObjectAttributes; + HANDLE LinkHandle, RegistryHandle, KeyHandle; + WCHAR LinkTargetBuffer[256], KeyNameBuffer[sizeof("SystemPartition")]; + UNICODE_STRING CmRegistryMachineSystemName = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\SYSTEM"); + + ASSERT(NtSystemPartitionDeviceName->MaximumLength >= NtSystemPartitionDeviceName->Length + sizeof(WCHAR)); + ASSERT(NtSystemPartitionDeviceName->Buffer[NtSystemPartitionDeviceName->Length / sizeof(WCHAR)] == UNICODE_NULL); + ASSERT(OsLoaderPathName->MaximumLength >= OsLoaderPathName->Length + sizeof(WCHAR)); + ASSERT(OsLoaderPathName->Buffer[OsLoaderPathName->Length / sizeof(WCHAR)] == UNICODE_NULL); + + /* First define needed stuff to open NtSystemPartitionDeviceName symbolic link */ + InitializeObjectAttributes(&ObjectAttributes, + NtSystemPartitionDeviceName, + OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, + NULL, + NULL); + + /* Open NtSystemPartitionDeviceName symbolic link */ + Status = ZwOpenSymbolicLinkObject(&LinkHandle, + SYMBOLIC_LINK_QUERY, + &ObjectAttributes); + if (!NT_SUCCESS(Status)) + { + DPRINT("Failed opening given symbolic link!\n"); + return; + } + + /* Prepare the string that will receive where symbolic link points to */ + LinkTarget.Length = 0; + /* We will zero the end of the string after having received it */ + LinkTarget.MaximumLength = sizeof(LinkTargetBuffer) - sizeof(UNICODE_NULL); + LinkTarget.Buffer = LinkTargetBuffer; + + /* Query target */ + Status = ZwQuerySymbolicLinkObject(LinkHandle, + &LinkTarget, + NULL); + + /* We are done with symbolic link */ + ObCloseHandle(LinkHandle, KernelMode); + + if (!NT_SUCCESS(Status)) + { + DPRINT("Failed querying given symbolic link!\n"); + return; + } + + /* As promised, we zero the end */ + LinkTarget.Buffer[LinkTarget.Length / sizeof(WCHAR)] = UNICODE_NULL; + + /* Open registry to save data (HKLM\SYSTEM) */ + Status = IopOpenRegistryKeyEx(&RegistryHandle, + NULL, + &CmRegistryMachineSystemName, + KEY_ALL_ACCESS); + if (!NT_SUCCESS(Status)) + { + DPRINT("Failed opening registry!\n"); + return; + } + + /* We'll store in Setup subkey, and as we love fun, we use only one buffer for three writings... */ + wcscpy(KeyNameBuffer, L"Setup"); + KeyName.Length = sizeof(L"Setup") - sizeof(UNICODE_NULL); + KeyName.MaximumLength = sizeof(L"Setup"); + KeyName.Buffer = KeyNameBuffer; + + /* So, open or create the subkey */ + Status = IopCreateRegistryKeyEx(&KeyHandle, + RegistryHandle, + &KeyName, + KEY_ALL_ACCESS, + REG_OPTION_NON_VOLATILE, + NULL); + + /* We're done with HKLM\SYSTEM */ + ObCloseHandle(RegistryHandle, KernelMode); + + if (!NT_SUCCESS(Status)) + { + DPRINT("Failed opening/creating Setup key!\n"); + return; + } + + /* Prepare first data writing... */ + wcscpy(KeyNameBuffer, L"SystemPartition"); + KeyName.Length = sizeof(L"SystemPartition") - sizeof(UNICODE_NULL); + KeyName.MaximumLength = sizeof(L"SystemPartition"); + + /* Write SystemPartition value which is the target of the symbolic link */ + Status = ZwSetValueKey(KeyHandle, + &KeyName, + 0, + REG_SZ, + LinkTarget.Buffer, + LinkTarget.Length + sizeof(WCHAR)); + if (!NT_SUCCESS(Status)) + { + DPRINT("Failed writing SystemPartition value!\n"); + } + + /* Prepare for second data writing... */ + wcscpy(KeyName.Buffer, L"OsLoaderPath"); + KeyName.Length = sizeof(L"OsLoaderPath") - sizeof(UNICODE_NULL); + KeyName.MaximumLength = sizeof(L"OsLoaderPath"); + + /* Remove trailing slash if any (one slash only excepted) */ + if (OsLoaderPathName->Length > sizeof(WCHAR) && + OsLoaderPathName->Buffer[(OsLoaderPathName->Length / sizeof(WCHAR)) - 1] == OBJ_NAME_PATH_SEPARATOR) + { + OsLoaderPathName->Length -= sizeof(WCHAR); + OsLoaderPathName->Buffer[OsLoaderPathName->Length / sizeof(WCHAR)] = UNICODE_NULL; + } + + /* Then, write down data */ + Status = ZwSetValueKey(KeyHandle, + &KeyName, + 0, + REG_SZ, + OsLoaderPathName->Buffer, + OsLoaderPathName->Length + sizeof(WCHAR)); + if (!NT_SUCCESS(Status)) + { + DPRINT("Failed writing OsLoaderPath value!\n"); + } + + /* We're finally done! */ + ObCloseHandle(KeyHandle, KernelMode); +} + /* PUBLIC FUNCTIONS ***********************************************************/ /*

1 0

[pschweitzer] 49042: [NTOSKRNL] Don't ignore IopCreateArcNames() return while booting. At the moment, it's just returning STATUS_SUCCES but it will be changed later.
by pschweitzer＠svn.reactos.org 07 Oct '10

07 Oct '10

Author: pschweitzer Date: Thu Oct 7 19:58:22 2010 New Revision: 49042 URL: http://svn.reactos.org/svn/reactos?rev=49042&view=rev Log: [NTOSKRNL] Don't ignore IopCreateArcNames() return while booting. At the moment, it's just returning STATUS_SUCCES but it will be changed later. Modified: trunk/reactos/ntoskrnl/io/iomgr/iomgr.c Modified: trunk/reactos/ntoskrnl/io/iomgr/iomgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iomgr.c?… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/iomgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/iomgr.c [iso-8859-1] Thu Oct 7 19:58:22 2010 @@ -507,7 +507,7 @@ } /* Create ARC names for boot devices */ - IopCreateArcNames(LoaderBlock); + if (!NT_SUCCESS(IopCreateArcNames(LoaderBlock))) return FALSE; /* Mark the system boot partition */ if (!IopMarkBootPartition(LoaderBlock)) return FALSE;

1 0

[ekohl] 49041: Fix indentation. No code changes.
by ekohl＠svn.reactos.org 07 Oct '10

07 Oct '10

Author: ekohl Date: Thu Oct 7 19:58:04 2010 New Revision: 49041 URL: http://svn.reactos.org/svn/reactos?rev=49041&view=rev Log: Fix indentation. No code changes. Modified: trunk/reactos/lib/rtl/bootdata.c Modified: trunk/reactos/lib/rtl/bootdata.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/bootdata.c?rev=490… ============================================================================== --- trunk/reactos/lib/rtl/bootdata.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/bootdata.c [iso-8859-1] Thu Oct 7 19:58:04 2010 @@ -541,9 +541,7 @@ */ NTSTATUS NTAPI -RtlCreateSystemVolumeInformationFolder( - IN PUNICODE_STRING VolumeRootPath - ) +RtlCreateSystemVolumeInformationFolder(IN PUNICODE_STRING VolumeRootPath) { OBJECT_ATTRIBUTES ObjectAttributes; IO_STATUS_BLOCK IoStatusBlock; @@ -679,8 +677,8 @@ NTAPI RtlCreateBootStatusDataFile(VOID) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; } /* @@ -688,17 +686,15 @@ */ NTSTATUS NTAPI -RtlGetSetBootStatusData( - HANDLE Filehandle, - BOOLEAN WriteMode, - DWORD DataClass, - PVOID Buffer, - ULONG BufferSize, - DWORD DataClass2 - ) +RtlGetSetBootStatusData(HANDLE Filehandle, + BOOLEAN WriteMode, + DWORD DataClass, + PVOID Buffer, + ULONG BufferSize, + DWORD DataClass2) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; } /* @@ -706,12 +702,10 @@ */ NTSTATUS NTAPI -RtlLockBootStatusData( - OUT PHANDLE Filehandle - ) +RtlLockBootStatusData(OUT PHANDLE Filehandle) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; } /* @@ -719,12 +713,10 @@ */ NTSTATUS NTAPI -RtlUnlockBootStatusData( - IN HANDLE Filehandle - ) +RtlUnlockBootStatusData(IN HANDLE Filehandle) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; } /* EOF */

1 0

[pschweitzer] 49040: [FREELDR] Fix CDs checksum computation [NTOSKRNL] Fix ARC names accordingly
by pschweitzer＠svn.reactos.org 07 Oct '10

07 Oct '10

Author: pschweitzer Date: Thu Oct 7 19:16:09 2010 New Revision: 49040 URL: http://svn.reactos.org/svn/reactos?rev=49040&view=rev Log: [FREELDR] Fix CDs checksum computation [NTOSKRNL] Fix ARC names accordingly Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c trunk/reactos/ntoskrnl/io/iomgr/arcname.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c [iso-8859-1] Thu Oct 7 19:16:09 2010 @@ -1004,6 +1004,7 @@ /* Calculate the MBR checksum */ for (i = 0; i < 2048 / sizeof(ULONG); i++) Checksum += Buffer[i]; + Checksum = ~Checksum + 1; DPRINTM(DPRINT_HWDETECT, "Checksum: %x\n", Checksum); /* Fill out the ARC disk block */ Modified: trunk/reactos/ntoskrnl/io/iomgr/arcname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/arcname.… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/arcname.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/arcname.c [iso-8859-1] Thu Oct 7 19:16:09 2010 @@ -368,7 +368,7 @@ ARC_DISK_SIGNATURE, ListEntry); /* And check if checksums and arc names match */ - if (CheckSum == ArcDiskEntry->CheckSum && + if (CheckSum + ArcDiskEntry->CheckSum == 0 && strcmp(KeLoaderBlock->ArcBootDeviceName, ArcDiskEntry->ArcName) == 0) { IsBootCdRom = TRUE;

1 0

[gadamopoulos] 49039: [win32k] - Fix an ancient FIXME in PATH_PathToRegion
by gadamopoulos＠svn.reactos.org 07 Oct '10

07 Oct '10

Author: gadamopoulos Date: Thu Oct 7 19:14:49 2010 New Revision: 49039 URL: http://svn.reactos.org/svn/reactos?rev=49039&view=rev Log: [win32k] - Fix an ancient FIXME in PATH_PathToRegion Modified: trunk/reactos/subsystems/win32/win32k/objects/path.c Modified: trunk/reactos/subsystems/win32/win32k/objects/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/path.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/path.c [iso-8859-1] Thu Oct 7 19:14:49 2010 @@ -1062,14 +1062,17 @@ PATH_FlattenPath ( pPath ); - /* FIXME: What happens when number of points is zero? */ - /* First pass: Find out how many strokes there are in the path */ /* FIXME: We could eliminate this with some bookkeeping in GdiPath */ numStrokes=0; for(i=0; i<pPath->numEntriesUsed; i++) if((pPath->pFlags[i] & ~PT_CLOSEFIGURE) == PT_MOVETO) numStrokes++; + + if(numStrokes == 0) + { + return FALSE; + } /* Allocate memory for number-of-points-in-stroke array */ pNumPointsInStroke = ExAllocatePoolWithTag(PagedPool, sizeof(ULONG) * numStrokes, TAG_PATH);

1 0

[cfinck] 49038: - Change the version to 0.3.12 - Set "Angelus_02_ROSWP.bmp" as the default wallpaper - Add a shortcut to RApps to the Desktop
by cfinck＠svn.reactos.org 07 Oct '10

07 Oct '10

Author: cfinck Date: Thu Oct 7 18:31:36 2010 New Revision: 49038 URL: http://svn.reactos.org/svn/reactos?rev=49038&view=rev Log: - Change the version to 0.3.12 - Set "Angelus_02_ROSWP.bmp" as the default wallpaper - Add a shortcut to RApps to the Desktop Modified: branches/ros-branch-0_3_12/reactos/base/shell/explorer/res/logov.bmp branches/ros-branch-0_3_12/reactos/boot/bootdata/hivedef_i386.inf branches/ros-branch-0_3_12/reactos/dll/win32/syssetup/install.c branches/ros-branch-0_3_12/reactos/include/reactos/version.h Modified: branches/ros-branch-0_3_12/reactos/base/shell/explorer/res/logov.bmp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_12/reactos/base/… ============================================================================== Binary files - no diff available. Modified: branches/ros-branch-0_3_12/reactos/boot/bootdata/hivedef_i386.inf URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_12/reactos/boot/… ============================================================================== Binary files - no diff available. Modified: branches/ros-branch-0_3_12/reactos/dll/win32/syssetup/install.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_12/reactos/dll/w… ============================================================================== --- branches/ros-branch-0_3_12/reactos/dll/win32/syssetup/install.c [iso-8859-1] (original) +++ branches/ros-branch-0_3_12/reactos/dll/win32/syssetup/install.c [iso-8859-1] Thu Oct 7 18:31:36 2010 @@ -760,6 +760,7 @@ /* Create desktop shortcuts */ CreateShortcut(CSIDL_DESKTOP, NULL, IDS_SHORT_CMD, _T("%SystemRoot%\\system32\\cmd.exe"), IDS_CMT_CMD, TRUE); + CreateShortcut(CSIDL_DESKTOP, NULL, IDS_SHORT_DOWNLOADER, _T("%SystemRoot%\\system32\\rapps.exe"), IDS_CMT_DOWNLOADER, TRUE); /* Create program startmenu shortcuts */ CreateShortcut(CSIDL_PROGRAMS, NULL, IDS_SHORT_EXPLORER, _T("%SystemRoot%\\explorer.exe"), IDS_CMT_EXPLORER, TRUE); Modified: branches/ros-branch-0_3_12/reactos/include/reactos/version.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_12/reactos/inclu… ============================================================================== --- branches/ros-branch-0_3_12/reactos/include/reactos/version.h [iso-8859-1] (original) +++ branches/ros-branch-0_3_12/reactos/include/reactos/version.h [iso-8859-1] Thu Oct 7 18:31:36 2010 @@ -18,13 +18,13 @@ #define __VERSION_H #define KERNEL_VERSION_MAJOR 0 -#define KERNEL_VERSION_MINOR 4 -#define KERNEL_VERSION_PATCH_LEVEL 0 +#define KERNEL_VERSION_MINOR 3 +#define KERNEL_VERSION_PATCH_LEVEL 12 #define COPYRIGHT_YEAR "2010" /* KERNEL_VERSION_BUILD_TYPE is L"SVN", L"RC1", L"RC2" or L"" (for the release) */ -#define KERNEL_VERSION_BUILD_TYPE L"SVN" +#define KERNEL_VERSION_BUILD_TYPE L"" #endif

1 0

[sir_richard] 49037: [NTOS]: Fix copy/paste error.
by sir_richard＠svn.reactos.org 07 Oct '10

07 Oct '10

Author: sir_richard Date: Thu Oct 7 17:41:20 2010 New Revision: 49037 URL: http://svn.reactos.org/svn/reactos?rev=49037&view=rev Log: [NTOS]: Fix copy/paste error. Modified: trunk/reactos/ntoskrnl/mm/marea.c Modified: trunk/reactos/ntoskrnl/mm/marea.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/marea.c?rev=49… ============================================================================== --- trunk/reactos/ntoskrnl/mm/marea.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/marea.c [iso-8859-1] Thu Oct 7 17:41:20 2010 @@ -373,9 +373,6 @@ Vad = ExAllocatePoolWithTag(NonPagedPool, sizeof(MMVAD), 'Fake'); ASSERT(Vad); RtlZeroMemory(Vad, sizeof(MMVAD)); - EndingAddress = (((ULONG_PTR)PBaseAddress + PRegionSize - 1) | (PAGE_SIZE - 1)); - StartingAddress = (ULONG_PTR)PAGE_ALIGN(PBaseAddress); - Vad->StartingVpn = PAGE_ROUND_DOWN(marea->StartingAddress) >> PAGE_SHIFT; /* * For some strange reason, it is perfectly valid to create a MAREA from 0x1000 to... 0x1000.

1 0

[sir_richard] 49036: [NTOS]: Hackfix a hack. Should get rid of the recent VAD assert in user32/bpp changes.
by sir_richard＠svn.reactos.org 07 Oct '10

07 Oct '10

Author: sir_richard Date: Thu Oct 7 17:35:25 2010 New Revision: 49036 URL: http://svn.reactos.org/svn/reactos?rev=49036&view=rev Log: [NTOS]: Hackfix a hack. Should get rid of the recent VAD assert in user32/bpp changes. Modified: trunk/reactos/ntoskrnl/mm/marea.c Modified: trunk/reactos/ntoskrnl/mm/marea.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/marea.c?rev=49… ============================================================================== --- trunk/reactos/ntoskrnl/mm/marea.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/marea.c [iso-8859-1] Thu Oct 7 17:35:25 2010 @@ -373,12 +373,23 @@ Vad = ExAllocatePoolWithTag(NonPagedPool, sizeof(MMVAD), 'Fake'); ASSERT(Vad); RtlZeroMemory(Vad, sizeof(MMVAD)); + EndingAddress = (((ULONG_PTR)PBaseAddress + PRegionSize - 1) | (PAGE_SIZE - 1)); + StartingAddress = (ULONG_PTR)PAGE_ALIGN(PBaseAddress); + Vad->StartingVpn = PAGE_ROUND_DOWN(marea->StartingAddress) >> PAGE_SHIFT; - Vad->EndingVpn = PAGE_ROUND_DOWN((ULONG_PTR)marea->EndingAddress - 1) >> PAGE_SHIFT; - if (Vad->EndingVpn < Vad->StartingVpn) - { - DPRINT1("Building a broken VAD. Data: %p %p %lx %lx\n", marea->StartingAddress, marea->EndingAddress, Vad->StartingVpn, Vad->EndingVpn); - } + /* + * For some strange reason, it is perfectly valid to create a MAREA from 0x1000 to... 0x1000. + * In a normal OS/Memory Manager, this would be retarded, but ReactOS allows this (how it works + * I don't even want to know). + */ + if (marea->EndingAddress != marea->StartingAddress) + { + Vad->EndingVpn = PAGE_ROUND_DOWN((ULONG_PTR)marea->EndingAddress - 1) >> PAGE_SHIFT; + } + else + { + Vad->EndingVpn = Vad->StartingVpn; + } Vad->u.VadFlags.Spare = 1; Vad->u.VadFlags.PrivateMemory = 1; MiInsertVad(Vad, MmGetAddressSpaceOwner(AddressSpace));

1 0

← Newer
1
...
32
33
34
35
36
37
38
...
44
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2010