Ros-diffs

ros-diffs@reactos.org

81390 discussions

[jgardou] 54390: [NTOSKRNL/MM] - ensure that all callers of MM providing an user land address also provide a process. - ASSERT about that - Fix broken check
by jgardou＠svn.reactos.org 15 Nov '11

15 Nov '11

Author: jgardou Date: Tue Nov 15 22:34:04 2011 New Revision: 54390 URL: http://svn.reactos.org/svn/reactos?rev=54390&view=rev Log: [NTOSKRNL/MM] - ensure that all callers of MM providing an user land address also provide a process. - ASSERT about that - Fix broken check Modified: trunk/reactos/ntoskrnl/mm/i386/page.c trunk/reactos/ntoskrnl/mm/section.c Modified: trunk/reactos/ntoskrnl/mm/i386/page.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/i386/page.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/mm/i386/page.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/i386/page.c [iso-8859-1] Tue Nov 15 22:34:04 2011 @@ -209,18 +209,59 @@ ULONG Entry; PULONG Pt, PageDir; - if (Address < MmSystemRangeStart && Process && Process != PsGetCurrentProcess()) - { - PageDir = MmCreateHyperspaceMapping(PTE_TO_PFN(Process->Pcb.DirectoryTableBase[0])); - if (PageDir == NULL) - { - KeBugCheck(MEMORY_MANAGEMENT); - } - if (0 == InterlockedCompareExchangePte(&PageDir[PdeOffset], 0, 0)) + if (Address < MmSystemRangeStart) + { + /* We should have a process for user land addresses */ + ASSERT(Process != NULL); + + if(Process != PsGetCurrentProcess()) + { + PageDir = MmCreateHyperspaceMapping(PTE_TO_PFN(Process->Pcb.DirectoryTableBase[0])); + if (PageDir == NULL) + { + KeBugCheck(MEMORY_MANAGEMENT); + } + if (0 == InterlockedCompareExchangePte(&PageDir[PdeOffset], 0, 0)) + { + if (Create == FALSE) + { + MmDeleteHyperspaceMapping(PageDir); + return NULL; + } + MI_SET_USAGE(MI_USAGE_LEGACY_PAGE_DIRECTORY); + if (Process) MI_SET_PROCESS2(Process->ImageFileName); + if (!Process) MI_SET_PROCESS2("Kernel Legacy"); + Status = MmRequestPageMemoryConsumer(MC_SYSTEM, FALSE, &Pfn); + if (!NT_SUCCESS(Status) || Pfn == 0) + { + KeBugCheck(MEMORY_MANAGEMENT); + } + Entry = InterlockedCompareExchangePte(&PageDir[PdeOffset], PFN_TO_PTE(Pfn) | PA_PRESENT | PA_READWRITE | PA_USER, 0); + if (Entry != 0) + { + MmReleasePageMemoryConsumer(MC_SYSTEM, Pfn); + Pfn = PTE_TO_PFN(Entry); + } + } + else + { + Pfn = PTE_TO_PFN(PageDir[PdeOffset]); + } + MmDeleteHyperspaceMapping(PageDir); + Pt = MmCreateHyperspaceMapping(Pfn); + if (Pt == NULL) + { + KeBugCheck(MEMORY_MANAGEMENT); + } + DPRINT1("Pt : %p, *pt %x, ret %p, *ret %x\n", Pt, *Pt, (char*)Pt + ADDR_TO_PTE_OFFSET(Address), *((char*)Pt + ADDR_TO_PTE_OFFSET(Address))); + return Pt + MiAddressToPteOffset(Address); + } + /* This is for our process */ + PageDir = (PULONG)MiAddressToPde(Address); + if (0 == InterlockedCompareExchangePte(PageDir, 0, 0)) { if (Create == FALSE) { - MmDeleteHyperspaceMapping(PageDir); return NULL; } MI_SET_USAGE(MI_USAGE_LEGACY_PAGE_DIRECTORY); @@ -231,25 +272,16 @@ { KeBugCheck(MEMORY_MANAGEMENT); } - Entry = InterlockedCompareExchangePte(&PageDir[PdeOffset], PFN_TO_PTE(Pfn) | PA_PRESENT | PA_READWRITE | PA_USER, 0); + Entry = InterlockedCompareExchangePte(PageDir, PFN_TO_PTE(Pfn) | PA_PRESENT | PA_READWRITE | PA_USER, 0); if (Entry != 0) { MmReleasePageMemoryConsumer(MC_SYSTEM, Pfn); - Pfn = PTE_TO_PFN(Entry); } } - else - { - Pfn = PTE_TO_PFN(PageDir[PdeOffset]); - } - MmDeleteHyperspaceMapping(PageDir); - Pt = MmCreateHyperspaceMapping(Pfn); - if (Pt == NULL) - { - KeBugCheck(MEMORY_MANAGEMENT); - } - return Pt + ADDR_TO_PTE_OFFSET(Address); - } + return (PULONG)MiAddressToPte(Address); + } + + /* This is for kernel land address */ PageDir = (PULONG)MiAddressToPde(Address); if (0 == InterlockedCompareExchangePte(PageDir, 0, 0)) { @@ -282,23 +314,7 @@ } else { - if (Create == FALSE) - { - return NULL; - } - MI_SET_USAGE(MI_USAGE_LEGACY_PAGE_DIRECTORY); - if (Process) MI_SET_PROCESS2(Process->ImageFileName); - if (!Process) MI_SET_PROCESS2("Kernel Legacy"); - Status = MmRequestPageMemoryConsumer(MC_SYSTEM, FALSE, &Pfn); - if (!NT_SUCCESS(Status) || Pfn == 0) - { - KeBugCheck(MEMORY_MANAGEMENT); - } - Entry = InterlockedCompareExchangePte(PageDir, PFN_TO_PTE(Pfn) | PA_PRESENT | PA_READWRITE | PA_USER, 0); - if (Entry != 0) - { - MmReleasePageMemoryConsumer(MC_SYSTEM, Pfn); - } + } } return (PULONG)MiAddressToPte(Address); @@ -370,8 +386,11 @@ { Pte = *Pt; } while (Pte != InterlockedCompareExchangePte(Pt, Pte & ~PA_PRESENT, Pte)); + Pte = *Pt; + Pte = InterlockedExchangePte(Pt, Pte & ~((ULONG)PA_PRESENT)); MiFlushTlb(Pt, Address); + WasValid = (PAGE_MASK(Pte) != 0); if (!WasValid) { @@ -769,7 +788,7 @@ PdeOffset = ADDR_TO_PDE_OFFSET(Addr); if (oldPdeOffset != PdeOffset) { - MmUnmapPageTable(Pt); + //MmUnmapPageTable(Pt); Pt = MmGetPageTableForProcess(Process, Addr, TRUE); if (Pt == NULL) { @@ -783,24 +802,14 @@ oldPdeOffset = PdeOffset; Pte = *Pt; - if (PAGE_MASK(Pte) != 0 && !(Pte & PA_PRESENT) && (Pte & 0x800)) + /* There should not be anything valid here */ + if ((Pte & PA_PRESENT) || (Pte & 0x800)) { DPRINT1("Bad PTE %lx\n", Pte); KeBugCheck(MEMORY_MANAGEMENT); } InterlockedExchangePte(Pt, PFN_TO_PTE(Pages[i]) | Attributes); - if (Pte != 0) - { - if (Address > MmSystemRangeStart || - (Pt >= (PULONG)PAGETABLE_MAP && Pt < (PULONG)PAGETABLE_MAP + 1024*1024)) - { - MiFlushTlb(Pt, Address); - } - } - } - if (Addr > Address) - { - MmUnmapPageTable(Pt); + MiFlushTlb(Pt, Addr); } return(STATUS_SUCCESS); 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 [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] Tue Nov 15 22:34:04 2011 @@ -1829,10 +1829,9 @@ DPRINT("MmAccessFaultSectionView(%x, %x, %x, %x)\n", AddressSpace, MemoryArea, Address); /* - * Check if the page has been paged out or has already been set readwrite - */ - if (!MmIsPagePresent(Process, Address) || - MmGetPageProtect(Process, Address) & PAGE_READWRITE) + * Check if the page has already been set readwrite + */ + if (MmGetPageProtect(Process, Address) & PAGE_READWRITE) { DPRINT("Address 0x%.8X\n", Address); return(STATUS_SUCCESS); @@ -1855,7 +1854,7 @@ */ MmLockSectionSegment(Segment); - OldPage = MmGetPfnForProcess(NULL, Address); + OldPage = MmGetPfnForProcess(Process, Address); Entry = MmGetPageEntrySectionSegment(Segment, Offset); MmUnlockSectionSegment(Segment);

