Ros-diffs February 2010

ros-diffs@reactos.org

22 participants
365 discussions

[sir_richard] 45621: [NTOS]: Fix an off-by-one-error which incorrectly causes GUI promotion to fail if the first GUI call is "0", since the limit on the GUI descriptor table will also be "0". We should check if the limit is equal to or lower, not just if it's lower. Thanks to Physicus and Fireball for reporting and working this out. Should fix the "ArwinSS" problem.

by sir_richard＠svn.reactos.org

Author: sir_richard Date: Fri Feb 19 18:54:16 2010 New Revision: 45621 URL: http://svn.reactos.org/svn/reactos?rev=45621&view=rev Log: [NTOS]: Fix an off-by-one-error which incorrectly causes GUI promotion to fail if the first GUI call is "0", since the limit on the GUI descriptor table will also be "0". We should check if the limit is equal to or lower, not just if it's lower. Thanks to Physicus and Fireball for reporting and working this out. Should fix the "ArwinSS" problem. Modified: trunk/reactos/ntoskrnl/ke/i386/traphdlr.c Modified: trunk/reactos/ntoskrnl/ke/i386/traphdlr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/traphdlr.… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/traphdlr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/traphdlr.c [iso-8859-1] Fri Feb 19 18:54:16 2010 @@ -1401,7 +1401,7 @@ DescriptorTable = (PVOID)((ULONG_PTR)Thread->ServiceTable + Offset); /* Validate the system call number */ - if (__builtin_expect(Id > DescriptorTable->Limit, 0)) + if (__builtin_expect(Id >= DescriptorTable->Limit, 0)) { /* Check if this is a GUI call */ if (__builtin_expect(!(Offset & SERVICE_TABLE_TEST), 0))

14 years, 10 months

[sir_richard] 45620: [NTOS]: Fix off-by-one error in MDL locking which caused the last PFN not to be referenced if it was part of a locked MDL, because it was assumed to be "higher than the last PFN". This further caused the entire MDL to be incorrectly treated as an I/O space mapping. Later, when unlocked, the last PFN's reference count would drop to 0, and the virtual memory range that had been locked would now be using a freed page, that would get re-used later. Noticed this bug because my WC

by sir_richard＠svn.reactos.org

Author: sir_richard Date: Fri Feb 19 18:45:10 2010 New Revision: 45620 URL: http://svn.reactos.org/svn/reactos?rev=45620&view=rev Log: [NTOS]: Fix off-by-one error in MDL locking which caused the last PFN not to be referenced if it was part of a locked MDL, because it was assumed to be "higher than the last PFN". This further caused the entire MDL to be incorrectly treated as an I/O space mapping. Later, when unlocked, the last PFN's reference count would drop to 0, and the virtual memory range that had been locked would now be using a freed page, that would get re-used later. Noticed this bug because my WC changes allocation strategies to increase the chance of pages at the end to be used, ans the last PFN was being used a lot due to this. Modified: trunk/reactos/ntoskrnl/mm/ARM3/mdlsup.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/mdlsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/mdlsup.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/mdlsup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/mdlsup.c [iso-8859-1] Fri Feb 19 18:45:10 2010 @@ -954,7 +954,7 @@ // Grab the PFN // PageFrameIndex = PFN_FROM_PTE(PointerPte); - if (PageFrameIndex < MmHighestPhysicalPage) + if (PageFrameIndex <= MmHighestPhysicalPage) { // // Get the PFN entry

14 years, 10 months

[cgutman] 45619: [NTOSKRNL] - Update boot logo copyright year - Patch by Gabriel Ilardi

by cgutman＠svn.reactos.org

Author: cgutman Date: Fri Feb 19 11:30:01 2010 New Revision: 45619 URL: http://svn.reactos.org/svn/reactos?rev=45619&view=rev Log: [NTOSKRNL] - Update boot logo copyright year - Patch by Gabriel Ilardi Modified: trunk/reactos/ntoskrnl/inbv/logo/5.bmp Modified: trunk/reactos/ntoskrnl/inbv/logo/5.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/inbv/logo/5.bmp?r… ============================================================================== Binary files - no diff available.

14 years, 10 months