1 0

[cgutman] 54389: [NTOSKRNL] - Fix 2 broken failure cases (forgot to detach from process and/or forgot to dereference process)
by cgutman＠svn.reactos.org 15 Nov '11

15 Nov '11

Author: cgutman Date: Tue Nov 15 22:16:57 2011 New Revision: 54389 URL: http://svn.reactos.org/svn/reactos?rev=54389&view=rev Log: [NTOSKRNL] - Fix 2 broken failure cases (forgot to detach from process and/or forgot to dereference process) Modified: trunk/reactos/ntoskrnl/mm/anonmem.c Modified: trunk/reactos/ntoskrnl/mm/anonmem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/anonmem.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/anonmem.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/anonmem.c [iso-8859-1] Tue Nov 15 22:16:57 2011 @@ -683,6 +683,7 @@ { /* Fail without it */ DPRINT1("Privilege not held for MEM_LARGE_PAGES\n"); + if (Attached) KeUnstackDetachProcess(&ApcState); if (ProcessHandle != NtCurrentProcess()) ObDereferenceObject(Process); return STATUS_PRIVILEGE_NOT_HELD; } @@ -701,6 +702,8 @@ (Protect & (PAGE_WRITECOPY | PAGE_EXECUTE_WRITECOPY))) { DPRINT1("Copy on write is not supported by VirtualAlloc\n"); + if (Attached) KeUnstackDetachProcess(&ApcState); + if (ProcessHandle != NtCurrentProcess()) ObDereferenceObject(Process); return STATUS_INVALID_PAGE_PROTECTION; }

1 0

[pschweitzer] 54388: Create branch for students of the Clermont IUT, to work on netsh
by pschweitzer＠svn.reactos.org 15 Nov '11

15 Nov '11

Author: pschweitzer Date: Tue Nov 15 20:56:13 2011 New Revision: 54388 URL: http://svn.reactos.org/svn/reactos?rev=54388&view=rev Log: Create branch for students of the Clermont IUT, to work on netsh Added: branches/iut-netsh/ (props changed) - copied from r54387, trunk/reactos/ Propchange: branches/iut-netsh/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Tue Nov 15 20:56:13 2011 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: branches/iut-netsh/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: branches/iut-netsh/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: branches/iut-netsh/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Tue Nov 15 20:56:13 2011 @@ -1,0 +1,14 @@ +*.iso +makefile.auto +makefile-*.auto +config-*.rbuild +obj-* +output-* +reactos +reactos.* +RosBE-Logs +*.sln +*.ncb +*.suo +versionreport.xml +config.rbuild Propchange: branches/iut-netsh/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Tue Nov 15 20:56:13 2011 @@ -1,0 +1,12 @@ +/branches/GSoC_2011/GSoC_Network:51548 +/branches/GSoC_2011/GSoC_TcpIpDriver:51550 +/branches/GSoC_2011/TcpIpDriver:51551-53074,53076-53119 +/branches/GSoC_Network:51545-51546 +/branches/cmake-bringup:50484,50693,50719,51544-52564 +/branches/header-work:45691-47721 +/branches/reactos-yarotows:45219-46371,46373-48025,48027-49273 +/branches/reactx/reactos:49994-49995 +/branches/ros-amd64-bringup:36852 +/branches/ros-amd64-bringup/reactos:34711-34712,34741,34743,34770,34780-34782,34803,34812,34839,34842,34864,34870,34874,34877,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35655,35683,35739,35746,35762,35771,35777,35781,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36011-36013,36172,36360,36380,36388-36389,36393,36397,36443,36445,36475,36502-36503,36505,36570,36614,36852,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36987-36988,36990,36992,37019,37322-37323,37333-37334,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38092,38100,38148-38151,38264-38265,38268,38355,39151,39333,39335,39345,39639,40120,40122-40123,40125,40127-40128,40155,40247,40324,40608,40753,40926-40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41070,41082-41086,41097-41098,41101,41449,41479-41480,41483-41485,41499-41500,41502,41531,41536,41540,41546-41547,41549,43080,43426,43451,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43836,43838-43840,43852,43857-43858,43860,43905-43907,43952,43954,43965,43969,43979,43981,43992,44002,44036-44037,44039-44040,44044-44045,44053,44065,44095,44123,44143-44144,44205,44238,44257,44259,44294,44338-44339,44385,44389,44391,44426,44460,44467-44468,44470-44471,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44634,44639,44772,44818,45124,45126-45127,45430,46394,46404,46478,46511,46523-46524,46526,46534-46535,46537-46539,46589,46805,46868,47472,47846-47847,47878,47882 +/branches/shell32_new-bringup:51893-53652,53661,53700 +/branches/tcp-rewrite-branch:48720,48840-48841,49424-49426,49454 Propchange: branches/iut-netsh/ ------------------------------------------------------------------------------ tsvn:logminsize = 10