[cgutman] 45618: [NTOSKRNL] - Put back the boot logo from the old bootvid - Rewrite the old broken progress bar code and enable the progress bar - The progress bar works now :) - NOTE: Someone should fix the copyright year on the boot logo

by cgutman＠svn.reactos.org

Author: cgutman Date: Fri Feb 19 04:16:04 2010 New Revision: 45618 URL: http://svn.reactos.org/svn/reactos?rev=45618&view=rev Log: [NTOSKRNL] - Put back the boot logo from the old bootvid - Rewrite the old broken progress bar code and enable the progress bar - The progress bar works now :) - NOTE: Someone should fix the copyright year on the boot logo Modified: trunk/reactos/ntoskrnl/inbv/inbv.c trunk/reactos/ntoskrnl/inbv/logo/5.bmp Modified: trunk/reactos/ntoskrnl/inbv/inbv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/inbv/inbv.c?rev=4… ============================================================================== --- trunk/reactos/ntoskrnl/inbv/inbv.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/inbv/inbv.c [iso-8859-1] Fri Feb 19 04:16:04 2010 @@ -407,38 +407,28 @@ NTAPI InbvUpdateProgressBar(IN ULONG Progress) { - ULONG FillCount, Left = 0; + ULONG FillCount; /* Make sure the progress bar is enabled, that we own and are installed */ if ((ShowProgressBar) && (InbvBootDriverInstalled) && (InbvDisplayState == INBV_DISPLAY_STATE_OWNED)) { - /* Calculate the fill count */ - FillCount = InbvProgressState.Bias * Progress + InbvProgressState.Floor; - FillCount *= 18; - FillCount /= 10000; - - /* Start fill loop */ - while (FillCount) - { - /* Acquire the lock */ - InbvAcquireLock(); - - /* Fill the progress bar */ - VidSolidColorFill(Left + ProgressBarLeft, - ProgressBarTop, - Left + ProgressBarLeft + 7, - ProgressBarTop + 7, - 11); - - /* Release the lock */ - InbvReleaseLock(); - - /* Update the X position */ - Left += 9; - FillCount--; - } + FillCount = InbvProgressState.Bias * Progress * 121 + InbvProgressState.Floor; + FillCount /= 1000000; + + /* Acquire the lock */ + InbvAcquireLock(); + + /* Fill the progress bar */ + VidSolidColorFill(ProgressBarLeft, + ProgressBarTop, + ProgressBarLeft + FillCount, + ProgressBarTop + 12, + 11); + + /* Release the lock */ + InbvReleaseLock(); } } @@ -613,7 +603,7 @@ /* Is the boot driver installed? */ if (!InbvBootDriverInstalled) return; - /* FIXME: TODO, display full-screen bitmap */ + /* Display full-screen bitmap */ Bitmap = InbvGetResourceAddress(5); if (Bitmap) { @@ -626,6 +616,9 @@ else Top = (480 - BitmapInfoHeader->biHeight) / 2; InbvBitBlt(Bitmap, Left, Top); + + /* Set progress bar coordinates and display it */ + InbvSetProgressBarCoordinates(257, 352); } } Modified: trunk/reactos/ntoskrnl/inbv/logo/5.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/inbv/logo/5.bmp?r… ============================================================================== Binary files - no diff available.

14 years, 10 months

[sir_richard] 45617: [NTOS]: Stop storing the consumer in the PFN, as this value is never actually checked. Clears up yet another misuse of the "real" PFN structure.

by sir_richard＠svn.reactos.org