1 0

[cgutman] 54387: [NDIS] - Implement NdisPciAssignResources
by cgutman＠svn.reactos.org 15 Nov '11

15 Nov '11

Author: cgutman Date: Tue Nov 15 18:41:34 2011 New Revision: 54387 URL: http://svn.reactos.org/svn/reactos?rev=54387&view=rev Log: [NDIS] - Implement NdisPciAssignResources Modified: trunk/reactos/drivers/network/ndis/ndis/30stubs.c trunk/reactos/drivers/network/ndis/ndis/hardware.c Modified: trunk/reactos/drivers/network/ndis/ndis/30stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/30stubs.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/30stubs.c [iso-8859-1] Tue Nov 15 18:41:34 2011 @@ -73,24 +73,6 @@ /* * @unimplemented */ -NDIS_STATUS -EXPORT -NdisPciAssignResources( - IN NDIS_HANDLE NdisMacHandle, - IN NDIS_HANDLE NdisWrapperHandle, - IN NDIS_HANDLE WrapperConfigurationContext, - IN ULONG SlotNumber, - OUT PNDIS_RESOURCE_LIST *AssignedResources) -{ - UNIMPLEMENTED - - return NDIS_STATUS_FAILURE; -} - - -/* - * @unimplemented - */ VOID EXPORT NdisReadBindingInformation ( Modified: trunk/reactos/drivers/network/ndis/ndis/hardware.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/hardware.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/hardware.c [iso-8859-1] Tue Nov 15 18:41:34 2011 @@ -78,7 +78,25 @@ return NDIS_STATUS_SUCCESS; } - +/* + * @implemented + */ +NDIS_STATUS +EXPORT +NdisPciAssignResources( + IN NDIS_HANDLE NdisMacHandle, + IN NDIS_HANDLE NdisWrapperHandle, + IN NDIS_HANDLE WrapperConfigurationContext, + IN ULONG SlotNumber, + OUT PNDIS_RESOURCE_LIST *AssignedResources) +{ + PNDIS_WRAPPER_CONTEXT WrapperContext = (PNDIS_WRAPPER_CONTEXT)WrapperConfigurationContext; + PLOGICAL_ADAPTER Adapter = WrapperContext->DeviceObject->DeviceExtension; + + return NdisMPciAssignResources(Adapter, + SlotNumber, + AssignedResources); +} /* * @implemented */

1 0

[jgardou] 54386: [NTOSKRNL/MM] - call mm functions with a process, when we have one. - Fix potential rounding issues - Add some sanity ASSERTs - You never use enough brackets ; -)
by jgardou＠svn.reactos.org 15 Nov '11

15 Nov '11

Author: jgardou Date: Tue Nov 15 18:36:26 2011 New Revision: 54386 URL: http://svn.reactos.org/svn/reactos?rev=54386&view=rev Log: [NTOSKRNL/MM] - call mm functions with a process, when we have one. - Fix potential rounding issues - Add some sanity ASSERTs - You never use enough brackets ;-) Modified: trunk/reactos/ntoskrnl/mm/anonmem.c trunk/reactos/ntoskrnl/mm/freelist.c trunk/reactos/ntoskrnl/mm/marea.c trunk/reactos/ntoskrnl/mm/pagefile.c Modified: trunk/reactos/ntoskrnl/mm/anonmem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/anonmem.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/anonmem.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/anonmem.c [iso-8859-1] Tue Nov 15 18:36:26 2011 @@ -183,7 +183,7 @@ * address space when another thread could load the page so we check * that. */ - if (MmIsPagePresent(NULL, Address)) + if (MmIsPagePresent(Process, Address)) { return(STATUS_SUCCESS); } @@ -301,7 +301,7 @@ /* * Handle swapped out pages. */ - if (MmIsPageSwapEntry(NULL, Address)) + if (MmIsPageSwapEntry(Process, Address)) { SWAPENTRY SwapEntry; @@ -327,7 +327,7 @@ { MmUnlockAddressSpace(AddressSpace); Status = MmCreateVirtualMapping(Process, - Address, + (PVOID)PAGE_ROUND_DOWN(Address), Region->Protect, &Page, 1); Modified: trunk/reactos/ntoskrnl/mm/freelist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/freelist.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/mm/freelist.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/freelist.c [iso-8859-1] Tue Nov 15 18:36:26 2011 @@ -92,6 +92,7 @@ /* Set the page as a user page */ ASSERT(Pfn != 0); ASSERT_IS_ROS_PFN(MiGetPfnEntry(Pfn)); + ASSERT(!RtlCheckBit(&MiUserPfnBitMap, (ULONG)Pfn)); OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); RtlSetBit(&MiUserPfnBitMap, (ULONG)Pfn); KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); @@ -123,6 +124,7 @@ /* Unset the page as a user page */ ASSERT(Page != 0); ASSERT_IS_ROS_PFN(MiGetPfnEntry(Page)); + ASSERT(RtlCheckBit(&MiUserPfnBitMap, (ULONG)Page)); RtlClearBit(&MiUserPfnBitMap, (ULONG)Page); } Modified: trunk/reactos/ntoskrnl/mm/marea.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/marea.c?rev=54… ============================================================================== --- trunk/reactos/ntoskrnl/mm/marea.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/marea.c [iso-8859-1] Tue Nov 15 18:36:26 2011 @@ -893,7 +893,7 @@ Granularity = (MEMORY_AREA_VIRTUAL_MEMORY == Type ? MM_VIRTMEM_GRANULARITY : PAGE_SIZE); if ((*BaseAddress) == 0 && !FixedAddress) { - tmpLength = PAGE_ROUND_UP(Length); + tmpLength = (ULONG_PTR)MM_ROUND_UP(Length, Granularity); *BaseAddress = MmFindGap(AddressSpace, tmpLength, Granularity, @@ -908,6 +908,7 @@ { tmpLength = Length + ((ULONG_PTR) *BaseAddress - (ULONG_PTR) MM_ROUND_DOWN(*BaseAddress, Granularity)); + tmpLength = (ULONG_PTR)MM_ROUND_UP(tmpLength, Granularity); *BaseAddress = MM_ROUND_DOWN(*BaseAddress, Granularity); if (!MmGetAddressSpaceOwner(AddressSpace) && *BaseAddress < MmSystemRangeStart) @@ -986,6 +987,8 @@ { ULONG i; NTSTATUS Status; + + ASSERT(((ULONG_PTR)BaseAddress % PAGE_SIZE) == 0); for (i = 0; i < PAGE_ROUND_UP(Length) / PAGE_SIZE; i++) { 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 [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/pagefile.c [iso-8859-1] Tue Nov 15 18:36:26 2011 @@ -113,7 +113,7 @@ */ #define FILE_FROM_ENTRY(i) ((i) & 0x0f) #define OFFSET_FROM_ENTRY(i) ((i) >> 11) -#define ENTRY_FROM_FILE_OFFSET(i, j) ((i) | (j) << 11 | 0x400) +#define ENTRY_FROM_FILE_OFFSET(i, j) ((i) | ((j) << 11) | 0x400) static BOOLEAN MmSwapSpaceMessage = FALSE;

1 0

[rharabien] 54385: [KBDTOOL] - Fix build under MSVC
by rharabien＠svn.reactos.org 15 Nov '11

15 Nov '11