Author: sir_richard Date: Fri Feb 19 02:58:48 2010 New Revision: 45617 URL: http://svn.reactos.org/svn/reactos?rev=45617&view=rev Log: [NTOS]: Stop storing the consumer in the PFN, as this value is never actually checked. Clears up yet another misuse of the "real" PFN structure. Modified: trunk/reactos/ntoskrnl/mm/freelist.c 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] Fri Feb 19 02:58:48 2010 @@ -29,7 +29,6 @@ // // REACTOS NT // -#define Consumer u3.e1.PageColor #define RmapListHead AweReferenceCount #define SavedSwapEntry u4.EntireFrame #define RemoveEntryList(x) RemoveEntryList((PLIST_ENTRY)x) @@ -59,8 +58,6 @@ MMPFNLIST MmModifiedPageListHead; MMPFNLIST MmModifiedNoWritePageListHead; -/* List of pages allocated to the MC_USER Consumer */ -static LIST_ENTRY UserPageListHead; /* List of pages zeroed by the ZPW (MmZeroPageThreadMain) */ static LIST_ENTRY FreeZeroedPageListHead; /* List of free pages, filled by MmGetReferenceCountPage and @@ -282,7 +279,6 @@ // This PFN is now a used page, set it up // RemoveEntryList(&Pfn1->ListEntry); - Pfn1->Consumer = MC_NPPOOL; Pfn1->u3.e2.ReferenceCount = 1; Pfn1->SavedSwapEntry = 0; @@ -481,7 +477,6 @@ // // Allocate it and mark it // - Pfn1->Consumer = MC_NPPOOL; Pfn1->u3.e1.StartOfAllocation = 1; Pfn1->u3.e1.EndOfAllocation = 1; Pfn1->u3.e2.ReferenceCount = 1; @@ -532,7 +527,6 @@ // // Now setup the page and mark it // - Pfn1->Consumer = MC_NPPOOL; Pfn1->u3.e2.ReferenceCount = 1; Pfn1->u3.e1.StartOfAllocation = 1; Pfn1->u3.e1.EndOfAllocation = 1; @@ -642,43 +636,11 @@ if (!Pfn1) continue; // - // Get the consumer - // - switch (Pfn1->Consumer) - { - case MC_NPPOOL: - - Type = "Nonpaged Pool"; - break; - - case MC_PPOOL: - - Type = "Paged Pool"; - break; - - case MC_CACHE: - - Type = "File System Cache"; - break; - - case MC_USER: - - Type = "Process Working Set"; - break; - - case MC_SYSTEM: - - Type = "System"; - break; - } - - // // Get the type // if (MiIsPfnInUse(Pfn1)) { State = "Used"; - Totals[Pfn1->Consumer]++; } else { @@ -720,13 +682,11 @@ ULONG NrSystemPages = 0; /* Initialize the page lists */ - InitializeListHead(&UserPageListHead); InitializeListHead(&FreeUnzeroedPageListHead); InitializeListHead(&FreeZeroedPageListHead); /* This is what a used page looks like */ RtlZeroMemory(&UsedPage, sizeof(UsedPage)); - UsedPage.Consumer = MC_NPPOOL; UsedPage.u3.e1.PageLocation = ActiveAndValid; UsedPage.u3.e2.ReferenceCount = 1; @@ -784,9 +744,6 @@ /* Finally handle the pages describing the PFN database themselves */ for (i = MxOldFreeDescriptor.BasePage; i < MxFreeDescriptor->BasePage; i++) { - /* Ensure this page was not added previously */ - ASSERT(MmPfnDatabase[0][i].Consumer == 0); - /* Mark it as used kernel memory */ MmPfnDatabase[0][i] = UsedPage; NrSystemPages++; @@ -898,7 +855,6 @@ MiSetConsumer(IN PFN_TYPE Pfn, IN ULONG Type) { - MiGetPfnEntry(Pfn)->Consumer = Type; MiGetPfnEntry(Pfn)->u3.e1.PageLocation = ActiveAndValid; } @@ -966,7 +922,6 @@ PageDescriptor = CONTAINING_RECORD(ListEntry, PHYSICAL_PAGE, ListEntry); } - PageDescriptor->Consumer = Type; PageDescriptor->u3.e2.ReferenceCount = 1; PageDescriptor->SavedSwapEntry = SwapEntry;

14 years, 10 months

[sir_richard] 45616: [NTOS]: Instead of having an LRU linked list of working set pages, we instead have a bitmap. Advantage: Pages are only in a linked list when they are NOT active (free/zeroed, for now). This makes the LIST_ENTRY fields usable when a page is active, so we can store data in there. This will make it easier to sync our PFN format with Windows. Advantage: It's a lot faster to set/clear bits than to do list operations (both still O1 though). Scanning for the bit is a bit slower tha

by sir_richard＠svn.reactos.org