Author: rharabien Date: Tue Nov 15 11:07:31 2011 New Revision: 54385 URL: http://svn.reactos.org/svn/reactos?rev=54385&view=rev Log: [KBDTOOL] - Fix build under MSVC Modified: trunk/reactos/tools/kbdtool/kbdtool.h trunk/reactos/tools/kbdtool/main.c Modified: trunk/reactos/tools/kbdtool/kbdtool.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/kbdtool/kbdtool.h?re… ============================================================================== --- trunk/reactos/tools/kbdtool/kbdtool.h [iso-8859-1] (original) +++ trunk/reactos/tools/kbdtool/kbdtool.h [iso-8859-1] Tue Nov 15 11:07:31 2011 @@ -12,7 +12,6 @@ #include <stdarg.h> #include <stdio.h> #include <stdlib.h> -#include <getopt.h> #include <time.h> #include <typedefs.h> Modified: trunk/reactos/tools/kbdtool/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/kbdtool/main.c?rev=5… ============================================================================== --- trunk/reactos/tools/kbdtool/main.c [iso-8859-1] (original) +++ trunk/reactos/tools/kbdtool/main.c [iso-8859-1] Tue Nov 15 11:07:31 2011 @@ -61,98 +61,100 @@ main(INT argc, PCHAR* argv) { - ULONG ErrorCode, FailureCode; + ULONG i, ErrorCode, FailureCode; CHAR Option; PCHAR OpenFlags; CHAR BuildOptions[16] = {0}; /* Loop for parameter */ - while (TRUE) - { - /* Get the options */ - Option = getopt(argc, argv, "aAeEiIkKmMnNOosSuUvVwWxX?"); - if (Option != -1) + for (i = 1; i < argc; ++i) + { + if (argv[i][0] != '/' && argv[i][0] != '-') + break; + + if (argv[i][1] && !argv[i][2]) + Option = argv[i][1]; + else + Option = 0; + + /* Check supported options */ + switch (Option) { - /* Check supported options */ - switch (Option) - { - /* ASCII File */ - case 'A': - case 'a': - UnicodeFile = 0; - continue; - - /* UNICODE File */ - case 'U': - case 'u': - UnicodeFile = 1; - continue; - - /* Verbose */ - case 'V': - case 'v': - Verbose = 1; - continue; - - /* No logo */ - case 'N': - case 'n': - NoLogo = 1; - continue; - - /* Fallback driver */ - case 'K': - case 'k': - FallbackDriver = 1; - continue; - - /* Sanity Check */ - case 'W': - case 'w': - SanityCheck = 1; - continue; - - /* Itanium */ - case 'I': - case 'i': - BuildType = 1; - continue; - - /* X86 */ - case 'X': - case 'x': - BuildType = 0; - continue; - - /* AMD64 */ - case 'M': - case 'm': - BuildType = 2; - continue; - - /* WOW64 */ - case 'O': - case 'o': - BuildType = 3; - continue; - - /* Source only */ - case 'S': - case 's': - SourceOnly = 1; - continue; - default: - break; - } - - /* If you got here, the options are invalid or missing */ - PrintUsage(); + /* ASCII File */ + case 'A': + case 'a': + UnicodeFile = 0; + break; + + /* UNICODE File */ + case 'U': + case 'u': + UnicodeFile = 1; + break; + + /* Verbose */ + case 'V': + case 'v': + Verbose = 1; + break; + + /* No logo */ + case 'N': + case 'n': + NoLogo = 1; + break; + + /* Fallback driver */ + case 'K': + case 'k': + FallbackDriver = 1; + break; + + /* Sanity Check */ + case 'W': + case 'w': + SanityCheck = 1; + break; + + /* Itanium */ + case 'I': + case 'i': + BuildType = 1; + break; + + /* X86 */ + case 'X': + case 'x': + BuildType = 0; + break; + + /* AMD64 */ + case 'M': + case 'm': + BuildType = 2; + break; + + /* WOW64 */ + case 'O': + case 'o': + BuildType = 3; + break; + + /* Source only */ + case 'S': + case 's': + SourceOnly = 1; + break; + + default: + /* If you got here, the options are invalid or missing */ + PrintUsage(); + break; } - break; } /* Do we have no options? */ - if (optind == argc) PrintUsage(); + if (i == argc) PrintUsage(); /* Should we announce ourselves? */ if (!NoLogo) @@ -161,9 +163,9 @@ printf("\nKbdTool v%d.%02d - convert keyboard text file to C file or a keyboard layout DLL\n\n", gVersion, gSubVersion); } - + /* Save the file name */ - gpszFileName = argv[optind]; + gpszFileName = argv[i]; /* Open either as binary or text */ OpenFlags = "rb";

1 0

[rharabien] 54384: [SYSSETUP] - Don't redefine constants from psdk in source files - Improve error message
by rharabien＠svn.reactos.org 15 Nov '11

15 Nov '11

Author: rharabien Date: Tue Nov 15 08:59:50 2011 New Revision: 54384 URL: http://svn.reactos.org/svn/reactos?rev=54384&view=rev Log: [SYSSETUP] - Don't redefine constants from psdk in source files - Improve error message Modified: trunk/reactos/dll/win32/syssetup/install.c Modified: trunk/reactos/dll/win32/syssetup/install.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/install… ============================================================================== --- trunk/reactos/dll/win32/syssetup/install.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/install.c [iso-8859-1] Tue Nov 15 08:59:50 2011 @@ -737,7 +737,7 @@ cleanup: MessageBoxW( NULL, - L"You can shutdown your computer, or press ENTER to reboot", + L"Failed to load LiveCD! You can shutdown your computer, or press ENTER to reboot.", L"ReactOS LiveCD", MB_OK); return 0; @@ -958,7 +958,7 @@ PROFILEINFOW ProfileInfo; HANDLE hToken; BOOL ret; -#define LOGON32_LOGON_NETWORK 3 + ret = LogonUserW(L"Administrator", L"", L"", LOGON32_LOGON_NETWORK, LOGON32_PROVIDER_DEFAULT, &hToken); if (!ret) {

1 0

[rharabien] 54383: [SYSSETUP] - Formatting. No code changes.
by rharabien＠svn.reactos.org 15 Nov '11

15 Nov '11

Author: rharabien Date: Tue Nov 15 08:44:37 2011 New Revision: 54383 URL: http://svn.reactos.org/svn/reactos?rev=54383&view=rev Log: [SYSSETUP] - Formatting. No code changes. Modified: trunk/reactos/dll/win32/syssetup/dllmain.c trunk/reactos/dll/win32/syssetup/globals.h trunk/reactos/dll/win32/syssetup/wizard.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/syssetup/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/dllmain… Modified: trunk/reactos/dll/win32/syssetup/globals.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/globals… Modified: trunk/reactos/dll/win32/syssetup/wizard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/wizard.…

1 0

[cgutman] 54382: [HAL] - Remove broken map register "prefetcher" code - Check that we have enough space to grow our map registers - Fix a bad hint to RtlFindClearBitsAndSet - Queuing the grow work ...
by cgutman＠svn.reactos.org 15 Nov '11

15 Nov '11