Author: sir_richard Date: Fri Feb 19 01:46:35 2010 New Revision: 45616 URL: http://svn.reactos.org/svn/reactos?rev=45616&view=rev Log: [NTOS]: Instead of having an LRU linked list of working set pages, we instead have a bitmap. Advantage: Pages are only in a linked list when they are NOT active (free/zeroed, for now). This makes the LIST_ENTRY fields usable when a page is active, so we can store data in there. This will make it easier to sync our PFN format with Windows. Advantage: It's a lot faster to set/clear bits than to do list operations (both still O1 though). Scanning for the bit is a bit slower than parsing a list, on the other hand, so it's a toss. Disadvantage: We lose LRU, which in theory makes us cannibalize working sets randomly instead of by-usage. However, considering the speed of ReactOS paging, and the effects of canabalizing the WS in the first place, I doubt this is really a problem. The main point of this is advantage #1 -- making used pages not be on any lists. This will allow us to almost 100% sync the PFN layouts, which will lead to the eventual negation of any temporary disavantages. Modified: trunk/reactos/ntoskrnl/mm/balance.c trunk/reactos/ntoskrnl/mm/freelist.c trunk/reactos/ntoskrnl/mm/mminit.c Modified: trunk/reactos/ntoskrnl/mm/balance.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/balance.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/balance.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/balance.c [iso-8859-1] Fri Feb 19 01:46:35 2010 @@ -187,11 +187,6 @@ DPRINT("Succeeded\n"); Target--; (*NrFreedPages)++; - } - else if (Status == STATUS_PAGEFILE_QUOTA) - { - MmRemoveLRUUserPage(CurrentPage); - MmInsertLRULastUserPage(CurrentPage); } CurrentPage = NextPage; 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] Fri Feb 19 01:46:35 2010 @@ -74,71 +74,81 @@ /* FUNCTIONS *************************************************************/ +static RTL_BITMAP MiUserPfnBitMap; + +/* FUNCTIONS *************************************************************/ + +VOID +NTAPI +MiInitializeUserPfnBitmap(VOID) +{ + PVOID Bitmap; + + /* Allocate enough buffer for the PFN bitmap and align it on 32-bits */ + Bitmap = ExAllocatePoolWithTag(NonPagedPool, + (((MmHighestPhysicalPage + 1) + 31) / 32) * 4, + ' mM'); + ASSERT(Bitmap); + + /* Initialize it and clear all the bits to begin with */ + RtlInitializeBitMap(&MiUserPfnBitMap, + Bitmap, + MmHighestPhysicalPage + 1); + RtlClearAllBits(&MiUserPfnBitMap); +} + PFN_TYPE NTAPI MmGetLRUFirstUserPage(VOID) { - PLIST_ENTRY NextListEntry; - PHYSICAL_PAGE* PageDescriptor; - KIRQL oldIrql; - - oldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); - NextListEntry = UserPageListHead.Flink; - if (NextListEntry == &UserPageListHead) - { - KeReleaseQueuedSpinLock(LockQueuePfnLock, oldIrql); - return 0; - } - PageDescriptor = CONTAINING_RECORD(NextListEntry, PHYSICAL_PAGE, ListEntry); - KeReleaseQueuedSpinLock(LockQueuePfnLock, oldIrql); - return PageDescriptor - MmPfnDatabase[0]; + ULONG Position; + KIRQL OldIrql; + + /* Find the first user page */ + OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + Position = RtlFindSetBits(&MiUserPfnBitMap, 1, 0); + KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + if (Position == 0xFFFFFFFF) return 0; + + /* Return it */ + return Position; } VOID NTAPI MmInsertLRULastUserPage(PFN_TYPE Pfn) { - KIRQL oldIrql; - PPHYSICAL_PAGE Page; - - oldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); - Page = MiGetPfnEntry(Pfn); -// if (!Page->Consumer != MC_USER) DPRINT1("Page Consumer: %d\n", Page->Consumer); - ASSERT(Page->Consumer == MC_USER); - ASSERT(Page->u3.e1.PageLocation = ActiveAndValid); - InsertTailList(&UserPageListHead, &Page->ListEntry); - KeReleaseQueuedSpinLock(LockQueuePfnLock, oldIrql); + KIRQL OldIrql; + + /* Set the page as a user page */ + OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + RtlSetBit(&MiUserPfnBitMap, Pfn); + KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); } PFN_TYPE NTAPI MmGetLRUNextUserPage(PFN_TYPE PreviousPfn) { - PLIST_ENTRY NextListEntry; - PHYSICAL_PAGE* PageDescriptor; - KIRQL oldIrql; - PPHYSICAL_PAGE Page; - - oldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); - Page = MiGetPfnEntry(PreviousPfn); - ASSERT(Page->Consumer == MC_USER); - ASSERT(Page->u3.e1.PageLocation = ActiveAndValid); - NextListEntry = (PLIST_ENTRY)Page->ListEntry.Flink; - if (NextListEntry == &UserPageListHead) - { - KeReleaseQueuedSpinLock(LockQueuePfnLock, oldIrql); - return 0; - } - PageDescriptor = CONTAINING_RECORD(NextListEntry, PHYSICAL_PAGE, ListEntry); - KeReleaseQueuedSpinLock(LockQueuePfnLock, oldIrql); - return PageDescriptor - MmPfnDatabase[0]; + ULONG Position; + KIRQL OldIrql; + + /* Find the next user page */ + OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + Position = RtlFindSetBits(&MiUserPfnBitMap, 1, PreviousPfn + 1); + KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + if (Position == 0xFFFFFFFF) return 0; + + /* Return it */ + return Position; } VOID NTAPI MmRemoveLRUUserPage(PFN_TYPE Page) { - RemoveEntryList(&MiGetPfnEntry(Page)->ListEntry); + /* Unset the page as a user page */ + RtlClearBit(&MiUserPfnBitMap, Page); } BOOLEAN @@ -907,7 +917,6 @@ if (Page->u3.e2.ReferenceCount == 0) { MmAvailablePages++; - if (Page->Consumer == MC_USER) RemoveEntryList(&Page->ListEntry); Page->u3.e1.PageLocation = FreePageList; InsertTailList(&FreeUnzeroedPageListHead, &Page->ListEntry); Modified: trunk/reactos/ntoskrnl/mm/mminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mminit.c?rev=4… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mminit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/mminit.c [iso-8859-1] Fri Feb 19 01:46:35 2010 @@ -349,6 +349,8 @@ DPRINT1("Total: %08lX (%d MB)\n", TotalPages, (TotalPages * PAGE_SIZE) / 1024 / 1024); } +VOID NTAPI MiInitializeUserPfnBitmap(VOID); + BOOLEAN NTAPI MmInitSystem(IN ULONG Phase, @@ -397,6 +399,7 @@ MmInitializePagedPool(); /* Initialize working sets */ + MiInitializeUserPfnBitmap(); MmInitializeMemoryConsumer(MC_USER, MmTrimUserMemory); /* Initialize the user mode image list */

14 years, 10 months

[dgorbachev] 45615: [NTOSKRNL] KiConvertToGuiThread() "accesses memory in an unpredictable fashion".

by dgorbachev＠svn.reactos.org

Author: dgorbachev Date: Fri Feb 19 00:25:12 2010 New Revision: 45615 URL: http://svn.reactos.org/svn/reactos?rev=45615&view=rev Log: [NTOSKRNL] KiConvertToGuiThread() "accesses memory in an unpredictable fashion". Modified: trunk/reactos/ntoskrnl/include/internal/i386/ke.h Modified: trunk/reactos/ntoskrnl/include/internal/i386/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/ke.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/ke.h [iso-8859-1] Fri Feb 19 00:25:12 2010 @@ -714,7 +714,7 @@ "movl %%eax, %0\n" : "=r"(Result), "=r"(StackFrame) : - : "%esp", "%ecx", "%edx" + : "%esp", "%ecx", "%edx", "memory" ); return Result;

14 years, 10 months

[dgorbachev] 45614: [BOOTVID] Initialize VgaAddress.HighPart

by dgorbachev＠svn.reactos.org

Author: dgorbachev Date: Fri Feb 19 00:25:05 2010 New Revision: 45614 URL: http://svn.reactos.org/svn/reactos?rev=45614&view=rev Log: [BOOTVID] Initialize VgaAddress.HighPart Modified: trunk/reactos/drivers/base/bootvid/i386/bootvid.c Modified: trunk/reactos/drivers/base/bootvid/i386/bootvid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/i386/… ============================================================================== --- trunk/reactos/drivers/base/bootvid/i386/bootvid.c [iso-8859-1] (original) +++ trunk/reactos/drivers/base/bootvid/i386/bootvid.c [iso-8859-1] Fri Feb 19 00:25:05 2010 @@ -394,6 +394,7 @@ { /* Translate the VGA Memory Address */ VgaAddress.LowPart = 0xA0000; + VgaAddress.HighPart = 0; AddressSpace = 0; Result = HalFindBusAddressTranslation(VgaAddress, &AddressSpace,

14 years, 10 months

[ekohl] 45613: [DEVMGR] Display some more device properties.

by ekohl＠svn.reactos.org

Author: ekohl Date: Thu Feb 18 21:18:24 2010 New Revision: 45613 URL: http://svn.reactos.org/svn/reactos?rev=45613&view=rev Log: [DEVMGR] Display some more device properties. Modified: trunk/reactos/dll/win32/devmgr/advprop.c trunk/reactos/dll/win32/devmgr/misc.c Modified: trunk/reactos/dll/win32/devmgr/advprop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/advprop.c… ============================================================================== --- trunk/reactos/dll/win32/devmgr/advprop.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/advprop.c [iso-8859-1] Thu Feb 18 21:18:24 2010 @@ -30,6 +30,9 @@ #define NDEBUG #include <debug.h> + +/* setupapi */ +DWORD WINAPI pSetupGuidFromString(PCWSTR pString, LPGUID lpGUID); typedef INT_PTR (WINAPI *PPROPERTYSHEETW)(LPCPROPSHEETHEADERW); typedef HPROPSHEETPAGE (WINAPI *PCREATEPROPERTYSHEETPAGEW)(LPCPROPSHEETPAGEW); @@ -898,6 +901,176 @@ static VOID +DisplayDeviceCoinstallers(IN PDEVADVPROP_INFO dap, + IN HWND hwndListView) +{ + HDEVINFO DeviceInfoSet; + PSP_DEVINFO_DATA DeviceInfoData; + HKEY hKey; + DWORD dwSize; + DWORD dwType; + LPBYTE lpBuffer; + LPWSTR lpStr; + INT index; + INT len; + + if (dap->CurrentDeviceInfoSet != INVALID_HANDLE_VALUE) + { + DeviceInfoSet = dap->CurrentDeviceInfoSet; + DeviceInfoData = &dap->CurrentDeviceInfoData; + } + else + { + DeviceInfoSet = dap->DeviceInfoSet; + DeviceInfoData = &dap->DeviceInfoData; + } + + hKey = SetupDiOpenDevRegKey(DeviceInfoSet, + DeviceInfoData, + DICS_FLAG_GLOBAL, + 0, + DIREG_DRV, + KEY_QUERY_VALUE); + if (hKey != INVALID_HANDLE_VALUE) + { + dwSize = 0; + if (RegQueryValueEx(hKey, + L"CoInstallers32", + NULL, + &dwType, + NULL, + &dwSize) == ERROR_SUCCESS && + dwSize > 0) + { + + lpBuffer = HeapAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, + dwSize); + + RegQueryValueEx(hKey, + L"CoInstallers32", + NULL, + &dwType, + lpBuffer, + &dwSize); + + lpStr = (LPWSTR)lpBuffer; + index = 0; + while (*lpStr != 0) + { + len = wcslen(lpStr) + 1; + + SetListViewText(hwndListView, index, lpStr); + + lpStr += len; + index++; + } + + HeapFree(GetProcessHeap(), + 0, + lpBuffer); + } + + RegCloseKey(hKey); + } +} + + +static VOID +DisplayClassProperties(IN PDEVADVPROP_INFO dap, + IN HWND hwndListView, + IN LPWSTR lpProperty) +{ + HDEVINFO DeviceInfoSet; + PSP_DEVINFO_DATA DeviceInfoData; + WCHAR szClassGuid[45]; + DWORD dwSize; + DWORD dwType; + HKEY hKey; + GUID ClassGuid; + LPBYTE lpBuffer; + LPWSTR lpStr; + INT index = 0; + INT len; + + if (dap->CurrentDeviceInfoSet != INVALID_HANDLE_VALUE) + { + DeviceInfoSet = dap->CurrentDeviceInfoSet; + DeviceInfoData = &dap->CurrentDeviceInfoData; + } + else + { + DeviceInfoSet = dap->DeviceInfoSet; + DeviceInfoData = &dap->DeviceInfoData; + } + + dwSize = 45 * sizeof(WCHAR); + if (!SetupDiGetDeviceRegistryProperty(DeviceInfoSet, + DeviceInfoData, + SPDRP_CLASSGUID, + &dwType, + (LPBYTE)szClassGuid, + dwSize, + &dwSize)) + return; + + pSetupGuidFromString(szClassGuid, + &ClassGuid); + + hKey = SetupDiOpenClassRegKey(&ClassGuid, + KEY_QUERY_VALUE); + if (hKey != INVALID_HANDLE_VALUE) + { + dwSize = 0; + if (RegQueryValueEx(hKey, + lpProperty, + NULL, + &dwType, + NULL, + &dwSize) == ERROR_SUCCESS && + dwSize > 0) + { + lpBuffer = HeapAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, + dwSize); + + RegQueryValueEx(hKey, + lpProperty, + NULL, + &dwType, + lpBuffer, + &dwSize); + + if (dwType == REG_SZ) + { + SetListViewText(hwndListView, 0, (LPWSTR)lpBuffer); + } + else if (dwType == REG_MULTI_SZ) + { + lpStr = (LPWSTR)lpBuffer; + index = 0; + while (*lpStr != 0) + { + len = wcslen(lpStr) + 1; + + SetListViewText(hwndListView, index, lpStr); + + lpStr += len; + index++; + } + } + + HeapFree(GetProcessHeap(), + 0, + lpBuffer); + } + + RegCloseKey(hKey); + } +} + + +static VOID DisplayDeviceProperties(IN PDEVADVPROP_INFO dap, IN HWND hwndComboBox, IN HWND hwndListView) @@ -992,20 +1165,45 @@ SPDRP_LOWERFILTERS); break; + case 15: /* Class Upper Filters */ + DisplayClassProperties(dap, + hwndListView, + L"UpperFilters"); + break; + + case 16: /* Class Lower Filters */ + DisplayClassProperties(dap, + hwndListView, + L"LowerFilters"); + break; + + case 17: /* Class Installer */ + DisplayClassProperties(dap, + hwndListView, + L"Installer32"); + break; + #if 0 - case 15: /* Class Upper Filters */ - break; - - case 16: /* Class Lower Filters */ - break; - - case 17: /* Class Installer */ - break; - case 18: /* Class Coinstaller */ break; +#endif case 19: /* Device Coinstaller */ + DisplayDeviceCoinstallers(dap, + hwndListView); + break; + +#if 0 + case 20: /* Firmware Revision */ + break; + + case 21: /* Current Power State */ + break; + + case 20: /* Power Capabilities */ + break; + + case 21: /* Power State Mappings */ break; #endif Modified: trunk/reactos/dll/win32/devmgr/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/misc.c?re… ============================================================================== --- trunk/reactos/dll/win32/devmgr/misc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/misc.c [iso-8859-1] Thu Feb 18 21:18:24 2010 @@ -1135,7 +1135,7 @@ WINAPI DllMain(IN HINSTANCE hinstDLL, IN DWORD dwReason, - IN LPVOID lpvReserved) + IN LPVOID lpvReserved) { switch (dwReason) {

14 years, 10 months

[sir_richard] 45612: [NTOS]: Fix build, my bad (missing file).

by sir_richard＠svn.reactos.org

Author: sir_richard Date: Thu Feb 18 18:13:37 2010 New Revision: 45612 URL: http://svn.reactos.org/svn/reactos?rev=45612&view=rev Log: [NTOS]: Fix build, my bad (missing file). Modified: trunk/reactos/ntoskrnl/mm/ARM3/mminit.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/mminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/mminit.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/mminit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/mminit.c [iso-8859-1] Thu Feb 18 18:13:37 2010 @@ -797,7 +797,7 @@ if (!Pfn1->u3.e2.ReferenceCount) { Pfn1->u3.e1.CacheAttribute = MiNonCached; - MiInsertPageInFreeList(PageFrameIndex); + //MiInsertPageInFreeList(PageFrameIndex); } /* Go to the next page */

14 years, 10 months

← Newer
1
...
9
10
11
12
13
14
15
...
37
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 2010