Author: cgutman Date: Tue Nov 15 07:58:46 2011 New Revision: 54382 URL: http://svn.reactos.org/svn/reactos?rev=54382&view=rev Log: [HAL] - Remove broken map register "prefetcher" code - Check that we have enough space to grow our map registers - Fix a bad hint to RtlFindClearBitsAndSet - Queuing the grow work item is non-vital; treat it as such - Fixes BSOD with CM3738 and VIA1723 sound cards [bug 6657] Modified: trunk/reactos/hal/halx86/generic/dma.c Modified: trunk/reactos/hal/halx86/generic/dma.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/dma.c?r… ============================================================================== --- trunk/reactos/hal/halx86/generic/dma.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/dma.c [iso-8859-1] Tue Nov 15 07:58:46 2011 @@ -1,4 +1,4 @@ -/* $Id$ +/* * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -221,8 +221,16 @@ KIRQL OldIrql; ULONG MapRegisterCount; - /* FIXME: Check if enough map register slots are available. */ + /* Check if enough map register slots are available. */ MapRegisterCount = BYTES_TO_PAGES(SizeOfMapBuffers); + if (MapRegisterCount + AdapterObject->NumberOfMapRegisters > MAX_MAP_REGISTERS) + { + DPRINT("No more map register slots available! (Current: %d | Requested: %d | Limit: %d)\n", + AdapterObject->NumberOfMapRegisters, + MapRegisterCount, + MAX_MAP_REGISTERS); + return FALSE; + } /* * Allocate memory for the new map registers. For 32-bit adapters we use @@ -599,7 +607,6 @@ OUT PULONG NumberOfMapRegisters) { PADAPTER_OBJECT AdapterObject = NULL; - PADAPTER_OBJECT MasterAdapter; BOOLEAN EisaAdapter; ULONG MapRegisters; ULONG MaximumLength; @@ -711,21 +718,7 @@ if (MapRegisters > 0) { AdapterObject->NeedsMapRegisters = TRUE; - MasterAdapter = HalpMasterAdapter; AdapterObject->MapRegistersPerChannel = MapRegisters; - - /* - * FIXME: Verify that the following makes sense. Actually - * MasterAdapter->NumberOfMapRegisters contains even the number - * of gaps, so this will not work correctly all the time. It - * doesn't matter much since it's only optimization to avoid - * queuing work items in HalAllocateAdapterChannel. - */ - MasterAdapter->CommittedMapRegisters += MapRegisters; - if (MasterAdapter->CommittedMapRegisters > MasterAdapter->NumberOfMapRegisters) - { - HalpGrowMapBuffers(MasterAdapter, 0x10000); - } } else { @@ -1333,24 +1326,19 @@ if (Index == MAXULONG) { + InsertTailList(&MasterAdapter->AdapterQueue, &AdapterObject->AdapterQueue); + WorkItem = ExAllocatePoolWithTag(NonPagedPool, sizeof(GROW_WORK_ITEM), TAG_DMA); - if (!WorkItem) + if (WorkItem) { - KeReleaseSpinLock(&MasterAdapter->SpinLock, OldIrql); - AdapterObject->NumberOfMapRegisters = 0; - IoFreeAdapterChannel(AdapterObject); - return STATUS_INSUFFICIENT_RESOURCES; + ExInitializeWorkItem(&WorkItem->WorkQueueItem, HalpGrowMapBufferWorker, WorkItem); + WorkItem->AdapterObject = AdapterObject; + WorkItem->NumberOfMapRegisters = NumberOfMapRegisters; + + ExQueueWorkItem(&WorkItem->WorkQueueItem, DelayedWorkQueue); } - - InsertTailList(&MasterAdapter->AdapterQueue, &AdapterObject->AdapterQueue); - - ExInitializeWorkItem(&WorkItem->WorkQueueItem, HalpGrowMapBufferWorker, WorkItem); - WorkItem->AdapterObject = AdapterObject; - WorkItem->NumberOfMapRegisters = NumberOfMapRegisters; - - ExQueueWorkItem(&WorkItem->WorkQueueItem, DelayedWorkQueue); KeReleaseSpinLock(&MasterAdapter->SpinLock, OldIrql); @@ -1574,7 +1562,7 @@ Index = RtlFindClearBitsAndSet(MasterAdapter->MapRegisters, AdapterObject->NumberOfMapRegisters, - MasterAdapter->NumberOfMapRegisters); + 0); if (Index == MAXULONG) { InsertHeadList(&MasterAdapter->AdapterQueue, ListEntry);

1 0

[cgutman] 54381: [SERVICES] - Always return ERROR_SUCCESS when ScmWaitForServiceConnect completes successfully instead of sometimes returning ERROR_PIPE_CONNECTED because the callers of this helper...
by cgutman＠svn.reactos.org 15 Nov '11

15 Nov '11

Author: cgutman Date: Tue Nov 15 02:55:44 2011 New Revision: 54381 URL: http://svn.reactos.org/svn/reactos?rev=54381&view=rev Log: [SERVICES] - Always return ERROR_SUCCESS when ScmWaitForServiceConnect completes successfully instead of sometimes returning ERROR_PIPE_CONNECTED because the callers of this helper just look for ERROR_SUCCESS to indicate a successful call Modified: trunk/reactos/base/system/services/database.c Modified: trunk/reactos/base/system/services/database.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/datab… ============================================================================== --- trunk/reactos/base/system/services/database.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/database.c [iso-8859-1] Tue Nov 15 02:55:44 2011 @@ -1514,6 +1514,11 @@ dwError = GetLastError(); DPRINT1("Reading the service control pipe failed (Error %lu)\n", dwError); + } + else + { + dwError = ERROR_SUCCESS; + DPRINT("Read control pipe successfully\n"); } } else

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs